bug 94962

(Portage version: 2.0.51.19)

7 files changed, 17 insertions, 263 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index c3884cce6c80..2aaebeac8f97 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.61 2005/05/30 13:55:19 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.62 2005/06/04 00:59:43 vanquirius Exp $
+
+  04 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -rrdtool-1.0.45-r2.ebuild, -rrdtool-1.0.47.ebuild, rrdtool-1.2.6.ebuild:
+  Marked 1.2.6 x86 stable and removing old versions. Fixes bug 94962. Thanks
+  to Daniel Webert <rockoo@gmail.com>.
 
 *rrdtool-1.2.9 (30 May 2005)
 
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 122c0e0b37b1..d6f8a861f366 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,16 +1,12 @@
-MD5 9a548ab51046767f94f38082a1f6ef6e rrdtool-1.2.6.ebuild 2700
-MD5 5237327ba17008615f4ee3498d1e12aa rrdtool-1.2.9.ebuild 2734
-MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
-MD5 177f6939c1ba72adbbd42b99ea93121f rrdtool-1.0.50.ebuild 2753
-MD5 a899bdbfc828fd8d3b6eccb20639b84b rrdtool-1.0.47.ebuild 2822
-MD5 4113d9e7a5b0bd4bc235a3eb3939eb59 rrdtool-1.2.8.ebuild 2735
 MD5 7245abe6326ff3cc840e5092c1b60890 rrdtool-1.0.49.ebuild 2729
+MD5 4113d9e7a5b0bd4bc235a3eb3939eb59 rrdtool-1.2.8.ebuild 2735
+MD5 177f6939c1ba72adbbd42b99ea93121f rrdtool-1.0.50.ebuild 2753
+MD5 5237327ba17008615f4ee3498d1e12aa rrdtool-1.2.9.ebuild 2734
 MD5 6597e148e3d6de00f413c477a5f209f9 ChangeLog 10137
-MD5 fd937eb5e7f8eab72f05e74d1533ddab rrdtool-1.0.45-r2.ebuild 2624
-MD5 cd1090ecb4ba89539e79667d88e4431c files/digest-rrdtool-1.0.47 67
-MD5 ddcbf31c065a424ce3ad6595d1b5ea8d files/digest-rrdtool-1.2.9 65
-MD5 be92791b72aabdf5de586c1810548431 files/digest-rrdtool-1.2.8 65
-MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6 65
-MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r2 67
-MD5 0f97ed6174056bc1f72fbd7eb964f3f6 files/digest-rrdtool-1.0.50 67
+MD5 8517a3ae5073f990291962edf4ce4aaa rrdtool-1.2.6.ebuild 2699
+MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
 MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67
+MD5 0f97ed6174056bc1f72fbd7eb964f3f6 files/digest-rrdtool-1.0.50 67
+MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6 65
+MD5 be92791b72aabdf5de586c1810548431 files/digest-rrdtool-1.2.8 65
+MD5 ddcbf31c065a424ce3ad6595d1b5ea8d files/digest-rrdtool-1.2.9 65
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45-r2 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45-r2
deleted file mode 100644
index 4a703fa78f96..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 64086fc7f1ca28c069ee5104f85d7a8c rrdtool-1.0.45.tar.gz 1176656
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.47 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.47
deleted file mode 100644
index 2dceff9395a2..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.47
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19fec533ad125b2538f5e27b3be6dfd6 rrdtool-1.0.47.tar.gz 1462489
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild
deleted file mode 100644
index 60dd51c8e51f..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.45-r2.ebuild,v 1.11 2005/04/01 13:58:21 agriffis Exp $
-
-inherit perl-module flag-o-matic gnuconfig
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
-SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~amd64 alpha ia64 hppa"
-IUSE="perl tcltk"
-
-DEPEND="perl? ( dev-lang/perl )
-	sys-apps/gawk
-	>=media-libs/gd-1.8.3"
-RDEPEND="tcltk? ( dev-lang/tcl )"
-
-TCLVER=""
-
-pkg_setup() {
-	if use tcltk ; then
-		TCLVER=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh`
-	fi
-
-	if use perl ; then
-		perl-module_pkg_setup
-	fi
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	local myconf
-	use tcltk \
-		&& myconf="${myconf} --with-tcllib=/usr/lib" \
-		|| myconf="${myconf} --without-tcllib"
-
-	gnuconfig_update
-
-	if use perl ; then
-	MMSIXELEVEN=`perl -e 'use ExtUtils::MakeMaker; print( $ExtUtils::MakeMaker::VERSION ge "6.11" )'`
-	  if [ "${MMSIXELEVEN}" ]; then
-	   econf \
-		--datadir=/usr/share \
-		--enable-shared \
-		--with-perl-options='INSTALLDIRS=vendor destdir=${D}/' \
-		${myconf} || die
-
-	  else
-	   econf \
-		--datadir=/usr/share \
-		--enable-shared \
-		--with-perl-options='PREFIX=${D}/usr INSTALLDIRS=vendor' \
-		${myconf} || die
-	  fi
-	else
-	 econf \
-	  --datadir=/usr/share \
-	  --enable-shared \
-	  ${myconf} || die
-	fi
-
-	make || die
-}
-
-src_install() {
-	einstall || die
-
-	# this package completely ignores mandir settings
-
-	doman doc/*.1
-	dohtml doc/*.html
-	dodoc doc/*.pod
-	dodoc doc/*.txt
-
-	rm -rf ${D}/usr/doc
-	rm -rf ${D}/usr/html
-	rm -rf ${D}/usr/man
-	rm -rf ${D}/usr/contrib
-	rm -rf ${D}/usr/examples
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-	insinto /usr/share/doc/${PF}/contrib
-	doins contrib/*
-
-	if use perl ; then
-		perlinfo
-		mytargets="site-perl-install"
-		perl-module_src_install || die
-	fi
-
-	if use tcltk ; then
-		mv ${S}/tcl/tclrrd.so ${S}/tcl/tclrrd${PV}.so
-		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
-		doins ${S}/tcl/tclrrd${PV}.so
-		echo "package ifneeded Rrd ${PV} [list load [file join \$$dir .. tclrrd${PV}.so]]" \
-			>> ${D}/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
-	fi
-
-	dodoc COPY* CONTR* README TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
deleted file mode 100644
index 5ff8821cd79b..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild,v 1.14 2005/04/01 13:58:21 agriffis Exp $
-
-inherit perl-module flag-o-matic gnuconfig eutils
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
-SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ~ia64"
-IUSE="perl tcltk"
-
-DEPEND="perl? ( dev-lang/perl )
-	sys-apps/gawk
-	>=media-libs/gd-1.8.3"
-RDEPEND="tcltk? ( dev-lang/tcl )"
-
-TCLVER=""
-
-pkg_setup() {
-	if use tcltk ; then
-		TCLVER=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh`
-	fi
-
-	if use perl ; then
-		perl-module_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e 's/^LTCOMPILE = $(LIBTOOL) --mode=compile $(CC)/& -prefer-pic/' -i src/Makefile.in
-
-	if [[ ! $(grep '^LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -prefer-pic' src/Makefile.in) ]]; then
-		die "Makefile.in sed failed"
-	fi
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	local myconf
-	myconf="${myconf} --datadir=/usr/share --enable-shared"
-
-	use tcltk \
-		&& myconf="${myconf} --with-tcllib=/usr/lib" \
-		|| myconf="${myconf} --without-tcllib"
-
-	if use perl; then
-		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed"
-
-		# libraries without -fPIC? feh!
-		for libdir in cgilib* gd* libpng* zlib*; do
-			sed -i -e 's/^CFLAGS.*/& -fPIC/' ${libdir}/Makefile
-		done
-	else
-		econf ${myconf} || die "econf failed"
-	fi
-
-	make || die "make failed"
-}
-
-src_install() {
-	einstall || die
-
-	# this package completely ignores mandir settings
-
-	doman doc/*.1
-	dohtml doc/*.html
-	dodoc doc/*.pod
-	dodoc doc/*.txt
-
-	rm -rf ${D}/usr/doc
-	rm -rf ${D}/usr/html
-	rm -rf ${D}/usr/man
-	rm -rf ${D}/usr/contrib
-	rm -rf ${D}/usr/examples
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-	insinto /usr/share/doc/${PF}/contrib
-	doins contrib/*
-
-	if use perl ; then
-		perlinfo
-		mytargets="site-perl-install"
-		perl-module_src_install || die
-
-		# remove duplicate installation into /usr/lib/perl
-		rm -Rf ${D}/usr/lib/perl
-	fi
-
-	if use tcltk ; then
-		mv ${S}/tcl/tclrrd.so ${S}/tcl/tclrrd${PV}.so
-		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
-		doins ${S}/tcl/tclrrd${PV}.so
-		echo "package ifneeded Rrd ${PV} [list load [file join \$$dir .. tclrrd${PV}.so]]" \
-			>> ${D}/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
-	fi
-
-	dodoc COPY* CONTR* README TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild
index 100a3f8b388c..79918d2e262c 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild,v 1.2 2005/05/18 17:35:51 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild,v 1.3 2005/06/04 00:59:43 vanquirius Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc"
+KEYWORDS="x86 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc"
 IUSE="perl tcltk"
 
 DEPEND="perl? ( dev-lang/perl )