gentoo resync : 18.11.2018

9 files changed, 92 insertions, 121 deletions

diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 4e4359ef2684..9e41e54af277 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/plymouth-openrc-plugin/Manifest b/sys-boot/plymouth-openrc-plugin/Manifest
index 069b6d3fab64..e505ebd11baf 100644
--- a/sys-boot/plymouth-openrc-plugin/Manifest
+++ b/sys-boot/plymouth-openrc-plugin/Manifest
@@ -1,3 +1,5 @@
+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
 EBUILD plymouth-openrc-plugin-0.1.2.ebuild 1108 BLAKE2B d2fadb66d4b4aef2b31a1d38ed75401a0ae0ff8427f72135e86abc69e4657ca93cda4d8e30e0ea0243249b6ca629305fbfe3b737db36159c23499398659dd6e5 SHA512 f8acf79f24c102d45ef0d2a65070100b750187b4b2c2114c65981628e3b6ef9671555394ce8559c4d1bf868cc93407405ac826259cb06bf7bc19d2c0ba167b0c
 MISC metadata.xml 262 BLAKE2B 849c4c384f3097e482f6d5b3e3e0f75704a87fed9091b3d96627238e8c79dd702a6dd90071ee73f0401d1c4981be853d9d6b18b30603e284ad97639e91bf4541 SHA512 062bc7259e7fdd86c288426f96c43713cdbbb9f39a32a314385131e99a2bdd36700925898d516bdfbbfa87475106ef9fee3ac1c41209a4cdb510e6ee8de74e7c
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
new file mode 100644
index 000000000000..7dc5feb2fc1f
--- /dev/null
+++ b/sys-boot/plymouth-openrc-plugin/files/plymouth-openrc-plugin-0.1.2-exit-at-mount-ro.patch
@@ -0,0 +1,25 @@
+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/plymouth-openrc-plugin-0.1.2-r1.ebuild b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..a073ee75df03
--- /dev/null
+++ b/sys-boot/plymouth-openrc-plugin/plymouth-openrc-plugin-0.1.2-r1.ebuild
@@ -0,0 +1,34 @@
+# 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/Manifest b/sys-boot/plymouth/Manifest
index 3837c44a1866..6abbba382366 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -1,11 +1,10 @@
 AUX 0.9.2-systemdsystemunitdir.patch 798 BLAKE2B eea3db4b75669ebf2a743dc5d39d2a8c7b65130165f47400a907adae6631ebf88424612ed1093728545f2c7da89b8bc1a4e9ae0d9d56c27a22ad6322aa863bb4 SHA512 5855dfdbd2031b2b0c91991261eda01f310f55ef5526d6a29ae77ae7a6fa1d9431201f05db4cc0ae9f2f4b31575c19316e36a8d4fd9596505fbe0d8d8b847ac7
 AUX 0.9.3-glibc-sysmacros.patch 1170 BLAKE2B cf3b927b3a53c419bcee9fc652346fc8e5858911134a654c7ce0c6f7d1928c91edb9c829b35b10a3107f3427712f697184dd1b66d8395bdb98712a854adb4276 SHA512 82f40cd6ee78904e3ca2ed594c923a11c1a6015e56bfafebf035c25287e2c1708b87901c5b68c04aecf4d1891124d58ab6b3c84ba0e12c5bd5d69dea24bc49d5
 DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c
-DIST plymouth-0.9.2.tar.bz2 1231336 BLAKE2B 2e565b0bb23dbab19bc164756165ca85793df3fe0e2df0c9aa2aa7e827f19f7b531951f2b7a302368e8b86829555754cc8cb67606291a80242b0a23a023643c7 SHA512 89356eb8326504fbf3155de262ce15de0847f0a0e6d157d873cf1dea9af464a6cb9e11d7143ee9a595b217a2487060b5835eba5ac142c3cd6d66689deb272e60
 DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed
-EBUILD plymouth-0.9.2-r1.ebuild 2494 BLAKE2B e0f1711a6fdfc2096eab5f90f4c85c16031d0505ed3fa114388645b8f0a2781dc15f77f9c7bac2be66e3c0a193a4a0e1797a60bfe7b31b702c50a11194135933 SHA512 4413aec2441e4466eaf308f352264abd9147c3eba073affe7b9e7ba84f97169f6be605f64e73c28b83b664699c981349c345576b855274cee9942f490d644435
+DIST plymouth-0.9.4.tar.xz 1103496 BLAKE2B abad2cefb89e9d17b77113396d7203090544759b3dd7f73f67153d9f126db28e5366d36aa11e2335566bf4046bebd50d8d9dd47c75634446fb3a0314cd458925 SHA512 83eb2de7e6d0980e9f7fa4e0b0f20c46a8238051d84bc38dbbb5dfa438e41c1a39846dcd652374256d9f1fe79967b154a3576cd9c433ef816b6c962be2d31e93
 EBUILD plymouth-0.9.3-r1.ebuild 2585 BLAKE2B d67507b56f0c864ce51d649d3a2a577aeb6b7a7688814045aea01e329cefd1899cc37ba019ee5ebce4db3011855df7146c61767fd37a8e5c2bed661609d55855 SHA512 291db5b95322b27a4798347b6e86c674f87a88380b72052f93c3f1a0fd1f35e3bfacf36fce2d3f67be0d5b8731307e6a387f05275622d26fb4ff4f07ccfa6a7b
 EBUILD plymouth-0.9.3-r2.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
-EBUILD plymouth-0.9.3.ebuild 2473 BLAKE2B b490f8947be293aee67da6bb517d38393896d9a8afc391574f91fd1d3cd2b7c48a6479f5ea8081e795bc63728ae4b84004ddd59c04d56700e6b6d2649f8118d5 SHA512 5a92e14027c37c1f98061d92da74896f3955b41b6e2c76853ba3b1ddd7e8579267faadf06272156491e70ade5380c08382f2a5407e050b137586557386758997
-EBUILD plymouth-9999.ebuild 2686 BLAKE2B 4991ce88676c102ff2bd5062a5d59184e9bb53b5db22dda2f22c5138627663a2f1c107af549de7abcc935be0d19e2b15a56234a15315f3deb1464c6a1ecda9f5 SHA512 8232ace285011d537cd876df0cd343deb42ba1924811ad808cdb39b1ef3d5e8caaac70c0b91859d909e3306ab3a5e6296b84b13413028e136c6eea8f13da4608
-MISC metadata.xml 1154 BLAKE2B c2110cccc02da18e101a516922a8e6e7fafb5087d482490f2b06213bb08a473916d3c9c5cc9b676914f1ab598237f0aa971f8a996d89be3f5088a3f4b45ede4b SHA512 aa809296ffaf68e481a09ae75c1500bf01e7474dca0990cdb66182881d5bff269aa19c60a022e37157330a52c5319410061f0209cc08128828981a46f7dc1b4a
+EBUILD plymouth-0.9.4-r1.ebuild 2733 BLAKE2B cc4448f42a7070bf6b2c97a9db679b69072a38abd600b93c4e01281cc55d9bb0fdc4302e7243aa83c450de21c08f09e288fd558ba6b0a9fd7dced8f1ad89571d SHA512 f438a632db17609504ae2090d81228ab02d79319ab9786491d7a83f56ed10b2e6042e97a92cb36373972af936561a8b9135e4c3ae118d9a7533265991634866f
+EBUILD plymouth-9999.ebuild 2691 BLAKE2B a09eb144e11469b0af81e094dad79fcf2a50522ab26d24286dbf2ee22e70c216b071437304d2eb3dbac8dea72e22621f7adc74769d918410357aa772bf65d32d SHA512 68812de9973b89cdc93ef7015a812c24250dc9a2524d63d043eab121bc86a1d25ee9c404230435508f531d6cdfdfdd19ca46c0dea2872b2306c4b61f3b08a768
+MISC metadata.xml 1247 BLAKE2B 6ebdb42e799d0abe9470a6f7a885d4c01130e4ad2e3498b3a6dc244460639ba15ae398408804ee939d93b0971178478925414dcd145cdde9a763aed2cdde0cb1 SHA512 c51276f71d8d7142fd69426c6622913c8d67dbcbbc3d0eec7fe1f0d6f0b6ac06cc48154c2e6512dff441682fe3df942162d499dae9258c0855d9b7183a54cd6a
diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml
index 22a2251fe995..be90aeb9a72a 100644
--- a/sys-boot/plymouth/metadata.xml
+++ b/sys-boot/plymouth/metadata.xml
@@ -15,6 +15,8 @@
 			nouveau and vmwgfx at this moment)</flag>
 		<flag name="pango">Adds support for printing text on splash screen and
 			text prompts, e.g. for password</flag>
+		<flag name="split-usr">Enable this if /bin and /usr/bin are separate
+			directories</flag>
 	</use>
 	<longdescription lang="en">
 		Plymouth is an application that runs very early in the boot process
diff --git a/sys-boot/plymouth/plymouth-0.9.2-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.2-r1.ebuild
deleted file mode 100644
index e0c922e5449d..000000000000
--- a/sys-boot/plymouth/plymouth-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SRC_URI="
-	https://dev.gentoo.org/~aidecoe/distfiles/sys-boot/plymouth/gentoo-logo.png"
-
-AUTOTOOLS_AUTORECONF="1"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
-	inherit git-r3
-else
-	SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2"
-fi
-
-inherit autotools-utils readme.gentoo systemd toolchain-funcs
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="debug gdm +gtk +libkms +pango static-libs"
-
-CDEPEND="
-	>=media-libs/libpng-1.2.16:=
-	gtk? (
-		dev-libs/glib:2
-		>=x11-libs/gtk+-3.14:3
-		x11-libs/cairo )
-	libkms? ( x11-libs/libdrm[libkms] )
-	pango? ( >=x11-libs/pango-1.21 )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-# Block due bug #383067
-RDEPEND="${CDEPEND}
-	virtual/udev
-	!<sys-kernel/dracut-0.37-r3
-"
-
-DOC_CONTENTS="
-	Follow the following instructions to set up Plymouth:\n
-	https://wiki.gentoo.org/wiki/Plymouth#Configuration
-"
-
-PATCHES=(
-	"${FILESDIR}/0.9.2-systemdsystemunitdir.patch"
-)
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-system-root-install=no
-		--localstatedir=/var
-		--without-rhgb-compat-link
-		--enable-systemd-integration
-		"$(systemd_with_unitdir)"
-		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms drm)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	insinto /usr/share/plymouth
-	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
-
-	# Install compatibility symlinks as some rdeps hardcode the paths
-	dosym /usr/bin/plymouth /bin/plymouth
-	dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
-	dosym /usr/sbin/plymouthd /sbin/plymouthd
-
-	readme.gentoo_create_doc
-
-	# looks like make install create /var/run/plymouth
-	# this is not needed for systemd, same should hold for openrc
-	# so remove
-	rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
-		ewarn "If you want initramfs builder with plymouth support, please emerge"
-		ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]."
-	fi
-}
diff --git a/sys-boot/plymouth/plymouth-0.9.3.ebuild b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
index 75326f75a379..cab004479b73 100644
--- a/sys-boot/plymouth/plymouth-0.9.3.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.4-r1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+inherit flag-o-matic
 SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
 
 if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth"
 	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/plymouth"
 else
 	SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit autotools readme.gentoo-r1 systemd toolchain-funcs
@@ -19,20 +21,22 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
 
 LICENSE="GPL-2"
 SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gdm +gtk +libkms +pango static-libs"
+IUSE="debug gdm +gtk +libkms +pango +split-usr static-libs"
 
 CDEPEND="
 	>=media-libs/libpng-1.2.16:=
 	gtk? (
 		dev-libs/glib:2
 		>=x11-libs/gtk+-3.14:3
-		x11-libs/cairo )
+		x11-libs/cairo
+	)
 	libkms? ( x11-libs/libdrm[libkms] )
 	pango? ( >=x11-libs/pango-1.21 )
 "
 DEPEND="${CDEPEND}
+	elibc_musl? ( sys-libs/rpmatch-standalone )
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
 	virtual/pkgconfig
 "
 # Block due bug #383067
@@ -47,9 +51,11 @@ DOC_CONTENTS="
 "
 
 PATCHES=(
+	"${FILESDIR}"/0.9.3-glibc-sysmacros.patch
 )
 
 src_prepare() {
+	use elibc_musl && append-ldflags -lrpmatch
 	default
 	eautoreconf
 }
@@ -59,6 +65,7 @@ src_configure() {
 		--with-system-root-install=no
 		--localstatedir=/var
 		--without-rhgb-compat-link
+		--enable-documentation
 		--enable-systemd-integration
 		--with-systemdunitdir="$(systemd_get_systemunitdir)"
 		$(use_enable !static-libs shared)
@@ -78,10 +85,12 @@ src_install() {
 	insinto /usr/share/plymouth
 	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
 
-	# Install compatibility symlinks as some rdeps hardcode the paths
-	dosym /usr/bin/plymouth /bin/plymouth
-	dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
-	dosym /usr/sbin/plymouthd /sbin/plymouthd
+	if use split-usr ; then
+		# Install compatibility symlinks as some rdeps hardcode the paths
+		dosym ../usr/bin/plymouth /bin/plymouth
+		dosym ../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
+		dosym ../usr/sbin/plymouthd /sbin/plymouthd
+	fi
 
 	readme.gentoo_create_doc
 
diff --git a/sys-boot/plymouth/plymouth-9999.ebuild b/sys-boot/plymouth/plymouth-9999.ebuild
index 5ffedf306a90..f10bd9023672 100644
--- a/sys-boot/plymouth/plymouth-9999.ebuild
+++ b/sys-boot/plymouth/plymouth-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
@@ -86,9 +86,9 @@ src_install() {
 	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
 
 	# Install compatibility symlinks as some rdeps hardcode the paths
-	dosym /usr/bin/plymouth /bin/plymouth
-	dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
-	dosym /usr/sbin/plymouthd /sbin/plymouthd
+	dosym ../usr/bin/plymouth /bin/plymouth
+	dosym ..../usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
+	dosym ../usr/sbin/plymouthd /sbin/plymouthd
 
 	readme.gentoo_create_doc