diff options
| -rw-r--r-- | net-analyzer/rrdtool/ChangeLog | 9 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/rrdtool-1.3.8-configure.ac.patch | 16 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/rrdtool-1.4.4-dont-link-system-lib.patch | 16 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch (renamed from net-analyzer/rrdtool/files/0001_rrdtool-1.4.7-configure.ac.patch) | 0 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild | 4 |
6 files changed, 12 insertions, 37 deletions
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog index f34e00539061..2304a2ecb0c4 100644 --- a/net-analyzer/rrdtool/ChangeLog +++ b/net-analyzer/rrdtool/ChangeLog @@ -1,6 +1,13 @@ # 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.246 2013/03/09 17:18:53 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.247 2013/08/01 13:19:10 jer Exp $ + + 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, + -files/rrdtool-1.4.4-dont-link-system-lib.patch, + -files/0001_rrdtool-1.4.7-configure.ac.patch, + +files/rrdtool-1.4.7-configure.ac.patch: + Old. 09 Mar 2013; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.7-r2.ebuild: Fix USE=static-libs by Alphat-PC (bug #460576). diff --git a/net-analyzer/rrdtool/files/rrdtool-1.3.8-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.3.8-configure.ac.patch deleted file mode 100644 index d1c719bd1893..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.3.8-configure.ac.patch +++ /dev/null @@ -1,16 +0,0 @@ -=== modified file 'configure.ac' ---- configure.ac 2009-07-08 09:47:54 +0000 -+++ configure.ac 2009-07-08 09:51:00 +0000 -@@ -174,11 +174,6 @@ - AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos)) - - --dnl add pic flag in any case this makes sure all our code is relocatable --eval `./libtool --config | grep pic_flag` --CFLAGS="$CFLAGS $pic_flag" -- -- - dnl Checks for library functions. - AC_FUNC_STRFTIME - AC_FUNC_VPRINTF - diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.4-dont-link-system-lib.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.4-dont-link-system-lib.patch deleted file mode 100644 index 5d8f8498f264..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.4.4-dont-link-system-lib.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make sure the Makefile for the ruby binding does not look in the -normal library path first by setting it to something else that will -not contain a rrd.so library. This is the least invasive method to fix -the linking order. - ---- bindings/Makefile.am.~1~ 2010-03-02 17:54:04.000000000 +0100 -+++ bindings/Makefile.am 2010-11-27 14:19:07.080938486 +0100 -@@ -29,7 +29,7 @@ - # RUBYARCHDIR= is to work around in a makefile quirk not sure - # it is is the right thing todo, but it makes rrdtool build on freebsd as well - ruby: Makefile -- cd ruby && $(RUBY) extconf.rb && $(MAKE) EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) RUBYARCHDIR= -+ cd ruby && $(RUBY) extconf.rb && $(MAKE) libdir=/lib EPREFIX=$(exec_prefix) $(RUBY_MAKE_OPTIONS) RUBYARCHDIR= - - # rules for building the pyton module - python: Makefile diff --git a/net-analyzer/rrdtool/files/0001_rrdtool-1.4.7-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch index ad97bec2defa..ad97bec2defa 100644 --- a/net-analyzer/rrdtool/files/0001_rrdtool-1.4.7-configure.ac.patch +++ b/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch diff --git a/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.7-r1.ebuild index 7b3192913a73..be6f81b490eb 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.10 2013/02/13 00:36:52 jer Exp $ +# $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 $ EAPI="4" @@ -45,7 +45,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/0001_"${P}"-configure.ac.patch + epatch "${FILESDIR}"/"${P}"-configure.ac.patch epatch "${FILESDIR}/${PN}"-1.4.5-automake-1.11.2.patch # bug 281694 diff --git a/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.7-r2.ebuild index 9b5fb607cc6b..74e443e5d934 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.4 2013/03/09 17:18:53 jer Exp $ +# $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 $ EAPI="5" @@ -50,7 +50,7 @@ python_install() { } src_prepare() { - epatch "${FILESDIR}"/0001_"${P}"-configure.ac.patch + epatch "${FILESDIR}"/"${P}"-configure.ac.patch epatch "${FILESDIR}/${PN}"-1.4.5-automake-1.11.2.patch # bug 281694 |