Switched to distutils-r1, cleanup

(Portage version: 2.2.01.21890-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

6 files changed, 64 insertions, 183 deletions

diff --git a/sci-visualization/veusz/ChangeLog b/sci-visualization/veusz/ChangeLog
index 529f37f5b0bc..cf2ef2414aa0 100644
--- a/sci-visualization/veusz/ChangeLog
+++ b/sci-visualization/veusz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/veusz
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/ChangeLog,v 1.42 2013/04/13 05:38:31 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/ChangeLog,v 1.43 2013/04/24 23:01:02 bicatali Exp $
+
+*veusz-1.17.1-r1 (24 Apr 2013)
+
+  24 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> +veusz-1.17.1-r1.ebuild,
+  -veusz-1.15.ebuild, -veusz-1.16.ebuild, -veusz-1.17.ebuild, metadata.xml:
+  Switched to distutils-r1, cleanup
 
 *veusz-1.17.1 (13 Apr 2013)
 
diff --git a/sci-visualization/veusz/metadata.xml b/sci-visualization/veusz/metadata.xml
index 9ccfb4792916..f5b277bf9edd 100644
--- a/sci-visualization/veusz/metadata.xml
+++ b/sci-visualization/veusz/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
   A Qt based scientific plotting package written in Python using PyQt. It is
   designed to produce publication ready Postscript output. It provides a GUI,
   command line and scripting interface (based on Python) to its plotting
   facilities.
 </longdescription>
-	<use>
-		<flag name="fits">Add FITS format via <pkg>dev-python/pyfits</pkg></flag>
-	</use>
+<use>
+  <flag name="fits">Add FITS format via <pkg>dev-python/pyfits</pkg></flag>
+</use>
+<upstream>
+  <remote-id type="pypi">veusz</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/sci-visualization/veusz/veusz-1.15.ebuild b/sci-visualization/veusz/veusz-1.15.ebuild
deleted file mode 100644
index a19ce2ed5c05..000000000000
--- a/sci-visualization/veusz/veusz-1.15.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.15.ebuild,v 1.1 2012/04/05 12:31:12 grozin Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils fdo-mime
-
-DESCRIPTION="Qt based scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/ http://pypi.python.org/pypi/veusz"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fits"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-
-DEPEND="dev-python/numpy"
-RDEPEND="${DEPEND}
-	dev-python/PyQt4[X,svg]
-	fits? ( dev-python/pyfits )"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-src_install() {
-	distutils_src_install
-	insinto /usr/share/doc/${PF}
-	if use examples; then
-		doins -r examples || die "examples install failed"
-	fi
-	if use doc; then
-		cd Documents
-		insinto /usr/share/doc/${PF}
-		doins manual.pdf || die "doins failed"
-		insinto /usr/share/doc/${PF}/html
-		doins -r manual.html manimages \
-			|| die "doc install failed"
-	fi
-	newicon "${S}"/windows/icons/veusz_48.png veusz.png
-	domenu "${FILESDIR}"/veusz.desktop || die "domenu failed"
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml || die "doins failed"
-	# symlinking the license, bug #341653
-	symlink_license() {
-		dosym "${ROOT}"/usr/portage/licenses/GPL-2 "$(python_get_sitedir)/${PN}"/COPYING
-	}
-	python_execute_function -q symlink_license
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/veusz/veusz-1.16.ebuild b/sci-visualization/veusz/veusz-1.16.ebuild
deleted file mode 100644
index e4351c1cdc9e..000000000000
--- a/sci-visualization/veusz/veusz-1.16.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.16.ebuild,v 1.2 2012/08/01 06:33:09 jlec Exp $
-
-EAPI=4
-
-# python cruft
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-inherit distutils eutils fdo-mime
-
-DESCRIPTION="Qt based scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/ http://pypi.python.org/pypi/veusz"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fits"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-
-DEPEND="dev-python/numpy"
-RDEPEND="${DEPEND}
-	dev-python/PyQt4[X,svg]
-	fits? ( dev-python/pyfits )"
-
-src_install() {
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	newicon windows/icons/veusz_48.png veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-	# symlinking the license, bug #341653
-	symlink_license() {
-		dosym /usr/portage/licenses/GPL-2 "$(python_get_sitedir)/${PN}"/COPYING
-	}
-	python_execute_function -q symlink_license
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/veusz/veusz-1.17.1-r1.ebuild b/sci-visualization/veusz/veusz-1.17.1-r1.ebuild
new file mode 100644
index 000000000000..ff75c49bd687
--- /dev/null
+++ b/sci-visualization/veusz/veusz-1.17.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.17.1-r1.ebuild,v 1.1 2013/04/24 23:01:02 bicatali Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit  eutils fdo-mime distutils-r1
+
+DESCRIPTION="Qt scientific plotting package with good Postscript output"
+HOMEPAGE="http://home.gna.org/veusz/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+IUSE="doc fits"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/PyQt4[X,svg,${PYTHON_USEDEP}]
+	fits? ( virtual/pyfits[${PYTHON_USEDEP}] )"
+
+python_install() {
+	distutils-r1_python_install
+	einfo "${D}/$(python_get_sitedir)/${PN}/COPYING"
+	# symlink the license, bug #341653
+	ln -s "${PORTDIR}"/licenses/${LICENSE} \
+		"${D}/$(python_get_sitedir)"/${PN}/COPYING || die
+}
+
+python_install_all() {
+	use doc && dodoc Documents/manual.pdf && \
+		dohtml -r Documents/{manimages,manual.html}
+
+	newicon windows/icons/veusz_48.png veusz.png
+	domenu "${FILESDIR}"/veusz.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/veusz.xml
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/sci-visualization/veusz/veusz-1.17.ebuild b/sci-visualization/veusz/veusz-1.17.ebuild
deleted file mode 100644
index ce40292bcdf5..000000000000
--- a/sci-visualization/veusz/veusz-1.17.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.17.ebuild,v 1.1 2013/03/28 13:43:46 grozin Exp $
-
-EAPI=4
-
-# python cruft
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-inherit distutils eutils fdo-mime
-
-DESCRIPTION="Qt based scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/ http://pypi.python.org/pypi/veusz"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-IUSE="doc examples fits"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-2"
-
-DEPEND="dev-python/numpy"
-RDEPEND="${DEPEND}
-	dev-python/PyQt4[X,svg]
-	fits? ( dev-python/pyfits )"
-
-src_install() {
-	distutils_src_install
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	newicon windows/icons/veusz_48.png veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-	# symlinking the license, bug #341653
-	symlink_license() {
-		dosym /usr/portage/licenses/GPL-2 "$(python_get_sitedir)/${PN}"/COPYING
-	}
-	python_execute_function -q symlink_license
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-}