Make sure Libs.Private in the .pc file is set correctly.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

5 files changed, 40 insertions, 19 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 9473e795fe26..5dc45fe098f4 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.199 2012/04/21 06:33:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.200 2012/04/24 14:43:41 vapier Exp $
+
+  24 Apr 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/pciutils-3.1.9-static-pc.patch, pciutils-3.1.9-r1.ebuild,
+  pciutils-3.1.9-r2.ebuild:
+  Make sure Libs.Private in the .pc file is set correctly.
 
   21 Apr 2012; Mike Frysinger <vapier@gentoo.org> pciutils-3.1.9-r2.ebuild:
   Restore ~arch keywords #410401.
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index cfb544889375..9bd9800f4367 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -7,6 +7,7 @@ AUX pciutils-2.2.7-update-pciids-both-forms.patch 717 RMD160 b900f82cf519d602ec2
 AUX pciutils-3.1.4-install-lib.patch 1548 RMD160 42d82a6b4616577f60039236f60355672d6ba540 SHA1 846e763c4cf001ff10d2cbfb429ddd3a4d74a85c SHA256 ce1f27cf8d76f441e976e2379ac587553a8a790a5ea7d7f451d74d17e041357d
 AUX pciutils-3.1.7-fbsd.patch 289 RMD160 ed741fd03a35c3bd28715a2eb9d84a51c65fc840 SHA1 e6957db6d54d446818fad874f606af29ea407d95 SHA256 801b01e0698711fc3695e6d8c2f088c88756d912ac561eda3d617fecf5556af4
 AUX pciutils-3.1.7-install-lib.patch 1507 RMD160 15d74ee481137937d60216b45354c035d6b37055 SHA1 a5f03e474d2a824355d97024d353fede8fa8ec44 SHA256 d1c5179274e238c619f751aeb8c3b992f2f4fe884a3d69cbca61acf18667d81c
+AUX pciutils-3.1.9-static-pc.patch 373 RMD160 e1e4529461bfdf116a2803a68a459ca1bd17f38c SHA1 5e3b6ee87aa6d53382a63bdde5f8f7e116a3b637 SHA256 81f8c664cf844adfe2238f6dc584100340de8781d361cb185035d5928aee82fe
 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
 DIST pciutils-3.1.4.tar.gz 305747 RMD160 86ed925d1345e8050aa990ce212fff114e569111 SHA1 eafde87ac5bb3f0bcabc98461f22a23f8e7229f2 SHA256 676b941ddaf912387092c6925597b14cef4f35f495bdbb229c1e5947151a1b20
 DIST pciutils-3.1.7.tar.gz 320603 RMD160 2d81a6a7fdf06889f7d5954dff716bb0516ffd20 SHA1 58336ef8c1bbe870f2cc0ed9481a8cf8a58e039c SHA256 0f39818eabd793bb48d5b98ca52141d8247306a85876482c0075d0c95aeccea2
@@ -16,25 +17,25 @@ EBUILD pciutils-3.1.4.ebuild 1852 RMD160 375f032c885dada98b812e05c6a70dd37677622
 EBUILD pciutils-3.1.7-r1.ebuild 1883 RMD160 6cb7d60afdf40115ed1f1c827ad879c5dca5fc86 SHA1 53ec5d2b9155c63de474541fc3929b24415b86db SHA256 c07867031c2737799543b80d07173b04613054b51c398ed3503f0914efe6b97d
 EBUILD pciutils-3.1.7.ebuild 1870 RMD160 f59bfdbd557bb890a160fb29aa645dd5bd6e0af5 SHA1 66486a2b852eba8683919e4c980ae6f35e3232a7 SHA256 cd6a33fb8a6369c4f7e15d165dfd416bed36243c0eb7dc929f792caffb23653d
 EBUILD pciutils-3.1.8.ebuild 1884 RMD160 1502f24c6ef8293c1dfb38b72e24c709a379291a SHA1 3011cc093aa321636555800f43d5d8d7206f1d44 SHA256 bbbcf3e2ffb42d3f9ef84af2586cb7dfa8bc41d168e9daf8601580a8307fccb0
-EBUILD pciutils-3.1.9-r1.ebuild 1928 RMD160 10b65aac8035fcd246e5eb320f0507d3cc3e7032 SHA1 ac8745a1ef0f2191bb6c62d4f2ac7f118cd9d090 SHA256 d95ddb8ecb5822fd957a8a15b58d57eeded339420c955bb736c7e23fd85fe1d4
-EBUILD pciutils-3.1.9-r2.ebuild 2007 RMD160 bc01d4239449c857af13f48763765f031f8040a6 SHA1 df859cdf00e76567b45376515d957f9084b1630d SHA256 b04083c97108511fb3903ac6d5332f77b4452c969135c2315d8216ab76e00027
+EBUILD pciutils-3.1.9-r1.ebuild 1977 RMD160 f4a09fa71348e97b2318365df6893e8f9dff5a2f SHA1 ef3bfeb638bddd10dd5c79ccf3b05071ddb11d96 SHA256 79a35a59d7b2571fce8bd61bda7fec77859cd14e9ab8e77452b260844831bf1e
+EBUILD pciutils-3.1.9-r2.ebuild 2057 RMD160 4e4dd2ab03165d1147cc45eed2309ef0644a26f8 SHA1 e98b05a7dec498393d281e7b0be56160ab9fc1f0 SHA256 edc620754d2f79604d8a56d26b1a61a2f942e90f36a7f35d32bcb39460a08e3d
 EBUILD pciutils-3.1.9.ebuild 1797 RMD160 fc67390ac9e35aa5efa81a37d77275742a5cb395 SHA1 1eb5ba901c3cc175ca76c1eb6bd9c1f7a580ecd2 SHA256 79b5892336135a7eeee050dd67aaf74f97ff4fadf594de567adbea748aa12ac8
-MISC ChangeLog 26138 RMD160 4409b6042fa704b62926624b6ebeb3bc0eb123c1 SHA1 55a64678a16b5ad2ed8c2b4ce647083db380f29d SHA256 652b6fbde02e439678389af25d40cf65d79c741cb17c37d81816bd8f035ce90d
+MISC ChangeLog 26343 RMD160 03f5df33dcac2d4d677b33ea01f9ec2236705065 SHA1 47d0316c02e88b5bff6f602f297e3de679134fda SHA256 f6dfed2452a057557e879bdbcf65f06250de75bc4e9a6216b3e05a2f46199316
 MISC metadata.xml 384 RMD160 47a8075a8d2431dd41a0e81d27f383235f6f1b9c SHA1 2ea81a6202a81879bdaa52cda253ff0118d71e02 SHA256 6e4cdaeea704436ddddb3669f7766fc8ec9b9c62290145a49859d29c907dead8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPklUVAAoJELEHsLL7fEFW6tMQAIYLxllwSJb9p2M6eRai6pG3
-OU7xpe7FAiu9oM/t5o5Pntq2Enxlkma2dX705VVmLoaC+sst2BqEqK/NHzVmjAiZ
-Vwin+tge8BNRsWbTB6n2yMIhnfEk2oxUqgbwUu+9ToOMzM9lwn5ctr0PTqizhOMo
-UJKnuzONOp1AnWFsl1OkH8KqitleoVjItMv4TyRb7g+famX3cdtfyTLqQB2JCtIA
-Habk512z7JxdiLqvH0AgXoBhxKVekNK0pTV9xYZ1pZy8LKntavQWKFIuVcBvwkMg
-GRb08L0FbRiT8voFjy4ZQX7oNdeGirjxNtc2G7poSg9r25ZkXWkKGafYUGDXM1ES
-Wzaup1LmPTkaMGPYTNlj1LcyDRl4T/rQ4bkkdVJsFNcPUb0KmDoJSp0cS7lqjXRV
-fFrxlUP0/VwScAbCH3RxnpuKACDEuNW7ZvYfxIqaQfdXg++Mj6X+AQaS+7gKPO7r
-6wopTGwCs+iliH4mnjKK85aw6aqeGMKoeKk47dTCu3CjSfHV6vE9i4rEhTdRezHj
-1lv2fwatVHdKNPjco+fpIV+hNGHG2Vv+a9eEIYSLZbrCxdVc9V2JHB6pf4DVPSKJ
-NBLwsjcGgES0YSrvLUtb1fJyBElF2fQtsqFFg9jhJ42S3dqkh+rVb4U7QmXOOW9D
-X9/2Gv4n8D9qKe1JTpC0
-=0xek
+iQIcBAEBAgAGBQJPlrx/AAoJELEHsLL7fEFWSHEQAI/DDNybfS8/HVSlIBYwxlDC
+JRxySLSXZT/S9IaTne8UWqfuev5wVFLPvK9HGFJN2NtV+1cE7km1QAzCXoLwJWZ+
+sxv7haFqanaK/mD2KY2GK854vfMdvOi5Ydu0SM1N1gi1FPBWemZDDlp8KUoNeezF
+zWLLqpLYBWJrlOBFKp/D+/vPD+7i676itHqjGO4To/M0Ger9hdkWN1GX6nvqHLxi
+eVBhqLk2tnfI90wvadIsWPoaniAqh26jK6GbCLHMw+E9pVhbIxj45u3YdTJLr0sC
+GZGGqYZmygc3MOrO1hhijdg2yDn+4VHHSLkmdtgGm6oBFMFRZd+EQRtkrsmDPe2x
+2Rwm83EhNDgMT8xmeo9SMtqJ7dEHM6kRtGUc3pEjMJpm7WDc99iRqozEdFTthvHE
+axXl6Zpnd2oDVaFdfNhDR+9v4Aysb+jAnkWcZ0dd0AT3alymeKKCcVYPFLhIWoUO
+Tytf2R2kLzIm8oJgNsz0zVC+oHQqdU7m1pHuV+dmKzwXoicj6pjs0L2H+avhREW2
+4KClvtJGKoXG5gY7aweP2lw+JdjHVb++Urhn7ndD2ZjcppFodPk0Fn0c9KtdQQS8
+DiByQ+vQOxCWjeCHJLyOXHE45E/xc5FNWRqi09jrQyia2ImbiwM4Xg08tjzw2yT5
+bbpBxVwKaOx50JEGgjsR
+=NpRi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch b/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
new file mode 100644
index 000000000000..9e63b7ecd661
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
@@ -0,0 +1,13 @@
+make sure all lib entries get into libs.private in the .pc file
+
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -61,7 +61,7 @@ $(PCILIBPC): libpci.pc.in
+ 		-e 's,@LIBDIR@,$(LIBDIR),' \
+ 		-e 's,@IDSDIR@,$(IDSDIR),' \
+ 		-e 's,@VERSION@,$(VERSION),' \
+-		-e 's,@LDLIBS@,$(LDLIBS),'
++		-e 's,@LDLIBS@,$(LDLIBS) $(LIB_LDLIBS),'
+ 
+ init.o: init.c $(INCL)
+ access.o: access.c $(INCL)
diff --git a/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild b/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild
index f6f037cb1895..47c551323f23 100644
--- a/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.1.9-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/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild,v 1.8 2012/04/01 16:25:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9-r1.ebuild,v 1.9 2012/04/24 14:43:41 vapier Exp $
 
 EAPI="4"
 
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489
 	epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321
+	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
 
 	if use static-libs ; then
 		cp -pPR "${S}" "${S}.static" || die
diff --git a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild b/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild
index 5dd01f585a2c..0153c0804bcb 100644
--- a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild
+++ b/sys-apps/pciutils/pciutils-3.1.9-r2.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/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild,v 1.5 2012/04/21 06:33:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild,v 1.6 2012/04/24 14:43:41 vapier Exp $
 
 EAPI="4"
 
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489
 	epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321
+	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
 
 	if use static-libs ; then
 		cp -pPR "${S}" "${S}.static" || die