| 1 |
commit: 00384c9045401077633e1aa82295448b2cdd1e92 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 31 20:03:21 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 20:03:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00384c90 |
| 7 |
|
| 8 |
app-misc/cpipe: update EAPI 6 -> 8 |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{cpipe-3.0.3.ebuild => cpipe-3.0.3-r1.ebuild} | 23 +++++++---------- |
| 13 |
app-misc/cpipe/files/cpipe-3.0.3-makefile.patch | 29 ++++++++++++++++++++++ |
| 14 |
2 files changed, 38 insertions(+), 14 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-misc/cpipe/cpipe-3.0.3.ebuild b/app-misc/cpipe/cpipe-3.0.3-r1.ebuild |
| 17 |
similarity index 54% |
| 18 |
rename from app-misc/cpipe/cpipe-3.0.3.ebuild |
| 19 |
rename to app-misc/cpipe/cpipe-3.0.3-r1.ebuild |
| 20 |
index ff2b6594a3f6..e1798e5b3092 100644 |
| 21 |
--- a/app-misc/cpipe/cpipe-3.0.3.ebuild |
| 22 |
+++ b/app-misc/cpipe/cpipe-3.0.3-r1.ebuild |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
-# Copyright 1999-2020 Gentoo Authors |
| 25 |
+# Copyright 1999-2022 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=6 |
| 29 |
+EAPI=8 |
| 30 |
|
| 31 |
inherit toolchain-funcs |
| 32 |
|
| 33 |
@@ -13,20 +13,15 @@ LICENSE="GPL-2" |
| 34 |
SLOT="0" |
| 35 |
KEYWORDS="amd64 x86" |
| 36 |
|
| 37 |
-src_prepare() { |
| 38 |
- default |
| 39 |
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) |
| 40 |
|
| 41 |
- sed -i \ |
| 42 |
- -e "s/CFLAGS =/CFLAGS =${CFLAGS} /" \ |
| 43 |
- -e "s/-lm/-lm ${LDFLAGS}/" \ |
| 44 |
- -e "s/744/644/" makefile || die "sed failed" |
| 45 |
-} |
| 46 |
- |
| 47 |
-src_compile() { |
| 48 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" |
| 49 |
+src_configure() { |
| 50 |
+ tc-export CC |
| 51 |
} |
| 52 |
|
| 53 |
src_install() { |
| 54 |
- dobin "${PN}" |
| 55 |
- doman "${PN}.1" |
| 56 |
+ dobin cpipe |
| 57 |
+ |
| 58 |
+ einstalldocs |
| 59 |
+ doman cpipe.1 |
| 60 |
} |
| 61 |
|
| 62 |
diff --git a/app-misc/cpipe/files/cpipe-3.0.3-makefile.patch b/app-misc/cpipe/files/cpipe-3.0.3-makefile.patch |
| 63 |
new file mode 100644 |
| 64 |
index 000000000000..d68bb56f2967 |
| 65 |
--- /dev/null |
| 66 |
+++ b/app-misc/cpipe/files/cpipe-3.0.3-makefile.patch |
| 67 |
@@ -0,0 +1,29 @@ |
| 68 |
+--- a/makefile |
| 69 |
++++ b/makefile |
| 70 |
+@@ -15,14 +15,14 @@ |
| 71 |
+ MANDIR=$(prefix)/man/man1 |
| 72 |
+ |
| 73 |
+ ## Your favorite compiler flags. |
| 74 |
+-CFLAGS = -O2 -W -Wall -pedantic |
| 75 |
++CFLAGS += -W -Wall -pedantic |
| 76 |
++LDLIBS = -lm |
| 77 |
+ |
| 78 |
+ VERSION=$(shell cat .version) |
| 79 |
+ ######################################################################## |
| 80 |
+ all: cpipe cpipe.1 |
| 81 |
+ |
| 82 |
+-cpipe: cpipe.o cmdline.o |
| 83 |
+- $(CC) -o $@ cpipe.o cmdline.o -lm |
| 84 |
++cpipe: cmdline.o |
| 85 |
+ |
| 86 |
+ cpipe.1: cpipe.1.in |
| 87 |
+ sed -e "s/|VERSION|/${VERSION}/g" <cpipe.1.in >cpipe.1 |
| 88 |
+@@ -37,7 +37,7 @@ |
| 89 |
+ install: cpipe cpipe.1 |
| 90 |
+ mkdir -p $(BINDIR) $(MANDIR) |
| 91 |
+ cp cpipe $(BINDIR); chmod 755 $(BINDIR)/cpipe |
| 92 |
+- cp cpipe.1 $(MANDIR); chmod 744 $(MANDIR)/cpipe.1 |
| 93 |
++ cp cpipe.1 $(MANDIR); chmod 644 $(MANDIR)/cpipe.1 |
| 94 |
+ |
| 95 |
+ uninstall: |
| 96 |
+ -rm $(BINDIR)/cpipe |
Archives