Stable for PPC64 (bug #509992).

(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --ignore-arches, signed Manifest commit with key A792A613)

5 files changed, 10 insertions, 129 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 1615e3ed0dde..fc13b775f458 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/mrtg
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.125 2014/08/13 09:28:10 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.126 2015/05/05 09:07:23 jer Exp $
+
+  05 May 2015; Jeroen Roovers <jer@gentoo.org> -mrtg-2.16.4-r1.ebuild,
+  mrtg-2.17.4-r1.ebuild, -files/mrtg-2.16.4-disable-static.patch,
+  -files/mrtg-2.16.4-no-rpath.patch:
+  Stable for PPC64 (bug #509992).
 
   13 Aug 2014; Agostino Sarubbo <ago@gentoo.org> mrtg-2.17.4-r1.ebuild:
   Stable for ppc, wrt bug #509992
diff --git a/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch b/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch
deleted file mode 100644
index af513a38c6e0..000000000000
--- a/net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://oss.oetiker.ch/mrtg-trac/ticket/97
-
---- configure.in	2010-11-09 16:25:34 +0000
-+++ configure.in	2010-11-09 16:35:39 +0000
-@@ -98,6 +98,8 @@
- AC_ARG_WITH(png-inc,[  --with-png-inc=DIR      location of the libpng include files],
- 		[CPPFLAGS="${CPPFLAGS} -I${withval}"])
- 
-+AC_ARG_ENABLE(static,[  --disable-static        avoid rateup static linkage with gd],
-+		[AVOID_STATIC="${enableval}"],[AVOID_STATIC="no"])
- 
- LIBS="${LIBS} ${MATHLIBS}"
- 
-@@ -127,9 +129,11 @@
-   CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImageGif"
- fi
- 
--AC_CHECK_LIB(gd,gdImageGd,[
--   GLIBS="-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic"
--        ],:,[-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic])
-+if test x$AVOID_STATIC = xyes; then
-+  AC_CHECK_LIB(gd,gdImageGd,[
-+    GLIBS="-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic"
-+      ],:,[-Wl,-Bstatic ${GLIBS} -Wl,-Bdynamic])
-+fi
- 
- if test x$GDFORM_EXT = xpng; then
-   CPPFLAGS="$CPPFLAGS -DGFORM_GD=gdImagePng"
-
diff --git a/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch b/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch
deleted file mode 100644
index 1f634134269d..000000000000
--- a/net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-http://oss.oetiker.ch/mrtg-trac/ticket/98
-
---- Makefile.in	2010-11-09 16:25:34 +0000
-+++ Makefile.in	2010-11-09 17:13:17 +0000
-@@ -21,7 +21,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- GDFORM_EXT = @GDFORM_EXT@
--LD_RUN_PATH = @LD_RUN_PATH@
-+SET_LD_RUN_PATH = @SET_LD_RUN_PATH@
- LIBS = @LIBS@
- 
- INSTALL = @INSTALL@
-@@ -30,7 +30,8 @@
- all:	 bin/rateup subst
- 
- bin/rateup: bin/rateup.o
--	LD_RUN_PATH=$(LD_RUN_PATH) $(CC) bin/rateup.o -o bin/rateup $(LDFLAGS)  $(LIBS) 
-+	$(SET_LD_RUN_PATH) $(CC) bin/rateup.o -o bin/rateup $(LDFLAGS)  $(LIBS)
-+
- 
- bin/rateup.o: $(top_srcdir)/src/rateup.c
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(top_srcdir)/src/rateup.c -o bin/rateup.o
-
---- configure.in	2010-11-09 17:11:20 +0000
-+++ configure.in	2010-11-09 17:12:49 +0000
-@@ -141,6 +141,9 @@
- 
- LIBS="${GLIBS} ${LIBS}" 
- 
-+if test x$LD_RUN_PATH != x; then
-+	SET_LD_RUN_PATH="LD_RUN_PATH=${LD_RUN_PATH}"
-+fi
- 
- dnl Make sure the header is here
- AC_CHECK_HEADER( gd.h,:,[ GDFORM_EXT="" ])
-@@ -198,7 +201,7 @@
- AC_SUBST(PERL)
- AC_SUBST(RRD_PERL)
- AC_SUBST(GDFORM_EXT)
--AC_SUBST(LD_RUN_PATH)
-+AC_SUBST(SET_LD_RUN_PATH)
- AC_SUBST(LIBS)
- AC_SUBST(CFLAGS)
- AC_CONFIG_HEADERS(config.h)
-
diff --git a/net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild b/net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild
deleted file mode 100644
index aab5ad2d69ac..000000000000
--- a/net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild,v 1.8 2011/03/30 08:40:24 xmw Exp $
-
-EAPI="3"
-
-inherit eutils autotools
-
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-HOMEPAGE="http://oss.oetiker.ch/mrtg/"
-SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	dev-perl/SNMP_Session
-	>=dev-perl/Socket6-0.20
-	>=media-libs/gd-1.8.4"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-disable-static.patch
-	epatch "${FILESDIR}"/${P}-no-rpath.patch
-	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install () {
-	keepdir /var/lib/mrtg
-
-	emake DESTDIR="${ED}" install || die "emake install failed"
-	mv "${ED}/usr/share/doc/"{mrtg2,${PF}}
-
-	newinitd "${FILESDIR}/mrtg.rc" ${PN} || die
-	newconfd "${FILESDIR}/mrtg.confd" ${PN} || die
-}
-
-pkg_postinst(){
-	elog "You must configure mrtg before being able to run it. Try cfgmaker."
-	elog "The following thread may be useful:"
-	elog "http://forums.gentoo.org/viewtopic-t-105862.html"
-}
diff --git a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
index 3d2aec9d6338..1bc0580945a3 100644
--- a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild,v 1.10 2014/08/13 09:28:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild,v 1.11 2015/05/05 09:07:23 jer Exp $
 
 EAPI=5
 inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
 
 DEPEND="
 	>=dev-perl/SNMP_Session-1.13-r2