[QA] EAPI 1 -> 5. Added missing dependencies using ELF's NEEDED entries. Support as-needed.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 35 insertions, 28 deletions

diff --git a/lxde-base/lxlauncher/ChangeLog b/lxde-base/lxlauncher/ChangeLog
index fd5516d3a32f..5731e3f85518 100644
--- a/lxde-base/lxlauncher/ChangeLog
+++ b/lxde-base/lxlauncher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for lxde-base/lxlauncher
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxlauncher/ChangeLog,v 1.16 2012/06/05 01:02:28 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxlauncher/ChangeLog,v 1.17 2014/05/14 18:16:24 tomwij Exp $
+
+  14 May 2014; Tom Wijsman <TomWij@gentoo.org> lxlauncher-0.2.1-r1.ebuild:
+  [QA] EAPI 1 -> 5. Added missing dependencies using ELF's NEEDED entries.
+  Support as-needed.
 
   05 Jun 2012; Michael Weber <xmw@gentoo.org> lxlauncher-0.2.2.ebuild:
   ppc stable (bug 385189)
@@ -64,4 +68,3 @@
   07 Nov 2008; Ben de Groot <yngwin@gentoo.org> +metadata.xml,
   +lxlauncher-0.2.ebuild:
   Initial import of ebuild from lxde overlay
-
diff --git a/lxde-base/lxlauncher/Manifest b/lxde-base/lxlauncher/Manifest
index 16da11eb08e9..66562c01dfdc 100644
--- a/lxde-base/lxlauncher/Manifest
+++ b/lxde-base/lxlauncher/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX lxlauncher-0.2.1-fix-segfault.patch 4218 RMD160 45055bc6e31195500a933d46c2905fa2fe35e37f SHA1 da508dd96efb34e825235d07b85a216fe0bc18eb SHA256 7676673cb2c7b4e16f20f019c2012dff2decc0eef482da728f3c89619a9351bf
-AUX lxlauncher-0.2.1-intltool.patch 436 RMD160 54e457139ec3b80a08ab04697fa37426404848e3 SHA1 bec64374d5efe8cf3d4d9279050b204ef4ec4a5a SHA256 d2854606e357337dfcb3347ab4a7fedede41366a8a8a21b6ce79f195832a5c1f
-DIST lxlauncher-0.2.1.tar.gz 201318 RMD160 5ad5737787008b48f5e6ade6e66571f113b6bb7e SHA1 d9352f1a2eaf7be59824ab39d208f87af4eb81e3 SHA256 032aaffa17e0a558e01427cfacd4e46157145acde79eb83092c1967c6641f8c1
-DIST lxlauncher-0.2.2.tar.gz 236484 RMD160 b6239ef9e66405bbe6adecec6a87bf9f7359ac9c SHA1 9e1fead1d24cedfa980db23bd31cc52b45ce1823 SHA256 ad586e3a2668f98bbf0217ec1be1f8f1be4ff876b180a407c7db2fe354303cbc
-EBUILD lxlauncher-0.2.1-r1.ebuild 1060 RMD160 fdbfe4a81cc0ce76389eb7a0d451a2371c68216f SHA1 a0d6fc75f2feeb9cc57a81232464d6fc012b487d SHA256 e5da44f5f61d4ad137f490a4703f00dd33f794cd667419f6d80aff1e20fe84ce
-EBUILD lxlauncher-0.2.1.ebuild 1008 RMD160 76901ff93b610e407b26869c9ee00b3662c6683f SHA1 effd5beb567b769b2800ebd29b644f759a71380a SHA256 88358e33b340809fdf6ffc020b7282622ec316d2adaef0ccb1d5f4c04c5b5fa2
-EBUILD lxlauncher-0.2.2.ebuild 790 RMD160 65fc0a4972048f64ed7547c397fcc84fc0a49c2b SHA1 0b6dada229c011785d591eea2d5a3d110abab9f0 SHA256 5e7090fce3c43726a80e99d0bcc8ba4d281af81ec4c6415bccb9ae59ce7a90ed
-MISC ChangeLog 2266 RMD160 4eab2ab75f45326fa8abb0bdb7a7fe2423d8b489 SHA1 738f5c6e31d9aca18a451b7b13afa950cb187efb SHA256 4ec23890561ab77504d83eca13896fefc65f233f91750408a1b90be2e88ad3b4
-MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
+AUX lxlauncher-0.2.1-fix-segfault.patch 4218 SHA256 7676673cb2c7b4e16f20f019c2012dff2decc0eef482da728f3c89619a9351bf SHA512 21210099625bc3e8ecc79d08fdd6606914d286353d0a43e54ef2aabe5e1926b264562ebc560b1a3eef9796e53bca3140c30eafa6bd78bfd3ffe56428c8d93572 WHIRLPOOL eb26144e0de85930acf248dfda63146bf9c1cbe717753021cb68fb8afe2fa167a0d8fcfa2456fb96a9615c08352231e9c266d96c26151c605736991c81466778
+AUX lxlauncher-0.2.1-intltool.patch 436 SHA256 d2854606e357337dfcb3347ab4a7fedede41366a8a8a21b6ce79f195832a5c1f SHA512 9df030791f5d207fe02cc50e87c598f2aa7299dbc01dd766b39b8760a32bf8ded5297be36e33e3dbbe3dfcecc2e38204507cc7f420453e19e34f66850544cd2c WHIRLPOOL 06af33f151054861d9a1fc385c3f79efb02d3efa43f7b93c8c255a860a9fec173a8e8cc00d6dc6bce3981a943a2830ce010a92288bf4c209a3dafac00340e7fe
+DIST lxlauncher-0.2.1.tar.gz 201318 SHA256 032aaffa17e0a558e01427cfacd4e46157145acde79eb83092c1967c6641f8c1 SHA512 1902332186d3fea7e2fbe8c04b3b65d806cfaa6f129ebcc370bfe1f615bf8a19700f4009d03202422bc770760d9d1e44995ddb0da1d856ec1dd1e571ad1a3776 WHIRLPOOL 297b4f09b4594b87c0a262e40c1735bd6d3a49e66b5d51789bf2c889d2e2f9de8b8a39548f9a5e7e47f37d3e4a6bd6a7fd66d764ff159e0904154e25f37a16be
+DIST lxlauncher-0.2.2.tar.gz 236484 SHA256 ad586e3a2668f98bbf0217ec1be1f8f1be4ff876b180a407c7db2fe354303cbc SHA512 f7249216b1b474945ee370f76433480d9e275c8b3375328183681083af10dc5a53d48606c00b948dc19f4c0b7d84573b65d52e122b472c69ff34becf953232a6 WHIRLPOOL 6d351f4c0cf43bfaaf820dc02cd0b860afea2b3a6307ead734c79835b6c0d945faf73c6f8fbc8403b10a12d2221981339ddff79bfa69e8f7d599ce861590365e
+EBUILD lxlauncher-0.2.1-r1.ebuild 1175 SHA256 487278c6b4d00642a78c2293bb5ac39225bf66cf81058b7dd72e7f5bba750412 SHA512 7fff090cbd48cac0567aa0c5f3ea947578168e3d19babeb8105b42da09f8000ed7235fb80ea28cebe8e5c032a5d6aaca80cdead22f763a83b97d74e41fe62ce5 WHIRLPOOL af2b62501d0f1fb82a28b3f0a7fc95ba60869cf35771b3e8b4aa62ebbaafbd77dcaac9ebc6f495fb18f98d04650e12acebb85b39f22962293c177d5d54a9a890
+EBUILD lxlauncher-0.2.1.ebuild 1008 SHA256 88358e33b340809fdf6ffc020b7282622ec316d2adaef0ccb1d5f4c04c5b5fa2 SHA512 8ff49bc9944476208260f64e40435b102570f850b4037a82c419f2444917fd0c9eafc6cf842a39ff1dbc5ebf13efa72e53a483b94d8c0b5c5789786df7547f44 WHIRLPOOL 5cccd1edf5dd0ef576473f7554a0f18f6ff769754889e2cf528abeec3782da16c9145e1309a5cd3653c5adbca6c59de9a96d930dc8d30a89bf053e0ebe9e24fd
+EBUILD lxlauncher-0.2.2.ebuild 790 SHA256 5e7090fce3c43726a80e99d0bcc8ba4d281af81ec4c6415bccb9ae59ce7a90ed SHA512 1713eb46717b2784a39d95f61b07a35d1ccfda6ee04b9b60ad8aeeef57b92c3df89f2705cbb5afd7e92b86b7a2af32a86007b70f258e56cb55001bc4d8b862f7 WHIRLPOOL 365e0a40a7b70f2d254500c899f78265b61694ac57d11de7fe752d40380137ce968329d241d80f5455ddbfe77e3460d3b7fb80c66403d19ff896e596cf3f0cda
+MISC ChangeLog 2440 SHA256 ca70e6cedfb85dbb2c4249f40850db9737047e8b729b29503e4b70d4dbb5622b SHA512 ff7cef9219c86f04c4cb95a48408c31cab175677e6b721a04ce1ee6de1e31ccfb33d0839d0a5eef27a5c30948853d728a656e7d9bd3dbbe64d0dffc043970551 WHIRLPOOL 18d1d1454aa00bdea135eca955f2ebaa3e6a5e4e4c8970d5fbcc00b7c5f14fab5678992a153b7ef867a52a0315ea056b93ccad3e6ea7fb2dbac2587c3abf23cc
+MISC metadata.xml 159 SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb SHA512 b4d06538d607c5ba81e0070475cd7d0a221b19e2adf740f479398a647c97350eb6d02b7db8bde107b0c369ce0058b8f0639468c0ca519ff585c555a0bfd4a381 WHIRLPOOL f5dfee2db356573e21cdb76ebcd11a61d2dc7f2b2b8458589cdabb1b2fd21f3261d0b40144b1417d433d1078a9c31a6b4562a914068719df66dfd4563714d9ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAk/NWooACgkQknrdDGLu8JDdXQEAjQqU/em69GSUqG6SveXDwUXF
-cbfEr/+4ws2UaI0Sb6cA/3x8B8o6INNm5Lu1boaebzXx2ESHSyIhNDs1ASf1KGAs
-=1m5M
+iQEcBAEBCAAGBQJTc7LxAAoJEJWyH81tNOV9iwkH/0RPwFhuWbA8l32kZ0uxdkwP
+y+7Ez7iZXHfZ16FJv7dHztaZ/XxZpkRu0J5NOSzD4DItsXkOb5ZP3CW62OOkzG1F
+T05f9TAAs8z75YmCSLpE2+WWUaCUoM0Kl7qhT9fUXN3CUueurDhZGqPMKveLRUL8
+xkt6fkYBZVluJnHZdzsKCM7el5/Ga8HMLbkbLaAOEtOpCYtl12tzEa11oWPRkm5l
+FbV2ZkPoMwwhBjD1CsnmcTyMWmEIx27PWA3SdoA2etcmV3/MbtpGfnyKOh+uPGTw
+UXdp592JicYffxGiVdAAoOQu+9d+3Sc3Slnm+aOMsZlZyEf4LaKNbVb91C/fqvQ=
+=5xeI
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild b/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild
index 22e6cd77e0ce..53b30c7d65cb 100644
--- a/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild
+++ b/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild,v 1.3 2012/05/04 05:50:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild,v 1.4 2014/05/14 18:16:24 tomwij Exp $
 
-EAPI="1"
+EAPI="5"
 
 inherit autotools eutils
 
@@ -16,8 +16,11 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2
 	gnome-base/gnome-menus
+	x11-libs/cairo
+	x11-libs/libX11
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
 	x11-libs/startup-notification"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -26,19 +29,16 @@ DEPEND="${RDEPEND}
 	lxde-base/menu-cache
 	!lxde-base/lxlauncher-gmenu"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-intltool.patch
 	epatch "${FILESDIR}"/${P}-fix-segfault.patch
 
 	# Rerun autotools
 	einfo "Regenerating autotools files..."
 	eautoreconf
-}
 
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
+	# Support as-needed and add missing libraries.
+	sed -e 's/^\(LINK = .*\) -o $@$/\1/' \
+		-e 's/$(lxlauncher_OBJECTS) $(lxlauncher_LDADD) $(LIBS)/\0 -lX11 -o $@/' \
+		-i src/Makefile.in || die
 }