Version bump. Add setuptools as dependency (bug #270207).

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

7 files changed, 111 insertions, 31 deletions

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index e5ebeb388183..51132eb8fd1f 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST opensc-0.11.6.tar.gz 1452763 RMD160 de838d827030f187ffa57028dbaf5013f6c82e68 SHA1 0aa3b6a57a730f8e06f138537220c30ee709037f SHA256 801fdb00582c2276e47635e17039a7f85467c0cb184d74cce7ac313d24acaa00
 DIST opensc-0.11.7.tar.gz 1422696 RMD160 29b221be2e7cfb8ffaeb8e848071e17e6f14cfeb SHA1 f91f66bb350d94c07fb01e427c936ce56f1c7d0d SHA256 6dab273cbdba8e92c59207715199f48f4f9e541e6d873561e30154bd40c4011d
 DIST opensc-0.11.8.tar.gz 1434051 RMD160 e6dc1e9705b922bfbcb5e9804ad08cfa9e8605d8 SHA1 4a320b0cc3bc3de5843ab6af677093d98d4cf318 SHA256 3713eff46d231e0b37c1fdba3d3d640716fe0edd875df57578643f0d9f221361
 EBUILD opensc-0.11.6.ebuild 1113 RMD160 bfc6a2f7fce204e6f9a8d6c320c4e24eb681ece1 SHA1 fbfdca94e105013d600f10a6a15e387fa3f24915 SHA256 3642f69417af8e70d2cb8765aad8c6645c67e936aa988b309bc8c72230fa3e86
 EBUILD opensc-0.11.7.ebuild 1455 RMD160 cbd8d95f679382ffebf743e3db2eb9849ada68f3 SHA1 5a96f569bf04dcf0b7a0355a492736e9a394c632 SHA256 ef2446cca97054e0435eccfff9c2b1c977063746797777b0cf96da4fe44f6718
-EBUILD opensc-0.11.8.ebuild 1578 RMD160 0b0c2a40812dfb88e69bd55b4286475a44cf4b1a SHA1 0add983540b1929e29afb1155f6f4e250ddb9c5f SHA256 a3a14c14047a6e8c299aa1dd3919dbf7b91867af75a22b6cc84e9c8cdcd9f142
-MISC ChangeLog 9875 RMD160 2633413daa9fd449984811584099d441468377bb SHA1 01fca62d1758eed41614ac9cc9e2dc449ed19c8d SHA256 51a70190e31e3dae6d156e85f395a17722faaa1bbfe9848ae78eb8251b14d595
+EBUILD opensc-0.11.8.ebuild 1577 RMD160 a956fee919d8ed203ccd4af776fecabf2405f734 SHA1 8e2cb70bf16ea50f053bec0d2a5b36161e39fee6 SHA256 26b1dec896bd56808e292b59b6b9d387b42e3d986fc28bf5b3d3edc07ada7a17
+MISC ChangeLog 9999 RMD160 4cad0aae045fc9ba95059d5db3701b2b96e91575 SHA1 3ee7f027ab96d760c80e19a68ae7d9e041aea2b6 SHA256 70f33f8710eb92babfd4f188588b87d014721834a57b7f580a637189707f6cfe
 MISC metadata.xml 836 RMD160 a77e0988c3ee24f1a32e686eb06bfbbb12d450c9 SHA1 099331ffab60cacb76551a916d41ec9a6b896b67 SHA256 2b8cbdb7bee676530dcf6f962d79d93278104ba12151ab08bd66ba77f3fa564c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoRhEEACgkQNQqtfCuFneNx0gCeKKRocbiRSpkSp04uDGKemOtx
-FPQAmgOYC7A6ten/gNsfenOulSyJpV/+
-=O1h1
------END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index 77bfb577a5e1..882b8584a9b5 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/protobuf
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.4 2008/12/06 22:31:17 spock Exp $
+# 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 $
+
+*protobuf-2.1.0 (18 May 2009)
+
+  18 May 2009; Michał Januszewski <spock@gentoo.org>
+  protobuf-2.0.0_beta.ebuild, protobuf-2.0.1.ebuild, protobuf-2.0.3.ebuild,
+  +protobuf-2.1.0.ebuild:
+  Version bump. Add setuptools as dependency (bug #270207).
 
 *protobuf-2.0.3 (06 Dec 2008)
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 3d5665b690e0..92709ae1c67c 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -6,15 +6,17 @@ AUX protobuf-2.0.3-decoder_test_64bit_fix.patch 935 RMD160 71b217978e1ae97e0db49
 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
-EBUILD protobuf-2.0.0_beta.ebuild 1694 RMD160 81c1c8063b5632df2b0da250836f220e2023dc93 SHA1 a02a6a7fc89d0b411125cd5956312a8fac49788b SHA256 d12dc684d215357d95a403b21a928dcf613ec3c6aac70a52d7d4b13d653afc59
-EBUILD protobuf-2.0.1.ebuild 1795 RMD160 4ba0f308dae8f0e803eb6b855a06a9adf8d80669 SHA1 f8ca7889ff4c1e7af5c338a9b3d52cd1b056af0f SHA256 c4b3d0bf9c28fb76d3c6ce2f93cc7d9bdbd0ef81a87fbb1067e5bf168e594cee
-EBUILD protobuf-2.0.3.ebuild 1812 RMD160 07860df821aa2f4c24174f06ee74e6977cd7c1b8 SHA1 25ef4e73c328f56b816d6eb62fe239d32a8ca10a SHA256 8987cdcc95802e4cf970950b49844274ba375da2f023e5a2a8f60134fab246d0
-MISC ChangeLog 880 RMD160 ea2a158bb191e30dffb83a24cdd1859673060237 SHA1 56ae7f19ed14006994ee9e152b6ff28227009ea8 SHA256 b30546cb00f26e11c5abe58fb5d8efe2f39bfb5a6785be5c80041e0ea8f4de7a
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkk6/ToACgkQchej4aZK9/c+bgCfbnyLArDhfL65LRdpAMk/vrKm
-yWoAn2hUwGZ2aQy74d3wKmtb4BpEEGgw
-=8Iot
+iEYEARECAAYFAkoRsHwACgkQchej4aZK9/eELwCfa+PV3LYCBlkNRLEL2MuNb5R8
+cCAAn19L7tSNENKSnbPFfwf1bXxMxmLS
+=iKLO
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/protobuf-2.0.0_beta.ebuild b/dev-libs/protobuf/protobuf-2.0.0_beta.ebuild
index 576b911caf31..cb055809a8d3 100644
--- a/dev-libs/protobuf/protobuf-2.0.0_beta.ebuild
+++ b/dev-libs/protobuf/protobuf-2.0.0_beta.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1 2008/07/17 23:16:44 spock Exp $
+# $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
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples java python vim-syntax"
 
-DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )"
+DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
+	python? ( dev-python/setuptools )"
 RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/protobuf/protobuf-2.0.1.ebuild b/dev-libs/protobuf/protobuf-2.0.1.ebuild
index 49033e77d773..73f44bb97db5 100644
--- a/dev-libs/protobuf/protobuf-2.0.1.ebuild
+++ b/dev-libs/protobuf/protobuf-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2 2008/10/30 14:22:14 spock Exp $
+# $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
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples java python vim-syntax"
 
-DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )"
+DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
+	python? ( dev-python/setuptools )"
 RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/protobuf/protobuf-2.0.3.ebuild b/dev-libs/protobuf/protobuf-2.0.3.ebuild
index 6c9622eaf8ac..e53ce8444762 100644
--- a/dev-libs/protobuf/protobuf-2.0.3.ebuild
+++ b/dev-libs/protobuf/protobuf-2.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.3.ebuild,v 1.1 2008/12/06 22:31:17 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.0.3.ebuild,v 1.2 2009/05/18 19:01:49 spock Exp $
 
 inherit eutils distutils python java-pkg-opt-2
 
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="examples java python vim-syntax"
 
-DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )"
+DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
+	python? ( dev-python/setuptools )"
 RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/protobuf/protobuf-2.1.0.ebuild b/dev-libs/protobuf/protobuf-2.1.0.ebuild
new file mode 100644
index 000000000000..88cf70f86c18
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-2.1.0.ebuild
@@ -0,0 +1,78 @@
+# 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 $
+
+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}/protobuf-2.0.3-decoder_test_64bit_fix.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
+}