diff options
Diffstat (limited to 'app-misc/color')
| -rw-r--r-- | app-misc/color/color-1.2-r3.ebuild (renamed from app-misc/color/color-1.2-r2.ebuild) | 23 | ||||
| -rw-r--r-- | app-misc/color/files/1.2-ldflags.patch | 23 | ||||
| -rw-r--r-- | app-misc/color/metadata.xml | 2 |
3 files changed, 15 insertions, 33 deletions
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r3.ebuild index 04850977dee3..0aa2258eb1c3 100644 --- a/app-misc/color/color-1.2-r2.ebuild +++ b/app-misc/color/color-1.2-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs @@ -14,25 +14,30 @@ SLOT="0" KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" src_prepare() { - eapply "${FILESDIR}"/${PV}-ldflags.patch default + # just rely on implicit rules + rm Makefile || die +} + +src_configure() { tc-export CC } +src_compile() { + emake color +} + src_install() { dobin color - dodoc CHANGELOG README - - # symlink for british users. - dosym color /usr/bin/colour + einstalldocs } pkg_postinst() { elog "For information on using colour in your shell scripts," - elog "run \`color\` without any arguments." + elog "run 'color' without any arguments." elog elog "To see all the colours available, use this command" elog " $ color --list" elog - elog "More examples are available in ${EPREFIX}/usr/share/doc/${PF}." + elog "More examples are available in ${EROOT}/usr/share/doc/${PF}." } diff --git a/app-misc/color/files/1.2-ldflags.patch b/app-misc/color/files/1.2-ldflags.patch deleted file mode 100644 index 9c95eda73b0e..000000000000 --- a/app-misc/color/files/1.2-ldflags.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Makefile b/Makefile -index 79c5b33..452e091 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,4 @@ --CC = cc -+CC ?= cc - #CFLAGS = -W -Wall -O2 -g - INCLUDE = $(wildcard *.h) - OBJS = color.o -@@ -6,8 +6,11 @@ EXE = color - - all: $(EXE) - -+OBJS: color.c -+ $(CC) $(CFLAGS) -c $^ $@ -+ - $(EXE): $(OBJS) -- $(CC) $(CFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) -o $@ $^ - - install: all - cp $(EXE) /usr/local/bin diff --git a/app-misc/color/metadata.xml b/app-misc/color/metadata.xml index 7a2823d5e0fc..6a6a26c95dc0 100644 --- a/app-misc/color/metadata.xml +++ b/app-misc/color/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>shell-tools@gentoo.org</email> |