diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/ChangeLog b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/ChangeLog index edb4891967..edfe94844d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/ChangeLog @@ -1,6 +1,186 @@ # ChangeLog for dev-libs/protobuf -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.40 2012/12/16 20:35:34 radhermit Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.89 2015/05/17 20:18:20 pacho Exp $ + + 17 May 2015; Pacho Ramos protobuf-2.6.1-r3.ebuild: + ppc64 stable wrt bug #528240 + + 15 May 2015; Pacho Ramos protobuf-2.6.1-r3.ebuild: + ppc stable wrt bug #528240 + + 15 May 2015; Pacho Ramos protobuf-2.5.0-r2.ebuild, + protobuf-2.6.1-r3.ebuild: + ppc* love + + 14 May 2015; Michael Sterrett + -protobuf-2.5.0-r3.ebuild: + old + + 04 May 2015; Tim Harder metadata.xml: + Remove myself as maintainer and update upstream metadata. + + 04 May 2015; Tim Harder -protobuf-2.4.0a.ebuild, + -protobuf-2.5.0.ebuild, -protobuf-2.5.0-r1.ebuild, -protobuf-2.6.0.ebuild, + -protobuf-2.6.1.ebuild, -protobuf-2.6.1-r1.ebuild, -protobuf-2.6.1-r2.ebuild: + Remove old. + + 25 Apr 2015; Jeroen Roovers protobuf-2.6.1-r3.ebuild: + Marked ~ppc64 too. + + 08 Apr 2015; Michał Górny protobuf-2.5.0-r1.ebuild, + protobuf-2.5.0.ebuild: + Drop old Python implementations + +*protobuf-2.6.1-r3 (10 Mar 2015) + + 10 Mar 2015; Mike Frysinger + +files/protobuf-2.6.1-protoc-cmdline.patch, +protobuf-2.6.1-r3.ebuild: + Add protoc patch from Chromium OS & sent upstream. + + 10 Mar 2015; Mike Frysinger protobuf-2.6.1-r2.ebuild: + Add arm64/sh love. Add cross-compile support #432106 by Dennis Schridde. + + 10 Mar 2015; Mike Frysinger protobuf-2.6.1-r2.ebuild: + Add ~ia64 #524084 by Paweł Hajdan, Jr.. + +*protobuf-2.6.1-r2 (26 Feb 2015) +*protobuf-2.5.0-r3 (26 Feb 2015) + + 26 Feb 2015; Tim Harder +protobuf-2.5.0-r3.ebuild, + +protobuf-2.6.1-r2.ebuild: + Add zlib use flag (bug #541396). + + 26 Jan 2015; Agostino Sarubbo protobuf-2.5.0-r2.ebuild: + Stable for x86, wrt bug #536794 + + 22 Jan 2015; Markus Meier protobuf-2.5.0-r2.ebuild: + arm stable, bug #536794 + + 22 Jan 2015; Agostino Sarubbo protobuf-2.5.0-r2.ebuild: + Stable for amd64, wrt bug #536794 + + 28 Nov 2014; Tim Harder protobuf-2.5.0-r2.ebuild, + protobuf-2.6.1-r1.ebuild, +files/protobuf-2.5.0-emacs-24.4.patch: + Fix build with emacs-24.4 (bug #524100, patch by ulm). + + 27 Nov 2014; Tim Harder protobuf-2.5.0-r2.ebuild, + protobuf-2.6.1-r1.ebuild: + Fix python/java builds (bug #530922) and doc installs. + + 27 Nov 2014; Tim Harder protobuf-2.5.0-r2.ebuild, + protobuf-2.6.1-r1.ebuild: + Apply patches manually so they don't get applied twice. + +*protobuf-2.6.1-r1 (27 Nov 2014) +*protobuf-2.5.0-r2 (27 Nov 2014) + + 27 Nov 2014; Tim Harder +protobuf-2.5.0-r2.ebuild, + +protobuf-2.6.1-r1.ebuild: + Add multilib support. + + 21 Nov 2014; Agostino Sarubbo protobuf-2.5.0-r1.ebuild: + Stable for amd64, wrt bug #529858 + + 21 Nov 2014; Agostino Sarubbo protobuf-2.5.0-r1.ebuild: + Stable for x86, wrt bug #529858 + +*protobuf-2.6.1 (31 Oct 2014) + + 31 Oct 2014; Tim Harder +protobuf-2.6.1.ebuild: + Version bump. + + 10 Oct 2014; Markus Meier protobuf-2.6.0.ebuild: + add ~arm, bug #524082 + + 07 Oct 2014; Tim Harder protobuf-2.6.0.ebuild: + Add github homepage. + + 30 Sep 2014; Tim Harder protobuf-2.6.0.ebuild: + Drop python2_6 support and remove old dateutil comment. + + 30 Sep 2014; Tim Harder protobuf-2.6.0.ebuild: + Remove unused python-dateutil and python-gflags deps as pointed out by + Arfrever. + +*protobuf-2.6.0 (30 Sep 2014) + + 30 Sep 2014; Pawel Hajdan jr +protobuf-2.6.0.ebuild: + Version bump, bug #521406 . Drop keywords because of new python deps; arm + (bug #524082), ia64 (bug #524084). + +*protobuf-2.5.0-r1 (26 Sep 2014) + + 26 Sep 2014; Pawel Hajdan jr + +protobuf-2.5.0-r1.ebuild: + Disable RTTI, bug #521882 . + + 14 Aug 2014; Jeroen Roovers protobuf-2.4.0a.ebuild, + protobuf-2.4.1.ebuild, protobuf-2.5.0.ebuild: + Marked -hppa (bug #519772). + + 06 Mar 2014; Agostino Sarubbo protobuf-2.5.0.ebuild: + Revert wrong commit wrt bug #503046 + + 30 Jan 2014; Markus Meier protobuf-2.5.0.ebuild: + arm stable, bug #496842 + + 20 Jan 2014; Agostino Sarubbo protobuf-2.5.0.ebuild: + Stable for ppc, wrt bug #496842 + + 19 Jan 2014; Agostino Sarubbo protobuf-2.5.0.ebuild: + Stable for ppc64, wrt bug #496842 + + 16 Jan 2014; Agostino Sarubbo protobuf-2.5.0.ebuild: + Stable for x86, wrt bug #496842 + + 16 Jan 2014; Agostino Sarubbo protobuf-2.5.0.ebuild: + Stable for amd64, wrt bug #496842 + + 30 Nov 2013; Mike Frysinger + +files/protobuf-2.5.0-x32.patch, protobuf-2.5.0.ebuild: + Fix builds on x32. + + 06 Sep 2013; Tim Harder protobuf-2.5.0.ebuild: + Add missing setuptools dep for python support (bug #479678 by hasufell). + + 05 Sep 2013; Michał Górny protobuf-2.5.0.ebuild: + Clean up PYTHON_COMPAT from old implementations. + + 23 Jul 2013; Agostino Sarubbo protobuf-2.4.1.ebuild: + Stable for arm, wrt bug #477170 + + 04 Jul 2013; Agostino Sarubbo protobuf-2.4.1.ebuild: + Stable for x86, wrt bug #474922 + + 29 Jun 2013; Tim Harder protobuf-2.5.0.ebuild: + Make python deps optional (bug #475242 by Diego Elio Pettenò). + + 29 Jun 2013; Agostino Sarubbo protobuf-2.4.1.ebuild: + Stable for ppc64, wrt bug #474922 + + 29 Jun 2013; Agostino Sarubbo protobuf-2.4.1.ebuild: + Stable for ppc, wrt bug #474922 + + 28 Jun 2013; Agostino Sarubbo protobuf-2.4.1.ebuild: + Stable for amd64, wrt bug #474922 + + 15 Jun 2013; Fabian Groffen protobuf-2.5.0.ebuild: + Fix compilation on Darwin, bug #472514 + + 02 Apr 2013; Tim Harder protobuf-2.4.0a.ebuild, + protobuf-2.4.1.ebuild: + Run java-pkg-opt-2_pkg_setup when the java use flag is enabled. + + 05 Mar 2013; Tim Harder files/proto.vim: + Simplify vim ftdetect file (bug #459304 by Laurent Bachelier). + +*protobuf-2.5.0 (05 Mar 2013) + + 05 Mar 2013; Tim Harder +protobuf-2.5.0.ebuild: + Version bump. Migrate to distutils-r1 and add subslot. + + 19 Feb 2013; Zac Medico protobuf-2.4.1.ebuild: + Add ~arm-linux keyword. 16 Dec 2012; Tim Harder metadata.xml: Add myself as maintainer. diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/Manifest index b0651f900e..e62cdf6ecc 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/Manifest @@ -2,22 +2,23 @@ Hash: SHA256 AUX 70protobuf-gentoo.el 170 SHA256 b6e5c2f11a63f9eb4a9382227ce8f41bfcf23213166d2fb212e21e237b2f264d SHA512 ed73cd6b1bf6c0019e4da73c3a480b0f917e949dfad2696336e805263c81610b2a8a0514840e389db0f0e78252cf053d754c5e07731dc5e9c93c9e88f0b2923c WHIRLPOOL aeffdec54d947cc219058a1efbe54898b2917947f07cd2249064593542b51e3c772a584106365d57dd9ea7fdf078bea388f6ff73ff857cabefa04aabda07495d -AUX proto.vim 79 SHA256 64d5a506e8f527f97f7c737a7135c64c5361b4d195674541656c24fbd88166aa SHA512 c59c2429ea5696c49e706bbc144cd7ab5f5f47e6d83e8b8a19e4fbbaf8c8501cc913b1e6af69d845ffd885fec5f13df37c8ea3ff3e8037b6c6fe754dd44e4e3e WHIRLPOOL 56d97b0442bc69a6a84a95ead53d79ee9271a43f12001002159b1330414512263c226fa20e028021d4a90fbae33e769b7a172911ddd790e22fbf8dc84df69d72 +AUX proto.vim 49 SHA256 17e7773363e3f5469c717e4173a6f6fa959a6bb30c6ee71f3bdeee159ee5b784 SHA512 65c1f49887c17973d1dfce07fa86d04c5079d2382826eaeb22e128570717f181c53d22ba50905252021f7e476a90ecd29f9d18799c1ccea64b01f4638323538e WHIRLPOOL 79c1fb6392c0a04fc6a4aec40c983b43f2eb2a3bd5cf807d37fa65b15191b6839a2c9cc182f9f05b7f2873e6689559f634d51c7db5f837d683d5411ecd50a43a AUX protobuf-2.3.0-asneeded-2.patch 705 SHA256 558ea98a54e544919837f88d133b8887ad5101b4493a62737d3cea94ae58464c SHA512 2f9d047ac64ac19bab2a793990de5070ac24604bf81622520a1f9b2e86aecbd125c9cba5b62bc7e296ecc3724069dbd9b07f7d7292be280403fc37af5c52cccf WHIRLPOOL 0b943cdda7feac71d394a9e72bdcbe1dfc3d7efb390496244cf511cbd1468b4b11d9f42501a62fe02b2fab7b4bf0867eb5739cb02af8d4777d22fe781ccd841e -DIST protobuf-2.4.0a.tar.bz2 1508837 SHA256 cef863023fb051b0f7e8f47b53fe57f7277a7743d644eae9563fb14db5bd7e4e SHA512 c099f75983a79a4fdc2c3bf44e748074000903fe89e65a74caebe191dbb46da01b3b023b5f4f1fec86f35f15c16d5863cad102ebc0c975f4c4662ab64694d9db WHIRLPOOL 5fe8b4aadefceadfcf42aee54d4133ada2c52a9f4e90e0cbe8ba1a92c887bc12c4e9eec6b2df68ab252dbe9358a85a789804c0d1f5612d62e6c03ebf380c5100 +AUX protobuf-2.5.0-emacs-24.4.patch 408 SHA256 1ca039e40ad6379302aeb1a2eb5391c66cef07a5e8e670fa4bac5bfa5fc4e3fb SHA512 243d468780ab65911d791f09f7584287cc4a4b368f7fb3ce517ef01345f1cf26ea5a4c2b264b857aaf5b0c110ff18a22b96020f0602019eae5bd9ddc8526e93b WHIRLPOOL 57a83062ffde2ebb2641899cc7dad57fda929a51d3c194db188dc3f53548c15ba4564eefcb13435d848a57d1ae5cfca6036e65a2987e3590c34f2e85536e2e77 +AUX protobuf-2.5.0-x32.patch 677 SHA256 8a4378b5b84cf1b91e88344eead7c3e8f3ae848540e7a850bff48994704e8752 SHA512 fa28941ff21785505f616e4da4be964e18de5d52a25224059431054ad7853693ca4281819d690e76eb4064d9d7b729eb1ad10388d43d437b975e62b66f5de1bc WHIRLPOOL 2ae6b2dd9c6d9f63ae2d8caa630e4720d66a30ac3e21bf135f10d4b567a08fecd8757b575a749a95050c6b673b787c09b18f48452cc7d0eaa019b8aa5903d3d4 +AUX protobuf-2.6.1-protoc-cmdline.patch 11184 SHA256 c931fcf5b0484d41465e9bc11598379fcdc85d58a882ea209795e5858b5fb4b4 SHA512 17855acd577412866e6e0a515e4dd754ae5aa9e75a9fdd44bb80f4061b28bda1bee5a45671819021ac1487852c20e2404f79ef13b711140cf204cbfb6142ad36 WHIRLPOOL 310f58414cc6ae642d19e29dedce7c6f2d6ae3e0962d526b7421ccf37078372ad046b29206336794898c9ee8f22cc08f0b441db44538174ef19ba50c45513af9 DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e -EBUILD protobuf-2.4.0a.ebuild 2947 SHA256 d50e1e57028a28de64a34a30dcd8aa61140cb66a3f63f1018a3e56f6f2608402 SHA512 3897d301bef7206aba05a9d96caf53fd65cad7b7e93ec051083f2bec0cd98fd36f78781695dd35dc753ed5c5452f09b90722efedfa52b8dfd22c6a09ab2e2583 WHIRLPOOL 9b85eed26c8b45433b38e8e52ac0ffe271476296beda79fb3290b65d5bfca138c50fce1390cb703797a3923b9a49ee14563f5eb76eef27cf4554d92786528d29 -EBUILD protobuf-2.4.1.ebuild 2989 SHA256 bbe96dc102486e44f646092f22a0e3ec5c6309bc46cfae62528a7707aa1f68b3 SHA512 c846a3826cbfd89aa2872395cf42b4ddca95178a62c30018bb7e8131a421fd784e20eda90134729073dc75ba99a4f366043aee41bb05b8f2c33418fdf02b2def WHIRLPOOL a2fd482b58b212f112bd5011b712171140ad829b7228ad428158977da6174faf94a32bd5fb198af9199d13febefaf42f1b61b47a72390accbb7862c2fbb41d3e -MISC ChangeLog 6090 SHA256 81530c385dc28070a71c490261537ca5441ece52dd8d7951fbec161f6c036b02 SHA512 b7b1a4d9162194065b02211b6de03601a2745a7c7a27c7286d2b44c77d5e39ea7564c2983bcbc16546b61252372bd7a174dbf8c76d5b5fdd4a32d2ccce92f560 WHIRLPOOL 1ea01c96d409aadea2819fe4f87fdc7287e455c7ee12df8795ddb198efa3bbddbb41f2f4cb3f21908bc66ed5bfb7c156ec32470a8541639b16b47c5c35c7e877 -MISC metadata.xml 310 SHA256 ded221b688b4ab4cd456b3036ee01a31add94142274b764939cc61e80ffebeb3 SHA512 eceedb3555bfc87b1b18c092aac4b79e53d5ea6eaa250e203e51e362bf63db29ed0c23725a276343cd78af56ae2ecbacab96c9ad1d0221b17d0560b85e5c1eda WHIRLPOOL a04e0304a373392f179b8a782719adf2d812cbd170c8eee33dc1ad178b8b09497b57a555fcb4288d104713e586346817166b6f8940661946cd71f928c52706ae +DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d +DIST protobuf-2.6.1.tar.bz2 2021416 SHA256 ee445612d544d885ae240ffbcbf9267faa9f593b7b101f21d58beceb92661910 SHA512 8b092b87fcd79223db199cd3d330f3d43689b47f345aa4e34028dcf1680d609a5d5a89ab08588e817b566d3b265834c38f1db580bc1c144b512ce74d35f2a174 WHIRLPOOL b8d7f5e6b85670520435fd1107eb67035c822c2dad9689dadc29754de3bf8076ac256cf3fe3e719e99c0ccb03ed78edecb91afbe96b611073b60ae3fb3f29b1a +EBUILD protobuf-2.4.1.ebuild 3035 SHA256 5c8690b49a5b80b8a4adf028a0d45f0f4ddfdae05e9ba8245f48814d50fc1185 SHA512 1e71dc30d60cab213cfd06c03dc01206ff29740cb852ec8ef87eeffc550af2df2fd4bd396ed900fd0125ce08c469820ab45967cbf46a6514f7e447a1e1bdfa29 WHIRLPOOL a66587c3c187601ac9398a53be03055e0d013d3f16a6fdb4f62e007aa8c469bed9015c480f69734915751df2930a2d589f0bac599cbebed895d1bd1fceb616c0 +EBUILD protobuf-2.5.0-r2.ebuild 3262 SHA256 0b215818bce2ff8edeb398d1b53d41c1544f93ea5e00a531c047a8ddce0dbb27 SHA512 eda91eb9c95c21fc7d7a4b6f8385db0aeb80284325d816e08b8cb295ebd3ab2206f756bd70df029f60dd069488741adbd0645573e9437b70cab41dea36ad8e78 WHIRLPOOL d28b104bb69156b0c17e97f056ad3a994a81670d752c76a729533f601a6551bb204194d420d4064bbdb3d16db38ea575cc239e2e5134087f1e3639cb8f8aa446 +EBUILD protobuf-2.6.1-r3.ebuild 4093 SHA256 8f9724b7c5ff4872091a1fa4fb97b83311f9f226ef315b0d4db8701b2da8ce40 SHA512 0d065a572e552f6ae042a7c3070b5fe9519104f7d13ca988ac3f090684c62ff04dd8c380eaa97b3c1748c2620f5f72a45a4934571941c6a67cc797db7aac5c95 WHIRLPOOL a00550093096503795fa1b9255a6eaffe3670307ebfe5ea874b5210bb29b1cb59a0fb58640578e6ce1f385d6fbb817414cbb1bd5b304209bc38ff41dfe599f6f +MISC ChangeLog 12573 SHA256 818510535a3e5990ba7c03c04ac85b44188deb8dd140f5e21e3cc8c87330a0a6 SHA512 486c81c092ec0d84dd82455242c41db0c00b4f6fbc55ebefd621c6cf7fa0f0fbcb99b9bc0fda7d14f07d9e3d19a3d16cf2dcaeb5b521fa3641bd7302613b2ba0 WHIRLPOOL 7df1ad6e22fb103c8a4138ae82fe5c6a67f74fd29f5bf2305bb86292702b617e3d405273c9553ccdd4365e62a5b122da75ecea70e73aadfed8ea952fd8ff35dc +MISC metadata.xml 294 SHA256 7060252f98d7d7c362b56dd1f99576e89265a5eb27dbff8e495e6c66256b19ce SHA512 d317e16f9253e18006a165d5b625150cc0d68f0bc943f55fef5df705b5bac9bc3be9ae3183b159b02dd56a2d885897a51791155033ada09793802ec7fda07675 WHIRLPOOL f00e33c0be7cb927cdeb59b5542915f350bedcb496e35de3f71ba612507348b6d92b61ac004edaa749d0f299e830a370a55468487121bfc2fab544536b3b40e3 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iQEcBAEBCAAGBQJQzjCbAAoJEEqz6FtPBkyjcfQIAK/lIvossPyFmlGtS0L0frCX -SFc97xcv3Pci/G/Kfo3f3yICv1blNoS8/vuo4c/71N+8nfNW3yJubYQC7F467orB -P91gp4PPcaQdL3809qFr1uDBsew7fEpE1xcvUqXbHeMa1RKkAPaIK2CH+0QQSG0K -RwYFUz95+t23F0zl0ijXbQa/mld6r6kylXXw81R4gFnNZi/4fLYocq3uRLgiA/o6 -5Lwd8L9oyHGh3dCwEsRjShyTspl4wtymI9fgEdRgVdcjoEmin6Z9rU7hVLlahA/H -8VqaRxv8GtGVPuOTBHv3LpRf2L4xpNrvCHPVUbqSQV8vGjPtUYZ6d93kjQXGJMQ= -=XEt2 +iEYEAREIAAYFAlVY940ACgkQCaWpQKGI+9T1qQCfVyiv8cMzwwXx2dZoIppsK9rw +nvgAnjKZ6XkeLDoiL4Q+rH9PTO+HLywq +=NHVI -----END PGP SIGNATURE----- diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/proto.vim b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/proto.vim index 5b76a4f6a6..6d26809efe 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/proto.vim +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/proto.vim @@ -1,3 +1 @@ -augroup filetype - au! BufRead,BufNewFile *.proto setfiletype proto -augroup end +au BufRead,BufNewFile *.proto set filetype=proto diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch new file mode 100644 index 0000000000..5154bd3a09 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch @@ -0,0 +1,17 @@ +Fix build with emacs-24.4. + +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18845 + +--- protobuf-2.5.0/editors/protobuf-mode.el ++++ protobuf-2.5.0/editors/protobuf-mode.el +@@ -66,6 +66,10 @@ + (require 'cc-mode) + + (eval-when-compile ++ (and (= emacs-major-version 24) ++ (= emacs-minor-version 4) ++ (null emacs-repository-version) ++ (require 'cl)) + (require 'cc-langs) + (require 'cc-fonts)) + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch new file mode 100644 index 0000000000..5c8d478318 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch @@ -0,0 +1,15 @@ +fix from upstream for building w/x32 + +https://code.google.com/p/protobuf/issues/detail?id=474 + +--- src/google/protobuf/stubs/atomicops.h (revision 491) ++++ src/google/protobuf/stubs/atomicops.h (revision 492) +@@ -66,7 +66,7 @@ typedef int32 Atomic32; + #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT + // We need to be able to go between Atomic64 and AtomicWord implicitly. This + // means Atomic64 and AtomicWord should be the same type on 64-bit. +-#if defined(GOOGLE_PROTOBUF_OS_NACL) ++#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL) + // NaCl's intptr_t is not actually 64-bits on 64-bit! + // http://code.google.com/p/nativeclient/issues/detail?id=1162 + typedef int64 Atomic64; diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch new file mode 100644 index 0000000000..60151e8f6b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch @@ -0,0 +1,256 @@ +https://github.com/google/protobuf/pull/235 + +From 18f71a50a9000e7558ae48a971fa301d76220ff0 Mon Sep 17 00:00:00 2001 +From: Prathmesh Prabhu +Date: Tue, 10 Mar 2015 17:04:40 -0400 +Subject: [PATCH] protoc: Add options to redirect input/output to files. + +When using protoc to encode/decode protobufs, the input/output was from +stdin/stdout only. This patch adds command line flags to specify files to read +the protobuf from and and write the encoded/decoded protobuf to. +--- + .../protobuf/compiler/command_line_interface.cc | 99 +++++++++++++++++----- + .../protobuf/compiler/command_line_interface.h | 11 ++- + .../compiler/command_line_interface_unittest.cc | 25 +++++- + 3 files changed, 110 insertions(+), 25 deletions(-) + +diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc +index 567238a..1db85c9 100644 +--- a/src/google/protobuf/compiler/command_line_interface.cc ++++ b/src/google/protobuf/compiler/command_line_interface.cc +@@ -745,6 +745,28 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) { + } + + if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { ++ bool success = false; ++ int in_fd = STDIN_FILENO; ++ int out_fd = STDOUT_FILENO; ++ ++ if (!protobuf_in_path_.empty()) { ++ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); ++ if (in_fd == -1) { ++ cerr << protobuf_in_path_ << ": error: failed to open file." << endl; ++ return 1; ++ } ++ } ++ if (!protobuf_out_path_.empty()) { ++ out_fd = open(protobuf_out_path_.c_str(), ++ O_WRONLY | O_CREAT | O_TRUNC, ++ 0644); ++ if (out_fd == -1) { ++ cerr << protobuf_out_path_ << ": error: failed to open file." << endl; ++ close(in_fd); ++ return 1; ++ } ++ } ++ + if (codec_type_.empty()) { + // HACK: Define an EmptyMessage type to use for decoding. + DescriptorPool pool; +@@ -753,13 +775,20 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) { + file.add_message_type()->set_name("EmptyMessage"); + GOOGLE_CHECK(pool.BuildFile(file) != NULL); + codec_type_ = "EmptyMessage"; +- if (!EncodeOrDecode(&pool)) { +- return 1; +- } ++ success = EncodeOrDecode(&pool, in_fd, out_fd); + } else { +- if (!EncodeOrDecode(importer.pool())) { +- return 1; +- } ++ success = EncodeOrDecode(importer.pool(), in_fd, out_fd); ++ } ++ ++ if (in_fd != STDIN_FILENO) { ++ close(in_fd); ++ } ++ if (out_fd != STDOUT_FILENO) { ++ close(out_fd); ++ } ++ ++ if (!success) { ++ return 1; + } + } + +@@ -873,6 +902,11 @@ CommandLineInterface::ParseArguments(int argc, const char* const argv[]) { + if (status != PARSE_ARGUMENT_DONE_AND_CONTINUE) + return status; + } ++ if (mode_ == MODE_COMPILE && ++ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { ++ cerr << "--protobuf_in and --protobuf_out are only valid with " ++ << "decode operations. Ignoring."; ++ } + + // If no --proto_path was given, use the current working directory. + if (proto_path_.empty()) { +@@ -1123,6 +1157,12 @@ CommandLineInterface::InterpretArgument(const string& name, + + codec_type_ = value; + ++ } else if (name == "--protobuf_in") { ++ protobuf_in_path_ = value; ++ ++ } else if (name == "--protobuf_out") { ++ protobuf_out_path_ = value; ++ + } else if (name == "--error_format") { + if (value == "gcc") { + error_format_ = ERROR_FORMAT_GCC; +@@ -1238,18 +1278,29 @@ void CommandLineInterface::PrintHelpText() { + " --version Show version info and exit.\n" + " -h, --help Show this text and exit.\n" + " --encode=MESSAGE_TYPE Read a text-format message of the given type\n" +-" from standard input and write it in binary\n" +-" to standard output. The message type must\n" +-" be defined in PROTO_FILES or their imports.\n" +-" --decode=MESSAGE_TYPE Read a binary message of the given type from\n" +-" standard input and write it in text format\n" +-" to standard output. The message type must\n" ++" an write it in binary. The message type must\n" + " be defined in PROTO_FILES or their imports.\n" +-" --decode_raw Read an arbitrary protocol message from\n" +-" standard input and write the raw tag/value\n" +-" pairs in text format to standard output. No\n" ++" The input/output protobuf files are specified\n" ++" using the --protobuf_in and --protobuf_out\n" ++" command line flags.\n" ++" --decode=MESSAGE_TYPE Read a binary message of the given type and\n" ++" write it in text format. The message type\n" ++" must be defined in PROTO_FILES or their\n" ++" imports. The input/output protobuf files are\n" ++" specified using the --protobuf_in and \n" ++" --protobuf_out command line flags.\n" ++" --decode_raw Read an arbitrary protocol message and write\n" ++" the raw tag/value pairs in text format. No\n" + " PROTO_FILES should be given when using this\n" +-" flag.\n" ++" flag. The input/output protobuf files are\n" ++" specified using the --protobuf_in and \n" ++" --protobuf_out command line flags.\n" ++" --protobuf_in Absolute path to the protobuf file to read to\n" ++" encode/decode. If omitted, file will be read\n" ++" from STDIN.\n" ++" --protobuf_out Absolute path to the protobuf file to write to\n" ++" after encode/decode operation. If omitted,\n" ++" output is written to STDOUT.\n" + " -oFILE, Writes a FileDescriptorSet (a protocol buffer,\n" + " --descriptor_set_out=FILE defined in descriptor.proto) containing all of\n" + " the input files to FILE.\n" +@@ -1490,7 +1541,9 @@ bool CommandLineInterface::GeneratePluginOutput( + return true; + } + +-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { ++bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, ++ int in_fd, ++ int out_fd) { + // Look up the type. + const Descriptor* type = pool->FindMessageTypeByName(codec_type_); + if (type == NULL) { +@@ -1502,15 +1555,15 @@ bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { + google::protobuf::scoped_ptr message(dynamic_factory.GetPrototype(type)->New()); + + if (mode_ == MODE_ENCODE) { +- SetFdToTextMode(STDIN_FILENO); +- SetFdToBinaryMode(STDOUT_FILENO); ++ SetFdToTextMode(in_fd); ++ SetFdToBinaryMode(out_fd); + } else { +- SetFdToBinaryMode(STDIN_FILENO); +- SetFdToTextMode(STDOUT_FILENO); ++ SetFdToBinaryMode(in_fd); ++ SetFdToTextMode(out_fd); + } + +- io::FileInputStream in(STDIN_FILENO); +- io::FileOutputStream out(STDOUT_FILENO); ++ io::FileInputStream in(in_fd); ++ io::FileOutputStream out(out_fd); + + if (mode_ == MODE_ENCODE) { + // Input is text. +diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h +index 7e611c4..b6fc38a 100644 +--- a/src/google/protobuf/compiler/command_line_interface.h ++++ b/src/google/protobuf/compiler/command_line_interface.h +@@ -244,7 +244,9 @@ class LIBPROTOC_EXPORT CommandLineInterface { + string* error); + + // Implements --encode and --decode. +- bool EncodeOrDecode(const DescriptorPool* pool); ++ bool EncodeOrDecode(const DescriptorPool* pool, ++ int in_fd, ++ int out_fd); + + // Implements the --descriptor_set_out option. + bool WriteDescriptorSet(const vector parsed_files); +@@ -357,6 +359,13 @@ class LIBPROTOC_EXPORT CommandLineInterface { + // decoding. (Empty string indicates --decode_raw.) + string codec_type_; + ++ // When using --encode / --decode / --decode_raw absolute path to the output ++ // file. (Empty string indicates write to STDOUT). ++ string protobuf_out_path_; ++ // When using --encode / --decode / --decode_raw, absolute path to the input ++ // file. (Empty string indicates read from STDIN). ++ string protobuf_in_path_; ++ + // If --descriptor_set_out was given, this is the filename to which the + // FileDescriptorSet should be written. Otherwise, empty. + string descriptor_set_name_; +diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc +index 2b26f3b..78ff2cf 100644 +--- a/src/google/protobuf/compiler/command_line_interface_unittest.cc ++++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc +@@ -94,7 +94,7 @@ class CommandLineInterfaceTest : public testing::Test { + virtual void SetUp(); + virtual void TearDown(); + +- // Runs the CommandLineInterface with the given command line. The ++ // Run the CommandLineInterface with the given command line. The + // command is automatically split on spaces, and the string "$tmpdir" + // is replaced with TestTempDir(). + void Run(const string& command); +@@ -1680,6 +1680,17 @@ class EncodeDecodeTest : public testing::Test { + EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); + } + ++ void ExpectBinaryFilesMatch(const string &expected_file, ++ const string &actual_file) { ++ string expected_output, actual_output; ++ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); ++ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); ++ ++ // Don't use EXPECT_EQ because we don't want to print raw binary data to ++ // stdout on failure. ++ EXPECT_TRUE(expected_output == actual_output); ++ } ++ + private: + int duped_stdin_; + string captured_stdout_; +@@ -1745,6 +1756,18 @@ TEST_F(EncodeDecodeTest, ProtoParseError) { + "google/protobuf/no_such_file.proto: File not found.\n"); + } + ++TEST_F(EncodeDecodeTest, RedirectInputOutput) { ++ string out_file = TestTempDir() + "/golden_message_out.pbf"; ++ string cmd = ""; ++ cmd += "google/protobuf/unittest.proto "; ++ cmd += "--encode=protobuf_unittest.TestAllTypes "; ++ cmd += "--protobuf_in=" + TestSourceDir() + ++ "/google/protobuf/testdata/text_format_unittest_data.txt "; ++ cmd += "--protobuf_out=" + out_file; ++ EXPECT_TRUE(Run(cmd)); ++ ExpectBinaryFilesMatch(out_file, "google/protobuf/testdata/golden_message"); ++} ++ + } // anonymous namespace + + } // namespace compiler +-- +2.3.1 + diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/metadata.xml index cba3e61bc9..b890438d00 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/metadata.xml @@ -2,10 +2,9 @@ - radhermit@gentoo.org - Tim Harder + maintainer-needed@gentoo.org - protobuf + google/protobuf diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.4.0a.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.4.0a.ebuild deleted file mode 100644 index b9393e3e64..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.4.0a.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.0a.ebuild,v 1.8 2011/07/15 16:05:13 xarthisius Exp $ - -EAPI="3" - -JAVA_PKG_IUSE="source" -PYTHON_DEPEND="python? 2" -DISTUTILS_SRC_TEST="setup.py" - -inherit autotools eutils distutils 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" -KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos" -IUSE="emacs examples java python static-libs 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 )" - -DISTUTILS_SETUP_FILES=("python|setup.py") -PYTHON_MODNAME="google/protobuf" - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch - eautoreconf - - if use python; then - python_convert_shebangs -r 2 . - distutils_src_prepare - fi -} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_compile() { - emake || die "emake failed" - - if use python; then - einfo "Compiling Python library ..." - distutils_src_compile - 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 - 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_test() { - emake check || die "emake check failed" - - if use python; then - distutils_src_test - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc CHANGES.txt CONTRIBUTORS.txt README.txt - - use static-libs || rm -rf "${D}"/usr/lib*/*.la - - if use python; then - distutils_src_install - 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* || 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 -} - -pkg_postinst() { - use emacs && elisp-site-regen - use python && distutils_pkg_postinst -} - -pkg_postrm() { - use emacs && elisp-site-regen - use python && distutils_pkg_postrm -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.4.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.4.1.ebuild index 74ec7a449f..4eea1dcfba 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.4.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.4.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# 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.4.1.ebuild,v 1.5 2012/11/19 18:29:50 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.4.1.ebuild,v 1.13 2014/08/14 00:03:40 jer Exp $ EAPI="3" @@ -16,7 +16,7 @@ SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-linux" +KEYWORDS="amd64 arm -hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos" IUSE="emacs examples java python static-libs vim-syntax" DEPEND="${DEPEND} java? ( >=virtual/jdk-1.5 ) @@ -33,6 +33,7 @@ pkg_setup() { python_set_active_version 2 python_pkg_setup fi + use java && java-pkg-opt-2_pkg_setup } src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild new file mode 100644 index 0000000000..9ca646164a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2015 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.8 2015/05/15 12:28:13 pacho 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 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/" +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() { + append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI + + epatch "${FILESDIR}"/${P}-x32.patch + + # breaks Darwin, bug #472514 + [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch + + # fix build with emacs-24.4 (bug #524100) + epatch "${FILESDIR}"/${P}-emacs-24.4.patch + + autotools-multilib_src_prepare + + if use python; then + cd python && distutils-r1_src_prepare + fi +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + if use python; then + einfo "Compiling Python library ..." + pushd "${S}"/python >/dev/null + PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile + popd >/dev/null + fi + + if use java; then + einfo "Compiling Java library ..." + pushd "${S}" >/dev/null + "${BUILD_DIR}"/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" + popd >/dev/null + fi + fi +} + +src_compile() { + autotools-multilib_src_compile + + 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() { + autotools-multilib_src_install + + dodoc CHANGES.txt CONTRIBUTORS.txt README.txt + + 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/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild new file mode 100644 index 0000000000..830de14f24 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2015 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-r3.ebuild,v 1.5 2015/05/17 20:18:20 pacho 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 eutils flag-o-matic toolchain-funcs 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 ~arm64 -hppa ~ia64 ~mips ppc ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="emacs examples java python static-libs vim-syntax zlib" + +CDEPEND="emacs? ( virtual/emacs ) + python? ( ${PYTHON_DEPS} ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +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 + + # breaks Darwin, bug #472514 + [[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch + + # fix build with emacs-24.4 (bug #524100) + epatch "${FILESDIR}"/${PN}-2.5.0-emacs-24.4.patch + epatch "${FILESDIR}"/${PN}-2.6.1-protoc-cmdline.patch + + autotools-multilib_src_prepare + + if use python; then + cd python && distutils-r1_src_prepare + fi +} + +src_configure() { + local myeconfargs=( + $(use_with zlib) + ) + + if tc-is-cross-compiler; then + # The build system wants `protoc` when building, so we need a copy that + # runs on the host. This is more hermetic than relying on the version + # installed in the host being the exact same version. + mkdir -p "${WORKDIR}"/build || die + pushd "${WORKDIR}"/build >/dev/null + ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" + myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) + popd >/dev/null + fi + + autotools-multilib_src_configure +} + +multilib_src_compile() { + default + + if multilib_is_native_abi; then + if use python; then + einfo "Compiling Python library ..." + pushd "${S}"/python >/dev/null + PROTOC="${BUILD_DIR}"/src/protoc distutils-r1_src_compile + popd >/dev/null + fi + + if use java; then + einfo "Compiling Java library ..." + pushd "${S}" >/dev/null + "${BUILD_DIR}"/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" + popd >/dev/null + fi + fi +} + +src_compile() { + if tc-is-cross-compiler; then + emake -C "${WORKDIR}"/build/src protoc + fi + + autotools-multilib_src_compile + + 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() { + autotools-multilib_src_install + + dodoc CHANGES.txt CONTRIBUTORS.txt README.md + + 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/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.4.0a b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.4.0a deleted file mode 100644 index d5a695d396..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.4.0a +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test -DEPEND=java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) ) -DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data -EAPI=3 -HOMEPAGE=http://code.google.com/p/protobuf/ -IUSE=emacs examples java python static-libs vim-syntax elibc_FreeBSD source java -KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos -LICENSE=Apache-2.0 -RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) ) -SLOT=0 -SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.4.0a.tar.bz2 -_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb distutils 92e738ea29389cb3f34778d7a349ac71 elisp-common 9a16929c1a6aec7e1c903289983e114c eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 6627198e505d021534cb20f89279c509 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python 3a270b7b1d1e679847ff0faeac25c5a3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=38b980bd8b4ce90b1eede36242a94511 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.4.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.4.1 index daab4d500b..212045ad2c 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.4.1 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.4.1 @@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structu EAPI=3 HOMEPAGE=http://code.google.com/p/protobuf/ IUSE=emacs examples java python static-libs vim-syntax elibc_FreeBSD source java -KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-linux +KEYWORDS=amd64 arm -hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos LICENSE=Apache-2.0 RDEPEND=java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) ) SLOT=0 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2 _eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb distutils 92e738ea29389cb3f34778d7a349ac71 elisp-common 9a16929c1a6aec7e1c903289983e114c eutils 9fb270e417e0e83d64ca52586c4a79de java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 6627198e505d021534cb20f89279c509 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 python 3a270b7b1d1e679847ff0faeac25c5a3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=eb7244b395f5840049edb2a01a652603 +_md5_=6dc5a4c8cfdfbc966e313a35ed02101f diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2 new file mode 100644 index 0000000000..061d897af1 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test +DEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) ) +DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data +EAPI=5 +HOMEPAGE=http://code.google.com/p/protobuf/ +IUSE=emacs examples java python static-libs vim-syntax abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 elibc_FreeBSD source java +KEYWORDS=amd64 arm -hppa ~ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos +LICENSE=Apache-2.0 +RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) ) +SLOT=0/8 +SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2 +_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils dbce0f7913bd240fdf0ef428149855c0 distutils-r1 c01d5c4af34f4a37a51fc9638299c222 elisp-common 9a16929c1a6aec7e1c903289983e114c eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 6627198e505d021534cb20f89279c509 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=06d576a4bc28a963ccd1bfb6995855c5 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3 new file mode 100644 index 0000000000..f2af357542 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test +DEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.5 ) python? ( dev-python/google-apputils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) !=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) ) +DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structured data +EAPI=5 +HOMEPAGE=http://code.google.com/p/protobuf/ https://github.com/google/protobuf/ +IUSE=emacs examples java python static-libs vim-syntax zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 elibc_FreeBSD source java +KEYWORDS=~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ppc ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos +LICENSE=Apache-2.0 +RDEPEND=emacs? ( virtual/emacs ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) ) +SLOT=0/9 +SRC_URI=https://github.com/google/protobuf/releases/download/2.6.1/protobuf-2.6.1.tar.bz2 +_eclasses_=autotools a9597abac7226d89ad9d010abeef6cfb autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils dbce0f7913bd240fdf0ef428149855c0 distutils-r1 c01d5c4af34f4a37a51fc9638299c222 elisp-common 9a16929c1a6aec7e1c903289983e114c eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 6627198e505d021534cb20f89279c509 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 62927b3db3a589b0806255f3a002d5d3 multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 6d3a3cb5705b9fff1aeb7cfa4e3336fe python-utils-r1 096f8247eae93026af13ab88cf4305cd toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f +_md5_=3b2a8cbe9fda82a32c1673f03a356a46