summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2012-12-29 16:22:07 +0000
committerSergey Popov <pinkbyte@gentoo.org>2012-12-29 16:22:07 +0000
commitd71aa3b4893031291d44b2849a93afb7cb50ebc9 (patch)
tree320ab846916951c421d4edc814210c9c24deebbd /dev-libs/apr
parentUse makeopts_jobs for more robust MAKEOPTS parsing. Bug 449106 by jannis. (diff)
downloadhistorical-d71aa3b4893031291d44b2849a93afb7cb50ebc9.tar.gz
historical-d71aa3b4893031291d44b2849a93afb7cb50ebc9.tar.bz2
historical-d71aa3b4893031291d44b2849a93afb7cb50ebc9.zip
Apply user patches, wrt bug #449048
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/apr')
-rw-r--r--dev-libs/apr/ChangeLog5
-rw-r--r--dev-libs/apr/Manifest18
-rw-r--r--dev-libs/apr/apr-1.4.6-r1.ebuild5
3 files changed, 10 insertions, 18 deletions
diff --git a/dev-libs/apr/ChangeLog b/dev-libs/apr/ChangeLog
index 2c8080eac85d..ad5f9366f3f8 100644
--- a/dev-libs/apr/ChangeLog
+++ b/dev-libs/apr/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/apr
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.186 2012/11/28 04:40:54 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/ChangeLog,v 1.187 2012/12/29 16:22:06 pinkbyte Exp $
+
+ 29 Dec 2012; Sergey Popov <pinkbyte@gentoo.org> apr-1.4.6-r1.ebuild:
+ Apply user patches, wrt bug #449048
*apr-1.4.6-r1 (28 Nov 2012)
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 651824564809..feb3f5bebe07 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -1,23 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX apr-1.4.6-mint.patch 1200 SHA256 d1d8217efbf87f136ece47d06e224f23a585b1634d70a911c88778b8503b3d71 SHA512 531961bcd79850a4b6af59288a6aeb489632d64fd4a1bed80450d48e48f5ff3ea7c0d1e05d80a591c2d8d1a2c6f0c859ef8500b1f01614d83df74034782fd7bd WHIRLPOOL 52c98387ed240f94099f4587734b048fdc6899309d5b4b2f5b237fc7621ef5aa81f1a8b6602e7589ec55fbf391104db3e4451e62dbabdc55133530830dddecf1
AUX config.layout.patch 818 SHA256 eeacaf654f23084e842bff02b97c083a8da5b5c056fd086166ba2d250edf3181 SHA512 4ff9a98c2a799c714d3b4c2cb42dd9c1cd6aa52b465570939710c0ac5800ea8806a9c38500d83b09a2bf61984d57c53ae934886d9f25e3111d721ef282a7d91e WHIRLPOOL a03f7e889a416ada14c62ca99727e2c8cba403972785c7d2282c1c914abe9c38a94b98489ec840b3c1e2cfc2af87ee08ac724d0434e8198596f7d2b44907d3db
DIST apr-1.4.5.tar.bz2 754763 SHA256 38c61cacb39be649411cdab212979c71ce29495549c249c2e9a1b0d12480c93e SHA512 090edd67ecb571cb6b3697a37fc25da9336c6345025b25a530eaa32d1d9906bc6b2eebde9cff8b7cb6a20a0b45d9c36a69c468657ae6c1dc372e4eb181be0344 WHIRLPOOL 5bf5d859528cc470bcade626cfb2a8f39c6ad093291c09128fbd96068b9b26aeb47ee8bef77aa06d41fa4c2cbebf4f21742f3cdb9c1ced3eca4eaa0928e719fd
DIST apr-1.4.6.tar.bz2 785724 SHA256 9b635e60feb163e6fc6c375721f71f44d7e26d6b9cd52f6b86b04e65d2481cbc SHA512 1842e2dfc9315d9dd39acd4545d80fad45dcb419c9bfb4423453ca8727aa78d864fd48f43e68a696345b4c0ee2e9eb50b3eddd96d3eaf6ed3c5d48211831b8e4 WHIRLPOOL 4d8a67dace2b7e1c41c778ad3d34f4a479f9885c0b11cd3c4be412da4e2e006765802f8756a52d97fbfe4e962302274fe0e67cd1b8ac1a673044e79fbec5dc6e
EBUILD apr-1.4.5.ebuild 2131 SHA256 13c591ee66cdfef1d3da5fbcf18925b18f3415ede24255be1897156568d4d7e5 SHA512 392d57566c0e5ff44efcbcdc8a4a9825a0ecddc2bbd1df638a9e278a2ff9fb7d2186d5bf031a0bf5e2a7712a0df24bdc985af38e50ee8eda1983ad877e267a76 WHIRLPOOL d758fa4274a653b7a202526d2579a46978b8a0f144d5c693b3f0a7b3dd1553be4abbbc425780d5cd458d3bbb53405a7aaa2635a9cd12f02ee1ddf814da613e49
-EBUILD apr-1.4.6-r1.ebuild 3372 SHA256 955c07175b86199e9508084a1499056dbc5b29067102a6d498690cb6e1f9a62f SHA512 2fbd92db632db5a5faa2510dbfa0ef8e3c20768e3a1f8e2d59c069226bbf3402b8186a867a1a8b80790dc2319d11103d32fb00f1bc4177e2e25022411cd3e6eb WHIRLPOOL 7a23d6ef219cbd909202392721bd398d81dba0f073f7a3182bf90da84622a1112f7511e519bc2d2846a329c0025f279afd663479f36e32657176023160f29456
+EBUILD apr-1.4.6-r1.ebuild 3423 SHA256 6cf921a4850747b690877537a8004c7af5dddf1f3dd091f45f19c8df03bd6b5d SHA512 13df876cad5739a1921fbe650cf0e0f078d09ccc19002d6bf07d79251b0c6119a56ef52ac48e726877601d58b0c71f2134c05e2d685d0f1a5c70022ab47a0538 WHIRLPOOL e2cc6221f1b1a33cd2ec9ba220ab69bc4fae8bd73eb17494a28683716f8bf0d154605222e005e159f027c786a2435334e235715540ffbef0c43c9e1b195fca49
EBUILD apr-1.4.6.ebuild 2138 SHA256 16b358e3787ae115fc3bd8de62356bb73b22feac889e69a57b5f4a7d8b589142 SHA512 77c9fa12cce1b61105fcfbd0bf4c6ac3714ded24b73828987b6b8c79944a21167d45bb22a41630e94153632ef73aca4112bfe29fb5f0c97de5997a203130c96a WHIRLPOOL 3b59a2d5ffc170e7a57ec80ed1ab9973e456db2dc83382e2a7985c0cf00ba5a2519b76487a338819f895d9cde5e68a894b951a3537d3c46b6c366d6c02851ce7
-MISC ChangeLog 22381 SHA256 3ce3bd63ef1d99c1bc92fcd61aff60ca1ebddaf06415a57f5ba7c5c95bf05053 SHA512 78e1c9491f74d2dcb99940f785fba870995e40acf149a346bbc62a61598952a0abb1ffcf7b06daa878c27690bb8f3fc6b7045bbd119dc69a3036bd6905310db8 WHIRLPOOL e277ceac640e683de117b0af3ccc10c1b81f3bee7e1378be541086bbbf5edffcc48f737f9e1efd6f98de0634e74faa85322b640f6b1a3623f69784cdef183f8d
+MISC ChangeLog 22493 SHA256 a2d09ee3165bf58d54bedb9ba01255ae627483b9e38143477d015f4888d3b284 SHA512 bda292f3356bb85758c488958700fd44ae5761cff41a8f52df8398583087be79855a15e191c1cd6d6bdb52eab485cfea261a031731e3f2bb2c8fb9a65653c202 WHIRLPOOL 32ba15c7c2f05f611b2dfe4c6ed7b9fa44d26acf411e329844ee5353074a501f65b711bc7023da8e8b2c49483317d8c8c604d88ea3d693cbeda23d90e119d5d1
MISC metadata.xml 443 SHA256 966327337370abc0213bdd1e4fc8723db10871adad7746e07e9b1ebaed188212 SHA512 b46c129b23e4ba9a27be4cf0592a80223726a38d022916a4032a00dc5ca117a15641003ecb302eed6a560c73515aa990800b80b1b48574fb58235ce8bafb5b4c WHIRLPOOL 48326ff95f79a6ddcdea9a915803497bc5a510503ee5bd91d2b7d4f5d113167784f9bdca9962b083395dbc2916846f8dbadce411dcc27a207ae211cba5a1c1e0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQtZXXAAoJEOeBhlrCAAWG/M4H/iXLMMGR24LWvrpPLe1LmJHK
-5IAuP+Qu7fe0GhzRsVwBixYktOwAhafqijs90S4X40TQhD3/Gs/BCS2Pl7wlNX57
-pwYdmj4bFNhySMsHfc0OVv1Bh5KZzHeRj3W/BHM1sV9MaROg5f8U/MKJav2kJHNs
-rNL1CcmzDiyGN/RnYsVLg/TJgwjydEtd5mKqbs1Ab557/qf2doqJ0ofJGqTidG0v
-p0Q1e0xctUQESS0mHkuw8ovIEzXtvA3sGI2gdJHgCcXvWz9U2FZdUo6fn3P8VbXH
-DKKzqgA5e7w5uZOAg4O86gyCVY0wpH92A3dE5od2GFNJP/eMf9Pw38SDcFwiUME=
-=NJxL
------END PGP SIGNATURE-----
diff --git a/dev-libs/apr/apr-1.4.6-r1.ebuild b/dev-libs/apr/apr-1.4.6-r1.ebuild
index e8bda72a10ef..37a57281fa0f 100644
--- a/dev-libs/apr/apr-1.4.6-r1.ebuild
+++ b/dev-libs/apr/apr-1.4.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.6-r1.ebuild,v 1.1 2012/11/28 04:40:54 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr/apr-1.4.6-r1.ebuild,v 1.2 2012/12/29 16:22:06 pinkbyte Exp $
EAPI="4"
@@ -33,6 +33,9 @@ src_prepare() {
sed -e 's:${installbuilddir}/libtool:'"${EPREFIX}/usr/bin/${g}libtool"':' -i apr-config.in || die "sed failed"
sed -e 's:@LIBTOOL@:$(SHELL) '"${EPREFIX}/usr/bin/${g}libtool"':' -i build/apr_rules.mk.in || die "sed failed"
+ # Apply user patches, bug #449048
+ epatch_user
+
AT_M4DIR="build" eautoreconf
elibtoolize