diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-04-07 18:06:45 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-04-07 18:06:45 +0000 |
| commit | 6c24a3a5c1fa09b24d43af1199163fe73a9b24f6 (patch) | |
| tree | 8db3023efc1c8c38a8a0de6edbea7a6df8987ac2 /x11-plugins | |
| parent | Use EAPI5 instead of EAPI1 and keyword also ~x86. (diff) | |
| download | gentoo-2-6c24a3a5c1fa09b24d43af1199163fe73a9b24f6.tar.gz gentoo-2-6c24a3a5c1fa09b24d43af1199163fe73a9b24f6.tar.bz2 gentoo-2-6c24a3a5c1fa09b24d43af1199163fe73a9b24f6.zip | |
Use EAPI5 instead of EAPI1.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmtimer/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild | 25 | ||||
| -rw-r--r-- | x11-plugins/wmtimer/wmtimer-2.92.ebuild | 13 |
3 files changed, 22 insertions, 24 deletions
diff --git a/x11-plugins/wmtimer/ChangeLog b/x11-plugins/wmtimer/ChangeLog index 54ea66b470fd..be7a7d583917 100644 --- a/x11-plugins/wmtimer/ChangeLog +++ b/x11-plugins/wmtimer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-plugins/wmtimer -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.28 2012/05/05 05:11:59 jdhore Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/ChangeLog,v 1.29 2014/04/07 18:06:45 ssuominen Exp $ + + 07 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> wmtimer-2.92-r1.ebuild, + wmtimer-2.92.ebuild: + Use EAPI5 instead of EAPI1. 05 May 2012; Jeff Horelick <jdhore@gentoo.org> wmtimer-2.92.ebuild, wmtimer-2.92-r1.ebuild: diff --git a/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild b/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild index 77cfcef8df7a..54d09987f807 100644 --- a/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild +++ b/x11-plugins/wmtimer/wmtimer-2.92-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/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild,v 1.6 2012/05/05 05:11:59 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.92-r1.ebuild,v 1.7 2014/04/07 18:06:45 ssuominen Exp $ -EAPI="1" +EAPI=5 inherit eutils multilib toolchain-funcs @@ -15,7 +15,7 @@ SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" IUSE="" -RDEPEND="dev-libs/glib +RDEPEND=">=dev-libs/glib-2 x11-libs/gtk+:2 x11-libs/libXpm x11-libs/libXext @@ -25,19 +25,16 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" - sed -e "s:\$(CFLAGS)::" -i Makefile - sed -e "s:-g::g" -i Makefile - sed -e "s:-O2:\$(CFLAGS) ${CFLAGS}:" -i Makefile - sed -e "s:-o wmtimer:\$(LDFLAGS) -o wmtimer:" -i Makefile - epatch "${FILESDIR}"/"${PN}"-counter-fix.patch +src_prepare() { + sed -i -e "s:\$(CFLAGS)::" Makefile || die + sed -i -e "s:-g::g" Makefile || die + sed -i -e "s:-O2:\$(CFLAGS) ${CFLAGS}:" Makefile || die + sed -i -e "s:-o wmtimer:\$(LDFLAGS) -o wmtimer:" Makefile || die + epatch "${FILESDIR}"/${PN}-counter-fix.patch } src_compile() { - emake CC="$(tc-getCC)" \ - LIBDIR="-L/usr/$(get_libdir)" || die "emake failed." + emake CC="$(tc-getCC)" LIBDIR="-L/usr/$(get_libdir)" } src_install() { diff --git a/x11-plugins/wmtimer/wmtimer-2.92.ebuild b/x11-plugins/wmtimer/wmtimer-2.92.ebuild index 62c8e27d0729..f1edc4668b89 100644 --- a/x11-plugins/wmtimer/wmtimer-2.92.ebuild +++ b/x11-plugins/wmtimer/wmtimer-2.92.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/x11-plugins/wmtimer/wmtimer-2.92.ebuild,v 1.5 2012/05/05 05:11:59 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtimer/wmtimer-2.92.ebuild,v 1.6 2014/04/07 18:06:45 ssuominen Exp $ -EAPI="1" +EAPI=5 inherit multilib toolchain-funcs @@ -24,9 +24,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P}/${PN} -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { sed -e "s:\$(CFLAGS)::" -i Makefile sed -e "s:-g::g" -i Makefile sed -e "s:-O2:\$(CFLAGS) ${CFLAGS}:" -i Makefile @@ -34,8 +32,7 @@ src_unpack() { } src_compile() { - emake CC="$(tc-getCC)" \ - LIBDIR="-L/usr/$(get_libdir)" || die "emake failed." + emake CC="$(tc-getCC)" LIBDIR="-L/usr/$(get_libdir)" } src_install() { |