From 0bff53119f08d677db6c1a991bd30741682a8a08 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 2 Jun 2018 17:13:10 +0100
Subject: Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.
---
 app-misc/binclock/Manifest                         |  3 +--
 app-misc/binclock/binclock-1.5.ebuild              | 21 +++++++++++----------
 .../binclock/files/binclock-1.5-Makefile.patch     | 22 ----------------------
 3 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 app-misc/binclock/files/binclock-1.5-Makefile.patch

(limited to 'app-misc/binclock')

diff --git a/app-misc/binclock/Manifest b/app-misc/binclock/Manifest
index 13ca25acb435..7104d4512c34 100644
--- a/app-misc/binclock/Manifest
+++ b/app-misc/binclock/Manifest
@@ -1,4 +1,3 @@
-AUX binclock-1.5-Makefile.patch 479 BLAKE2B 72cb38107301d133e6c17f43f5b3cb35d9401d6c41712603e3c8c6231c4ea560e3e24958ab46a1a9878272ddbcb6ce7cb82e64d2716736eae2b5e4007078e209 SHA512 7f120eeed63f27753875c7a4b8924f5db9bfc9c5048d414c1e5de7f53cf36138bfc185843e14292c9f47e87e2aeec1fd08a31254f7ac0716e4549588776fc773
 DIST binclock-1.5.tar.gz 12301 BLAKE2B 598185f21d257bd02cd4d91e0ddc707d5eaa9ff52160bd9af0d8d50238fe6ca134952bfc99d285568b77c747ec388ed7e23e3c4bac0fec5fd150e34e55687ed3 SHA512 f3650c8befb999a7e6261bc72ee4f81be670fe95899efc742112102c4107ebbbb25d015d57a702630ce2104cf8c738953c7fe70f24814514d8a2705240000e75
-EBUILD binclock-1.5.ebuild 643 BLAKE2B 7742dbc447638df9bac3260dafbe86eeed5a5e8efc6f6cfec435a970b978c9ad49f4c93f98ca2103456cc0ed96fc2d61b8696295e264cf7ddeb0736e86d405ef SHA512 d9b9a5878ce902b8c56812a0f290a47f33441b435c94b68fb5343096baf02daa41d1dbfbc68db345e09be62be1730dd5b0f8ab2648adc168f133baacf22dbdf0
+EBUILD binclock-1.5.ebuild 732 BLAKE2B bc61e463349f3008f4c77a507a55665956c0e6b3174ebcb16db85d8d865ff654bd78347f88e8fe5d45eebed8e2a6f83d03ee33e491b62eca6d7469f42cd98bea SHA512 6a0acd2fcf9778e2f1e7b85e0c6b8f816b24b0fb7c999f2d53195764c9b30a095f24f8abd6b9533ab923ca63df406367468162eb556f71f73234a6ea7c104378
 MISC metadata.xml 352 BLAKE2B 27cde27260dedf58780e1e1a2d53eababedd9d5166a2894ba4de8c50ecf78f3367c40e9fdcd4d8e55109bee2e6f371d5cb90ca57884dee5aca45845109d986c1 SHA512 f4fb925a021543b198c3fb8d4a53e5d1c5450fd7f49cd76c99d9252e1c52747359c327fa99ea3a1a8882d51949b298c39c368049f86b7890c84dccaa6746226c
diff --git a/app-misc/binclock/binclock-1.5.ebuild b/app-misc/binclock/binclock-1.5.ebuild
index 0c4db18b0aad..3e80505179b1 100644
--- a/app-misc/binclock/binclock-1.5.ebuild
+++ b/app-misc/binclock/binclock-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="2"
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Displays a binary clock in your terminal"
 HOMEPAGE="http://www.ngolde.de/binclock/"
@@ -17,15 +17,16 @@ IUSE=""
 RDEPEND=""
 DEPEND=">=sys-apps/sed-4"
 
-PATCHES=( "${FILESDIR}/binclock-1.5-Makefile.patch" )
+src_prepare() {
+	sed -i -e s/strip/true/ Makefile || die
+}
 
-src_configure() {
-	append-cflags -Wall -pedantic
-	tc-export CC
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin binclock
-	doman doc/binclock.1
-	dodoc CHANGELOG README binclockrc
+	dobin binclock || die "dobin failed"
+	doman doc/binclock.1 || die "doman failed"
+	dodoc CHANGELOG README binclockrc || die "dodoc failed"
 }
diff --git a/app-misc/binclock/files/binclock-1.5-Makefile.patch b/app-misc/binclock/files/binclock-1.5-Makefile.patch
deleted file mode 100644
index 15a510186b55..000000000000
--- a/app-misc/binclock/files/binclock-1.5-Makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 :
- 
-- 
cgit v1.2.3