Revision bump. Fixing an error occuring within an uclibc chroot, where no man/groff is present.

Package-Manager: portage-2.1.1_pre5

5 files changed, 190 insertions, 6 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 55c13ac9f363..9ea2dda6d44b 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.94 2006/07/21 10:39:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.95 2006/08/14 08:12:15 phreak Exp $
+
+*rrdtool-1.2.15-r2 (14 Aug 2006)
+
+  14 Aug 2006; Christian Heim <phreak@gentoo.org>
+  +files/rrdtool-1.2.15-no-man.patch, +rrdtool-1.2.15-r2.ebuild:
+  Revision bump. Fixing an error occuring within an uclibc chroot, where no
+  man/groff is present.
 
 *rrdtool-1.2.15-r1 (21 Jul 2006)
 
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 591385f2b502..075bb46b23ca 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,13 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e SHA1 973b40a3954942dd3306d5781f31faf4f88c257d SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1
 MD5 7fcb8fda7c3d799249423d8e69e0febe files/rrdtool-1.2.15-newstyle-resize.patch 5231
 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e files/rrdtool-1.2.15-newstyle-resize.patch 5231
 SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1 files/rrdtool-1.2.15-newstyle-resize.patch 5231
+AUX rrdtool-1.2.15-no-man.patch 951 RMD160 098eeee5b79e72b7a52f64791496cd6f33027344 SHA1 751d49206265cef58975c81950113755396b92fe SHA256 adf121e31a1cea86ee97af0de71c6d76a666784121185ccb28055f433acff67f
+MD5 b99841a92f3429f741b4bf7fbd3da60e files/rrdtool-1.2.15-no-man.patch 951
+RMD160 098eeee5b79e72b7a52f64791496cd6f33027344 files/rrdtool-1.2.15-no-man.patch 951
+SHA256 adf121e31a1cea86ee97af0de71c6d76a666784121185ccb28055f433acff67f files/rrdtool-1.2.15-no-man.patch 951
 DIST rrdtool-1.0.49.tar.gz 1466897 RMD160 965cf352b4d3da64fdf44e0af5d1cf95072a283e SHA1 259a8445e429f0f04b59b0a959d965cd5a17eafb SHA256 20acb0aa347f1629c4d5529ab8afbe4986fe820555049af3f905653300e5ea74
 DIST rrdtool-1.0.50.tar.gz 1474200 RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b SHA1 399e2bf807e3fbc987eec4c5364dc4cb416ba287 SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91
 DIST rrdtool-1.2.11.tar.gz 1003339 RMD160 f294c3dd0e8597d0be23e2aa317774bd626695a6 SHA1 2aa33cbc857318679db03c0b8b42dc1ab18e4d4f SHA256 de1af03b28c1c7db3486f629710e53b6317d55810253d5d15f3add582ef30c69
 DIST rrdtool-1.2.13.tar.gz 1034025 RMD160 111b9cccea5e5a54ce1a206828f100bfb2cb3470 SHA1 5e097253d0792a2c95cc0aba0ac22855719796fa SHA256 9a0471609426a3fe7585ae04177a51ce1d136a77bb65535574bf795a961eee5b
 DIST rrdtool-1.2.15.tar.gz 1043064 RMD160 493e5b108ac363484eb4015c0962945c5fb9fb9e SHA1 4ac695aff26ab193a083c65513aad06ff36bad82 SHA256 b33d68da8a39bb0fc745c0202f3a58e73bfc6a9fd35d71fbd8979d40a5ef7397
-DIST rrdtool-1.2.6.tar.gz 872221 RMD160 f58831b31c57ea45a1086dd0daa01756ecaf4658 SHA256 abce65fcea0c6a47ba0325a79c2660f72d9a155b825da0a5001f7cdfddd59d0d
+DIST rrdtool-1.2.6.tar.gz 872221 RMD160 f58831b31c57ea45a1086dd0daa01756ecaf4658 SHA1 77eb3155ee2d3c2a8c4edcf6b303bae1ae1d4460 SHA256 abce65fcea0c6a47ba0325a79c2660f72d9a155b825da0a5001f7cdfddd59d0d
 EBUILD rrdtool-1.0.49.ebuild 2729 RMD160 e71d05afa5903dce2e9530fc0947b74d0d8a0c9f SHA1 e7bc24d16e3d9b71b5c3b53d9dc0fb24bce83d00 SHA256 16b548d812019fb399017dab4172e0c9490f97f30b3c374d77ce49a714d6431e
 MD5 7245abe6326ff3cc840e5092c1b60890 rrdtool-1.0.49.ebuild 2729
 RMD160 e71d05afa5903dce2e9530fc0947b74d0d8a0c9f rrdtool-1.0.49.ebuild 2729
@@ -28,6 +35,10 @@ EBUILD rrdtool-1.2.15-r1.ebuild 3120 RMD160 cba9d2a33be5bf1177f2e405cc3b78b446a1
 MD5 866a4b3a5ee389812eb3bacc442fc9b7 rrdtool-1.2.15-r1.ebuild 3120
 RMD160 cba9d2a33be5bf1177f2e405cc3b78b446a1af1d rrdtool-1.2.15-r1.ebuild 3120
 SHA256 254bf4d66b364ac6cc8615e6d0a96c3e2a817016aebcd8e450dad3ff705f1b79 rrdtool-1.2.15-r1.ebuild 3120
+EBUILD rrdtool-1.2.15-r2.ebuild 3182 RMD160 9f0b72c9f151bbbdbe0c2f0f677b7deb662e51d4 SHA1 d7bd8363e21f192d258688ed0ba883f22a3eaaab SHA256 5b5c01b8e86f94e88ba5099200ebd31a5c6c4ae6c217022430f0b721eb6b7629
+MD5 99aaf0210efaeb9851febb81867fe1d6 rrdtool-1.2.15-r2.ebuild 3182
+RMD160 9f0b72c9f151bbbdbe0c2f0f677b7deb662e51d4 rrdtool-1.2.15-r2.ebuild 3182
+SHA256 5b5c01b8e86f94e88ba5099200ebd31a5c6c4ae6c217022430f0b721eb6b7629 rrdtool-1.2.15-r2.ebuild 3182
 EBUILD rrdtool-1.2.15.ebuild 3073 RMD160 fb8b8438ee9d1b29b869d8a962c0fa73dc287602 SHA1 8c957641e4ace8675fe139666a3d811543bb61d2 SHA256 52c4c14030102175e833cbba43399b190c7a301fe4da08fa5e9c405fa1de6734
 MD5 1f02e02f1b94f04a4d03e4a16fe92519 rrdtool-1.2.15.ebuild 3073
 RMD160 fb8b8438ee9d1b29b869d8a962c0fa73dc287602 rrdtool-1.2.15.ebuild 3073
@@ -36,10 +47,10 @@ EBUILD rrdtool-1.2.6-r1.ebuild 2792 RMD160 7ee995600c048dbfaac1d4c01975f4e48fe88
 MD5 916a2ac749bc18f0d3515931bcc3c592 rrdtool-1.2.6-r1.ebuild 2792
 RMD160 7ee995600c048dbfaac1d4c01975f4e48fe887a8 rrdtool-1.2.6-r1.ebuild 2792
 SHA256 b8aca50b5ae263aa008578f220ac2d4c82012005d22f8917f9ca54bba0825e30 rrdtool-1.2.6-r1.ebuild 2792
-MISC ChangeLog 14626 RMD160 dcab5f6957b3300600fa3a2a58c5c86b65b4df7b SHA1 c25c79bf4d0c5502ea2d56a0c3afdbcc68e783c0 SHA256 4410552aa7530919f160a30d7faf18c714b6a8cd05647d057179f2ea852b20a4
-MD5 01d7565ad3a9277b299bc8086307c218 ChangeLog 14626
-RMD160 dcab5f6957b3300600fa3a2a58c5c86b65b4df7b ChangeLog 14626
-SHA256 4410552aa7530919f160a30d7faf18c714b6a8cd05647d057179f2ea852b20a4 ChangeLog 14626
+MISC ChangeLog 14875 RMD160 e8fe92dc42df0e13e22a7a24e961a9f0e6977e57 SHA1 c62161623451d22010d9d7ead5fe41ef1f6155bb SHA256 adfaf462208bbb6a93119258eb0e65943473db870c0454a00f28a7b523c0cc57
+MD5 0b2d4a0cb4273d1b01eef8562df48ffa ChangeLog 14875
+RMD160 e8fe92dc42df0e13e22a7a24e961a9f0e6977e57 ChangeLog 14875
+SHA256 adfaf462208bbb6a93119258eb0e65943473db870c0454a00f28a7b523c0cc57 ChangeLog 14875
 MISC metadata.xml 241 RMD160 b010229ed860b6dadc3faa19006512f195e3ee55 SHA1 01721f8bf6f699f3647589a173ef1941fbd6dd1c SHA256 de63c7fc765937d32e93bda47d365a2e044ad3c6a70caff4ff5916dde97e6a3c
 MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
 RMD160 b010229ed860b6dadc3faa19006512f195e3ee55 metadata.xml 241
@@ -62,6 +73,16 @@ SHA256 62ab296ac4fc6e30708d669ec3df2e44b159d3b5075b047d2f551d4e1dea6f5b files/di
 MD5 d04040e7f409bdc7d2ab4fce17702cdf files/digest-rrdtool-1.2.15-r1 247
 RMD160 772add36b866e1107c42ba47f6b9f6e938a758c4 files/digest-rrdtool-1.2.15-r1 247
 SHA256 62ab296ac4fc6e30708d669ec3df2e44b159d3b5075b047d2f551d4e1dea6f5b files/digest-rrdtool-1.2.15-r1 247
+MD5 d04040e7f409bdc7d2ab4fce17702cdf files/digest-rrdtool-1.2.15-r2 247
+RMD160 772add36b866e1107c42ba47f6b9f6e938a758c4 files/digest-rrdtool-1.2.15-r2 247
+SHA256 62ab296ac4fc6e30708d669ec3df2e44b159d3b5075b047d2f551d4e1dea6f5b files/digest-rrdtool-1.2.15-r2 247
 MD5 105ab00f490ce2f0372afde45ccd2549 files/digest-rrdtool-1.2.6-r1 241
 RMD160 3425de5ce68bc51b0c1c301cc75956def35af3f2 files/digest-rrdtool-1.2.6-r1 241
 SHA256 b1a53151e3b90098c6124eac6da2dcd5ebff47f1f378709f3c5af62174565743 files/digest-rrdtool-1.2.6-r1 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFE4DBnyuNVb5qfaOYRAq0MAJ43JG744OjQnp4Ms3LCAuxA6pfmdQCcD8eL
+gqeOBFG6n2tupfT9LBlfP8o=
+=xMYs
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.15-r2 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.15-r2
new file mode 100644
index 000000000000..4a38035815c3
--- /dev/null
+++ b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.15-r2
@@ -0,0 +1,3 @@
+MD5 bde8b12c202bc4e27fb9a9588a0aaddf rrdtool-1.2.15.tar.gz 1043064
+RMD160 493e5b108ac363484eb4015c0962945c5fb9fb9e rrdtool-1.2.15.tar.gz 1043064
+SHA256 b33d68da8a39bb0fc745c0202f3a58e73bfc6a9fd35d71fbd8979d40a5ef7397 rrdtool-1.2.15.tar.gz 1043064
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.15-no-man.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.15-no-man.patch
new file mode 100644
index 000000000000..73b0761f1cb7
--- /dev/null
+++ b/net-analyzer/rrdtool/files/rrdtool-1.2.15-no-man.patch
@@ -0,0 +1,26 @@
+Index: rrdtool-1.2.15/Makefile.am
+===================================================================
+--- rrdtool-1.2.15.orig/Makefile.am
++++ rrdtool-1.2.15/Makefile.am
+@@ -2,7 +2,7 @@
+ RSYNC = rsync --rsh=ssh
+ 
+ # build the following subdirectories
+-SUBDIRS = src bindings doc examples
++SUBDIRS = src bindings examples
+ 
+   # the following files are not mentioned in any other Makefile
+ EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
+Index: rrdtool-1.2.15/Makefile.in
+===================================================================
+--- rrdtool-1.2.15.orig/Makefile.in
++++ rrdtool-1.2.15/Makefile.in
+@@ -227,7 +227,7 @@ target_vendor = @target_vendor@
+ RSYNC = rsync --rsh=ssh
+ 
+ # build the following subdirectories
+-SUBDIRS = src bindings doc examples
++SUBDIRS = src bindings examples
+ EXTRA_DIST = COPYRIGHT CHANGES NT-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
+ 	     rrdtool.spec confignt/config.h favicon.ico
+ 
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.15-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.15-r2.ebuild
new file mode 100644
index 000000000000..a435fdfa03cc
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.2.15-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.15-r2.ebuild,v 1.1 2006/08/14 08:12:15 phreak Exp $
+
+inherit perl-module flag-o-matic gnuconfig eutils multilib autotools
+
+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 ~ppc64 ~sparc ~x86"
+IUSE="doc perl python rrdcgi tcltk uclibc"
+
+RDEPEND="tcltk? ( 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
+	rrdcgi? ( >=dev-libs/cgilib-0.5 )"
+
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	sys-apps/gawk"
+
+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:python_PROGRAMS:pyexec_PROGRAMS:' \
+		bindings/python/Makefile.* || die "sed failed"
+	sed -i -e 's:\$TCL_PACKAGE_PATH:${TCL_PACKAGE_PATH%% *}:' \
+		configure.ac
+	epatch "${FILESDIR}"/${P}-newstyle-resize.patch
+	use uclibc && epatch "${FILESDIR}"/${P}-no-man.patch
+	eautoreconf
+}
+
+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/$(get_libdir)" \
+		|| myconf="${myconf} --without-tcllib"
+
+	use python || myconf="${myconf} --disable-python"
+
+	if use perl ; then
+		econf ${myconf} \
+			$(use_enable rrdcgi) \
+			--with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || \
+			die "econf failed"
+	else
+		econf ${myconf} \
+			$(use_enable rrdcgi) \
+			--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/$(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
+}
+
+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
+}