[gentoo-commits] repo/gentoo:master commit in: app-misc/binclock/files/, app-misc/binclock/

[gentoo-commits] repo/gentoo:master commit in: app-misc/binclock/files/, app-misc/binclock/

[Aaron Bauman]

commit:     7634da65f4c569a4f2f4dcc63cb9ab39132b585e
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 14:29:57 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue May 29 20:10:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7634da65

app-misc/binclock: bump EAPI and drop eutils

This also moves the sed call to a patch for the Makefile.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-misc/binclock/binclock-1.5.ebuild              | 21 ++++++++++-----------
 .../binclock/files/binclock-1.5-Makefile.patch     | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/app-misc/binclock/binclock-1.5.ebuild b/app-misc/binclock/binclock-1.5.ebuild
index 3e80505179b..0c4db18b0aa 100644
--- a/app-misc/binclock/binclock-1.5.ebuild
+++ b/app-misc/binclock/binclock-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Displays a binary clock in your terminal"
 HOMEPAGE="http://www.ngolde.de/binclock/"
@@ -17,16 +17,15 @@ IUSE=""
 RDEPEND=""
 DEPEND=">=sys-apps/sed-4"
 
-src_prepare() {
-	sed -i -e s/strip/true/ Makefile || die
-}
+PATCHES=( "${FILESDIR}/binclock-1.5-Makefile.patch" )
 
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die "emake failed"
+src_configure() {
+	append-cflags -Wall -pedantic
+	tc-export CC
 }
 
 src_install() {
-	dobin binclock || die "dobin failed"
-	doman doc/binclock.1 || die "doman failed"
-	dodoc CHANGELOG README binclockrc || die "dodoc failed"
+	dobin binclock
+	doman doc/binclock.1
+	dodoc CHANGELOG README binclockrc
 }

diff --git a/app-misc/binclock/files/binclock-1.5-Makefile.patch b/app-misc/binclock/files/binclock-1.5-Makefile.patch
new file mode 100644
index 00000000000..15a510186b5
--- /dev/null
+++ b/app-misc/binclock/files/binclock-1.5-Makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile	2018-05-29 10:18:47.795059054 -0400
++++ b/Makefile	2018-05-29 10:21:37.126740904 -0400
+@@ -18,8 +18,6 @@
+ # Boston, MA  02111-1307, USA
+ #
+ 
+-CC = gcc
+-CFLAGS = -O2 -Wall --pedantic
+ BIN = binclock
+ SRC = ./src/binclock.c
+ INSPATH = /usr/local/bin/
+@@ -28,8 +26,8 @@
+ CONF = /etc/
+ 
+ all : $(MAINSRC)
+-	$(CC) $(CFLAGS) -o $(BIN) $(SRC)
+-	strip $(SOURCEPATH)$(BIN)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN) $(SRC)
++	true $(SOURCEPATH)$(BIN)
+ 
+ install :
+ 

[gentoo-commits] repo/gentoo:master commit in: app-misc/binclock/files/, app-misc/binclock/

[David Seifert]

commit:     530d91bb46735077a1ec3847fb9c2ca374b1349e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 12:43:12 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 12:43:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530d91bb

app-misc/binclock: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../{binclock-1.5.ebuild => binclock-1.5-r1.ebuild}    | 15 +++++----------
 app-misc/binclock/files/binclock-1.5-Makefile.patch    | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/app-misc/binclock/binclock-1.5.ebuild b/app-misc/binclock/binclock-1.5-r1.ebuild
similarity index 64%
rename from app-misc/binclock/binclock-1.5.ebuild
rename to app-misc/binclock/binclock-1.5-r1.ebuild
index 733fc66c5a74..f609767f392a 100644
--- a/app-misc/binclock/binclock-1.5.ebuild
+++ b/app-misc/binclock/binclock-1.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Displays a binary clock in your terminal"
 HOMEPAGE="http://www.ngolde.de/binclock/"
@@ -12,20 +12,15 @@ SRC_URI="http://www.ngolde.de/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND=""
-DEPEND=">=sys-apps/sed-4"
-
-PATCHES=( "${FILESDIR}/binclock-1.5-Makefile.patch" )
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_configure() {
-	append-cflags -Wall -pedantic
 	tc-export CC
 }
 
 src_install() {
-	dobin binclock
+	dobin src/binclock
 	doman doc/binclock.1
 	dodoc CHANGELOG README binclockrc
 }

diff --git a/app-misc/binclock/files/binclock-1.5-Makefile.patch b/app-misc/binclock/files/binclock-1.5-Makefile.patch
index 15a510186b55..21fcec8cc40d 100644
--- a/app-misc/binclock/files/binclock-1.5-Makefile.patch
+++ b/app-misc/binclock/files/binclock-1.5-Makefile.patch
@@ -1,22 +1,24 @@
---- a/Makefile	2018-05-29 10:18:47.795059054 -0400
-+++ b/Makefile	2018-05-29 10:21:37.126740904 -0400
-@@ -18,8 +18,6 @@
+--- a/Makefile
++++ b/Makefile
+@@ -18,18 +18,15 @@
  # Boston, MA  02111-1307, USA
  #
  
 -CC = gcc
 -CFLAGS = -O2 -Wall --pedantic
- BIN = binclock
+-BIN = binclock
++CFLAGS += -Wall -pedantic
++BIN = ./src/binclock
  SRC = ./src/binclock.c
  INSPATH = /usr/local/bin/
-@@ -28,8 +26,8 @@
+ SOURCEPATH = ./
+ MANPATH = /usr/man/man1/
  CONF = /etc/
  
- all : $(MAINSRC)
+-all : $(MAINSRC)
 -	$(CC) $(CFLAGS) -o $(BIN) $(SRC)
 -	strip $(SOURCEPATH)$(BIN)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN) $(SRC)
-+	true $(SOURCEPATH)$(BIN)
++all : $(BIN)
  
  install :