Fix tests to match new CFLAGS behavior; bug #146551

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index d9b1698c1f1eee8370dea98c21e78dad0f01d394..1ffb83c1b34139ade8ccbd963ca27138a1dcfe5e 100644 (file)
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/pkgconfig
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.52 2006/11/06 22:38:14 flameeyes Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.53 2007/01/04 02:05:50 dang Exp $
+
+  04 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/pkg-config-0.21-fix-tests.patch, pkgconfig-0.21-r1.ebuild:
+  Fix tests to match new CFLAGS behavior; bug #146551
 
 *pkgconfig-0.21-r1 (06 Nov 2006)
 

diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index ba73f5b7936eb1e7124a176ae7b6dc762b217982..2f21a55ff653839b95d1cc7d1cb11dbb130801e7 100644 (file)
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pkg-config-0.21-fix-tests.patch 1029 RMD160 a6cd5a4da990ab3d8d83b2f81bbe0416da07f217 SHA1 b5c4ff5fe983c042592f3b1436a9c5cb02406fb6 SHA256 13b6fe6acdf0ecdf4530887b26201ae4f46c3a255a18061ddff0866e154b2589
+MD5 dc3e135c437dcb3bf030f100bfc80aa9 files/pkg-config-0.21-fix-tests.patch 1029
+RMD160 a6cd5a4da990ab3d8d83b2f81bbe0416da07f217 files/pkg-config-0.21-fix-tests.patch 1029
+SHA256 13b6fe6acdf0ecdf4530887b26201ae4f46c3a255a18061ddff0866e154b2589 files/pkg-config-0.21-fix-tests.patch 1029
 DIST pkg-config-0.19.tar.bz2 717032 RMD160 8a2f5fda648e53e38534b58410618614bd1f0b32 SHA1 a93d762d70866983dfdc2ec6588989386dd33674 SHA256 6eb6e8e005c38ce10c5bd242637b3474ffdc93230bc66eb1f1d32f33573b8236
 DIST pkg-config-0.20.tar.gz 969993 RMD160 2ebea903646e405d8e9a9e43648de445041499a6 SHA1 285a486e2cf97e3c6bcb3eec9a7fed299031eb6e SHA256 a047fe95564d7afde6b52382d57754c27a40af813d9c73f338083890da416f05
 DIST pkg-config-0.21.tar.gz 998420 RMD160 6d48e449a3cedb576c0f54b08825be6ab684d955 SHA1 b2508ba8404cad46ec42f6f58cbca43ae59d715f SHA256 e8831f43c8126a5da32502901c58cc1a39effe045dd2932e6e273cc8d67f633f
@@ -17,18 +21,18 @@ EBUILD pkgconfig-0.20.ebuild 836 RMD160 82a146aac4e5430c8c3ada79e32394d712999f63
 MD5 c2cc3090c17e905ee0b0fe02db61b9cf pkgconfig-0.20.ebuild 836
 RMD160 82a146aac4e5430c8c3ada79e32394d712999f63 pkgconfig-0.20.ebuild 836
 SHA256 c66c0b122b743827308282998a763ff7a27a2dfbd9e895ab0af4162c8e65a98c pkgconfig-0.20.ebuild 836
-EBUILD pkgconfig-0.21-r1.ebuild 1145 RMD160 8c25f55b28f9664f576437df5ca217240fe3f8f9 SHA1 1c23866a301ca5fa44075ec68602f701c13f2202 SHA256 d20d51d06c447888ada93c1a2bbb886fe6c38e315e1969654497297b599ac951
-MD5 b34a34e87aabf4cab33f9ddfd1969d81 pkgconfig-0.21-r1.ebuild 1145
-RMD160 8c25f55b28f9664f576437df5ca217240fe3f8f9 pkgconfig-0.21-r1.ebuild 1145
-SHA256 d20d51d06c447888ada93c1a2bbb886fe6c38e315e1969654497297b599ac951 pkgconfig-0.21-r1.ebuild 1145
+EBUILD pkgconfig-0.21-r1.ebuild 1203 RMD160 c7464da2b8c43deea71b84234b9cc23008b9e50e SHA1 a763cf30daee897f1f29d07bf15fb877e7af74fe SHA256 2029138669f144ee0f1b865cc3bf02e4ec96ef28d03ff39ff02601305aaf9b9c
+MD5 6795fd3d297279f4bd285df658c2edc8 pkgconfig-0.21-r1.ebuild 1203
+RMD160 c7464da2b8c43deea71b84234b9cc23008b9e50e pkgconfig-0.21-r1.ebuild 1203
+SHA256 2029138669f144ee0f1b865cc3bf02e4ec96ef28d03ff39ff02601305aaf9b9c pkgconfig-0.21-r1.ebuild 1203
 EBUILD pkgconfig-0.21.ebuild 859 RMD160 1662b6b3799d938f205892d9088c1dd670b3d110 SHA1 04913ad821ce922b94217cb3a74a8cdb51ffeb98 SHA256 da157a07e7f2dd2b8816fa7e9ddfba4331f54b4c767dcfeb6cfee0f2f7454f54
 MD5 9486e50f6a6b1eacf784b8f401440ed2 pkgconfig-0.21.ebuild 859
 RMD160 1662b6b3799d938f205892d9088c1dd670b3d110 pkgconfig-0.21.ebuild 859
 SHA256 da157a07e7f2dd2b8816fa7e9ddfba4331f54b4c767dcfeb6cfee0f2f7454f54 pkgconfig-0.21.ebuild 859
-MISC ChangeLog 6223 RMD160 6f6d616b5fae989a75e26ccad2f057b74e007bc9 SHA1 691bcb9c162d05cdd8d4646fbc869fa022e7ffd2 SHA256 7ee1bc09f0169a69f499ba23861ba18b3d8a5e14e68abfd0e9e376435eeb5d1b
-MD5 fb0e07c4369af55d456067ceb49ac804 ChangeLog 6223
-RMD160 6f6d616b5fae989a75e26ccad2f057b74e007bc9 ChangeLog 6223
-SHA256 7ee1bc09f0169a69f499ba23861ba18b3d8a5e14e68abfd0e9e376435eeb5d1b ChangeLog 6223
+MISC ChangeLog 6392 RMD160 c02195119bdf78ca114e1cdf24d939d8e6433460 SHA1 40d819b50ed988f6c54eb65f5fd28a1b09f401ac SHA256 2d97c57255477ac3dc926dd393b99fa59946080c96fe8283e2cc80d88bca1e4d
+MD5 5d5f74221a023946798028dc963ca9b9 ChangeLog 6392
+RMD160 c02195119bdf78ca114e1cdf24d939d8e6433460 ChangeLog 6392
+SHA256 2d97c57255477ac3dc926dd393b99fa59946080c96fe8283e2cc80d88bca1e4d ChangeLog 6392
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -49,9 +53,9 @@ MD5 819dd476d23bd1a6007bd59c9355223b files/digest-pkgconfig-0.21-r1 247
 RMD160 bc868ea68b938f2e17c8195239ba7459deb7a92a files/digest-pkgconfig-0.21-r1 247
 SHA256 c5315da02b7dc78fcd42a01cd88c381ba1dafc707e6b3c4708f935ef8f25c6b1 files/digest-pkgconfig-0.21-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFT7llAiZjviIA2XgRAm7OAJ4u5QshMxMv05RKAS1OSRVTTh0vcgCg3L23
-fZlzS2T5FGA/2B91G1c9INY=
-=4i97
+iD8DBQFFnGDYomPajV0RnrERAjvfAKCBBSWMdcrPbgcCNPAL1jglzLljNwCfeNr6
+vp+5LMdJHUfxTNbXwDsEGJE=
+=SWZl
 -----END PGP SIGNATURE-----

diff --git a/dev-util/pkgconfig/files/pkg-config-0.21-fix-tests.patch b/dev-util/pkgconfig/files/pkg-config-0.21-fix-tests.patch
new file mode 100644 (file)
index 0000000..8c98166
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkg-config-0.21-fix-tests.patch
@@ -0,0 +1,22 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN pkg-config-0.21.orig/check/check-requires-private pkg-config-0.21/check/check-requires-private
+--- pkg-config-0.21.orig/check/check-requires-private  2006-08-16 13:05:30.000000000 -0400
++++ pkg-config-0.21/check/check-requires-private       2007-01-03 20:49:56.000000000 -0500
+@@ -9,14 +9,14 @@ set -e
+ 
+ . ${srcdir}/common
+ 
+-# expect cflags from requires-test and public-dep
++# expect cflags from requires-test, public-dep, and private-dep
+ ARGS="--cflags requires-test"
+-RESULT="-I/requires-test/include -I/public-dep/include"
++RESULT="-I/requires-test/include -I/private-dep/include -I/public-dep/include"
+ run_test
+ 
+-# still expect those cflags for static linking case
++# still expect cflags from requires-test, public-dep, and private-dep
+ ARGS="--static --cflags requires-test"
+-RESULT="-I/requires-test/include -I/public-dep/include"
++RESULT="-I/requires-test/include -I/private-dep/include -I/public-dep/include"
+ run_test
+ 
+ # expect libs for just requires-test and public-dep

diff --git a/dev-util/pkgconfig/pkgconfig-0.21-r1.ebuild b/dev-util/pkgconfig/pkgconfig-0.21-r1.ebuild
index a84f09c756c969c6587449127bf7b99e94e0534a..3b4964d77617352b1ccebf33742201b7a69ad56b 100644 (file)
--- a/dev-util/pkgconfig/pkgconfig-0.21-r1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.21-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.21-r1.ebuild,v 1.1 2006/11/06 22:38:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.21-r1.ebuild,v 1.2 2007/01/04 02:05:50 dang Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 MY_P="pkg-config"-${PV}
 DESCRIPTION="Package config system that manages compile/link flags"
@@ -22,6 +22,9 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
        unpack "${A}"
+       cd "${S}"
+
+       epatch ${FILESDIR}/${MY_P}-fix-tests.patch
 
        use ppc64 && use hardened && replace-flags -O[2-3] -O1
 }