Bug #341653 fixed; old versions cleaned

(Portage version: 2.2.0_alpha47/cvs/Linux i686)

4 files changed, 13 insertions, 114 deletions

diff --git a/sci-visualization/veusz/ChangeLog b/sci-visualization/veusz/ChangeLog
index dec84b4ceb30..b6ea4b010746 100644
--- a/sci-visualization/veusz/ChangeLog
+++ b/sci-visualization/veusz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-visualization/veusz
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/ChangeLog,v 1.34 2011/07/20 16:08:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/ChangeLog,v 1.35 2011/07/26 09:52:41 grozin Exp $
+
+*veusz-1.12-r1 (26 Jul 2011)
+
+  26 Jul 2011; Andrey Grozin <grozin@gentoo.org> -veusz-1.9.ebuild,
+  -veusz-1.10.ebuild, -veusz-1.12.ebuild, +veusz-1.12-r1.ebuild:
+  Bug #341653 fixed; old versions cleaned
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #70723
diff --git a/sci-visualization/veusz/veusz-1.10.ebuild b/sci-visualization/veusz/veusz-1.10.ebuild
deleted file mode 100644
index 74b0a4faf25d..000000000000
--- a/sci-visualization/veusz/veusz-1.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.10.ebuild,v 1.1 2010/12/15 15:18:50 grozin Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-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"
-}
-
-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.12.ebuild b/sci-visualization/veusz/veusz-1.12-r1.ebuild
index 21ea5d0e81cc..97e8636c5942 100644
--- a/sci-visualization/veusz/veusz-1.12.ebuild
+++ b/sci-visualization/veusz/veusz-1.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.12.ebuild,v 1.1 2011/06/29 19:19:32 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.12-r1.ebuild,v 1.1 2011/07/26 09:52:41 grozin Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -43,6 +43,11 @@ src_install() {
 	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() {
diff --git a/sci-visualization/veusz/veusz-1.9.ebuild b/sci-visualization/veusz/veusz-1.9.ebuild
deleted file mode 100644
index 81b2f4a896a1..000000000000
--- a/sci-visualization/veusz/veusz-1.9.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/veusz/veusz-1.9.ebuild,v 1.4 2010/10/19 09:49:11 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-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"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_desktop_database_update
-}