| 1 |
commit: 7634da65f4c569a4f2f4dcc63cb9ab39132b585e |
| 2 |
Author: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 29 14:29:57 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 20:10:06 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7634da65 |
| 7 |
|
| 8 |
app-misc/binclock: bump EAPI and drop eutils |
| 9 |
|
| 10 |
This also moves the sed call to a patch for the Makefile. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 13 |
|
| 14 |
app-misc/binclock/binclock-1.5.ebuild | 21 ++++++++++----------- |
| 15 |
.../binclock/files/binclock-1.5-Makefile.patch | 22 ++++++++++++++++++++++ |
| 16 |
2 files changed, 32 insertions(+), 11 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-misc/binclock/binclock-1.5.ebuild b/app-misc/binclock/binclock-1.5.ebuild |
| 19 |
index 3e80505179b..0c4db18b0aa 100644 |
| 20 |
--- a/app-misc/binclock/binclock-1.5.ebuild |
| 21 |
+++ b/app-misc/binclock/binclock-1.5.ebuild |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
-# Copyright 1999-2011 Gentoo Foundation |
| 24 |
+# Copyright 1999-2018 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI="2" |
| 28 |
+EAPI=6 |
| 29 |
|
| 30 |
-inherit toolchain-funcs |
| 31 |
+inherit flag-o-matic toolchain-funcs |
| 32 |
|
| 33 |
DESCRIPTION="Displays a binary clock in your terminal" |
| 34 |
HOMEPAGE="http://www.ngolde.de/binclock/" |
| 35 |
@@ -17,16 +17,15 @@ IUSE="" |
| 36 |
RDEPEND="" |
| 37 |
DEPEND=">=sys-apps/sed-4" |
| 38 |
|
| 39 |
-src_prepare() { |
| 40 |
- sed -i -e s/strip/true/ Makefile || die |
| 41 |
-} |
| 42 |
+PATCHES=( "${FILESDIR}/binclock-1.5-Makefile.patch" ) |
| 43 |
|
| 44 |
-src_compile() { |
| 45 |
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die "emake failed" |
| 46 |
+src_configure() { |
| 47 |
+ append-cflags -Wall -pedantic |
| 48 |
+ tc-export CC |
| 49 |
} |
| 50 |
|
| 51 |
src_install() { |
| 52 |
- dobin binclock || die "dobin failed" |
| 53 |
- doman doc/binclock.1 || die "doman failed" |
| 54 |
- dodoc CHANGELOG README binclockrc || die "dodoc failed" |
| 55 |
+ dobin binclock |
| 56 |
+ doman doc/binclock.1 |
| 57 |
+ dodoc CHANGELOG README binclockrc |
| 58 |
} |
| 59 |
|
| 60 |
diff --git a/app-misc/binclock/files/binclock-1.5-Makefile.patch b/app-misc/binclock/files/binclock-1.5-Makefile.patch |
| 61 |
new file mode 100644 |
| 62 |
index 00000000000..15a510186b5 |
| 63 |
--- /dev/null |
| 64 |
+++ b/app-misc/binclock/files/binclock-1.5-Makefile.patch |
| 65 |
@@ -0,0 +1,22 @@ |
| 66 |
+--- a/Makefile 2018-05-29 10:18:47.795059054 -0400 |
| 67 |
++++ b/Makefile 2018-05-29 10:21:37.126740904 -0400 |
| 68 |
+@@ -18,8 +18,6 @@ |
| 69 |
+ # Boston, MA 02111-1307, USA |
| 70 |
+ # |
| 71 |
+ |
| 72 |
+-CC = gcc |
| 73 |
+-CFLAGS = -O2 -Wall --pedantic |
| 74 |
+ BIN = binclock |
| 75 |
+ SRC = ./src/binclock.c |
| 76 |
+ INSPATH = /usr/local/bin/ |
| 77 |
+@@ -28,8 +26,8 @@ |
| 78 |
+ CONF = /etc/ |
| 79 |
+ |
| 80 |
+ all : $(MAINSRC) |
| 81 |
+- $(CC) $(CFLAGS) -o $(BIN) $(SRC) |
| 82 |
+- strip $(SOURCEPATH)$(BIN) |
| 83 |
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN) $(SRC) |
| 84 |
++ true $(SOURCEPATH)$(BIN) |
| 85 |
+ |
| 86 |
+ install : |
| 87 |
+ |
Archives