Version bump try #3 ( see bug #163179 ), thanks to Frederic Mangeant for reporting

(Portage version: 2.1.2-r1)

6 files changed, 30 insertions, 145 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 4dc0cc230416..c52e6a12813e 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.112 2007/01/14 23:38:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.113 2007/01/24 20:22:15 jokey Exp $
+
+*rrdtool-1.2.18 (24 Jan 2007)
+
+  24 Jan 2007; Markus Ullmann <jokey@gentoo.org> -rrdtool-1.2.6-r1.ebuild,
+  -rrdtool-1.2.11-r2.ebuild, +rrdtool-1.2.18.ebuild:
+  Version bump try #3 ( see bug #163179 ), thanks to Frederic Mangeant for
+  reporting
 
   14 Jan 2007; Jeroen Roovers <jer@gentoo.org> rrdtool-1.2.15-r3.ebuild:
   Stable for HPPA (bug #160321).
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.11-r2 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.11-r2
deleted file mode 100644
index 7b078aa4d128..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.11-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d61c5755cb77207f9ad3584b26e8bf08 rrdtool-1.2.11.tar.gz 1003339
-RMD160 f294c3dd0e8597d0be23e2aa317774bd626695a6 rrdtool-1.2.11.tar.gz 1003339
-SHA256 de1af03b28c1c7db3486f629710e53b6317d55810253d5d15f3add582ef30c69 rrdtool-1.2.11.tar.gz 1003339
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.18 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.18
new file mode 100644
index 000000000000..38372ebccc42
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.18
@@ -0,0 +1,3 @@
+MD5 0c116d031275b7e0da1f8326d52d097d rrdtool-1.2.18.tar.gz 1060451
+RMD160 6287c61ffe6742ad16d93d3b4352a407713f0241 rrdtool-1.2.18.tar.gz 1060451
+SHA256 85e6baa0911e51e0703adb774d6904d0d77cab05180d2875188b35ae7c9b2ebd rrdtool-1.2.18.tar.gz 1060451
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.6-r1 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.6-r1
deleted file mode 100644
index 082ff11b025e..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a152a09aab26849491d493f96941c45d rrdtool-1.2.6.tar.gz 872221
-RMD160 f58831b31c57ea45a1086dd0daa01756ecaf4658 rrdtool-1.2.6.tar.gz 872221
-SHA256 abce65fcea0c6a47ba0325a79c2660f72d9a155b825da0a5001f7cdfddd59d0d rrdtool-1.2.6.tar.gz 872221
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.11-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.18.ebuild
index a59197eda929..64a06d2bfa21 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.11-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.18.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.11-r2.ebuild,v 1.11 2007/01/05 07:09:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.18.ebuild,v 1.1 2007/01/24 20:22:15 jokey Exp $
 
-inherit perl-module flag-o-matic eutils multilib
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit perl-module flag-o-matic eutils multilib autotools
 
 DESCRIPTION="A system to store and display time-series data"
 HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
@@ -10,20 +13,20 @@ SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ppc ppc64 sh ~sparc ~x86"
-IUSE="doc perl python tcl"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sh sparc x86"
+IUSE="doc perl python rrdcgi tcl uclibc"
 
 RDEPEND="tcl? ( dev-lang/tcl )
 	>=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/libpng-1.2.5
+	rrdcgi? ( >=dev-libs/cgilib-0.5 )"
 
 DEPEND="${RDEPEND}
 	perl? ( dev-lang/perl )
 	python? ( dev-lang/python )
-	sys-apps/gawk
-	>=dev-libs/cgilib-0.5"
+	sys-apps/gawk"
 
 TCLVER=""
 
@@ -38,8 +41,9 @@ src_unpack() {
 		bindings/python/Makefile.* || die "sed failed"
 	sed -i -e 's:\$TCL_PACKAGE_PATH:${TCL_PACKAGE_PATH%% *}:' \
 		configure.ac
-	libtoolize --copy --force
-	autoreconf
+	epatch "${FILESDIR}"/${PN}-1.2.15-newstyle-resize.patch
+	use uclibc && epatch "${FILESDIR}"/${PN}-1.2.15-no-man.patch
+	eautoreconf
 }
 
 pkg_setup() {
@@ -62,10 +66,14 @@ src_compile() {
 	use python || myconf="${myconf} --disable-python"
 
 	if use perl ; then
-		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || \
+		econf ${myconf} \
+			$(use_enable rrdcgi) \
+			--with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || \
 			die "econf failed"
 	else
-		econf ${myconf} --disable-perl || die "econf failed"
+		econf ${myconf} \
+			$(use_enable rrdcgi) \
+			--disable-perl || die "econf failed"
 	fi
 
 	make || die "make failed"
@@ -96,14 +104,6 @@ src_install() {
 		rm -Rf "${D}"/usr/lib/perl
 	fi
 
-	if use tcl ; then
-		mv "${S}"/bindings/tcl/tclrrd.so "${S}"/bindings/tcl/tclrrd${PV}.so
-		insinto /usr/$(get_libdir)/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/$(get_libdir)/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
-	fi
-
 	dodoc CONTRIBUTORS README TODO
 }
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild
deleted file mode 100644
index fdddc00d99a9..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2007 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.15 2007/01/05 07:09:32 flameeyes Exp $
-
-inherit perl-module flag-o-matic eutils multilib
-
-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="alpha amd64 hppa ia64 ~mips ppc sparc x86"
-IUSE="doc perl tcl"
-
-DEPEND="perl? ( dev-lang/perl )
-	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="tcl? ( 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"
-	sed -i -e 's:^\(LIBDIRS\s*= .*-L\)\.\./src/.libs:\1../../src/.libs/:' \
-		bindings/tcl/Makefile.in || 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"
-
-	if use tcl ; then
-		myconf="${myconf} --with-tcllib=/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --without-tcllib"
-	fi
-
-	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() {
-	einstall || die
-
-	# this package completely ignores mandir settings
-
-
-	rm -rf ${D}/usr/doc
-	rm -rf ${D}/usr/examples
-	rm -rf ${D}/usr/shared
-
-	if use doc ; then
-		doman doc/*.1
-		dohtml doc/*.html
-		dodoc doc/*.pod
-		dodoc doc/*.txt
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-	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 tcl ; then
-		mv ${S}/bindings/tcl/tclrrd.so ${S}/bindings/tcl/tclrrd${PV}.so
-		insinto /usr/$(get_libdir)/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/$(get_libdir)/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
-}