Install compat symlinks as some rdeps need them, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 14 insertions, 256 deletions

diff --git a/sys-boot/plymouth/ChangeLog b/sys-boot/plymouth/ChangeLog
index a13cfcd516c2..7a1b30c27a50 100644
--- a/sys-boot/plymouth/ChangeLog
+++ b/sys-boot/plymouth/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/plymouth
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.39 2013/10/12 11:21:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.40 2013/10/13 12:27:11 pacho Exp $
+
+*plymouth-0.8.8-r3 (13 Oct 2013)
+
+  13 Oct 2013; Pacho Ramos <pacho@gentoo.org> +plymouth-0.8.8-r3.ebuild,
+  -plymouth-0.8.3-r5.ebuild, -plymouth-0.8.4.ebuild, -plymouth-0.8.8-r2.ebuild,
+  -plymouth-0.8.8.ebuild:
+  Install compat symlinks as some rdeps need them, drop old
 
   12 Oct 2013; Pacho Ramos <pacho@gentoo.org> plymouth-0.8.8-r2.ebuild:
   Fix install with static-libs (#487756 by Andrius Štikonas)
diff --git a/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild b/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
deleted file mode 100644
index d86da7542cb2..000000000000
--- a/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild,v 1.5 2012/05/03 04:50:13 jdhore Exp $
-
-EAPI="3"
-
-inherit autotools-utils
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
-SRC_URI="http://cgit.freedesktop.org/${PN}/snapshot/${P}.tar.bz2
-	http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png
-	"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_nouveau video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +openrc +pango static-libs"
-
-COMMON_DEPEND=">=media-libs/libpng-1.2.16
-	>=x11-libs/gtk+-2.12:2
-	pango? ( >=x11-libs/pango-1.21 )
-	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
-	video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] )
-	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-	"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-kernel/dracut-008-r1[dracut_modules_plymouth]
-	openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
-	"
-
-DOCS=(AUTHORS ChangeLog NEWS README TODO)
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-drm-reduce-minimum-build-requirements.patch
-	"${FILESDIR}"/${PV}-image-replace-deprecated-libpng-function.patch
-	"${FILESDIR}"/${PV}-gentoo-fb-path.patch
-	)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localstatedir=/var
-		$(use_enable debug tracing)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		$(use_enable video_cards_intel libdrm_intel)
-		$(use_enable video_cards_nouveau libdrm_nouveau)
-		$(use_enable video_cards_radeon libdrm_radeon)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.a \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.a files failed'
-		gen_usr_ldscript libply.so libply-splash-core.so
-	else
-		local la
-		for la in "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la}; do
-			einfo "Removing left ${la#${D}}"
-			rm "${la}" || die "rm '${la}'"
-		done
-	fi
-
-	insinto /usr/share/plymouth
-	newins "${DISTDIR}"/gentoo-logo.png bizcom.png || die 'branding failed'
-}
-
-pkg_postinst() {
-	elog "Follow instructions on"
-	elog ""
-	elog "  http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml"
-	elog ""
-	elog "to set up Plymouth."
-}
diff --git a/sys-boot/plymouth/plymouth-0.8.4.ebuild b/sys-boot/plymouth/plymouth-0.8.4.ebuild
deleted file mode 100644
index f7c606bba470..000000000000
--- a/sys-boot/plymouth/plymouth-0.8.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.4.ebuild,v 1.8 2013/02/02 23:11:45 ago Exp $
-
-EAPI=4
-
-inherit autotools-utils
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
-SRC_URI="
-	http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2
-	http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_nouveau video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +libkms +openrc +pango static-libs"
-
-CDEPEND=">=media-libs/libpng-1.2.16
-	>=x11-libs/gtk+-2.12:2
-	libkms? ( x11-libs/libdrm[libkms] )
-	pango? ( >=x11-libs/pango-1.21 )
-	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
-	video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] )
-	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	"
-RDEPEND="${CDEPEND}
-	>=sys-kernel/dracut-008-r1[dracut_modules_plymouth]
-	openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
-	"
-
-DOCS=(AUTHORS README TODO)
-
-src_prepare() {
-	autotools-utils_src_prepare
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-system-root-install
-		--localstatedir=/var
-		$(use_enable debug tracing)
-		$(use_enable libkms)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		$(use_enable video_cards_intel libdrm_intel)
-		$(use_enable video_cards_nouveau libdrm_nouveau)
-		$(use_enable video_cards_radeon libdrm_radeon)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.a \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.a files failed'
-		gen_usr_ldscript libply.so libply-splash-core.so
-	else
-		local la
-		for la in "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la}; do
-			einfo "Removing left ${la#${D}}"
-			rm "${la}" || die "rm '${la}'"
-		done
-	fi
-
-	insinto /usr/share/plymouth
-	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
-}
-
-pkg_postinst() {
-	elog "Follow instructions on"
-	elog ""
-	elog "  http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml"
-	elog ""
-	elog "to set up Plymouth."
-}
diff --git a/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r3.ebuild
index 2ae4f26963fa..d1ae2a26ef4e 100644
--- a/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild
+++ b/sys-boot/plymouth/plymouth-0.8.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.8-r2.ebuild,v 1.2 2013/10/12 11:21:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.8-r3.ebuild,v 1.1 2013/10/13 12:27:11 pacho Exp $
 
 EAPI=5
 
@@ -74,6 +74,11 @@ 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
 }
 
diff --git a/sys-boot/plymouth/plymouth-0.8.8.ebuild b/sys-boot/plymouth/plymouth-0.8.8.ebuild
deleted file mode 100644
index 6b5c150de6be..000000000000
--- a/sys-boot/plymouth/plymouth-0.8.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.8.ebuild,v 1.1 2013/03/10 19:41:38 maksbotan Exp $
-
-EAPI=4
-
-inherit autotools-utils systemd toolchain-funcs
-
-DESCRIPTION="Graphical boot animation (splash) and logger"
-HOMEPAGE="http://cgit.freedesktop.org/plymouth/"
-SRC_URI="
-	http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2
-	http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE_VIDEO_CARDS="video_cards_intel video_cards_nouveau video_cards_radeon"
-IUSE="${IUSE_VIDEO_CARDS} debug gdm +gtk +libkms +openrc +pango static-libs systemd"
-
-CDEPEND=">=media-libs/libpng-1.2.16
-	gtk? ( dev-libs/glib
-	>=x11-libs/gtk+-2.12:2 )
-	libkms? ( x11-libs/libdrm[libkms] )
-	pango? ( >=x11-libs/pango-1.21 )
-	video_cards_intel? ( x11-libs/libdrm[video_cards_intel] )
-	video_cards_nouveau? ( x11-libs/libdrm[video_cards_nouveau] )
-	video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] )
-	"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	"
-RDEPEND="${CDEPEND}
-	>=sys-kernel/dracut-008-r1[dracut_modules_plymouth]
-	openrc? ( sys-boot/plymouth-openrc-plugin !sys-apps/systemd )
-	"
-
-DOCS=(AUTHORS README TODO)
-
-src_prepare() {
-	sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \
-		systemd-units/systemd-ask-password-plymouth.service.in || die \
-		'sed bin failed'
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-system-root-install
-		--localstatedir=/var
-		$(use_enable debug tracing)
-		$(use_enable gtk gtk)
-		$(use_enable libkms)
-		$(use_enable pango)
-		$(use_enable gdm gdm-transition)
-		$(use_enable video_cards_intel libdrm_intel)
-		$(use_enable video_cards_nouveau libdrm_nouveau)
-		$(use_enable video_cards_radeon libdrm_radeon)
-		$(use_enable systemd systemd-integration)
-		)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.a \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.a files failed'
-		gen_usr_ldscript libply.so libply-splash-core.so
-	fi
-
-	insinto /usr/share/plymouth
-	newins "${DISTDIR}"/gentoo-logo.png bizcom.png
-}
-
-pkg_postinst() {
-	elog "Follow instructions on"
-	elog ""
-	elog "  http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml"
-	elog ""
-	elog "to set up Plymouth."
-}