From 84d18450ee7a8ba5d8d29141df6b46345d6a402c Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Mon, 18 Jan 2010 05:57:43 +0000 Subject: Replaced IPL-1 license to IBM since they are the same (bug #301180) (Portage version: 2.2_rc61/cvs/Linux x86_64) --- sci-visualization/opendx-samples/ChangeLog | 7 +++- .../opendx-samples/opendx-samples-4.3.2.ebuild | 26 ++++++------- .../opendx-samples/opendx-samples-4.4.0-r1.ebuild | 4 +- .../opendx-samples/opendx-samples-4.4.0.ebuild | 44 ---------------------- 4 files changed, 21 insertions(+), 60 deletions(-) delete mode 100644 sci-visualization/opendx-samples/opendx-samples-4.4.0.ebuild (limited to 'sci-visualization') diff --git a/sci-visualization/opendx-samples/ChangeLog b/sci-visualization/opendx-samples/ChangeLog index 30fc52acaa0f..be12d91f6bc7 100644 --- a/sci-visualization/opendx-samples/ChangeLog +++ b/sci-visualization/opendx-samples/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-visualization/opendx-samples # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx-samples/ChangeLog,v 1.10 2010/01/12 19:01:22 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx-samples/ChangeLog,v 1.11 2010/01/18 05:57:43 bicatali Exp $ + + 18 Jan 2010; Sébastien Fabbro + opendx-samples-4.3.2.ebuild, -opendx-samples-4.4.0.ebuild, + opendx-samples-4.4.0-r1.ebuild: + Replaced IPL-1 license to IBM since they are the same (bug #301180) 12 Jan 2010; nixnut opendx-samples-4.4.0-r1.ebuild: ppc stable #299841 diff --git a/sci-visualization/opendx-samples/opendx-samples-4.3.2.ebuild b/sci-visualization/opendx-samples/opendx-samples-4.3.2.ebuild index 87678c4c60e4..c762fbb7205e 100644 --- a/sci-visualization/opendx-samples/opendx-samples-4.3.2.ebuild +++ b/sci-visualization/opendx-samples/opendx-samples-4.3.2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx-samples/opendx-samples-4.3.2.ebuild,v 1.6 2007/07/15 02:36:19 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx-samples/opendx-samples-4.3.2.ebuild,v 1.7 2010/01/18 05:57:43 bicatali Exp $ S="${WORKDIR}/dxsamples-${PV}" DESCRIPTION="Samples for IBM Data Explorer" HOMEPAGE="http://www.opendx.org/" SRC_URI="http://opendx.npaci.edu/source/dxsamples-${PV}.tar.gz" -LICENSE="IPL-1" +LICENSE="IBM" SLOT="0" KEYWORDS="amd64 ppc x86" @@ -22,18 +22,18 @@ my_einstall() { if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then if [ ! -z "${PORTAGE_DEBUG}" ]; then make -n prefix=${D}/usr \ - infodir=${D}/usr/share/info \ - localstatedir=${D}/var/lib \ - mandir=${D}/usr/share/man \ - sysconfdir=${D}/etc \ - "$@" install + infodir=${D}/usr/share/info \ + localstatedir=${D}/var/lib \ + mandir=${D}/usr/share/man \ + sysconfdir=${D}/etc \ + "$@" install fi make prefix=${D}/usr \ - infodir=${D}/usr/share/info \ - localstatedir=${D}/var/lib \ - mandir=${D}/usr/share/man \ - sysconfdir=${D}/etc \ - "$@" install || die "einstall failed" + infodir=${D}/usr/share/info \ + localstatedir=${D}/var/lib \ + mandir=${D}/usr/share/man \ + sysconfdir=${D}/etc \ + "$@" install || die "einstall failed" else die "no Makefile found" fi diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild index dc2909dda7cf..cd9c12d04686 100644 --- a/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild +++ b/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild,v 1.2 2010/01/12 19:01:22 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx-samples/opendx-samples-4.4.0-r1.ebuild,v 1.3 2010/01/18 05:57:43 bicatali Exp $ EAPI=2 @@ -13,7 +13,7 @@ DESCRIPTION="Samples for IBM Data Explorer" HOMEPAGE="http://www.opendx.org/" SRC_URI="http://opendx.sdsc.edu/source/${MY_P}.tar.gz mirror://gentoo/${P}-install.patch.bz2" -LICENSE="IPL-1" +LICENSE="IBM" SLOT="0" S="${WORKDIR}/${MY_P}" diff --git a/sci-visualization/opendx-samples/opendx-samples-4.4.0.ebuild b/sci-visualization/opendx-samples/opendx-samples-4.4.0.ebuild deleted file mode 100644 index 4544d6e567da..000000000000 --- a/sci-visualization/opendx-samples/opendx-samples-4.4.0.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/sci-visualization/opendx-samples/opendx-samples-4.4.0.ebuild,v 1.1 2008/01/21 16:27:07 spock Exp $ - -S="${WORKDIR}/dxsamples-${PV}" - -DESCRIPTION="Samples for IBM Data Explorer" -HOMEPAGE="http://www.opendx.org/" -SRC_URI="http://opendx.npaci.edu/source/dxsamples-${PV}.tar.gz" -LICENSE="IPL-1" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -DEPEND="=sci-visualization/opendx-4.4*" - -# this einstall do not define datadir, because -# it will cause problems since datadir is redefined -# across Makefiles -my_einstall() { - if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then - if [ ! -z "${PORTAGE_DEBUG}" ]; then - make -n prefix="${D}"/usr \ - infodir="${D}"/usr/share/info \ - localstatedir="${D}"/var/lib \ - mandir="${D}"/usr/share/man \ - sysconfdir="${D}"/etc \ - "$@" install - fi - make prefix="${D}"/usr \ - infodir="${D}"/usr/share/info \ - localstatedir="${D}"/var/lib \ - mandir="${D}"/usr/share/man \ - sysconfdir="${D}"/etc \ - "$@" install || die "einstall failed" - else - die "no Makefile found" - fi -} - -src_install() { - my_einstall || die -} -- cgit v1.2.3-65-gdbad