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/simage/ChangeLog b/media-libs/simage/ChangeLog
index b81b4a4ca856a04fd66aef730ceee9cf1f764786..0ac45f7c88870d6ef672e1889bee9800adf4d312 100644 (file)
--- a/media-libs/simage/ChangeLog
+++ b/media-libs/simage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/simage
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/ChangeLog,v 1.1 2010/06/25 23:17:24 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/ChangeLog,v 1.2 2010/06/29 06:22:10 reavertm Exp $
+
+  29 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> simage-1.7.0.ebuild,
+  +files/simage-1.7.0-pkgconfig-partial.patch:
+  Remove excessive linking in pkgconfig (move link deps to Libs.private)
 
 *simage-1.7.0 (25 Jun 2010)
 

diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 45d726d589dfe81028413a6f2960198948054c71..60b9eae8b85c5297ea65cd417151f99f8600abae 100644 (file)
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,4 +1,5 @@
+AUX simage-1.7.0-pkgconfig-partial.patch 468 RMD160 42d54481125f99f32943c77863c2ce0500d106e4 SHA1 ccba77070c0d9f7518117426e7cda4cde15e0968 SHA256 2ae9cb1a65d8d7c5254cc4a607f83d16a5e410f45c9c3069af8200241c25751a
 DIST simage-1.7.0.tar.gz 752602 RMD160 be5e13c0acc345a39f4686e3121222faa3cdbd51 SHA1 32b2bbfd7f2e7ec3591f506094c9d006e4af3921 SHA256 c9a0c43e45f825c46941789f5a8f6c3b61da5ac87e4088cb611ac0fead494def
-EBUILD simage-1.7.0.ebuild 1664 RMD160 2adaaa14a3adbf9feebc526dffe7b1d4275ac5e7 SHA1 b042cdba59d7e3645f8f555b81c24e587acfbb65 SHA256 f3bb479154a922b06ff6a8aaf75cb1043e661a4f9742746873db11da02d44030
-MISC ChangeLog 393 RMD160 ef24fd140ad3b97e79e82e0c9625c781d218df6a SHA1 3e6d25dbe9feb8a78e47c17bff447d2b4eb101ff SHA256 c8848ac01e68b3a611e938e952045ab7dc8dd9c8d3c688e1018b34f0273e5b40
+EBUILD simage-1.7.0.ebuild 1823 RMD160 4959fa3f408875e711d876779dc93355b5001372 SHA1 5e4bcf1e8437254b6f83be1166cc65a2e6fff1fd SHA256 18fbd08942c28db1b9ea70a63763a67daa91ec873018760336130dc3d6ac8dae
+MISC ChangeLog 589 RMD160 6d8b8eade93e3b8731ee7d97b082c7d9ff43d9cb SHA1 1bad90f420283702b153cdeaffe9684255b09fb0 SHA256 6b54690a24f7277abf2d792e11181d19f5d1a4e68fbe90830b2f1a460d3cb423
 MISC metadata.xml 223 RMD160 d5189fe7f8f603fb9e67951b617d0ad517ad1bb0 SHA1 6e59101bd30c63151d80cee3be02a18d95bf2020 SHA256 88de6fef5837fc6140830f1ef762f603831f0a13c8d7ceefe80963555d541ea7

diff --git a/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch b/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch
new file mode 100644 (file)
index 0000000..94392a1
--- /dev/null
+++ b/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch
@@ -0,0 +1,13 @@
+diff -ru ../simage-1.7.0/simage.pc.in ./simage.pc.in
+--- ../simage-1.7.0/simage.pc.in       2010-02-26 16:47:31.000000000 +0100
++++ ./simage.pc.in     2010-06-28 19:22:20.521610092 +0200
+@@ -8,7 +8,8 @@
+ Version: @VERSION@
+ Requires:
+ Conflicts:
+-Libs: -L${libdir} @SIMAGE_EXTRA_LDFLAGS@ @SIMAGE_EXTRA_LIBS@
++Libs: -L${libdir} -lsimage
++Libs.private: -L${libdir} @SIMAGE_EXTRA_LIBS@
+ Cflags: -I${includedir} @SIMAGE_EXTRA_CFLAGS@ @SIMAGE_EXTRA_CPPFLAGS@
+ 
+ simage_host="@host@"

diff --git a/media-libs/simage/simage-1.7.0.ebuild b/media-libs/simage/simage-1.7.0.ebuild
index f4ea2cf24f06f2d72b9b18a90c80d0a2ce3532d4..0f56df933be7d5df72cd6fdf584859510c6b200a 100644 (file)
--- a/media-libs/simage/simage-1.7.0.ebuild
+++ b/media-libs/simage/simage-1.7.0.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/simage/simage-1.7.0.ebuild,v 1.1 2010/06/25 23:17:24 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/simage/simage-1.7.0.ebuild,v 1.2 2010/06/29 06:22:10 reavertm Exp $
 
 EAPI=2
 
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
 
 DOCS=(AUTHORS ChangeLog NEWS README)
 
+PATCHES=(
+       "${FILESDIR}/${PN}-1.7.0-pkgconfig-partial.patch"
+)
+
 # --with-pic, two defined (PIC and one for image format, sillyt), no not pass
 # --enable-qimage, broken Qt checks, unable to locate FHS-compliant Qt install
 # --with-x, not used anywhere
@@ -61,7 +65,11 @@ src_configure() {
 }
 
 src_install() {
+       # Remove simage from Libs.private
+       sed -e '/Libs.private/s/ -lsimage//' -i simage.pc || die
+
        base_src_install
+
        # Remove libtool files when not needed.
        use static-libs || rm -f "${D}"/usr/lib*/*.la
 }