Version bump.

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

3 files changed, 110 insertions, 6 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index 25dbfda122df..244c3d074979 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.8 2009/08/21 17:41:18 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.9 2009/11/26 23:39:03 nelchael Exp $
+
+*protobuf-2.2.0a (26 Nov 2009)
+
+  26 Nov 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  +protobuf-2.2.0a.ebuild:
+  Version bump.
 
 *protobuf-2.2.0 (21 Aug 2009)
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index b5121bdf33ee..ea4d2ccd9f81 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -8,14 +8,16 @@ AUX protobuf-2.2.0-decoder_test_64bit_fix.patch 935 RMD160 71b217978e1ae97e0db49
 AUX protobuf-2.2.0-fix-emacs-byte-compile.patch 653 RMD160 64580c8aeb0d7656096367eabb3debd4e1410d98 SHA1 78e12dbde5e8581748dac5953dd398aa7a1b6d2e SHA256 74f0fd6978eda88cfea02f3ab5b451e5400ba154f0e3443fee20a3f338af2eed
 DIST protobuf-2.1.0.tar.bz2 1286218 RMD160 f209732febc8d4cc321246c5caff2b7502d13073 SHA1 042025cac0b8f76468091bc796d3fd8807a4664f SHA256 55ead035337b248bb63243d2c6deeb42e5e88789109d14b5ae0beda6548928e1
 DIST protobuf-2.2.0.tar.bz2 1350084 RMD160 724482bceb2dfe45927dc1061fb1b7ee79c4527e SHA1 a0aff9df8dc93c5337553d586bbe726808d342a6 SHA256 731dfb6b19e0bbc4e20fcc4d2cc317d8acb4203bc611e4247684bae8403c724b
+DIST protobuf-2.2.0a.tar.bz2 1350849 RMD160 b029fb9336c3f7e457c1c148c613e202ce252ee1 SHA1 755cd8e381478bfed8158d9cb52e4a5a2618767b SHA256 7ed69101bab0607f9fdb59ae93d0603c3c8748b2a5c91051af07c13260fb0026
 EBUILD protobuf-2.1.0.ebuild 2343 RMD160 9e4315fa1f72ac413cb35e74c93497a7b8ed6d88 SHA1 a1d299408f32cba3652b4118b7c5cb03b77a2ecc SHA256 0cc39313c78b45fb67c54970b22442ed69302ce2f93f993dabbf7fcc74c6c1b0
 EBUILD protobuf-2.2.0.ebuild 2329 RMD160 c322630ed98a420b6d18d2a17e286335a4d5f269 SHA1 166908590b3c05055e9e60528fde99e5df00de17 SHA256 b3e0ee90e017339ff322e62325d25359127263d36195df8d8014a79900122980
-MISC ChangeLog 1850 RMD160 919d289eec69151bf2c9226e39e608aeb8c35152 SHA1 3e18902af6b5b3f6630b45b886778a6581a298a6 SHA256 4e92ec07be2cf96f8823a0c5d8709b0b45477cc39c422e4443ced8292eb7764e
+EBUILD protobuf-2.2.0a.ebuild 2330 RMD160 0c3f84c0ed31b13a1862da9db8a08d4fa8b757f4 SHA1 7e3d725bbd7b79f043581a9d0a076bae8631fcd2 SHA256 cdcdb7d7deb22fa6706814d5ccaa95298726a536263ddbbd92f60b007430e34f
+MISC ChangeLog 1979 RMD160 80f2777eaef1b1894c1e3f99b6b511eab98fb910 SHA1 4769a0716ee432ab12c615d04cbf022e7588737e SHA256 dbcb72f4ca2ebd4246b9ea74324c8c2b3b3a3ed33a37b672cb1a4bd0e7202660
 MISC metadata.xml 356 RMD160 b6b528df5c353d5d918c22800774c0162af8d968 SHA1 8ab96b25050ac855282587b12969b795b3e96544 SHA256 854e6241f233981ad8d1b7dce927e72f5e483b88f1210759b3c5f3054a31e89a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkqO3EQACgkQgo/w9rxVVVGnFgCgwU2EP3+xOPwCSewOzy+olE+U
-xwkAoJ/eVCDD8pNEOqqUj6TWOvLCJgJv
-=k1hx
+iEYEARECAAYFAksPEZ0ACgkQgo/w9rxVVVH0DwCgwS14WuMldvsP+FeGycrAqeJI
+PqAAoKPHlVQkJJdSJSzxONt2vsedwSfW
+=XLQQ
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/protobuf-2.2.0a.ebuild b/dev-libs/protobuf/protobuf-2.2.0a.ebuild
new file mode 100644
index 000000000000..25e625290f1e
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-2.2.0a.ebuild
@@ -0,0 +1,96 @@
+# 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.2.0a.ebuild,v 1.1 2009/11/26 23:39:03 nelchael Exp $
+
+EAPI="2"
+
+JAVA_PKG_IUSE="source"
+
+inherit eutils distutils python java-pkg-opt-2 elisp-common
+
+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/${PF}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs examples java python vim-syntax"
+
+DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 )
+	python? ( dev-python/setuptools )
+	emacs? ( virtual/emacs )"
+RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.5 )
+	emacs? ( virtual/emacs )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-decoder_test_64bit_fix.patch"
+	epatch "${FILESDIR}/${P}-fix-emacs-byte-compile.patch"
+}
+
+src_compile() {
+	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
+		pushd java/src/main/java
+		ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
+		popd
+		jar cf "${PN}.jar" -C java/build . || die "jar failed"
+	fi
+
+	if use emacs; then
+		elisp-compile "${S}/editors/protobuf-mode.el" || die "elisp-compile 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 emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	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
+		use source && java-pkg_dosrc java/src/main/java/*
+	fi
+}
+
+src_test() {
+	emake check
+
+	if use python; then
+		 cd python; ${python} setup.py test || die "python test failed"
+		 cd ..
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}