diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2012-07-03 14:15:54 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-07-03 14:15:54 +0000 |
commit | 337607183d042508a1c991f97dfabba4f7da1a19 (patch) | |
tree | 7d3d6f8334de5ede6185528257f5acdf3cf34d8b /x11-plugins | |
parent | Version bump for bug 423861. (diff) | |
download | gentoo-2-337607183d042508a1c991f97dfabba4f7da1a19.tar.gz gentoo-2-337607183d042508a1c991f97dfabba4f7da1a19.tar.bz2 gentoo-2-337607183d042508a1c991f97dfabba4f7da1a19.zip |
Clean over-enthusiastic sed call, bug #424141. Ebuild cleanup and EAPI bump
(Portage version: 2.2.0_alpha115/cvs/Linux x86_64)
Diffstat (limited to 'x11-plugins')
-rw-r--r-- | x11-plugins/wmxres/ChangeLog | 7 | ||||
-rw-r--r-- | x11-plugins/wmxres/wmxres-1.2.ebuild | 15 |
2 files changed, 12 insertions, 10 deletions
diff --git a/x11-plugins/wmxres/ChangeLog b/x11-plugins/wmxres/ChangeLog index ada635fafd37..bb492fac200a 100644 --- a/x11-plugins/wmxres/ChangeLog +++ b/x11-plugins/wmxres/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-plugins/wmxres -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.9 2010/10/05 20:29:16 voyageur Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.10 2012/07/03 14:15:54 voyageur Exp $ + + 03 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org> wmxres-1.2.ebuild: + Clean over-enthusiastic sed call, bug #424141. Ebuild cleanup and EAPI bump 05 Oct 2010; Bernard Cafarelli <voyageur@gentoo.org> wmxres-1.2.ebuild: Newer dga headers require libXxf86dga, thanks Agostino Sarubbo diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild index 6592b67f30b5..159801d8f70f 100644 --- a/x11-plugins/wmxres/wmxres-1.2.ebuild +++ b/x11-plugins/wmxres/wmxres-1.2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.9 2010/10/05 20:29:16 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.10 2012/07/03 14:15:54 voyageur Exp $ +EAPI=4 inherit eutils multilib toolchain-funcs DESCRIPTION="Dock application to select your display mode among those possible" @@ -24,17 +25,15 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${PN}.app -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}"/${PN}-debian-1.1-1.2.patch sed -e "s:-g -c -O2:${CFLAGS} -c:" \ - -e "s:cc:$(tc-getCC) \$(LDFLAGS):g" -i Makefile + -e "s:\tcc :\t $(tc-getCC) \$(LDFLAGS) :g" \ + -i Makefile || die "sed failed" } src_compile() { - emake INCDIR="-I/usr/include" \ - LIBDIR="-L/usr/$(get_libdir)" || die "emake failed." + emake INCDIR="-I/usr/include" LIBDIR="-L/usr/$(get_libdir)" } src_install() { |