From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 099391382C5 for ; Mon, 11 May 2020 17:17:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A1F2E081A; Mon, 11 May 2020 17:17:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 191DEE081A for ; Mon, 11 May 2020 17:17:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E464734FBBE for ; Mon, 11 May 2020 17:17:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BE721B6 for ; Mon, 11 May 2020 17:17:13 +0000 (UTC) From: "Bernard Cafarelli" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Bernard Cafarelli" Message-ID: <1589217426.1c88feea94d12bcc94c4ace29a871b38875ed5d1.voyageur@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/linux-logo/, app-misc/linux-logo/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/linux-logo/Manifest app-misc/linux-logo/files/linux-logo-6.0-configure.patch app-misc/linux-logo/linux-logo-6.0.ebuild X-VCS-Directories: app-misc/linux-logo/ app-misc/linux-logo/files/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: 1c88feea94d12bcc94c4ace29a871b38875ed5d1 X-VCS-Branch: master Date: Mon, 11 May 2020 17:17:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ccb083fc-08a3-4503-a4df-500c886770e7 X-Archives-Hash: 255ebdde7f915b130c0912411352a296 commit: 1c88feea94d12bcc94c4ace29a871b38875ed5d1 Author: Bernard Cafarelli gentoo org> AuthorDate: Mon May 11 17:16:56 2020 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Mon May 11 17:17:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c88feea app-misc/linux-logo: 6.0 bump Almost 10 years after previous release Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Bernard Cafarelli gentoo.org> app-misc/linux-logo/Manifest | 1 + .../files/linux-logo-6.0-configure.patch | 78 ++++++++++++++++++++++ app-misc/linux-logo/linux-logo-6.0.ebuild | 76 +++++++++++++++++++++ 3 files changed, 155 insertions(+) diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest index 053a018722d..d9fe570152f 100644 --- a/app-misc/linux-logo/Manifest +++ b/app-misc/linux-logo/Manifest @@ -1 +1,2 @@ DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114 +DIST linux_logo-6.0.tar.gz 117486 BLAKE2B 3340b893574f0c18561b208824cd80cff19c387d981af6ca63f56e691cebd2030e058ef367d91a999fd662592582da38b21a5a31f3f8364dbd87a43bd2c2b608 SHA512 ebd7513f90e79bb21acd984c671a1d1ce8421411d2b2948b01e6e08f7c9826184f9b9d528e0cfc814df8d8015d444a09c45025c344115ac9a6c2cff5743f03ad diff --git a/app-misc/linux-logo/files/linux-logo-6.0-configure.patch b/app-misc/linux-logo/files/linux-logo-6.0-configure.patch new file mode 100644 index 00000000000..05df945a4c5 --- /dev/null +++ b/app-misc/linux-logo/files/linux-logo-6.0-configure.patch @@ -0,0 +1,78 @@ +diff -Naur linux_logo-6.0.orig/configure linux_logo-6.0/configure +--- linux_logo-6.0.orig/configure 2020-05-08 07:37:08.000000000 +0200 ++++ linux_logo-6.0/configure 2020-05-11 19:00:57.894062221 +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.3.0 + +-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-6.0.orig/libsysinfo-0.3.0/configure linux_logo-6.0/libsysinfo-0.3.0/configure +--- linux_logo-6.0.orig/libsysinfo-0.3.0/configure 2020-05-08 07:37:08.000000000 +0200 ++++ linux_logo-6.0/libsysinfo-0.3.0/configure 2020-05-11 19:01:09.551071479 +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-6.0.ebuild b/app-misc/linux-logo/linux-logo-6.0.ebuild new file mode 100644 index 00000000000..5d00ccd57c2 --- /dev/null +++ b/app-misc/linux-logo/linux-logo-6.0.ebuild @@ -0,0 +1,76 @@ +# 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}"-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 + + sed -e 's#=$(PREFIX)#=$(DESTDIR)$(PREFIX)#' -i po/Makefile || die + default +} + +src_configure() { + ARCH="" CC="$(tc-getCC)" AR="$(tc-getAR)" LDFLAGS="${LDFLAGS}" DESTDIR="${D}" \ + ./configure --prefix=/usr || die +} + +src_install() { + default + + dobin "${FILESDIR}"/linux_logo_creator + newinitd "${FILESDIR}"/${PN}.init.d ${PN} + newconfd "${FILESDIR}"/${PN}-5.11.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 +}