Version bump.

Package-Manager: portage-2.1.6_rc3/cvs/Linux 2.6.27 x86_64

4 files changed, 109 insertions, 5 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index fe67603d2408..77bfb577a5e1 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.3 2008/10/30 14:22:14 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.4 2008/12/06 22:31:17 spock Exp $
+
+*protobuf-2.0.3 (06 Dec 2008)
+
+  06 Dec 2008; Michał Januszewski <spock@gentoo.org>
+  +files/protobuf-2.0.3-decoder_test_64bit_fix.patch,
+  +protobuf-2.0.3.ebuild:
+  Version bump.
 
   30 Oct 2008; Michał Januszewski <spock@gentoo.org> protobuf-2.0.1.ebuild:
   Install the vim syntax file into vimfiles/syntax instead of vimfiles.
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 54bd8f977f79..3d5665b690e0 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -2,16 +2,19 @@
 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
 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
-MISC ChangeLog 698 RMD160 818ae140948773624709595c7235f3fe8d12d2d6 SHA1 b6b07264a6dc937e1618123e66aa99d1a4772e29 SHA256 c223fadae9f84970e4e57beb8f84c2f9c92daece81fe816370be976594eadbda
+EBUILD protobuf-2.0.3.ebuild 1812 RMD160 07860df821aa2f4c24174f06ee74e6977cd7c1b8 SHA1 25ef4e73c328f56b816d6eb62fe239d32a8ca10a SHA256 8987cdcc95802e4cf970950b49844274ba375da2f023e5a2a8f60134fab246d0
+MISC ChangeLog 880 RMD160 ea2a158bb191e30dffb83a24cdd1859673060237 SHA1 56ae7f19ed14006994ee9e152b6ff28227009ea8 SHA256 b30546cb00f26e11c5abe58fb5d8efe2f39bfb5a6785be5c80041e0ea8f4de7a
 MISC metadata.xml 260 RMD160 7c8f2391a156380ab813494ac3d3db92386fc03b SHA1 631f6ea758b913f6dabd59b83bc8a5f053274f50 SHA256 4e471cd253b0e2e3c1900f0dd3383623080ca9ad9b6e116dd88bac46224681ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkJwyAACgkQchej4aZK9/f5cACeP2jbI+kHPudzFrRQ5quRK1bS
-85IAn3DzkOJPbkYCwqdta8H155t1DC6Q
-=9g1Y
+iEYEARECAAYFAkk6/ToACgkQchej4aZK9/c+bgCfbnyLArDhfL65LRdpAMk/vrKm
+yWoAn2hUwGZ2aQy74d3wKmtb4BpEEGgw
+=8Iot
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/files/protobuf-2.0.3-decoder_test_64bit_fix.patch b/dev-libs/protobuf/files/protobuf-2.0.3-decoder_test_64bit_fix.patch
new file mode 100644
index 000000000000..5a88a119e538
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-2.0.3-decoder_test_64bit_fix.patch
@@ -0,0 +1,17 @@
+diff -Naurp protobuf-2.0.3-orig/python/google/protobuf/internal/decoder_test.py protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py
+--- protobuf-2.0.3-orig/python/google/protobuf/internal/decoder_test.py	2008-12-05 19:07:15.000000000 +0100
++++ protobuf-2.0.3/python/google/protobuf/internal/decoder_test.py	2008-12-06 22:11:48.000000000 +0100
+@@ -106,6 +106,13 @@ class DecoderTest(unittest.TestCase):
+     self.mox.ReplayAll()
+     result = decoder_method(d)
+     self.assertEqual(expected_result, result)
++    # HACK: Convert all ints to longs so that different behavior
++    # between 32-bit and 64-bit systems does not impact the result
++    # of the test.
++    if isinstance(result, int):
++      result = long(result)
++    if isinstance(expected_result, int):
++      expected_result = long(expected_result)
+     self.assert_(isinstance(result, type(expected_result)))
+     self.mox.VerifyAll()
+     self.mox.ResetAll()
diff --git a/dev-libs/protobuf/protobuf-2.0.3.ebuild b/dev-libs/protobuf/protobuf-2.0.3.ebuild
new file mode 100644
index 000000000000..6c9622eaf8ac
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-2.0.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 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 $
+
+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 )"
+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
+}