Fix fperms invocation (#494886 by Zhang Hongjiu), drop old.

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

3 files changed, 11 insertions, 38 deletions

diff --git a/media-gfx/splash-themes-gentoo/ChangeLog b/media-gfx/splash-themes-gentoo/ChangeLog
index ec8974d9c229..950fda85708f 100644
--- a/media-gfx/splash-themes-gentoo/ChangeLog
+++ b/media-gfx/splash-themes-gentoo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/splash-themes-gentoo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/ChangeLog,v 1.30 2013/10/13 14:34:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/ChangeLog,v 1.31 2013/12/22 11:18:08 pacho Exp $
+
+  22 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  -splash-themes-gentoo-20101212.ebuild,
+  splash-themes-gentoo-20101212-r2.ebuild:
+  Fix fperms invocation (#494886 by Zhang Hongjiu), drop old.
 
 *splash-themes-gentoo-20101212-r2 (13 Oct 2013)
 
diff --git a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.ebuild b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.ebuild
index 1e10721ab4a7..c22b919d197e 100644
--- a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.ebuild
+++ b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.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/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.ebuild,v 1.1 2013/10/13 14:34:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212-r2.ebuild,v 1.2 2013/12/22 11:18:08 pacho Exp $
 
 EAPI="5"
 
@@ -32,7 +32,10 @@ src_install() {
 	doins -r *
 
 	# They need to be executable, bug #470100
-	fperms +x /etc/splash/emerge-world/scripts/*
+	fperms +x /etc/splash/emerge-world/scripts/svc_started-pre
+	fperms +x /etc/splash/emerge-world/scripts/svc_start-pre
+	fperms +x /etc/splash/emerge-world/scripts/svc_stopped-pre
+	fperms +x /etc/splash/emerge-world/scripts/svc_stop-pre
 }
 
 pkg_postinst() {
diff --git a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212.ebuild b/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212.ebuild
deleted file mode 100644
index 0ebe8b5e43db..000000000000
--- a/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-gentoo/splash-themes-gentoo-20101212.ebuild,v 1.5 2013/09/28 09:27:06 pinkbyte Exp $
-
-EAPI="2"
-
-DESCRIPTION="A collection of Gentoo themes for splashutils."
-HOMEPAGE="http://dev.gentoo.org/~spock/"
-SRC_URI="mirror://gentoo/fbsplash-theme-emergence-r2.tar.bz2
-	 mirror://gentoo/fbsplash-theme-gentoo-r2.tar.bz2
-	 mirror://gentoo/fbsplash-theme-emerge-world-1.0.tar.bz2
-	 http://fbsplash.berlios.de/themes/repo/natural_gentoo-9.0-r2.tar.bz2"
-IUSE=""
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-RDEPEND=">=media-gfx/splashutils-1.1.9.5[png]"
-DEPEND="${RDEPEND}"
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	sed -i -e 's/natural-gentoo/natural_gentoo/g' "${WORKDIR}"/natural_gentoo/*.cfg
-}
-
-src_install() {
-	dodir /etc/splash/{emergence,gentoo,natural_gentoo,emerge-world}
-	cp -pR "${WORKDIR}"/{emergence,gentoo,natural_gentoo,emerge-world} "${D}/etc/splash"
-}
-
-pkg_postinst() {
-	elog "The upstream tarball for the 'Natural Gentoo' theme also contains a GRUB"
-	elog "splash image which is not installed by this ebuild.  See:"
-	elog "  http://www.kde-look.org/content/show.php?content=49074"
-	elog "if you are interested in this."
-}