diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-06-15 11:27:07 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-06-15 11:27:07 +0000 |
| commit | e9c3ec8ba5896ed6c392aff650348f0d9a644623 (patch) | |
| tree | 71a5668e1e7108c857e9c0907f8675ddbfc16d41 /dev-libs/protobuf | |
| parent | Version bump alpha and drop older (diff) | |
| download | historical-e9c3ec8ba5896ed6c392aff650348f0d9a644623.tar.gz historical-e9c3ec8ba5896ed6c392aff650348f0d9a644623.tar.bz2 historical-e9c3ec8ba5896ed6c392aff650348f0d9a644623.zip | |
Fix compilation on Darwin, bug #472514
Package-Manager: portage-2.2.01.22013-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89
Diffstat (limited to 'dev-libs/protobuf')
| -rw-r--r-- | dev-libs/protobuf/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/protobuf/Manifest | 16 | ||||
| -rw-r--r-- | dev-libs/protobuf/protobuf-2.5.0.ebuild | 11 |
3 files changed, 17 insertions, 15 deletions
diff --git a/dev-libs/protobuf/ChangeLog b/dev-libs/protobuf/ChangeLog index 3974734a5fab..3eed0e3874b7 100644 --- a/dev-libs/protobuf/ChangeLog +++ b/dev-libs/protobuf/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/protobuf # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.44 2013/04/02 18:19:55 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.45 2013/06/15 11:26:56 grobian Exp $ + + 15 Jun 2013; Fabian Groffen <grobian@gentoo.org> protobuf-2.5.0.ebuild: + Fix compilation on Darwin, bug #472514 02 Apr 2013; Tim Harder <radhermit@gentoo.org> protobuf-2.4.0a.ebuild, protobuf-2.4.1.ebuild: diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest index db7090460bbd..49c6809e10dd 100644 --- a/dev-libs/protobuf/Manifest +++ b/dev-libs/protobuf/Manifest @@ -9,17 +9,13 @@ DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d EBUILD protobuf-2.4.0a.ebuild 2984 SHA256 8a5363f9fbdcb92e3b6574182a80c985f33c5d70a06a02c20187eaf40bff2ba1 SHA512 774efb0342230eec232c7d33cafd558ba57601e3ef7e2fb9d9b854fa996b3c81a7db9349ef6be126d9d2f3a313b9c6562f1ed6053c837c52c38409f0936ed68c WHIRLPOOL 0be09e6364881c0b2d15e2e087bbe1f82e83e4d8b73502af764c2ee8474939d1d0e9416d5343d665180fe76a02a07111bed85eac7e9aa579f01eb04cafbdb93c EBUILD protobuf-2.4.1.ebuild 3039 SHA256 e8f114f4db999fd50f55b317d892a70e6d6ea01b617a153358e6f35f46c16de3 SHA512 cee8f04e6e1912f95f7be17fa668a9cf4b5c05101cd27fd36ae18739863da07a9758be6941d0d492741d922f1a8ecb29635aa8d72b23deb96cd4238efbd89990 WHIRLPOOL a04a8879f2be69a7e330907dfd547f82cc96796fe78bd8dabd331e019a604e9d8d0672d5889b15db4a78bf002729504c55a637e10e2635dbe1519eb8ab87b89d -EBUILD protobuf-2.5.0.ebuild 2669 SHA256 93889df36cc5b13b2ec136691a6d0cfe0b1be33fd76ce824d912d012cd6966f2 SHA512 c3c8c9875b218cc1f1136c45d855cf822457822213cd0d5aa04c2ec039762ddb9a43d6b109d24fc915a00cc93a43d46f371195e58a0d19309795cfcfbd630e73 WHIRLPOOL 669859757a8816b2feab8b33693fcfbe230688ad2c8c33b4bd497aa99d273e5b159a9be7f24f64d10509e868038dc69bb395ec9466610b2bf2a00edf8d7c82be -MISC ChangeLog 6646 SHA256 ef3c4694a027359a46e8797ce0dab71ed13e0b2def6475452b18fa695ab1cb2d SHA512 a221ca3f2bc28a7dee0ce45ea0620b91ddcfec1b522a3829c8723aba53beb665cb241fb8a97d7ea3f3dcf8f9ce5aef043a2652e3b64a1cb7f7875d4df8b4283e WHIRLPOOL 8aef1abc43194d7b99bfcf8bbcf59366cdbede13c7cc23958c0a5e53749fabda3a4fe4eafb071eb33a60fa1af898ad3fa48ea5a405e26d025412b4d0390e4841 +EBUILD protobuf-2.5.0.ebuild 2753 SHA256 a898dd5f1cbddabc665a4a82a2c21b507918e27be185b0cea2dafffb00c06693 SHA512 0b2986404003b63506b8fff329c959c35493eab34b53be0a469951d632254417957939bc6b522260764c8bc1d392ecb76812d087ac5b51b572a951ac9e53c554 WHIRLPOOL cd8f90f6bfa0ebac8c7563a569b100ae68db2bf35d46e7fbca6f58a4faded5aec762f0d27e0906ec85c94345173db5fa95098c2c513683b86b360049170c1ba3 +MISC ChangeLog 6760 SHA256 34555e4d38a7369adf8c39bcacccba667312b889b664fcfd74af1e09364da43d SHA512 d29b098d6ef83a037f5e0547c51bce4d232d798504574c2440688634dbdc34f1bc6c10f27e19de6390ef92831b8e4cd5be98775e01222e77cfd67039e36f499b WHIRLPOOL 7d55e40b4309b6039c645da121f3a928e408daf98683e9cfa08d8b3b2fd56a5c0887707b13ed4cc776962c2ee3fe62f9447d8956152e606fad3ee3225d9a1909 MISC metadata.xml 310 SHA256 ded221b688b4ab4cd456b3036ee01a31add94142274b764939cc61e80ffebeb3 SHA512 eceedb3555bfc87b1b18c092aac4b79e53d5ea6eaa250e203e51e362bf63db29ed0c23725a276343cd78af56ae2ecbacab96c9ad1d0221b17d0560b85e5c1eda WHIRLPOOL a04e0304a373392f179b8a782719adf2d812cbd170c8eee33dc1ad178b8b09497b57a555fcb4288d104713e586346817166b6f8940661946cd71f928c52706ae -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (SunOS) -iQEcBAEBCAAGBQJRWyFPAAoJEEqz6FtPBkyj0TQH/A5SyXZtpnlsZdMyscnoywB+ -3dG33DH2UzsDrQ2FgWH1h0+kZ3MC/n6206lkWvW37qY5AtHgRZCxTJ722wY6ThEY -+XV5N8ASbChvQuO8lTVq2g6J59K0+DJ9NesrR5FeBgOFCaiiJRYOrLpBAh1Qdulg -rkguaq6zwkm2w7HgB7nAMflysvjnGZ0rw+0HJ5U0T9QNEhSlyAbJF0M53YaZVkDk -xMnVsgfm991ltIRqMypD+u/O3NGojuUGixdgd2VOmgGZdXH+Gi44zFIqyc3Wve7l -MDDqhVp4Mu9hKRlpJ4fM4W4EUmozaAtfOVoGlQgYAwRWewjAYezy+hP/zGmbdvg= -=6JrN +iEYEAREIAAYFAlG8T4EACgkQX3X2B8XHTonHNgCfYAlK4Vp2+gHc/Cs1ERl9HjzO +OxkAoKLEYzQVi1M54BRHOPcxMmHP5AuR +=RK4E -----END PGP SIGNATURE----- diff --git a/dev-libs/protobuf/protobuf-2.5.0.ebuild b/dev-libs/protobuf/protobuf-2.5.0.ebuild index 704d51ba6051..81c3fa359430 100644 --- a/dev-libs/protobuf/protobuf-2.5.0.ebuild +++ b/dev-libs/protobuf/protobuf-2.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.ebuild,v 1.1 2013/03/05 05:21:45 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0.ebuild,v 1.2 2013/06/15 11:26:56 grobian Exp $ EAPI=5 JAVA_PKG_IUSE="source" @@ -14,7 +14,7 @@ SRC_URI="http://protobuf.googlecode.com/files/${P}.tar.bz2" LICENSE="Apache-2.0" SLOT="0/8" # subslot = soname major version -KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x64-macos ~x86-linux" +KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos x86-macos" IUSE="emacs examples java python static-libs vim-syntax" DEPEND="java? ( >=virtual/jdk-1.5 ) @@ -23,8 +23,11 @@ RDEPEND="java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs )" src_prepare() { - epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch - eautoreconf + 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 |