summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2010-06-29 06:50:57 +0000
committerMaciej Mrozowski <reavertm@gentoo.org>2010-06-29 06:50:57 +0000
commitbaa3b0a6b0dd951d62bd81d2853e1b083cb5bfb0 (patch)
tree52a3e7d4afbe541d2d107c10bd6bd17c03a8ee4b /media-libs
parentReorder (diff)
downloadgentoo-2-baa3b0a6b0dd951d62bd81d2853e1b083cb5bfb0.tar.gz
gentoo-2-baa3b0a6b0dd951d62bd81d2853e1b083cb5bfb0.tar.bz2
gentoo-2-baa3b0a6b0dd951d62bd81d2853e1b083cb5bfb0.zip
Remove excessive linking in pkgconfig (move link deps to Libs.private)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/SoQt/ChangeLog6
-rw-r--r--media-libs/SoQt/SoQt-1.5.0-r1.ebuild9
-rw-r--r--media-libs/SoQt/files/SoQt-1.5.0-pkgconfig-partial.patch13
3 files changed, 26 insertions, 2 deletions
diff --git a/media-libs/SoQt/ChangeLog b/media-libs/SoQt/ChangeLog
index e51253f30ffa..7dc0231ced53 100644
--- 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/SoQt-1.5.0-r1.ebuild b/media-libs/SoQt/SoQt-1.5.0-r1.ebuild
index 9b7f1782bd4d..aeb45ff0e432 100644
--- 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
index 000000000000..1fae9fe8c8ab
--- /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@