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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA4D9158094 for ; Thu, 18 Aug 2022 16:21:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1222E07B2; Thu, 18 Aug 2022 16:21:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39168E07B2 for ; Thu, 18 Aug 2022 16:21:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9EBE341082 for ; Thu, 18 Aug 2022 16:21:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4FF4D54D for ; Thu, 18 Aug 2022 16:21:53 +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: <1660839700.e90d528782405cd4d082ce9a3229d4b0ca02b140.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-5.11-add-aarch64-support.patch app-misc/linux-logo/files/linux-logo-5.11-configure.patch app-misc/linux-logo/linux-logo-5.11-r4.ebuild app-misc/linux-logo/linux-logo-5.11-r5.ebuild X-VCS-Directories: app-misc/linux-logo/files/ app-misc/linux-logo/ X-VCS-Committer: voyageur X-VCS-Committer-Name: Bernard Cafarelli X-VCS-Revision: e90d528782405cd4d082ce9a3229d4b0ca02b140 X-VCS-Branch: master Date: Thu, 18 Aug 2022 16:21:53 +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: a1ac90fd-4c4c-409c-930c-a8c5a3044302 X-Archives-Hash: 0107cceee283f0e536adb8153545cdec commit: e90d528782405cd4d082ce9a3229d4b0ca02b140 Author: Bernard Cafarelli gentoo org> AuthorDate: Thu Aug 18 16:21:40 2022 +0000 Commit: Bernard Cafarelli gentoo org> CommitDate: Thu Aug 18 16:21:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90d5287 app-misc/linux-logo: drop 5.11-r4, 5.11-r5 Closes: https://bugs.gentoo.org/836038 Signed-off-by: Bernard Cafarelli gentoo.org> app-misc/linux-logo/Manifest | 1 - .../linux-logo-5.11-add-aarch64-support.patch | 13 ---- .../files/linux-logo-5.11-configure.patch | 78 --------------------- app-misc/linux-logo/linux-logo-5.11-r4.ebuild | 78 --------------------- app-misc/linux-logo/linux-logo-5.11-r5.ebuild | 80 ---------------------- 5 files changed, 250 deletions(-) diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest index d9fe570152f6..ac5e5f3c7706 100644 --- a/app-misc/linux-logo/Manifest +++ b/app-misc/linux-logo/Manifest @@ -1,2 +1 @@ -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-5.11-add-aarch64-support.patch b/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch deleted file mode 100644 index 8ea15ebab6ac..000000000000 --- a/app-misc/linux-logo/files/linux-logo-5.11-add-aarch64-support.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/files/linux-logo-5.11-configure.patch b/app-misc/linux-logo/files/linux-logo-5.11-configure.patch deleted file mode 100644 index a699db0485e1..000000000000 --- a/app-misc/linux-logo/files/linux-logo-5.11-configure.patch +++ /dev/null @@ -1,78 +0,0 @@ -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-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild deleted file mode 100644 index 7a01642f4e7b..000000000000 --- a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# 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 -} diff --git a/app-misc/linux-logo/linux-logo-5.11-r5.ebuild b/app-misc/linux-logo/linux-logo-5.11-r5.ebuild deleted file mode 100644 index f63e15d1e14c..000000000000 --- a/app-misc/linux-logo/linux-logo-5.11-r5.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# 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 -}