Put logo_config in FILESDIR. Die more often. Move ./configure to src_configure().

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

4 files changed, 28 insertions, 18 deletions

diff --git a/app-misc/linux-logo/ChangeLog b/app-misc/linux-logo/ChangeLog
index d2faab8f4ba6..03c0b3083bc4 100644
--- a/app-misc/linux-logo/ChangeLog
+++ b/app-misc/linux-logo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/linux-logo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.75 2011/06/24 06:21:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.76 2011/06/24 16:29:24 jer Exp $
+
+  24 Jun 2011; Jeroen Roovers <jer@gentoo.org> linux-logo-5.11.ebuild,
+  +files/logo_config:
+  Put logo_config in FILESDIR. Die more often. Move ./configure to
+  src_configure().
 
   24 Jun 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Maintain.
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index c4dcec1e1365..aa8b80deeb45 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -6,6 +6,7 @@ AUX gentoo2.logo 1640 RMD160 3797e98df403337ff805786bd15be13421558bc2 SHA1 d2356
 AUX linux-logo.conf 1213 RMD160 8df7fea63cb0e2531d638783d9513595216711a5 SHA1 62b13288453078ad56cc03e437b70fff3224fa23 SHA256 054ebe197d7f6c34c0e6245b1e9113384d6da16654c04ad8a8da3ed6b50ced4f
 AUX linux-logo.initscript 449 RMD160 4b0f6aa66075e257a068b0ff467eed7e25b6aa0a SHA1 ca42ff6331c632d41b4211fb6c70becc9fe2a0b4 SHA256 73ae9e7fe5136786f3a6d7826c3f99a5790964f7c720daf99ad1f19bcf8990e6
 AUX linux_logo-5.10-makefile-tabs.patch 628 RMD160 4121c401bbfbdd43ae726d7373499a45306e7fda SHA1 0835fd74bd668387f018f90d71b3b3446455f071 SHA256 c16dd460f745228611a4058b2b26f07fbb6244b22e32b33f43438bac0221d1f5
+AUX logo_config 186 RMD160 eab4aae06dd8610fb40cb1a40e58acfa000542f0 SHA1 e09a0da87c288f1df658761571b7bdc77eec2e02 SHA256 0c082f43528263e32350a632da7d35ba257ec7bb6e948545c06cd97963eefe12
 DIST linux_logo-5.02.tar.gz 97279 RMD160 ff1ff3b7576e9873778d21d9bb8d19b14604b693 SHA1 36ebc75d11851e73f0776f64051e22763a023d8c SHA256 9932ab41b32a270f590890d515119456671814bdd6e4f4481a276cdfb5494690
 DIST linux_logo-5.03.tar.gz 96562 RMD160 d11e23faf90a46a9ba85f418934f27fa493ed508 SHA1 b254b2d2fe803c90f4a0f662d2eba3f68717fbfe SHA256 654818fda72162322d86203303335d4293d68b25149a464f99ca9390ae4fd0b8
 DIST linux_logo-5.04.tar.gz 97082 RMD160 fbb897faefc9e166b9c13b6529295b59af1e7f80 SHA1 6cb795044f101414b1ab462efc9a015e329fa4d1 SHA256 49bfbe9fbec959cb8cade395e0af5e20249d9e9c49c4bbb2f3ca0da476a4143a
@@ -20,13 +21,13 @@ EBUILD linux-logo-5.06.ebuild 2079 RMD160 04f1a3ee36e8d1e1afa1c966e09595ed3779c6
 EBUILD linux-logo-5.07.ebuild 2079 RMD160 64824c1763d19053f5f46ab0072ecbec5e882673 SHA1 8d3d20e43bbf9063c9bf65b4fa8824291885fb34 SHA256 f0c6d7601ea508e332388c1e0b4677dec524acdc73ebe978e107639c6b612150
 EBUILD linux-logo-5.10-r1.ebuild 2188 RMD160 ec99a4137f3636d19e75a825ee9d4dfb49deab63 SHA1 c481ad6d2cd5160166b1d85c00a08691a56b156e SHA256 301ffb363cd70ebd322716c93318948461ad7556eb6407c56609f2535bb74e1e
 EBUILD linux-logo-5.10.ebuild 2079 RMD160 de2862194d2fbe685b01d424564c5c1c01644272 SHA1 3124e2be0e0db2110c22675566309b564d9a2998 SHA256 f594d157bd3b71f1fc6edb7d283ca82550d8c5a290e8f31b3ff9311bddb23a38
-EBUILD linux-logo-5.11.ebuild 2087 RMD160 e42887d7587b345c55e0c9db8f5562d5726ac1f0 SHA1 145319bf7515f68895efdf813b8321e726c6422b SHA256 c31c90fd3d33b31c4272b484e77e7bf40ebc33fe03dc9081614d3578c538e576
-MISC ChangeLog 10512 RMD160 b142fdb13c0363ab3a640458b50424324472562f SHA1 b91ce5659bf117ab1b61cc1e6bc2933eebf14501 SHA256 2192b58fd1c345410458202627f942dfa58de44ae53ed38794c5b779dfa73e61
+EBUILD linux-logo-5.11.ebuild 1869 RMD160 c54174db41498ea95ced5b6e5ad68e21f12c9d7d SHA1 48ba8bb45769bca94a6443dbc1ad72e215292285 SHA256 c972e49ea06a6bfafc46ec5c233b9c845384b561a4f6c38587568a0a1550eae3
+MISC ChangeLog 10692 RMD160 613119231dc05e27b56ed32295188c8f3fdc17b1 SHA1 896857ee0505ff7ee3d51ff02f4dd73ebb32099d SHA256 fd3fde35dbced1d7a0977746713d3f80197568c76612a5a5e83fc0af9b50974a
 MISC metadata.xml 218 RMD160 c2c1aaf73a5a791f0704f4fdd05dff6eeedf0e51 SHA1 c15badaf06994183185a26139ce9ea79d5989b9e SHA256 e215ea143f2521cd28fd145124579dd976b13a003040bae02581614240de9a95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4ELOsACgkQVWmRsqeSphPKZQCeKMFMbNkVu2piPwAiw+l9r/XA
-fr4An3Rs9ursrL2IOFk/66VPlgwGiRzM
-=Tas6
+iEYEARECAAYFAk4Eu2oACgkQVWmRsqeSphPZMACeP8aw9dnre+3elnPIpchf6Vu6
+U2oAn24Q3uqvxksSoijO7aLbA3fvNa+R
+=tDip
 -----END PGP SIGNATURE-----
diff --git a/app-misc/linux-logo/files/logo_config b/app-misc/linux-logo/files/logo_config
new file mode 100644
index 000000000000..36839d23b3c1
--- /dev/null
+++ b/app-misc/linux-logo/files/logo_config
@@ -0,0 +1,7 @@
+./logos/gentoo.logo
+./logos/gentoo2.logo
+./logos/banner-simplified.logo
+./logos/banner.logo
+./logos/classic-no_periods.logo
+./logos/classic-no_periods_or_chars.logo
+./logos/classic.logo
diff --git a/app-misc/linux-logo/linux-logo-5.11.ebuild b/app-misc/linux-logo/linux-logo-5.11.ebuild
index 9ef830eafa12..9fe50bbeaa69 100644
--- a/app-misc/linux-logo/linux-logo-5.11.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11.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/app-misc/linux-logo/linux-logo-5.11.ebuild,v 1.1 2011/06/24 06:20:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.11.ebuild,v 1.2 2011/06/24 16:29:24 jer Exp $
 
 EAPI="4"
 
@@ -22,19 +22,16 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	echo "./logos/gentoo.logo" >> logo_config
-	echo "./logos/gentoo2.logo" >> logo_config
-	echo "./logos/banner-simplified.logo" >> logo_config
-	echo "./logos/banner.logo" >> logo_config
-	echo "./logos/classic-no_periods.logo" >> logo_config
-	echo "./logos/classic-no_periods_or_chars.logo" >> logo_config
-	echo "./logos/classic.logo" >> logo_config
-	cp "${FILESDIR}"/gentoo{,2}.logo "${S}"/logos/
+	cp "${FILESDIR}"/logo_config "${S}"/ || die
+	cp "${FILESDIR}"/gentoo{,2}.logo "${S}"/logos/ || die
 	echo "NAME gentoo" >> "${S}"/logos/gentoo.logo
 }
 
-src_compile() {
+src_configure() {
+	# Not an autotools based configure script
 	ARCH="" ./configure --prefix="${D}"/usr || die
+}
+src_compile() {
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
 }
 
@@ -43,8 +40,8 @@ src_install() {
 
 	dodoc BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ
 
-	cp "${FILESDIR}"/${PN}.conf "${WORKDIR}"
-	sed -i -e 's/-L 4 -f -u/-f -u/' "${WORKDIR}"/${PN}.conf
+	cp "${FILESDIR}"/${PN}.conf "${WORKDIR}" || die
+	sed -i -e 's/-L 4 -f -u/-f -u/' "${WORKDIR}"/${PN}.conf || die
 
 	newinitd "${FILESDIR}"/${PN}.initscript ${PN}
 	newconfd "${WORKDIR}"/${PN}.conf ${PN}