Update for systemd wrt bug #491744

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

5 files changed, 125 insertions, 3 deletions

diff --git a/app-misc/linux-logo/ChangeLog b/app-misc/linux-logo/ChangeLog
index 039fc241b983..0800fae8166e 100644
--- a/app-misc/linux-logo/ChangeLog
+++ b/app-misc/linux-logo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/linux-logo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.85 2012/10/30 19:29:07 nimiux Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/linux-logo/ChangeLog,v 1.86 2013/11/24 10:28:21 nimiux Exp $
+
+*linux-logo-5.11-r2 (24 Nov 2013)
+
+  24 Nov 2013; Chema Alonso <nimiux@gentoo.org> +linux-logo-5.11-r2.ebuild,
+  +files/linux-logo.service, +files/linux_logo_creator:
+  Update for systemd wrt bug #491744 by Joerg Neikes
 
   30 Oct 2012; Chema Alonso <nimiux@gentoo.org> -linux-logo-5.02.ebuild,
   -linux-logo-5.03.ebuild, -linux-logo-5.10-r1.ebuild,
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index ccb00d65c4d3..a0b7ed77d841 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -1,9 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gentoo.logo 4732 SHA256 86ee09ee715d10e987274d3887dd5bfe6992bb4b08fbe4538b4eb4829f87c55f SHA512 94982f89d45bbcd47e4875bff956db958fc6fc90c974a15729d933d0a5088e4d5c19cce9d4886263b2b96a6bd2cf42b17306c54eb6b5b749148254bc64e4aee2 WHIRLPOOL afcd0f022db70c158d748643f2e1bf04abc9a7f325d141ead02ec3ae0e1970929f5ba50e190a856f5c9a4bf2edf76f5559634fdf4a6caa18e73ecb8d4b3527e8
 AUX gentoo2.logo 1640 SHA256 2f9cda11a31e93873b424b5499437ffa3c3ae9e348f440e9ac14972c15df7850 SHA512 fa0049f206b94ccc8cb246c3e7018f50ac5b73e337d23fe3268aa85a614d3707d118622aae20e0f9edfd029e9a9f27d1bd84a4ea364da2cd94266ce64a49f0d7 WHIRLPOOL 4e735198b2807fcc180133cc0808896021be330b475d60b97ed10bb4aefcd24187efb36eba5f4d19cd828899125bab46aaa50e53d4f49fd669de74dc793603a6
 AUX linux-logo-5.11.conf 1208 SHA256 9e1a782268af67b63d7f176c1440ee2856f2f40e5bf2cddacd4373214f5b436b SHA512 8eb8774b191ac67f37f2c590737428ded8204f87ca4856c25a463c4ea39a49c133258e22c43e48cc221c56e928a12179a65a98776daf485711d9c2472490c2fa WHIRLPOOL 047e3b152f19224dd7c6338d2c0c31d3de23cf51085ff69511ed6a26d8801e314c79de8dfa3031d95b72a74a58426f50297a6569c64854daeef71fe78f2a6724
 AUX linux-logo.init.d 937 SHA256 c81e4e063c87fdd74a10c4fdd1fb60112911a94f9ddb1688ebf03cc88a2b8dc1 SHA512 86b8c4a82f2c3ed69719c0c4ea5fe20cbd153b2334190a37e9c060add7e5f5087d6460c117aab1ad7b82e182f7afb58ae4dc0f6b5cebd80a5c98470e70c857a0 WHIRLPOOL d1c3f69880942e19eab0e101d27eb3f79acb22a3b75253f5fc5d800d40ea3def4a423f5f0bbce72cdd26b9fd89f10cc0a1fd3c71710485897c5eff4b0a070874
+AUX linux-logo.service 155 SHA256 7b33f7fb8b93f69f860ab8a0966f5ccf9d37eec8211ffc465a648adbf9a03314 SHA512 01b5917d1a7a70faa2622e459f4e27b5e23f15481ac94cae51ee39799d15f783a6427c7430067208a7a73e6f270527c1e64740c6eb31ce0f17a4777343bc3261 WHIRLPOOL 6114e7853703a9d7530cc4596676d763523fcef73cda53ab99d02589f2c9de3558f42069b912363955a1f479d2aca31fff07bd246bf41002fa3d34b0fe137827
+AUX linux_logo_creator 604 SHA256 613d44af9778e9e050850341a32f9efc75dec47bda4dfb5f85693ea2ded42dee SHA512 a1098c1ea4c867c8950e744c598373f6f409eb411525b2e6e7a0e592b78ba237ec71a591b13c8a958e4622c3471d087ef196d07e2a958450392b75aeb9318513 WHIRLPOOL d5aefa21234c6d010080a7f7dd033ce06adac87fd4cdef4d685dfbe292f653878b22b4e79d069b87d135adbd1daa60250b2b299876d1a3e7e9bac5033f0aaa62
 AUX logo_config 186 SHA256 0c082f43528263e32350a632da7d35ba257ec7bb6e948545c06cd97963eefe12 SHA512 8bdf0454f260b8f833f58ee265925de7619252d847e33a949dcab8e51cc94e44cd08e31fb6dd2beadcbd860f9a1a63cc91d1384395f47e9654dce89ab7b4a25f WHIRLPOOL 4c444667f5a827ccc66e76b3dec8f368bf580cc808d0344c8a7fc8e5c5f93a97bac9b3bc78a3c7b09f2efd58db5419c7667546732210aa0fe2d89ad289ccb69a
 DIST linux_logo-5.11.tar.gz 103623 SHA256 f56634d7b6bebd6598705d973997435fdc9cb9115dea3cc1d63398c92ebe72d9 SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114 WHIRLPOOL d2f83045df8c2f23f74a527af1aa36ea952fb3595ebed39d216b6ccdf12609051598024e703c8af6d496cf1c7e66de27104dfdb885fe8bbab60e1607fd0ed1a5
 EBUILD linux-logo-5.11-r1.ebuild 2094 SHA256 7dec3d8ba2b271be8bc504273ec5dfd9c7749b0f42fc06cb315f58f8d7cf6a79 SHA512 97bf650b7bcc488976fee65cdb7b213ffe5071e984e995195254ac4cadc63a7b487e6fe9a3378a2f27ae2385219a24245c35bf5e4204a83f8196cffb3b0b4493 WHIRLPOOL 580107b07e397582cb00782d6d083dc3d14d01a77a867a6bc95b59f45f6493d653f3bb5a66e036661434af3a12cbdb22e62cee4264be14fa4e08563936d75c37
-MISC ChangeLog 12187 SHA256 58eecbe87c1dee362c2891bbb591b7c19ed41a4c9735ca4cecea828484b52429 SHA512 7f85dd419febf5e0e917467cc2ed03d8ac75e3739e07778b867079021235c8ba6b4328e2f613cb1be4d7aebcc4163ff4bbed41fc662c6ab0f910974d0d773d7d WHIRLPOOL 2defbc1c1e6e6cce6c252fa6ac6f029b8d5d2708a28e0005516cf768382f6b9b76da06c24ae2dd785d2367480567015dd1c809f36c8f8bf88b5d26d8f552c06f
+EBUILD linux-logo-5.11-r2.ebuild 2411 SHA256 c45ce194980b742ac7a9f52593f734399fe850e806f594a05c71fcf76c65b30d SHA512 f85cafffa09af233c671647ed86a6efce6a7798e7ccf65ef7587259bcc31a299b8e9d9ec9d6dfae710abbdf67eba9ac9e000ddb633689348d9fb87001a3ae67c WHIRLPOOL 65e2e6c5057630d4be92a0c889ae89853cda658cb71ea6fe371931cd870897cee4ec1211e37706b0cf88248693bdc89709eac3e3dfb30e1ce78d3c6f0b646eed
+MISC ChangeLog 12408 SHA256 a1221d72d74f3bb77fcbb323bd4b0710c3dec4673018e6e14516a58059203c74 SHA512 8d4c8bcfcbcf83cc08764af62516daf3327566c6c4464b27a49cfde77406fc08f0c9d07a697a3337100232843af218fd07617433a07c41966b499729d0eba586 WHIRLPOOL 26f2e693841a70bcbf3993647f2e404557336e541553456b80e4b315964da2be7e0a4396b75efce2c4e3358660e611580ec4dc63f8d7f2db1a73f906a2519a69
 MISC metadata.xml 227 SHA256 7fdd9039ad4266df626950455589eb74f2b52230fad7c8e01461e513e005cf1b SHA512 cfe9e536c24ab60ae3ed744248dacdcadc3ced7ca8917f198ba3da5ae801fda96f7a3e6e4a763455abaf9887aa9223a8700637438b06a07db0690d8cddf1fef7 WHIRLPOOL 113ca10ea09fe1227954bb320152faeb485e963c7df231f5a3c18bb3d3602c391d4922ec2103cd515558f2d131642378e1bff7ce9886948df0b2895d2b239cf4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSkdUDAAoJEA2sAkrWKOU2hk8IAKNh9qNWCSrMvtJY3DJzGx5K
+aCUyCjzU77Zn6miItkihhEtKCC9fkuSGc/aVIzccLWlwg94yoTRlsYVuYU+SHSpy
+PT/V/Co/7kpdAtdZLQX2wQ0O2T5RHxxGh2sbp8OpOk4+cEZe7aOlyEpwu0ISIvxj
+qPlu5Fpbgb3dRTyWHFXdQs4Do8nvXuEpHCcmaBbQvA+O019SqDLV41P18bMY2P9J
+M4lXucEZDzlxET4fnOe82bVV2qL9haQOGverlGLbJY4mQXggXU/VEcdf14qnJZph
+kUbMMOxRfgS/z7zgAB+qHcbLZy2alPuBjAVifV3nhRaRK3kUhieTqmQI51Wtul4=
+=SmbA
+-----END PGP SIGNATURE-----
diff --git a/app-misc/linux-logo/files/linux-logo.service b/app-misc/linux-logo/files/linux-logo.service
new file mode 100644
index 000000000000..658d7103c5e9
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=linux-logo-creator
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/bin/linux_logo_creator
+
+[Install]
+WantedBy=logo.target
diff --git a/app-misc/linux-logo/files/linux_logo_creator b/app-misc/linux-logo/files/linux_logo_creator
new file mode 100644
index 000000000000..5acc2fd5b85b
--- /dev/null
+++ b/app-misc/linux-logo/files/linux_logo_creator
@@ -0,0 +1,12 @@
+#!/bin/bash
+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="-L 2 -f -u"
+OPTIONSNET="-L 2 -f -u -a "
+
+# FORMAT="Gentoo Linux `cat /etc/gentoo-release | awk '{ print $5,$6 }'`"
+# /usr/bin/linux_logo -L 2 -f -u
+
+/usr/bin/linux_logo ${LOGO} ${OPTIONS} -F "${FORMAT}" > /etc/issue
+/usr/bin/linux_logo ${LOGO} ${OPTIONSNET} -F "${FORMATNET}" >  /etc/issue.net
+
diff --git a/app-misc/linux-logo/linux-logo-5.11-r2.ebuild b/app-misc/linux-logo/linux-logo-5.11-r2.ebuild
new file mode 100644
index 000000000000..f548c520a945
--- /dev/null
+++ b/app-misc/linux-logo/linux-logo-5.11-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 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-r2.ebuild,v 1.1 2013/11/24 10:28:21 nimiux Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs systemd
+
+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 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	cp "${FILESDIR}"/logo_config "${S}/" || die
+	cp "${FILESDIR}"/linux_logo_creator "${S}/" || die
+	cp "${FILESDIR}"/linux-logo.service "${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() {
+	ARCH="" ./configure --prefix="${ED}"/usr || die "configure failed"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake install
+
+	dodoc BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ
+
+	dobin "${FILESDIR}"/linux_logo_creator
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	newconfd "${FILESDIR}"/${P}.conf ${PN}
+
+	# systemd support
+	systemd_newunit "${FILESDIR}/linux-logo.service" "linux-logo.service"
+}
+
+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 "or for systemd"
+	elog "	 systemctl enable linux-logo.service"
+	elog "which uses the settings found in"
+	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
+}