1 |
commit: 305688418b25a4e94d102fc1d0dc1fcdbf74c86d |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 6 23:48:42 2017 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 6 23:49:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30568841 |
7 |
|
8 |
app-arch/zoo: new EAPI=6 revision to fix two bugs. |
9 |
|
10 |
This new revision updates to EAPI=6 and switches our upstream to |
11 |
Debian. Doing so obsoletes most of our custom patches, and fixes the |
12 |
build with -Werror=format-security. |
13 |
|
14 |
The LICENSE variable has also been updated to "public-domain", since |
15 |
the author released it as such to Debian in an email. That means the |
16 |
"zoo" license will soon be unused. |
17 |
|
18 |
Two things may come back to bite me: |
19 |
|
20 |
* I omitted the "gcc fixes" patch, because there is no indication |
21 |
of what it's supposed to fix. The thing builds fine here. |
22 |
|
23 |
* I switched the "make" command back to "emake", because that's how |
24 |
it should be. If it still causes problems with BSD systems, I |
25 |
guess we can put it back. |
26 |
|
27 |
The program is still announcing that it's copyrighted, but that will |
28 |
have to be patched out. |
29 |
|
30 |
Gentoo-Bug: 520476 |
31 |
Gentoo-Bug: 614674 |
32 |
|
33 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
34 |
|
35 |
app-arch/zoo/Manifest | 2 ++ |
36 |
app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch | 25 +++++++++++++++++ |
37 |
app-arch/zoo/zoo-2.10-r5.ebuild | 34 ++++++++++++++++++++++++ |
38 |
3 files changed, 61 insertions(+) |
39 |
|
40 |
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest |
41 |
index 7024a3ea8c5..0a70f675c04 100644 |
42 |
--- a/app-arch/zoo/Manifest |
43 |
+++ b/app-arch/zoo/Manifest |
44 |
@@ -1,2 +1,4 @@ |
45 |
DIST zoo-2.10-gcc-issues-fix.patch 19467 SHA256 0215efd7aa218048f5f8bc085810f89cad6a9f710234f0d0e93be959a02f582b SHA512 a5b5e857b3d38633224ca8a28717cb529a11a2e66ca974fb9b7e326d18443657439b88b4af4867492399813845496dc0812a7e07885b01116e0163416562ce3c WHIRLPOOL dcf18afbfb097e4edf35dd0b9a10f8253c949d0017ad4c26b7bf3f0acfaa090bc32a3d06e5fa55960073baa06b6d4a8721674a355a060d31ee6acf32c13ec247 |
46 |
DIST zoo-2.10pl1.tar.gz 172096 SHA256 ad8d8fee5e524aca0e1e9a1e431c21cd59943d8373d5dffe4edca03a7e4284f4 SHA512 cf69b15020ebcbd10bda19967a52ac6f8fe09dc598e8034b82449c50f4c5000571a5be284452f5e7801d134e1581f8f9e871fbef65518dc9c69a77fb536f2c12 WHIRLPOOL 430fe2bd185dc1845afd36426966d0c29a2df5495d6c5c8e3092de5da48a77b781430cf95c93467826da03b646ab4641b881c5bacd4e6e763cb409dcbcf11762 |
47 |
+DIST zoo_2.10-28.debian.tar.xz 14984 SHA256 17ce35beb831b9d67a2fc19172f519881ef88fd6f134ffe69f327c7a8c9e7a78 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708 WHIRLPOOL bb21e803f88471806ada28d279925b3841fa93b19d730a202341c58d2c95907f71ebdfa1627f14587c96890ac313523a0e35d8c12b9195c883eae4eef39c4893 |
48 |
+DIST zoo_2.10.orig.tar.gz 172629 SHA256 a8bd2fb9907db425760831eb28b3b690c18529a53568e7e9c42a97f9ef70f129 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f WHIRLPOOL 566645ea8e00ec0f938657cc725deac3bdef42f5773a1c9514079afebffb27c1770b305b6448e848da511e1434e19cd41dca2ed77be690735921112ade1ec005 |
49 |
|
50 |
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 |
51 |
new file mode 100644 |
52 |
index 00000000000..ba7d31e4a47 |
53 |
--- /dev/null |
54 |
+++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch |
55 |
@@ -0,0 +1,25 @@ |
56 |
+--- a/sysv.c 2007-06-16 15:01:53 +0200 |
57 |
++++ b/sysv.c.new 2007-06-16 14:38:38 +0200 |
58 |
+@@ -63,8 +63,8 @@ |
59 |
+ return (fname); /* default is no-op */ |
60 |
+ } |
61 |
+ |
62 |
+-extern long timezone; /* defined by library routine */ |
63 |
+-long time (); |
64 |
++/*extern long timezone; defined by library routine */ |
65 |
++/* long time (); */ |
66 |
+ struct tm *localtime (); |
67 |
+ |
68 |
+ /* Function gettz(), returns the offset from GMT in seconds of the |
69 |
+--- a/zoo.h 2007-06-16 15:01:53 +0200 |
70 |
++++ /zoo.h.new 2007-06-16 14:57:58 +0200 |
71 |
+@@ -95,6 +95,9 @@ |
72 |
+ #endif |
73 |
+ |
74 |
+ typedef unsigned char uchar; |
75 |
++typedef unsigned int uint; |
76 |
++typedef unsigned long ulong; |
77 |
++typedef unsigned short ushort; |
78 |
+ |
79 |
+ /* WARNING: Static initialization in zooadd.c or zooext.c depends on the |
80 |
+ order of fields in struct zoo_header */ |
81 |
\ No newline at end of file |
82 |
|
83 |
diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild |
84 |
new file mode 100644 |
85 |
index 00000000000..68ba0e6602c |
86 |
--- /dev/null |
87 |
+++ b/app-arch/zoo/zoo-2.10-r5.ebuild |
88 |
@@ -0,0 +1,34 @@ |
89 |
+# Copyright 1999-2017 Gentoo Foundation |
90 |
+# Distributed under the terms of the GNU General Public License v2 |
91 |
+ |
92 |
+EAPI=6 |
93 |
+ |
94 |
+inherit toolchain-funcs |
95 |
+ |
96 |
+DESCRIPTION="Manipulate archives of files in compressed form" |
97 |
+HOMEPAGE="https://packages.debian.org/sid/utils/zoo" |
98 |
+SRC_URI="http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}.orig.tar.gz |
99 |
+ http://http.debian.net/debian/pool/main/z/${PN}/${PN}_${PV}-28.debian.tar.xz" |
100 |
+ |
101 |
+LICENSE="public-domain" |
102 |
+SLOT="0" |
103 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris" |
104 |
+IUSE="" |
105 |
+ |
106 |
+S="${WORKDIR}/${P}.orig" |
107 |
+ |
108 |
+PATCHES=( "${FILESDIR}/zoo-2.10-gentoo-fbsd-r1.patch" ) |
109 |
+ |
110 |
+src_prepare() { |
111 |
+ eapply "${WORKDIR}"/debian/patches/*.patch |
112 |
+ default |
113 |
+} |
114 |
+ |
115 |
+src_compile() { |
116 |
+ emake CC="$(tc-getCC)" linux |
117 |
+} |
118 |
+ |
119 |
+src_install() { |
120 |
+ dobin zoo fiz |
121 |
+ doman zoo.1 fiz.1 |
122 |
+} |