Improve Python support.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 39 insertions, 20 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index f9c0c4198b43..449f35c712cc 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/protobuf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.15 2010/04/17 22:57:30 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.16 2010/04/18 13:15:29 nelchael Exp $
+
+  18 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> protobuf-2.3.0.ebuild:
+  Improve Python support.
 
   17 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org>
   -files/protobuf-2.0.3-decoder_test_64bit_fix.patch,
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 62ed6fdf0717..f74272713b00 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX 70protobuf-gentoo.el 170 RMD160 f6208c9a555325c1a6e1b26daee6fbc425cbfd98 SHA1 8f8f8ce9bdab9a8f9a11b16236be383488277cb3 SHA256 b6e5c2f11a63f9eb4a9382227ce8f41bfcf23213166d2fb212e21e237b2f264d
 DIST protobuf-2.3.0.tar.bz2 1424966 RMD160 92b9c374ce3ccbb0b0d22d08e9f9d3a5a68d1ac8 SHA1 db0fbdc58be22a676335a37787178a4dfddf93c6 SHA256 760c7707c3fe9ce801916bbd3067d711a33aa550c01b32d1e1761119cf6280ac
-EBUILD protobuf-2.3.0.ebuild 2208 RMD160 3cba5d6d036b4436235091bb477010955b604473 SHA1 82ddf97dafd7b82188ec49f991dcef7190c4f718 SHA256 5cd2ac6dfc86156626d0f4c54cf0759d957398bf51e776b29765346a0f2fd2a4
-MISC ChangeLog 2903 RMD160 527bb362268274c9f8c75d5c8c330f753589ea10 SHA1 bf909d082438b70887e5f9a46f3edc4b34f5f512 SHA256 ae4bdf57f16df3e50d9cd4ff12be0cf398121e02628c7531e6d7a7acc92c6e13
+EBUILD protobuf-2.3.0.ebuild 2451 RMD160 516cc5f9da32e061070c61f6fd6ce4c9deff2b84 SHA1 7da6391d04bd4429b8d42da603ae34449d4c09ad SHA256 1cca4337dbe776ee123980f868969619b655b36accd364a0ab6cb8e38cbfea6a
+MISC ChangeLog 3007 RMD160 aea205d561f7cf90cb0580ae136a2fd7f5a9d386 SHA1 d70163cb778e94e2d10c1ea7a4ed6030bf309350 SHA256 2d2935e1235dfa355737e20b129362b092b26480bf957bb85f23f3d05cfe67b4
 MISC metadata.xml 259 RMD160 854ca28d16ec40e1d7e59e2416c9633513d97454 SHA1 09b1f80597e496801e479f5b2642cd04aafadb74 SHA256 e4352d15b7bff1306476d49687525386bd7acca33010e3f06ed91b963e3d5893
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQEcBAEBAgAGBQJLyjzfAAoJEBZyv1r2qA5GZyMH/i5/Mg+16rn7tERtyncDctxy
-Jx1XDUvT5gvVUAS8j2C/LJC5tv9RYU+oqvfh5pOrdzPvl5Olwjc6QfIwBlJqTq/0
-lrDy/JUNMKoaO5VEV+Arw2Ni83K00VGGjrznJJttnR7Ke//E7Q1R7pIO/oOzBLNi
-/ieHxsxfHTzAM2QCL3nuQKx7go0da1A0y5YkWYj45qTmta+p9xRVrf1nEfmUVNZm
-2pXzo1ZIuCFiEqanxi0i5mKPphmUjzBqsr7pcWNaBlcZKtKhPOaFZblnL/MMdYpX
-oLyZgSGX72miZmuCktJHQUepMCW3Kt6SRvuoN1LoCA5VUE2GvmK5PrZittIXfsA=
-=8uZX
+iQEcBAEBAgAGBQJLywX3AAoJEBZyv1r2qA5GEy8IAJa6Jq9I3GMBmBD47BBmIyvp
+kNgGxfvc8Ev3dn2xXO0ynbSHy7tpNhQ7K9TmPmORU91pBxVjEhms7iMRLJ+uiXRD
+H4GxIkgRsIDaKTqY/LJSHXFi9YfPv8z/hhQ8+UpCzNCud2sFHdpF7cKVrqK8zUBX
+XuYev07yXU8Dupg0q+CRo+KFAUG193keLupvU2gNiNGMVT9gHeucJ78CDRs9Dqso
++GJEeHTAKd3D9Z6/vCViHKMmvAWRvUCq54VKcU21tfEJcx/KDzTedW0OUfoiVQN/
+f0bzAXFvgA5BeHsAcjTFRqSZyvbO6vK9doCnZQZ5vHVmY3BFrFD8gxgqB5DOoA0=
+=6LVE
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/protobuf-2.3.0.ebuild b/dev-libs/protobuf/protobuf-2.3.0.ebuild
index f6bb3e575001..8a22b393c5a9 100644
--- a/dev-libs/protobuf/protobuf-2.3.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.3.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.3.0.ebuild,v 1.2 2010/04/02 19:22:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.3.0.ebuild,v 1.3 2010/04/18 13:15:29 nelchael Exp $
 
 EAPI="2"
 
 JAVA_PKG_IUSE="source"
+PYTHON_DEPEND="python? 2"
 
 inherit eutils distutils python java-pkg-opt-2 elisp-common
 
@@ -23,14 +24,22 @@ DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
 RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )
 	emacs? ( virtual/emacs )"
 
+src_prepare() {
+	use python && python_convert_shebangs -r 2 .
+}
+
 src_compile() {
 	emake || die
 
 	if use python; then
-		cd python; distutils_src_compile; cd ..
+		einfo "Compiling Python library ..."
+		pushd python
+		distutils_src_compile
+		popd
 	fi
 
 	if use java; then
+		einfo "Compiling Java library ..."
 		src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
 		mkdir java/build
 		pushd java/src/main/java
@@ -49,7 +58,14 @@ src_install() {
 	dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
 
 	if use python; then
-		cd python; distutils_src_install; cd ..
+		pushd python
+		distutils_src_install
+		popd
+	fi
+
+	if use java; then
+		java-pkg_dojar ${PN}.jar
+		use source && java-pkg_dosrc java/src/main/java/*
 	fi
 
 	if use vim-syntax; then
@@ -66,22 +82,22 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins -r examples/* || die "doins examples failed"
 	fi
-
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-		use source && java-pkg_dosrc java/src/main/java/*
-	fi
 }
 
 src_test() {
 	emake check
 
 	if use python; then
-		 cd python; ${python} setup.py test || die "python test failed"
-		 cd ..
+		 pushd python
+		 "$(PYTHON)" setup.py test || die "python tests failed"
+		 popd
 	fi
 }
 
+pkg_setup() {
+	use python && python_set_active_version 2
+}
+
 pkg_postinst() {
 	use emacs && elisp-site-regen
 }