1.2.6-r1 x86 stable, remove 1.2.8 for bug 94411

(Portage version: 2.0.51.19)

5 files changed, 15 insertions, 128 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 2119cf4f551a..4ab47a1e60ea 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.67 2005/06/17 20:22:14 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.68 2005/06/18 23:38:13 vanquirius Exp $
+
+  18 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> rrdtool-1.2.6-r1.ebuild,
+  -rrdtool-1.2.8.ebuild:
+  Marking 1.2.6-r1 stable to push doc USE flag fix. Also, taking 1.2.8 out for
+  bug 94411.
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> rrdtool-1.2.6.ebuild:
   Stable on ppc.
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 0d019605f6f1..ea5e24c5bec2 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,14 +1,12 @@
-MD5 6fc50ca1a5c083a6185c8ab9568d74e3 rrdtool-1.2.6.ebuild 2691
 MD5 7245abe6326ff3cc840e5092c1b60890 rrdtool-1.0.49.ebuild 2729
-MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
-MD5 0d9ecd0c568a701267e6056ac9f9a292 ChangeLog 10917
 MD5 177f6939c1ba72adbbd42b99ea93121f rrdtool-1.0.50.ebuild 2753
-MD5 66ec92a64e1d6e4490eb59febaefacdf rrdtool-1.2.6-r1.ebuild 2636
-MD5 4113d9e7a5b0bd4bc235a3eb3939eb59 rrdtool-1.2.8.ebuild 2735
 MD5 5237327ba17008615f4ee3498d1e12aa rrdtool-1.2.9.ebuild 2734
-MD5 ddcbf31c065a424ce3ad6595d1b5ea8d files/digest-rrdtool-1.2.9 65
+MD5 0d9ecd0c568a701267e6056ac9f9a292 ChangeLog 10917
+MD5 1516636cb0573f49318b9809f5902571 rrdtool-1.2.6-r1.ebuild 2635
+MD5 6fc50ca1a5c083a6185c8ab9568d74e3 rrdtool-1.2.6.ebuild 2691
+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-r1 65
 MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6 65
-MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67
-MD5 be92791b72aabdf5de586c1810548431 files/digest-rrdtool-1.2.8 65
+MD5 ddcbf31c065a424ce3ad6595d1b5ea8d files/digest-rrdtool-1.2.9 65
+MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6-r1 65
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.8 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.8
deleted file mode 100644
index 7743a4c26655..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94666a3e01260a6b1ad0f18715d1feb3 rrdtool-1.2.8.tar.gz 898931
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild
index 501e16780f76..eb1f1be47904 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.6-r1.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-r1.ebuild,v 1.1 2005/06/10 13:44:28 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild,v 1.2 2005/06/18 23:38:13 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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc x86"
 IUSE="doc perl tcltk"
 
 DEPEND="perl? ( dev-lang/perl )
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.8.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.8.ebuild
deleted file mode 100644
index f1042313f080..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.2.8.ebuild
+++ /dev/null
@@ -1,115 +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.2.8.ebuild,v 1.2 2005/05/18 17:35:51 vanquirius 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/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc"
-IUSE="doc perl python tcltk"
-
-DEPEND="perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	sys-apps/gawk
-	>=sys-libs/zlib-1.2.1
-	>=media-libs/freetype-2.1.5
-	>=media-libs/libart_lgpl-2.3.16
-	>=media-libs/libpng-1.2.5
-	>=media-libs/gd-1.8.3
-	>=dev-libs/cgilib-0.5"
-RDEPEND="tcltk? ( dev-lang/tcl )"
-
-TCLVER=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e 's:<rrd_\(.*\)>:"../../src/rrd_\1":g' \
-		bindings/tcl/tclrrd.c || die "sed failed"
-	sed -i -e 's:-lrrd_private:-ltcl -lrrd:' \
-		bindings/tcl/Makefile.* || die "sed failed"
-}
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	local myconf
-	myconf="--datadir=/usr/share --enable-shared"
-
-	use tcltk \
-		&& myconf="${myconf} --with-tcllib=/usr/lib" \
-		|| myconf="${myconf} --without-tcllib"
-
-	use python || myconf="${myconf} --disable-python"
-
-	if use perl ; then
-		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || \
-			die "econf failed"
-	else
-		econf ${myconf} --disable-perl || die "econf failed"
-	fi
-
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	rm -fr ${D}/usr/examples
-	rm -fr ${D}/usr/shared
-
-	if use doc ; then
-		dohtml doc/*.html
-		dodoc doc/*.pod
-		dodoc doc/*.txt
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-		insinto /usr/share/doc/${PF}/contrib
-		doins contrib/*
-	fi
-
-	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}/bindings/tcl/tclrrd.so ${S}/bindings/tcl/tclrrd${PV}.so
-		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
-		doins ${S}/bindings/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
-}