1 |
commit: 4047c3d29b22672dbe829c8440617c0ab53bb6b5 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Thu Apr 29 21:46:09 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 4 22:17:00 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4047c3d2 |
7 |
|
8 |
app-arch/zoo: Port to EAPI 7, fix CFLAGS, tc-directly |
9 |
|
10 |
Closes: https://bugs.gentoo.org/726376 |
11 |
Closes: https://bugs.gentoo.org/721888 |
12 |
Closes: https://bugs.gentoo.org/729126 |
13 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch | 10 ++++---- |
17 |
app-arch/zoo/files/zoo-2.10-makefile.patch | 32 ++++++++++++++++++++++++ |
18 |
app-arch/zoo/zoo-2.10-r5.ebuild | 21 ++++++++-------- |
19 |
3 files changed, 48 insertions(+), 15 deletions(-) |
20 |
|
21 |
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 |
22 |
index ba7d31e4a47..b1e598359f6 100644 |
23 |
--- a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch |
24 |
+++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch |
25 |
@@ -1,5 +1,5 @@ |
26 |
---- a/sysv.c 2007-06-16 15:01:53 +0200 |
27 |
-+++ b/sysv.c.new 2007-06-16 14:38:38 +0200 |
28 |
+--- a/sysv.c |
29 |
++++ b/sysv.c |
30 |
@@ -63,8 +63,8 @@ |
31 |
return (fname); /* default is no-op */ |
32 |
} |
33 |
@@ -11,8 +11,8 @@ |
34 |
struct tm *localtime (); |
35 |
|
36 |
/* Function gettz(), returns the offset from GMT in seconds of the |
37 |
---- a/zoo.h 2007-06-16 15:01:53 +0200 |
38 |
-+++ /zoo.h.new 2007-06-16 14:57:58 +0200 |
39 |
+--- a/zoo.h |
40 |
++++ b/zoo.h |
41 |
@@ -95,6 +95,9 @@ |
42 |
#endif |
43 |
|
44 |
@@ -22,4 +22,4 @@ |
45 |
+typedef unsigned short ushort; |
46 |
|
47 |
/* WARNING: Static initialization in zooadd.c or zooext.c depends on the |
48 |
- order of fields in struct zoo_header */ |
49 |
\ No newline at end of file |
50 |
+ order of fields in struct zoo_header */ |
51 |
|
52 |
diff --git a/app-arch/zoo/files/zoo-2.10-makefile.patch b/app-arch/zoo/files/zoo-2.10-makefile.patch |
53 |
new file mode 100644 |
54 |
index 00000000000..89269b48045 |
55 |
--- /dev/null |
56 |
+++ b/app-arch/zoo/files/zoo-2.10-makefile.patch |
57 |
@@ -0,0 +1,32 @@ |
58 |
+https://bugs.gentoo.org/726376 |
59 |
+https://bugs.gentoo.org/721888 |
60 |
+https://bugs.gentoo.org/729126 |
61 |
+--- a/makefile |
62 |
++++ b/makefile |
63 |
+@@ -18,15 +18,12 @@ |
64 |
+ |
65 |
+ MAKE = make # needed for some systems e.g. older BSD |
66 |
+ |
67 |
+-CC = cc |
68 |
+-CFLAGS = |
69 |
+ MODEL = |
70 |
+ EXTRA = -DBIG_MEM -DNDEBUG |
71 |
+ LINTFLAGS = -DLINT |
72 |
+-OPTIM = `dpkg-buildflags --get CFLAGS` |
73 |
++OPTIM = $(CFLAGS) |
74 |
+ OPTIM += -Wall |
75 |
+-OPTIM += `dpkg-buildflags --get CPPFLAGS` |
76 |
+-LDFLAGS = `dpkg-buildflags --get LDFLAGS` |
77 |
++OPTIM += $(CPPFLAGS) |
78 |
+ |
79 |
+ DESTDIR = /usr/local/bin |
80 |
+ |
81 |
+@@ -102,7 +99,7 @@ bsd: |
82 |
+ |
83 |
+ # Linux |
84 |
+ linux: |
85 |
+- $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS) |
86 |
++ $(MAKE) CC="$(CC)" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS) |
87 |
+ |
88 |
+ # Linux64 |
89 |
+ linux64: |
90 |
|
91 |
diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild |
92 |
index 6c1f749c178..0cda3159c24 100644 |
93 |
--- a/app-arch/zoo/zoo-2.10-r5.ebuild |
94 |
+++ b/app-arch/zoo/zoo-2.10-r5.ebuild |
95 |
@@ -1,7 +1,7 @@ |
96 |
-# Copyright 1999-2020 Gentoo Authors |
97 |
+# Copyright 1999-2021 Gentoo Authors |
98 |
# Distributed under the terms of the GNU General Public License v2 |
99 |
|
100 |
-EAPI=6 |
101 |
+EAPI=7 |
102 |
|
103 |
inherit toolchain-funcs |
104 |
|
105 |
@@ -9,23 +9,24 @@ DESCRIPTION="Manipulate archives of files in compressed form" |
106 |
HOMEPAGE="https://packages.debian.org/sid/utils/zoo" |
107 |
SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz |
108 |
http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz" |
109 |
+S="${WORKDIR}"/${P}.orig |
110 |
|
111 |
LICENSE="public-domain" |
112 |
SLOT="0" |
113 |
KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" |
114 |
-IUSE="" |
115 |
|
116 |
-S="${WORKDIR}/${P}.orig" |
117 |
+PATCHES=( |
118 |
+ "${WORKDIR}"/debian/patches/. |
119 |
+ "${FILESDIR}"/${P}-gentoo-fbsd-r1.patch |
120 |
+ "${FILESDIR}"/${P}-makefile.patch |
121 |
+) |
122 |
|
123 |
-PATCHES=( "${FILESDIR}/zoo-2.10-gentoo-fbsd-r1.patch" ) |
124 |
- |
125 |
-src_prepare() { |
126 |
- eapply "${WORKDIR}"/debian/patches/*.patch |
127 |
- default |
128 |
+src_configure() { |
129 |
+ tc-export CC |
130 |
} |
131 |
|
132 |
src_compile() { |
133 |
- emake CC="$(tc-getCC)" linux |
134 |
+ emake linux |
135 |
} |
136 |
|
137 |
src_install() { |