use python-single-r1, bump EAPI

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 36 insertions, 31 deletions

diff --git a/games-mud/wxmud/ChangeLog b/games-mud/wxmud/ChangeLog
index 6309e3df37cd..082f0bfb7d34 100644
--- a/games-mud/wxmud/ChangeLog
+++ b/games-mud/wxmud/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-mud/wxmud
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/wxmud/ChangeLog,v 1.5 2011/03/27 13:19:58 nirbheek Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/wxmud/ChangeLog,v 1.6 2013/04/01 14:34:36 hasufell Exp $
+
+  01 Apr 2013; Julian Ospald <hasufell@gentoo.org> wxmud-9999.ebuild:
+  use python-single-r1, bump EAPI
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> wxmud-9999.ebuild:
   Fix slot-dep on gtk+
diff --git a/games-mud/wxmud/Manifest b/games-mud/wxmud/Manifest
index 731db826dcef..fe5cd1ef29b2 100644
--- a/games-mud/wxmud/Manifest
+++ b/games-mud/wxmud/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-EBUILD wxmud-9999.ebuild 1112 RMD160 e92ddbcdb2d7f9f23cc854401a558af01c7dc04e SHA1 2f033387441e6497ad695d7caa728705b0f75a7c SHA256 4a6138932663d4db6a2db768e37d04f2b4d770e04688c0572e798382061876a6
-MISC ChangeLog 846 RMD160 c22e4e827ae72245e0e38b3a179de9a5529f3ea7 SHA1 ffd53901cdbbfdb789242bd819be08c4054bf554 SHA256 86a805120121375d137ba3f49cdbc2fc134558b6aa3b3148df838c642ddad731
-MISC metadata.xml 380 RMD160 c37e0cfe08a6239b93e15cf8ddc99aa21d4962b6 SHA1 35942f5914779eecb8e6f5beabf2f43d11ad60db SHA256 54fd4d961ab7ae8bdf10092dfb41c592f3af7ac9b3a2989b97dbe36d456a8c05
+EBUILD wxmud-9999.ebuild 1150 SHA256 7061841b06850f35bf8ab664ef9b82f06e33e25b76efbc9b15dabd1a3678c9ad SHA512 9cf2b82d4f701647536bc9a33faeaa93ce65419a736c155aad534eec51a0859775120291c6750bfab8a8fad763176764361534c1b8bc852781d534fbd242b1f5 WHIRLPOOL d4d2baa72350f0e9725ab3c7473573471a870a6f0fde1c0da70b03796d31fa8b7b8e05d5c4c587f31ff28e16b07a98ccb641804384edb0daab69e59b870b6a8c
+MISC ChangeLog 951 SHA256 23c1608b87e47ecc589c0a5721aeffd1d8b0c53a8128663be2bf4af951c95cd7 SHA512 432b5d2c9fa2c5399bb00b416e4e7bb09b62eb497c8a72f60285fb710d2391a169291836b213e97ebd617ea03b5893f24460eb1350ec39166578d0c4c9af4cf5 WHIRLPOOL 4d21926e432dfd204fba1fb3d7a2ea03d7f99f28d55c357539d8890f06be7d913628563f7a97b1a987ff3d795323a3a62d7a90db3a174350d310f0772fdd825f
+MISC metadata.xml 380 SHA256 54fd4d961ab7ae8bdf10092dfb41c592f3af7ac9b3a2989b97dbe36d456a8c05 SHA512 a024f97f9c071cfa9e3c64c8cec56a8d9a0b7ff9109dfb4af8f9e99fde9064df3b4ee5d4e0b2ef61ebed70dbcea98a85f01921e8e7e67f83fce7eeddc56e97ca WHIRLPOOL 76127a3ed0ef9dadffff4f7248f310a7bb50ccb50dae404dc6dd577c96177721a8b7884678a1469831e79c3eac3f92cb753e423f39db4a687e58de1a6802fc35
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjzmEAAoJEO/kOhxWD91knucQALlezXYW+h2pTXIeQw45E8yf
-9WbAOfFEDCfkYMbGs6p+rTB/I+OxpXgLLpZ9Q1hsF6XbUgDKb9YnE4+iQIlwXkKO
-Kp6K0A84FznbehOWNGHJ5BxYGOKih7swK58KLxYlbGblEntfqLH9iPuHWy1xdfre
-mT7lGUjAB2dG+iZg/pcqkmAKie4/ppVRSrE/w5ztQG7j87SNM9hISomIZX1gPHwh
-zQqHIDugZQXJbop+SG7VhDGJlPJJ/1Re2RHHH5azitXT7GKNtnebGyC/Z37nWwJR
-vSf8HHw6vaqzKO04TyIfhrdGybml5FV2OVcyzCvbUOUOPaRmWGOryd+FEY5CIrHn
-GZjW4pftSWSarBsScugXuohoyKuWL+ozhNYwS9F1DrcQ713PCRIy+C8W+DPzPsIF
-g1Rv2KgJ4p6ImjYhO7tAPPIJ+5YdifzYP3cW717H6iTv3U/hyQwqazgH4taan00k
-L8I4l6Enk+z03IlPDldoral0Lqh0sjyAU0ZPeQFmBfd81IwtlDsjp6CEyK36vXOh
-8klnsYDzyMTG3ph2AKTFwDGFacASRgwuCx77raa3HQ5fe8puMRv4c74GaqyAEXhu
-14ZErA4a325wnafViiAFXTx120N7DMA1WuWIdjKn6X/cj3J/ecx6eoRyCxyhLumx
-i36Y3iACM9vUIcd1nT+5
-=SQCN
+iQEcBAEBCAAGBQJRWZr9AAoJEFpvPKfnPDWza6AH/jUXJFQhvPySHQKPcZCzBQGZ
+0OhkmDU8mmAKNTLA5xlxjMYVr4ZPOetpetDCIao+HWypgKjVRizgdGG0tQWN4mD7
+WGrV0GwNN7DQzDUeyNtNEmyzD7qjJ5RnQOCfR+kFLCrOfWq4LDq964ddRrFkAWCX
+Xto92xmbOB1Omy+VOSkjF4qkzIzgo/2Lj4r+luyaw7AGuGbBubGfss9HlfrKZ1o5
+5wP79zJXPdSdE7ZYFOe7O7u/tH8eRZrh7Bg3rfpZsj8vruBw3gTMM/v0GUGTJVEU
+piTOGrWpW8mjpcGvr6mCnDiuokx64Kt7bpwa+wPEaJn+FN9TS1RRj487PeZNjK8=
+=jhfW
 -----END PGP SIGNATURE-----
diff --git a/games-mud/wxmud/wxmud-9999.ebuild b/games-mud/wxmud/wxmud-9999.ebuild
index ca9758adc6cf..75db7fbaccee 100644
--- a/games-mud/wxmud/wxmud-9999.ebuild
+++ b/games-mud/wxmud/wxmud-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/wxmud/wxmud-9999.ebuild,v 1.5 2011/03/27 13:19:58 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/wxmud/wxmud-9999.ebuild,v 1.6 2013/04/01 14:34:36 hasufell Exp $
+
+EAPI=5
 
-EAPI="1"
 WX_GTK_VER=2.8
-inherit flag-o-matic subversion wxwidgets autotools games
+PYTHON_COMPAT=( python2_{5,6,7} )
+inherit flag-o-matic subversion wxwidgets autotools python-single-r1 games
 
 DESCRIPTION="Cross-platform MUD client"
 HOMEPAGE="http://wxmud.sourceforge.net/"
@@ -16,28 +18,34 @@ SLOT="0"
 KEYWORDS=""
 IUSE="python"
 
-RDEPEND="=x11-libs/wxGTK-2.8*
+RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}
 	>=x11-libs/gtk+-2.4:2
-	python? ( >=dev-lang/python-2.4 )"
+	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"
 
+pkg_setup() {
+	games_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
 src_unpack() {
 	subversion_src_unpack
-	cd "${S}"
+	cd "${S}" || die
 	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
 	append-flags -fno-strict-aliasing
 	# No audiere in portage yet, so useful MSP support is disabled for now
-	egamesconf --with-wx-config="${WX_CONFIG}" \
+	egamesconf \
+		--with-wx-config="${WX_CONFIG}" \
 		$(use_enable python) \
 		--disable-audiere
-	emake || die "emake failed"
+	emake
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS README TODO docs/input.txt docs/scripting.txt || die
+	default
+	dodoc docs/input.txt docs/scripting.txt
 	prepgamesdirs
 }