gentoo resync : 10.01.2018

4 files changed, 61 insertions, 11 deletions

diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 040fca778d89..f4edacceaf63 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,6 +1,7 @@
 AUX mrtg-2.17.4-socket6.patch 481 BLAKE2B 2294221471be6b9db0a5676a3f819684b0bdac9815c6e20fcd0c32cbd3ee149746dccff2a89f9113243cfe56d5fee66417f07289450c43e089502c270572e5bd SHA512 d93456173c25a5858e71ededd30a6322d5a8cb2908053e1a47529774fad1e4ff0c7a9935501391f8b3dee95cda4620d1b2bd98ea67aa9a2618b22c45ce4c7026
 AUX mrtg.confd 402 BLAKE2B 8a06370eeb0b31e435eb93be8e625a8ba151278462576c0f3f600747cef9f043b66c4f5142900f515a12dd1c38a7fe27f04dcdc832d050e980ee08ccb6e7739f SHA512 18066805d2fea3090a3165a15f963310a94b4e4ee5e9fa88617eb246b1a1a4e91e3faabe4f4a2fe2ebd8f7a69acae82f1b51e3830bdab04da64f03d84c2e7e7c
-AUX mrtg.rc 1285 BLAKE2B 8a50a40829f4eef780bd0d000ce73e41c742defd0d9fc8fff3e6bc5b1dd8620a94738c83e437413e35546828ea994f90df5023e5bf58fcb896d8e4e04cdabeb6 SHA512 4885de66f6b9b65e262b1d49ac7cb3c96a29041d3055316f4db7fce4c5a5155fc4640af818f2881bf2fcd23312ff344ad0b2765e9820667fb08fbb21ee520679
+AUX mrtg.rc 1275 BLAKE2B 180e9070e8648e05ff02b24a642c9e4f1b22d3a952385ab58c70411c1ed2fde4bef3f9ae61b35808049a1451d82822f7bfc2e3c222a3689dabafcd83a49ee00c SHA512 bcf5d95130e2e8ec4df9b3d97e99e2a36e65ed41b23ca8b249e3507e61ac0945945a0576e80efae9efaca9deca4d1a64ead95e05c285fd62fb0ea914864b6d51
 DIST mrtg-2.17.4.tar.gz 1096879 BLAKE2B 12d485e8bdb28ff3706341d5b53e78dc37291e6f157e7792f1d2f3b43ee09c7b7eed57acfd8c7e9c9621187f75ee117e0ea85ce1ec34636f26aaf7e06ca58e14 SHA512 b15dac707e387714ba1a181c487894fcacbb9c2c1a1710475ebe86a11e30d758a4b44c139b42638de7fdef6616cf3112afc4e5a8c5fbf53718829673698ee110
-EBUILD mrtg-2.17.4-r1.ebuild 839 BLAKE2B bb6c11a2856434248e87407fa4a1f5262a2f11f368d67b31838ca18491bf88eb9e2189218664b7c674bc319ad14a3aacacde52d7cf6ce7af5d242be0c7e3521a SHA512 d4fdf13f873e204d5cb03539e7e37003c904edfb1653a064a7b20cc92875fe07495f202a08cf2b5b1ab88420dca7881ae776fcdb79cd9d95bf9595624b8f9fd9
+EBUILD mrtg-2.17.4-r1.ebuild 824 BLAKE2B 34727aafba25ed97e7eb8e5f37806f533eac1d4300bf225c6142dc884cc2d7dcbf33cd0a4367a06427d789c076f78d0d4c6bd75a36c6adf16fd44f1f76d549f5 SHA512 a81daab88b80342d21a46eb8be24135b301e0c1169abd6871c4fa7081a765ed7adb8a39a4de35774f5da151788c7a805e9c7b082a5127074575146f03a9ed9c4
+EBUILD mrtg-2.17.4-r2.ebuild 1000 BLAKE2B 335c76bb71ba16bc1908762dc5002b8ab26e464ce294d6ecab2763bda86fde929bcd826fbafcb9d3b69bc1a64f58ffed09de597914bc4d5b9eb7badeb3481196 SHA512 3c71dfe63faa649b90aba120b148348a2b1bdf5ff6250887006183939f8e94f0d87fc855e94782f3f9aa6c1f355a2ec27dfca5af820906319b681e80a5dddba4
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/mrtg/files/mrtg.rc b/net-analyzer/mrtg/files/mrtg.rc
index d1ee6861cd45..0ff5d0783f38 100644
--- a/net-analyzer/mrtg/files/mrtg.rc
+++ b/net-analyzer/mrtg/files/mrtg.rc
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
@@ -10,7 +10,7 @@ depend() {
 }
  
 checkconfig() {
-    if [[ ! -f ${MRTG_CONF} ]] ; then
+    if [ ! -f ${MRTG_CONF} ] ; then
 		eerror "Please create ${MRTG_CONF} (try man cfgmaker)"
 		return 1
 	fi
@@ -22,21 +22,21 @@ checkconfig() {
 start() {
 	# mrtg will not run if LANG=*utf8
 	# use grep instead of bash regexp for bug #159786
-	[[ "$(echo $LANG|grep -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$')" ]] \
+	[ "$(echo $LANG|grep -E '((^[A-Za-z0-9\_\@\-]+\.)|(^))([uU][tT][fF]-?8)$')" ] \
 	&& LANG='C'
 
 	checkconfig || return $?
 
 	# enable logging?
-	[[ -n "${MRTG_LOG}" ]] && \
+	[ -n "${MRTG_LOG}" ] && \
 		MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}"
 	
 	# run as a different user?
-	[[ -n "${MRTG_USER}" ]] && \
+	[ -n "${MRTG_USER}" ] && \
 		MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}"
 
 	# run as a different group?
-	[[ -n "${MRTG_GROUP}" ]] && \
+	[ -n "${MRTG_GROUP}" ] && \
 		MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}"
 
 	ebegin "Starting mrtg"
diff --git a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
index aa3e52b338d4..d6459ad61290 100644
--- a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 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"
+HOMEPAGE="https://oss.oetiker.ch/mrtg/"
+SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-analyzer/mrtg/mrtg-2.17.4-r2.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r2.ebuild
new file mode 100644
index 000000000000..a278e5a925f4
--- /dev/null
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib
+
+DESCRIPTION="A tool to monitor the traffic load on network-links"
+HOMEPAGE="https://oss.oetiker.ch/mrtg/"
+SRC_URI="${HOMEPAGE}pub/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="selinux"
+
+DEPEND="
+	>=dev-perl/SNMP_Session-1.13-r2
+	>=dev-perl/Socket6-0.23
+	dev-lang/perl
+	media-libs/gd[png]
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-mrtg )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-socket6.patch
+)
+
+src_prepare() {
+	rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die
+
+	sed -i \
+		-e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \
+		$(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die
+
+	default
+}
+
+src_install () {
+	keepdir /var/lib/mrtg
+
+	default
+
+	mv "${ED}"/usr/share/doc/{mrtg2,${PF}} || die
+
+	newinitd "${FILESDIR}/mrtg.rc" ${PN}
+	newconfd "${FILESDIR}/mrtg.confd" ${PN}
+}