gentoo resync : 18.12.2017

11 files changed, 60 insertions, 118 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 9121a18e5616..6c3fe39e354e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/cancd/Manifest b/app-admin/cancd/Manifest
index da33bee4008a..7b0327de086b 100644
--- a/app-admin/cancd/Manifest
+++ b/app-admin/cancd/Manifest
@@ -1,9 +1,9 @@
-AUX cancd-0.1.0-build.patch 262 BLAKE2B 59f99f07c8dba6cff4266813c739625457333f9c03373b650a6230bdba12a1a49e7109adb376c54c4a3fca8a8a17ae3fb23e434c2ea11c7faae9431e83c86afa SHA512 cbc3d0bfcdb2abae08268a408d2d7f7bc5898bd07c744878a6d8996dea5ea4f9f308078f9fe05566ee8cd06b3a5e083163f50d69f6795b31952934a88d69c481
+AUX cancd-0.1.0-build-r1.patch 266 BLAKE2B 0f1c43d64e02899b09d2ce4401f951ba60bad8bf31aa41c1c40677266021d2a3869db40f593f84745782d2ceaef226c7e3398b541cd9746496024d2455923ffc SHA512 83886c972ccc4b34fa4255d2b66f7abd286ba8b3929f2c35d85652ff290559ad837f96015f05d47cbae97fed6aec468852e75e0e6ac0bbac1a0538ea889f603b
 AUX cancd-0.1.0-c-cleanup.patch 1648 BLAKE2B 498c2eff05163a49e1499146e24d54e03ea0c8136e925b8ecfadccd7bcfcb77548ce49a31072c4c5d63c36a8c4b161d5d456b4b0247e915f0a6065e3a586637c SHA512 16350363f8f8f7e3843000e3128216d302ea7112608d61ae8d74ca79688588f3b028e1eedf187df06c78f8aaa2c987cdfdf33761adb9e597d4ca617f34b1072e
-AUX cancd-conf.d 496 BLAKE2B ccba9f3b8a2c89f698ccf835b8638948f6f044c9c33754fa711a33b91e09339956996c4e6dbe20a4c876ae3f26baf906fea58a69a5e8fa960d187ee1b63ff7cd SHA512 95d7fdeec35b2b544b9c30ca3c45197195ae8180624971af1c876ad19bedc0e9045edbb8d5bb393ff8d4f2f96dd7258cdeeb30ba58f31326ebff14f21a9efae9
-AUX cancd-init.d 514 BLAKE2B 108cf545fc68a5682a9380ad2327743f53225876f87da85f15b85d642a556290b39bfb32f8959e6c93e046bb518c0c0f7ef0ac043be9d8d62e664f27668eaf3e SHA512 27f46006a90814c41849bf03d45b100361ce49ac83d498e2244db13827620a254140aefee14059a722b08446c62124d25fb029080cc246aea34287a838b31c64
+AUX cancd-conf.d-r1 378 BLAKE2B 2b2b73484d8de7ee533bd217eb78224c3edae2c894c328ed8b17a941b2087461cc2b83483dd27563d162a83ff254b86f6fc564442bdef8510eb0cd14d51a7c0e SHA512 02c27367dda025f2a1b7aada8bc4c5a2cf5b046b4ded22c7bd7f50daa1ee18ffdda5997faa0d9edacfb17b23aedb007c8dbdee11cc2a70f7f9214e77fa1fb919
+AUX cancd-init.d-r1 596 BLAKE2B 5c439792ef8680238aa59e3f441b1b69ac1889e9a9ea4e57828b9969ec38ae0611971d7a52d68fbc676e2162f726a011839a2810991c70d2e7d3f25f81df9011 SHA512 73ed3f87e98822b0d5cc53b4a515ec02cdbbad03551eb58206522f615f2eafe6d2e2e190dcb41d8ec67ccad4d4411cbd1ce9087035539291ba520e2c3a84b2bf
 AUX netconsole-conf.d 751 BLAKE2B a81cdd8aa5be18e55065e1ca27698a2106bea320da98ea149e4da3f8a0817765b593fe816a9dda8adc9f1cde853f4debaf769e551ff97fe9ac24976c6045ab1e SHA512 7095ec6b8595865fc084b39f027efa0818c1348b8bfc8bfbea8d7d05c767f57a8357ae2eb07f13f073143911451e0fa005e1623ec9865076e4350f442cb8648b
 AUX netconsole-init.d 1503 BLAKE2B e03ee0010c92e011070950bdbb538add60a3eb2291b6b7ff9df60baa28d6fce2ce8e80b5750f730d56d6767743cf6daed358feb524359a0410cf678cf33b140f SHA512 33005e692fce59d567e399fca58b81b740cb381ce897f689af7e33785ccd1991506be1af2c09de8f96b6eb3996c5be16c212daee03d304b1fff7095b2ae1491d
 DIST cancd-0.1.0.tar.gz 7634 BLAKE2B 3ff488caf54764df053237d6ae4c39e7db44c5a5ecd1bcb18f3006e31030232ade4d7a93286dce8f58fb2ae7743700fd14939f219b7f5059cd2fb84bbc107b19 SHA512 9b01ed3ea1e27276799d657572645a7b40da9cf80910a73e2de9d733e8f3cfa374e29764b1e5853d7fb5a6835edda3103a1a6d31fd699010f98318631e62c5fb
-EBUILD cancd-0.1.0-r3.ebuild 1197 BLAKE2B 5126ef5fcda7d4b1d41c12a049fc2449c3fad2530468563c298939f59ddca25c75855f2f9bbe410c284251b0b25fe09cd630617b0361afc9bdfa43c08e7ade90 SHA512 4258be990c471d8d5a3df2c735b19c3333bd17be8d878bde92839216df8350220b463f97e5b92753ef9af866e40ed0b6d53df3f0e8c30e52bb71721ec72add1c
+EBUILD cancd-0.1.0-r4.ebuild 1162 BLAKE2B 5060bcf92d4c5495a7a3160ab67e3050eff26889ee005f55fad3e330899bcd3f3333b64468cd1e767f248b0c5f51e21081546f9e8bbf2826055c6b1d12bf4a3c SHA512 e135297de6f711870435a688d5b1fff4b3bffed77c3136cf52de41566c019e01f28d5dc120ae0a4f94a286614c9344330debf5728748013a7459b5377f87a647
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-admin/cancd/cancd-0.1.0-r3.ebuild b/app-admin/cancd/cancd-0.1.0-r4.ebuild
index 6ad37a6163ff..d66212991751 100644
--- a/app-admin/cancd/cancd-0.1.0-r3.ebuild
+++ b/app-admin/cancd/cancd-0.1.0-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils
+inherit user
 
-DESCRIPTION="the CA NetConsole Daemon receives output from the Linux netconsole driver"
+DESCRIPTION="CA NetConsole Daemon receives output from the Linux netconsole driver"
 HOMEPAGE="http://oss.oracle.com/projects/cancd/"
 SRC_URI="http://oss.oracle.com/projects/cancd/dist/files/source/${P}.tar.gz"
 
@@ -14,9 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-build-r1.patch"
+	"${FILESDIR}/${P}-c-cleanup.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch #246734
-	epatch "${FILESDIR}"/${P}-c-cleanup.patch
+	default
+
 	# slight makefile cleanup
 	sed -i \
 		-e '/^CFLAGS/s,-g,,' \
@@ -27,11 +32,12 @@ src_prepare() {
 
 src_install() {
 	dosbin cancd
-	newinitd "${FILESDIR}"/cancd-init.d cancd
-	newconfd "${FILESDIR}"/cancd-conf.d cancd
+	newinitd "${FILESDIR}"/cancd-init.d-r1 cancd
+	newconfd "${FILESDIR}"/cancd-conf.d-r1 cancd
 	newinitd "${FILESDIR}"/netconsole-init.d netconsole
 	newconfd "${FILESDIR}"/netconsole-conf.d netconsole
-	keepdir /var/crash
-	fowners adm:nobody /var/crash
-	fperms 700 /var/crash
+}
+
+pkg_preinst() {
+	enewuser cancd
 }
diff --git a/app-admin/cancd/files/cancd-0.1.0-build.patch b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch
index b1c99b1cd565..19bc929b2bc0 100644
--- a/app-admin/cancd/files/cancd-0.1.0-build.patch
+++ b/app-admin/cancd/files/cancd-0.1.0-build-r1.patch
@@ -2,8 +2,8 @@ fix building with newer glibc
 
 http://bugs.gentoo.org/246734
 
---- cancd.c
-+++ cancd.c
+--- a/cancd.c
++++ b/cancd.c
 @@ -36,6 +36,7 @@
  #include <libgen.h>
  #include <getopt.h>
diff --git a/app-admin/cancd/files/cancd-conf.d b/app-admin/cancd/files/cancd-conf.d
deleted file mode 100644
index 7b4dd27383c0..000000000000
--- a/app-admin/cancd/files/cancd-conf.d
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# user to run as, root strongly discouraged
-# user should have /bin/false for a shell
-# but file access into /var
-CHUID='adm:nobody'
-
-# port to listen on
-CANCD_PORT=6667
-
-# directory to output to
-CRASH_DIR=/var/crash
-
-# one file per minute, one dir per host/date
-#CRASH_FORMAT="%Q/%Y-%m-%d/%H:%M.log"
-# one file per day, one dir per host
-CRASH_FORMAT="%Q/%Y-%m-%d.log"
diff --git a/app-admin/cancd/files/cancd-conf.d-r1 b/app-admin/cancd/files/cancd-conf.d-r1
new file mode 100644
index 000000000000..13322298f28b
--- /dev/null
+++ b/app-admin/cancd/files/cancd-conf.d-r1
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# port to listen on
+CANCD_PORT=6667
+
+# directory to output to
+CANCD_LOG_DIR=/var/log/cancd
+
+# one file per minute, one dir per host/date
+#CANCD_LOG_FORMAT="%Q/%Y-%m-%d/%H:%M.log"
+# one file per day, one dir per host
+CANCD_LOG_FORMAT="%Q/%Y-%m-%d.log"
diff --git a/app-admin/cancd/files/cancd-init.d b/app-admin/cancd/files/cancd-init.d
deleted file mode 100644
index eb0d34e1a2ee..000000000000
--- a/app-admin/cancd/files/cancd-init.d
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	mkdir -p ${CRASH_DIR}
-	chown ${CHUID} ${CRASH_DIR}
-	chmod 700 ${CRASH_DIR}
-	ebegin "Starting cancd"
-	start-stop-daemon --start --quiet --user ${CHUID} --exec /usr/sbin/cancd  -- -p ${CANCD_PORT} -l "${CRASH_DIR}" -o "${CRASH_FORMAT}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping cancd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cancd
-	eend ${?}
-}
diff --git a/app-admin/cancd/files/cancd-init.d-r1 b/app-admin/cancd/files/cancd-init.d-r1
new file mode 100644
index 000000000000..a2a96f1ce81c
--- /dev/null
+++ b/app-admin/cancd/files/cancd-init.d-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/cancd"
+command_args="-p ${CANCD_PORT}
+              -l ${CANCD_LOG_DIR}
+              -o ${CANCD_LOG_FORMAT}"
+command_user="cancd"
+
+# cancd daemonizes itself, but doesn't write a PID file and doesn't
+# have an option to run in the foreground. So the best we can do
+# is try to match the process name when stopping it.
+procname="cancd"
+
+depend() {
+    need net
+}
+
+start_pre() {
+    checkpath --directory --owner cancd --mode 0700 "${CANCD_LOG_DIR}"
+}
diff --git a/app-admin/metalog/Manifest b/app-admin/metalog/Manifest
index 7816b593fe68..defaf736774e 100644
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@@ -4,6 +4,5 @@ AUX metalog.confd 393 BLAKE2B 326653a23ff4e6bc78a4ddebf8af7c517f7b67973063ce1ac6
 AUX metalog.initd 701 BLAKE2B 9cb211b887b7294a11649710d45c104603fa9b9c27469f33c20613b58d0eede015cc7faa7d489530150bacc9ae5c4f4ecdee69ac2a9fbd4eb7157296413d0594 SHA512 45eb2f4c5a99723ac24bdb90726a81efef422aab7c991d1502a0bb728a4138cda74b2f8efb4cc70f1375b21b92039639e8bd5ab01af310991a81fce668f6f096
 AUX metalog.service-r1 153 BLAKE2B 0353f6c1983b7146ce6471be82540aeb87d930e5c9f7334a4133754c52c2c8770c04a9eeb6f9f20ecc41359b1eae135e525d2dbde2471f2d973bb751690703d7 SHA512 72076f6aeab9975dedd824ea1d48b96f6a964d06f529923d4f7a1280a1123a63c0e958f74c6a1417c6362487a69d165bf3eb6c417aae3887ff43ae726f5a30d8
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
-EBUILD metalog-3-r1.ebuild 1533 BLAKE2B f634bd40a721f5b80a14f36fe7288b6cda8ae40f852d4de24bd7b3b67fd9abdd45c653872b11d3c296cb923547f668e90e7a1f4c7e3cf2c5b09167aaf9e1d90f SHA512 3e1f0ff8ddd35d3ba9432489ae3ff35e30bc24af43056144c3eacc9a2654378c157699c86ce1ab2ff39c4f38bef8be0d07d21ee9d14ca6978709767ca7b0e87a
-EBUILD metalog-3-r2.ebuild 1489 BLAKE2B a743d9cbd236bf04d08861af23bb29e3a1b416f30646cca202c5a5d7f249332a0ad345c21ea852a28142f100799de4a53ff0e7bbaf0993411c6870100e275c6d SHA512 72c155850389ad0869e633c59c2aba196b91a18955d8464cda60d224030bac5be1943da862a57542b981bbb29cd30695dedc2cdb7f5ff272ac76946a20275dae
+EBUILD metalog-3-r2.ebuild 1488 BLAKE2B 5240b4290bc4df6738312a9c0474ca114b658fc9c55e371dd69c4ce1b680293d3d92899a7aa39a7dfd35db5eb583365fa539f75f203b912000b542dccd1ecbc3 SHA512 c116056aa22037bbfd20d6e53e55b60972821ebec8f0693dfbce8f928401a2cadac3dee4a2520527348b5d7c4174d2cd9e8937306e4a1550fa74d571d0e6e607
 MISC metadata.xml 412 BLAKE2B 669797f6cec852364918cc83bbd58c3902815ca8b060f142ce90ae1af18bbf37ae460aad132ab091a62f3d206f21f2a30a7162423f7fe5490af458ba5464adb8 SHA512 3c5b8ad724089154480e4a1672e714fba022f30e371d317e53c144411ded8d8ca92bddac9eb51503ed9eb9e8069b851a8ff5078f9c9b576542efc54e621a98a8
diff --git a/app-admin/metalog/metalog-3-r1.ebuild b/app-admin/metalog/metalog-3-r1.ebuild
deleted file mode 100644
index b67bb91b753a..000000000000
--- a/app-admin/metalog/metalog-3-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-inherit eutils systemd
-
-DESCRIPTION="A highly configurable replacement for syslogd/klogd"
-HOMEPAGE="http://metalog.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="unicode"
-
-RDEPEND=">=dev-libs/libpcre-3.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/xz-utils"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9-metalog-conf.patch
-}
-
-src_configure() {
-	econf $(use_with unicode)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README NEWS metalog.conf
-
-	into /
-	dosbin "${FILESDIR}"/consolelog.sh || die
-
-	newinitd "${FILESDIR}"/metalog.initd metalog
-	newconfd "${FILESDIR}"/metalog.confd metalog
-	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
-}
-
-pkg_preinst() {
-	if [[ -d "${ROOT}"/etc/metalog ]] && [[ ! -e "${ROOT}"/etc/metalog.conf ]] ; then
-		mv -f "${ROOT}"/etc/metalog/metalog.conf "${ROOT}"/etc/metalog.conf
-		rmdir "${ROOT}"/etc/metalog
-		export MOVED_METALOG_CONF=true
-	else
-		export MOVED_METALOG_CONF=false
-	fi
-}
-
-pkg_postinst() {
-	if ${MOVED_METALOG_CONF} ; then
-		ewarn "The default metalog.conf file has been moved"
-		ewarn "from /etc/metalog/metalog.conf to just"
-		ewarn "/etc/metalog.conf.  If you had a standard"
-		ewarn "setup, the file has been moved for you."
-	fi
-}
diff --git a/app-admin/metalog/metalog-3-r2.ebuild b/app-admin/metalog/metalog-3-r2.ebuild
index bec325dcdb05..4988c910ee2e 100644
--- a/app-admin/metalog/metalog-3-r2.ebuild
+++ b/app-admin/metalog/metalog-3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="unicode"
 
 RDEPEND=">=dev-libs/libpcre-3.4"