rm old, adjustment to test phase, fixes bug #532112

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

diff --git a/dev-python/mako/ChangeLog b/dev-python/mako/ChangeLog
index 65d47c068140581ff07359a7f296abd5f728840e..227b995417ca57a3b097e4e62cbd85e000b2a830 100644 (file)
--- a/dev-python/mako/ChangeLog
+++ b/dev-python/mako/ChangeLog
@@ -1,6 +1,10 @@
 # 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.86 2014/12/10 06:45:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/ChangeLog,v 1.87 2014/12/11 16:39:04 idella4 Exp $
+
+  11 Dec 2014; Ian Delaney <idella4@gentoo.org> -mako-0.7.0.ebuild,
+  -mako-0.7.3-r2.ebuild, mako-1.0.0.ebuild:
+  rm old, adjustment to test phase, fixes bug #532112
 
   10 Dec 2014; Patrick Lauer <patrick@gentoo.org> mako-0.7.3-r2.ebuild,
   mako-1.0.0.ebuild:

diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index e8d67073dd61de653908218d307d32ddd7630f97..2d4f4ebac7be379bac2bb37e1f8ea442799849fc 100644 (file)
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX test-fix.patch 432 SHA256 344aee637baf354951849e979ab4e7e61026b34c2ff0510f3944db7fc78ae6f1 SHA512 2c13f048cebaac8dc37c08529fada9416f55b338b7f1fc4a2244cc199f8026ad05688fab1d7b1b1ba48dc8b23ac56b39964a39c0712e6f459d729d2be752bc2d WHIRLPOOL 928f7d9f00e09f61ca19094577530b891ee5930959e70b11191152ba01304e55d53c5ffc66ccea58f3cd11483cf2c06c8c67ec959be0ce9d99d7ea6aee945115
-DIST Mako-0.7.0.tar.gz 398315 SHA256 2a0acef46ab00d355c668addac08b51712e26741c21f7329de6ce8e8fc229f8e SHA512 e399624ebe131134b45d665793a5dfe07725c6127394502010e17a05cd7f2baae6be967fb9d6dce2f6db03821705571f97b3df225c0ab7ac71387ca364a4d96a WHIRLPOOL 09f5fe178913bbcc838113abe83bb571b6625e1de0502eb1056afc8f3199e977cb5bb3c240d658786eec411e15c9cfdbb78aca5c7d31c53ae85c407c5034f85d
 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.0.ebuild 1327 SHA256 b92b4c375e57b8bc6e8ad506242282f7dd7cf66e069cfb123c89f2721dc5fb01 SHA512 5e9cca87b494cd8f994a097673d3705b9858e0f2abce9b96d0f575ba6c270f4ce4bcff458e885ca83148c012087242d59104aa34de51a5478e8be559259db4a8 WHIRLPOOL a7af8e7dd4670824e43efe26da3eacf77602a8e7e9c0e4b52ae77b20733cdc40caad747a9f6b0136ff103fb133baacf713639a45a79b8367bcb7c0bac9f44799
 EBUILD mako-0.7.3-r1.ebuild 1363 SHA256 e09fb2b06d38d01074aded35eb7cb9c6dfbf70b3599b76a78b66db6f1cad1213 SHA512 93ee2ceb455bfe11ed5deb3de0925799d92218ec1c6f060e6bd56bc5acdffdc46a5bd17f85924dcf94900c953aced67b477a748f75384755cd1567fad6ef9394 WHIRLPOOL 6ba468d8df464740ae9b1e535023af2c7db8d08db31956c22ba86ad080cebe66de0564204daefcb6acf67a51f83a1d7959c29b4e4644cf6ee889e94ee621b36b
-EBUILD mako-0.7.3-r2.ebuild 1799 SHA256 d0366c3b4a80333c0921263d4043aa366213c742b7f4759b0c5535d26c602a3b SHA512 321cf743648d4b8c58c3feb7e475f6d8646ffca52097b0ec8bc13e9fb34863675d79c464edf03d62bd11f79116659d0ba4b9e927a42ac3ec4f50db12fe4783a3 WHIRLPOOL 6ee944e2a07a1723725835d84152cdb84742c543219a6a58182432c1139437e09f7f180326d786f8a737f97059c2f849a25c6e3c3b11cc658a26f7ba323f50c6
-EBUILD mako-1.0.0.ebuild 1605 SHA256 ba2f7a3cb7f70ecb489fcd790bd1e35ee68d02afa409f02bb64b78e6572a2ea1 SHA512 5001a9783bd2ac04fb156f82ba1057873020498405ef03010dd09bd190a10d809d82c35f30bc381439959fa0ad4013e43854313954bef90ecca2e09865cb6f63 WHIRLPOOL 06439871d59558b1e6af45abd4f6a70c025647096f6e4f1f2aa10ad728262f7fdc0ae4869114b325f6248bb899770a9d9b9df368a5fc6f0c0b9204fa57bdc393
-MISC ChangeLog 10351 SHA256 5a7207d0d495dd7b9b835102c38155ff6ee26247c66069f278e8d9f7f293c115 SHA512 203877d56c20cf4b59b2ce05a26c13ab5eeb9adee19c2a016b67af89d164716ab4473d12cc04cb2ef067fde564bb8f4c4cb5c51faf0e288d42d1aa29e028ba1a WHIRLPOOL d96fa613ff6c978a88f8fbf8ad7776adbe284d4ce81a12c9dfbec81a76510d8cf71a94abf6e8fe8e4645eb7a09f979d1fc0935d7d7343be13e6398439ff4e997
+EBUILD mako-1.0.0.ebuild 1548 SHA256 fa9fc88ef9969e14134deb56698ed306be1ba4662e97bae5004709276ed5a6ba SHA512 595701adde63bcaaa5c102d2e7931ba5b64ba966dab1871275f989d3347003e7e69c0b286dcf74e1b81a1a6b23c477f65e81dea711fdbb5c5448ce767e34416f WHIRLPOOL ce1e58832d4849e39c6ad30579a5b1d9791e9a5a6687ea91ea083df1120215b6eaa3d634d11e22589ca6b3311a764e99608579101876bc2cffd33a985d164e77
+MISC ChangeLog 10518 SHA256 83bde1862c212b0969632e41d45fe899ef82ec0095058197322bf175ffd8eb25 SHA512 9c54de31ba8992710e44b22c52e93e322ade0e3ef3649c43ab557062ac5d7b1a64ab98ac9663baf86adadf8331e2be33f5da2e803953b311826f96c825db3c79 WHIRLPOOL 3ae48c418aab04956af0b088cad0c03fa622f2f4be2c1a3cacdd7a07be14ac25ebf7ebeb3415bdd25b1d0d17c62db375e23d1f50f1e2fcbe4a62decd8eac493f
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlSJyLkACgkQso7CE7gHKw3R9gCeN3R3Mwo+u5jHtgDxg7x2INFU
+7jIAoIJFOcqZhz9sPaaG6AeHeI9x3/xG
+=FAIQ
+-----END PGP SIGNATURE-----

diff --git a/dev-python/mako/mako-0.7.0.ebuild b/dev-python/mako/mako-0.7.0.ebuild
deleted file mode 100644 (file)
index 9fd6ae6..0000000
--- a/dev-python/mako/mako-0.7.0.ebuild
+++ /dev/null
@@ -1,56 +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/mako/mako-0.7.0.ebuild,v 1.8 2014/09/30 09:52:08 jer Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-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="amd64 arm ~hppa ia64 ppc s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-python/beaker-1.1
-       >=dev-python/markupsafe-0.9.2"
-DEPEND="${RDEPEND}
-       dev-python/setuptools"
-
-S="${WORKDIR}/${MY_P}"
-
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-src_prepare() {
-       distutils_src_prepare
-       epatch "${FILESDIR}/test-fix.patch"
-
-       2to3_conversion() {
-               [[ "${PYTHON_ABI}" == 2.* ]] && return
-               2to3-${PYTHON_ABI} -nw --no-diffs test
-       }
-       python_execute_function -s 2to3_conversion
-}
-
-src_test() {
-       distutils_src_test -P -w test
-}
-
-src_install() {
-       distutils_src_install
-
-       if use doc; then
-               pushd doc > /dev/null
-               rm -fr build
-               insinto /usr/share/doc/${PF}/html
-               doins -r [a-z]* _static || die "Installation of documentation failed"
-               popd > /dev/null
-       fi
-}

diff --git a/dev-python/mako/mako-0.7.3-r2.ebuild b/dev-python/mako/mako-0.7.3-r2.ebuild
deleted file mode 100644 (file)
index c51d806..0000000
--- a/dev-python/mako/mako-0.7.3-r2.ebuild
+++ /dev/null
@@ -1,71 +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/mako/mako-0.7.3-r2.ebuild,v 1.12 2014/12/10 06:45:16 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,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}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/test-fix.patch"
-)
-
-DOC_CONTENTS="
-${PN} can be enhanced 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 5d56f7f11502bec297f61b6d32f4dacb84b83f95..165a3a210f9b6bda4498ac3891a888362c9a0684 100644 (file)
--- a/dev-python/mako/mako-1.0.0.ebuild
+++ b/dev-python/mako/mako-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2014/12/10 06:45:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mako/mako-1.0.0.ebuild,v 1.5 2014/12/11 16:39:04 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -31,9 +31,7 @@ DOC_CONTENTS="
 ${PN} can be enhanced with caching by dev-python/beaker"
 
 python_test() {
-       cp -r -l test "${BUILD_DIR}"/ || die
-       cd "${BUILD_DIR}"/test || die
-       nosetests || die "Tests fail with ${EPYTHON}"
+       nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
 }
 
 python_install_all() {