version bump, closes #59543

8 files changed, 55 insertions, 139 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index e948a4719fa2..24a77db0c277 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.38 2004/07/21 22:43:34 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.39 2004/08/05 22:19:16 squinky86 Exp $
+
+*rrdtool-1.0.48 (05 Aug 2004)
+
+  05 Aug 2004; Jon Hood <squinky86@gentoo.org>
+  +files/rrdtool-1.0.48-fPIC.patch, -rrdtool-1.0.42-r1.ebuild,
+  -rrdtool-1.0.45-r1.ebuild, +rrdtool-1.0.48.ebuild:
+  Version bump, closes #59543, ebuild cleanups, thanks solar@g.o!
 
   22 Jul 2004; Eldad Zack <eldad@gentoo.org> rrdtool-1.0.47.ebuild:
   Tidy up. Fixed issue with 64-bit archs, when perl is in USE. Fixed duplicate
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 7ee2c23554a5..5eac7979577b 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 0c0e881b527385864b80c66881548947 rrdtool-1.0.42-r1.ebuild 2242
 MD5 e4acce78bdbb0d39318cff50a1da1661 rrdtool-1.0.46.ebuild 2759
 MD5 4c4038dc596939f72ef89846382e1ba8 rrdtool-1.0.45-r1.ebuild 2297
+MD5 4d518d50a520be775d58196446201500 rrdtool-1.0.48.ebuild 2537
 MD5 dc14bf81b27063da73b71cf7163ce1c4 rrdtool-1.0.45.ebuild 2276
 MD5 2d4f76f7c52f48306f28c4f82d9cd8ed rrdtool-1.0.40-r1.ebuild 2178
 MD5 a451cd75df750da81cdf79f5115cdd8d rrdtool-1.0.47.ebuild 2631
@@ -11,19 +9,14 @@ MD5 5a4d1855e426f710e740146b2a05ba5a ChangeLog 6501
 MD5 c0b48928d9b670b8837a080dfc28df60 metadata.xml 794
 MD5 83c969024d1d6d7e6e093e0c03e416e6 rrdtool-1.0.45-r2.ebuild 2624
 MD5 db9507e851ba51a61398c1ac7816f72a files/rrdtool-1.0.47-fPIC.patch 587
+MD5 db9507e851ba51a61398c1ac7816f72a files/rrdtool-1.0.48-fPIC.patch 587
 MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45 67
 MD5 dbfa1a58afba8beb1930edc01f37f908 files/digest-rrdtool-1.0.46 67
 MD5 cd1090ecb4ba89539e79667d88e4431c files/digest-rrdtool-1.0.47 67
+MD5 f258771c66239d553cf011c9874a50b1 files/digest-rrdtool-1.0.48 67
 MD5 97610425876ad7e680316d1a3e808c4b files/digest-rrdtool-1.0.40-r1 67
 MD5 e2341044ceaf46443ec4c577647d9cae files/digest-rrdtool-1.0.42-r1 67
 MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r1 67
 MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r2 67
 MD5 0375bc1ad29af2bbb7fc1782eef03896 files/rrdtool-1.0.46-tcl.patch 1170
 MD5 db9507e851ba51a61398c1ac7816f72a files/rrdtool-1.0.46-fPIC.patch 587
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFA/vDYT+MN7JbqCpMRAoISAJ0T91w4YhgxWRsodpMGEqfdNMa56ACdFXPK
-61X6tlUSLGn1l6/wHKz9VLc=
-=xwJZ
------END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.42-r1 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.42-r1
deleted file mode 100644
index 7a1bba600873..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.42-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20183bf09b52030a6e29a0678930bb42 rrdtool-1.0.42.tar.gz 1158148
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45-r1 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45-r1
deleted file mode 100644
index 4a703fa78f96..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.45-r1
+++ /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.48 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.48
new file mode 100644
index 000000000000..b540b7175860
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.48
@@ -0,0 +1 @@
+MD5 b38a3b04d2540f2f2bf4ca072b8eb229 rrdtool-1.0.48.tar.gz 1462609
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.0.48-fPIC.patch b/net-analyzer/rrdtool/files/rrdtool-1.0.48-fPIC.patch
new file mode 100644
index 000000000000..2e740dbdaf07
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.0.48-fPIC.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in	2004-03-18 14:32:51.670818448 +0000
++++ src/Makefile.in	2004-03-18 14:33:05.911258477 +0000
+@@ -336,7 +336,7 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/rrd_xport.Plo
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
++LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -prefer-pic $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild
deleted file mode 100644
index 60e86fb16847..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.42-r1.ebuild,v 1.8 2004/06/30 18:01:16 vapier Exp $
-
-inherit perl-module flag-o-matic
-
-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"
-IUSE="tcltk perl"
-
-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"
-
-	econf \
-		--datadir=/usr/share \
-		--enable-shared \
-		--with-perl-options='INSTALLMAN1DIR=/usr/share/man/man1 INSTALLMAN3DIR=/usr/share/man/man3  PREFIX=${D}/usr' \
-		${myconf} || die
-
-	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 CHANGES 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.45-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.48.ebuild
index a4e7f817926c..3dd0100abada 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.45-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.48.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.6 2004/07/14 22:33:24 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.48.ebuild,v 1.1 2004/08/05 22:19:16 squinky86 Exp $
 
-inherit perl-module flag-o-matic gnuconfig
+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/"
@@ -10,8 +10,8 @@ SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE="tcltk perl"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="perl tcltk"
 
 DEPEND="perl? ( dev-lang/perl )
 	sys-apps/gawk
@@ -21,33 +21,40 @@ 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
+	if use perl ; then
 		perl-module_pkg_setup
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fPIC.patch
+}
+
 src_compile() {
-	filter-mfpmath "sse"
-	filter-flags "-ffast-math"
+	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"
 
-	gnuconfig_update
-
-	econf \
-		--datadir=/usr/share \
-		--enable-shared \
-		--with-perl-options='INSTALLMAN1DIR=/usr/share/man/man1 INSTALLMAN3DIR=/usr/share/man/man3  PREFIX=${D}/usr INSTALLDIRS=vendor' \
-		${myconf} || die
+	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 || die "make failed"
 }
 
 src_install() {
@@ -75,12 +82,15 @@ src_install() {
 		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
+#		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