From cb6e16221874d38c15bfa504bcf0ed90578ec723 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Tue, 5 May 2015 09:07:25 +0000 Subject: [PATCH] Stable for PPC64 (bug #509992). Package-Manager: portage-2.2.18/cvs/Linux x86_64 RepoMan-Options: --ignore-arches Manifest-Sign-Key: 0xA792A613 --- net-analyzer/mrtg/ChangeLog | 9 +++- net-analyzer/mrtg/Manifest | 24 ++------- .../files/mrtg-2.16.4-disable-static.patch | 29 ----------- .../mrtg/files/mrtg-2.16.4-no-rpath.patch | 46 ----------------- net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild | 49 ------------------- net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild | 6 +-- 6 files changed, 15 insertions(+), 148 deletions(-) delete mode 100644 net-analyzer/mrtg/files/mrtg-2.16.4-disable-static.patch delete mode 100644 net-analyzer/mrtg/files/mrtg-2.16.4-no-rpath.patch delete mode 100644 net-analyzer/mrtg/mrtg-2.16.4-r1.ebuild 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 -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 mrtg-2.17.4-r1.ebuild: Stable for ppc, wrt bug #509992 diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest index 6f0c6c3cd600..23ac508d8425 100644 --- a/net-analyzer/mrtg/Manifest +++ b/net-analyzer/mrtg/Manifest @@ -1,31 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX mrtg-2.16.4-disable-static.patch 908 SHA256 d593a22d67da5e82c50a9c1f7da31917a8bbfeab85944606618ada2eea9c12ce SHA512 562ebea8baa764e87e44bd3a778e6591b26e02220b3cb6b4b0ad006c23dcc972e9dd7a7290be00bd15bcffa28ec68f0b3143eae68c9def664dbb94898cf4f490 WHIRLPOOL b07611e5852d74215dfaa0ff94868767aba8b3492bb98134820ea29bbec74fa1c17935cd3f7f1fb9dc1df20eca5ee8de0b8b9fabf3ca09d05bd7514f3d4361c7 -AUX mrtg-2.16.4-no-rpath.patch 1163 SHA256 08d13f0a659eb539432237c32b521d710664c3d9eef54e3da152acbfeb0b5a55 SHA512 ab51857f49eacd562b33c07feb5909d2cf6796c37b656d803afb98259dee9cfcbc35929b41ccbf2104c42f4f63f4df27a54a361a02c5f685d72cb213dc71a7ee WHIRLPOOL ce46d262e9d2e03a63d9e7302090734cffded26fe9ac5823f6cab23f2228f208ba74e15612211612db7f7679e2482ac6c68a9142d6a016574ba82ad7cea17ce0 AUX mrtg-2.17.4-socket6.patch 481 SHA256 9a369a9c383e9ea23b49b6aa687798a2639de6fac7615d4464a63c7641a373fd SHA512 d93456173c25a5858e71ededd30a6322d5a8cb2908053e1a47529774fad1e4ff0c7a9935501391f8b3dee95cda4620d1b2bd98ea67aa9a2618b22c45ce4c7026 WHIRLPOOL cfc74309eb0b0f5fa33bb411c19aa3dc125f637b82d93f416a951a0c1d55ffb42b9f76b6edd821a173b8af4aab1b4d909bf5f4d4028770463258590c5d01405a AUX mrtg.confd 512 SHA256 fb929fd0e3658bc614f2ba51b9fba748050dbc76c0f1c0ac1bc233559bd2b4e7 SHA512 ee42805b0d3abb802e7e69d1544f2821223183aadf3a6009c9434e56054d9b0df579e83a9f6ab22afa65590f6d331daf49fb512ac2578e9f473b6d40382dd2b5 WHIRLPOOL bf8bc06a7e294b41a68e400af60b93d2f8b4549363a67f87ffea361ee7714422715f602c9d2f8989d65f93d7dd0c82addaad14c7c11ceb727c9a6805abae8d00 AUX mrtg.rc 1388 SHA256 25aa80a6eac6b7ca09a577c1ff895d40a03c167892aa1f2dde39a5085b24c41a SHA512 f4aac9cb288a668aacc4c35213c5466442fe796a434910b9e4c1b4f384937866f713a49999a07ed11b0595dd82cf8c5edc24273330f490e3a3c08c00b43b1d2e WHIRLPOOL 46cdc93be14e25aa2b0b8ef5e33bc3859edd23b8b6f625461c7b0244e46c6b7b988fc68944cefa8637a5a8b147a829776523bf665d45c8a97cae162734296098 -DIST mrtg-2.16.4.tar.gz 1089068 SHA256 6d61fad616f6a73b2080a6ed295ec8d2a021a4e1110db42a2d35b9ad6d3037e6 SHA512 1adbb109fa788e183eee3824b81f2e8596a57c5b882fde00485140e4cee546b225869f7078f0f6779af37826304634437b0f42924a9ca2bdbb2f28d338f6e262 WHIRLPOOL 36c7f358d19488d3a8d9efcf85905e753dad3236864ef060f2d9ffe1783d6826125efc946af3d5a17c5edd07d5a38c9ffa5d35e1bcf348369517e283ae522689 DIST mrtg-2.17.4.tar.gz 1096879 SHA256 5efa7fae8040159208472e5f889be5b41d8c8a2ea6b31616f0f75cc7f48d2365 SHA512 b15dac707e387714ba1a181c487894fcacbb9c2c1a1710475ebe86a11e30d758a4b44c139b42638de7fdef6616cf3112afc4e5a8c5fbf53718829673698ee110 WHIRLPOOL 125ef92077ba691c769924bab20a86e3a72f406a8ce5a7fed0342c0c03aa35d5b1ee4f0ddb6419ab892337ac38bf2ad12131b099ba9e972b08e753b61f08ff11 -EBUILD mrtg-2.16.4-r1.ebuild 1268 SHA256 363ff91111d5f2e43de2c9322b537c73dae52d6fbae68274497b38c40bf9a21e SHA512 95bba34b05ca7c6f1c577421c0fe75b2a4dde672104c75395de11ddbb9dc36ca09a4bd04889602d0f974e4364c9241a750ef78ab80517195c6654e273b0a302c WHIRLPOOL b5f8b89b50c61567c143b59cdc97500961f917ee0746195c127c6676a3c1a386f5230005fff5aa49b3269d6bed790d24c223f40dc43f0bb0131cb4f392df4eac -EBUILD mrtg-2.17.4-r1.ebuild 899 SHA256 e72264aad5dc94f7c4c7aa093c234e62a7a853d9f6e4ab88325bfc80ea141391 SHA512 64e10aa934a801ebbc81e358ad4bdc7c815fff412cbadb65ec2926b5b0d46c0f5f6303309bf27b3743708e06f84ddf2b975976b59b9497e039d78327b999f812 WHIRLPOOL cc8cd1596470a59c123e13fc4e67f03134daeeb7f86477c6d6d3ac6f0dd29685fc7dac0ee02fd359ffe93247aa3b0d47d5bb129937d67852ebcdad482c038d40 -MISC ChangeLog 15521 SHA256 e5975fe6fa72b1f8850e928836289cc6cfa785a788dabaa9805cc10fd35f1097 SHA512 b58f263e76b12c34b1c28d5f86911e4b8f81d512d8ab502ddeac1847e1b4817f28295426a4b8ceb300233f935f20d655df86fa13ec23617fbaba179e57f77216 WHIRLPOOL a21432b52f554a3ae97a81f7bd3ca9548f69f2c69c36f60e01c3f8ff720185543a60752b8853f0366a1ce5b235e814ab94345fbaef05344ab4b1988617abedb8 +EBUILD mrtg-2.17.4-r1.ebuild 898 SHA256 85ab5dd901047009613e364d8bea8ffde8a5f58447faec8e9465f93dc40b28aa SHA512 76cdb2157231b81cebb9ffc6dfbf207888cf5eb8971498f26a925d8be6219abc44f3c6a08708f6b2556b8ff67c12a6a4779fc40b92accc4265e268288b21e676 WHIRLPOOL 5bfdea581e0316c81759b115c43c64d33fd139462ec4a3dc126559762f9bc48ef1905b3c34b0f8c5f6c41116ddbd396f854217dbc9de2ebcacbd4849c50c16e3 +MISC ChangeLog 15730 SHA256 6535d1aaeadba0e2aaccba8994e8d5d0d26ddac2bde9690b19fb34ef4a21aeda SHA512 60ac41a491c2df6af84c8b11de3d670e5f12bd71d7a39f4cc1dc283cc426b201666e730d92e8c64ea239152527506e19a38be2d9a15a67c2a5ff7a948f3c5c6f WHIRLPOOL 5b38aaa18cdffa863af7b782a195f372424e0b2388d5b57cb1e4ee1551f32567e3a5899835cdb1065936bd8e84145730f7b9797a5d154abfac26b256d6e18b33 MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJT6y+rAAoJELp701BxlEWfKI0P/iu5iKOszv0dWphbF4ZqW+/f -+gWcG8nn+IoKeQQkO0RlcWTyRadhhE1K5PtIKVwXSKNntgEC4V+CoDTrGb7gM8T1 -lugMj8m3e0/vwGcubGhDTSRYxptaj7bQdjbD4vQUuLqEpZqqb8OAhIB0ZLLRt7uT -k/CK5bHCpkQQndoA2fwW03oFFcmqzWoqtThPl9BSGGtsJM83eNwV3lunk2FCewpf -jKvfngE7kPx0eR91JlYmtp6H0HY1zj711JyaC1ZYF4MxAehI/AUWoUh430g+nImI -1dXn8opFmq4ReB+/yywJZSlgZKWlL0tRwml1nzmgwNxjwYtvTg3WnHtJhRbp9gJY -4DBHAkbfK8T9y52695OJ7hfOsOD6FsN41xS5WxV63/wv5Ia7NxRa2SM3ua1vPfYA -VKSYH+cWWBFoc+LHDLNjO6rOuIBOl72+F1wGgKJAStyY4MLTk2bRmY8BjXM3Ru+L -b4k3+F8c12K76dijKqJ9vbz1MKFYaXZC4aLKc+Q3WA2cFOBvZ6NqM+6zdSn9QYs4 -R3vJtVz4cym25aPNHECceaa9wHY1n5tyTpNaD7ACOL6VtlWXa8aL2Fz7SdxIjamU -xpEsHo87TweHpRp5fp2jQUsOWdZBe4BWedlfgaNtVDMLRSgy7gZU6mLKqX1rozKP -iBLd872WnZ8UlDHmjuvP -=nCHm +iEYEAREIAAYFAlVIiE0ACgkQVWmRsqeSphO4fACeKLmWCyRK401bntpFEHilHu+Q +O0cAn0MDMZWOpK+XMUkoBFkvxve7mN3v +=6j1V -----END PGP SIGNATURE----- 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 -- 2.26.2