gentoo resync : 30.12.2017

5 files changed, 53 insertions, 32 deletions

diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
index a8cf54b3e4a5..a838a396afc6 100644
--- a/app-admin/sysrqd/Manifest
+++ b/app-admin/sysrqd/Manifest
@@ -1,5 +1,6 @@
-AUX sysrqd-config.patch 494 BLAKE2B 6fe771456c36e434341186c07df7317afbd086efe7a57e53bb019581f38d8e04babe864c8707b37c7c5c7a164c43197c93d0b6bf59e58936d99f18e71d825763 SHA512 5dc0d43e571a8d75c61914846edb87437b81c5bb467a5a16fa927a82d5b42d40b45e3a1cfcf98165a417cd175192207ed8a5d23f39f1c5844d9b589c7eae2337
+AUX sysrqd-14-fix-build-system.patch 615 BLAKE2B 25de1ca0a421ab37737613533fb68819a6f611271b44c7381963476e01ab62a204bf61a1bf5a61100d1199601d7db8f7010cdd1207eeb50dff9768f34b7028fe SHA512 2ecb26c68a4a7382af1c09d81b71544e9621c0425fcd7577be1e4b929b808989d223d128affb0107724423624f3bf550327c92cb9c56676d45f49707ee7d1321
+AUX sysrqd-config.patch 421 BLAKE2B 9cc04c7c31c39f1015b95aaf5c695a2221b65d2c471506b9f3e836fec43585e7e21d7fa7a01c4cdd7815f9c1ebb10800ca1cfccabd397223eb6b3f700f8cd54d SHA512 5dd351220cbb10a09d6c6f0bae07a37fc678988467a8a1cff2075217a82eb4bbfc6f2155b47b71159e3442f8d25bbff539a3e2a61f91829d6dae7820e647fca8
 AUX sysrqd.init 700 BLAKE2B 2570aeb1b01d098bd8330a9e78c85708013d3ee09318f84a1e5f088ffc2a32077cf6e18bc3413106724d7fe024bea9720f6f20c5a28a5fb5a775a219ed7c95e4 SHA512 9845a09cfa20ee9cd09e61e142cf53aaf482909ce3ec1401743864823a7bd45ced812fb235eef2adb914c3c624e227fa5936b73e1b83d8a3888fb25498980918
 DIST sysrqd-14.tar.gz 4759 BLAKE2B 3ef8b2f5092a899753da487d0a82a71d2d93d0c6a70689b5923fa900f2766de15fa2e416cb667d800dac19499218a0246941b8c52bfe4421af774ccecc62222e SHA512 efad48be3974923ec14d0958e788115c9273bc29b4f03853e6e087f6af872299ea57d42f885be19ff4eeaffa577ecf1c53ea2adb2f84e1487bb2511597b89cb2
-EBUILD sysrqd-14.ebuild 1445 BLAKE2B 591e1d250557bcca641dd741e36215c08c0b6f2b3f585e9cbdece3caf53c97727a5b46fd82e41be894baf602ef08f3ae623112090081a5df41ebf212cbd97b65 SHA512 e9f5bfec1305270a52e179516d8060d6c220b2eff281232253a37317173a51ff60c04e857361d36495537775bf21330e4d6be2dfbf2a6c349193d1b6f1ca7c1e
-MISC metadata.xml 531 BLAKE2B 86c0d187a5b5898a509e528ea3829a5eaa7a3c40fa812866ed0089c4f226978d08eefa488219024aa685c0b0059aad7e668ec504d39a756c9563c3d44d0e6041 SHA512 38c2de89d5f31d94e4756e76a3b2cba02c4907d84b2fb7d977ce5ae1b322ea92a096449dc5de5a85d4b6175e0e9a7529c01ef90e4eaf9396fcdeecde48aac7dd
+EBUILD sysrqd-14.ebuild 1395 BLAKE2B 4368fe901f94f14e010dfa5e8f4648f13dd93727a521e9db49398cc2704482a1d62e633a8acf5a4633b1903224d5c99357a08cfe25118aea695fc9297d06c1ab SHA512 11080e964bfa37504a653432ea99910ac469c969859f5301ee86b7f80db4a5bd147af3da5b8cf6119473959de2110195978d9d00c3589f8f61d12f4845cc32ae
+MISC metadata.xml 496 BLAKE2B 9da66d775bffc6860de235edd1fd5c2c26c6fc2c42b244ce21f662fa59c1c2b08b775cd2a67fd7c96b418a93882776da142b825c5adbfdcb7733f4cbd83cafcf SHA512 f5a4047c8630f430d87d34685a12d3e72409d1fe0f69973f882143988a0d2955b48ed27e6a2d172413da8ff3ace899b8e6b7f749a72259b92ff7ade719c49ebc
diff --git a/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch
new file mode 100644
index 000000000000..2668c3c0c491
--- /dev/null
+++ b/app-admin/sysrqd/files/sysrqd-14-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -5,15 +5,15 @@
+         -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare \
+         -Wunused -Winit-self -Wpointer-arith -Wredundant-decls \
+         -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn \
+-        -std=gnu99 -pipe -DSYSRQD_VERSION="\"$(VERSION)\"" -O3
++        -std=gnu99
++CPPFLAGS += -DSYSRQD_VERSION="\"$(VERSION)\""
+ 
+ SBINDIR=$(DESTDIR)/usr/sbin
+ #MANDIR=$(DESTDIR)/usr/share/man/man1
+ INSTALL = install
+ #MAN=sysrqd.1
+ 
+-$(BIN): $(O)
+-	$(CC) $(LDFLAGS) -o $(BIN) $(O)
++all: $(BIN)
+ 
+ install: $(BIN)
+ 	$(INSTALL) -d -m 755 $(SBINDIR)
diff --git a/app-admin/sysrqd/files/sysrqd-config.patch b/app-admin/sysrqd/files/sysrqd-config.patch
index ce463814d1e3..56c6afb60804 100644
--- a/app-admin/sysrqd/files/sysrqd-config.patch
+++ b/app-admin/sysrqd/files/sysrqd-config.patch
@@ -1,5 +1,5 @@
---- sysrqd.c.orig	2009-11-05 14:58:21.644471772 +0100
-+++ sysrqd.c	2009-11-05 14:58:43.276472005 +0100
+--- a/sysrqd.c
++++ b/sysrqd.c
 @@ -40,8 +40,8 @@
  #define BIND_MAX_LEN 16
  #define PROMPT "sysrq> "
diff --git a/app-admin/sysrqd/metadata.xml b/app-admin/sysrqd/metadata.xml
index b86ebd13ff32..97a6a018180f 100644
--- a/app-admin/sysrqd/metadata.xml
+++ b/app-admin/sysrqd/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>wschlich@gentoo.org</email>
-	<name>Wolfram Schlich</name>
-	<description>Primary maintainer</description>
-</maintainer>
-<longdescription>
-sysrqd is a small daemon intended to manage Linux Sysrq over network.
-Its philosophy is to be very responsive under heavy load and try to
-be somehow reliable. Authentication is made by clear password.
-</longdescription>
+	<maintainer type="person">
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+	</maintainer>
+	<longdescription>
+		sysrqd is a small daemon intended to manage Linux Sysrq over network.
+		Its philosophy is to be very responsive under heavy load and try to
+		be somehow reliable. Authentication is made by clear password.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild
index 3475122a5807..249bbce77e12 100644
--- a/app-admin/sysrqd/sysrqd-14.ebuild
+++ b/app-admin/sysrqd/sysrqd-14.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils toolchain-funcs
+EAPI=6
+
+inherit toolchain-funcs
 
-IUSE=""
 DESCRIPTION="daemon providing access to the kernel sysrq functions via network"
 HOMEPAGE="http://julien.danjou.info/projects/sysrqd"
 #SRC_URI="http://julien.danjou.info/${PN}/${P}.tar.gz"
 SRC_URI="https://dev.gentoo.org/~wschlich/src/${CATEGORY}/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-config.patch"
-}
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-config.patch
+	"${FILESDIR}"/${PN}-14-fix-build-system.patch
+)
 
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o sysrqd sysrqd.c
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
@@ -31,8 +31,8 @@ src_install() {
 	local bindip='127.0.0.1' secret
 	declare -i secret
 	let secret=${RANDOM}*${RANDOM}*${RANDOM}*${RANDOM}
-	echo ${bindip} > sysrqd.bind
-	echo ${secret} > sysrqd.secret
+	echo ${bindip} > sysrqd.bind || die
+	echo ${secret} > sysrqd.secret || die
 
 	diropts -m 0700 -o root -g root
 	dodir /etc/sysrqd
@@ -41,7 +41,7 @@ src_install() {
 	doins sysrqd.bind
 	doins sysrqd.secret
 
-	dodoc README ChangeLog
+	einstalldocs
 }
 
 pkg_postinst() {