Use doicon instead insinto + doins to install icon files; Bump EAPI to 4

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

3 files changed, 31 insertions, 14 deletions

diff --git a/games-util/qjoypad/ChangeLog b/games-util/qjoypad/ChangeLog
index 55f7d820d801..68648c9db66c 100644
--- a/games-util/qjoypad/ChangeLog
+++ b/games-util/qjoypad/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-util/qjoypad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/ChangeLog,v 1.25 2012/07/16 15:45:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/ChangeLog,v 1.26 2012/09/05 10:03:01 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> qjoypad-4.1.0.ebuild:
+  Use doicon instead insinto + doins to install icon files; Bump EAPI to 4
 
   16 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org> qjoypad-4.1.0.ebuild:
   tidy
diff --git a/games-util/qjoypad/Manifest b/games-util/qjoypad/Manifest
index 6cc651bb2215..ab89d30af83e 100644
--- a/games-util/qjoypad/Manifest
+++ b/games-util/qjoypad/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX qjoypad-4.1.0-underlink.patch 248 SHA256 52577d1f1fe5240241feb4c88bf4c7acc7712f05f4f66a5832f19d53e7e3dbfb SHA512 e2c81e08402afa6f06dc915b2bd16598248ac360617a5646f188d7fa2cd9b5a4f1ed88fe29cbd2b79a4eebfd7d4ca7f9c348d10bb515f68452b0941d4bdd6f6f WHIRLPOOL 5aebdc28ad5de308bdce86702eb598ea73ed45ce01fb5d6d3029e4d879b165d9b0017384d251f4bdad18b8a7791b027317221aca9d57a7c3bf2c7abf0b8c88b7
-DIST qjoypad-4.1.0.tar.gz 82306 SHA256 b5aa088827a6f7231e43e45fb942917e3f677ef933109a7b41e13a6b443c95ca
-EBUILD qjoypad-4.1.0.ebuild 1093 SHA256 59d4ab064553430765121147506e71b36a510048fb2743f1154cb693dd3211da SHA512 1c08944502d2907420241457396cefcd4566242c79c034862764cf00ee5df006a1db40c01ee8352f096f0dcd3fa3002103fc970c1fbfba8a6e5656ef5429968d WHIRLPOOL a227376b061fb5a8e29afc1618ed96950c1b2584c29153e808e7d0eb2b05d4eae18ee0c54b5988050d37eae1637009cbb87cb9f93c8ee80800ae4a80676ba68a
-MISC ChangeLog 3358 SHA256 074204a724c8616e08001faf9985771de951cc3e91ee40f6894bc900252dcae9 SHA512 226099ab66126c5f995434f3d5c8c65a54ac4340ff503d818a2a62cf11ce695328383bc7eb74c8c37be4a1d6d59ba2aa19806d6072d68f6f0cde30008d19fba0 WHIRLPOOL 15b4cb7dd13c18c8a76184ad684518a32db54ddc075c0a91bad0187c64f788ff284bf89ffcc9f7fd7c84c56c8c40fed7e0f837ea03210f2d1c1ee49f69c743de
+DIST qjoypad-4.1.0.tar.gz 82306 SHA256 b5aa088827a6f7231e43e45fb942917e3f677ef933109a7b41e13a6b443c95ca SHA512 c14705aa24ead7c358dc2c82284ae5145df4eb041f47d4a017391346719b6330a8a1146e37ebd1f5d25d755385b611965b94b5835f9df0f6b2ef5e6a4ea3bc7b WHIRLPOOL d78ba76196899779e14eae78fcb528ca32f4802670c9f0f95faa6db6186c6924293cecffcf4c2e85f0ef5b5bfb77c568092a5eef650aaae9f70bea996c329793
+EBUILD qjoypad-4.1.0.ebuild 944 SHA256 24fede1f17a8f3ef5886b45ed21c0a7c354bf1034dd611b37206a9085b0bc1ac SHA512 63d5c1723e35831154cdb8fc73c26b71d399970c7956425f055912e2e8335cfaf07846095cff463e637878c948ff7a515f9c2f07fbcb309c3a61ac45aaad3e34 WHIRLPOOL ead9b06b30f9f7d1123ec9ee1f418305c2c5a1e692da257609baeddd025803c721bc717f8b142cb9e8c9d4acc8d0526536f3fc2ac5f05fc68b5c33bb87820086
+MISC ChangeLog 3498 SHA256 90f056acc43111297ffdf39fe91ba7cebe51dccab34397c97d1fa979000a85f1 SHA512 65f95f7985a73d80c0c798c63e363d6fa4ca900c8bddd5d118dd644a6c87e19613fb758e5bcea3dfcdefc19dd29daf3b1cbe4086c6cc7cb3863f95cafd269b8b WHIRLPOOL 88ca4daaf0fd190298e73dc1bf223debd1d6f85ee996caf1a0f816289391391f19bcdd77125dc5a212e5a9447d866e15a1e16577d6c0321eac0208bc6a20ac8b
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlBHI1oACgkQgAnW8HDreRa6NACgrUcDcfye8I72PJbh6WLcLPqi
+E1kAniM0cUrUhMsXun+H5jGzicx1P1aN
+=04ZL
+-----END PGP SIGNATURE-----
diff --git a/games-util/qjoypad/qjoypad-4.1.0.ebuild b/games-util/qjoypad/qjoypad-4.1.0.ebuild
index 27ba161298d5..8e4cdb761541 100644
--- a/games-util/qjoypad/qjoypad-4.1.0.ebuild
+++ b/games-util/qjoypad/qjoypad-4.1.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/qjoypad-4.1.0.ebuild,v 1.7 2012/07/16 15:45:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/qjoypad/qjoypad-4.1.0.ebuild,v 1.8 2012/09/05 10:03:01 jlec Exp $
+
+EAPI=4
 
-EAPI=2
 inherit eutils qt4-r2
 
-DESCRIPTION="translate gamepad/joystick input into key strokes/mouse actions in X"
+DESCRIPTION="Translate gamepad/joystick input into key strokes/mouse actions in X"
 HOMEPAGE="http://qjoypad.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qjoypad/${P}.tar.gz"
 
@@ -14,7 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libXtst
+RDEPEND="
+	x11-libs/libXtst
 	x11-libs/qt-gui:4"
 DEPEND="${RDEPEND}
 	x11-proto/inputproto
@@ -30,11 +32,12 @@ src_configure() {
 }
 
 src_install() {
-	dobin qjoypad || die "bin"
-	insinto /usr/share/pixmaps/${PN}
-	doins ../icons/* || die "icons"
-	dosym gamepad4-24x24.png /usr/share/pixmaps/${PN}/icon24.png
-	dosym gamepad4-64x64.png /usr/share/pixmaps/${PN}/icon64.png
+	local i
+	dobin qjoypad
 	dodoc ../README.txt
-	make_desktop_entry qjoypad QJoypad /usr/share/pixmaps/${PN}/icon64.png
+	cd ../icons
+	for i in *; do
+		newicon ${i} ${i/gamepad/qjoypad}
+	done
+	make_desktop_entry qjoypad QJoypad ${PN}4-64x64
 }