commit: 40873dc4b92baa01e5749cde1d85c032c4c187cd Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Sun Sep 13 08:24:41 2015 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sun Sep 13 08:27:17 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40873dc4
x11-plugins/wmlpq: Drop version using /usr/local Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> x11-plugins/wmlpq/metadata.xml | 2 +- x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild | 44 --------------------------------- x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild | 10 +++----- 3 files changed, 5 insertions(+), 51 deletions(-) diff --git a/x11-plugins/wmlpq/metadata.xml b/x11-plugins/wmlpq/metadata.xml index b1a9efc..a03f5d8 100644 --- a/x11-plugins/wmlpq/metadata.xml +++ b/x11-plugins/wmlpq/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<herd>desktop-dock</herd> + <herd>desktop-dock</herd> </pkgmetadata> diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild deleted file mode 100644 index 83515e2..0000000 --- a/x11-plugins/wmlpq/wmlpq-0.2.1-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils flag-o-matic toolchain-funcs - -IUSE="" - -DESCRIPTION="Windowmaker dockapp which monitors up to 5 printqueues" -SRC_URI="http://www.ur.uklinux.net/wmlpq/dl/wmlpq_0.2.1.tar.gz"; -HOMEPAGE="http://www.ur.uklinux.net/wmlpq/"; - -DEPEND="<x11-libs/libdockapp-0.7" -RDEPEND="${DEPEND}" - -RDEPEND="" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~ppc ~x86" - -src_unpack() -{ - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${PN}-makefile-ldflags.patch" -} - -src_compile() -{ - append-ldflags "-L/usr/X11R6/lib -L/usr/local/lib" - emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}" || die -} - -src_install() -{ - dodir /usr/bin || die - emake DESTDIR="${D}/usr/bin" install || die "Installation failed" - - dodoc README sample.wmlpqrc || die - newman wmlpq.1x wmlpq.1 || die - - domenu "${FILESDIR}/${PN}.desktop" || die -} diff --git a/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild b/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild index 6cb65d6..d4e6de5 100644 --- a/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild +++ b/x11-plugins/wmlpq/wmlpq-0.2.1-r3.ebuild @@ -3,6 +3,7 @@ # $Id$ EAPI=5 + inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="Windowmaker dockapp which monitors up to 5 printqueues" @@ -17,20 +18,17 @@ IUSE="" DEPEND=">=x11-libs/libdockapp-0.7:=" RDEPEND="${DEPEND}" -src_prepare() -{ +src_prepare() { epatch "${FILESDIR}/${PN}-makefile-ldflags.patch" sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die } -src_compile() -{ +src_compile() { emake CC=$(tc-getCC) LDFLAGS="${LDFLAGS}" } -src_install() -{ +src_install() { dodir /usr/bin emake DESTDIR="${D}"/usr/bin install
