revbump; conversion -> distutils-r1, rm old

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

4 files changed, 26 insertions, 59 deletions

diff --git a/dev-python/dbutils/ChangeLog b/dev-python/dbutils/ChangeLog
index e254e30ce993..eba55c4010af 100644
--- a/dev-python/dbutils/ChangeLog
+++ b/dev-python/dbutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/dbutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dbutils/ChangeLog,v 1.7 2014/08/10 21:09:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbutils/ChangeLog,v 1.8 2014/12/30 04:30:56 idella4 Exp $
+
+*dbutils-1.1-r1 (30 Dec 2014)
+
+  30 Dec 2014; Ian Delaney <idella4@gentoo.org> +dbutils-1.1-r1.ebuild,
+  -dbutils-1.0.ebuild, -dbutils-1.1.ebuild:
+  revbump; conversion -> distutils-r1, rm old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> dbutils-1.0.ebuild,
   dbutils-1.1.ebuild:
diff --git a/dev-python/dbutils/Manifest b/dev-python/dbutils/Manifest
index a31959b4cacb..3e5961535678 100644
--- a/dev-python/dbutils/Manifest
+++ b/dev-python/dbutils/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST DBUtils-1.0.tar.gz 94409 SHA256 42f8440d6dc70668d6fac65cd25b635de12e1761b6429cc313593c84b12f5c01 SHA512 31d329787b8bb7707226186bd0887bd0c6435cf750150a61c9443f3e411f808b9d0fccc0b877cb19ba11d8a4e645321a540585fe5b6f264fa2ac13dcda060577 WHIRLPOOL 3a4e5973a26cb2d9b3a82b8a115aaf181c177072ab9aacccafd42394ba4aaa9367875a6bd1031f20de4797991f9e155093703b194cba5d8d201490df84594460
 DIST DBUtils-1.1.tar.gz 109943 SHA256 d62d1abaafdbd9245a53e9c901f4162125d0258ef8a489233dba4689cea0bff7 SHA512 34e2dd85e94bbf13804deb7a40707ed2d83174758af7282702e1614d34924a6ae085bca620da0233bfd8972a00332c022fe764e6e5efa642c3365879cdedf88e WHIRLPOOL d1ae1126c00acef91fbd01b6048adac5f81bec07ca523ef73684fcc0879e5b90e42d74c4e901eb65166cad4767f9d6c97ceca0434b971bd6606e62a2f2d0e818
-EBUILD dbutils-1.0.ebuild 723 SHA256 697227aee7b8e6ce21169d39abe59e374bfbeaad6acd302c9795ad3e780cb042 SHA512 3c8174c77d988983b7b4e29ee210dbee0bba42a156ec1653be5a0f74ee32831251463710f69c25513ec70408698ebc26d470fc36e69938e711173bbeb64989cb WHIRLPOOL f5684579f2e63d97dad4ab4eea6c8d177b2f3b0be1ff124e831d334e46f6a34a51fe67db20ea371b252a939f65ae4b92338c8660faf60cc006991c247b8cc779
-EBUILD dbutils-1.1.ebuild 1176 SHA256 0ee02892a42a26aa82de4ce59ec3435fe8aa3b3827bbf0007195c4b9cfb89838 SHA512 571ee2acdc0b51fc32c3f2dadfb0654139e0184972f3d3516f7963ab0aa0f8bdd6e9780e5b916535b572c5aa63e2e1042294c34c22409438b2a20fc4ea671cc4 WHIRLPOOL 6afd3654e0fad28000db15804db68dfeb65f260e3db3eb24df173148c520e81789406a02aff58fd25b4da20eae738cf4dd0025055c745edf52c885852379c423
-MISC ChangeLog 1188 SHA256 adc48a7e0b90fc80579ed5cfd4748dcc25e3060f6dcb1ef6d2c2f7cbb5298b9c SHA512 d6e8f6f931654cbcc7a405e608af77d101cdbb54915ea4fd2ba08f330ce791f09bbd6b1d37b0749eb56f2586af09672ad2cfbece86a98fcff99122b9d409ed96 WHIRLPOOL 3d8fc7712ef03bd4e4ef03855cbb1798f750cfdf5e8a616bffb81f24e6ad50e11d76b7d4cdd6d47632c005a0ecfb0dd5c90757f8bab13aa7b2d7136554715106
+EBUILD dbutils-1.1-r1.ebuild 1079 SHA256 dd2bf4386036663a5940a385f18403aafd80710d06df7a07af075e555f5b48e5 SHA512 08295cf5605bf4b34f39502ebadced5ea6b990d797259cfb9dc879e47ef3400d2dd0fb411ef5f13b88d02624c7aeb1501f392ee6d141cd9b7bea8bb648fd5f34 WHIRLPOOL ba3a3c1700aaa8f73e8077289560eaac6c9156069ff24985c845f02eb15d9bb6243180f957aa24e01d5845959c04c77e3eeb9807c590fab01e27ffceda926711
+MISC ChangeLog 1383 SHA256 0453a93306c8891a1e9cbdc5938437e91576a7ab639a46d8ac8091b20778f710 SHA512 2257bd11c295bcdb47921a3efe05fafe10eac791bc6573830328f394938cf39915655e1939810fde52e4836b7ac06303a096943d452e9dfcd141cf74b9f6602a WHIRLPOOL dd94022b596f62fdc381c462a7c12f6ed1a26b06d1dbe59f5b17008db555c81c9a6d2b6c25d340bb2cbfda05b3a93133d8f39c1a07557d8a4e7d1fcbd4afb80a
 MISC metadata.xml 604 SHA256 77e56c86a3319d9935b2edefa03e7b4f775549a504a877a02e1201f00f217179 SHA512 349fb90ba0f2c4392b7fe5d265cab4bff654bbc6918cf3d1d65fcf5d321790c010b1d64a66416792cd10f1f13ac33433a810aa7cd872646b15b1c446ea1ecee3 WHIRLPOOL 657c722a149f25a29389504075d75774dec2020cc6b74b80702289b4ebfcde8c0ada07bf7a9cb094cd1c55453cc2903ceb70345218e8b6d5484f4e83253314c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn33wACgkQcaHudmEf86pWawCcCg0wgoEelSWCrUuhEJ3wh4EG
-nosAn2C5PMCqqyp7Fb3zks1wtM5R0Mg7
-=4iul
+iEYEAREIAAYFAlSiKpEACgkQso7CE7gHKw20VACghEVJQVr+DkI3j2fdKQCaOKTP
+iBQAn3RxCVYbIiXzBSjyB7miKGEqUPD1
+=xAI/
 -----END PGP SIGNATURE-----
diff --git a/dev-python/dbutils/dbutils-1.0.ebuild b/dev-python/dbutils/dbutils-1.0.ebuild
deleted file mode 100644
index a12f94acde18..000000000000
--- a/dev-python/dbutils/dbutils-1.0.ebuild
+++ /dev/null
@@ -1,29 +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/dbutils/dbutils-1.0.ebuild,v 1.4 2014/08/10 21:09:16 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="DBUtils"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Database connections for multi-threaded environments"
-HOMEPAGE="http://www.webwareforpython.org/DBUtils http://pypi.python.org/pypi/DBUtils"
-SRC_URI="http://www.webwareforpython.org/downloads/DBUtils/${MY_P}.tar.gz"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="${MY_PN}"
diff --git a/dev-python/dbutils/dbutils-1.1.ebuild b/dev-python/dbutils/dbutils-1.1-r1.ebuild
index 1ec242aeb9de..5c98bbb5baea 100644
--- a/dev-python/dbutils/dbutils-1.1.ebuild
+++ b/dev-python/dbutils/dbutils-1.1-r1.ebuild
@@ -1,14 +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/dbutils/dbutils-1.1.ebuild,v 1.3 2014/08/10 21:09:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dbutils/dbutils-1.1-r1.ebuild,v 1.1 2014/12/30 04:30:56 idella4 Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils
+inherit distutils-r1
 
 MY_PN="DBUtils"
 MY_P="${MY_PN}-${PV}"
@@ -20,32 +17,27 @@ SRC_URI="http://www.webwareforpython.org/downloads/DBUtils/${MY_P}.tar.gz"
 LICENSE="OSL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="doc"
+IUSE="doc examples"
 
 DEPEND=""
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
-PYTHON_MODNAME="${MY_PN}"
-
-src_prepare() {
-	sed -i \
-		-e "s/, 'DBUtils.Tests'//" \
+python_prepare_all() {
+	sed -i -e "s/, 'DBUtils.Tests'//" \
 		-e "s/, 'DBUtils.Examples'//" \
 		-e "/package_data=/d" \
 		setup.py || die "sed failed"
+	distutils-r1_python_prepare_all
 }
 
-src_test() {
-	python_execute_nosetests -- -P -s ${MY_PN}/Tests
+python_test() {
+	nosetests -s ${MY_PN}/Tests
 }
 
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r "${S}/${MY_PN}"/Docs/* || die "dohtml failed"
-		insinto "/usr/share/doc/${PF}/examples"
-		doins "${S}/${MY_PN}"/Examples/*.py
-	fi
+python_install_all() {
+	use doc && local HTML_DOCS=( "${S}/${MY_PN}"/Docs/. )
+	use examples && local EXAMPLES=( "${MY_PN}"/Examples/. )
+	distutils-r1_python_install_all
 }