Use EAPI5 instead of EAPI1.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 42 insertions, 30 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/Manifest b/x11-plugins/wmtimer/Manifest
index 9b7fcabe6aba..f87fd3472ce8 100644
--- a/x11-plugins/wmtimer/Manifest
+++ b/x11-plugins/wmtimer/Manifest
@@ -1,6 +1,20 @@
-AUX wmtimer-counter-fix.patch 597 RMD160 ef4adeea10fc8c9a1284633061a0838b759921c2 SHA1 9a2ca01c24ee9d2fae0bbc33914ebe5c92b4ef59 SHA256 85deed43e3224fba6cc46c0212d99c0b5748d8fff7583a56a5543b593381ad4c
-DIST wmtimer-2.92.tar.gz 22091 RMD160 c794df79ba3554400be4cc12b8309c2171e68652 SHA1 d72839e4233746d2288248e25079542030a34a77 SHA256 3726c0e0a0a95ce7c4c9dd8088b3f050d5268f70fef9341452f5449cef8c0cd4
-EBUILD wmtimer-2.92-r1.ebuild 1127 RMD160 461523fe23acfd2d046f4e6dfcd1dd6607b3f935 SHA1 c0f99ef4c85df510a8e2146892c0600eff1e6fdd SHA256 4323332285589c7c90f064f9e672c852f04e80442510b856494c21f3c15550a6
-EBUILD wmtimer-2.92.ebuild 1052 RMD160 29ab61333a0c62b5f873ad734d506943e298be1d SHA1 027361a99c575a9baf16c6dda0ce05ca09964a2f SHA256 9090b1b4e215d7fa4c30f0beb7e2b153a28caebc17145e1681ad290e4cee306b
-MISC ChangeLog 3645 RMD160 fe6e57fc6563b7257747af007a8850ec93f99f5d SHA1 2e34b75c2c389c91aa0a6737d4be72dd54356c57 SHA256 7bd0ca178041dec1c2b80881b761fa92929ab7657ab43c8dafce4dc59cb03f34
-MISC metadata.xml 505 RMD160 22adc6e29eede7047e57dcdee28858217f1c6eae SHA1 8ccbae9521fb42b35cdd1b39c042244e665d260b SHA256 e2d9c4eda52505bf90a61775c704f9dbce5fc7bf8bacaf23b27a53b62d307ac4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX wmtimer-counter-fix.patch 597 SHA256 85deed43e3224fba6cc46c0212d99c0b5748d8fff7583a56a5543b593381ad4c SHA512 dda0947bcb511fa030a9238ff9732388f3e74aa111c97f2aec4c5220a8bb76f05460583c9999e22c35d642f5996974c862e5045c9df3ca495472f6be0b6896d1 WHIRLPOOL b92452f57dafb4bbf665117651a67a2150fe05578d4271069d4a2b72cc0e591b91d544054c97e120c819edfce7a5da436dfcba2d21902efefa1fc90bff606b6f
+DIST wmtimer-2.92.tar.gz 22091 SHA256 3726c0e0a0a95ce7c4c9dd8088b3f050d5268f70fef9341452f5449cef8c0cd4
+EBUILD wmtimer-2.92-r1.ebuild 1109 SHA256 3e2df15257a2a2a6a710ab59926325038171715c141b4929130f2b7ca92e7c07 SHA512 48143e5465375bebfabb7ae669e12b9f49519908cac7e12afd060820a3ccbdefc9477e80225e6872b94b63ab57e6e13a6e9bd81052415918c8287d3c40ae2592 WHIRLPOOL fe173976c5cef55090016c73e12139f75853563c1c72b8e20e84df50ceeb086b79c228b3138566802ec1fa665eb9d80b25bf6a298686515aec29e36955d23182
+EBUILD wmtimer-2.92.ebuild 1003 SHA256 7c943a2464330781be5a59fc7ccfeb1d917603c8d542abd65d7a475fb4656b07 SHA512 fa643880d2580c4435ddd1ea0d805da57e43d3dab2afa053adb220c424479f39d2c88f37232bd81dd56bdc6762cbe617c6db8b433fef140cc5d56fc192402e60 WHIRLPOOL d1e963f1224f36f5282390f62f18e74d5b5e86621e21f5b6f11b88ae576a9a1157abc109dc462842a61c66ffc2f4b001e796c97dd027939718f6987b41e30330
+MISC ChangeLog 3780 SHA256 aee52ab093570232676c5cc714caa540fba62429b4c9c11164372c3d8ee00b9c SHA512 1775407d1d4e90489a8588b1d82ffeb550011ba29a2720ce283f52141af1e0a24f419b791922d7de10dc153334234dd619c7836f84a7475a226e04eb332582ac WHIRLPOOL dae94dd56e4377128a0126c6d4f2e4853bbc4f963d88d0ec3c9c6a356998568706e59055c199e88c6779e374ba398e75973ad23bc11535309c38ac76daa3f256
+MISC metadata.xml 505 SHA256 e2d9c4eda52505bf90a61775c704f9dbce5fc7bf8bacaf23b27a53b62d307ac4 SHA512 02f9f6d4ec48bea1ef085ebb2a88fdb9ae99624dfcbb16785bbf2d26c5d5f977dfc6dc486628f60b81d20f416d023307b20b9f15e517215b30cb234ecde97807 WHIRLPOOL b45e159fe8a7e086ea629d5ff41040ff8e3c59843f6be6988d4dcb486645eff87f15190b9fd323133d46e5f20287ca3f214cf553d99e3e250a02625179730596
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTQufTAAoJEEdUh39IaPFNJyIH/3RgkGqJTG4EQjKRYWVtEUDB
+v4XHZflsA+KcFgCV/2WD+glFswZCVI/HpEo3RNY/JdGk1WFezJxN+xB3tpwM0NCl
+xLk5Wbf1EW9YNiLgqU+XDC5LgWqntVSCVncFlH/awbRZOyWViw97bOpRCMpeU1va
+aKy8AvhtGAdpqJ3gExz/+BFXgUMzhph2I2I9dLIf0Ofgz2a/zXvXnTRs/defIZRl
+/0tN1fBqIgK/rhYSqxw15qPb13z/PtdiJoHWpMXrdFF1DcL78zWSitidQa086nek
+kWw1w6l1RGmDX0+mfzBfh048vBRXspwKa8DxUDWVXbDVf4ShsyE7SHx0F6/0zLI=
+=GXLv
+-----END PGP SIGNATURE-----
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() {