Fix dependency over rake-compiler that was declared a runtime dependency in the spec file; bump to EAPI=4 to be on the safe side (with REQUIRE_USE).

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

3 files changed, 25 insertions, 14 deletions

diff --git a/dev-ruby/pg/ChangeLog b/dev-ruby/pg/ChangeLog
index 97028099824d..549f526cc667 100644
--- a/dev-ruby/pg/ChangeLog
+++ b/dev-ruby/pg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ruby/pg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/ChangeLog,v 1.41 2011/12/13 00:57:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/ChangeLog,v 1.42 2011/12/18 21:13:51 flameeyes Exp $
+
+*pg-0.12.0-r1 (18 Dec 2011)
+
+  18 Dec 2011; Diego E. Pettenò <flameeyes@gentoo.org> +pg-0.12.0-r1.ebuild,
+  -pg-0.12.0.ebuild:
+  Fix dependency over rake-compiler that was declared a runtime dependency in
+  the spec file; bump to EAPI=4 to be on the safe side (with REQUIRE_USE).
 
 *pg-0.12.0 (13 Dec 2011)
 
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 079514066c91..bcfa867f9ee6 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -5,14 +5,14 @@ DIST pg-0.11.0.gem 115200 RMD160 17ce2b76b3cf83416fbc7cfb327c3848acc5716b SHA1 d
 DIST pg-0.12.0.gem 107008 RMD160 3d50977babf23043beade3379f50abaca0c569c7 SHA1 28df0b4432daa90683213e0449a1ee975b7240a4 SHA256 97cb6386089861f259d03bd092e717a809446a2333a17dac4f5c2d4d9384b400
 DIST pg-0.9.0.gem 100352 RMD160 e1db8140493cda141c49569a2a209f07f75e3113 SHA1 40aca1b69c5b88a89d05598f6f062f33cb609b4b SHA256 cd277796982956bac3f21f01b80f9075fe8692799e0dcc6eb20905506a2354c6
 EBUILD pg-0.11.0.ebuild 1562 RMD160 33c77989e78c1784f3fa15b3648aef7506f96b61 SHA1 51ac8191047195ffd78eacbc9b853d3398101c16 SHA256 da1aeb64dde59bdfa894030f12e4ad25899d37036dca7d67d31c103864a1c6ea
-EBUILD pg-0.12.0.ebuild 1606 RMD160 3eccec2b13e06648cf09a80de697d8a032f95a7a SHA1 f610a806fa5f081fa2aff5722123340b100f0b43 SHA256 5c074f78ad193f2ea607b660f7a17bc643da9c54a90d4975fbf80d68ad3cca2d
+EBUILD pg-0.12.0-r1.ebuild 1858 RMD160 2d5d0eba9a2f2da6e5b055949d6037905983940c SHA1 e79c8bf3612fe46b3b6c1e9d88303b49676bae14 SHA256 3d7eb63a8e2ea8d8531ac9537b239ef55663d4354034c50f77f4a4cc53ffc8a2
 EBUILD pg-0.9.0-r1.ebuild 1774 RMD160 240a6d10fa54283d852ae04739143fb47176c0ea SHA1 817e187ac437df279853c868b3fefbd7117c60bc SHA256 0d9aba3f734e7d3fb8946140101249fd537d9024168b372fdcba7931a51374cd
-MISC ChangeLog 5241 RMD160 97ac136354316f86afcf203b3c6be5b575a6acb4 SHA1 b1e521fbacdeb6bacfd4d0c9680100b3e79e688f SHA256 af5d591f6a4d75ff79a540c6a5be1b6963bb29a275ab3c0e813e4890a92a45ba
+MISC ChangeLog 5523 RMD160 c85ddba2e61844972453f42d8dfab2860fa8c34a SHA1 2100ba897b4c769131b93c1080f54824e6a6af65 SHA256 b03ab8950d4381a63775ca3455f8db897e215f6cfcca6f335e612337fa8f5785
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7mowMACgkQAiZjviIA2XjG5ACgtReJ1v7P7ExyLLzBURtgOrpN
-vbAAnAzVc++e4LTDj/XXr0AhlFM9Kx91
-=M4Dd
+iEYEARECAAYFAk7uV3IACgkQAiZjviIA2XgZ7QCgqIm9NBMjZF3X7C1nEhZQoy8P
+PhkAoKf6GbiZsmzOW5N3UoHZBNVp9Utd
+=wYJc
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/pg/pg-0.12.0.ebuild b/dev-ruby/pg/pg-0.12.0-r1.ebuild
index a0552268c4db..df4f7b78defc 100644
--- a/dev-ruby/pg/pg-0.12.0.ebuild
+++ b/dev-ruby/pg/pg-0.12.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/pg-0.12.0.ebuild,v 1.1 2011/12/13 00:57:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/pg/pg-0.12.0-r1.ebuild,v 1.1 2011/12/18 21:13:51 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 USE_RUBY="ruby18 ree18 ruby19"
 
 RUBY_FAKEGEM_TEST_TASK=""
@@ -34,16 +34,20 @@ ruby_add_bdepend "
 		|| ( >=dev-ruby/yard-0.6.1 dev-ruby/rdoc ) )
 	test? ( dev-ruby/rspec:2 )"
 
+all_ruby_prepare() {
+	# this is required to make rake-compiler a build-time only
+	# dependency rather than a runtime one. Without this, bundler will
+	# fail to load pg if rake-compiler is not installed as well (which
+	# is silly).
+	sed -i -e 's|:runtime|:development|' ../metadata || die
+}
+
 each_ruby_configure() {
-	pushd ext
-	${RUBY} extconf.rb || die "extconf.rb failed"
-	popd
+	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
 }
 
 each_ruby_compile() {
-	pushd ext
-	emake CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed"
-	popd
+	emake -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
 	cp ext/*.so lib || die
 }