Remove old. Make lua support optional. Remove last USE=nls usage.

Package-Manager: portage-2.2_rc51/cvs/Linux i686

4 files changed, 11 insertions, 105 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 85aac5d54f6a..ba922e35890e 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.196 2009/11/23 06:19:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.197 2009/11/24 16:55:48 jer Exp $
+
+  24 Nov 2009; Jeroen Roovers <jer@gentoo.org> -rrdtool-1.4.1.ebuild,
+  rrdtool-1.4.2.ebuild:
+  Remove old. Make lua support optional. Remove last USE=nls usage.
 
 *rrdtool-1.4.2 (23 Nov 2009)
 
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 6823cce04d8b..d2d53f26c31f 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -6,7 +6,6 @@ DIST rrdtool-1.2.30.tar.gz 1092483 RMD160 ee4d492fee4e109da89ca85bd9dd561cb9ddfc
 DIST rrdtool-1.3.7.tar.gz 1084709 RMD160 ffa30cd01f77f8cbb674c7c22994f34e18f0a8f2 SHA1 802fc03107c5b600548beef0ee6ad6cf153fc1f1 SHA256 ce7c4e732642c3e57e2b60784dfc0e2d83cb561a13d2c43274f6ffa1caa20a55
 DIST rrdtool-1.3.8.tar.gz 1021427 RMD160 e05cada9d1df11ed474536c1f6e11d7cc4c08077 SHA1 1fe71706442ddd78ec8cdbaadd8ce16bb1326b05 SHA256 a7084e07a8c78e91ca7af211af11f777c7a040b93ce21ab1144dd00079da0f38
 DIST rrdtool-1.3.9.tar.gz 1189442 RMD160 2b05c37a713cca3d15d92d1d9c5292c3cc4e0781 SHA1 5c202810bdf5e5dda3f06079c7739993622c7e86 SHA256 9e8757192a56e006d7c593970aca4850a05fa34807a5092d1d132da8f48e0108
-DIST rrdtool-1.4.1.tar.gz 1354801 RMD160 d7d2084ae722954513aeeb90ce4a7ff090a8548c SHA1 62d39ef408acd008e86b1b5ce2c7fa9894a1459b SHA256 14f23d9b22449d33963ae1104ddf27516ca2f16b026db882246a8b0a4b0e9823
 DIST rrdtool-1.4.2.tar.gz 1355269 RMD160 18d28dc0c22f28b6303898cb4555c7ed8df59937 SHA1 d77fbeac37837e64cbe2a377acbf3e7b95b6e86e SHA256 e55ebe13b16515a275185229a93ee1fc266010a9e3c6b05b229a1530695311cb
 EBUILD rrdtool-1.0.50.ebuild 2693 RMD160 b541b709ee70a0e28023aad30666254cf8007ec1 SHA1 3ff735acf09aea437c131cfc308b8f66bb2271b5 SHA256 ad422d3c48106ffa12c16b0146d6f465cf6d956889a8afae8e143fe2757ff331
 EBUILD rrdtool-1.2.29.ebuild 1941 RMD160 9edd22ded6a83dded4ae8f92d33e31ae8e3b5b24 SHA1 9df27ffab759f26db64097fb7e31d71589eb5643 SHA256 34b93cf0e2dd63da5da2fe45760c85211e9439d03cea36bae17357a097805148
@@ -15,7 +14,6 @@ EBUILD rrdtool-1.3.7.ebuild 2499 RMD160 3358b06dc3ab6dc49a5b73e8107b741a4a78e4eb
 EBUILD rrdtool-1.3.8-r1.ebuild 2795 RMD160 8a84bf2fa032ab0114b41de9c9ff0351d5a63d9c SHA1 f04b1aef20fe4a859177a19584b9927f68173faa SHA256 ab3131ff551b5c057c6efcfcf0897fce47c06ed40e6ed145d3dd756ed44f2353
 EBUILD rrdtool-1.3.8.ebuild 2601 RMD160 fcda40d43a55c24c828809bdb1472a0cc8f3c1d4 SHA1 d94575dc0cac2948443b0213c7f675c3bd8e8039 SHA256 c3311066cfbb8d8e3cc202d2f8db3f9f0f87dec1b76c1647b9e9f441c0a84a88
 EBUILD rrdtool-1.3.9.ebuild 2777 RMD160 1c257c8ecf8c90056685eba80cf7891dbbe4ca04 SHA1 63e1f5ed4d8729a5c54e564a8ed7cc0f3e4383fb SHA256 5b6ac43316ab46d6dc11a0d13c04d49dcd363711c11859f736289507b2b75c6d
-EBUILD rrdtool-1.4.1.ebuild 2688 RMD160 826d85f25e7f756afbf7941a5f22e01d95cdaa85 SHA1 b15d17a29a0b24f64d43d89d3a80fa3e637fc598 SHA256 11a34e49f039e6d3b7d24f708c40824ce30dca3009cf16ff5465aa84cf14d53a
-EBUILD rrdtool-1.4.2.ebuild 2688 RMD160 a9aed5d8db2a4411968a3a54e39c5a313c561d64 SHA1 06c69b221103b45bbbafbbfa0bdeb5ab67be2ab7 SHA256 1cc6fcee6900108546f63cfe96682be9b7de3d543dafb329ac40d10beefd8b10
-MISC ChangeLog 29590 RMD160 b1154619ce7108813382529801bef62cdf4c35da SHA1 fa788f17d22801a83acb1cf6c3927e3405a83d99 SHA256 9af5db20f8d81581f30c426884fa000a3e2e622d001c946b9e8b0ed902bf763a
+EBUILD rrdtool-1.4.2.ebuild 2731 RMD160 2fba64460e01e66e3683106d2d3010ece23fac7e SHA1 f9848e80cc3bbe89b934b765d95f0c0893431a8c SHA256 59966852a641e7ee8c8c34de14899525c202dd802f8e3e7aae8c130742f60ff8
+MISC ChangeLog 29753 RMD160 fdca4a2dd0a5245a274a37abee4f85f63db8fc40 SHA1 2c0363d48672a5017bbda4b27b2668d2174c15a6 SHA256 c9bab85f0b5523b3beabe2b7da0294c07df57d0751a6e3f13e9210485b360dfd
 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.1.ebuild
deleted file mode 100644
index 95741f5a72c7..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.1.ebuild,v 1.1 2009/11/23 06:01:04 jer Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc perl python ruby rrdcgi tcl"
-
-# This versions are minimal versions upstream tested with.
-RDEPEND="
-	>=media-libs/libpng-1.2.10
-	>=dev-libs/libxml2-2.6.31
-	>=x11-libs/cairo-1.4.6[svg]
-	>=dev-libs/glib-2.12.12
-	>=x11-libs/pango-1.17
-	tcl? ( dev-lang/tcl )
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13
-			!dev-ruby/ruby-rrd )"
-
-DEPEND="${RDEPEND}
-	sys-apps/gawk"
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/rrdtool-1.3.8-configure.ac.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-	eautoconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=/usr/share/doc/${PF}
-
-	econf $(use_enable rrdcgi) \
-		$(use_enable nls) \
-		$(use_enable ruby) \
-		$(use_enable ruby ruby-site-install) \
-		$(use_enable perl) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib /usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
-	fi
-
-	use perl && fixlocalpod
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with ann old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
index 24bc598a70dd..bd9a7315f9ce 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v 1.1 2009/11/23 06:07:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v 1.2 2009/11/24 16:55:48 jer Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc perl python ruby rrdcgi tcl"
+IUSE="doc lua perl python ruby rrdcgi tcl"
 
 # This versions are minimal versions upstream tested with.
 RDEPEND="
@@ -47,7 +47,8 @@ src_configure() {
 	export RRDDOCDIR=/usr/share/doc/${PF}
 
 	econf $(use_enable rrdcgi) \
-		$(use_enable nls) \
+		$(use_enable lua) \
+		$(use_enable lua lua-site-install) \
 		$(use_enable ruby) \
 		$(use_enable ruby ruby-site-install) \
 		$(use_enable perl) \