From: Krzysztof Pawlik <nelchael@gentoo.org>
Date: Sun, 18 Apr 2010 13:44:22 +0000 (+0000)
Subject: Use more functions from distutils eclass.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66f2df88e383a1905d4c9775d1e8dfc268992770;p=gentoo.git

Use more functions from distutils eclass.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index 449f35c712cc..f9c79413a109 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.16 2010/04/18 13:15:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.17 2010/04/18 13:44:22 nelchael Exp $
+
+  18 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> protobuf-2.3.0.ebuild:
+  Use more functions from distutils eclass.
 
   18 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> protobuf-2.3.0.ebuild:
   Improve Python support.
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index f74272713b00..86ec81706fba 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 2451 RMD160 516cc5f9da32e061070c61f6fd6ce4c9deff2b84 SHA1 7da6391d04bd4429b8d42da603ae34449d4c09ad SHA256 1cca4337dbe776ee123980f868969619b655b36accd364a0ab6cb8e38cbfea6a
-MISC ChangeLog 3007 RMD160 aea205d561f7cf90cb0580ae136a2fd7f5a9d386 SHA1 d70163cb778e94e2d10c1ea7a4ed6030bf309350 SHA256 2d2935e1235dfa355737e20b129362b092b26480bf957bb85f23f3d05cfe67b4
+EBUILD protobuf-2.3.0.ebuild 2584 RMD160 85e5ed20991199306d0d532096eff9f8ad804284 SHA1 7f5b9ff3251162425e89a16cb99fd926d03616a1 SHA256 f6b6f09c2d226f032c0ad9feb13e362ec3b209bd30ca10428b6f1fd54d876654
+MISC ChangeLog 3129 RMD160 f0e9d8920ea97bece570f8fbdd55aaedc0a41a52 SHA1 34762053bc537030e53c0c993985eed61a8ac588 SHA256 1d46ca5370e740bd2f322dc8f698c441220bdaa8027c6d096cce52a00465e655
 MISC metadata.xml 259 RMD160 854ca28d16ec40e1d7e59e2416c9633513d97454 SHA1 09b1f80597e496801e479f5b2642cd04aafadb74 SHA256 e4352d15b7bff1306476d49687525386bd7acca33010e3f06ed91b963e3d5893
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQEcBAEBAgAGBQJLywX3AAoJEBZyv1r2qA5GEy8IAJa6Jq9I3GMBmBD47BBmIyvp
-kNgGxfvc8Ev3dn2xXO0ynbSHy7tpNhQ7K9TmPmORU91pBxVjEhms7iMRLJ+uiXRD
-H4GxIkgRsIDaKTqY/LJSHXFi9YfPv8z/hhQ8+UpCzNCud2sFHdpF7cKVrqK8zUBX
-XuYev07yXU8Dupg0q+CRo+KFAUG193keLupvU2gNiNGMVT9gHeucJ78CDRs9Dqso
-+GJEeHTAKd3D9Z6/vCViHKMmvAWRvUCq54VKcU21tfEJcx/KDzTedW0OUfoiVQN/
-f0bzAXFvgA5BeHsAcjTFRqSZyvbO6vK9doCnZQZ5vHVmY3BFrFD8gxgqB5DOoA0=
-=6LVE
+iQEcBAEBAgAGBQJLywy8AAoJEBZyv1r2qA5GDJsH/21GaSTIQg7hgQheRVbXGiXp
+t06hRsLhB/yMo1TnrHuX/1LDlaGLzpY2sGYaVnWxEyYOlvEYed8l1ZHi1Bt2Mdwy
+fZYdS+9ftAYIMKxHDdOOlvdX/7IOmI+z1UXV7M8DUFaeKOBxhobc5mIhIQHUJMND
+EWhWdZt7LS5+PrpohqKJcOPp/lFbG0Xz++MAGrcVGdoaJLfELRBAcAsiZ+U33WAO
+2RFjZoUSNYKglrj6ir5kTBWb39PtV0jQuaWWs1KqYlHfaDpLWVI+zLdjx1igvVTg
+U3zWr/2zQzwHdoJHiC7PAJZZXfjBQ8XDxczrMFI4qIF5LngBLqYgwi3VG1bBmJo=
+=Ec8G
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/protobuf-2.3.0.ebuild b/dev-libs/protobuf/protobuf-2.3.0.ebuild
index 8a22b393c5a9..8a7f31db39a6 100644
--- a/dev-libs/protobuf/protobuf-2.3.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2010/04/18 13:15:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.3.0.ebuild,v 1.4 2010/04/18 13:44:22 nelchael Exp $
 
 EAPI="2"
 
@@ -24,8 +24,14 @@ DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
 RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )
 	emacs? ( virtual/emacs )"
 
+PYTHON_MODNAME="google/protobuf"
+DISTUTILS_SRC_TEST="setup.py"
+
 src_prepare() {
-	use python && python_convert_shebangs -r 2 .
+	use python && {
+		python_convert_shebangs -r 2 .
+		distutils_src_prepare
+	}
 }
 
 src_compile() {
@@ -89,7 +95,7 @@ src_test() {
 
 	if use python; then
 		 pushd python
-		 "$(PYTHON)" setup.py test || die "python tests failed"
+		 distutils_src_test
 		 popd
 	fi
 }
@@ -100,8 +106,10 @@ pkg_setup() {
 
 pkg_postinst() {
 	use emacs && elisp-site-regen
+	use python && distutils_pkg_postinst
 }
 
 pkg_postrm() {
 	use emacs && elisp-site-regen
+	use python && distutils_pkg_postrm
 }