revbump; conversion -> distutils-r1, rm old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 21 insertions, 52 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/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
 }