[patch] rubygems-1.3.7-r1-prefix.diff

rubygems-1.3.7-r1-prefix.diff (text/plain), 5.83 KB, created by Jeremy Olexa (darkside) (RETIRED) on 2010-07-30 17:09:49 UTC

? rubygems-1.3.7.ebuild.1
? files/rubygems-1.3.3-prefix.patch
Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/Manifest,v
retrieving revision 1.169
diff -u -r1.169 Manifest
--- Manifest	23 Jul 2010 13:08:18 -0000	1.169
+++ Manifest	30 Jul 2010 17:06:50 -0000
@@ -8,6 +8,7 @@
 AUX init.d-gem_server 502 RMD160 9fe089f462edff052e6b7fa6ea3803e0178f41ef SHA1 e00ead252760613865f5e655ff2e559e7578d28f SHA256 b6166c27021880ee1509eb68092f0d3d0550adb9d6b0dcb9396c91c725c5218e
 AUX init.d-gem_server2 502 RMD160 baf764bc5ad41adce73576b2376093744ddd3917 SHA1 ad332343eab53b4be8d796999063ec2018245a4b SHA256 b7f7d215bb3dba02150dbdc431a84308010515ad4c5d9776d0dd5b99bf9a2cee
 AUX rubygems-1.3.3-gentoo.patch 1422 RMD160 e39a2042170399d0e98c772b0572026d6057353d SHA1 11cb4656b77185c78df809d3180061e5fe41139b SHA256 95e6c7ea38177b0798562be5abaf040e72db4a27f851502d91c4453890e630b0
+AUX rubygems-1.3.3-prefix.patch 254 RMD160 a851eeb26c54e87436fa977424239187e98ea094 SHA1 fa16808661a82299e6b896397c20bfce2965aac1 SHA256 0245bbf7b7244c48dff07f06f7ee2d53b038a70358bbc36f420d1de18100e6ac
 AUX rubygems-1.3.5-setup.patch 942 RMD160 69e8714f72482387019bad7b9254110c6bb8b957 SHA1 ba58de08e29731de4ce820f7d8e4c60de2fcee6e SHA256 d3e7c43ff20a649d1c731e27b0791f110b920201a28607091da0166495709b97
 AUX rubygems-1.3.7-ruby19.patch 584 RMD160 7f0587930ca8a2a9e1f489169338108020173c01 SHA1 d921a4d2bc794b7e6f8b1472a50b7252eebca609 SHA256 8f0543a261b14e1531047fe6a147402e8db02886b5c566ee3222d9606e8a1eb1
 AUX rubygems-1.3.7-rubyee.patch 825 RMD160 d406da8f27ab69de6cea2aec04b954581e271456 SHA1 23a244497f2e495047c65ea9ad030a81c186e3d4 SHA256 4f272cdfe2383546edcefa11a816b4b4c8ab9bd78e5f23f4f737b6fce2f705c0
@@ -20,7 +21,8 @@
 EBUILD rubygems-1.3.5.ebuild 3166 RMD160 95a7edee644212eabf8a86f1dc42d06c14a3deed SHA1 8c1b5af2fd039e655628a1884697883824b0bafc SHA256 14822c8c0b156a93a8ab2215b5502f7cea55c2cbce8a57b5ddd7eec2753338b1
 EBUILD rubygems-1.3.6-r2.ebuild 3252 RMD160 cf0d122e362d0a75ff8187cc053319c4b2174cc4 SHA1 3a962a853a2c5adb6454be06df763ceb68c39b4a SHA256 51a72883760f1f2616f4808f43ad1c2f7e1435540cb07b6acbb5dc094963c610
 EBUILD rubygems-1.3.6.ebuild 3096 RMD160 3abcac49900105943cbf2bbde168c97d088b162d SHA1 f598b8ab87f175ead2cb73ed599c37bfe6094fe4 SHA256 492d0c250fb3a7c5d84d52301c7ca4e4eaa942d452cbcf096c5fefe69e4c8ea9
-EBUILD rubygems-1.3.7-r1.ebuild 3405 RMD160 b2876e032b5f9609ea863e25338ab491df407ba1 SHA1 78252070356461745b7c8ac4a4e5f635bb2c1963 SHA256 38b98cce5addf5b45a9ebc6b4d2c1dad56c2ee8de61cb0cef58bcc50d076d9fc
+EBUILD rubygems-1.3.7-r1.ebuild 3664 RMD160 ee2c21566c7f67ea1e6a3d704e690228faf4ef02 SHA1 758f353fc16ae116ef774f4534b5062341910dec SHA256 5f7b2e454355a4b0fcef627ad746138dcb40b89cbe56fbdfe113fed0ce0b88e6
 EBUILD rubygems-1.3.7.ebuild 3314 RMD160 e5905ad88c7f210df0978f0ba804c9e7aa533171 SHA1 3ea9c3519266f8ff546a6c6de6d028b67f38e83c SHA256 cbfab609137b0d8ebcd57165a7d2d15662bae18dd7dbc30d00c4eee20c06435d
 MISC ChangeLog 22535 RMD160 d7da6997f0ba02f1507383d37783b3e4fa58cba8 SHA1 5a6ab43b0ac35fc6b96ae3187c0b771fbf839431 SHA256 166c48c29dfdc65b9b2b9e175be27e5e594ee409c477e4bc8d371c37d01193e9
 MISC metadata.xml 247 RMD160 eb1d10b4366542ce2f232dcaf7317341b6b5608f SHA1 fcb6e2a1d6cda6d45640f9c5a5dfcc0fd4f3ab3b SHA256 633ae9912e8dd27f76b9cf53f5ad0d3222db85d9a19a76da7fd5e26f40b144e3
+MISC rubygems-1.3.7.ebuild.1 3526 RMD160 b22ed5f2b27e0cb0136e5737013897263ff09766 SHA1 e8db60835d0ebb952b8818273186b3b133cb49ce SHA256 99fc489c78f65e1e7dba99788f55e0b49ab1a4067b0a297af68b788f280fdd78
Index: rubygems-1.3.7-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r1.ebuild,v
retrieving revision 1.1
diff -u -r1.1 rubygems-1.3.7-r1.ebuild
--- rubygems-1.3.7-r1.ebuild	16 May 2010 13:30:02 -0000	1.1
+++ rubygems-1.3.7-r1.ebuild	30 Jul 2010 17:06:50 -0000
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-1.3.7-r1.ebuild,v 1.1 2010/05/16 13:30:02 a3li Exp $
 
-EAPI="2"
+EAPI="3"
 
 USE_RUBY="ruby18 ruby19 ree18 jruby"
 
-inherit ruby-ng
+inherit ruby-ng prefix
 
 DESCRIPTION="Centralized Ruby extension management system"
 HOMEPAGE="http://rubyforge.org/projects/rubygems/"
@@ -17,7 +17,7 @@
 
 SRC_URI="mirror://rubyforge/${PN}/${P}.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="doc server"
 
@@ -35,6 +35,9 @@
 	# Fixes a new "feature" that would prevent us from recognizing installed
 	# gems inside the sandbox
 	epatch "${FILESDIR}/${PN}-1.3.3-gentoo.patch"
+
+	epatch "${FILESDIR}"/${PN}-1.3.3-prefix.patch
+	eprefixify lib/rubygems/config_file.rb
 }
 
 each_ruby_prepare() {
@@ -60,7 +63,7 @@
 	# bug #202109. Since 1.2.0 we also need to set GEM_PATH for this reason, bug #230163
 	export GEM_HOME="${D}${gemsitedir}"
 	export GEM_PATH="${GEM_HOME}/"
-	keepdir ${gemsitedir}/{doc,gems,cache,specifications}
+	keepdir ${gemsitedir#${EPREFIX}}/{doc,gems,cache,specifications}
 
 	myconf=""
 	if ! use doc; then
@@ -70,7 +73,8 @@
 
 	${RUBY} setup.rb $myconf --destdir="${D}" || die "setup.rb install failed"
 
-	insinto $(ruby_rbconfig_value 'sitelibdir')
+	sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+	insinto ${sitelibdir#${EPREFIX}}
 	newins "${FILESDIR}/auto_gem.rb.$(basename ${RUBY})" auto_gem.rb || die	"newins auto_gem failed"
 }
 
@@ -98,7 +102,7 @@
 pkg_postinst() {
 	_ruby_each_implementation clear_source_cache
 
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+	if [[ ! -n $(readlink "${EROOT}"usr/bin/gem) ]] ; then
 		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
 	fi