summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Orlitzky <mjo@gentoo.org>2017-05-06 19:48:42 -0400
committerMichael Orlitzky <mjo@gentoo.org>2017-05-06 19:49:04 -0400
commit305688418b25a4e94d102fc1d0dc1fcdbf74c86d (patch)
treee6ac6471d04344c21a5e10433a0d41adb4e9e68b /app-arch
parentapp-text/convmv: Bump to version 2.01 (diff)
downloadgentoo-305688418b25a4e94d102fc1d0dc1fcdbf74c86d.tar.gz
gentoo-305688418b25a4e94d102fc1d0dc1fcdbf74c86d.tar.bz2
gentoo-305688418b25a4e94d102fc1d0dc1fcdbf74c86d.zip
app-arch/zoo: new EAPI=6 revision to fix two bugs.
This new revision updates to EAPI=6 and switches our upstream to Debian. Doing so obsoletes most of our custom patches, and fixes the build with -Werror=format-security. The LICENSE variable has also been updated to "public-domain", since the author released it as such to Debian in an email. That means the "zoo" license will soon be unused. Two things may come back to bite me: * I omitted the "gcc fixes" patch, because there is no indication of what it's supposed to fix. The thing builds fine here. * I switched the "make" command back to "emake", because that's how it should be. If it still causes problems with BSD systems, I guess we can put it back. The program is still announcing that it's copyrighted, but that will have to be patched out. Gentoo-Bug: 520476 Gentoo-Bug: 614674 Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'app-arch')
-rw-r--r--app-arch/zoo/Manifest2
-rw-r--r--app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch25
-rw-r--r--app-arch/zoo/zoo-2.10-r5.ebuild34
3 files changed, 61 insertions, 0 deletions
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
index 7024a3ea8c55..0a70f675c04c 100644
--- a/app-arch/zoo/Manifest
+++ b/app-arch/zoo/Manifest
@@ -1,2 +1,4 @@
DIST zoo-2.10-gcc-issues-fix.patch 19467 SHA256 0215efd7aa218048f5f8bc085810f89cad6a9f710234f0d0e93be959a02f582b SHA512 a5b5e857b3d38633224ca8a28717cb529a11a2e66ca974fb9b7e326d18443657439b88b4af4867492399813845496dc0812a7e07885b01116e0163416562ce3c WHIRLPOOL dcf18afbfb097e4edf35dd0b9a10f8253c949d0017ad4c26b7bf3f0acfaa090bc32a3d06e5fa55960073baa06b6d4a8721674a355a060d31ee6acf32c13ec247
DIST zoo-2.10pl1.tar.gz 172096 SHA256 ad8d8fee5e524aca0e1e9a1e431c21cd59943d8373d5dffe4edca03a7e4284f4 SHA512 cf69b15020ebcbd10bda19967a52ac6f8fe09dc598e8034b82449c50f4c5000571a5be284452f5e7801d134e1581f8f9e871fbef65518dc9c69a77fb536f2c12 WHIRLPOOL 430fe2bd185dc1845afd36426966d0c29a2df5495d6c5c8e3092de5da48a77b781430cf95c93467826da03b646ab4641b881c5bacd4e6e763cb409dcbcf11762
+DIST zoo_2.10-28.debian.tar.xz 14984 SHA256 17ce35beb831b9d67a2fc19172f519881ef88fd6f134ffe69f327c7a8c9e7a78 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708 WHIRLPOOL bb21e803f88471806ada28d279925b3841fa93b19d730a202341c58d2c95907f71ebdfa1627f14587c96890ac313523a0e35d8c12b9195c883eae4eef39c4893
+DIST zoo_2.10.orig.tar.gz 172629 SHA256 a8bd2fb9907db425760831eb28b3b690c18529a53568e7e9c42a97f9ef70f129 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f WHIRLPOOL 566645ea8e00ec0f938657cc725deac3bdef42f5773a1c9514079afebffb27c1770b305b6448e848da511e1434e19cd41dca2ed77be690735921112ade1ec005
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
new file mode 100644
index 000000000000..ba7d31e4a47d
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch
@@ -0,0 +1,25 @@
+--- a/sysv.c 2007-06-16 15:01:53 +0200
++++ b/sysv.c.new 2007-06-16 14:38:38 +0200
+@@ -63,8 +63,8 @@
+ return (fname); /* default is no-op */
+ }
+
+-extern long timezone; /* defined by library routine */
+-long time ();
++/*extern long timezone; defined by library routine */
++/* long time (); */
+ 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
+@@ -95,6 +95,9 @@
+ #endif
+
+ typedef unsigned char uchar;
++typedef unsigned int uint;
++typedef unsigned long ulong;
++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
diff --git a/app-arch/zoo/zoo-2.10-r5.ebuild b/app-arch/zoo/zoo-2.10-r5.ebuild
new file mode 100644
index 000000000000..68ba0e6602c7
--- /dev/null
+++ b/app-arch/zoo/zoo-2.10-r5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+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"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+S="${WORKDIR}/${P}.orig"
+
+PATCHES=( "${FILESDIR}/zoo-2.10-gentoo-fbsd-r1.patch" )
+
+src_prepare() {
+ eapply "${WORKDIR}"/debian/patches/*.patch
+ default
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" linux
+}
+
+src_install() {
+ dobin zoo fiz
+ doman zoo.1 fiz.1
+}