Revert rrdtool-1.0.* another time. It's still required for FlowScan.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686
RepoMan-Options: --force

3 files changed, 126 insertions, 2 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 0a460f737999..638b397ed8f4 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.148 2008/09/16 18:02:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.149 2008/09/18 11:10:44 pva Exp $
+
+  18 Sep 2008; Peter Volkov <pva@gentoo.org> +rrdtool-1.0.50.ebuild:
+  Revert rrdtool-1.0.* another time. It's still required for FlowScan.
 
 *rrdtool-1.3.3 (16 Sep 2008)
 *rrdtool-1.2.28 (16 Sep 2008)
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index f04f14b9b1df..a1ebeeeff5ec 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -2,14 +2,16 @@ AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac82451
 AUX rrdtool-1.2.23-ruby-binding-compile.patch 434 RMD160 485ecf5deb3db466722d81550e645c31dc5e46ba SHA1 e8c8960195a7ffbb47355e161c1599eb45fb2efa SHA256 a275a87653cf16086eaff5f2377673fea9d5ac88c66e4ebaf3498931b4082bc4
 AUX rrdtool-1.2.23-ruby-binding-configure.patch 541 RMD160 fa2cde6227972b3c23b56dea146430a1d5332833 SHA1 cae50646441da93929b74a46ce663f51233b4be0 SHA256 000a3376a2c42bc5789b65bab852a818f5714cbe3fa86f3c049af6a77a9d0e3c
 AUX rrdtool-1.2.23-tclbindings.patch 564 RMD160 082f66d7832e3b996cc9515a8c585afa791c7316 SHA1 17593d590141434668297ecfab128a98983b6bcf SHA256 83647ef379faa22bd6119f6687d49c74b18ac58baa2ef704aefab8664013dbd5
+DIST rrdtool-1.0.50.tar.gz 1474200 RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b SHA1 399e2bf807e3fbc987eec4c5364dc4cb416ba287 SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91
 DIST rrdtool-1.2.23.tar.gz 1061530 RMD160 0c1147242adf476f5e93f4d59b553ee3ea378b23 SHA1 5da610e1c8bc01b80abc21ab9e98e004363b429c SHA256 4b1df00b23a74a1c81734dd274e72e00d8bb29b11e1f3d2938ff87691ece1f0f
 DIST rrdtool-1.2.27.tar.gz 1081450 RMD160 ee01b9cd52a9dbf42c6ac8d9259bdcfcd036b112 SHA1 15028b65be68da83602f7479405dffb1eef819ec SHA256 61fc7871a9c3ff8a2853bf8b5d006eda1573d6de768f38252918b2d6d719afee
 DIST rrdtool-1.2.28.tar.gz 1089006 RMD160 11a4c6414037b3ce0e49d49b458f9fc13f3ef7ba SHA1 a8ca75fcf7b32ca94b057fa663e5f989522e2df9 SHA256 a008fec98bb36d09a7be8810afbdd1bf51d7365200d03a0e966a29bf871b3041
 DIST rrdtool-1.3.3.tar.gz 1064805 RMD160 e1f6410eef0524548525708fd4ea2b97c3571010 SHA1 1a1b028f14931c9fb4a2b62af40f506fe8e65cc2 SHA256 f21a5dc4db3d6884588d25d88a940a70991f9562ddaff8e117ab0c86ed038d2c
+EBUILD rrdtool-1.0.50.ebuild 2693 RMD160 b541b709ee70a0e28023aad30666254cf8007ec1 SHA1 3ff735acf09aea437c131cfc308b8f66bb2271b5 SHA256 ad422d3c48106ffa12c16b0146d6f465cf6d956889a8afae8e143fe2757ff331
 EBUILD rrdtool-1.2.23-r1.ebuild 2209 RMD160 ce765af1c3c56ed55a35484892038e5e277eaf88 SHA1 3bfd6368cd94f8eecceb22c539f873e09de1cf91 SHA256 7f61007dd2d25ae00204c6761ca797bbe4582a72afd1c17768ea0c935a9fe6b7
 EBUILD rrdtool-1.2.27-r1.ebuild 1950 RMD160 78a148ae293a207dc5c59342edbbb03e5cbfa4f5 SHA1 22e5c45103977e6919ad3815ddd5e9577a0c7681 SHA256 dc8163c85162f9d95f30779cee03dffd17b56f6df4b149d8792f735e529f7a91
 EBUILD rrdtool-1.2.27.ebuild 2104 RMD160 18655c89ea9d9e78c44b695e8006119930dd256f SHA1 250ac7676641f07d523128a2ba3dec143c1100fc SHA256 239731054ddb561466a49e127a341518fb88186fa28b4c907f6079c559884ece
 EBUILD rrdtool-1.2.28.ebuild 1949 RMD160 6275cab9659481270245710db072bfd786507df0 SHA1 e9d0f17ac9aa6666793e8a22ecb86a64c49ac544 SHA256 aa4917a0553414f8b5db34c5003699b67eab0b8030941817e32258653837d67b
 EBUILD rrdtool-1.3.3.ebuild 2422 RMD160 09d2bb0f40a23f4a60292ae414fb2ae89790ad36 SHA1 dd9eb00f8db116fbf27fdbab60d3d6829cd60480 SHA256 e3e26a83fe665ebb5ffc5aa7a5fdd492c9ba76292784b9e268ce524e9674c7f2
-MISC ChangeLog 22536 RMD160 552c5e9f852b52878d817d8da6e8fddd23ef714d SHA1 a0c82affbf429cc8a9455fddbeb35d146905a20d SHA256 51aa394b27f4199774bc917e4c94f2c775593c1b55b7560441dec507494472ed
+MISC ChangeLog 22677 RMD160 fc9e6a4ed49a057b5c1232982b9e03ab61be402f SHA1 0f7d45dbfe7cc52e0e352d18c37ed7b50e73e850 SHA256 caaf0089192da42fbf9e011a9c34bb88b23848b64d0c9d93fd5359ff4dcc01a7
 MISC metadata.xml 300 RMD160 9d38b7169a91e0be57ae6ab449296e56527a0d0b SHA1 c67d156899a9058bf4cf1b620299b7e18779fb37 SHA256 f7ced9a7b2949623b183802c55cef4e37d6e9e4d072a7243a5eb934c9ef5ac62
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild
new file mode 100644
index 000000000000..70a7e2390aa7
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild,v 1.5 2008/09/18 11:10:44 pva Exp $
+
+inherit perl-module flag-o-matic eutils
+
+DESCRIPTION="A system to store and display time-series data"
+HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
+SRC_URI="ftp://ftp.bit.nl/mirror/rrdtool/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
+IUSE="perl tcl"
+
+DEPEND="perl? ( dev-lang/perl )
+	sys-apps/gawk
+	>=media-libs/gd-1.8.3"
+RDEPEND="tcl? ( dev-lang/tcl )"
+
+TCL_VER=""
+
+pkg_setup() {
+	use perl && perl-module_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e 's/^LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC)/& -prefer-pic/' -i src/Makefile.in
+
+	if [[ ! $(grep '^LTCOMPILE = $(LIBTOOL) --tag=CC --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"
+
+	if use tcl ; then
+		myconf="${myconf} --with-tcllib=/usr/lib"
+	else
+		myconf="${myconf} --without-tcllib"
+	fi
+
+	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 tcl ; 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
+}