[gentoo-commits] repo/gentoo:master commit in: app-misc/linux-logo/files/, app-misc/linux-logo/

[José María Alonso]

commit:     4e24b546d16ae43d08970325145fd6717e742942
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 21:52:06 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Wed Jan  3 21:52:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e24b546

app-misc/linux-logo: Adds arm64 support

Closes: https://bugs.gentoo.org/642218
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../linux-logo-5.11-add-aarch64-support.patch      | 13 ++++
 app-misc/linux-logo/linux-logo-5.11-r4.ebuild      | 78 ++++++++++++++++++++++
 2 files changed, 91 insertions(+)

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 00000000000..8ea15ebab6a
--- /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 00000000000..22aa370e801
--- /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
+}