4 files changed, 37 insertions, 50 deletions
diff --git a/dev-python/numdisplay/ChangeLog b/dev-python/numdisplay/ChangeLog
index ac002f7e8335..9aee0fbc1ce5 100644
--- a/dev-python/numdisplay/ChangeLog
+++ b/dev-python/numdisplay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/numdisplay
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numdisplay/ChangeLog,v 1.3 2009/09/30 19:28:06 bicatali Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numdisplay/ChangeLog,v 1.4 2010/01/15 19:11:52 bicatali Exp $
+
+*numdisplay-1.5.6 (15 Jan 2010)
+
+  15 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -numdisplay-1.4.ebuild, numdisplay-1.5.4.ebuild, +numdisplay-1.5.6.ebuild:
+  Version bump and change license to BSD (bug #301123)
 
 *numdisplay-1.5.4 (30 Sep 2009)
 
diff --git a/dev-python/numdisplay/numdisplay-1.4.ebuild b/dev-python/numdisplay/numdisplay-1.4.ebuild
deleted file mode 100644
index 0c4d95bc1f56..000000000000
--- a/dev-python/numdisplay/numdisplay-1.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numdisplay/numdisplay-1.4.ebuild,v 1.1 2008/06/26 14:29:48 bicatali Exp $
-
-inherit distutils versionator
-
-MY_P=${PN}_v$(replace_version_separator 1 '' )
-
-DESCRIPTION="Python package for interactively displaying FITS arrays"
-SRC_URI="http://stsdas.stsci.edu/${PN}/download/${MY_P}.tar"
-HOMEPAGE="http://stsdas.stsci.edu/numdisplay/"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="AURA"
-IUSE="doc"
-
-DEPEND="virtual/python"
-RDEPEND="dev-python/numpy"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-	   -e '/data_files/d' \
-		setup.py || die "sed setup.py failed"
-	sed -i \
-		-e 's:/usr/local/lib:/etc:' \
-		imconfig.py || die "sed imconfig.py failed"
-}
-
-src_install() {
-	distutils_src_install
-	insinto /etc
-	doins imtoolrc || die "doins imtoolrc failed"
-	if use doc; then
-		einfo "Installing docs"
-		insinto /usr/share/doc/${PF}
-		doins doc/*.pdf || die "doins doc failed"
-	fi
-}
diff --git a/dev-python/numdisplay/numdisplay-1.5.4.ebuild b/dev-python/numdisplay/numdisplay-1.5.4.ebuild
index 4cf8d96fdec4..f4cf63a283ee 100644
--- a/dev-python/numdisplay/numdisplay-1.5.4.ebuild
+++ b/dev-python/numdisplay/numdisplay-1.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numdisplay/numdisplay-1.5.4.ebuild,v 1.1 2009/09/30 19:28:06 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numdisplay/numdisplay-1.5.4.ebuild,v 1.2 2010/01/15 19:11:52 bicatali Exp $
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="Python package for interactively displaying FITS arrays"
 SRC_URI="http://stsdas.stsci.edu/${PN}/download/${P}.tar.gz"
@@ -11,7 +11,7 @@ HOMEPAGE="http://stsdas.stsci.edu/numdisplay/"
 SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
-LICENSE="AURA"
+LICENSE="BSD"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/numdisplay/numdisplay-1.5.6.ebuild b/dev-python/numdisplay/numdisplay-1.5.6.ebuild
new file mode 100644
index 000000000000..9f4121c551ba
--- /dev/null
+++ b/dev-python/numdisplay/numdisplay-1.5.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numdisplay/numdisplay-1.5.6.ebuild,v 1.1 2010/01/15 19:11:52 bicatali Exp $
+
+inherit distutils
+
+DESCRIPTION="Python package for interactively displaying FITS arrays"
+SRC_URI="http://stsdas.stsci.edu/${PN}/download/${P}.tar.gz"
+HOMEPAGE="http://stsdas.stsci.edu/numdisplay/"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="BSD"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-python/numpy"
+
+S="${WORKDIR}/${PN}"
+
+src_install() {
+	distutils_src_install
+	rm -f "${D}"usr/$(get_libdir)/python*/site-packages/${PN}/LICENSE.txt
+}