From 38658e89b097867e243ee7f46572a6b94bc700f4 Mon Sep 17 00:00:00 2001
From: Ian Delaney <idella4@gentoo.org>
Date: Fri, 14 Jun 2013 17:48:17 +0000
Subject: revbump; migrate -> distutils-r1, remove old

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
---
 dev-python/happydoc/ChangeLog              |  9 ++++--
 dev-python/happydoc/happydoc-3.1-r1.ebuild | 47 ------------------------------
 dev-python/happydoc/happydoc-3.1-r2.ebuild | 40 +++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 49 deletions(-)
 delete mode 100644 dev-python/happydoc/happydoc-3.1-r1.ebuild
 create mode 100644 dev-python/happydoc/happydoc-3.1-r2.ebuild

(limited to 'dev-python/happydoc')

diff --git a/dev-python/happydoc/ChangeLog b/dev-python/happydoc/ChangeLog
index 05655dee8763..cddce19b389b 100644
--- a/dev-python/happydoc/ChangeLog
+++ b/dev-python/happydoc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/happydoc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/ChangeLog,v 1.26 2012/12/01 02:00:42 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/ChangeLog,v 1.27 2013/06/14 17:48:17 idella4 Exp $
+
+*happydoc-3.1-r2 (14 Jun 2013)
+
+  14 Jun 2013; Ian Delaney <idella4@gentoo.org> +happydoc-3.1-r2.ebuild:
+  revbump; migrate -> distutils-r1, remove old
 
   01 Dec 2012; Tim Harder <radhermit@gentoo.org> happydoc-3.1-r1.ebuild:
   Fix LICENSE (bug #445414 by ulm).
diff --git a/dev-python/happydoc/happydoc-3.1-r1.ebuild b/dev-python/happydoc/happydoc-3.1-r1.ebuild
deleted file mode 100644
index 271375ceb0be..000000000000
--- a/dev-python/happydoc/happydoc-3.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-3.1-r1.ebuild,v 1.2 2012/12/01 02:00:42 radhermit Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils versionator
-
-MY_PN="HappyDoc"
-MY_PV=$(replace_all_version_separators "_" ${PV})
-MY_V=$(get_major_version ${PV})
-
-DESCRIPTION="Tool for extracting documentation from Python source code"
-HOMEPAGE="http://happydoc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_r${MY_PV}.tar.gz"
-
-LICENSE="HPND ZPL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-# Tests need extra data not present in the release tarball.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_PN}${MY_V}-r${MY_PV}"
-
-PYTHON_MODNAME="happydoclib"
-
-src_prepare() {
-	distutils_src_prepare
-	cp "${FILESDIR}/${P}-setup.py" setup.py || die "Copying of setup.py failed"
-	epatch "${FILESDIR}/${P}-python-2.6.patch"
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r "srcdocs/${MY_PN}${MY_V}-r${MY_PV}"/* || die "Installation of documentation failed"
-	fi
-}
diff --git a/dev-python/happydoc/happydoc-3.1-r2.ebuild b/dev-python/happydoc/happydoc-3.1-r2.ebuild
new file mode 100644
index 000000000000..04663e595c44
--- /dev/null
+++ b/dev-python/happydoc/happydoc-3.1-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-3.1-r2.ebuild,v 1.1 2013/06/14 17:48:17 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+
+inherit distutils-r1 versionator
+
+MY_PN="HappyDoc"
+MY_PV=$(replace_all_version_separators "_" ${PV})
+MY_V=$(get_major_version ${PV})
+
+DESCRIPTION="Tool for extracting documentation from Python source code"
+HOMEPAGE="http://happydoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_r${MY_PV}.tar.gz"
+
+LICENSE="HPND ZPL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+# Tests need extra data not present in the release tarball.
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_PN}${MY_V}-r${MY_PV}"
+
+python_prepare_all() {
+	cp "${FILESDIR}/${P}-setup.py" setup.py || die "Copying of setup.py failed"
+	epatch "${FILESDIR}/${P}-python-2.6.patch"
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( srcdocs/${MY_PN}${MY_V}-r${MY_PV}/. )
+	distutils-r1_python_install_all
+}
-- 
cgit v1.2.3-65-gdbad