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

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

diff --git a/media-libs/SoQt/ChangeLog b/media-libs/SoQt/ChangeLog
index e51253f30ffa83051f014949e77460d0f17b41ab..7dc0231ced53f369068ae96cdb51edfe0ff627ea 100644 (file)
--- a/media-libs/SoQt/ChangeLog
+++ b/media-libs/SoQt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/SoQt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/ChangeLog,v 1.30 2010/06/26 14:13:54 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/ChangeLog,v 1.31 2010/06/29 06:50:56 reavertm Exp $
+
+  29 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> SoQt-1.5.0-r1.ebuild,
+  +files/SoQt-1.5.0-pkgconfig-partial.patch:
+  Remove excessive linking in pkgconfig (move link deps to Libs.private)
 
 *SoQt-1.5.0-r1 (26 Jun 2010)
 

diff --git a/media-libs/SoQt/Manifest b/media-libs/SoQt/Manifest
index 34c2ebd3abf072fb7e2b8c37c0f21a75a638d2ec..f52c1c3bbfef77876086065884beab6e0b7303c8 100644 (file)
--- a/media-libs/SoQt/Manifest
+++ b/media-libs/SoQt/Manifest
@@ -1,9 +1,10 @@
 AUX SoQt-1.4.1-gcc44.patch 674 RMD160 18e053a9d51c371092a88ef0e737d91d857b35e0 SHA1 b3c33e3162f8f58ee39bf7a81a2c60046cc569fc SHA256 cb9252174e0d0ecb018289056ad4fb6c034d95da7dbdd341b4bf94958d42a563
+AUX SoQt-1.5.0-pkgconfig-partial.patch 457 RMD160 817a7de0147e605ff48979de241a79dfefc81157 SHA1 697350776e186f8d83c61ecaab11a0615a079e18 SHA256 c2c9838afb413b09a154f6e908d9cc051ba084168de4a184fbffca255dd38196
 DIST SoQt-1.4.1.tar.gz 1706403 RMD160 5978543ff90db0943675bd3acf883849b42d3586 SHA1 bbbb4eedf308fa4ea46bb20700cb5bbdc39fe85f SHA256 741449af3619a60995d27838d94b8a77e6f8bedf00d6fd3745a8d15cbaaea1ea
 DIST SoQt-1.4.2_alpha1841.tar.bz2 1100526 RMD160 404b5a587b1ea610051404ad78d49950a2b69196 SHA1 02f2478d2873cea9c967a582268bb31a58b0d1ed SHA256 5506ee1417e165cfb4c5d9023d317253d933caa87be671820419189d7d6982e3
 DIST SoQt-1.5.0.tar.gz 1515230 RMD160 04e9179954f7e3bfb5d1c595ad6c62215bc24ad2 SHA1 c64f00f8c219b69f10ddfffe6294fb02be73dd20 SHA256 f6a34b4c19e536c00f21aead298cdd274a7a0b03a31826fbe38fc96f3d82ab91
 EBUILD SoQt-1.4.1.ebuild 1139 RMD160 00e1828884671f8754e57b91a1add217789383cc SHA1 ea4886233d8a8ce58ad1fbfddeea5282f0edeed4 SHA256 1462045db2ce9aa398bb3cd29531ebaf399faa5c2b349488cc1a879c317a59c9
 EBUILD SoQt-1.4.2_alpha1841.ebuild 879 RMD160 de72e00e276906371a979f00c5e5b3b66c086b13 SHA1 df4e898ea1fa517e3b1967e3765b19873102ae12 SHA256 e19e08d59cbbc94f9ec54af408602e67120898f766a9f78e884bb4559254095e
-EBUILD SoQt-1.5.0-r1.ebuild 1179 RMD160 e084d342fc138cf31a03b4c245567eefbc9fb919 SHA1 998a5de0f3e77301076f0bda4ee347c720a76c92 SHA256 b399a0a5c43e2e1c4179955c7107013784127134dcb212a7ef55e57a530c6f60
-MISC ChangeLog 4366 RMD160 a597c4404548022b4b1a82b22f9851c5a601bc40 SHA1 7480ce0a5b51bef1e1befbd8d62c36973eeaba52 SHA256 a612fda60ada899924e09cb373dbeca70a0b55df2d5d3901d7fae6bfbb82be2a
+EBUILD SoQt-1.5.0-r1.ebuild 1331 RMD160 e5478a453b559a104bb3ce93923ae8ded6a5667c SHA1 d2f5a466d7aa751d1f089a54bdc5c1fd89ceec10 SHA256 ef8ce89f5a75293c540b380ae5d6139fdb71a0422ebe84ee2587fb7a8e646783
+MISC ChangeLog 4561 RMD160 9ae5beb2ba47e44901842deab2ec23544e3432e4 SHA1 97d21077e9aac29e32ff82cf97ef356039a5e3f0 SHA256 de0f4f1350524c8ca36e7042c7c310f66aa70eb6dc40ac59c6fdb054d5dc1780
 MISC metadata.xml 227 RMD160 dc9b58ed10c2265b4cf8b84c30fd9a75615bd8c2 SHA1 e76b08f415dbb66b3f2c67bbbea38f3523104caa SHA256 f0051e36f8cb72cc6a4e991fd7aa60cf8a59cfdc133d93502bc6af6cdaae7129

diff --git a/media-libs/SoQt/SoQt-1.5.0-r1.ebuild b/media-libs/SoQt/SoQt-1.5.0-r1.ebuild
index 9b7f1782bd4def56e9760529e2581a28908f8699..aeb45ff0e4321caf800ba8438d3c97c8ea0db278 100644 (file)
--- a/media-libs/SoQt/SoQt-1.5.0-r1.ebuild
+++ b/media-libs/SoQt/SoQt-1.5.0-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/SoQt/SoQt-1.5.0-r1.ebuild,v 1.1 2010/06/26 14:13:54 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-1.5.0-r1.ebuild,v 1.2 2010/06/29 06:50:56 reavertm Exp $
 
 EAPI="2"
 
@@ -27,6 +27,10 @@ DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )
 "
 
+PATCHES=(
+       "${FILESDIR}/${PN}-1.5.0-pkgconfig-partial.patch"
+)
+
 DOCS=(AUTHORS ChangeLog FAQ HACKING NEWS README)
 
 src_configure() {
@@ -46,6 +50,9 @@ src_configure() {
 }
 
 src_install() {
+       # Remove SoQt from Libs.private
+       sed -e '/Libs.private/s/ -lSoQt//' -i SoQt.pc || die
+
        base_src_install
 
        # Remove libtool files when not needed.

diff --git a/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch b/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch
new file mode 100644 (file)
index 0000000..1fae9fe
--- /dev/null
+++ b/media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch
@@ -0,0 +1,13 @@
+diff -ru ../SoQt-1.5.0/SoQt.pc.in ./SoQt.pc.in
+--- ../SoQt-1.5.0/SoQt.pc.in   2010-03-02 23:57:41.000000000 +0100
++++ ./SoQt.pc.in       2010-06-29 08:36:14.288413544 +0200
+@@ -10,7 +10,8 @@
+ Version: @SOQT_VERSION@
+ Requires: Coin
+ Conflicts:
+-Libs: -L${libdir} @SOGUI_EXTRA_LDFLAGS@ @SOGUI_EXTRA_LIBS@
++Libs: -L${libdir} -lSoQt
++Libs.private: -L${libdir} @SOGUI_EXTRA_LIBS@
+ Cflags: -I${includedir} @SOGUI_EXTRA_CFLAGS@ @SOGUI_EXTRA_CPPFLAGS@
+ 
+ soqt_host=@host@