Add myself as maintainer, remove old versions, improve 2.1.0.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

6 files changed, 22 insertions, 178 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index 882b8584a9b5..ff13d6ee46b3 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/protobuf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.5 2009/05/18 19:01:49 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.6 2009/05/18 19:28:15 nelchael Exp $
+
+  18 May 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  -protobuf-2.0.0_beta.ebuild, -protobuf-2.0.1.ebuild,
+  -files/protobuf-2.0.1-python-unittest.patch, protobuf-2.1.0.ebuild,
+  metadata.xml:
+  Add myself as maintainer, remove old versions, improve 2.1.0.
 
 *protobuf-2.1.0 (18 May 2009)
 
diff --git a/dev-libs/protobuf/files/protobuf-2.0.1-python-unittest.patch b/dev-libs/protobuf/files/protobuf-2.0.1-python-unittest.patch
deleted file mode 100644
index f187e4b69f34..000000000000
--- a/dev-libs/protobuf/files/protobuf-2.0.1-python-unittest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naurp protobuf-2.0.1-orig/python/setup.py protobuf-2.0.1/python/setup.py
---- protobuf-2.0.1-orig/python/setup.py	2008-09-11 21:52:47.000000000 +0200
-+++ protobuf-2.0.1/python/setup.py	2008-09-11 21:53:58.000000000 +0200
-@@ -47,6 +47,9 @@ def generate_proto(source):
-       sys.exit(-1)
- 
- def MakeTestSuite():
-+  if 'google' in sys.modules:
-+    del sys.modules['google']
-+
-   generate_proto("../src/google/protobuf/unittest.proto")
-   generate_proto("../src/google/protobuf/unittest_import.proto")
-   generate_proto("../src/google/protobuf/unittest_mset.proto")
diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index 2c3ddaaa0f8e..be7acbdcdfba 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -6,5 +6,8 @@
 		<email>spock@gentoo.org</email>
 		<name>Michał Januszewski</name>
 	</maintainer>
+	<maintainer>
+		<email>nelchael@gentoo.org</email>
+		<name>Krzysiek Pawlik</name>
+	</maintainer>
 </pkgmetadata>
-
diff --git a/dev-libs/protobuf/protobuf-2.0.0_beta.ebuild b/dev-libs/protobuf/protobuf-2.0.0_beta.ebuild
deleted file mode 100644
index cb055809a8d3..000000000000
--- a/dev-libs/protobuf/protobuf-2.0.0_beta.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.0.0_beta.ebuild,v 1.2 2009/05/18 19:01:49 spock Exp $
-
-inherit distutils python java-pkg-opt-2
-
-MY_P=${PN}-${PV//_/}
-
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="http://code.google.com/p/protobuf/"
-SRC_URI="http://protobuf.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples java python vim-syntax"
-
-DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
-	python? ( dev-python/setuptools )"
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf || die
-	emake || die
-
-	if use python; then
-		cd python; distutils_src_compile; cd ..
-	fi
-
-	if use java; then
-		src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
-		mkdir java/build
-		cd java/src/main/java
-		ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
-		cd ../../../..
-		jar cf ${PN}.jar -C java/build . || die "jar failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
-
-	if use python; then
-		cd python; distutils_src_install; cd ..
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins editors/proto.vim
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "doins examples failed"
-	fi
-
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-	fi
-}
-
-src_test() {
-	make check
-
-	if use python; then
-		 cd python; ${python} setup.py test || die "python test failed"
-		 cd ..
-	fi
-}
diff --git a/dev-libs/protobuf/protobuf-2.0.1.ebuild b/dev-libs/protobuf/protobuf-2.0.1.ebuild
deleted file mode 100644
index 73f44bb97db5..000000000000
--- a/dev-libs/protobuf/protobuf-2.0.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.0.1.ebuild,v 1.3 2009/05/18 19:01:49 spock Exp $
-
-inherit eutils distutils python java-pkg-opt-2
-
-MY_P=${PN}-${PV//_/}
-
-DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
-HOMEPAGE="http://code.google.com/p/protobuf/"
-SRC_URI="http://protobuf.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples java python vim-syntax"
-
-DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
-	python? ( dev-python/setuptools )"
-RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-python-unittest.patch
-}
-
-src_compile() {
-	econf || die
-	emake || die
-
-	if use python; then
-		cd python; distutils_src_compile; cd ..
-	fi
-
-	if use java; then
-		src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
-		mkdir java/build
-		cd java/src/main/java
-		ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
-		cd ../../../..
-		jar cf ${PN}.jar -C java/build . || die "jar failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGES.txt CONTRIBUTORS.txt README.txt
-
-	if use python; then
-		cd python; distutils_src_install; cd ..
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins editors/proto.vim
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "doins examples failed"
-	fi
-
-	if use java; then
-		java-pkg_dojar ${PN}.jar
-	fi
-}
-
-src_test() {
-	emake check
-
-	if use python; then
-		 cd python; ${python} setup.py test || die "python test failed"
-		 cd ..
-	fi
-}
diff --git a/dev-libs/protobuf/protobuf-2.1.0.ebuild b/dev-libs/protobuf/protobuf-2.1.0.ebuild
index 88cf70f86c18..f38718a4c429 100644
--- a/dev-libs/protobuf/protobuf-2.1.0.ebuild
+++ b/dev-libs/protobuf/protobuf-2.1.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.1.0.ebuild,v 1.1 2009/05/18 19:01:49 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.1.0.ebuild,v 1.2 2009/05/18 19:28:15 nelchael Exp $
 
-inherit eutils distutils python java-pkg-opt-2
+EAPI="2"
+
+JAVA_PKG_IUSE="source"
 
-MY_P=${PN}-${PV//_/}
+inherit eutils distutils python java-pkg-opt-2
 
 DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data"
 HOMEPAGE="http://code.google.com/p/protobuf/"
-SRC_URI="http://protobuf.googlecode.com/files/${MY_P}.tar.bz2"
+SRC_URI="http://protobuf.googlecode.com/files/${PF}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,16 +21,11 @@ DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
 	python? ( dev-python/setuptools )"
 RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )"
 
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/protobuf-2.0.3-decoder_test_64bit_fix.patch"
 }
 
 src_compile() {
-	econf || die
 	emake || die
 
 	if use python; then
@@ -38,10 +35,10 @@ src_compile() {
 	if use java; then
 		src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
 		mkdir java/build
-		cd java/src/main/java
+		pushd java/src/main/java
 		ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
-		cd ../../../..
-		jar cf ${PN}.jar -C java/build . || die "jar failed"
+		popd
+		jar cf "${PN}.jar" -C java/build . || die "jar failed"
 	fi
 }
 
@@ -65,6 +62,7 @@ src_install() {
 
 	if use java; then
 		java-pkg_dojar ${PN}.jar
+		use source && java-pkg_dosrc java/src/main/java/*
 	fi
 }