revbumps; conversion -> distutils-r1, rm old

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

6 files changed, 74 insertions, 127 deletions

diff --git a/dev-python/simpletal/ChangeLog b/dev-python/simpletal/ChangeLog
index e89921f858fc..706913fc45c1 100644
--- a/dev-python/simpletal/ChangeLog
+++ b/dev-python/simpletal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/simpletal
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/ChangeLog,v 1.12 2014/08/10 21:22:29 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/ChangeLog,v 1.13 2015/01/09 10:29:37 idella4 Exp $
+
+*simpletal-5.1-r1 (09 Jan 2015)
+*simpletal-4.2-r1 (09 Jan 2015)
+
+  09 Jan 2015; Ian Delaney <idella4@gentoo.org> +simpletal-4.2-r1.ebuild,
+  +simpletal-5.1-r1.ebuild, -simpletal-4.2.ebuild, -simpletal-5.0.ebuild,
+  -simpletal-5.1.ebuild:
+  revbumps; conversion -> distutils-r1, rm old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> simpletal-4.2.ebuild,
   simpletal-5.0.ebuild, simpletal-5.1.ebuild:
diff --git a/dev-python/simpletal/Manifest b/dev-python/simpletal/Manifest
index 506b9cba17e3..bd6433b6537a 100644
--- a/dev-python/simpletal/Manifest
+++ b/dev-python/simpletal/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST SimpleTAL-4.2.tar.gz 96011 SHA256 3f2983773382491c981e8f621094be4ea4e202336c96f81f9a1f7305e4b2eb08 SHA512 ce816a9c7c66ffa96da0968cea60d838b7e9ed5608a0eae05c40fbbacddec2ca369944f820237d9c3756cd14552d7957c86f8f3e8067cb944ac86529232aa0c8 WHIRLPOOL 6dd675f113d37209a4d10945c0f7116e3d4b45f31bbdfe4488e17150d3969a27e1cb348c3d0136878bae456de646fa8ab086c78d67b8a49046e0b7261261a484
-DIST SimpleTAL-5.0.tar.gz 90229 SHA256 7137e93a87d9a9b905b8bb880307f553abe170e460fb5806fa6ffa06d9b1201f SHA512 fe71dac468ad8cedbe73fcba29ee3b0c30b483776ccc312064b8f6e201ed7e8295705bf1fc7b473b27344d59d39a7c5365187d6fa8a0ea38b0656b6d0622a439 WHIRLPOOL 0326602cc022d367933a0cfad58cbe8e918255e31d14bc7a0d61484a4a8dcf3f843ff94420824539784c4d6c68ad2df10a9c90a6394c29e4a03fe507facb07fc
 DIST SimpleTAL-5.1.tar.gz 90604 SHA256 00118ccf7eb74cb3e536a891a1858ad31a2416f63a85cf61fd538bde4c760057 SHA512 51fc5bcfdb4a5ac06b06d7aca20d13cb964a625d0167cc723e8b7352cf154bcde9f14aff96eaa42a5b299c8439336cd35d8fc8f927ae1352be7e7ca5f12aba52 WHIRLPOOL 25e40138a4e53a6f8a6aaa6d607e082ac8ba428ff8b99336d91c5d10e3a6ae8d203e6a49756c96d5357b8605ad4a6eafc3501403a62dce63127eb3ff8ff485bd
-EBUILD simpletal-4.2.ebuild 1166 SHA256 b76bffbcbb9c9c827307be55ec77cdd33eef04da786cbb3ba41cb34c34300414 SHA512 b02172ad9f2e8d44b50b61307f958ac9a6b847e1582c988ff583dbe7568614259bb87912f4676282c94ec37471fd2af63181c5cfa48ef39eec9186b3097c45d2 WHIRLPOOL 883d26cb603ab1f9eb723b0d44cfbecb36e93deed040323f0a68311e58738f6abdb46f13d0caa6ac0445ecef45473b088625282ec670acea93e86ddade99a97a
-EBUILD simpletal-5.0.ebuild 1133 SHA256 8e0eb553b6436efd4cb38f33b499cbbe6feee37b0233880598d9f06ae50f3181 SHA512 c6267bc633f7dbe4ad4af9feab35e1bc35d51d78bc1632880baad77f7bffdecfe633b285c089e7b881b121b3aa74db6fbba6bc4d134a41126dd198e466b6895c WHIRLPOOL a91aefbafc4cee1e8a2e4bc3c7f07ecbbac0a8e10e29e8bf275f9ac071ce89842e74c20d2a958dc9def1d77a648dd230b77b5bf1b6cc0285e62df23e5b1249c0
-EBUILD simpletal-5.1.ebuild 1133 SHA256 95fcb0effba10704ef7a75db9b3b3453f1d0f6aed3ecaed6fb2381ae94c7abe6 SHA512 34114110afc4e3ae780e1a62e49b3e675f4894d4acd072062c614867d7164ea748c3d03b4b0523f16b905062866c78f15144c0d6161d71535205efe3497575be WHIRLPOOL 275bfafdc5626de6f0d4c146644019b346f7b8a3c30014b86422c1733bcc1dba5976ed292dbd4f0befc3719fbacaddd5e1f02048c517c0733214a2474a0b1508
-MISC ChangeLog 2626 SHA256 96ab2de2549aa9d6d1266c045b33502328991a59a12f3ca08197214f70b0c011 SHA512 fce0a812791bd183f0968130714510ce17ebc9a97c3ceee0fcb2415a1ca5fc2f16a782b03d9b85348d9625bef3b2ae975bff710368cba3f6333cd944b5d9cb03 WHIRLPOOL 1a32e93b9d39d87f8dcbbdc7555e0e5b9cd16e9e1ce1ea86ecc3faa548ad3a000ee42558b5f13a7ab2e0be7a24ec141742a03dc7dc21d77fa467f204a311d36e
+EBUILD simpletal-4.2-r1.ebuild 1176 SHA256 96c1ede2fde759df67a4b08ed002bc24ec02bd1434c3fa185cd500351cf0270e SHA512 a0a0b8d5190bb964c86eba4da16b5dda4c5a5d916e1dfe1929305472c1eed9e4e7ba9051a5025826bff6d26318734d5bb8cced04ade38d694aa981c9d78572eb WHIRLPOOL 8ccce21f39f683b2abe0a952e08aefc19c2a84dc2383ff5744f2431cdde94bc61894225c9bffa0d4f25bd221f025fad58cb618beca79fd3f44ccaaecf765d241
+EBUILD simpletal-5.1-r1.ebuild 1133 SHA256 638e193fd0f0c500117de7eac3e940f171d2b89905ca70412dd0038bac810ea7 SHA512 2ca5d7d08201fa5eb652830319f6e76c34e5f4c4cf3d1e01c02dd512853b72e3d2c0e67a8a066a178cf645bfeb3111e82fe78a93a753ca744e2ba0f008f33bb2 WHIRLPOOL 753af5f7c43310a60c3b50c3b8dd9bc4f14644bfd1637d777dc86000ca41e3395bc1f5491fe17fd3c2bd914d2b2451208743f271fa30311ce3481fb71d34f795
+MISC ChangeLog 2913 SHA256 445911b1f15b48d60b2fa2b26ff4c47314c38ec55e7af8f60b9c515cc480a5e0 SHA512 dde3fb48ced4b6c269c6fbb0e96d1635b14651240b52cde9e8b72057d3991d51aa73c3f11d999431c1917104a3c1cc47387ce1b123bc4c2bc2cf619779f4e6d5 WHIRLPOOL 5a88ad1e62a41cce3ade78b2bc8d0011f82fee997f57403932226791c2a55b39afbb1ae39813340d0879e2fbd2a120d35e1065c94e3dbcfba179071c670ce5fb
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn4pUACgkQcaHudmEf86qsEwCdGB8hUBHXpVDk5TNfl/j37MY4
-FW0AnR0AisZGK+51RLQ3CjKGGTG41WYx
-=N91e
+iEYEAREIAAYFAlSvrZ8ACgkQso7CE7gHKw299ACgho5l5b57g11rtmTO5uXKC9fy
+zxsAnj/+3rV2L/XDR/EkmIFkyqcyrHZi
+=T4C8
 -----END PGP SIGNATURE-----
diff --git a/dev-python/simpletal/simpletal-4.2-r1.ebuild b/dev-python/simpletal/simpletal-4.2-r1.ebuild
new file mode 100644
index 000000000000..d6891de45f28
--- /dev/null
+++ b/dev-python/simpletal/simpletal-4.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/simpletal-4.2-r1.ebuild,v 1.1 2015/01/09 10:29:37 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_PN="SimpleTAL"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Stand alone Python implementation of the Zope TAL, TALES and METAL specs for HTML/XML templates"
+HOMEPAGE="http://www.owlfish.com/software/simpleTAL/ http://pypi.python.org/pypi/SimpleTAL"
+SRC_URI="http://www.owlfish.com/software/simpleTAL/downloads/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="dev-python/pyxml[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	sed -e "s/^TEMP_DIR=.*/TEMP_DIR=os.curdir/" \
+		-i tests/TALUtilsTests/TemplateCacheTestCases.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" runtests.py || die "tests failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/simpletal/simpletal-4.2.ebuild b/dev-python/simpletal/simpletal-4.2.ebuild
deleted file mode 100644
index 2aa991b4d203..000000000000
--- a/dev-python/simpletal/simpletal-4.2.ebuild
+++ /dev/null
@@ -1,47 +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/simpletal/simpletal-4.2.ebuild,v 1.4 2014/08/10 21:22:29 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit distutils
-
-MY_PN="SimpleTAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Stand alone Python implementation of the Zope TAL, TALES and METAL specs for HTML/XML templates"
-HOMEPAGE="http://www.owlfish.com/software/simpleTAL/ http://pypi.python.org/pypi/SimpleTAL"
-SRC_URI="http://www.owlfish.com/software/simpleTAL/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/pyxml"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_test() {
-	sed -e "s/^TEMP_DIR=.*/TEMP_DIR=os.curdir/" -i tests/TALUtilsTests/TemplateCacheTestCases.py || die "sed failed"
-
-	testing() {
-		"$(PYTHON)" runtests.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	dohtml documentation/html/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/simpletal/simpletal-5.0.ebuild b/dev-python/simpletal/simpletal-5.1-r1.ebuild
index ae99950ddbe5..25d1413fe3f2 100644
--- a/dev-python/simpletal/simpletal-5.0.ebuild
+++ b/dev-python/simpletal/simpletal-5.1-r1.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/simpletal-5.0.ebuild,v 1.4 2014/08/10 21:22:29 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/simpletal-5.1-r1.ebuild,v 1.1 2015/01/09 10:29:37 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.*"
+EAPI=5
+PYTHON_COMPAT=( python3_3 )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN="SimpleTAL"
 MY_P="${MY_PN}-${PV}"
@@ -19,29 +17,25 @@ SRC_URI="http://www.owlfish.com/software/simpleTAL/downloads/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="5"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="examples"
+IUSE="doc examples"
 
 DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
-src_test() {
-	sed -e "s/^TEMP_DIR=.*/TEMP_DIR=os.curdir/" -i tests/TALUtilsTests/TemplateCacheTestCases.py || die "sed failed"
-
-	testing() {
-		"$(PYTHON)" runtests.py
-	}
-	python_execute_function testing
+python_prepare_all() {
+	sed -e "s/^TEMP_DIR=.*/TEMP_DIR=os.curdir/" \
+		-i tests/TALUtilsTests/TemplateCacheTestCases.py || die
+	distutils-r1_python_prepare_all
 }
 
-src_install() {
-	distutils_src_install
-
-	dohtml documentation/html/*
+python_test() {
+	"${PYTHON}" runtests.py || die "tests failed"
+}
 
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
+python_install_all() {
+	use doc && local HTML_DOCS=( documentation/html/. )
+	use examples && local EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/simpletal/simpletal-5.1.ebuild b/dev-python/simpletal/simpletal-5.1.ebuild
deleted file mode 100644
index 3b4f77a579ed..000000000000
--- a/dev-python/simpletal/simpletal-5.1.ebuild
+++ /dev/null
@@ -1,47 +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/simpletal/simpletal-5.1.ebuild,v 1.3 2014/08/10 21:22:29 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.*"
-
-inherit distutils
-
-MY_PN="SimpleTAL"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Stand alone Python implementation of the Zope TAL, TALES and METAL specs for HTML/XML templates"
-HOMEPAGE="http://www.owlfish.com/software/simpleTAL/ http://pypi.python.org/pypi/SimpleTAL"
-SRC_URI="http://www.owlfish.com/software/simpleTAL/downloads/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_test() {
-	sed -e "s/^TEMP_DIR=.*/TEMP_DIR=os.curdir/" -i tests/TALUtilsTests/TemplateCacheTestCases.py || die "sed failed"
-
-	testing() {
-		"$(PYTHON)" runtests.py
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	dohtml documentation/html/*
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}