re-add 0.7.3-r2, drop old impls, tidy deps

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

4 files changed, 90 insertions, 9 deletions

diff --git a/dev-python/mako/ChangeLog b/dev-python/mako/ChangeLog
index 227b995417ca..f6448066f864 100644
--- a/dev-python/mako/ChangeLog
+++ b/dev-python/mako/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/mako
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/ChangeLog,v 1.87 2014/12/11 16:39:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/ChangeLog,v 1.88 2014/12/12 05:43:54 idella4 Exp $
+
+*mako-0.7.3-r2 (12 Dec 2014)
+
+  12 Dec 2014; Ian Delaney <idella4@gentoo.org> +mako-0.7.3-r2.ebuild,
+  mako-1.0.0.ebuild:
+  re-add 0.7.3-r2, drop old impls, tidy deps
 
   11 Dec 2014; Ian Delaney <idella4@gentoo.org> -mako-0.7.0.ebuild,
   -mako-0.7.3-r2.ebuild, mako-1.0.0.ebuild:
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 2d4f4ebac7be..abd6ae1b4c91 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -5,13 +5,14 @@ AUX test-fix.patch 432 SHA256 344aee637baf354951849e979ab4e7e61026b34c2ff0510f39
 DIST Mako-0.7.3.tar.gz 401787 SHA256 5e1d17fbd1aed57ebeea74ee3809015b121e142d73069066a113a125a4ec2ef5 SHA512 3134a05fcacb5d8e41ebab3bedb6c1a31eec94afb56f2c8319fee4b749930fcc7df5ed86e0de26cafbaea966b920921e29788f1c6ba5810eedb4d98f322085f9 WHIRLPOOL 8d3011b472a4bd04c4ef0ddad4767357bd1c570228702e900c956582c2e1e7e668765a34e4e450e18b8a1e0562d9b024ee1ae8b82efc891023154cf442f16d8a
 DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c
 EBUILD mako-0.7.3-r1.ebuild 1363 SHA256 e09fb2b06d38d01074aded35eb7cb9c6dfbf70b3599b76a78b66db6f1cad1213 SHA512 93ee2ceb455bfe11ed5deb3de0925799d92218ec1c6f060e6bd56bc5acdffdc46a5bd17f85924dcf94900c953aced67b477a748f75384755cd1567fad6ef9394 WHIRLPOOL 6ba468d8df464740ae9b1e535023af2c7db8d08db31956c22ba86ad080cebe66de0564204daefcb6acf67a51f83a1d7959c29b4e4644cf6ee889e94ee621b36b
-EBUILD mako-1.0.0.ebuild 1548 SHA256 fa9fc88ef9969e14134deb56698ed306be1ba4662e97bae5004709276ed5a6ba SHA512 595701adde63bcaaa5c102d2e7931ba5b64ba966dab1871275f989d3347003e7e69c0b286dcf74e1b81a1a6b23c477f65e81dea711fdbb5c5448ce767e34416f WHIRLPOOL ce1e58832d4849e39c6ad30579a5b1d9791e9a5a6687ea91ea083df1120215b6eaa3d634d11e22589ca6b3311a764e99608579101876bc2cffd33a985d164e77
-MISC ChangeLog 10518 SHA256 83bde1862c212b0969632e41d45fe899ef82ec0095058197322bf175ffd8eb25 SHA512 9c54de31ba8992710e44b22c52e93e322ade0e3ef3649c43ab557062ac5d7b1a64ab98ac9663baf86adadf8331e2be33f5da2e803953b311826f96c825db3c79 WHIRLPOOL 3ae48c418aab04956af0b088cad0c03fa622f2f4be2c1a3cacdd7a07be14ac25ebf7ebeb3415bdd25b1d0d17c62db375e23d1f50f1e2fcbe4a62decd8eac493f
+EBUILD mako-0.7.3-r2.ebuild 1863 SHA256 b23c98eb3b4891cbec406dbeceaa8384964af0683384a097e938faaa68eecbdb SHA512 7679906b4029a3968ad638c42238304edce6ae13d327d0abd79ab92a0495a548ffb80a9a67142f255ecc72c3e74181dbdac64a1d49730704abe4997dd8c44a30 WHIRLPOOL 510144d1bc0d5683b14b2874acf052d75e7dc6fbc571b5022751d14fa4538e41759745d70d99e22fc92c0021adb9596f736f23f223597f90fc137c7fa5efcf6a
+EBUILD mako-1.0.0.ebuild 1577 SHA256 708f30489422154816cca25d1debf1f17e01f6dc8c419b78e4b12750a00c26c7 SHA512 2a8cb7dd13a469e67c542bd70b4a854ac62bfca37e04b93f16eb848e5100c875a2de9f5efa8bed1d7bd9cbc7ed18364eb41916687ea0eee63d0fab71e8e28c6e WHIRLPOOL ffaeb713390e1e591469a2efc574dd99e01c4108bd5934ea569300f80c7fabd83db7aabdbdaa1ebb5d0d451bddc03ab937b52fbd555bb8505164e60b0b9b61d7
+MISC ChangeLog 10686 SHA256 a61cd19e69bc7599625624125204b4caf4553c26edd40f92bcf15c4538e6f48c SHA512 07c85cff0e9754d022d1e192f560d3ddf52800c77c91999ac365ba24321b1c35947b5f9249f60e40d1e1652b008baa8365251fe0f045389f59bcbe487bb77735 WHIRLPOOL e8e3ce2a7a785472f711599c23bdc2f7da2a26a9bcd3759c4bbbb06dbefbfc0fc1926087d7a64be0ec6836888d6c7843a7c1122618a88834690a5c111a82a5c1
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSJyLkACgkQso7CE7gHKw3R9gCeN3R3Mwo+u5jHtgDxg7x2INFU
-7jIAoIJFOcqZhz9sPaaG6AeHeI9x3/xG
-=FAIQ
+iEYEAREIAAYFAlSKgKkACgkQso7CE7gHKw1k8wCgoXLbieGGvapKWd3/8KUFkPwc
+ogAAoKtUctLAz+wwFi/egE+MTvYBo1DM
+=390/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/mako/mako-0.7.3-r2.ebuild b/dev-python/mako/mako-0.7.3-r2.ebuild
new file mode 100644
index 000000000000..5beb616a85f7
--- /dev/null
+++ b/dev-python/mako/mako-0.7.3-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-0.7.3-r2.ebuild,v 1.14 2014/12/12 05:43:54 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit readme.gentoo versionator distutils-r1
+
+MY_P="Mako-${PV}"
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ http://pypi.python.org/pypi/Mako"
+SRC_URI="http://www.makotemplates.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/test-fix.patch"
+)
+
+DOC_CONTENTS="
+${PN} can be enchanced with caching by dev-python/beaker"
+
+python_test() {
+	cp -r -l test "${BUILD_DIR}"/ || die
+
+	if [[ ${EPYTHON} == python3.* ]]; then
+		# Notes:
+		#   -W is not supported by python3.1
+		#   -n causes Python to write into hardlinked files
+		2to3 --no-diffs -w "${BUILD_DIR}"/test || die
+	fi
+
+	cd "${BUILD_DIR}"/test || die
+	nosetests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	rm -rf doc/build
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 0.7.3-r2 $v; then
+			ewarn "dev-python/beaker is no longer hard dependency of ${P}"
+			ewarn "If you rely on it, you should add beaker to your world"
+			ewarn "file:"
+			ewarn "# emerge --noreplace beaker"
+			break
+		fi
+	done
+}
diff --git a/dev-python/mako/mako-1.0.0.ebuild b/dev-python/mako/mako-1.0.0.ebuild
index 165a3a210f9b..962c3b99b325 100644
--- a/dev-python/mako/mako-1.0.0.ebuild
+++ b/dev-python/mako/mako-1.0.0.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-1.0.0.ebuild,v 1.5 2014/12/11 16:39:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-1.0.0.ebuild,v 1.6 2014/12/12 05:43:54 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
 inherit readme.gentoo versionator distutils-r1
 
 MY_PN="Mako"
@@ -23,7 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}] )"
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
 
 S="${WORKDIR}/${MY_P}"