Index: rrdtool-1.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.2.ebuild,v
--- rrdtool-1.4.2.ebuild	25 Nov 2009 03:53:43 -0000	1.4
+++ rrdtool-1.4.2.ebuild	25 May 2010 09:03:25 -0000
@@ -31,10 +31,6 @@ 
 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
@@ -53,6 +49,7 @@ 
 		$(use_enable ruby ruby-site-install) \
 		$(use_enable perl) \
 		$(use_enable perl perl-site-install) \
+		--with-perl-options=INSTALLDIRS=vendor \
 		$(use_enable tcl) \
 		$(use_with tcl tcllib /usr/$(get_libdir)) \
 		$(use_enable python)
@@ -65,17 +62,15 @@ 
 		rm -rf "${D}"/usr/share/doc/${PF}/{html,txt}
 	fi
 
-	use perl && fixlocalpod
+	if use perl ; then
+		fixlocalpod
+		perl_delete_packlist
+	fi
 
 	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 @@ 
 	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
-}