gentoo resync : 04.01.2018

3 files changed, 93 insertions, 0 deletions

diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index 9935a7e38437..992f9cdc619b 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -1,5 +1,6 @@
 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.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
@@ -7,4 +8,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-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
+EBUILD linux-logo-5.11-r4.ebuild 2265 BLAKE2B 391f663a53b1ecb154a094262952f1442278964d3b6ba970ce341bd5700739c7fe959a6c356e8261a10321cf67cc4b2f86cb7812fe732ceaeaa3fb7fa0c31a11 SHA512 880d1acfedf80af82dcec3a35b1ab2a304a6b37c94a562941bc75fb432ed6dfbac78ea470ff285b48420946ace19d70792ad06d7be906eac2d70384f89117e02
 MISC metadata.xml 487 BLAKE2B 25ad355aac4b4da399514cf9045159f13a93b47ddf26fc8bf6a75aa6f4ab5a300b0a11d50df5458b7be57a735005de2ce82292807163c71c448d2a3e092322dc SHA512 bbc83554665f6466c688c8e2fc432c30e26cab8193f70c0cd47965a9f603a2284b0e9c147dd486ead65207133655d31fb4919eecd6bb72079290e46a677a6c5e
diff --git a/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch b/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch
new file mode 100644
index 000000000000..8ea15ebab6ac
--- /dev/null
+++ b/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch
@@ -0,0 +1,13 @@
+diff -Nuar a/libsysinfo-0.2.2/Linux/Makefile b/libsysinfo-0.2.2/Linux/Makefile
+--- a/libsysinfo-0.2.2/Linux/Makefile	2010-02-15 18:15:07.000000000 +0100
++++ b/libsysinfo-0.2.2/Linux/Makefile	2018-01-03 20:16:48.299998620 +0100
+@@ -6,6 +6,9 @@
+ ifneq (,$(findstring arm,$(ARCH)))
+    ARCH := arm
+ endif
++ifneq (,$(findstring aarch64,$(ARCH)))
++   ARCH := arm
++endif
+ ifneq (,$(findstring sh,$(ARCH)))
+    ARCH := sh
+ endif
diff --git a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
new file mode 100644
index 000000000000..22aa370e8017
--- /dev/null
+++ b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~arm64 ~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
+
+	eapply "${FILESDIR}"/"${P}"-add-aarch64-support.patch
+	# 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
+	eapply_user
+}
+
+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
+}