tomwij 14/05/14 18:16:24 Modified: lxlauncher-0.2.1-r1.ebuild ChangeLog Log: [QA] EAPI 1 -> 5. Added missing dependencies using ELF's NEEDED entries. Support as-needed. (Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path 1.4 lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild?r1=1.3&r2=1.4 Index: lxlauncher-0.2.1-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/lxde-base/lxlauncher/lxlauncher-0.2.1-r1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lxlauncher-0.2.1-r1.ebuild 4 May 2012 05:50:39 -0000 1.3 +++ lxlauncher-0.2.1-r1.ebuild 14 May 2014 18:16:24 -0000 1.4 @@ -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 @@ 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 @@ 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 } 1.17 lxde-base/lxlauncher/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxlauncher/ChangeLog?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxlauncher/ChangeLog?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxlauncher/ChangeLog?r1=1.16&r2=1.17 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/lxde-base/lxlauncher/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 5 Jun 2012 01:02:28 -0000 1.16 +++ ChangeLog 14 May 2014 18:16:24 -0000 1.17 @@ -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 <tom...@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 <x...@gentoo.org> lxlauncher-0.2.2.ebuild: ppc stable (bug 385189) @@ -64,4 +68,3 @@ 07 Nov 2008; Ben de Groot <yng...@gentoo.org> +metadata.xml, +lxlauncher-0.2.ebuild: Initial import of ebuild from lxde overlay -