Add multilib support.

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

diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog
index 816486a35e3a03419e2fa904f3c5ec6b51c26413..5c6b6cce9c6a28f94b7cdac0d770f6c3ecbd4b7c 100644 (file)
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,13 @@
 # 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.70 2014/11/21 14:04:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.71 2014/11/27 18:05:23 radhermit Exp $
+
+*protobuf-2.6.1-r1 (27 Nov 2014)
+*protobuf-2.5.0-r2 (27 Nov 2014)
+
+  27 Nov 2014; Tim Harder <radhermit@gentoo.org> +protobuf-2.5.0-r2.ebuild,
+  +protobuf-2.6.1-r1.ebuild:
+  Add multilib support.
 
   21 Nov 2014; Agostino Sarubbo <ago@gentoo.org> protobuf-2.5.0-r1.ebuild:
   Stable for amd64, wrt bug #529858

diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 80c7a955dd664e3be1a396046c95c2e240fa0a1f..1f05d4505a82497cfb4d4f362eeb65df88963f9a 100644 (file)
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -13,25 +13,21 @@ DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 ee445612d544d885ae240ffbcbf9267faa9f5
 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 2956 SHA256 087046d13743fd78123b7b1eccb538992e18ffc85e32598fa167259686da012c SHA512 a8de19e004a898d89e9691ade39f7a4ea08f72da7a9a89a5afda3ba990885f9918c9c461ad0b6acb264295d960bf9b59d891b97a3445db9efb2826577b8f89f0 WHIRLPOOL f6be150631d6355d88cdd3d232265dbba2518786c317d01312d3b2ce0fc83ddd38b4a9f24f16a49090d0348580ff710177fd4a6b726d22c62e52adab8300ec07
+EBUILD protobuf-2.5.0-r2.ebuild 3010 SHA256 ade8047efa43edaaea0902007fa4860e744a4b622a1baa115a67bd89a42f6c7f SHA512 a7e4e6c0e376c6f96797768469d29649eb1f597953c4cd2b5396b3055d587ccb9f817e6e85f731352fa2fff915b3bb16c269e12cab6df73840138248b710df20 WHIRLPOOL 1cd700015f50534491e1701af9b95d38b5cdfc3d8098615d2a83087b6734d1dce35a7f14f09f5fd962fb95a0848cea3491130c5f8ab0eddf3928bc198b7e3915
 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
+EBUILD protobuf-2.6.1-r1.ebuild 3064 SHA256 e9bc1f838e04b76829d6d8f30a0eed4c833c09866930085082fc14dc388be88f SHA512 f960be2f7a86b0cb425c68505476bfa4614f3d36380e685bf4d64be1190bd262ccb42238cd99ebe7edd038050a7ed57bdc26c41825a17ef8703acea2360fe0e5 WHIRLPOOL 4cf6ebacadf4040f8fcf2f389772496bad63c902de2df119f760caae9b34c02f731f58f4b562bbc2be814a32409be04256d773fbcc8798f54f0b64647290feb2
 EBUILD protobuf-2.6.1.ebuild 3016 SHA256 4eeb189f80d262542237155d9bd6f82954159a4bb115e4afed0c7e580ccb80e8 SHA512 b98cf5ebd67b82e565cd81f41fbfbf2bce05375e00999f494b7d8f518001476ee42c7eccf21ce2d0bd5f01cb7db611779eb77207cee2e921c03250561a3ef3eb WHIRLPOOL 45a1a31272750d1071030d240a37150c3bad9a9c4bee0fca7719bd9e583b7a9df98356e53f0034232e454161fb925d8f7d119380fde133588a1016f43be0d8b5
-MISC ChangeLog 9825 SHA256 5bf0d218985c66e339cfb593efcd14486041a814d106f75f5334b7e563ce257f SHA512 563d9864b16cda8b0c0c645e92000aa99a454723c8d146a20ed31170c4dbdd242faa62f9333c83ea1f21ee9010c1e594142285ca55aa7b6cce411ab6b0da9b33 WHIRLPOOL 850747429637705f72a58015c67f513ac451882296e1765ba5296317ab73ac90967f450ca9ef94b920fcf2cb1c2b6b3a227526b3ded922b25396405401495b5d
+MISC ChangeLog 10028 SHA256 7f619da05c19f89b12de9cdca0bf09ba71b986b42b60f00e4d1d0d60505eff2f SHA512 5e3533dd09b609d2868a06ccaa34a6f6f73cee9e0ac3b5b94be144e4ee53c6e65712914c623f8d5771a6d8d4e2bd92ac24e79bf4794b84ee743fdba1691fc6e6 WHIRLPOOL 705311b255f2e9d85c744976f18d1d9b2d98f30db387970b3b8302a2cc7f7520dba60ac099c69e7a76d091eaba6c325b6a3d556fb2106a9ac2f80adc259e6010
 MISC metadata.xml 310 SHA256 ded221b688b4ab4cd456b3036ee01a31add94142274b764939cc61e80ffebeb3 SHA512 eceedb3555bfc87b1b18c092aac4b79e53d5ea6eaa250e203e51e362bf63db29ed0c23725a276343cd78af56ae2ecbacab96c9ad1d0221b17d0560b85e5c1eda WHIRLPOOL a04e0304a373392f179b8a782719adf2d812cbd170c8eee33dc1ad178b8b09497b57a555fcb4288d104713e586346817166b6f8940661946cd71f928c52706ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUb0ZuAAoJELp701BxlEWfFJUQAL5tr024yvi0FcTNYnTTokVG
-nf73TP1SKXvVhps8oaAKhWrFIhTDqqu4mwWs4jwwKMpJHxLD9StUz+xr/DMpPVtI
-zYwB8Z2r0p2z2Kb4dW6HU/zrIUO1vDIW9ph5Zxvq9hAI0mnuqwVERjxmKxD008ci
-SE6m7waQcKBuqF/gG+W1Oi5uDNKU9959Q+LonMVULV1egCy9ebwiQXTA5PO4z+aO
-30VCP9doAWqdCAElNn28+raU6cx+WecTBco/M4kzZJ6ty0RhNvGTxFqaxjVqsvay
-YbTWhFk2rpog72h0nndzm4wAwbp2ObNKpP4vs4j1Tr4TquOdB7lIhEfCas0DUsie
-N/jkAkoQkkFdaLmGWfvrSqXmUDon4WSIqs+T4mXlGUpUOr71g4nVz/bZZLYOIr2i
-/d9ThT5HTriHII3t0wAx0gn+C0wyif6AoPngQExZyld3iCNanBB/6cPISH+NOIH/
-1SS67At0Ty/KwBzuFE0S4WHGcvU/hbMiXEn5GZhbHrlJu+zBEA3OJe7XthX0h8Yq
-O55MxigTyLQX70WFgGhryOIwry6A5WknA6yPV/GfNlFcYd61MsZ1e/hyr8xAtjDJ
-Q7P4KBcIPGzUs3pqK4Yge/BZwXAdEeV9DnOHRke5ZStFuk7bTCusM+3ubWoN6vhI
-9eE7QQFLDk1tf3hHnT32
-=rI+g
+iQEcBAEBCAAGBQJUd2fsAAoJEEqz6FtPBkyjvrwH/2lCVER4XO1MWUhfY8kgb33M
++groRfpRcg5atjWj2uZ3pY50kZmqKGtaYskeyEgfPoPv9nXkkPjD8Dy7tgovM0eR
+zylW5ReOVqx5br5foAJtBPLi7CNnr5gOsCeaplNzOekygM1ufrbR6FGQbh/lPG1E
+l0TjZb2oVmmNHYkRuoW1VnliCwo2VI5ngYpLFUHAkzYK3ET8ErAboHI5NFzuGZoI
+rYNZJqe7eoB6eBqsajhpG4zzYuOPgB2pWha5uhLZp8OVnIzBLfucq7sdI//Pjvt/
+XxG7UZB8/tYljR8WnygTxJLWkTKdcrQpl/Ppk66rmxfEnA6pxP9ejgBA/N+otLY=
+=mKjM
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
new file mode 100644 (file)
index 0000000..e91770a
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
@@ -0,0 +1,120 @@
+# 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.5.0-r2.ebuild,v 1.1 2014/11/27 18:05:23 radhermit Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+JAVA_PKG_IUSE="source"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools-multilib 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/"
+SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0/8" # subslot = soname major version
+KEYWORDS="~amd64 ~arm -hppa ~ia64 ~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/setuptools[${PYTHON_USEDEP}] )"
+RDEPEND="${CDEPEND}
+       java? ( >=virtual/jre-1.5 )"
+
+src_prepare() {
+       local PATCHES=( "${FILESDIR}"/${P}-x32.patch )
+
+       # breaks Darwin, bug #472514
+       [[ ${CHOST} != *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )
+
+       append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+       if use python; then
+               cd python && distutils-r1_src_prepare
+       fi
+
+       autotools-multilib_src_prepare
+}
+
+src_compile() {
+       autotools-multilib_src_compile
+
+       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() {
+       autotools-multilib_src_test check
+
+       if use python; then
+               pushd python >/dev/null
+               distutils-r1_src_test
+               popd >/dev/null
+       fi
+}
+
+src_install() {
+       local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.txt )
+       autotools-multilib_src_install
+
+       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
+}

diff --git a/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
new file mode 100644 (file)
index 0000000..596ab27
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
@@ -0,0 +1,121 @@
+# 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-r1.ebuild,v 1.1 2014/11/27 18:05:23 radhermit Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+JAVA_PKG_IUSE="source"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools-multilib 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() {
+       # breaks Darwin, bug #472514
+       [[ ${CHOST} != *-darwin* ]] && local PATCHES=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )
+
+       append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+       if use python; then
+               cd python && distutils-r1_src_prepare
+       fi
+
+       autotools-multilib_src_prepare
+}
+
+src_compile() {
+       autotools-multilib_src_compile
+
+       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() {
+       autotools-multilib_src_test check
+
+       if use python; then
+               pushd python >/dev/null
+               distutils-r1_src_test
+               popd >/dev/null
+       fi
+}
+
+src_install() {
+       local DOCS=( CHANGES.txt CONTRIBUTORS.txt README.md )
+       autotools-multilib_src_install
+
+       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
+}