Bump to EAPI=3, add prefix keywords, clean up ebuild

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

3 files changed, 39 insertions, 29 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 50bd2e00a090..31af29232b19 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,9 @@
 # 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.200 2009/12/08 19:45:37 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.201 2010/05/26 17:03:56 abcd Exp $
+
+  26 May 2010; Jonathan Callen <abcd@gentoo.org> rrdtool-1.4.2.ebuild:
+  Bump to EAPI=3, add prefix keywords, clean up ebuild
 
   08 Dec 2009; Brent Baude <ranger@gentoo.org> rrdtool-1.2.30.ebuild,
   rrdtool-1.3.8.ebuild:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 9ab2b27d2cfe..ef8f3dd048a8 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX rrdtool-1.2.15-newstyle-resize.patch 5231 RMD160 acdd68b7a7f422c615cfac824516beaeb782eb5e SHA1 973b40a3954942dd3306d5781f31faf4f88c257d SHA256 e55f1e7f0c4d3649b6790cb56247eaf5518a359ef662a959848805e416239fd1
 AUX rrdtool-1.3.8-configure.ac.patch 410 RMD160 7bc8ae6bf64fbc8602c0e4a4571c74d9afea818b SHA1 b28a7f253ff66d788a29d491ef57f11c6721bb16 SHA256 220d42a1228d015f6bd02124b3f8c878f0b7bda2e277e9e3b15d4f05603328b5
 DIST rrdtool-1.0.50.tar.gz 1474200 RMD160 96af2ec2831881e167687f65f5fc9bc64c67358b SHA1 399e2bf807e3fbc987eec4c5364dc4cb416ba287 SHA256 42aa7c213dedbd95d33ca84d92f4187880f7e96062c6a3fb05bfb16f77ba2a91
@@ -14,6 +17,23 @@ EBUILD rrdtool-1.3.7.ebuild 2498 RMD160 92d3e6f323127b0483babadba5b61eb16bfe01f0
 EBUILD rrdtool-1.3.8-r1.ebuild 2791 RMD160 f2773ddce102fddb879420fa1231af599c3491cb SHA1 487e09766df5580edcfa74b894c38c7e9899de19 SHA256 1d30943ce009c0248975f2bee22b0deae9ba7b60c2d781c2c5349917fef0d5d5
 EBUILD rrdtool-1.3.8.ebuild 2602 RMD160 f7bee371d1410101e74c6152885ba58a9487bc40 SHA1 5fa8c902b737ecda779c4bf14fc1074e0b50e4ff SHA256 044d1cc514e3d07595f81bfe53a7729f80718f5d25dcbaeed39c9203ce42a0a1
 EBUILD rrdtool-1.3.9.ebuild 2776 RMD160 bb5a72c574c337bfebdadf2f11bb3da594b0ebf3 SHA1 18a3a7b9f8877c9747e4c9cc73d482c5280d7da8 SHA256 58bb63b2b6903945414c85015306561e6be685c9b7b307dc2e88f76d66af7141
-EBUILD rrdtool-1.4.2.ebuild 2750 RMD160 7b296c65d943d4bcedcf7c39668d7a2db85a735c SHA1 ca5c6f63dc2956908b6c3c51cfa19aa1b93153ff SHA256 28cd98c6e59ca032b98bba741a9963262ed7d41ad9af327be000c78718ec7a3c
-MISC ChangeLog 30219 RMD160 239acced332102ae246b759e0377bd9e49de3eb8 SHA1 92019bfa95544e08db0aac986ea0a0aac7af2455 SHA256 f4f64c0ca99940b13463e50d6ba547fb30100f6a9ff62410de91d197f665ea43
+EBUILD rrdtool-1.4.2.ebuild 2694 RMD160 021a516e899056af0a7e2a128ad97dfd41fb5aef SHA1 3656b314c92b72c6a7829b02b0e5e6a017f96952 SHA256 e1c8a54d7ec2ca9245e0e827017f69b2814ca2bc763e21fd074dd59858b27db1
+MISC ChangeLog 30344 RMD160 01b9b6eecfcea8ec127c1a48ce5063f54ecdf8c2 SHA1 9ba47f3cbbd58782d17986505cfb6ddb94f13350 SHA256 b68e542d8771e2e4087451779996c6071b0d145a32f124140b4b87b54f44f10f
 MISC metadata.xml 376 RMD160 78da9054230eb8ed5474d75d1a0f7419eb1e45f9 SHA1 b7645e63557b4d5049032390ee07d86c5411fc96 SHA256 ccdb09cfa58f274722a7b61fb666c96c5d1c55d828fff44abc9415e56c056bb7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBCAAGBQJL/VSHAAoJELHSF2kinlg4SuMP/izEzFOPUF2qQAPHI7vdGMdu
+VUOkK2+3U6MRphPcBQDT5zjVfltdGGf0LX842qNtnUh6LQSjSYydGVsTOs8isFbt
+YoNjmwSTUdony2ajKpCt/DdBUMqYnHrXkngCUsuzPPRTBwg3s+QoIRnpN/RO+acG
+iI735y4Qj9Jt/KguQ0cqT/2s9filxfB5OA74sRuwZ38lH9haMOx65uySI9VcLtwU
+Idn6ve7xjwIPsJX8lsRpTacYQODbguzvmpWtnXWX+lB5n5o09WXw2CtAcVZKbMoD
+FGhlgFaoo7FUNYIZtOBo83+y93O0J39/fxb4cRvSjabtSRTtv85X+OBnlxrslRYp
+uV1yQAvVtbLlz0Oa2y6SaeIHbwucYRccqe5R0sqx60j6SZUSQBye/RZZIUsSikVv
+fto2UnSZRT98jXmVdk24wOQMUNSBg8sJbDBY24hgvq4LrEqBYQmLttaNoFvfIUp0
+LCzsY+oGU2UooUssFScnuuUBfMJiLifiZ5p7o4wyW8EY6dBRc7bVtD6cM1AS5DLJ
+ihu/S2m9+1R+PsnrX1hEWRWfgDDVW5+ZKFlPFsNcR1z0QLLUz9di9hl63GuHVSu8
+mHXGVHbQMfuhA50XvdQXf68t4HeJpBWlGBeh+KjNG1dy1zqslG5HfM+0n5FwmXXe
+m0gK8dTzm8wbAMB4Jou9
+=bsYE
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
index c4626d42c02a..f66629a7f200 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.4 2009/11/25 03:53:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v 1.5 2010/05/26 17:03:56 abcd Exp $
 
-EAPI="2"
+EAPI="3"
 
+GENTOO_DEPEND_ON_PERL="no"
 inherit eutils flag-o-matic multilib perl-module autotools
 
 DESCRIPTION="A system to store and display time-series data"
@@ -12,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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 IUSE="doc lua perl python ruby rrdcgi tcl"
 
 # This versions are minimal versions upstream tested with.
@@ -31,10 +32,6 @@ RDEPEND="
 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
@@ -44,7 +41,10 @@ src_prepare() {
 src_configure() {
 	filter-flags -ffast-math
 
-	export RRDDOCDIR=/usr/share/doc/${PF}
+	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
+
+	# to solve bug #260380
+	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
 
 	econf $(use_enable rrdcgi) \
 		$(use_enable lua) \
@@ -54,7 +54,7 @@ src_configure() {
 		$(use_enable perl) \
 		$(use_enable perl perl-site-install) \
 		$(use_enable tcl) \
-		$(use_with tcl tcllib /usr/$(get_libdir)) \
+		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
 		$(use_enable python)
 }
 
@@ -62,20 +62,15 @@ src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
 	if ! use doc ; then
-		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
+		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
 	fi
 
-	use perl && fixlocalpod
+	use perl && perl_delete_localpod
 
 	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."
@@ -88,11 +83,3 @@ pkg_postinst() {
 	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
-}