gentoo resync : 02.06.2018

5 files changed, 4 insertions, 99 deletions

diff --git a/sys-process/minit/Manifest b/sys-process/minit/Manifest
index aed1e95c729c..324f4efaa5fc 100644
--- a/sys-process/minit/Manifest
+++ b/sys-process/minit/Manifest
@@ -1,8 +1,4 @@
-AUX 0.9.1-destdir.patch 622 BLAKE2B 7272237f8bc03cd7a19fac768ab69d12521f7b1537798993e47f04a361429dce996cde27b11996fd42c4584dfb2b3c4ec84cda7210972a78082d61a3ae3e4e9f SHA512 decff61697cbce5ffad4dff34141182c585b5b367cc31f1983cfe816b5a22a2f35454e1dc997443b4f79c597d6029cbf3c1d23ec830af5fabd7abedcd2be89c0
 AUX minit-0.10-fixes.diff 1916 BLAKE2B 4c277a5f25838533074515edf5b11244ad94350ebb5dce0bfef66ba7c022f5d68e54e568da851c610c2da832cfec6b0a1d53d990b5e9725b4b7b5bcdfbcfdea6 SHA512 dca96b6a5c6dba7d72f0df32a2d615aee7ffd9f640a20fa67b4fcd9a0f56e991033196e91090fd78c2ba1c38d013a4ca4b0a74e7ddc39f488354a8aafb281b00
 DIST minit-0.10.tar.bz2 26119 BLAKE2B 3520cb53192df3da87f2cd40247623a1c1c77cd728890aa7ee24804729429d955abe430e9f90e6786a5c4f8dc733aae8ea17f7488ef0650bb4ece356c2033713 SHA512 9c617ca9f3638a430ae8347ec4b3dc36c5b23c703f11c4d445c9abebb2e7cb2460424f5ed71112bb21e862818a45338926bc4de3d0ed8b2e99f7d296ca37479c
-DIST minit-0.9.1.tar.bz2 21894 BLAKE2B f9ec822a80f67ed575937d8fc69cb842077864185a489780233a924c4b63be708faa9a57a411390ad14c0e0c51436dc0c8fd8da036d87b0d0ec9037addb8c74b SHA512 896ed2eb163c63daebea50e1edc8ce4de02dce619d5bc5bf08f76dc19df82c1fdeee1e8dc0f89f5662ea5975436bdfcb4690f367b89bcb92f7a5f8328c03cfb1
-EBUILD minit-0.10-r1.ebuild 927 BLAKE2B 1f99056e08e96cbe3001c975873d169d6c212d91e36250c410ba9ecd1bedda089dfb7657183198d1a6d54a626d1d53ad829b3ca03bde217744127eedbeba97cb SHA512 a6ab53764eded985db3d889b008edc54b4780ce206802469ec6dbc70c012149e37350d35c03af53c55b5d13ebad6d8ba5a2582024123a7e973ebce26f811fad4
-EBUILD minit-0.10.ebuild 959 BLAKE2B 398dcf95f9efb5a9f8fbf97a5c406bd82136118ca4aba76511f40405ebd055eb7fcda387184481bf3c418a2b9654816add71cea0fcca4e448dc9a63b2ccd69e0 SHA512 6c4d884ecebe1bf367d9fdc7f439adb9fd6e9fbdefcd0bb75594260831b04e3d832652631262aaffb41308a125a124f4e3c6f7b15912a044fb44b88b938d2a7c
-EBUILD minit-0.9.1.ebuild 572 BLAKE2B 1ec853c19a5a3f745aa46e9e921a677952c5c9d413a04eee69799c89b8b6945fc32966be2d862aa53a39923089c6c85915a3433878318be59c0ec9247ea5d0a7 SHA512 61d26777c79aff39d44829b4c601918db2bf67887999378879af992ed76239663e65984c10a50cf074619d29dc05976d3948e29667a5163e50ffdea3383280ce
+EBUILD minit-0.10-r1.ebuild 934 BLAKE2B 74adeb15a44dacca463e7f4c8436e5eadaa61325a23c30b96f180c517386c11e1f5a810cb6d1fb292513b214571781d017f65ce6c531edfabddbd55e42367ff8 SHA512 4dd5afc99b797057101d108949de43a7002fea17b0a653212273b970d362d26d4fd1309d26a3040950184e27c0e038db4e4827b12c3b0b289a00e7c742661ccf
 MISC metadata.xml 1237 BLAKE2B 2da4c9ab4f1627e17f1f580ed4402fe1524605ba15e30028bcbf2dc82faaccf0837518adc0ca08f21b0a7c732e4ed4937d719f61408e676e82b178e65d6b8356 SHA512 c219e5b11f7fa3dd1eaed9570722ec050c93f4b372ac35f11b031a96a8ea3740a64f885e87fe6547e9a4f66f899b4ccbbfa6c0787ca6ff835925c94b9eb3326b
diff --git a/sys-process/minit/files/0.9.1-destdir.patch b/sys-process/minit/files/0.9.1-destdir.patch
deleted file mode 100644
index 7a36d3cdfde7..000000000000
--- a/sys-process/minit/files/0.9.1-destdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.orig	2004-03-04 03:08:18.967017104 -0500
-+++ Makefile	2004-03-04 03:10:11.445917712 -0500
-@@ -36,10 +36,12 @@
- 	$(DIET) $(CROSS)$(CC) $(CFLAGS) -o $@ $^
- 
- install-files:
-+	test -d $(DESTDIR)/sbin || mkdir -p $(DESTDIR)/sbin
- 	install minit pidfilehack $(DESTDIR)/sbin
- 	install write_proc hard-reboot $(DESTDIR)/sbin
-+	test -d $(DESTDIR)/bin || mkdir -p $(DESTDIR)/bin
- 	install msvc $(DESTDIR)/bin
--	test -d $(DESTDIR)/etc/minit || mkdir $(DESTDIR)/etc/minit
-+	test -d $(DESTDIR)/etc/minit || mkdir -p $(DESTDIR)/etc/minit
- 
- install-fifos:
- 	-mkfifo -m 600 $(DESTDIR)/etc/minit/in $(DESTDIR)/etc/minit/out
diff --git a/sys-process/minit/minit-0.10-r1.ebuild b/sys-process/minit/minit-0.10-r1.ebuild
index b5e5a674cca0..38f8edebd305 100644
--- a/sys-process/minit/minit-0.10-r1.ebuild
+++ b/sys-process/minit/minit-0.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit toolchain-funcs
 
 DESCRIPTION="a small yet feature-complete init"
 HOMEPAGE="http://www.fefe.de/minit/"
@@ -11,7 +11,7 @@ SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	dev-libs/libowfat
diff --git a/sys-process/minit/minit-0.10.ebuild b/sys-process/minit/minit-0.10.ebuild
deleted file mode 100644
index bc449452106c..000000000000
--- a/sys-process/minit/minit-0.10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="a small yet feature-complete init"
-HOMEPAGE="http://www.fefe.de/minit/"
-SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libowfat-0.28-r1
-		dev-libs/dietlibc"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}"/minit-0.10-fixes.diff
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS} -I/usr/include/libowfat" \
-		LDFLAGS="${LDFLAGS}" DIET="diet" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	emake install-files DESTDIR="${D}" || die
-	mv "${D}"/sbin/shutdown "${D}"/sbin/minit-shutdown || die
-	mv "${D}"/sbin/killall5 "${D}"/sbin/minit-killall5 || die
-	rm "${D}"/sbin/init || die
-	dodoc CHANGES README TODO
-}
-
-pkg_postinst() {
-	[ -e /etc/minit/in ] || mkfifo "${ROOT}"/etc/minit/in
-	[ -e /etc/minit/out ] || mkfifo "${ROOT}"/etc/minit/out
-}
diff --git a/sys-process/minit/minit-0.9.1.ebuild b/sys-process/minit/minit-0.9.1.ebuild
deleted file mode 100644
index dc5b61d80951..000000000000
--- a/sys-process/minit/minit-0.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="a small yet feature-complete init"
-HOMEPAGE="http://www.fefe.de/minit/"
-SRC_URI="http://www.fefe.de/minit/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PV}-destdir.patch
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" DIET="" || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc CHANGES README TODO
-}