app-arch/zoo: Port to EAPI 7, fix CFLAGS, tc-directly

Closes: https://bugs.gentoo.org/726376
Closes: https://bugs.gentoo.org/721888
Closes: https://bugs.gentoo.org/729126
Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 48 insertions, 15 deletions

diff --git a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
index ba7d31e4a47d..b1e598359f6c 100644
--- a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
+++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
@@ -1,5 +1,5 @@
---- a/sysv.c	2007-06-16 15:01:53 +0200
-+++ b/sysv.c.new	2007-06-16 14:38:38 +0200
+--- a/sysv.c
++++ b/sysv.c
 @@ -63,8 +63,8 @@
     return (fname); /* default is no-op */
  }
@@ -11,8 +11,8 @@
  struct tm *localtime ();
  
  /* Function gettz(), returns the offset from GMT in seconds of the
---- a/zoo.h	2007-06-16 15:01:53 +0200
-+++ /zoo.h.new	2007-06-16 14:57:58 +0200
+--- a/zoo.h
++++ b/zoo.h
 @@ -95,6 +95,9 @@
  #endif
  
@@ -22,4 +22,4 @@
 +typedef unsigned short ushort;
  
  /* WARNING:  Static initialization in zooadd.c or zooext.c depends on the 
-    order of fields in struct zoo_header */
\ No newline at end of file
+    order of fields in struct zoo_header */
diff --git a/app-arch/zoo/files/zoo-2.10-makefile.patch b/app-arch/zoo/files/zoo-2.10-makefile.patch
new file mode 100644
index 000000000000..89269b480457
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-makefile.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/726376
+https://bugs.gentoo.org/721888
+https://bugs.gentoo.org/729126
+--- a/makefile
++++ b/makefile
+@@ -18,15 +18,12 @@
+ 
+ MAKE = make	      # needed for some systems e.g. older BSD
+ 
+-CC = cc
+-CFLAGS =
+ MODEL =
+ EXTRA = -DBIG_MEM -DNDEBUG
+ LINTFLAGS = -DLINT
+-OPTIM = `dpkg-buildflags --get CFLAGS`
++OPTIM = $(CFLAGS)
+ OPTIM += -Wall
+-OPTIM += `dpkg-buildflags --get CPPFLAGS`
+-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
++OPTIM += $(CPPFLAGS)
+ 
+ DESTDIR = /usr/local/bin
+ 
+@@ -102,7 +99,7 @@ bsd:
+ 
+ # Linux
+ linux:
+-	$(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS)
++	$(MAKE) CC="$(CC)" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS)
+ 
+ # Linux64
+ linux64:
diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild
index 6c1f749c178c..0cda3159c240 100644
--- a/app-arch/zoo/zoo-2.10-r5.ebuild
+++ b/app-arch/zoo/zoo-2.10-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -9,23 +9,24 @@ DESCRIPTION="Manipulate archives of files in compressed form"
 HOMEPAGE="https://packages.debian.org/sid/utils/zoo"
 SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz
 	http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz"
+S="${WORKDIR}"/${P}.orig
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
 
-S="${WORKDIR}/${P}.orig"
+PATCHES=(
+	"${WORKDIR}"/debian/patches/.
+	"${FILESDIR}"/${P}-gentoo-fbsd-r1.patch
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
-PATCHES=( "${FILESDIR}/zoo-2.10-gentoo-fbsd-r1.patch" )
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches/*.patch
-	default
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" linux
+	emake linux
 }
 
 src_install() {