app-misc/linux-logo: Updated maintainer info. Revision bump. Drop old versions.

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

10 files changed, 120 insertions, 292 deletions

diff --git a/app-misc/linux-logo/ChangeLog b/app-misc/linux-logo/ChangeLog
index 03c0b3083bc4..aeafb543aa05 100644
--- a/app-misc/linux-logo/ChangeLog
+++ b/app-misc/linux-logo/ChangeLog
@@ -1,6 +1,17 @@
 # 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.76 2011/06/24 16:29:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.77 2011/06/29 14:11:37 c1pher Exp $
+
+*linux-logo-5.11-r1 (29 Jun 2011)
+
+  29 Jun 2011; Dane Smith <c1pher@gentoo.org> -linux-logo-5.04.ebuild,
+  -linux-logo-5.06.ebuild, -linux-logo-5.07.ebuild, -linux-logo-5.10.ebuild,
+  -linux-logo-5.11.ebuild, +linux-logo-5.11-r1.ebuild,
+  +files/linux-logo-5.11.conf, +files/linux-logo.init.d, metadata.xml:
+  Updated metadata to reflect new Maintainer/Proxy.
+  Removed old versions.
+  Added 5.11-r1. Uses new init script. Numerous cleanups. Moved to
+  EAPI4.
 
   24 Jun 2011; Jeroen Roovers <jer@gentoo.org> linux-logo-5.11.ebuild,
   +files/logo_config:
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index aa8b80deeb45..a6240133e7a2 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -1,33 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gentoo.logo 4732 RMD160 6321307167d956732cbfb6d52faf5f1252ffeef1 SHA1 250f09cf603d07c16ce5010d341c2c7329287286 SHA256 86ee09ee715d10e987274d3887dd5bfe6992bb4b08fbe4538b4eb4829f87c55f
 AUX gentoo2.logo 1640 RMD160 3797e98df403337ff805786bd15be13421558bc2 SHA1 d23566479591aaab49a8eaefedb603eec4642193 SHA256 2f9cda11a31e93873b424b5499437ffa3c3ae9e348f440e9ac14972c15df7850
+AUX linux-logo-5.11.conf 1208 RMD160 6d0034e0f7e5c03c90fded659792dbc727026559 SHA1 89c08d2da501621111a1a954a2eef5173f2ce973 SHA256 9e1a782268af67b63d7f176c1440ee2856f2f40e5bf2cddacd4373214f5b436b
 AUX linux-logo.conf 1213 RMD160 8df7fea63cb0e2531d638783d9513595216711a5 SHA1 62b13288453078ad56cc03e437b70fff3224fa23 SHA256 054ebe197d7f6c34c0e6245b1e9113384d6da16654c04ad8a8da3ed6b50ced4f
+AUX linux-logo.init.d 937 RMD160 648c6bdaed2fc99ffc187ee1e7d2d44ddbd45011 SHA1 138d24369936e640ac12b6076ffce1593c240722 SHA256 c81e4e063c87fdd74a10c4fdd1fb60112911a94f9ddb1688ebf03cc88a2b8dc1
 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
-DIST linux_logo-5.06.tar.gz 99041 RMD160 8674837842c08547de60816ff1dea9c5d9df5333 SHA1 53c0149fa2f8264af8484e24e6c4634ac9f87046 SHA256 777f4c6ed3fceeb2c90d503580f6e1655700f8b32a033e53a60b9e72890bd842
-DIST linux_logo-5.07.tar.gz 100426 RMD160 4ea7a0cb72a268e1ee79ee96416cd58f3def7cf5 SHA1 cd101d6070479d88f7d39c3451315ca2ba1b31f6 SHA256 0425a6bec0fee6913214a5479843e293cc8ae3726f4a05bbf0e9eb375eebca27
 DIST linux_logo-5.10.tar.gz 103589 RMD160 dbcf6dcbe64ebc16c4d8dd5b5bbc98d71a15fcfc SHA1 0ba27d563b938fd802e424c8c116e1ea3c19aab4 SHA256 e7028d5a01a5964e4d1420d38bb35f758381e92775d4b53ad3e55c2cc04646e0
 DIST linux_logo-5.11.tar.gz 103623 RMD160 eca9467b5fe6a59bc9341de3d6e85c7f78d1a4ba SHA1 bd22808f165574cb3bc98c579aa48c0acab65f39 SHA256 f56634d7b6bebd6598705d973997435fdc9cb9115dea3cc1d63398c92ebe72d9
 EBUILD linux-logo-5.02.ebuild 2089 RMD160 fd8d6e21cb1190ad203f3107f70139c35f7f2b0c SHA1 d48e4153053fac4a4efd2927c9cd5bface70a594 SHA256 13523582f351027c7f868b6dbe14a0bb1e6452d5efdf99fae46854eaf6681a53
 EBUILD linux-logo-5.03.ebuild 2066 RMD160 4f776a0a401ce42f2586c9fcf66b5498551cae49 SHA1 b6ac6c98f32aa766300a3510a61ff968a53f0fc1 SHA256 8f9fa81c85643ca41a1c2d6e8eed10f0246417b4981d402162ed9c614694cda2
-EBUILD linux-logo-5.04.ebuild 2071 RMD160 40ca9898197657fc786774b66cb0572d8017d847 SHA1 e91c98065e03b87ca875241506cb9e16bafca44b SHA256 deb23fb6147d2077344dc08822cf383dd366817334cfd615ce377b56a39703a5
-EBUILD linux-logo-5.06.ebuild 2079 RMD160 04f1a3ee36e8d1e1afa1c966e09595ed3779c6d0 SHA1 33f079cc81fa632f458ea0b71c77db0aa59e896a SHA256 4dab191e3d83246201214557f7511cc25fc215bb84c53e9726b8543420b360cf
-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 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
+EBUILD linux-logo-5.11-r1.ebuild 2074 RMD160 b640484c2d632f67ade513e928c7025690a990ef SHA1 a6e7fe38548bfada270997e1a7640d78a065c9c6 SHA256 38a240ed6c50d53b4a6252577fa3763007ae059c6599df38ef8e84c193815d93
+MISC ChangeLog 11157 RMD160 10d598d329141b6652ca0ec7b00f4a9d599bf897 SHA1 6d7fe21ff4b829b44661ab42dbee3d4a6cc7257b SHA256 63d3e6f83909086e9207e2e71122fa8d9e940608d2762919eecc728cfda4ac69
+MISC metadata.xml 391 RMD160 df3341f20087a1ebb0dbdf0154ace8e30bca2a6d SHA1 5f140f5a6e971bef7bdaa94c88c6389810c72252 SHA256 2551f9a0641fafb946ad9ca233c4c34997fc163841e36b389387f48747342b1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4Eu2oACgkQVWmRsqeSphPZMACeP8aw9dnre+3elnPIpchf6Vu6
-U2oAn24Q3uqvxksSoijO7aLbA3fvNa+R
-=tDip
+iQIcBAEBCAAGBQJOCzFXAAoJEEsurZwMLhUxEI0P/A6YLinnQramh+uCgqfQsBp8
+eaOqRiEfC8S8jHcHXNoXFB8FI66LjydG4IM8e1uJYtfHV/RlfAw4wmW4uMz4bGAy
+XUKODOctwcE01GUcfqcIybb7Q/rsbUjwWBMmWq/G5z6tx95+3QQRbHAuqjfeTIUy
+jmFITmkcTX5VJK5cKH38qtUhZWsDkFK7Lf6xN5vZ5iRI/QzxAVqviNHDRTlurZNW
+U3ZKaE1GEOYgZmUS1iK0N0KrDvF+D8U2cW5PslWQ0agnnFjXarOQ7yzTRBqc96gP
+5bvALro+8qXZrBfvRUjzqtV7PYte5Gnovo2NLxDWC/pwPz/XoDJc43JurwnyJ8pP
+S9uG/k/zekWv3a2SDHfyaBi+4g+EIROWw6lIJ7EgyI3CysRUMuwurYCsHGqGGBLW
+zh0SkgUc00syWzt48h1uzMakDKpq7EvwHi8cn3DSwxTPjN99usC1By6LcS3M6/Fz
+8sKCIJaLjqCSB5LnAOBJEgCQwMiI2L4MS4OTrE5NmRk78rPKq9WDgxr3UbDkfHq8
+RW7qA2ZfND48u6M0MKwiAXV6zqrJUaxsY+k/4gq6y8IIu6X6CKNdiRrHtmaWuQ3o
+d1roGhNnD0J2BpodoJafCC7XMAJ8Np2ra1aQnrJVgB3g16tRQU/QfJj1gC0WOzVD
+G5djhZKpMkFgS4v3qsO6
+=Ti8t
 -----END PGP SIGNATURE-----
diff --git a/app-misc/linux-logo/files/linux-logo-5.11.conf b/app-misc/linux-logo/files/linux-logo-5.11.conf
new file mode 100644
index 000000000000..49c538e012a5
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo-5.11.conf
@@ -0,0 +1,27 @@
+# Seq   Description             Output
+# ----------------------------------------------------------------
+# ##                            #
+# #B    Bogomips                374.37
+# #C    Compiled Date           #47 Fri Jan 8 10:37:09 EST 1999
+# #E    User Text               My Favorite Linux Distribution
+#       Displayed with -t
+# #H    Hostname                deranged
+# #L    Load average            Load average 0.04, 0.01, 0.01
+# #M    Megahertz               188Mhz
+#       where supported
+# #N    Number of CPU's         Two
+# #O    OS Name                 Linux
+# #P    Processor or Processors Processor
+# #R    Ram                     64M
+#       in Megabytes
+# #S    Plural                  s
+# #T    Type of CPU             K6
+# #U    Uptime                  Uptime 10 hours 59 minutes
+# #V    Version of OS           2.2.0-pre5
+# #X    CPU Vendor              AMD
+# \\n   carriage return
+
+FORMAT="Gentoo #O `cat /etc/gentoo-release | awk '{ print $5,$6 }'`\n#O #V, Compiled #C\n#N #X #T #M CPU#S, #R RAM, #B Bogomips\n#U\n#H / \l  \n"
+FORMATNET="Gentoo #O `cat /etc/gentoo-release | awk '{ print $5,$6 }'`\n#O #V, Compiled #C\n#N #X #T #M CPU#S, #R RAM, #B Bogomips\n#U\n#H\n"
+OPTIONS="-f -u"
+
diff --git a/app-misc/linux-logo/files/linux-logo.init.d b/app-misc/linux-logo/files/linux-logo.init.d
new file mode 100644
index 000000000000..50ca96b04eb3
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo.init.d
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+
+ISSUE_BACKUP_FILE="/etc/issue.linux-logo.backup"
+ISSUE_NET_BACKUP_FILE="/etc/issue.net.linux-logo.backup"
+
+start() {
+	ebegin "Starting linux_logo"
+
+	if [ ! -x /usr/bin/linux_logo ]
+	then
+		eerror "ERROR:  linux_logo not found !"
+		return 1
+	fi
+
+	ebegin "  Creating /etc/issue"
+	cp /etc/issue ${ISSUE_BACKUP_FILE} 2> /dev/null
+	/usr/bin/linux_logo ${LOGO} ${OPTIONS} -F "${FORMAT}" > /etc/issue
+	eend $? "  Failed to create /etc/issue"
+
+	if [ -f /etc/issue.net ]
+	then
+		ebegin "  Creating /etc/issue.net"
+		cp /etc/issue.net ${ISSUE_NET_BACKUP_FILE} 2> /dev/null
+		/usr/bin/linux_logo ${LOGO} ${OPTIONS} -F "${FORMATNET}" > \
+			/etc/issue.net
+		eend $? "  Failed to create /etc/issue.net"
+	fi
+}
+
+stop() {
+	ebegin "Stopping linux_logo"
+	[ -f ${ISSUE_NET_BACKUP_FILE} ] && \
+		mv ${ISSUE_NET_BACKUP_FILE} /etc/issue.net 2> /dev/null
+	[ -f ${ISSUE_BACKUP_FILE} ] && \
+		mv ${ISSUE_BACKUP_FILE} /etc/issue 2> /dev/null
+}
diff --git a/app-misc/linux-logo/linux-logo-5.04.ebuild b/app-misc/linux-logo/linux-logo-5.04.ebuild
deleted file mode 100644
index acb6a6d9f958..000000000000
--- a/app-misc/linux-logo/linux-logo-5.04.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 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.04.ebuild,v 1.1 2009/01/03 11:44:27 spock Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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/
-	echo "NAME gentoo" >> "${S}"/logos/gentoo.logo
-}
-
-src_compile() {
-	./configure --prefix="${D}"/usr || die
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make install || die
-
-	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
-
-	newinitd "${FILESDIR}"/${PN}.initscript ${PN}
-	newconfd "${WORKDIR}"/${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
-	elog ""
-	elog "To display the first Gentoo logo type: linux_logo -L gentoo"
-	elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
-	elog "To display all the logos available type: linux_logo -L list."
-	elog ""
-	elog "To start linux_logo on boot, please type:"
-	elog "   rc-update add linux-logo default"
-	elog "which uses the settings found in"
-	elog "   /etc/conf.d/linux-logo"
-	echo
-}
diff --git a/app-misc/linux-logo/linux-logo-5.06.ebuild b/app-misc/linux-logo/linux-logo-5.06.ebuild
deleted file mode 100644
index fde9b4c10910..000000000000
--- a/app-misc/linux-logo/linux-logo-5.06.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 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.06.ebuild,v 1.1 2009/10/17 21:05:32 spock Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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/
-	echo "NAME gentoo" >> "${S}"/logos/gentoo.logo
-}
-
-src_compile() {
-	ARCH="" ./configure --prefix="${D}"/usr || die
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make install || die
-
-	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
-
-	newinitd "${FILESDIR}"/${PN}.initscript ${PN}
-	newconfd "${WORKDIR}"/${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
-	elog ""
-	elog "To display the first Gentoo logo type: linux_logo -L gentoo"
-	elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
-	elog "To display all the logos available type: linux_logo -L list."
-	elog ""
-	elog "To start linux_logo on boot, please type:"
-	elog "   rc-update add linux-logo default"
-	elog "which uses the settings found in"
-	elog "   /etc/conf.d/linux-logo"
-	echo
-}
diff --git a/app-misc/linux-logo/linux-logo-5.07.ebuild b/app-misc/linux-logo/linux-logo-5.07.ebuild
deleted file mode 100644
index 12d8492d8ecb..000000000000
--- a/app-misc/linux-logo/linux-logo-5.07.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 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.07.ebuild,v 1.1 2010/02/08 11:50:11 spock Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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/
-	echo "NAME gentoo" >> "${S}"/logos/gentoo.logo
-}
-
-src_compile() {
-	ARCH="" ./configure --prefix="${D}"/usr || die
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make install || die
-
-	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
-
-	newinitd "${FILESDIR}"/${PN}.initscript ${PN}
-	newconfd "${WORKDIR}"/${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
-	elog ""
-	elog "To display the first Gentoo logo type: linux_logo -L gentoo"
-	elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
-	elog "To display all the logos available type: linux_logo -L list."
-	elog ""
-	elog "To start linux_logo on boot, please type:"
-	elog "   rc-update add linux-logo default"
-	elog "which uses the settings found in"
-	elog "   /etc/conf.d/linux-logo"
-	echo
-}
diff --git a/app-misc/linux-logo/linux-logo-5.10.ebuild b/app-misc/linux-logo/linux-logo-5.10.ebuild
deleted file mode 100644
index 1c726c1da6a0..000000000000
--- a/app-misc/linux-logo/linux-logo-5.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 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.10.ebuild,v 1.1 2010/07/05 10:38:08 spock Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=${PN/-/_}-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A utility that displays an ANSI/ASCII logo and some system information"
-HOMEPAGE="http://www.deater.net/weave/vmwprod/linux_logo/"
-SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	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/
-	echo "NAME gentoo" >> "${S}"/logos/gentoo.logo
-}
-
-src_compile() {
-	ARCH="" ./configure --prefix="${D}"/usr || die
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	make install || die
-
-	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
-
-	newinitd "${FILESDIR}"/${PN}.initscript ${PN}
-	newconfd "${WORKDIR}"/${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	echo
-	elog "Linux_logo ebuild for Gentoo comes with two Gentoo logos."
-	elog ""
-	elog "To display the first Gentoo logo type: linux_logo -L gentoo"
-	elog "To display the second Gentoo logo type: linux_logo -L gentoo-alt"
-	elog "To display all the logos available type: linux_logo -L list."
-	elog ""
-	elog "To start linux_logo on boot, please type:"
-	elog "   rc-update add linux-logo default"
-	elog "which uses the settings found in"
-	elog "   /etc/conf.d/linux-logo"
-	echo
-}
diff --git a/app-misc/linux-logo/linux-logo-5.11.ebuild b/app-misc/linux-logo/linux-logo-5.11-r1.ebuild
index 9fe50bbeaa69..e4b627ae652d 100644
--- a/app-misc/linux-logo/linux-logo-5.11.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r1.ebuild
@@ -1,10 +1,10 @@
 # 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.2 2011/06/24 16:29:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/linux-logo-5.11-r1.ebuild,v 1.1 2011/06/29 14:11:37 c1pher Exp $
 
 EAPI="4"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=${PN/-/_}-${PV}
 S=${WORKDIR}/${MY_P}
@@ -22,29 +22,30 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
-	cp "${FILESDIR}"/logo_config "${S}"/ || die
-	cp "${FILESDIR}"/gentoo{,2}.logo "${S}"/logos/ || die
+	cp "${FILESDIR}"/logo_config "${S}/" || die
+	cp "${FILESDIR}"/gentoo{,2}.logo "${S}"/logos/ \
+		|| die "Unable to copy Gentoo logos"
 	echo "NAME gentoo" >> "${S}"/logos/gentoo.logo
+	# Remove warn_unused_result warning
+	sed -i -e 's/FILE \*fff;/FILE \*fff;\n   char *stemp;/' \
+	    -e 's/fgets/stemp=fgets/' "${S}"/load_logo.c || die "sed failed"
 }
 
 src_configure() {
-	# Not an autotools based configure script
-	ARCH="" ./configure --prefix="${D}"/usr || die
+	ARCH="" ./configure --prefix="${D}"/usr || die "configure failed"
 }
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake install
 
 	dodoc BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ
 
-	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}
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	newconfd "${FILESDIR}"/${P}.conf ${PN}
 }
 
 pkg_postinst() {
@@ -61,3 +62,9 @@ pkg_postinst() {
 	elog "   /etc/conf.d/linux-logo"
 	echo
 }
+
+pkg_prerm() {
+	# Restore issue files
+	mv /etc/issue.linux-logo.backup /etc/issue 2> /dev/null
+	mv /etc/issue.net.linux-logo.backup /etc/issue.net 2> /dev/null
+}
diff --git a/app-misc/linux-logo/metadata.xml b/app-misc/linux-logo/metadata.xml
index a8c47d44ab7b..92823ebff675 100644
--- a/app-misc/linux-logo/metadata.xml
+++ b/app-misc/linux-logo/metadata.xml
@@ -3,6 +3,12 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-	<email>jer@gentoo.org</email>
+	<email>c1pher@gentoo.org</email>
+	<name>Dane Smith</name>
+</maintainer>
+<maintainer>
+	<email>nimiux@gentoo.org</email>
+	<name>Chema Alonso</name>
+	<description>Proxy-Maintainer. CC on bugs</description>
 </maintainer>
 </pkgmetadata>