Fix SNMP_Session::pack_sockaddr_in redefinition (bug #509986 by Sven).

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

5 files changed, 43 insertions, 76 deletions

diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 3f01aed8c7a2..abedb93906e1 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/mrtg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.115 2012/02/04 21:29:16 radhermit Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.116 2014/05/10 17:22:18 jer Exp $
+
+*mrtg-2.17.4-r1 (10 May 2014)
+
+  10 May 2014; Jeroen Roovers <jer@gentoo.org> -mrtg-2.17.2.ebuild,
+  -mrtg-2.17.4.ebuild, +mrtg-2.17.4-r1.ebuild,
+  +files/mrtg-2.17.4-socket6.patch:
+  Fix SNMP_Session::pack_sockaddr_in redefinition (bug #509986 by Sven).
 
   04 Feb 2012; Tim Harder <radhermit@gentoo.org> -mrtg-2.16.2.ebuild,
   -mrtg-2.16.2-r1.ebuild, -mrtg-2.16.4.ebuild:
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index cd3b558a88db..0a6a2fd0ad18 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,26 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX mrtg-2.16.4-disable-static.patch 908 RMD160 847f1d61a77b35a3f62d0b416323052100f7081f SHA1 ec63fef69b993df0ae83f627f427283398e323c2 SHA256 d593a22d67da5e82c50a9c1f7da31917a8bbfeab85944606618ada2eea9c12ce
-AUX mrtg-2.16.4-no-rpath.patch 1163 RMD160 5b2ca85c66ed591386512d0dff41ca2cac507cef SHA1 c976852e7b6b0405e3c33ae4d76455a8ce9d4972 SHA256 08d13f0a659eb539432237c32b521d710664c3d9eef54e3da152acbfeb0b5a55
-AUX mrtg.confd 512 RMD160 ad2824f21df0ecf864b53250b1e50912b1f17777 SHA1 b3248d27b94155f14240c9d4151c5a789cc152c1 SHA256 fb929fd0e3658bc614f2ba51b9fba748050dbc76c0f1c0ac1bc233559bd2b4e7
-AUX mrtg.rc 1388 RMD160 beb973376ed5f5f1022fdc3caa1fdc5393c18a4a SHA1 11f32fbcc911ae3200eed8a41184cea6e94f93cb SHA256 25aa80a6eac6b7ca09a577c1ff895d40a03c167892aa1f2dde39a5085b24c41a
-DIST mrtg-2.16.4.tar.gz 1089068 RMD160 9d7f2573fded09b16cd5b108271b9dd68d78bc18 SHA1 8d810487585c929bf48246311512f88077e10e55 SHA256 6d61fad616f6a73b2080a6ed295ec8d2a021a4e1110db42a2d35b9ad6d3037e6
-DIST mrtg-2.17.2.tar.gz 1095721 RMD160 8159376e1682bcabf41b73a3f7ede5a302216115 SHA1 dc591cc92ee664d4049333c19becc6a88e162008 SHA256 136a1c2b6c34437a103d71cca9bd3cc27a72cc91fa5bf25e2abc808bbde54adf
-DIST mrtg-2.17.4.tar.gz 1096879 RMD160 cea76ad3685375770520ebbccd0ad4b6adafff1f SHA1 5ae0e659001c613b847237a6b223b26cb7a8ab0f SHA256 5efa7fae8040159208472e5f889be5b41d8c8a2ea6b31616f0f75cc7f48d2365
-EBUILD mrtg-2.16.4-r1.ebuild 1268 RMD160 ed4f08057e6f262760b8c84c3d291bda56ccc83b SHA1 42c60d8effb4ad09cbfa43df999210063abad3ea SHA256 363ff91111d5f2e43de2c9322b537c73dae52d6fbae68274497b38c40bf9a21e
-EBUILD mrtg-2.17.2.ebuild 1070 RMD160 4849d16687c938c74a17a16907aaa5502ee8d198 SHA1 d8f2d5f9fed6ce19eeb7056e41646c39c7b7d39d SHA256 554d61cd64bbc4118fd51c36e32156bee318645c8a63058a284274c4eb2d1888
-EBUILD mrtg-2.17.4.ebuild 1060 RMD160 f7d448f69a4061c6b3b35ad141b24437b726a986 SHA1 bb04b1ac9c8e7ad932c32681ac855d31a8546d73 SHA256 0603657e0c99191b1e933b57668b986379324e96831f7ed571b0344cecd0c4a7
-MISC ChangeLog 14206 RMD160 58ccd1de97b32ead7ad07bc09c2ae8fe5df6cc6f SHA1 89ce6b7e03d2e18f2a99cd36e4b824c6f819c33a SHA256 3b217455a4e5c1adf01ed845fb1ee802b1981a4d806d54faff5f00b7a935b757
-MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
+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 887 SHA256 4fd8361a49e5b6c7f0e06e81004a7f70379200b36e115f199a6a3f2b7abe9a5b SHA512 2b68ef874e7008a547ac0d56d595d1a4b04a965519ae98f6a1e8aaa8f590336a947d1f4e47a12b8651e4d2fabed905028e989248c0cff394807374c900390423 WHIRLPOOL 8ebadd55d8bb6042023c68155802216e2c2d195870bf127a132c00c6ec34329d0482a7104e2cdc458a0760e9dea333b51309734fc9ef8ed832d29463d3847768
+MISC ChangeLog 14456 SHA256 b919c32c74e6a0715f2fa537f7120ac779810fa915b5119ce7af879e354bd9ad SHA512 1f8befa3c5b804f91bfb02a3cd8620521345e660768065b06ae14372f37e71675d170e9a903ea8f6bac8f6019bc83191045d0009ad559b4f7aabd004b81fc9cf WHIRLPOOL ec0a260d548d905666f81bc8c16521093dd7b30e82631c7123f3c01566aa2995f58d813aff63558d5f3d26e88e19b62b60a3c61918874b65101739d009ccd655
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPLaMyAAoJEEqz6FtPBkyj9gcH/A/dvEUYMTC7rSgnP2GRTJPE
-Se4+f8jLZ+lYBkubGWkZX6NjrKdQ19Cfc0+bZyArJc7BB88z5IQ7FKGVTJEQzc5H
-VuhJaj1VnfSmFTWspD5Ybkb8wgos/EXnG0O+gD26ZSCEDwYjEBXCpE2OQ9ysydgh
-rqVl2IBNsScNZJCr1sP/LGCpXCk8CRaRbNGEzHTbM6ztTkDPmcqLA9qrRvGKQZMT
-xvrt+B1WnrXovFMbhUVrf5tZ+oADpaCBTJLK/aX3Un1fxDP858PTcoh4HCWk/MOP
-L8XIm0Yw/wtPYf+L09QcWCEClEu5UkdaPyf9iQIlZsnnNNUSe/46nPLWZeTjHq8=
-=wziE
+iEYEAREIAAYFAlNuYEwACgkQVWmRsqeSphNPwgCdHS9P3TCu5aBRAgIi/Pow1Gnb
+7e8An0nNrjKVXJS957E3quXyuJ+hEfYn
+=wInV
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch b/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch
new file mode 100644
index 000000000000..5540874d9a00
--- /dev/null
+++ b/net-analyzer/mrtg/files/mrtg-2.17.4-socket6.patch
@@ -0,0 +1,11 @@
+--- a/bin/mrtg
++++ b/bin/mrtg
+@@ -300,7 +300,7 @@ sub main {
+     if ($cfg{enableipv6} eq 'yes') {
+         if ( eval {local $SIG{__DIE__};require Socket; require Socket6; require IO::Socket::INET6;}) {
+             import Socket;
+-            import Socket6;
++            Socket6->import(qw(inet_pton getaddrinfo));
+             debug('base', "IPv6 libraries found, IPv6 enabled.");
+         } else {
+             warn "$NOW: WARNING: IPv6 libraries not found, IPv6 disabled.\n";
diff --git a/net-analyzer/mrtg/mrtg-2.17.2.ebuild b/net-analyzer/mrtg/mrtg-2.17.2.ebuild
deleted file mode 100644
index ea6922d79841..000000000000
--- a/net-analyzer/mrtg/mrtg-2.17.2.ebuild
+++ /dev/null
@@ -1,42 +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.17.2.ebuild,v 1.3 2011/08/20 20:30:10 jer Exp $
-
-EAPI="4"
-
-inherit eutils
-
-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() {
-	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
-}
-
-src_install () {
-	keepdir /var/lib/mrtg
-
-	emake DESTDIR="${ED}" install
-	mv "${ED}/usr/share/doc/"{mrtg2,${PF}}
-
-	newinitd "${FILESDIR}/mrtg.rc" ${PN}
-	newconfd "${FILESDIR}/mrtg.confd" ${PN}
-}
-
-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.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
index 951e5d2b33f6..d1a0da280996 100644
--- a/net-analyzer/mrtg/mrtg-2.17.4.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.ebuild,v 1.1 2012/02/04 21:26:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild,v 1.1 2014/05/10 17:22:18 jer Exp $
 
-EAPI="4"
+EAPI=5
+inherit eutils
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://oss.oetiker.ch/mrtg/"
@@ -11,7 +12,6 @@ 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
@@ -20,21 +20,17 @@ DEPEND="dev-lang/perl
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-socket6.patch
 	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
 }
 
 src_install () {
 	keepdir /var/lib/mrtg
 
-	emake DESTDIR="${ED}" install
+	default
+
 	mv "${ED}/usr/share/doc/"{mrtg2,${PF}}
 
 	newinitd "${FILESDIR}/mrtg.rc" ${PN}
 	newconfd "${FILESDIR}/mrtg.confd" ${PN}
 }
-
-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"
-}