Remove excessive linking in pkgconfig (move link deps to Libs.private)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 26 insertions, 4 deletions

diff --git a/media-libs/coin/ChangeLog b/media-libs/coin/ChangeLog
index 53c44e3b31b2..fefe1370ec96 100644
--- a/media-libs/coin/ChangeLog
+++ b/media-libs/coin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/coin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.36 2010/06/27 05:37:07 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/ChangeLog,v 1.37 2010/06/29 06:29:26 reavertm Exp $
+
+  29 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> coin-3.1.3-r1.ebuild,
+  +files/coin-3.1.3-pkgconfig-partial.patch:
+  Remove excessive linking in pkgconfig (move link deps to Libs.private)
 
   27 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> coin-3.1.3-r1.ebuild:
   Add note about expat unbundling being broken, remove expat workaround (as
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index c2ab65c3103d..2f07f2f4c049 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,7 +1,8 @@
 AUX coin-3.1.0-javascript.patch 1259 RMD160 b5d2b39d7f75bf975efde6e2e96f21ba97894fc0 SHA1 8ab2f91bc9fdf1e23ba49f9cd2cd4f50810dd7aa SHA256 179489dfd99872150cc229d4f9d1bd40a03c67df5daad20741ff8b3a1874a883
+AUX coin-3.1.3-pkgconfig-partial.patch 447 RMD160 06055dc4f485b5af2dafc41eadeebc10fecf5626 SHA1 760ecb2fbd376509dcd33714989a4cc39fe60fa9 SHA256 ee97a13717efb9fbaed10d0a1cdaeccd473a9fcac080b980b669ebf5c42da009
 DIST Coin-3.1.0.tar.gz 5632452 RMD160 0fd8125b08be4d623d2ded14feceb0c70b45eec4 SHA1 369f3b28baa7725ab2a3f0f2cf4ccaa191fcecc5 SHA256 81ec8c4bf0daca6718d6b59eca76354f5f9e1c5a19c20dd4fa173d65f04cb899
 DIST Coin-3.1.3.tar.gz 5981534 RMD160 e57fd6a4876a06874429f9ad6b96f166f5609362 SHA1 8e9f05628461963623686d3ec53102214e233dd1 SHA256 583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417
 EBUILD coin-3.1.0.ebuild 1666 RMD160 79cba148c500a2246c814dff55cf3505fc039dc9 SHA1 acb72332065b1a2a8163c5235c3289d691c0c186 SHA256 985d0c3d0de3e164994cd1006ef8b6ce0932928ed5b082acbd41b9c075a046b0
-EBUILD coin-3.1.3-r1.ebuild 2349 RMD160 859e033abf8fa4984848f135d6f2af88e64a0e65 SHA1 015669bed52aef3b4691fd89db240669e3cc8813 SHA256 3f84b3ee0402fb842c18eee36cf3fb8101a4574f086d6af39dd73827e3509430
-MISC ChangeLog 5279 RMD160 c23b634aa67b1d900238d18f036e1c4f4d632408 SHA1 c8fcb47714a0c278b424e5bc793a83151003f45f SHA256 fc7240fad0d0f5d9f5aa4af13cc703505e918904b837b5acc365cf98caf3afe1
+EBUILD coin-3.1.3-r1.ebuild 2488 RMD160 09a472e9994ca907caa74b10986375404f661e6e SHA1 35d6b964edb8f5b48da79c04af71fb421fad7657 SHA256 4565bcc4f12ce7043de26cf684ce369d6dfb1c67e714f5774d6e093406be5962
+MISC ChangeLog 5474 RMD160 89942916cb7a66705fb228f15b33c7b1a003bda0 SHA1 15de6f792b1488df5c46ace3fc743c51de6fd76a SHA256 3975de0b4b0cedd7468eaaa7068f61713fbb118d066f396ab5a1d60b497f00b0
 MISC metadata.xml 321 RMD160 82d4bf8ca9bbd023d90c6980429208533fc48660 SHA1 950908467325aba69bb4f18a295417a57f3af6ef SHA256 a198ab6bfdd62b7e7d7f006192ef7aed6d002174bae40e0af3b43668019fd962
diff --git a/media-libs/coin/coin-3.1.3-r1.ebuild b/media-libs/coin/coin-3.1.3-r1.ebuild
index 9f9c74a52ad4..a08a7bcc2fde 100644
--- a/media-libs/coin/coin-3.1.3-r1.ebuild
+++ b/media-libs/coin/coin-3.1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3-r1.ebuild,v 1.2 2010/06/27 05:37:07 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-3.1.3-r1.ebuild,v 1.3 2010/06/29 06:29:26 reavertm Exp $
 
 EAPI=2
 
@@ -48,6 +48,7 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.1.0-javascript.patch"
+	"${FILESDIR}/${PN}-3.1.3-pkgconfig-partial.patch"
 )
 
 src_configure() {
@@ -88,6 +89,9 @@ src_configure() {
 }
 
 src_install() {
+	# Remove Coin from Libs.private
+	sed -e '/Libs.private/s/ -lCoin//' -i Coin.pc || die
+
 	base_src_install
 
 	# Remove libtool files when not needed.
diff --git a/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
new file mode 100644
index 000000000000..a6dc1fa5f1e2
--- /dev/null
+++ b/media-libs/coin/files/coin-3.1.3-pkgconfig-partial.patch
@@ -0,0 +1,13 @@
+diff -ru ../Coin-3.1.3/Coin.pc.in ./Coin.pc.in
+--- ../Coin-3.1.3/Coin.pc.in	2010-03-02 14:20:09.000000000 +0100
++++ ./Coin.pc.in	2010-06-28 19:27:59.634534460 +0200
+@@ -10,7 +10,8 @@
+ Version: @COIN_VERSION@
+ Requires:
+ Conflicts:
+-Libs: -L${libdir} @COIN_EXTRA_LDFLAGS@ @COIN_EXTRA_LIBS@
++Libs: -L${libdir} -lCoin
++Libs.private: -L${libdir} @COIN_EXTRA_LIBS@
+ Cflags: -I${includedir} @COIN_EXTRA_CFLAGS@ @COIN_EXTRA_CPPFLAGS@
+ 
+ coin_host=@host@