From: Tim Harder <radhermit@gentoo.org>
Date: Thu, 27 Nov 2014 19:51:38 +0000 (+0000)
Subject: Apply patches manually so they don't get applied twice.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9afb995f40f2562767821bdf09f53deb44ae12ef;p=gentoo.git

Apply patches manually so they don't get applied twice.

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 5c6b6cce9c6a..5bda099c89ff 100644
--- a/dev-libs/protobuf/ChangeLog
+++ b/dev-libs/protobuf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.71 2014/11/27 18:05:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/ChangeLog,v 1.72 2014/11/27 19:51:33 radhermit Exp $
+
+  27 Nov 2014; Tim Harder <radhermit@gentoo.org> 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)
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 1f05d4505a82..7ce9eae3d4b5 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -13,21 +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-r2.ebuild 3000 SHA256 6a6bd9b861e3fa1c909352364840715d82cbc81de72adb910dabd3e3442d5711 SHA512 3e243a0b008ae16131c20fd5c522c124151576a23bc727ae825c494a55951b2ea8a57a13811e2744a8833da3ad3c60725d8720cade754ba0653d2e4fc710ec82 WHIRLPOOL e810f9c3dc7bfc9cfdfb914752a688b1c7ae63a477f511a9c318fec372c4952b67c58dc89a5aaa3d294a3eb206b57e9fbf2ec7a6571320531ba614835d28638d
 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-r1.ebuild 3060 SHA256 2c03e1ef2ac6bd86de96b31484fac60c66b77824d788a2115b048280c731e24b SHA512 391be6eaaee0be5fbe13c63d07283c01acd87635f21346ccb5a0281f55ca7ce42ef05f05b4f55ab09bdc685df885656075bd2cc35af0f47162cced068b49bc8a WHIRLPOOL f7acfe8f135a4d346d600342b354d6bb9c4ec3ebe9465d5fa036e9f697328d4b752e9ee333b7ce0443a162a8f712228f5d1b105b3ed3ae8cc4225917d38d2497
 EBUILD protobuf-2.6.1.ebuild 3016 SHA256 4eeb189f80d262542237155d9bd6f82954159a4bb115e4afed0c7e580ccb80e8 SHA512 b98cf5ebd67b82e565cd81f41fbfbf2bce05375e00999f494b7d8f518001476ee42c7eccf21ce2d0bd5f01cb7db611779eb77207cee2e921c03250561a3ef3eb WHIRLPOOL 45a1a31272750d1071030d240a37150c3bad9a9c4bee0fca7719bd9e583b7a9df98356e53f0034232e454161fb925d8f7d119380fde133588a1016f43be0d8b5
-MISC ChangeLog 10028 SHA256 7f619da05c19f89b12de9cdca0bf09ba71b986b42b60f00e4d1d0d60505eff2f SHA512 5e3533dd09b609d2868a06ccaa34a6f6f73cee9e0ac3b5b94be144e4ee53c6e65712914c623f8d5771a6d8d4e2bd92ac24e79bf4794b84ee743fdba1691fc6e6 WHIRLPOOL 705311b255f2e9d85c744976f18d1d9b2d98f30db387970b3b8302a2cc7f7520dba60ac099c69e7a76d091eaba6c325b6a3d556fb2106a9ac2f80adc259e6010
+MISC ChangeLog 10190 SHA256 3d92cdb24cfac2e566e4103d354b6ee21be5d51e3433853872d64d4eb66f8306 SHA512 a73b2293f364967bb0e7606145732353aefd446bc8a2be50dfd603ad6126eb60671f4516d07305394080e446bd87cd009f12bcdd16a68023c40bba984d8f1fba WHIRLPOOL 261393acc65b5101ebe92a1c4d6d58a1dd3927685c631be950f0d8ebba9f22c132edb2e097d74891a4469c57c56c47b6d08ff99db30d4d84f710a775207754a3
 MISC metadata.xml 310 SHA256 ded221b688b4ab4cd456b3036ee01a31add94142274b764939cc61e80ffebeb3 SHA512 eceedb3555bfc87b1b18c092aac4b79e53d5ea6eaa250e203e51e362bf63db29ed0c23725a276343cd78af56ae2ecbacab96c9ad1d0221b17d0560b85e5c1eda WHIRLPOOL a04e0304a373392f179b8a782719adf2d812cbd170c8eee33dc1ad178b8b09497b57a555fcb4288d104713e586346817166b6f8940661946cd71f928c52706ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUd2fsAAoJEEqz6FtPBkyjvrwH/2lCVER4XO1MWUhfY8kgb33M
-+groRfpRcg5atjWj2uZ3pY50kZmqKGtaYskeyEgfPoPv9nXkkPjD8Dy7tgovM0eR
-zylW5ReOVqx5br5foAJtBPLi7CNnr5gOsCeaplNzOekygM1ufrbR6FGQbh/lPG1E
-l0TjZb2oVmmNHYkRuoW1VnliCwo2VI5ngYpLFUHAkzYK3ET8ErAboHI5NFzuGZoI
-rYNZJqe7eoB6eBqsajhpG4zzYuOPgB2pWha5uhLZp8OVnIzBLfucq7sdI//Pjvt/
-XxG7UZB8/tYljR8WnygTxJLWkTKdcrQpl/Ppk66rmxfEnA6pxP9ejgBA/N+otLY=
-=mKjM
+iQEcBAEBCAAGBQJUd4DQAAoJEEqz6FtPBkyjfqEIAJ/ajWo7FKSDIfPbF9bk7+Id
+SK+zwZATJAitACMLamjIxExydMD4b72YjpLa2szAuQK7YgxnCGVM8LgF03YfUppD
+JwO+H21bplXBWY3F9WkfdacF3IqxTQMfp/Dv3RMlzHAj7PKchodvTrtyMhQLisoA
+FlmjsZGTjxPxvhI7xchqOhq+vlPn2ybZdORd1vP0C+mMc3lZULlKZGG2jN+7ntF0
+jAUC/9GyoQulxgNzJpczaP3p3TIjZalFPabrgWEEbNerrkIa3yof5LmG+5UuSLy1
+WlbndHz61+yleG1iauN0+ZwAYgDxMJuewBfgE1ObtpoDGli2O++0HUm1PY/snxw=
+=n0sB
 -----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
index e91770a14309..c6fcb7e643f3 100644
--- a/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
+++ b/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.5.0-r2.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -9,7 +9,7 @@ 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
+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/"
@@ -29,18 +29,18 @@ RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.5 )"
 
 src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${P}-x32.patch )
+	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+
+	epatch "${FILESDIR}"/${P}-x32.patch
 
 	# breaks Darwin, bug #472514
-	[[ ${CHOST} != *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )
+	[[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
 
-	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+	autotools-multilib_src_prepare
 
 	if use python; then
 		cd python && distutils-r1_src_prepare
 	fi
-
-	autotools-multilib_src_prepare
 }
 
 src_compile() {
diff --git a/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
index 596ab27c7f57..bc7842a056f3 100644
--- a/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
+++ b/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r1.ebuild,v 1.2 2014/11/27 19:51:33 radhermit Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -9,7 +9,7 @@ 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
+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/ https://github.com/google/protobuf/"
@@ -32,16 +32,16 @@ RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.5 )"
 
 src_prepare() {
+	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+
 	# breaks Darwin, bug #472514
-	[[ ${CHOST} != *-darwin* ]] && local PATCHES=( "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch )
+	[[ ${CHOST} != *-darwin* ]] && epatch "${FILESDIR}"/${PN}-2.3.0-asneeded-2.patch
 
-	append-cxxflags -DGOOGLE_PROTOBUF_NO_RTTI
+	autotools-multilib_src_prepare
 
 	if use python; then
 		cd python && distutils-r1_src_prepare
 	fi
-
-	autotools-multilib_src_prepare
 }
 
 src_compile() {