Version bump

(Portage version: 2.1.10.41/cvs/Linux x86_64)

3 files changed, 71 insertions, 21 deletions

diff --git a/dev-python/apptools/ChangeLog b/dev-python/apptools/ChangeLog
index f0e746c6e6d5..1e4af623b2c2 100644
--- a/dev-python/apptools/ChangeLog
+++ b/dev-python/apptools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/apptools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/ChangeLog,v 1.12 2011/08/03 23:51:07 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/ChangeLog,v 1.13 2012/01/17 06:16:44 bicatali Exp $
+
+*apptools-4.0.1 (17 Jan 2012)
+
+  17 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org> apptools-4.0.0.ebuild,
+  +apptools-4.0.1.ebuild:
+  Version bump
 
 *apptools-4.0.0 (03 Aug 2011)
 
diff --git a/dev-python/apptools/apptools-4.0.0.ebuild b/dev-python/apptools/apptools-4.0.0.ebuild
index 5473ad6aa489..9aa6c70a5f48 100644
--- a/dev-python/apptools/apptools-4.0.0.ebuild
+++ b/dev-python/apptools/apptools-4.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-4.0.0.ebuild,v 1.1 2011/08/03 23:51:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-4.0.0.ebuild,v 1.2 2012/01/17 06:16:44 bicatali Exp $
 
-EAPI="3"
+EAPI=4
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="*-jython"
 DISTUTILS_SRC_TEST="nosetests"
 
 inherit distutils virtualx
@@ -21,7 +21,7 @@ IUSE="doc examples test"
 
 RDEPEND="dev-python/configobj
 	dev-python/numpy
-	>=dev-python/traits-4.0.0"
+	>=dev-python/traits-4.1.0"
 DEPEND="dev-python/setuptools
 	doc? ( dev-python/sphinx )
 	test? (
@@ -33,12 +33,7 @@ DEPEND="dev-python/setuptools
 
 src_compile() {
 	distutils_src_compile
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		emake html || die "Generation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && emake -C docs html
 }
 
 src_test() {
@@ -49,15 +44,10 @@ src_install() {
 	find -name "*LICENSE*.txt" -delete
 	distutils_src_install
 
-	if use doc; then
-		pushd docs/build/html > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
+	use doc && dohtml -r docs/build/html/*
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r examples/* || die "Installation of examples failed"
+		insinto /usr/share/doc/${PF}
+		doins -r examples
 	fi
 }
diff --git a/dev-python/apptools/apptools-4.0.1.ebuild b/dev-python/apptools/apptools-4.0.1.ebuild
new file mode 100644
index 000000000000..06a55b4d4b9e
--- /dev/null
+++ b/dev-python/apptools/apptools-4.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-4.0.1.ebuild,v 1.1 2012/01/17 06:16:44 bicatali Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils virtualx
+
+DESCRIPTION="Enthought Tool Suite: Application tools"
+HOMEPAGE="http://code.enthought.com/projects/app_tools/ http://pypi.python.org/pypi/apptools"
+SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="dev-python/configobj
+	dev-python/numpy
+	>=dev-python/traits-4"
+DEPEND="dev-python/setuptools
+	doc? ( dev-python/sphinx )
+	test? (
+		${RDEPEND}
+		>=dev-python/pyface-4
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)"
+
+src_compile() {
+	distutils_src_compile
+	use doc && emake -C docs html
+}
+
+src_test() {
+	VIRTUALX_COMMAND="distutils_src_test" virtualmake
+}
+
+src_install() {
+	find -name "*LICENSE*.txt" -delete
+	distutils_src_install
+
+	use doc && dohtml -r docs/build/html/*
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}