gentoo resync : 02.06.2019

3 files changed, 7 insertions, 85 deletions

diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index 3f1383617665..b14e4b16ae0a 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -7,6 +7,5 @@ AUX linux-logo.service 155 BLAKE2B 706487d4b0a266d563bf427996ba15775a6e317d77a71
 AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895c76c379f90470d4ac9d28d24c8f02321ceab42007cb149c5d20bd7b87bbd2f978f289123fda2afba941 SHA512 a1098c1ea4c867c8950e744c598373f6f409eb411525b2e6e7a0e592b78ba237ec71a591b13c8a958e4622c3471d087ef196d07e2a958450392b75aeb9318513
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
-EBUILD linux-logo-5.11-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
 EBUILD linux-logo-5.11-r4.ebuild 2260 BLAKE2B 991a099bfe2644d2cdbc8a87bc6ad741bcaf957af788246bf9e9d80c0f4c40b013c8ab30b34877af053263b22d249266d6f2ed8d3681657c23ce1a9d43994d95 SHA512 9319f5f3d9db13737766bb2ab8bbd6a84c4a281106ff6d0f3ee171560b4201b23385797ee6ad1ce87f4017b79882cf98a32a7588ea2eb418b97bb0e52231e7be
-MISC metadata.xml 410 BLAKE2B 70c580020aa70cdd8014ec30006a34222d0a09397eeba4e09ecaee3a3ce14c65a5990d401334a06e54adcaab4898b1b4d6526c2a628f9d50610f331ffe2990bf SHA512 90b168683db981176423d73dc4454cd216b5985e6100793462d28bbdbf8e08951a400502e8835c11c230a8f37db0e67a2911738875ac22fa3c5824ced3c8aab2
+MISC metadata.xml 490 BLAKE2B 86e3962880353e6e86dbbf5d6582140126a5d2c56eff5e110119aa9a77b73051258ab4624220733da236e6ab438aeb6ac11102481a792afd4807dcbcdf669c11 SHA512 103652d3e84265d69b041a3268935de7fd1935c0cca90d905656d845009037774e46cae7116fccdac64c3fdb919a1a2b011600ea1858277117420bb63b5740df
diff --git a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild b/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
deleted file mode 100644
index 6406607e1caa..000000000000
--- a/app-misc/linux-logo/linux-logo-5.11-r3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 ~arm 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}/logo_config" || die
-	cp "${FILESDIR}"/linux_logo_creator "${S}/" || die
-	cp "${FILESDIR}"/linux-logo.service "${S}/" || die
-	cp "${FILESDIR}"/gentoo-*.logo "${S}"/logos/ || die
-
-	# 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
-}
-
-src_configure() {
-	ARCH="" ./configure --prefix="${ED}"/usr || die
-}
-
-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
-}
diff --git a/app-misc/linux-logo/metadata.xml b/app-misc/linux-logo/metadata.xml
index 28aea643562f..351315604363 100644
--- a/app-misc/linux-logo/metadata.xml
+++ b/app-misc/linux-logo/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-  A utility that displays an ANSI/ASCII logo and some system information
-</longdescription>
-<longdescription lang="es">
-  Una utilidad que muestra un logotipo ANSI/ASCII e información del sistema
-</longdescription>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription lang="en">A utility that displays an ANSI/ASCII logo and some system information</longdescription>
+	<longdescription lang="es">Una utilidad que muestra un logotipo ANSI/ASCII e información del sistema</longdescription>
 </pkgmetadata>