sys-boot/plymouth: Fixes bug #387561.

Made changes according to the ones in libtool files handling in autotools-utils
eclass.

(Portage version: 2.1.10.27/cvs/Linux x86_64)

5 files changed, 39 insertions, 25 deletions

diff --git a/sys-boot/plymouth/ChangeLog b/sys-boot/plymouth/ChangeLog
index 0a28074abef3..bb7ca5fe989f 100644
--- a/sys-boot/plymouth/ChangeLog
+++ b/sys-boot/plymouth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/plymouth
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.15 2011/10/18 09:57:50 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/ChangeLog,v 1.16 2011/10/18 17:54:55 aidecoe Exp $
+
+  18 Oct 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  plymouth-0.8.3-r2.ebuild, plymouth-0.8.3-r4.ebuild, plymouth-0.8.3-r5.ebuild,
+  plymouth-0.9_pre20111013.ebuild:
+  Fixes bug #387561. Made changes according to the ones in libtool files
+  handling in autotools-utils eclass.
 
 *plymouth-0.9_pre20111013 (18 Oct 2011)
 
diff --git a/sys-boot/plymouth/plymouth-0.8.3-r2.ebuild b/sys-boot/plymouth/plymouth-0.8.3-r2.ebuild
index b9f686c81e64..ecb35d444fcf 100644
--- a/sys-boot/plymouth/plymouth-0.8.3-r2.ebuild
+++ b/sys-boot/plymouth/plymouth-0.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r2.ebuild,v 1.2 2011/06/28 21:51:11 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.3-r2.ebuild,v 1.3 2011/10/18 17:54:55 aidecoe Exp $
 
 EAPI="3"
 
@@ -60,13 +60,15 @@ src_install() {
 	autotools-utils_src_install
 
 	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.{a,la} \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.{a,la} files failed'
+		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
-		einfo "Removing /usr/$(get_libdir)/plymouth/*.la"
-		rm "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la} \
-			|| die 'rm *.la'
+		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
 
 	newinitd "${FILESDIR}"/plymouth.initd plymouth || die 'initd failed'
diff --git a/sys-boot/plymouth/plymouth-0.8.3-r4.ebuild b/sys-boot/plymouth/plymouth-0.8.3-r4.ebuild
index 5450268712e1..2b52128492de 100644
--- a/sys-boot/plymouth/plymouth-0.8.3-r4.ebuild
+++ b/sys-boot/plymouth/plymouth-0.8.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r4.ebuild,v 1.2 2011/06/28 21:51:11 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.3-r4.ebuild,v 1.3 2011/10/18 17:54:55 aidecoe Exp $
 
 EAPI="3"
 
@@ -75,13 +75,15 @@ src_install() {
 	autotools-utils_src_install
 
 	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.{a,la} \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.{a,la} files failed'
+		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
-		einfo "Removing /usr/$(get_libdir)/plymouth/*.la"
-		rm "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la} \
-			|| die 'rm *.la'
+		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
 
 	if use branding ; then
diff --git a/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild b/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
index 7bf3c4af0b74..16e41f2c2295 100644
--- a/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
+++ b/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.1 2011/07/03 10:06:14 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.8.3-r5.ebuild,v 1.2 2011/10/18 17:54:55 aidecoe Exp $
 
 EAPI="3"
 
@@ -62,13 +62,15 @@ src_install() {
 	autotools-utils_src_install
 
 	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.{a,la} \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.{a,la} files failed'
+		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
-		einfo "Removing /usr/$(get_libdir)/plymouth/*.la"
-		rm "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la} \
-			|| die 'rm *.la'
+		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
diff --git a/sys-boot/plymouth/plymouth-0.9_pre20111013.ebuild b/sys-boot/plymouth/plymouth-0.9_pre20111013.ebuild
index a6ae170936bc..015e0b26b0b4 100644
--- a/sys-boot/plymouth/plymouth-0.9_pre20111013.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9_pre20111013.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.9_pre20111013.ebuild,v 1.1 2011/10/18 09:57:50 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/plymouth/plymouth-0.9_pre20111013.ebuild,v 1.2 2011/10/18 17:54:55 aidecoe Exp $
 
 EAPI=4
 
@@ -60,13 +60,15 @@ src_install() {
 	autotools-utils_src_install
 
 	if use static-libs; then
-		mv "${D}/$(get_libdir)"/libply{,-splash-core}.{a,la} \
-			"${D}/usr/$(get_libdir)"/ || die 'mv *.{a,la} files failed'
+		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
-		einfo "Removing /usr/$(get_libdir)/plymouth/*.la"
-		rm "${D}/usr/$(get_libdir)"/plymouth/{*.la,renderers/*.la} \
-			|| die 'rm *.la'
+		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