Use EAPI5 instead of EAPI1.

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

3 files changed, 35 insertions, 25 deletions

diff --git a/x11-plugins/wmdrawer/ChangeLog b/x11-plugins/wmdrawer/ChangeLog
index 88a85711ddec..1dd4ad8d6782 100644
--- a/x11-plugins/wmdrawer/ChangeLog
+++ b/x11-plugins/wmdrawer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmdrawer
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/ChangeLog,v 1.24 2012/05/05 05:12:01 jdhore Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/ChangeLog,v 1.25 2014/04/07 19:53:06 ssuominen Exp $
+
+  07 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> wmdrawer-0.10.5-r2.ebuild:
+  Use EAPI5 instead of EAPI1.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> wmdrawer-0.10.5-r2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -104,4 +107,3 @@
 
   03 Jun 2003; Brad Cowan <bcowan@gentoo.org> wmdrawer-0.9.15.ebuild:
   Initial import. Thanks to Martin Schipany bug # 16223
-
diff --git a/x11-plugins/wmdrawer/Manifest b/x11-plugins/wmdrawer/Manifest
index defd5353f009..a9ed4b10229b 100644
--- a/x11-plugins/wmdrawer/Manifest
+++ b/x11-plugins/wmdrawer/Manifest
@@ -1,5 +1,19 @@
-AUX wmdrawer-0.10.5-gtk+-2.patch 370 RMD160 6ea1e97f4787909e68e6aefaabd2644624cfc191 SHA1 634e79148e91ca63a1aa4b18127552a0de81f92e SHA256 f0c6fdd13e1d94daee03f5f83d3e6f145452c426ba149ab4175f527c757fb96e
-DIST wmdrawer-0.10.5.tar.gz 49413 RMD160 5631a658997bdcb97c0435b1dcf14ca8030f2dc3 SHA1 ee3a7dc01fc30fddce0a4618b061e1e5cc8e4570 SHA256 1fd727ce9d91abe1e0c12ad82dbaa9b3aa69f4b852af460ac81c32a7394c5078
-EBUILD wmdrawer-0.10.5-r2.ebuild 1244 RMD160 94d7c504d83889fcd1a37a6720e82a0c3b6dc4a7 SHA1 1dce15f0758f3e0ccc8fe7ff012c3df6a16b692f SHA256 edc53110812ffef19e3865c200576d1823888a16fec0682600a7656f15693e7b
-MISC ChangeLog 3579 RMD160 9db48413e48cc58ca8013d0d438ee57c28b1779d SHA1 0023083ad69511a5bf5ffb6cb1304be68ace782c SHA256 2c0d8afb7d3fb3155126f1584fbcf2aacbc14cb579402b7f68b6fe3877b2238a
-MISC metadata.xml 302 RMD160 b2a7e9ccf88b4a47b1744fbc9e44f0dd7cfb8311 SHA1 cf864296feb55d04761206e0b1779558f71ff522 SHA256 578a6b5a10882c40d8d4835778cca2e288783c4f36296e474c0cefad1cc8bc95
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX wmdrawer-0.10.5-gtk+-2.patch 370 SHA256 f0c6fdd13e1d94daee03f5f83d3e6f145452c426ba149ab4175f527c757fb96e SHA512 4ee57e974cb4828a20fe5313746a0c646f793793a89ce70fb3bbdf28cf397fb4112121eb7f4274a67601f5e18487cbabf2b655161d575b8a58740eaa6aec87e6 WHIRLPOOL b227e220e15ca3c07c19976923215f0c146da7692264eb7768d8e939f97e675314597192e3826c6b3dd25ed431e991250ddce1e9607e5cff513b59fdc0ab469f
+DIST wmdrawer-0.10.5.tar.gz 49413 SHA256 1fd727ce9d91abe1e0c12ad82dbaa9b3aa69f4b852af460ac81c32a7394c5078
+EBUILD wmdrawer-0.10.5-r2.ebuild 1205 SHA256 62f8eaf09994faab32f3c3c3772d4e3284fcc53300cf3c8e797a1c2bfaf24993 SHA512 27841dc4ef41dea4f83fe5197ca82007bfbf47a5b27273a3bbb46c2eaf51a9f034f7f13d91e2677ea57b9898d300066193ed739444c78e8e6d068de8c4a0d982 WHIRLPOOL 5bc50e9af2e92b6b90efab5669f8f8fcbd33f9d52c5738dd32956596bfe0db1a735f3ee8779af70d928b156ac1f4b6fa6fb5184b05ec2a70e0ac6365036fd9d7
+MISC ChangeLog 3693 SHA256 44ab43947db60df42a8af0677721e992a426912a3b41f9ee6426a207aa1aea62 SHA512 946aa9b7b065519d8c3acf5c99aeb5596ad47792f9c20479de10bf49a1f7100a55f224e34226470b4d9d16a1f0c1c5e260607b9fbe533eca0c00b52390ebbffa WHIRLPOOL 951ce3a571a35575a8ab16c89eab8a9261de25fbb1578c2b2923296466c6015c1644ad4a2bfecd137635a2322d436197dd586642c2899b8438b2d0c01849018b
+MISC metadata.xml 302 SHA256 578a6b5a10882c40d8d4835778cca2e288783c4f36296e474c0cefad1cc8bc95 SHA512 7676ff0f60b5dc82fb60c2157d1140a42e9f7297cbb71932b5afdf133f112e11fe6a698cd85070692bef5068c8a3088df3acc690986ad3903b3dc409ecdf80c9 WHIRLPOOL 9eecd86a5143c070f76423126ca8bf9d5f32f88dae17b2bead7be925c27e3f675df00d4efa9ae6b30b50948e0bb4ba0002827f9b800de755100e4cb6689f81d9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJTQwC/AAoJEEdUh39IaPFNky0H/1mrSlPuTUAPMn2Sy5RRxOjS
+AcSvYTKuwaiXhR8AP6959ibQMfgCoXQuz8iFBmlfgFywnoci5hlcj8QqaME1/PdN
+NS+E6Ws6PwbXj73FGPr2Vxjvba5OVhgho1/ICq2eRW6V+CDKr5KqrkkefxKXP3Ru
+aOjWBBVhYbel7z/+CRwrkvsxH2bNimgWPaQvLoUOweHXsFqgFoc74+adYZmOxWMR
+G5zTd4koiRlOGg9V5K5fMUbCDL9O6xBccaXpikS31AyqFO5VJCAy1fXoaiRlOV/J
+fwqyqhPSnBX6TX497JkDZeRc/3jvSmTZh4qIz5OnErQOWA0tT41B4Wc/xfZpuGI=
+=vD/h
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
index c3c53929e66d..18638565ac0a 100644
--- a/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
+++ b/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild
@@ -1,44 +1,38 @@
-# 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/wmdrawer/wmdrawer-0.10.5-r2.ebuild,v 1.10 2012/05/05 05:12:01 jdhore Exp $
-
-EAPI="1"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdrawer/wmdrawer-0.10.5-r2.ebuild,v 1.11 2014/04/07 19:53:06 ssuominen Exp $
 
+EAPI=5
 inherit eutils
 
-IUSE=""
 DESCRIPTION="dockapp which provides a drawer (retractable button bar) to launch applications"
-SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
 HOMEPAGE="http://people.easter-eggs.org/~valos/wmdrawer/"
+SRC_URI="http://people.easter-eggs.org/~valos/wmdrawer/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
 
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gtk+-2.patch
 
 	# Honour Gentoo CFLAGS
 	sed -i -e "s|-O3|${CFLAGS}|" Makefile || die
-
 	# Fix LDFLAGS ordering per bug #248640
-	sed -i 's/$(CC) $(LDFLAGS) -o $@ $(OBJS)/$(CC) -o $@ $(OBJS) $(LDFLAGS)/' Makefile || die
-
+	sed -i -e 's/$(CC) $(LDFLAGS) -o $@ $(OBJS)/$(CC) -o $@ $(OBJS) $(LDFLAGS)/' Makefile || die
 	# Do not auto-strip binaries
-	sed -i 's/	strip $@//' Makefile || die
-
+	sed -i -e 's/	strip $@//' Makefile || die
 	# Honour Gentoo LDFLAGS
-	sed -i 's/$(CC) -o/$(CC) $(REAL_LDFLAGS) -o/' Makefile || die
+	sed -i -e 's/$(CC) -o/$(CC) $(REAL_LDFLAGS) -o/' Makefile || die
 }
 
 src_compile() {
-	emake REAL_LDFLAGS="${LDFLAGS}" || die "make failed"
+	emake REAL_LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {