revbump; conversion -> distutils-r1, rm old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

5 files changed, 44 insertions, 116 deletions

diff --git a/dev-python/pygui/ChangeLog b/dev-python/pygui/ChangeLog
index 8dde8599003b..96e5a78b1dd9 100644
--- a/dev-python/pygui/ChangeLog
+++ b/dev-python/pygui/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pygui
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/ChangeLog,v 1.8 2014/04/21 12:46:21 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/ChangeLog,v 1.9 2015/01/03 07:11:04 idella4 Exp $
+
+*pygui-2.5.3-r1 (03 Jan 2015)
+
+  03 Jan 2015; Ian Delaney <idella4@gentoo.org> +pygui-2.5.3-r1.ebuild,
+  -pygui-2.2-r1.ebuild, -pygui-2.5.3.ebuild:
+  revbump; conversion -> distutils-r1, rm old
 
   21 Apr 2014; Ulrich Müller <ulm@gentoo.org> pygui-2.2-r1.ebuild,
   pygui-2.5.3.ebuild:
@@ -37,4 +43,3 @@
   20 Feb 2010; Andrey Grozin <grozin@gentoo.org> +pygui-2.2.ebuild,
   +files/pygui-2.2-python-2.6.patch, +metadata.xml:
   Initial import
-
diff --git a/dev-python/pygui/Manifest b/dev-python/pygui/Manifest
index 851f43bd3a49..1d8855d07c9b 100644
--- a/dev-python/pygui/Manifest
+++ b/dev-python/pygui/Manifest
@@ -3,23 +3,14 @@ Hash: SHA256
 
 AUX pygui-2.2-python-2.6.patch 616 SHA256 e7789e4b44d123f9c3c359ca66d42e364cda326222777515ad4c96730cb74f57 SHA512 852cdce3621ca29ae09eaba2f2e15e62989aaaf8102290dbbeb5682601e115c5cab04816ef7d0470025a3db1827ea72ce6b0c07ba77c5ac30957889d9da2a627 WHIRLPOOL 95a80658ca0e31d0b63b174fa30d702294cbd5340e91586768b789b976400dbe2f8d80d4fdb938a04455b62d26ba2ae5bc426f38f402a641c5200b8df07cbb72
 AUX pygui-2.2-resources.patch 410 SHA256 4b078ad1f8665ce13319d0d364596a152439fb1578837789a9a29216a233a743 SHA512 a3937e72956691ca4ab0887fe5c812a8495d53bb873e6319d415e038fc625322f7b17fbeaa3721772750cc6d0a134a00a29ffaf9685b48daa60b7ae98a12d80d WHIRLPOOL 9a8aa5458ee0fde45da815511eb2cc03a420d45be241e28ea5099e0be4e6dfdd45dd78976bd163066f5d93ce4bfe14f9e91106bf04aa8ed2eba579c3a281f4cb
-DIST PyGUI-2.2.tar.gz 509639 SHA256 f11863e4ed18919e8e2190d764141778657ecf3ef0e8c854cc02c52202542e14 SHA512 8aef23d34cfc052313e35af8a46271c113053a83420f38ac2e629be54df886b27a0ec687cf73c6d8a7f4e2766674153fe0cbf9f1a594bc8b8734e0bdf0f5f149 WHIRLPOOL dddc00218490b5e96a337ed449aa18a426777f3147f2ebe7a484659dc191cda8ed4dcaaa096d10f73e4651a9a886ab2db694053b4e59d1526cf764d65fb3b970
 DIST PyGUI-2.5.3.tar.gz 594157 SHA256 ef3af16d97dc6f71898d71706ee9e2fe6de44a83ace01d690054804ca16c7315 SHA512 dbbfd95785f37842dab657be7218bf057512fdb43f1c3eda7a9cf1b6d62c83b40b4295572bc6947fe77fc23e25b53c8a69855ddf2272e25410fdb17297483942 WHIRLPOOL 37853cbd2a959c1c9c3e1f69bdd68bfd84094c1db465c490ada16b7081a84b4a6b992ad668f01340295654c15eb0f0137a10f88d38402cee77d50ae196c9acc0
-EBUILD pygui-2.2-r1.ebuild 1209 SHA256 dd3afa51f87775f7447f09e5ba615b885e7822572b464a88731d2d3308d2a734 SHA512 43493c47eb200498c0c662e0f6194b3e0b24f37f58faf3b584b0c1c1b1d87947eca7a091edb40f91e299dee6c2c31ceeaf85ad2b1c50643973a743b4b67c52dc WHIRLPOOL b354c9ba46f5ffe0bbf810b8e6a1b646498286ce634b52ff33b1b7045dfaa2d3f22cc68617b0e24dfa2fc60799fb6f8ee92b3c7b131ee599550b8899f458028a
-EBUILD pygui-2.5.3.ebuild 1046 SHA256 00bfd30e029d6d6f4df3d265a33ee08773e91d0be35134f69f4897dd456bbdd7 SHA512 8e9305d8d0430e2f5e4538cd8028d543ecd782ec4e68071f4f669385ec73a570c17dd68b3cbb42fef2f66f4c594f56dffcd8729b21ad1ee29ab174f45523a03a WHIRLPOOL 3ad3075e446570265f04faa0c870f5ef1698650e6af7770406c715cef9ef4bcf9ed0174c18aaa5d80c738ec886f83305f986a97a54c9845f812ffa26eefa3db4
-MISC ChangeLog 1317 SHA256 ea5229fdf259c423c8fcf3a797ec2dd9e4f1cbcc1ed3a1d06bad771e522383ff SHA512 8d7a7a7b1cb32ea71556bfc469d1ab114de4deb96caee0e46880c5ecdcf216b86792bb8b4f28bf758256e378ca15b476709d26e3f42006d0796e7e4062c456f2 WHIRLPOOL f81cfda11f043815e6d3ec41408fca2f508d45ec1f7bd6f5ec8373e90043721f23a9b1673bb5acc68e2af5471b24fa7f17b3304cec22d19ffd3b6f845064887d
+EBUILD pygui-2.5.3-r1.ebuild 792 SHA256 181ff7790429aca0186b0600cfbf9840f3621556f785746ed593410d6faed85b SHA512 2130376341ba8a79ad99d5f9f37eac79820200bb3ebf23706da2fa738095c27f27a3eeefa7597e62002bc10275ac6dbe275fff0aae4d087783789d5f9d22072d WHIRLPOOL 4deb5f2642f0f63e1991f73cc721d6927d9f8b2b73f757d5e43bcebfc11b9c2e6e18cdff70a5a0699663cf7edea755a8b8da216a6ad0642f99a08c008aed65a4
+MISC ChangeLog 1515 SHA256 f74fba6a55b55a5c5040a2d08e84eccc152f1dff0cbf3cbb955dc8bb8979db7b SHA512 ee3bb883f164435810eacdc13232c7ac069c2eb461a06f5c546ec2a1e7b33e6eb06451b7709a788cd6f7f6925b1174cc2459435b1c1d38ad5e93054ecee4ee2b WHIRLPOOL 6595c123e1138c71d3a80dad57fa9a523e7fd9c65acf9c0964ad8b99d047110adfa1c3dcbbde83df9e11f5850bc6453a6db301b476504ebdc1cd1ebb502a8070
 MISC metadata.xml 366 SHA256 addb253a5e1869daef7d46e080f365b7f6515cd6c4bac35e39be5bbb28631f32 SHA512 132c4b5dda56b046d3beddc65d9c160a4072a97b789addc091300952a4a37510d4b5491def9a313ad9e27f01e21e9e158df7c61f4f0aed2e6978b90a1da9a0f7 WHIRLPOOL 201b3c0ffec3b583621700bf9952766541fa412ceebe656cc34cbdbf2bae2f332b9a2e0218c3540bb84a8dd78144704eb2d1857789e07098b421de8f75a9988e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTVRM5AAoJEJQzkH1pP7W41hIMAK6W7wG6SSYxHsmUTOMU6M3x
-NvT9R2DtgQVDHdhMaKCOSHxrUpmMA8NXj08ed3ORwe4TOqvfGKmEx8JDtGS+ZbwS
-ixfpCiZCw5iblttOOf2BmmXC5bBcU7WbUz0p/WccyV59/OGWrsjBL2MrHhHph89L
-WzwIrrl51r3M7jjuZibJ0Pt01ucGFE4qzx2qSS5yqvb4DdO+Z6SxSlQnrHn0OEXX
-seeFZw8eWudF7g+pcnk3QAu45cr3Uw6y57x4nm1uFT0RWgYQRbZtjMPl94kPMMey
-yb7LlbBXhuDDJQtDjXExX341OgihxJYj9rXBABeh3+Vsk4LGAbv5qGvtMY/hM7aZ
-nhUT0zdjeqPZQKEb8gWwGOzAq8QIyZ3ttwyzgqNNIZlFJfxXuurylYntnnuufD8b
-gcSW9s8tzptGeAvqK1fnAP44ie/jCHO0hivCksmw0swLRZzy0EdJ13iAbjXy3mCR
-FULF5cR65jMNrHrlbfAS8jHD5rFHEq+w7ZDY6QGhtA==
-=FUyw
+iEYEAREIAAYFAlSnlhcACgkQso7CE7gHKw0uvACfXs6tF4WyU7f1euZv95m1KPZJ
+GDEAoMXymFAleunGDGHX62yIG8mh48Rb
+=2z7h
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pygui/pygui-2.2-r1.ebuild b/dev-python/pygui/pygui-2.2-r1.ebuild
deleted file mode 100644
index a947cde1e2f1..000000000000
--- a/dev-python/pygui/pygui-2.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/pygui-2.2-r1.ebuild,v 1.4 2014/04/21 12:46:21 ulm Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-MY_P="PyGUI-${PV}"
-
-DESCRIPTION="A cross-platform pythonic GUI API"
-HOMEPAGE="http://www.cosc.canterbury.ac.nz/greg.ewing/python_gui/"
-SRC_URI="http://www.cosc.canterbury.ac.nz/greg.ewing/python_gui/${MY_P}.tar.gz"
-
-LICENSE="PyGUI"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/pygtk"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PYTHON_MODNAME="GUI"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# "as" is a keyword
-	epatch "${FILESDIR}"/${P}-python-2.6.patch
-
-	# Fixing a typo in setup.py
-	epatch "${FILESDIR}"/${P}-resources.patch
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml Doc/* || die "Installing html documentation failed"
-	fi
-
-	if use examples; then
-		pushd Tests
-		insinto /usr/share/doc/${PF}/examples
-		doins *.py *.tiff *.jpg || die "Installing examples failed"
-		doins -r ../Demos/* || die "Installing demos failed"
-		popd
-	fi
-}
diff --git a/dev-python/pygui/pygui-2.5.3-r1.ebuild b/dev-python/pygui/pygui-2.5.3-r1.ebuild
new file mode 100644
index 000000000000..73439362bd58
--- /dev/null
+++ b/dev-python/pygui/pygui-2.5.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/pygui-2.5.3-r1.ebuild,v 1.1 2015/01/03 07:11:04 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="PyGUI-${PV}"
+
+DESCRIPTION="A cross-platform pythonic GUI API"
+HOMEPAGE="http://www.cosc.canterbury.ac.nz/greg.ewing/python_gui/"
+SRC_URI="http://www.cosc.canterbury.ac.nz/greg.ewing/python_gui/${MY_P}.tar.gz"
+
+LICENSE="PyGUI"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/pygtk[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Doc/. )
+	use examples && local EXAMPLES=( Demos/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygui/pygui-2.5.3.ebuild b/dev-python/pygui/pygui-2.5.3.ebuild
deleted file mode 100644
index cddcbb563671..000000000000
--- a/dev-python/pygui/pygui-2.5.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygui/pygui-2.5.3.ebuild,v 1.4 2014/04/21 12:46:21 ulm Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython *-pypi-*"
-
-inherit distutils
-
-MY_P="PyGUI-${PV}"
-
-DESCRIPTION="A cross-platform pythonic GUI API"
-HOMEPAGE="http://www.cosc.canterbury.ac.nz/greg.ewing/python_gui/"
-SRC_URI="http://www.cosc.canterbury.ac.nz/greg.ewing/python_gui/${MY_P}.tar.gz"
-
-LICENSE="PyGUI"
-SLOT=0
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="dev-python/pygtk"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-PYTHON_MODNAME="GUI"
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml Doc/* || die "Installing html documentation failed"
-	fi
-
-	if use examples; then
-		pushd Tests
-		insinto /usr/share/doc/${PF}/examples
-		doins *.py *.tiff *.jpg || die "Installing examples failed"
-		doins -r ../Demos/* || die "Installing demos failed"
-		popd
-	fi
-}