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

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 99 insertions, 11 deletions

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/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
+}