Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

3 files changed, 142 insertions, 5 deletions

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index faf59e55f09b..5255467badf5 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/protobuf
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.67 2014/10/10 20:17:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.68 2014/10/31 00:43:41 radhermit Exp $
+
+*protobuf-2.6.1 (31 Oct 2014)
+
+  31 Oct 2014; Tim Harder <radhermit@gentoo.org> +protobuf-2.6.1.ebuild:
+  Version bump.
 
   10 Oct 2014; Markus Meier <maekke@gentoo.org> protobuf-2.6.0.ebuild:
   add ~arm, bug #524082
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index be1e549d4fbb..fe3361b8e7ce 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -9,17 +9,23 @@ DIST protobuf-2.4.0a.tar.bz2 1508837 SHA256 cef863023fb051b0f7e8f47b53fe57f7277a
 DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e
 DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
 DIST protobuf-2.6.0.tar.bz2 2021255 SHA256 0a2f8533b2e0587a2b4efce0c4c8aea21bbfae1c41c466634d958dedf580f6aa SHA512 a59a6d28d1653335fee42eff074f54b317d79d50361ed27d16502012ebb68bf7932ff80be4ce1588829940d6fdf77d113536ee3b27b72959577527ca488eddab WHIRLPOOL 6897269aa6f0952ce19b42a0fa086de885ffae61d19c0edf5dbe69ac952426462cb826b451e607150ee066ec7866c870aff6cb3424837d1914ee0d762f304a37
+DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174 WHIRLPOOL b8d7f5e6b85670520435fd1107eb67035c822c2dad9689dadc29754de3bf8076ac256cf3fe3e719e99c0ccb03ed78edecb91afbe96b611073b60ae3fb3f29b1a
 EBUILD protobuf-2.4.0a.ebuild 2985 SHA256 d8a843e40cfa37f4f45b524d661e482b45bab9f59983b297e8960907981312b0 SHA512 65d6688963cc0e7ba6fafcd69be0917993d8213e23760ad2d4659dce555c2639bd7ffc4571c699eea4d4b192c24f0371cc37c94ac05f29f151b5dec82c491dc3 WHIRLPOOL 32335b6e04f6ac2fd6264d548106b1ccad2959911ac43391bcd1a6663aa595a9f46bdd2decf599bc4d085636c3ec8e30501f3908cdaae9b41dc59020014ad6c8
 EBUILD protobuf-2.4.1.ebuild 3035 SHA256 5c8690b49a5b80b8a4adf028a0d45f0f4ddfdae05e9ba8245f48814d50fc1185 SHA512 1e71dc30d60cab213cfd06c03dc01206ff29740cb852ec8ef87eeffc550af2df2fd4bd396ed900fd0125ce08c469820ab45967cbf46a6514f7e447a1e1bdfa29 WHIRLPOOL a66587c3c187601ac9398a53be03055e0d013d3f16a6fdb4f62e007aa8c469bed9015c480f69734915751df2930a2d589f0bac599cbebed895d1bd1fceb616c0
 EBUILD protobuf-2.5.0-r1.ebuild 2965 SHA256 0694775ff6330f68c59dc63ab8ea25b5080488592306820b01337c4126265947 SHA512 a278ec9e0bca197f914a566b583c4f6b220436b5be191a56d1f99b8cef47106c7803e143b976898326120af27b08ed67767f63443f3af5433c5b7bdbab37c261 WHIRLPOOL ed63246125976d4970bc78d68d67a293815cb664c362239c9fbbf160d64572d15dd660339f55079439565a4234c64d78b4f94ab01d8c9f513ab4d567e6d54b90
 EBUILD protobuf-2.5.0.ebuild 2895 SHA256 7b68cf03751b6e799fc721746133e7fa4327834ccebde5356b238824caca5198 SHA512 452a3c2dde8463891b831c2b1edb776272795705131c803557d825363107e62f91874c688ebc080aab99452ba81ad7a4df5bb11a00677a7fbe7c258bc5908c05 WHIRLPOOL c15f67f8e3cfca30cc0f99aa9712deb5821ee71914051bdd84c4cd1c09fa31e587b9039256403534907599994e3f590f580ea0aabcba08f04336a72dadd66e28
 EBUILD protobuf-2.6.0.ebuild 2997 SHA256 8e7a679c4b2f353305c79cbe42eb59bb39138b2e6fdee6e03c8861cacbd9ea42 SHA512 00eaa39d421ce1c1a0f785d152f176714b585d24a7eea8f0248d37a58828b78927f3d6d34b6d15614b654afa8f74a30a07fb53bbdfdaaa4c3e9e8b4defadac1e WHIRLPOOL ef38db8a47623bf58cd353566307dcc602562caedb69f5c41680ba0070dc2b87d1534ae3ff6138d9206bd3f46f0e9f7e8d06f09e079d21953393eb16e420fde9
-MISC ChangeLog 9485 SHA256 e6872fa6199cdf4b17269cded31d97cb0ed18613a894120859f1bfab07e0795f SHA512 634b86cbb83b270ee227d7df43da4f2f9ae5161a98cd93b6eea0d2c28d72e4fe423325225231c682454eb6116209d6b7c4b916377511e7f0196d33ef435464a3 WHIRLPOOL ac39ccb911466e8e516eb65a9e11188d109fec1979abc56f807e1df9a5fd94ec7ab80b64a2d1adb1736558d9c575e7dd387a2d373219b3a45cceaa63167f6dcf
+EBUILD protobuf-2.6.1.ebuild 3016 SHA256 4eeb189f80d262542237155d9bd6f82954159a4bb115e4afed0c7e580ccb80e8 SHA512 b98cf5ebd67b82e565cd81f41fbfbf2bce05375e00999f494b7d8f518001476ee42c7eccf21ce2d0bd5f01cb7db611779eb77207cee2e921c03250561a3ef3eb WHIRLPOOL 45a1a31272750d1071030d240a37150c3bad9a9c4bee0fca7719bd9e583b7a9df98356e53f0034232e454161fb925d8f7d119380fde133588a1016f43be0d8b5
+MISC ChangeLog 9609 SHA256 110538a482b4300e19868198b4679f442cd51a0557d54cb3bc6bc172e1554a57 SHA512 db9bc96c1116cd3455ebc3b0eb4c9bc69bac5dc42c30919924439062eaabe9af7dbe77e7d19e3da7f44ef1d711ac424227827c6a77556d623610c0224e8c1d71 WHIRLPOOL 4fa8251107654c4ea0efbc4d76152b93261f794f7bd05796f5d96e915ffc92b19e7dd3cfc99413d2630957b90e83ee9bdea2c839b30000b331111b4edd904d30
 MISC metadata.xml 310 SHA256 ded221b688b4ab4cd456b3036ee01a31add94142274b764939cc61e80ffebeb3 SHA512 eceedb3555bfc87b1b18c092aac4b79e53d5ea6eaa250e203e51e362bf63db29ed0c23725a276343cd78af56ae2ecbacab96c9ad1d0221b17d0560b85e5c1eda WHIRLPOOL a04e0304a373392f179b8a782719adf2d812cbd170c8eee33dc1ad178b8b09497b57a555fcb4288d104713e586346817166b6f8940661946cd71f928c52706ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ4PtcACgkQkKaRLQcq0GLUKgCgrBusLZ2O5AF6GdwUxNCLOQl1
-GPMAnRnVuWKc5kdod2PBu9LV6VaCjt7u
-=ZnK2
+iQEcBAEBCAAGBQJUUttAAAoJEEqz6FtPBkyjsZQIALoXAp1PFv8g8rWWrwbBSpnW
+S2vLuK9QOnsqEkib52krWDz+nuXelFal1sD5k73P5tc042dycP8PvPXOIS5f5YS9
+XRpXgqJEJ70AI2n+fTuX7oAVV0pwrSu5EXh8NXSn5qneMro4WTzEIShbVwU4SrOB
+4k1v04e9ZzFT/yxVPUWu4fkd8igAOCXO14Iiru7PBz6DKaKVploEftoioYVj5U0E
+XrEz5Am8grAZlEtBbWykWCF47DXmAbg2SekhrJcD8gF2Bm2Is49XC0LcPs70vtwQ
+eg19vynrx+aMMDFjK5oR/i5t2rxwuxtz+fFdrlFC9hvcMKImmqkFk4syQd0aK8Q=
+=ETVm
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/protobuf/protobuf-2.6.1.ebuild b/dev-libs/protobuf/protobuf-2.6.1.ebuild
new file mode 100644
index 000000000000..1912d5d390f5
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-2.6.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1.ebuild,v 1.1 2014/10/31 00:43:41 radhermit Exp $
+
+EAPI=5
+JAVA_PKG_IUSE="source"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools eutils flag-o-matic distutils-r1 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/ https://github.com/google/protobuf/"
+SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0/9" # subslot = soname major version
+KEYWORDS="~amd64 ~arm -hppa ~mips -ppc -ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="emacs examples java python static-libs vim-syntax"
+
+CDEPEND="emacs? ( virtual/emacs )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${CDEPEND}
+	java? ( >=virtual/jdk-1.5 )
+	python? (
+		dev-python/google-apputils[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.5 )"
+
+src_prepare() {
+	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		# breaks Darwin, bug #472514
+		epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
+		eautoreconf
+	fi
+
+	if use python; then
+		cd python && distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		einfo "Compiling Python library ..."
+		pushd python >/dev/null
+		distutils-r1_src_compile
+		popd >/dev/null
+	fi
+
+	if use java; then
+		einfo "Compiling Java library ..."
+		src/protoc --java_out=java/src/main/java --proto_path=src src/google/protobuf/descriptor.proto
+		mkdir java/build
+		pushd java/src/main/java >/dev/null
+		ejavac -d ../../../build $(find . -name '*.java') || die "java compilation failed"
+		popd >/dev/null
+		jar cf ${PN}.jar -C java/build . || die "jar failed"
+	fi
+
+	if use emacs; then
+		elisp-compile "${S}"/editors/protobuf-mode.el
+	fi
+}
+
+src_test() {
+	emake check
+
+	if use python; then
+		pushd python >/dev/null
+		distutils-r1_src_test
+		popd >/dev/null
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc CHANGES.txt CONTRIBUTORS.txt README.md
+	prune_libtool_files
+
+	if use python; then
+		pushd python >/dev/null
+		distutils-r1_src_install
+		popd >/dev/null
+	fi
+
+	if use java; then
+		java-pkg_dojar ${PN}.jar
+		use source && java-pkg_dosrc java/src/main/java/*
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins editors/proto.vim
+		insinto /usr/share/vim/vimfiles/ftdetect/
+		doins "${FILESDIR}"/proto.vim
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}"/70${PN}-gentoo.el
+	fi
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}