sys-boot/plymouth: Fixes bug #387561.

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

Package-Manager: portage-2.1.10.27/cvs/Linux x86_64

6 files changed, 51 insertions, 37 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/Manifest b/sys-boot/plymouth/Manifest
index 20b25d06aed6..82af98936d33 100644
--- a/sys-boot/plymouth/Manifest
+++ b/sys-boot/plymouth/Manifest
@@ -10,20 +10,20 @@ DIST gentoo-logo.png 14501 RMD160 e4f33be3f763537242bcd47ea9e145e919152213 SHA1
 DIST plymouth-0.8.3.tar.bz2 763575 RMD160 bb5c13e4eb48d8b881a4d2cc15190c377430f672 SHA1 30135d3b2db42778b32b6d2d9e7e0da90f0da599 SHA256 2e51abbc087228f7910302334755d0190fc9e923eae9992150adb0f6cccc9077
 DIST plymouth-0.9_pre20111013.tar.bz2 817483 RMD160 0ebe65c68dd17fe34a3318e16ade60ce9b6ecc5d SHA1 c73725ca573abac46af99c115aa3c41e365d124a SHA256 b4247fc0cbaa04a1e250f8bbcf32a16c4d12073d7f55813745489c39aba5cda5
 DIST plymouth-openrc-plugin-0.1.1.tar.bz2 8581 RMD160 64c300ea9a34b84ac13bdd3b55758fa0094493c1 SHA1 c6b103e13503b705a1314fb07c6bc45851a598e5 SHA256 5c176703b61bd4406955ee104c478359dc8849ed7f8fca59da138232e3e1e24c
-EBUILD plymouth-0.8.3-r2.ebuild 2750 RMD160 72f0698f4a74f4cd25947e11b6077046c5ed546d SHA1 fba1e9b2f1c4675b920d3e7db21ef2ff7f55ea37 SHA256 da01c6dc5817f65ef5b779d9bb3e82c45b4aab2219b9cc6802fb94ab42c93ecb
-EBUILD plymouth-0.8.3-r4.ebuild 3284 RMD160 8e63f196e3b3c8272ae44a23048f4ee7df44f40d SHA1 2379e92fd712c3117f88033dd3fed5ce28e75de0 SHA256 e95c8d10652fe449752a65570d420fa84e27ae84b0d90ee3e612a216dddbbb20
-EBUILD plymouth-0.8.3-r5.ebuild 2407 RMD160 24345de401f8839fe0c7f38becaf0d7d4869466b SHA1 296819df941528b7bc5dc1aa007e1d5f2ac3dfdf SHA256 74e0590d9491cacd5300f6d7c080defd8295b2b99d0f7cad1be562dfa85209ed
-EBUILD plymouth-0.9_pre20111013.ebuild 2273 RMD160 5eff48aba00f8570d02fd3eae2e471ad5c703753 SHA1 9017f261b166b0a608beaf1c7eb584e9c918b11d SHA256 0917fd180e6ecbc6d9faec88df5bd5df664b1a49da4e857af3ca28f5c6248d26
-MISC ChangeLog 4368 RMD160 0f6e4a4c382a1fcf06f686901eb6c19de36f95f3 SHA1 0bccebeea6233e6c4dfb60d0a49df36fcf61b316 SHA256 35a2fd334d8ee46f6ce228cf3a2fbf523206ddbc11427a3cd7de4374b2075df5
+EBUILD plymouth-0.8.3-r2.ebuild 2765 RMD160 906056b3e1abccbfa63326ca603e8011a6cc7d2d SHA1 162867bcfe1c2852b27f8ff11ec310e56e95db42 SHA256 c16d951d664d397f76246ab392aa2d52420ba6ea8b1c1b046d825c16e47621e5
+EBUILD plymouth-0.8.3-r4.ebuild 3299 RMD160 a88a912c562e7fd97d63fda62bf7eb4676fc0f9f SHA1 70c8e41688e0500d3a84614579a4cd75d74b6e53 SHA256 fe5bfbb04125ed77f1d515ac5fcc12300917766e13f62afa40f8e44315f6c559
+EBUILD plymouth-0.8.3-r5.ebuild 2422 RMD160 acd6d004e118bf0471feead549150ec5c93b3641 SHA1 51b7ed57f02fdeb18bddbf592fb7f62a93d8c21f SHA256 1d62b52f73333656a068ccec7d577ecfc40a47d32c94cce4e7992e8a3872db3e
+EBUILD plymouth-0.9_pre20111013.ebuild 2288 RMD160 f4b83f6ab4a90e67018b7abc3ea90fd85bf871ba SHA1 7dd7d14a5c6f58cbef181f5092782442abec4679 SHA256 974d995a56b09cece456a7323de9e44526fa54bf6c19d3fbabc83d2cc94ccc46
+MISC ChangeLog 4652 RMD160 4e3d5071d7bd88e8b15914cb3bf06eb1787711ea SHA1 32f1ee999f47c18d6b00691efa28b7d6d220b082 SHA256 b0ac5ad09d37c5e445616b1345d1c269d7e2ee366e1ac6fb3d6167fed560e00a
 MISC metadata.xml 1084 RMD160 0f9195c2fe72b820567c3bdcc887dc21bd9cdada SHA1 898ac516f4eee7131124552dbe349cc554017296 SHA256 a328ea1080deda78f60aa9167876ced93f4df92dc6781020947b4c10d6a86578
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOnU2jAAoJEPATRTHh2/q1d9wH+QEzoZFAOLLptmy5y308y/S7
-xewwO1mtoE3Bqr3U46xJ8CNFCZiITWneWV9Wjo5h08RlNpA8J/QHaTka85eL3LGe
-eyB59N07avn8ZWbzxvIhZouKm70aRPz3/XNH9WeVJ1OjvUq8abSn+Zf0ywbzgdjk
-kNA1dKwAeGUmfsymF471ts9LbiylWab9CZjyYedsvfovGDqnoby0yPj4AzsUaZzJ
-4eVQhGGxt7HQSTrtXpJPI1D3uNcyJhZHqS+uUGRLjmztbB6idAYWd+37AKYQkTTC
-cGAeO4MaR1AlhO0mhPrh1jFU14ZEdj4UoIrXX/xEouTZeaUu+Ww2sxnFhPtQqvg=
-=ii70
+iQEcBAEBAgAGBQJOnb13AAoJEPATRTHh2/q1Nm8IAJL2QkwbQHaYV4Db7hFlDW3t
+256MIOULcLrtm9zyxml+ckXN/x9CWy4CoEbHuq8zh6I5NPTXZfZ73EOh7V2xQp+D
+BTzWrDU1CFozYZFt8WSFrhCjsd61N5EU+ILBHPyO92Anpp4Hi/RC7Y48OlLQmEIo
+eh5rETVOU5D1zlh7KioSgesdajTMPE8OxtiT19vCl1ehkGeYqteoXFqy3h3ssIm3
+Oe4vrrIaj0degj/4s01KcblKePUKeFY5rWEfdUq9Yr1SQt6kcXal1plU6ud0NPzT
+vMH4L8HhxUPCadk6Jyg+4SU23FLYMBHJNFNMfxIdLO5q95hFMbDs1dGAUTKSfjg=
+=uB/0
 -----END PGP SIGNATURE-----
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