Fix underlinking (bug #369153)

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

4 files changed, 32 insertions, 15 deletions

diff --git a/x11-misc/launchy/ChangeLog b/x11-misc/launchy/ChangeLog
index 89b2604554e8..6427b25c1f81 100644
--- a/x11-misc/launchy/ChangeLog
+++ b/x11-misc/launchy/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for x11-misc/launchy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/launchy/ChangeLog,v 1.1 2011/04/15 22:02:15 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/launchy/ChangeLog,v 1.2 2012/07/29 18:38:14 angelos Exp $
+
+  29 Jul 2012; Christoph Mende <angelos@gentoo.org>
+  +files/launchy-2.5-underlink.patch, launchy-2.5.ebuild:
+  Fix underlinking (bug #369153)
 
 *launchy-2.5 (15 Apr 2011)
 
   15 Apr 2011; Christoph Mende <angelos@gentoo.org> +launchy-2.5.ebuild,
   +metadata.xml:
   Initial import
-
diff --git a/x11-misc/launchy/Manifest b/x11-misc/launchy/Manifest
index e537bd2654ba..46c78e27fc8c 100644
--- a/x11-misc/launchy/Manifest
+++ b/x11-misc/launchy/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST launchy-2.5.tar.gz 2926807 RMD160 e15a45443295b2391c6432365c569050618f64ab SHA1 7a6317168fe7aa219c138fbbc0f84539be9bce9e SHA256 93ec471423b77973a2118eaec64c7a1c05ce37b5bff41760336ebd14fc819500
-EBUILD launchy-2.5.ebuild 921 RMD160 69fa601f7768b16703205421952aa20cad765624 SHA1 c240577440e6540445c6a9f963ba5a6527b8a59d SHA256 604b31482ccb6408737b231459044b12789fed7eb60a23d35d9ae80de275342e
-MISC ChangeLog 342 RMD160 da40e0ea0e3bc3fe513e6f379f10cf6088629990 SHA1 c599b3315c90e9411d9c0e183425025f8e49b105 SHA256 17a8da372367391946d0ddb428c539d2942b18930ed626b2726bb823abe61fce
-MISC metadata.xml 236 RMD160 3348c48c2a7c00387c08c41ede421d3d611c29ea SHA1 ae40985ca4378285fc895a7ed548cfd58e053292 SHA256 3d0f545d018f4339358833ccd9c96f191d49a0ec57538a6555b1e8309950ffc4
+AUX launchy-2.5-underlink.patch 431 SHA256 80cfb27676e31836bd1638a2cf80fb9a6ec4c812bba6452261784e20ed661d82 SHA512 e9df33fce8b5f01b598346c432facd3a5ef87b95888bd534913b0a7d7477b596cb469bb6b685599cfbe9621deeeaee50b01e01948245c34b185b00d528c9eb6b WHIRLPOOL 9df9b19aed8dda4eba09067dfe1f96f7b9ff442b43f728aa5a7129f4958b354039216f65c7cd7a66e55b2ac889f54a76655f674f13e9fc75ebffa7f69f23bdd6
+DIST launchy-2.5.tar.gz 2926807 SHA256 93ec471423b77973a2118eaec64c7a1c05ce37b5bff41760336ebd14fc819500 SHA512 31cf591184c81c5c44c174f12ffdec4fd15eb2f78af3195afceb9b11253d4bb17edee77b9316c8275828431b2ece5bfbc69f50b390eec27295828e80965c0930 WHIRLPOOL ff210a23f675fe9c5000dfc1dadbefd5acd6604b355ef257fa7ef3550da5dcb43721ae5f8d1aaba2b5db835068054838c9c7e81e8a83efb3b9c00303e4e0ddb0
+EBUILD launchy-2.5.ebuild 989 SHA256 32b582af41af7be3a5337678ff65adbefc073d1dd54f244a698cecbf714ebf0d SHA512 093bdc546b18d1ed9b293c7cefc5bf6b3adb07e4f7dd50b711fca79406001f9ee105cb148c87dbb517ef9b6446c5cfe4bf975fe60d38bc7bee9ced0a85e59093 WHIRLPOOL 8d8b3d64243e7253a151349269de7ef730e3d5f4e131d01d16cca5c158ef40196619b6e2eaddd27e18dd644d70d33e59f72e45f8afee5f0293e500eb9698fb44
+MISC ChangeLog 485 SHA256 8eda97cfc8b6480b0b7e5ff8b76cd9f7e140d1e4da011e4b3f7bd8b42abf9ce8 SHA512 3986af7183d23eaae04868bdfa9055c5dbc5ff47e360d630aa3ab97858db76e862c0921ce6118877b860015e85b218a3e18307504fda58ac92621158fd69f925 WHIRLPOOL a7283c0cf9b4325186b2c90e52c081bee01097eba6723b46e52452aee51cc255e165cbd62d06c25b4964a9456aae0369e08df40f0ee45e611321e427e2ae7c5d
+MISC metadata.xml 236 SHA256 3d0f545d018f4339358833ccd9c96f191d49a0ec57538a6555b1e8309950ffc4 SHA512 1b0218005e78814a9faddb69385f8c52c70735859380dd678148021c65ae7010fd045e14ce87945a01e6ec3a5114f060a6be64cde6ecc5d6e142179bcfffbd7b WHIRLPOOL 17efdd67f82ebefdaef81327ecff218d23085003b7c1eea0eef873ade2c2ea2a3de078e44a46290cb359212a1b62b48cc795c84219bb8fb05d71039996e3eeef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ulIACgkQfXuS5UK5QB1eUgP8C/4qo0LCggnLxj9jBqEv9454
-VjzoN6o+JAHfk9zhYmnDoDh8TKqVxkSEGTsWqFT7cbk4Rzfgttqr0b4s/KjZlvR9
-GHIAMebdzGHTWiGHHjbyQfLU+tVGHBcgdbu29qa64UYsh5SV7hpEOaRUvsUvCK2X
-Yt7ajk6KK9xrT1ZOxoQ=
-=xR2w
+iF4EAREIAAYFAlAVgxwACgkQmWq1bYTyC0N5vgEAwejIZZeb1RNEY38dC2mY6yd/
+UQs30gRd85fz+KHk0MUBAKEQvD1rzxqvaKYb0+qoTpHvE8FEHoStGFYkA1O0XqVA
+=JnnE
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/launchy/files/launchy-2.5-underlink.patch b/x11-misc/launchy/files/launchy-2.5-underlink.patch
new file mode 100644
index 000000000000..f14110d581b5
--- /dev/null
+++ b/x11-misc/launchy/files/launchy-2.5-underlink.patch
@@ -0,0 +1,12 @@
+diff --git a/src/src.pro b/src/src.pro
+index 13a627d..f720a22 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -72,6 +72,7 @@ unix:!macx {
+                 platform_base_hottrigger.h

+ 

+     PREFIX = /usr

++    LIBS += -lX11 -lXext -lXrender

+     DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \

+         PLUGINS_PATH=\\\"$$PREFIX/lib64/launchy/plugins/\\\" \

+         PLATFORMS_PATH=\\\"$$PREFIX/lib64/launchy/\\\"

diff --git a/x11-misc/launchy/launchy-2.5.ebuild b/x11-misc/launchy/launchy-2.5.ebuild
index b6aa66dfc3a4..37ebcee645a8 100644
--- a/x11-misc/launchy/launchy-2.5.ebuild
+++ b/x11-misc/launchy/launchy-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/launchy/launchy-2.5.ebuild,v 1.1 2011/04/15 22:02:15 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/launchy/launchy-2.5.ebuild,v 1.2 2012/07/29 18:38:14 angelos Exp $
 
 EAPI=4
 inherit fdo-mime gnome2-utils qt4-r2
@@ -18,10 +18,13 @@ RDEPEND="x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}
 	dev-libs/boost"
 
+PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
+
 src_prepare() {
 	sed -i -e "s:lib/launchy:$(get_libdir)/launchy:" src/src.pro \
 		platforms/unix/unix.pro \
 		plugins/*/*.pro || die "sed failed"
+	qt4-r2_src_prepare
 }
 
 pkg_preinst() {