Remove old; bump to EAPI=4; fix dependencies; split compile function in configure+compile; remove FAKEGEM_NAME.

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

4 files changed, 38 insertions, 57 deletions

diff --git a/dev-ruby/fcgi/ChangeLog b/dev-ruby/fcgi/ChangeLog
index 2acc15d08ddf..8bf009172a19 100644
--- a/dev-ruby/fcgi/ChangeLog
+++ b/dev-ruby/fcgi/ChangeLog
@@ -1,6 +1,11 @@
-# ChangeLog for dev-ruby/ruby-fcgi
+# ChangeLog for dev-ruby/fcgi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fcgi/ChangeLog,v 1.1 2012/08/16 03:43:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fcgi/ChangeLog,v 1.2 2012/08/16 16:46:48 flameeyes Exp $
+
+  16 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> -fcgi-0.8.8.ebuild,
+  fcgi-0.8.8-r2.ebuild:
+  Remove old; bump to EAPI=4; fix dependencies; split compile function in
+  configure+compile; remove FAKEGEM_NAME.
 
   10 Aug 2012; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix failed gpg signiture of manifest
@@ -205,4 +210,3 @@
   +ruby-fcgi-0.8.4.ebuild:
   Initial import. Ebuild submitted by awk <glawk01@awks.org>,
   closing bug #59042.
-
diff --git a/dev-ruby/fcgi/Manifest b/dev-ruby/fcgi/Manifest
index 74349445d588..1b60eac96f17 100644
--- a/dev-ruby/fcgi/Manifest
+++ b/dev-ruby/fcgi/Manifest
@@ -1,5 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST fcgi-0.8.8.gem 13312 SHA256 7e6b5850d6c7b3c22777f3006467e28daaaa8cbb134e36d36d98c740f8d64d03 SHA512 d46a36cd564e87e3c9fbfce08f5e8d8820a0d67681450daa0c44988063a318c5198f1fcdc24b36fc93776e5073d96696fb3385133f55205c159c913980561afd WHIRLPOOL 2de26b537f52269a2e333774aa81a1bd459f0e0ccce65930c2fecc12cebea2611af3bb7793dc89704028bcc2e161e9375086ba4376cd95a96593399657c49908
-EBUILD fcgi-0.8.8-r2.ebuild 910 SHA256 cb6c96670b18aed772b13ab74fab04ccb5b7ea9e7ed093b296d4ea190e7f6fd5 SHA512 e0e9f17a24da57c4bd85862680b99321c55846cfc3cbf7a120f09e038aa4bdf13b6b48fd15b1f9f4a3c875cb31a9b5a13395bfc7e5c52cdd1902fc1e14d01e4d WHIRLPOOL 8dc01d7f0bd58acb9a96e5d0405d5b55bcdcace43cb33b6bd1196334ee62941c1195363c0e93028bf38d3f97fafd44de3688b4ce1b76cdf4cbd079b242e296d8
-EBUILD fcgi-0.8.8.ebuild 878 SHA256 9472575dbbcdc72e26677f19051953872e075566d6312202d42aa0a981292833 SHA512 ecd38b9a2c7d359374a8466d7c2a9f5ec0759b88bf5438c001e3247788a65c505b7e3e5f7bcb8cf026bbc2883b61fe99f6a5bf0e445abe0b549978744b7af445 WHIRLPOOL 6d16d9e8f58c9c36ddad8c889de434a9b3326be0bb518eea02c40f64ef289e34e5fe2f8292e2933e5f8e9e164ef4abe6b803e584f8d1b18a305d834c1e65afe9
-MISC ChangeLog 6955 SHA256 316a4f4174df2ddaacff677164e23db6febbdb309124d3cdc1306426e9887735 SHA512 2d5d875212cb94023931ae7d5728732dcfd1b758e6dae334c912a74a0a3e148814d63ee3be61962a276264aafdd3817a3f63015e331d4c93aa9c5941f792b5c2 WHIRLPOOL 5016c2186f1700a2fd5cf4e05423acdc59859fc57add12afa7c5a0775252851754b0ef0cec062963b5a5ab25943654c4ebc8c6ff524528bcae6c49d47cd0bf66
+EBUILD fcgi-0.8.8-r2.ebuild 946 SHA256 4b88cd2b608c8d844850fe15bf00ff01888aa4b50158fdca7ccaf042a5831371 SHA512 437d144c4ed11bf1522d36861ec699911899fb4dc8501c28cc4df67b71100fc5b5570f3ca4a6ab62416b96de70a528f9a8eab1c50cfb25685a18a7f9bd613d44 WHIRLPOOL 532a6394bd8260fec2fce805565ba9120602979d565344612861e5c188f84c72218fb233d7fcdcdadabc1d948ae7714c7456d02756c347c9f77be1cf952092e8
+MISC ChangeLog 7166 SHA256 9e488d74e9f197cba3484ca07660daa6d7ce5953851f3920e996f87449f7d49d SHA512 a4dc17395a90adb13ded641c2f6275d111d5dd1f50810ea5c0967adc46cab3f9843c17e7772873c26ecd7b72dad853a111c6c64d3b6166a4e33cde06a433c4be WHIRLPOOL abb47a7ce52a5731543a22545aa1c33921451daefdcf9f51e574643451e8e98d409c80fbc0b2565328de4841a2265321d2b049a57110fe2b299f300df4445773
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQLSQjAAoJEBzRPIrUMBNCtCcH/A4hCSDmOUlfkf5v8XdTqmbW
+6Mju3gRWc5PYEvZ0DgMy52v9aBlnmYxQ/w++xVNq17Xx+NvmwFn7bmj+cWGggpAB
+pVFedxvstre3fOAP9lLV7aLhaJvPE9202KXM8P9qfyR3L6bVP50QQnP8bpYgTLsB
+mY3Pk+DGGU54kC6vuBfNyymM2xsOCj4Ycn7NHwKADolqOvpUqthpRZPbXY6Vof3x
+7K6vRwI7Cyo9o7RvAjz8a6JP+v6D8X68LaOhvren6XERwA1Z9148pXnhm1AqC6X4
+XjlDKmKWe+/ho11/pYPvV20NwC6GgNzMeEq1nzoqbqaFHENplzB9Nd/VmUlvtEA=
+=DELX
+-----END PGP SIGNATURE-----
diff --git a/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild b/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild
index e977b4809d0a..bb327b0d7eb9 100644
--- a/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild,v 1.1 2012/08/16 03:43:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild,v 1.2 2012/08/16 16:46:48 flameeyes Exp $
 
-EAPI=2
+EAPI=4
 USE_RUBY="ruby18 ruby19 ree18 jruby"
 
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
 
 RUBY_FAKEGEM_EXTRADOC="README README.signals ChangeLog"
 
-inherit ruby-fakegem eutils
+inherit multilib ruby-fakegem
 
 DESCRIPTION="FastCGI library for Ruby"
 HOMEPAGE="http://rubyforge.org/projects/fcgi/"
@@ -20,20 +18,25 @@ HOMEPAGE="http://rubyforge.org/projects/fcgi/"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 LICENSE="Ruby"
 
-DEPEND="dev-libs/fcgi"
-RDEPEND="${DEPEND}"
+DEPEND+=" dev-libs/fcgi"
+RDEPEND+=" dev-libs/fcgi"
 
 IUSE=""
 SLOT="0"
 
+each_ruby_configure() {
+	case ${RUBY} in
+		*ruby18|*rubyee18)
+			${RUBY} -C ext/fcgi extconf.rb || die "extconf failed"
+			;;
+	esac
+}
+
 each_ruby_compile() {
 	case ${RUBY} in
 		*ruby18|*rubyee18)
-			pushd ext/fcgi
-			${RUBY} extconf.rb || die "extconf failed"
-			emake || die "emake ext failed"
-			popd
-			cp ext/fcgi/fcgi.so lib || die
+			emake -C ext/fcgi
+			cp ext/fcgi/fcgi$(get_modname) lib || die
 			;;
 	esac
 }
diff --git a/dev-ruby/fcgi/fcgi-0.8.8.ebuild b/dev-ruby/fcgi/fcgi-0.8.8.ebuild
deleted file mode 100644
index 78f3be6f6450..000000000000
--- a/dev-ruby/fcgi/fcgi-0.8.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fcgi/fcgi-0.8.8.ebuild,v 1.1 2012/08/16 03:43:57 flameeyes Exp $
-
-EAPI=2
-USE_RUBY="ruby18 jruby"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README README.signals ChangeLog"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="FastCGI library for Ruby"
-HOMEPAGE="http://rubyforge.org/projects/fcgi/"
-
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-LICENSE="Ruby"
-
-DEPEND="dev-libs/fcgi"
-RDEPEND="${DEPEND}"
-
-IUSE=""
-SLOT="0"
-
-each_ruby_compile() {
-	case ${RUBY} in
-		*ruby18)
-			pushd ext/fcgi
-			${RUBY} extconf.rb || die "extconf failed"
-			emake || die "emake ext failed"
-			popd
-			cp ext/fcgi/fcgi.so lib || die
-			;;
-	esac
-}