Add a patch to fix bug 426410 .

Package-Manager: portage-2.2.0_alpha119/cvs/Linux i686

4 files changed, 83 insertions, 11 deletions

diff --git a/dev-util/pkgconf/ChangeLog b/dev-util/pkgconf/ChangeLog
index ccf7887b0f68..6787f7121832 100644
--- a/dev-util/pkgconf/ChangeLog
+++ b/dev-util/pkgconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/pkgconf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/ChangeLog,v 1.26 2012/07/21 03:56:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/ChangeLog,v 1.27 2012/07/21 06:35:44 jdhore Exp $
+
+  21 Jul 2012; Jeff Horelick <jdhore@gentoo.org>
+  +files/pkgconf-0.8.1-newm4.patch, pkgconf-0.8.1.ebuild:
+  Add a patch to fix bug 426410 .
 
 *pkgconf-0.8.1 (21 Jul 2012)
 
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 7063a54923bc..86912557a33e 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -2,21 +2,22 @@
 Hash: SHA512
 
 AUX pkgconf-0.8-fix-build-fbsd.patch 470 SHA256 09ff1449d2003fcf0fc7d082ec5b47c07a5882e47e698b1c3e601077223d6742 SHA512 1be45f67d8605cc810d0078ef648401805697b15d4f4c2bbc44a11cf7ab551dc9d56e2019ce18ad017c2096dc6c16c0d80084dfb9eeb582678ade2a383d5b512 WHIRLPOOL 892d35c2d6add0a4258a928511765b305a80f60a9eface87d9e044eaede6cac3c92ef8d14a1a028081822185a2ecb01f74cec75e6bfc4451b8772e9c09338418
+AUX pkgconf-0.8.1-newm4.patch 2658 SHA256 5c8405f3353f6880f747f07f19528ac3b7f82da124b9d6bd85f7b5e68416b782 SHA512 7c921ba0e4840b3d8596eb92f24c7d5963130c100c2c9d0da801db3fd49bb7e1efd572d356f2819f9bd72431c915a6e4969f3024979dbc1cabef17d455323781 WHIRLPOOL 7fed96ae4b584f3066a2b53ba59a05514d1ac3a1758d16dfe15ee3dc183460fd01be9acc5c1a346e96f2608860536bc6e56595b72c85974f17b2d02880077b38
 DIST pkgconf-0.8.1.tar.bz2 81740 SHA256 65e11b5d9b35de3e89d5c285cd4abb84ce82ee05a5feac1e829395bb257b53d7 SHA512 74854d2d1f4e76d34f325777c60ed456323ebdb1e1e806a89e0ac87959bc5dda8918ca775da563f9eb7f542cdb42787c96b4d346451ff835f84e1dec4e9b4345 WHIRLPOOL d0f1be6ea8af07cccbae505cb80210fe39bcf97c78669366925337a4862e1e8e06bffab21335aa4a430961bef77a19b7523dd1a7964317cce6c5983ebb3e63eb
 DIST pkgconf-0.8.tar.bz2 80986 SHA256 8ce5a64b74dff76dad042ff2386d48eee6416d46580328e1a9042aef0f95adc5 SHA512 f9d653ed40ff24176bc4ad08d11abfbe42cacf06633c711a2ab5d271992b48b6cc2862fd07b5820d705d87ec973bbfbf4d40d698fc8506f375aa7f9f67f16dfc WHIRLPOOL f9752c8a058dbd902c57378514a32670a68282a45aa831705461650f8b5d1f0304f9930e12ef73e921b5d0479358832b5958972f631083632edc76410286d485
-EBUILD pkgconf-0.8.1.ebuild 1261 SHA256 d2415233ce4c6ee2d85bcefa5f2422d45a9aa39cdcf23d4900276c3a24f12ce2 SHA512 aacafdea6774f9eef1cd56c9fd11e4287ad3cfc237d72e99459cbb3c841ecfabedd16ac936aaa16ea7f66e94cdaae236cd2b42be9490e93d02235b7ec8a82f80 WHIRLPOOL de8cc4aa10c78cef2eda5638319587729f899a39b60438195f5f2c1b6268003d3e8f81982902a69a98e22028ff3adc456769dce2a2d07e47b876c7681d5c63e9
+EBUILD pkgconf-0.8.1.ebuild 1300 SHA256 b53ee3533a36bdf481fc91f841a18b24bd38fcdb32dc984b0cc9ef11a4d6912d SHA512 0870e2924ff5a2eaa027a513f528d86c3ff8663ad5f025ebb80e8cdabe9dd10e6207e7cc022f770e1c9a4d7fe3e3ab2442d4ea327f4ce5eb3dc5f63c7252aeb0 WHIRLPOOL fa7193a9617fc4d47098e12446c50d862693c28e8bcc6ad0b13e14deda74daa54c47dea0366da27c010faaf660a18d5cafeff8556d0d0e6a9bca4553003bbc73
 EBUILD pkgconf-0.8.ebuild 1241 SHA256 76cdfde3fbf29f36b791e8c4e4d748fe0bbaef6eefa5687a1d891a46cdbd7949 SHA512 71b9f393f591c9174dfbdca94668e127f0a7ee290318e16f095b90c9f56121ecfeca1ad016b3b46a81ec135427fbb8f6113d9fcc6f2469dfccc837353e5bc7b1 WHIRLPOOL e649f32704f5aaeb91b7a332598ee7fc672333153e9f2834f0715e69bb7139792262e40f6dc083c3ec8e4a8369c568b860dbd1db9d01fd59be798604516f8083
 EBUILD pkgconf-9999.ebuild 1233 SHA256 826be361c957ba312326482252d7afe944613baec365658845fc4ad3595fe9ac SHA512 35d8d49f133af208a99b4a20020efe4de3d1dfc8e9f6be2e818b9aaac31bc0409199b2cc4d7969077ff47f9a98e9b157e6ca4d61e531079068863050dacda454 WHIRLPOOL 9d07b8bacbd348387fb995f262ab35ebeb3e9ea589368e8d24875e9a5c84bb1ee1bdf1f684f080c2bc70e0d8e36d9b46eeef4732c08b19741e635bea5c3c8694
-MISC ChangeLog 3799 SHA256 8dfbc2bb92f21f55aa4dc6689485896f7cbf7e80fdb2ecb0990214204aed6d0d SHA512 4e8714e9af48cd4a3d36132699b1d6e04eb659567ab061339eadd46ddcc5b2c0abd4a0da77073e6043fe09470e88136df7d8344e3b59eb9f6223eafcacd70192 WHIRLPOOL dd406deb248ac3f8b45ea59497c7c3a5b547594521d622365c71fe6a5633047c9e3306a3421d07fab73ab3d9499e069dc455c3bb5343de3ecaea99a538126c43
+MISC ChangeLog 3941 SHA256 4322cac00405188de1112a0c85f0c03c245a5b2562bd671eb1ff630fbbf3f84e SHA512 879380901797afae407b0c6a1fb8e9ab1678471cc8d6dca0de69a9c2aca2f7aedddc299a0466cca6f92d769d5d5a85670fc223a5e82df7eb6a23fcc9e9b60e80 WHIRLPOOL d68ab73fa22d613646be4a4da5c085ddf686214e9885c6caa04433f790af6416a88aa0ce83c2f004329e91e8398a9b5acfd638ca42f248a76e3b517924c86bee
 MISC metadata.xml 392 SHA256 5fed6d6703e6f5b191fe729743e46f07389f7681abe82d9279178757f608835b SHA512 248859a1c3de35f3b26835621c701395ef2638de9008f8a3eb8a8484abeb8046117e0fda5ef7d34bfedda6ddabcebca21b63cc818c38d4d280f9c2c0564460ff WHIRLPOOL d36957339f5473f96dd5b255c348cd05182ace86624a4c3268ff25616fa81974353c9805e3153a2881052ce56efbe550f4dcc23962cc88f2c5c6bf38c86d8988
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQCiheAAoJEPUd7O0j6ekAXhoIALLjCzwPMJOHTRxE3TbvBq1d
-VlvlaGnfWmYjjTefRC4D/aV7cwISiMQ6iGaZARzoQy6BGe9TLbUHma2ksKrbrjgL
-W3ncDVpdh/KP1mVybESP8khYExItM3s4u14W4qmKsAbVuiVimjmpaksxo2/ZG+78
-G2psWQ6brKSQkAAJTy0MOdSoClD4BDj/PIztSIUMlzj8vIjfmQbEVtDD0J5WMsxQ
-Yt30mOyWDUE7JD2HIiyyUK8goyY7730NVYy1qBFhfTNCVJ+BWvcUiXzRiwhvEHwU
-0VkG9OPlRFV5cO+hA62eNSIktG4d7PcoHKcPBTfhXV8suzzRgPgAVrKe2F1llo0=
-=9jsZ
+iQEcBAEBCgAGBQJQCk3GAAoJEPUd7O0j6ekAJ/oH/1xl1SeEC0mwc92cizd1sIAu
+bc4qtxRkZF9xNhGxnBc2rkE5gH5zHlFlDjmdvU0MibnbYcea6zkVjcKEjUOrWFYD
+Xym/r8NGWo0R3r3NXVbigIpcBane8VxiLa8fJ4Ie6U8EW10vVFacaXzidzAMLmkg
+AqsBJkLXAcPH0e4Zc8TdpJNoMripyP2WFlF5yBpl4v6hxnH7NUbM6uGv0AB2ze8d
+Swjgt+MUqt7iaGbjKWePvrpdQ0TzAiufQUcMREu9s6xCkayiZalgbPiaeioFohAC
+Pwphy3TZ6iRRA+vISnCN3DCaVqQxy6sDKmNMozSnP2UKFtfU4gnavoixiXtGqy0=
+=19Fv
 -----END PGP SIGNATURE-----
diff --git a/dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch b/dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch
new file mode 100644
index 000000000000..498850485d23
--- /dev/null
+++ b/dev-util/pkgconf/files/pkgconf-0.8.1-newm4.patch
@@ -0,0 +1,66 @@
+commit 840ecc846d1a168b475a31bb927b78c3677d565a
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date:   Sat Jul 21 01:09:13 2012 -0500
+
+    Add autoconf macros to help packagers install .pc files
+    
+    Some distros and users have unusual installation needs that don't
+    conform to the standard $libdir/pkgconfig and $datadir/pkgconfig
+    pathways. Help packagers support these users with the macros
+    PKG_INSTALLDIR and PKG_NOARCH_INSTALLDIR. These are simple macros that
+    provide the configure parameters --with-pkgconfigdir and
+    --with-noarch-pkgconfigdir to allow users to override the standard
+    locations.
+    
+    Freedesktop #48743
+
+diff --git a/pkg.m4 b/pkg.m4
+index 4748f99..0354609 100644
+--- a/pkg.m4
++++ b/pkg.m4
+@@ -158,6 +158,45 @@ else
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
++# PKG_INSTALLDIR(DIRECTORY)
++# -------------------------
++# Substitutes the variable pkgconfigdir as the location where a module
++# should install pkg-config .pc files. By default the directory is
++# $libdir/pkgconfig, but the default can be changed by passing
++# DIRECTORY. The user can override through the --with-pkgconfigdir
++# parameter.
++AC_DEFUN([PKG_INSTALLDIR],
++[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
++m4_pushdef([pkg_description],
++    [pkg-config installation directory @<:@]pkg_default[@:>@])
++AC_ARG_WITH([pkgconfigdir],
++    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
++    [with_pkgconfigdir=]pkg_default)
++AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
++m4_popdef([pkg_default])
++m4_popdef([pkg_description])
++]) dnl PKG_INSTALLDIR
++
++
++# PKG_NOARCH_INSTALLDIR(DIRECTORY)
++# -------------------------
++# Substitutes the variable noarch_pkgconfigdir as the location where a
++# module should install arch-independent pkg-config .pc files. By
++# default the directory is $datadir/pkgconfig, but the default can be
++# changed by passing DIRECTORY. The user can override through the
++# --with-noarch-pkgconfigdir parameter.
++AC_DEFUN([PKG_NOARCH_INSTALLDIR],
++[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
++m4_pushdef([pkg_description],
++    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
++AC_ARG_WITH([noarch-pkgconfigdir],
++    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
++    [with_noarch_pkgconfigdir=]pkg_default)
++AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
++m4_popdef([pkg_default])
++m4_popdef([pkg_description])
++]) dnl PKG_NOARCH_INSTALLDIR
++
+ # PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
+ #                  [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
+ #                  [DESCRIPTION], [DEFAULT])
diff --git a/dev-util/pkgconf/pkgconf-0.8.1.ebuild b/dev-util/pkgconf/pkgconf-0.8.1.ebuild
index 7f6a2203a251..51f80f53b2d2 100644
--- a/dev-util/pkgconf/pkgconf-0.8.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.8.1.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-util/pkgconf/pkgconf-0.8.1.ebuild,v 1.1 2012/07/21 03:56:04 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconf/pkgconf-0.8.1.ebuild,v 1.2 2012/07/21 06:35:44 jdhore Exp $
 
 EAPI="4"
 
@@ -31,6 +31,7 @@ RDEPEND="${DEPEND}
 	)"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-newm4.patch
 	[[ -e configure ]] || AT_M4DIR="m4" eautoreconf
 }