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

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

7 files changed, 28 insertions, 189 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/Manifest b/dev-libs/protobuf/Manifest
index 92709ae1c67c..756935ae7a52 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -1,22 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX protobuf-2.0.1-python-unittest.patch 569 RMD160 467438bb73f7044372df87c0c9b4265e3709ab3d SHA1 ef9edd56a16e4a351ea9dde9a74a64c28e3aae97 SHA256 a67d7d0abfc5d7824b55bad80ac454c05e8f44caa78c2148531a719c8c1121de
 AUX protobuf-2.0.3-decoder_test_64bit_fix.patch 935 RMD160 71b217978e1ae97e0db49292be3d325483990d03 SHA1 1c7704958ce43e958a59852eb7c71ebec092fd8d SHA256 c836602d5f0c4686122c07312892b42e8dc20c8517d8a89ff41924c0872be4b0
-DIST protobuf-2.0.0beta.tar.bz2 704775 RMD160 533d977dd2cb35f56d0ee1d593fb670c393e9d23 SHA1 eaf63f778aad90c00cbd9ec982e7502659b58d3c SHA256 b2ab129a70989894e89377e8279e8132d91037a26345ac8d498a6b25d59e81b4
-DIST protobuf-2.0.1.tar.bz2 731478 RMD160 dbc4b14d9a2d2ec6f3e5bdcfe7fe84014a7089d5 SHA1 59338ff41fea179e34aa8e30355f23ac87c628f4 SHA256 a6c88a0a2e60ad8ea22ae009bd4eb4a64ca09b9c28a9ec039ace2089de05721f
 DIST protobuf-2.0.3.tar.bz2 800667 RMD160 624ea3075ba5756106c367be224c6eb68ee4ae69 SHA1 aad5cbe1423060b0ff315d2a1447e7bf1209dc63 SHA256 b1d558df74c49aeda8e92c0c33dd9633d53e5ab2e180ab5b6873f167d8dc016c
 DIST protobuf-2.1.0.tar.bz2 1286218 RMD160 f209732febc8d4cc321246c5caff2b7502d13073 SHA1 042025cac0b8f76468091bc796d3fd8807a4664f SHA256 55ead035337b248bb63243d2c6deeb42e5e88789109d14b5ae0beda6548928e1
-EBUILD protobuf-2.0.0_beta.ebuild 1729 RMD160 28b6280847ccb21c5a45c5d0e6e6039b6e800c3e SHA1 cceffc3314b9fffff9f62d37bd45568831b86a20 SHA256 d90d05555165e213456661402b32ce6e20137e4d00002e7b12cb01800eaeeb27
-EBUILD protobuf-2.0.1.ebuild 1830 RMD160 88ba81eb7fa32c1e0845b969f7c71740e0a1b095 SHA1 e49443c3cdf78ae54686916639b47be24503fda8 SHA256 6b6d417cad24d54a7371f4b1acd8340a7455aa9188546700a1c98f3ca6369c45
 EBUILD protobuf-2.0.3.ebuild 1847 RMD160 34450a9e3ced8cb893aa4b95aa35adebb5aeb380 SHA1 762de4d65ba612592e83aaa1fb9b95a0b68b0587 SHA256 73f8c74ccf17221cc035e71fae42eaf678b9d2d5adceae25e1a1b21b79b6812e
-EBUILD protobuf-2.1.0.ebuild 1847 RMD160 ae1dd1aee3f186aa58669ed8ce1128819a2cfb83 SHA1 d1ef8fb6f1db745cc35a02cc596593e283963360 SHA256 a4969e034f0ce08d566901d35b040e87794d4911f151ea6202e845a0e80f9b47
-MISC ChangeLog 1128 RMD160 4dec634568a3de2d469836e62103b414c1a9b817 SHA1 c0abb0ca078c94f1adec5b6b6fd6c1611afb664f SHA256 1e92b2ab1b46db7be7c3564506199fb545534289499ca51d8558b1535211174a
-MISC metadata.xml 260 RMD160 7c8f2391a156380ab813494ac3d3db92386fc03b SHA1 631f6ea758b913f6dabd59b83bc8a5f053274f50 SHA256 4e471cd253b0e2e3c1900f0dd3383623080ca9ad9b6e116dd88bac46224681ac
+EBUILD protobuf-2.1.0.ebuild 1846 RMD160 a52ec56a884ce432c3284c3632eb19e1b05b1a0a SHA1 44eb8de540730df1f8e3536d2a597f7f294a3d4a SHA256 f96d3e66fddd66c6c8f096e3c31430e85a74a6c2c7a8ee4d8d54c9532e11611c
+MISC ChangeLog 1390 RMD160 45b704726fe516336fdf6959c869c0d4a74f7f54 SHA1 7406b02e5985a7cda8c40a836a5045d3b7ac5959 SHA256 74900069bfabe24cdf188525ea3cf0c6ea2061983020073c3a1875c3af166936
+MISC metadata.xml 356 RMD160 b6b528df5c353d5d918c22800774c0162af8d968 SHA1 8ab96b25050ac855282587b12969b795b3e96544 SHA256 854e6241f233981ad8d1b7dce927e72f5e483b88f1210759b3c5f3054a31e89a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoRsHwACgkQchej4aZK9/eELwCfa+PV3LYCBlkNRLEL2MuNb5R8
-cCAAn19L7tSNENKSnbPFfwf1bXxMxmLS
-=iKLO
+iEYEARECAAYFAkoRttUACgkQgo/w9rxVVVFkvACgvdanTFQQlO0aq8nFeRREgROI
+kVIAoIspM1OgAsMzfG/+vacIscnZmb7c
+=fbZ6
 -----END PGP SIGNATURE-----
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
 }