More old.

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 17 insertions, 294 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 2304a2ecb0c4..bb6de9003621 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.247 2013/08/01 13:19:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.248 2013/08/01 13:24:16 jer Exp $
+
+  01 Aug 2013; Jeroen Roovers <jer@gentoo.org> -rrdtool-1.4.5-r1.ebuild,
+  -rrdtool-1.4.5-r2.ebuild, -files/rrdtool-1.4.3-ruby-ldflags.patch:
+  More old.
 
   01 Aug 2013; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.7-r1.ebuild,
   rrdtool-1.4.7-r2.ebuild, -files/rrdtool-1.3.8-configure.ac.patch,
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 3411592f1dec..a8b9c2a007ca 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -3,21 +3,17 @@ Hash: SHA256
 
 AUX rrdcached.confd 150 SHA256 f544145d142ab85f5efa578c24ab6b813c4a236af2b3ddc51d5fb2cd847cf976 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0 WHIRLPOOL af0317711dfd276e8047dbf285125104931a9ea696d8b73e54d41bbce7d1d7c08da0d71564346a95b485171d4990005b2f944be227962aed44b332807f300838
 AUX rrdcached.init 449 SHA256 cc1b0d349ebdbaa224d51bd271b2b299b89d10f87e75537e3618d9ea6d4dcbb4 SHA512 770000e8541b0cb2c5e70fe8b105901f5362633bcacb1d75684163ec78dda59e04adacfde3a3cc03b1cff1c44a5933146a4b1beeacd2c9fb6206de47c5af7156 WHIRLPOOL dd1936b9491ca91a1851db8252b750fa14072584b8d71c3f0f316d7a93cd34687c5c7221d1fd09bc28f4d2c0aea3065fd5d93f50668193c08e5f5cd7b0da7e42
-AUX rrdtool-1.4.3-ruby-ldflags.patch 614 SHA256 d51f1e01a5faccc0a83a09a7aca2fa251fdfd662ba19f3670ef6591e46afec09 SHA512 abbc8eba233937c6c70ebe1b7b53685bb7263e1de5a7394cd55053e44ad9327eee3a972973fc023a7784db2bdccafbcb39067b6c53fef6083543cb122e24c109 WHIRLPOOL 5551a87742a13a6b5dbcd8fc82957a831b63c46b4aa3c758ca4e0820cf308a0a5cb008eaf40957304a30f93178b31b38c79c5b1a0d106ed7a6326be1b357c5f9
 AUX rrdtool-1.4.5-automake-1.11.2.patch 857 SHA256 d72b5b9f7713832fa946f2310938f8df14b980548f789a4e629951cc4040b3ef SHA512 a2e75b2c44c61be7405ada0decae6eea8bca907ffc47794339016106927b449163b5acdc9d5c78c92b98a74deac9713798ca5ac2f5c5d6941fa19effe8bc2554 WHIRLPOOL 46a707e5aba8f7577a8d9cd40fa96886209a5f55ce3919aae9f0fd9b5209ffefb6ef103ce54155b8de2cf7fdca92a86c1bddf13f6574941aabab90e917ed1bc9
 AUX rrdtool-1.4.7-configure.ac.patch 492 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5 SHA512 c91bb2ac81de4ca3002eb4526582d24067da71597218afd94c6c198686f70709afbc9d1058bab090a56cb2d8290b52809bcafdffe83aaeb54e7510040851a74c WHIRLPOOL f453a9ae54853a9d2546edc6394e71eae2c28ca77c9751b8d5add5495360c20cd5d70046d5a9a9122ec5979cfba238fe799a965814399f51588758ed5fe37b6b
-DIST rrdtool-1.4.5.tar.gz 1348713 SHA256 1267af420533d846432e55352db89b0f2507c711f80c65e016f7484f3cb0cf1d SHA512 89cc7fb7a7c87b7ec4868501073ffd335287e9135b5941a5fe7eba33bbb3a84f23018257294916acf6b446828b8190e27b8726666e8cb6181a2c8e7d1653c44e WHIRLPOOL fecff48126d4eb89c975ae8828b59c45688f71871e66b2b8481ab2f4627b1f6666f2d446df3aa910f18dc5d976df4fab4fcfc8f966c38e0cb52e0bd89ba275f8
 DIST rrdtool-1.4.7.tar.gz 1349040 SHA256 956aaf431c955ba88dd7d98920ade3a8c4bad04adb1f9431377950a813a7af11 SHA512 5be26ba4d54700553e3d25fe416aa5e752de4b035c91ccda98cdefb0df09321528abef188cfd2049ba40f8a71edb253ff75ada4a5305fdbc6acade64cdf45d32 WHIRLPOOL 236c33d514e3e826bf2047cb20ca7bea29ef9bdabc1b2a4ebf7f14278698bddd6ad927f97a427f35044cdaaa91bd743ac8985ef7201678cae1830b29d9040b74
-EBUILD rrdtool-1.4.5-r1.ebuild 3644 SHA256 fcee367f1504f7a4ffaccf700b2d80b050392090d4e4e4b0ff667efd878783b7 SHA512 2fc49d1fd906b89aae97b624ad5720852a718d1c660afaa7eb3b6377ecbbad4fcd2505c636278ec0d9eef34f2e66a2ca41edb7d4d9e657cf615d75ef2f28c8b6 WHIRLPOOL 419db53c8cd9ecc491828195dd6f24160dd968abc94f4c93dc8241872e82a69740e2bfdf75fde0741e86d6ea339fb534b4f4f1a17058389599b7949d3b2a9e48
-EBUILD rrdtool-1.4.5-r2.ebuild 3716 SHA256 1d915c9abdbea167ee6536f6af4b122e91e549822326dcc7daf49bcc5d0c96f7 SHA512 83ae6c4ea7c7e49dbb760bf805bdf93cca2997175c1b205dc93c51d46e1661d7824b11008ced793c7ffdf980b7ac2bbf134bdf3a87e9e489e3ffafffe55b7b7a WHIRLPOOL 1a76003bbdff97f3305b5efe6495119356bcec0213762f4a09b9b9d50e1f563092a74032655f1834463a8c0deefb2f1d83e2de9c618f57d06f437fe38f2b1c29
-EBUILD rrdtool-1.4.7-r1.ebuild 4094 SHA256 a169b86b7611993fbc0cc6d9475c633fe2f39d4787c6387aa5c207aa7f4d2b60 SHA512 ae754c6d9db3d0c70800088df4168492f0b5777e1cca607e8a0b7289f6d6bf67dc911b76b682c85a44e325aab686d90b7cd3d4134de7dd21116bca80520aae14 WHIRLPOOL 5ea4d334f5cef0bdc3782a8128090a89414f1b98730da39cb793d9f33d78984bf3526360fd59c96048da4a18d4b727b0be7632cc49f3d1ced422b83c09cfe888
-EBUILD rrdtool-1.4.7-r2.ebuild 4246 SHA256 2386e52332da1aebe3cbaa0d35dfbf8fdf4eb03d17f1e49bfba86a28d9fb7750 SHA512 a6b3659c7dcba58c68f350fd9614e0786282911708ef405806741188e17cede88c757247030dab152292e280e1bb2d832cca98efea0a210f698f51c13f53c7d3 WHIRLPOOL 4f8d09d6a0f9b54831c8a58c3b74a6b61d569e5403f61502a8640156bc01c70b16e76baf478d48a488c3f02315cb2b885aaad1eb4338b578f6cd80b698c16154
-MISC ChangeLog 37130 SHA256 ab4a40bee2486d425682e324d32ce2012dc3510109354b5c99b9d0cdf4b2bc86 SHA512 652350c23108a1a580451ed9b013162f926eaa19fbf08e9a957ef0aae2d7af21332667435072983279425b70315c910777d379faa81c42223ccb33a7ceb6be6a WHIRLPOOL ca782046ef66784ea33299aa257e5d932714a3c680ea1f0b7e144aa7997379c20e7d6b097bcf6f7cc06ec06b8bcb4ac1729a7da3709b803a6154583ba9a14c9c
+EBUILD rrdtool-1.4.7-r1.ebuild 4092 SHA256 ba5f8bced37de7aaaf0bed97e960a8a5dfad9ae5a5345f68cf9d647a5311e7ee SHA512 70a7cbbb85c725dbb882fb2a891ea1706be58230c6b3b09be1d3c4717d28772077a4407f797104042df0953a070a3a3258471f60555b1f4041a1589f98e73067 WHIRLPOOL 765a33228c1f98cd5d51a7337483bede7118eb0ad1389fad4ee371bda3ef9709793bfde7919b8ad524a513a668e5725ca925207573ff49a6fdf211aa07133527
+EBUILD rrdtool-1.4.7-r2.ebuild 4244 SHA256 4e38c9dfe54e56b4787bb69a10069f3f29283bc2c11b84c0895893d98a581cbd SHA512 9a62a7b56414c7886b37ca825fb62a9ca43f0706f39f69eefd09fe785fae2a8639f9ff16cb1c5734ca07389c9c340ceba5ee042870397bc17519cbe9ad0f70e3 WHIRLPOOL f96c56210705b9ed45985605ffddb1965c4070d72397e90364b586ba4b2501e8296ea281ad70a6924bbb5d3f436c5c94fc05d8b3725b1247937b38eea5a55a24
+MISC ChangeLog 37285 SHA256 a9e17217f40165661056413c2b0a1876dd54de6a06787244131e62145b888de8 SHA512 0cc5231b648586dda12be993ed6415fd10780fb437c6c29a310177389e5b509e52a880394a82734e78d6e67585a3b964cb93cf5e5da15254e31d741fe3c0742b WHIRLPOOL 435a70eac1540a820270284f1011c3c614964a8f790e3dceac474fe97895d4663429bfdab7ad42d37c2f1a36c128961bf9855de4d59ffca7cbe28b23c1565736
 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab SHA512 f30109bc3a89232a2b4f55afebaf6322ab70b0bd38b53e2650259192cca547bf69cdbe5640d43576a9ac0fb637eb447053ad8a6cb4f3fc1bf49746eb821bf905 WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH6YFAACgkQVWmRsqeSphMC/QCdGEow7vNePl7lMJa0Ch49TsTs
-M2cAnRrsDw0/pzX9EaSfFMXx5EftNrAh
-=jKXg
+iEYEAREIAAYFAlH6YYIACgkQVWmRsqeSphMUZQCfdbCe5Tzj1oZ0fu4R2m7IbUWl
+vXAAniuEf8fV7gm6xoWgoCF7RyKw+Uol
+=Dw+c
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch
deleted file mode 100644
index 8a325f41c608..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.3-ruby-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/bindings/ruby/extconf.rb
-+++ b/bindings/ruby/extconf.rb
-@@ -4,13 +4,13 @@
- require 'mkmf'
- 
- if /linux/ =~ RUBY_PLATFORM
--   $LDFLAGS += '-Wl,--rpath -Wl,$(EPREFIX)/lib'
-+   $LDFLAGS += ' -Wl,--rpath -Wl,$(EPREFIX)/lib'
- elsif /solaris/ =~ RUBY_PLATFORM
--   $LDFLAGS += '-R$(EPREFIX)/lib'
-+   $LDFLAGS += ' -R$(EPREFIX)/lib'
- elsif /hpux/ =~ RUBY_PLATFORM
--   $LDFLAGS += '+b$(EPREFIX)/lib'
-+   $LDFLAGS += ' +b$(EPREFIX)/lib'
- elsif /aix/ =~ RUBY_PLATFORM
--   $LDFLAGS += '-Wl,-blibpath:$(EPREFIX)/lib'
-+   $LDFLAGS += ' -Wl,-blibpath:$(EPREFIX)/lib'
- end
- 
- dir_config("rrd","../../src","../../src/.libs")
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild
deleted file mode 100644
index a1829ecf2d4e..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild,v 1.11 2013/02/11 22:24:08 pinkbyte Exp $
-
-EAPI="3"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit eutils distutils 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 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc lua 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
-	lua? ( dev-lang/lua )
-	perl? ( dev-lang/perl )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 )
-	tcl? ( dev-lang/tcl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	virtual/awk"
-
-DISTUTILS_SETUP_FILES=("bindings/python|setup.py")
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch"
-#	epatch "${FILESDIR}/${PN}-1.4.3-ruby-ldflags.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-dont-link-system-lib.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-
-	# Python bindings are built/installed manually
-	sed -e "/^all-local:/s/ @COMP_PYTHON@//" -i bindings/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	econf \
-		--disable-static \
-		$(use_enable rrdcgi) \
-		$(use_enable lua) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable ruby) \
-		$(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 "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_compile() {
-	default
-	use python && distutils_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	use python && distutils_src_install
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-
-	ewarn "Since version 1.3, rrdtool dump emits completely legal xml. Basically this"
-	ewarn "means that it contains an xml header and a DOCTYPE definition. Unfortunately"
-	ewarn "this causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an 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 ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
-	ewarn ">you've 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_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild
deleted file mode 100644
index eec6a2d12a4c..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild,v 1.5 2013/02/11 22:24:08 pinkbyte Exp $
-
-EAPI="3"
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit eutils distutils 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 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc lua 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
-	lua? ( dev-lang/lua )
-	perl? ( dev-lang/perl )
-	ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 )
-	tcl? ( dev-lang/tcl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	virtual/awk"
-
-DISTUTILS_SETUP_FILES=("bindings/python|setup.py")
-
-pkg_setup() {
-	use python && python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.8-configure.ac.patch"
-#	epatch "${FILESDIR}/${PN}-1.4.3-ruby-ldflags.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-dont-link-system-lib.patch"
-	epatch "${FILESDIR}/${P}-automake-1.11.2.patch"
-	sed -i '/PERLLD/s:same as PERLCC:same-as-PERLCC:' configure.ac #281694
-
-	# Python bindings are built/installed manually
-	sed -e "/^all-local:/s/ @COMP_PYTHON@//" -i bindings/Makefile.am
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	econf \
-		--disable-static \
-		$(use_enable rrdcgi) \
-		$(use_enable lua) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable ruby) \
-		$(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 "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_enable python)
-}
-
-src_compile() {
-	default
-	use python && distutils_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	use python && distutils_src_install
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-
-	ewarn "Since version 1.3, rrdtool dump emits completely legal xml.  Basically this"
-	ewarn "means that it contains an xml header and a DOCTYPE definition.  Unfortunately"
-	ewarn "this causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an 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 ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
-	ewarn ">you've 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_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild
index be6f81b490eb..3c6e5b0eb5c6 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild,v 1.11 2013/08/01 13:19:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild,v 1.12 2013/08/01 13:24:16 jer Exp $
 
 EAPI="4"
 
@@ -45,8 +45,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch	"${FILESDIR}"/"${P}"-configure.ac.patch
-	epatch	"${FILESDIR}/${PN}"-1.4.5-automake-1.11.2.patch
+	epatch	"${FILESDIR}"/${PN}-1.4.5-automake-1.11.2.patch
+	epatch	"${FILESDIR}"/${P}-configure.ac.patch
 
 	# bug 281694
 	# bug 456810
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild
index 74e443e5d934..2026f539a778 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild,v 1.5 2013/08/01 13:19:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild,v 1.6 2013/08/01 13:24:16 jer Exp $
 
 EAPI="5"
 
@@ -50,8 +50,8 @@ python_install() {
 }
 
 src_prepare() {
-	epatch	"${FILESDIR}"/"${P}"-configure.ac.patch
-	epatch	"${FILESDIR}/${PN}"-1.4.5-automake-1.11.2.patch
+	epatch	"${FILESDIR}"/${PN}-1.4.5-automake-1.11.2.patch
+	epatch	"${FILESDIR}"/${P}-configure.ac.patch
 
 	# bug 281694
 	# bug 456810