More old.

(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key A792A613)

6 files changed, 11 insertions, 284 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/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