Fix deprecation warnings.

(Portage version: 2.2.0_alpha14_p4/cvs/Linux x86_64)

1 files changed, 22 insertions, 19 deletions

diff --git a/dev-libs/protobuf/protobuf-2.3.0-r1.ebuild b/dev-libs/protobuf/protobuf-2.3.0-r1.ebuild
index cb6065fc6130..8ad5476e3442 100644
--- a/dev-libs/protobuf/protobuf-2.3.0-r1.ebuild
+++ b/dev-libs/protobuf/protobuf-2.3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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-r1.ebuild,v 1.3 2010/12/15 12:42:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.3.0-r1.ebuild,v 1.4 2011/01/12 20:47:56 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 
 JAVA_PKG_IUSE="source"
 PYTHON_DEPEND="python? 2"
@@ -27,14 +27,21 @@ RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )
 PYTHON_MODNAME="google/protobuf"
 DISTUTILS_SRC_TEST="setup.py"
 
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-asneeded-2.patch
 	eautoreconf
 
-	use python && {
+	if use python; then
 		python_convert_shebangs -r 2 .
 		distutils_src_prepare
-	}
+	fi
 }
 
 src_configure() {
@@ -67,6 +74,16 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	emake check || die "emake check failed"
+
+	if use python; then
+		 pushd python
+		 distutils_src_test
+		 popd
+	fi
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
@@ -100,20 +117,6 @@ src_install() {
 	fi
 }
 
-src_test() {
-	emake check || die "emake check failed"
-
-	if use python; then
-		 pushd python
-		 distutils_src_test
-		 popd
-	fi
-}
-
-pkg_setup() {
-	use python && python_set_active_version 2
-}
-
 pkg_postinst() {
 	use emacs && elisp-site-regen
 	use python && distutils_pkg_postinst