Merge branch 'edge' into next

3 files changed, 160 insertions, 0 deletions

diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index b14e4b16ae0a..7f97eb174ba6 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -1,6 +1,7 @@
 AUX gentoo-alt.logo 1672 BLAKE2B 19cd7ac8cf29cb253cf2a2b44be7f369ac840f6f891e19bd550a2b6ae0c4098d10c28bad4003c83f7cae5a462f66d676393cd855e96dcd51d6234c86d72b8fda SHA512 7068100889469c489ec327fa1aaa9503c6b54b350b2d7786ad1cbd9bcafb92630220820defd01089d3dc52c7dab2c2f2787aef4361430f8dc97894b46f3d72de
 AUX gentoo-linux.logo 4788 BLAKE2B 3b130f25770a7d39c2a86bcb7c09aefb254721de7ebae629eb55faa2ccf435ee6bff147b7b230493e31c6f678e30746b21275e9eb7a93369076caa309dfdca45 SHA512 63f72473c05073258c47b0b24bc8dea4e7f3e4e060d8296ae31eee2dccb93c159ed473ef23924e96fa47a4796150e16c542908d55312a660ccf0696904962fbe
 AUX linux-logo-5.11-add-aarch64-support.patch 422 BLAKE2B 29b9163b930192d5fc83e549d5bf2e149e1a5d85aa6485fa3b60ca964d5e376c3d0f26cc63c3a28f6e1d85a3ecdb63594a48d3bc0726c7bb7aea4c8e676d0d6f SHA512 0af44f11d7aa4c96be50e77d65a966b56002a7b8903d5f109695e2151f7bde64a52645ba291b429dcfb7c5cb2cc2d29147e88ac0db4d1a2589e63427417d0133
+AUX linux-logo-5.11-configure.patch 1460 BLAKE2B 1a8b7eda9344ea23e17069b32add1afef018e906691764a7756ba9ffaa9b608bc430ae13cdc2aea27b3f872fbeb6f6dd5376fa75f4d221a02746964b2253c0cd SHA512 1cea59a513f02e2c2aa3ba3d224b7de3dd497947272c2dae40a7d5380f943d617a822ea4154cfaea1b4698ae7030894be2385bca2424344d42fe25686310083a
 AUX linux-logo-5.11.conf 1225 BLAKE2B c84f6722843d01052a40b5270e816d35fad11423c5072107c5794aab14dceff6494659cc6a5ea381a905f571f87da599f6dd50a1325370de57534b67b5b0ec88 SHA512 b277fb20fb4db7420fad63f7412513f992471e64985d9e8f7ed4d3975fc9c5dac4ed777bc3b0cf6138bbab5a38c519ae75039bd89e42503b75e7d5ce191846d1
 AUX linux-logo.init.d 938 BLAKE2B 9760e591b1500a4776eaf1f24eb0903dc6d1a21102c2cf45373ab3a7f104ae87bfd31476c5bed7be32119a36764986f0de98f9a3eeb0d4bd6a750109adbd0b2e SHA512 0c021418a4e7e31df3aada8bd3c7cebd97f8e812d086a45aaff5d5779650195e92e87072a3627a3bb50384f10fccafd78cd966c8daed6775bbe58f6305e6db53
 AUX linux-logo.service 155 BLAKE2B 706487d4b0a266d563bf427996ba15775a6e317d77a71d1e7c359499617a2065e74f500884736e8becc3fa64907feff8a06b2644c1337e295d3f24383b47c7ff SHA512 01b5917d1a7a70faa2622e459f4e27b5e23f15481ac94cae51ee39799d15f783a6427c7430067208a7a73e6f270527c1e64740c6eb31ce0f17a4777343bc3261
@@ -8,4 +9,5 @@ AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895
 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-r4.ebuild 2260 BLAKE2B 991a099bfe2644d2cdbc8a87bc6ad741bcaf957af788246bf9e9d80c0f4c40b013c8ab30b34877af053263b22d249266d6f2ed8d3681657c23ce1a9d43994d95 SHA512 9319f5f3d9db13737766bb2ab8bbd6a84c4a281106ff6d0f3ee171560b4201b23385797ee6ad1ce87f4017b79882cf98a32a7588ea2eb418b97bb0e52231e7be
+EBUILD linux-logo-5.11-r5.ebuild 2282 BLAKE2B beb00eaa05d1075dfae1ee11650e36e619a3c9773ac27d86e6485e2842af6bbf74957494aeaa31a310129e1af1338e32ed1bd8ba0aa88b9d546a48e02e9ff3e9 SHA512 c085b8f05f310098ef3effddc8ad3651fca8801d8d5ef6f0d62b205559dbc1ee4ec58402671e7fefb8dd76ea57a16c6889e5240d0c3a3a2d194078b674dab952
 MISC metadata.xml 490 BLAKE2B 86e3962880353e6e86dbbf5d6582140126a5d2c56eff5e110119aa9a77b73051258ab4624220733da236e6ab438aeb6ac11102481a792afd4807dcbcdf669c11 SHA512 103652d3e84265d69b041a3268935de7fd1935c0cca90d905656d845009037774e46cae7116fccdac64c3fdb919a1a2b011600ea1858277117420bb63b5740df
diff --git a/app-misc/linux-logo/files/linux-logo-5.11-configure.patch b/app-misc/linux-logo/files/linux-logo-5.11-configure.patch
new file mode 100644
index 000000000000..a699db0485e1
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo-5.11-configure.patch
@@ -0,0 +1,78 @@
+diff -Naur linux_logo-5.11.orig/configure linux_logo-5.11/configure
+--- linux_logo-5.11.orig/configure	2010-02-19 23:47:46.000000000 +0100
++++ linux_logo-5.11/configure	2020-04-23 23:35:47.468728737 +0200
+@@ -41,31 +41,8 @@
+    XGETTEXT=xgettext
+ fi
+ 
+-which gcc
+-GCC_MISSING=$?
+-
+-if [ $GCC_MISSING -eq 1 ]; then
+-   which cc
+-   CC_MISSING=$?
+-   if [ $CC_MISSING -eq 1 ]; then
+-      echo "C compiler not found!"
+-   else
+-      CC=cc   
+-   fi
+-else
+-   CC=gcc
+-fi
+-
+ LIBSYSINFO=libsysinfo-0.2.2
+ 
+-LDFLAGS=""
+-
+-if [ $CC = gcc ]; then
+-   CFLAGS="-Wall -O2"
+-else
+-   CFLAGS="-O2"
+-fi   
+-
+ $CROSS$CC $CFLAGS -c intl_test.c 
+ INTL_MISSING=$?
+ 
+diff -Naur linux_logo-5.11.orig/libsysinfo-0.2.2/configure linux_logo-5.11/libsysinfo-0.2.2/configure
+--- linux_logo-5.11.orig/libsysinfo-0.2.2/configure	2009-06-05 20:53:44.000000000 +0200
++++ linux_logo-5.11/libsysinfo-0.2.2/configure	2020-04-23 23:39:32.874812532 +0200
+@@ -15,39 +15,6 @@
+ PREFIX=/usr/local
+ INSTALL=`which install`
+ 
+-which gcc
+-GCC_MISSING=$?
+-
+-if [ $GCC_MISSING -eq 1 ]; then
+-   which cc
+-   CC_MISSING=$?
+-   if [ $CC_MISSING -eq 1 ]; then
+-      echo "C compiler not found!"
+-   else
+-      CC=cc   
+-   fi
+-else
+-   CC=gcc
+-fi
+-
+-which ar
+-AR_MISSING=$?
+-
+-if [ $AR_MISSING -eq 0 ]; then
+-   AR=ar
+-fi
+-
+-
+-if [ $OS = SunOS ]; then
+-   AR=/usr/ccs/bin/ar
+-fi
+-   
+-if [ $CC = gcc ]; then
+-   CFLAGS="-Wall -O2"
+-else
+-   CFLAGS="-O2"
+-fi   
+-
+ LIBSYSINFO_INCLUDE="-I.."
+ LFLAGS=""
+ 
diff --git a/app-misc/linux-logo/linux-logo-5.11-r5.ebuild b/app-misc/linux-logo/linux-logo-5.11-r5.ebuild
new file mode 100644
index 000000000000..f63e15d1e14c
--- /dev/null
+++ b/app-misc/linux-logo/linux-logo-5.11-r5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs systemd
+
+MY_P=${PN/-/_}-${PV}
+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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="nls"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}"-add-aarch64-support.patch
+	"${FILESDIR}"/"${P}"-configure.patch
+)
+
+DOCS=( BUGS README README.CUSTOM_LOGOS TODO USAGE LINUX_LOGO.FAQ )
+
+S=${WORKDIR}/${MY_P}
+
+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
+	default
+}
+
+src_configure() {
+	ARCH="" CC="$(tc-getCC)" AR="$(tc-getAR)" LDFLAGS="${LDFLAGS}" \
+		./configure --prefix="${ED}"/usr || die
+}
+
+src_install() {
+	default
+
+	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
+}