got rid of patch in favor of sed (1.0.47-49), marked x86 stable (1.0.48,1.0.49)

7 files changed, 45 insertions, 122 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index bf1dc1c23b07..b58258613592 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,11 @@
 # 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.44 2004/09/26 21:59:00 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.45 2004/10/24 16:30:42 eldad Exp $
+
+  24 Oct 2004; Eldad Zack <eldad@gentoo.org> -rrdtool-1.0.40-r1.ebuild,
+  rrdtool-1.0.47.ebuild, rrdtool-1.0.48.ebuild, rrdtool-1.0.49.ebuild:
+  Got rid of -fPIC patch in favor of sed (1.0.47-1.0.49). x86 marked stable
+  (1.0.48, 1.0.49)
 
   27 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> rrdtool-1.0.47.ebuild:
   Marked stable on amd64.
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index db4358cc262d..43bdbabc388e 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,15 +1,23 @@
-MD5 e9dd91f95516aad7b110c88c0e4ea870 ChangeLog 7502
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6581e91ef2dc0333fba34dfacb9f0c31 rrdtool-1.0.49.ebuild 2730
+MD5 fa106d2afd702fbc038607f4c9087c2c rrdtool-1.0.48.ebuild 2730
+MD5 6796657ec2d97b93cc9b60012fd0b8b9 rrdtool-1.0.47.ebuild 2819
+MD5 533413dfdc7ffe715c1fbed69d755820 ChangeLog 7737
 MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
-MD5 2d4f76f7c52f48306f28c4f82d9cd8ed rrdtool-1.0.40-r1.ebuild 2178
 MD5 7d70f3c5e0abd1afecf4f0d568ace73f rrdtool-1.0.45-r2.ebuild 2624
-MD5 747b4addb5d6009cfc44f4eadd2d7c31 rrdtool-1.0.49.ebuild 2542
-MD5 5033d0dcb90c405f410d6311cf30f764 rrdtool-1.0.47.ebuild 2631
-MD5 abcd1c944f07ae5bf5693204a8730da1 rrdtool-1.0.48.ebuild 2542
-MD5 97610425876ad7e680316d1a3e808c4b files/digest-rrdtool-1.0.40-r1 67
-MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67
-MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r2 67
-MD5 cd1090ecb4ba89539e79667d88e4431c files/digest-rrdtool-1.0.47 67
-MD5 f258771c66239d553cf011c9874a50b1 files/digest-rrdtool-1.0.48 67
-MD5 db9507e851ba51a61398c1ac7816f72a files/rrdtool-1.0.49-fPIC.patch 587
 MD5 db9507e851ba51a61398c1ac7816f72a files/rrdtool-1.0.47-fPIC.patch 587
 MD5 db9507e851ba51a61398c1ac7816f72a files/rrdtool-1.0.48-fPIC.patch 587
+MD5 db9507e851ba51a61398c1ac7816f72a files/rrdtool-1.0.49-fPIC.patch 587
+MD5 cd1090ecb4ba89539e79667d88e4431c files/digest-rrdtool-1.0.47 67
+MD5 f258771c66239d553cf011c9874a50b1 files/digest-rrdtool-1.0.48 67
+MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67
+MD5 dd9238326165d64f1c400c9e38cfda28 files/digest-rrdtool-1.0.45-r2 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBe9iAT+MN7JbqCpMRAqKWAKCKJzgzQb0n87OYL96g5d/UdfUq9ACfSAnu
+Ah+7BOp2MScRfhWJDzQqJy4=
+=dYmD
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.40-r1 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.40-r1
deleted file mode 100644
index ce8b68765603..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.40-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6754a550c788e9cea626dec4a3a25219 rrdtool-1.0.40.tar.gz 1148458
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild
deleted file mode 100644
index 7bb9942b6b8e..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.0.40-r1.ebuild
+++ /dev/null
@@ -1,101 +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.40-r1.ebuild,v 1.7 2004/06/30 18:01:16 vapier Exp $
-
-inherit perl-module
-
-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/rrdtool/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() {
-	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.47.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
index 996e43f586f9..886216783696 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild
@@ -1,6 +1,6 @@
 # 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.47.ebuild,v 1.12 2004/09/26 21:59:00 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.47.ebuild,v 1.13 2004/10/24 16:30:42 eldad Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -33,7 +33,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-fPIC.patch
+	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() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.48.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.48.ebuild
index 77c942f1955d..dd5294f65897 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.48.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.48.ebuild
@@ -1,6 +1,6 @@
 # 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.48.ebuild,v 1.2 2004/09/03 16:43:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.48.ebuild,v 1.3 2004/10/24 16:30:42 eldad Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 IUSE="perl tcltk"
 
 DEPEND="perl? ( dev-lang/perl )
@@ -29,7 +29,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-fPIC.patch
+	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() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
index 0e05c6e8044b..436df6391aed 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
@@ -1,6 +1,6 @@
 # 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.49.ebuild,v 1.2 2004/09/03 16:43:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild,v 1.3 2004/10/24 16:30:42 eldad Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="x86 ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 IUSE="perl tcltk"
 
 DEPEND="perl? ( dev-lang/perl )
@@ -29,7 +29,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-fPIC.patch
+	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() {