gentoo resync : 13.06.2020

5 files changed, 46 insertions, 65 deletions

diff --git a/sys-boot/plymouth-openrc-plugin/Manifest b/sys-boot/plymouth-openrc-plugin/Manifest
index 10c975ec51a6..72056c6eaaac 100644
--- a/sys-boot/plymouth-openrc-plugin/Manifest
+++ b/sys-boot/plymouth-openrc-plugin/Manifest
@@ -1,4 +1,3 @@
-AUX plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch 1196 BLAKE2B f12b3a58933f8f25270cdd4a2bd1e38d189677742c199cf32aee56453abff8be9fb3a9ea9aa455444b43fa4fed948e27ccb57887f6306d20c323e776513577ee SHA512 d80932c69531959cbf16bce750d7fcddefba814d61a027568949bc9fd5fbc067eb5572930c2b0d049f204cfce9cf06171f39cc1813adcedda80007425a42297b
-DIST plymouth-openrc-plugin-0.1.2.tar.bz2 8909 BLAKE2B 0ddebeb0d957cea672eca2faa4c4f12d348e38bf5e5d2947585bdc12c0f9188920a2359a88b2ada5c7872400c12fb224aca24e78ec2ac6bc7fba9bcdd2a0c5bc SHA512 a6c578dcdcc770cf55cf150fbf67e99ef4fac08db17fd8a84ec5f76f96172aa4cb071a0ee695a6d6fe6883e5117c95b096ba5ce8260d71bea33a26909719457d
-EBUILD plymouth-openrc-plugin-0.1.2-r1.ebuild 902 BLAKE2B df73a4cac67f9a3829c6d23853cb048783d616e6692c6b1544f28ba550859153d3bf519ca33204bdadde458a24132e4eb02bbfab7abc9c9dda7befe6c1a73932 SHA512 792c1da4b8c4a404ca48af361ae16156cf6bf1c8504f5450d80024d7369a95648e707ae3f275734875f5136caa4097fac2563a2f83ffe26afd427ae77e0a8c9c
-MISC metadata.xml 262 BLAKE2B 849c4c384f3097e482f6d5b3e3e0f75704a87fed9091b3d96627238e8c79dd702a6dd90071ee73f0401d1c4981be853d9d6b18b30603e284ad97639e91bf4541 SHA512 062bc7259e7fdd86c288426f96c43713cdbbb9f39a32a314385131e99a2bdd36700925898d516bdfbbfa87475106ef9fee3ac1c41209a4cdb510e6ee8de74e7c
+DIST plymouth-openrc-plugin-0.1.3.tar.gz 9404 BLAKE2B 809cfab881ef47565badfc330b77ae07a8bbbddf822cbdb50f2d1d2a0c95f915ac5024e02400ab2ea9d8f98dc466a8a3cbad92805587f77a00e58c9f9d78d388 SHA512 b07a4d9d56c8f49d5b0a91799fe0100eac705cd2a266674539948fdc661876474a93d8ed5f329f097a1fc5dc571f3b3c00322191fb77d2a7e32b1ff192ca0a6b
+EBUILD plymouth-openrc-plugin-0.1.3.ebuild 747 BLAKE2B 8e572b805ec906c17ef5640b44ec7a518d447f5db15995206f59cf170bb6f61ef1f2517c2ebee6b7b223e63492b934394bbe4c10e2b04f053c51e1047a7d000d SHA512 57c074f4e83ad7866bbd6f971b9866d072fc1f948238cfd377dc2ee397e811aceea32c9145d34743888e3e59f4416746b0dd3b6dfd51c4556e4b382a8120e8af
+MISC metadata.xml 572 BLAKE2B 7862ed5b0127297bd18885d61ffedd913b4c1baa065db2360dd22051c99a3d788c3c645c01219898ff3ceb78f3af324211af538d4ae33c6e7b63a3c52534278b SHA512 4ad96493abcebf578888dce532d28dad483a0b0836cca97cc2c62aaf8c93656e38286ba93684cf4e792880f7dc9a94f94e40b937da8d37f6ab932ff9801d76d4
diff --git a/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch b/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
deleted file mode 100644
index 7dc5feb2fc1f..000000000000
--- a/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9d3485d73244eea61205c4c84b2c37d489d5bbcb Mon Sep 17 00:00:00 2001
-From: tlhonmey <lperkins@zagmail.gonzaga.edu>
-Date: Wed, 31 Jan 2018 11:10:48 -0800
-Subject: [PATCH] Exit plymouth when we hit mount-ro rather than localmount.
-
-Newer versions of openrc appear to run localmount almost immediately upon shutdown, causing the plugin to send Plymouth the quit command before the splash is even displayed, resulting in no splash on shutdown.
-
-The job that cuts us off from writing to /var is now mount-ro, which runs near the end like it should and gives Plymouth time to show the splash.
----
- plymouth.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plymouth.c b/plymouth.c
-index e657e82..e9c925b 100644
---- a/plymouth.c
-+++ b/plymouth.c
-@@ -240,7 +240,7 @@ int rc_plugin_hook(RC_HOOK hook, const char *name)
- 
-     case RC_HOOK_SERVICE_STOP_IN:
-         /* Quit Plymouth when we're going to lost write access to /var/... */
--        if(strcmp(name, "localmount") == 0 &&
-+        if(strcmp(name, "mount-ro") == 0 &&
-                 strcmp(runlevel, RC_LEVEL_SHUTDOWN) == 0) {
-             DBG("ply_quit(PLY_MODE_SHUTDOWN)");
-             if(!ply_quit(PLY_MODE_SHUTDOWN))
diff --git a/sys-boot/plymouth-openrc-plugin/metadata.xml b/sys-boot/plymouth-openrc-plugin/metadata.xml
index c6a8cf3f96bb..abb6f67a40e5 100644
--- a/sys-boot/plymouth-openrc-plugin/metadata.xml
+++ b/sys-boot/plymouth-openrc-plugin/metadata.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>Kangie@footclan.ninja</email>
+		<name>Matt Jolly</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">aidecoe/plymouth-openrc-plugin</remote-id>
+		<maintainer status="active">
+			<email>Kagnie@footclan.ninja</email>
+			<name>Matt Jolly</name>
+		</maintainer>
+		<remote-id type="github">Kangie/plymouth-openrc-plugin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild
deleted file mode 100644
index a073ee75df03..000000000000
--- a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Plymouth plugin for OpenRC"
-HOMEPAGE="https://github.com/aidecoe/plymouth-openrc-plugin"
-SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/openrc:="
-RDEPEND="${DEPEND}
-	sys-boot/plymouth"
-
-PATCHES=( "${FILESDIR}/${P}-exit-at-mount-ro.patch" )
-
-src_install() {
-	insinto /$(get_libdir)/rc/plugins
-	doins plymouth.so
-}
-
-pkg_postinst() {
-	ewarn "You need to disable 'rc_interactive' feature in /etc/rc.conf to make"
-	ewarn "Plymouth work properly with OpenRC init system."
-
-	if has_version sys-apps/systemd; then
-		eerror "sys-apps/systemd is installed, please uninstall this package if you"
-		eerror "are booting with systemd"
-	fi
-}
diff --git a/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.3.ebuild b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.3.ebuild
new file mode 100644
index 000000000000..cbcd73c52a0c
--- /dev/null
+++ b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Plymouth plugin for OpenRC"
+HOMEPAGE="https://github.com/Kangie/plymouth-openrc-plugin"
+SRC_URI="https://github.com/Kangie/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/openrc"
+RDEPEND="${DEPEND}
+	sys-boot/plymouth
+	!sys-apps/systemd"
+
+src_install() {
+	insinto /$(get_libdir)/rc/plugins
+	doins plymouth.so
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		ewarn "You need to disable 'rc_interactive' feature in /etc/rc.conf to make"
+		ewarn "Plymouth work properly with OpenRC init system."
+	fi
+}