public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/files/, app-arch/zoo/
@ 2017-10-07 12:31 Michael Palimaka
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2017-10-07 12:31 UTC (permalink / raw
  To: gentoo-commits

commit:     2e4814f45754dda7687601cd881f829bf7f3c600
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  7 12:30:46 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Oct  7 12:31:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e4814f4

app-arch/zoo: remove 2.10-r4

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-arch/zoo/Manifest                              |  2 -
 app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch    | 36 -----------
 app-arch/zoo/files/zoo-2.10-febz-183426.patch      | 16 -----
 app-arch/zoo/files/zoo-2.10-gentoo-fbsd.patch      | 25 --------
 app-arch/zoo/files/zoo-2.10-multiple-dos-fix.patch | 71 ----------------------
 .../zoo/files/zoo-2.10-security_pathsize.patch     | 23 -------
 app-arch/zoo/zoo-2.10-r4.ebuild                    | 36 -----------
 7 files changed, 209 deletions(-)

diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest
index 0a70f675c04..3182726ed62 100644
--- a/app-arch/zoo/Manifest
+++ b/app-arch/zoo/Manifest
@@ -1,4 +1,2 @@
-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-CAN-2005-2349.patch b/app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch
deleted file mode 100644
index 3752728c8e5..00000000000
--- a/app-arch/zoo/files/zoo-2.10-CAN-2005-2349.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Taken from Fedora
-
---- portable.c
-+++ portable.c
-@@ -364,6 +364,31 @@
-       show_dir(direntry);
-    }
- #endif
-+   char *p;
-+   /* take off '../'   */
-+   while ((p = strstr( direntry->dirname, "../" )) != NULL) {
-+      while (*(p+3) != '\0') {
-+        *p = *(p + 3);
-+        p++;
-+      }
-+      *p = *(p+3); /* move last null */
-+      //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname);
-+   }
-+   /* take off  '/'  */
-+   if ( direntry->dirname[0] == '/' ) {
-+      p = direntry->dirname;
-+      while (*p != '\0') {
-+        *p = *(p + 1);
-+        p++;
-+      }
-+      *p = *(p+1); /* move last null */
-+      //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname);
-+   }
-+   /* take off '..'   */
-+   if(!strcmp(direntry->dirname, ".."))
-+      direntry->dirname[0] = '\0';
-+   /* direntry->dirlen = strlen(direntry->dirname); */
-+
-    return (0);
- }
- 

diff --git a/app-arch/zoo/files/zoo-2.10-febz-183426.patch b/app-arch/zoo/files/zoo-2.10-febz-183426.patch
deleted file mode 100644
index d8e34d62809..00000000000
--- a/app-arch/zoo/files/zoo-2.10-febz-183426.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Taken from Fedora
-
-https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183426
-http://bugs.gentoo.org/125622
-
---- zoo/parse.c
-+++ zoo/parse.c
-@@ -39,7 +39,7 @@
-    char *namep;                   /* points to relevant part of tempname */
- 
-    char *p;
--   strcpy (tempname, fname);
-+   strncpy(tempname, fname, LFNAMESIZE);
- 
- #ifdef DEBUG
- printf ("parse:  supplied name is [%s].\n", tempname);

diff --git a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd.patch b/app-arch/zoo/files/zoo-2.10-gentoo-fbsd.patch
deleted file mode 100644
index 64eabaf4058..00000000000
--- a/app-arch/zoo/files/zoo-2.10-gentoo-fbsd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- sysv.c	2007-06-16 15:01:53 +0200
-+++ 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
---- 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/files/zoo-2.10-multiple-dos-fix.patch b/app-arch/zoo/files/zoo-2.10-multiple-dos-fix.patch
deleted file mode 100644
index b37cee0c94d..00000000000
--- a/app-arch/zoo/files/zoo-2.10-multiple-dos-fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ur zoo-2.10-r2/zooext.c zoo-2.10-r3/zooext.c
---- zoo-2.10-r2/zooext.c	2007-05-23 23:39:14.000000000 +0200
-+++ zoo-2.10-r3/zooext.c	2007-05-23 23:36:37.000000000 +0200
-@@ -89,6 +89,7 @@
- #endif
- struct direntry direntry;                 /* directory entry */
- int first_dir = 1;								/* first dir entry seen? */
-+ unsigned long zoo_pointer = 0;           /* Track our position in the file */
- 
- static char extract_ver[] = "Zoo %d.%d is needed to extract %s.\n";
- static char no_space[] = "Insufficient disk space to extract %s.\n";
-@@ -169,6 +170,9 @@
- 		exit_status = 1;
-    }
-    zooseek (zoo_file, zoo_header.zoo_start, 0); /* seek to where data begins */
-+
-+   /* Begin tracking our position in the file */ 
-+   zoo_pointer = zoo_header.zoo_start; 
- }
- 
- #ifndef PORTABLE
-@@ -597,6 +601,11 @@
-    } /* end if */
- 
- loop_again:
-+   /* Make sure we are not seeking to already processed data */ 
-+   if (next_ptr <= zoo_pointer)
-+     prterror ('f', "ZOO chain structure is corrupted\n");
-+   zoo_pointer = next_ptr; 
-+
-    zooseek (zoo_file, next_ptr, 0); /* ..seek to next dir entry */
- } /* end while */
- 
-Nur in zoo-2.10-r3: zooext.c~.
-Nur in zoo-2.10-r3: zooext.c.orig.
-diff -ur zoo-2.10-r2/zoolist.c zoo-2.10-r3/zoolist.c
---- zoo-2.10-r2/zoolist.c	1991-07-20 00:57:27.000000000 +0200
-+++ zoo-2.10-r3/zoolist.c	2007-05-23 23:38:19.000000000 +0200
-@@ -92,7 +92,7 @@
- int show_mode = 0;				/* show file protection */
- #endif
- int first_dir = 1;				/* if first direntry -- to adjust dat_ofs */
--
-+unsigned long zoo_pointer = 0; /* Track our position in the file */
- while (*option) {
-    switch (*option) {
-       case 'a': show_name++; break;
-@@ -211,6 +211,9 @@
- 		show_acmt (&zoo_header, zoo_file, 0);		/* show archive comment */
- 	}
- 
-+	/* Begin tracking our position in the file */
-+	zoo_pointer = zoo_header.zoo_start;
-+
-    /* Seek to the beginning of the first directory entry */
-    if (zooseek (zoo_file, zoo_header.zoo_start, 0) != 0) {
-       ercount++;
-@@ -437,6 +440,11 @@
-          if (verb_list && !fast)
-             show_comment (&direntry, zoo_file, 0, (char *) NULL);
-       } /* end if (lots of conditions) */
-+
-+      /* Make sure we are not seeking to already processed data */
-+      if (direntry.next <= zoo_pointer)
-+        prterror ('f', "ZOO chain structure is corrupted\n");
-+      zoo_pointer = direntry.next;
-    
- 		/* ..seek to next dir entry */
-       zooseek (zoo_file, direntry.next, 0);
-Nur in zoo-2.10-r3: zoolist.c~.
-Nur in zoo-2.10-r3: zoolist.c.orig.

diff --git a/app-arch/zoo/files/zoo-2.10-security_pathsize.patch b/app-arch/zoo/files/zoo-2.10-security_pathsize.patch
deleted file mode 100644
index 4f89530f43e..00000000000
--- a/app-arch/zoo/files/zoo-2.10-security_pathsize.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Taken from Fedora
-
---- misc.c
-+++ misc.c
-@@ -135,11 +135,17 @@
- char *fullpath (direntry)
- struct direntry *direntry;
- {
--	static char result[PATHSIZE];
-+	static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/
- 	combine (result,
- 				direntry->dirlen != 0 ? direntry->dirname : "", 
- 				(direntry->namlen != 0) ? direntry->lfname : direntry->fname
- 			  );
-+
-+       if (strlen (result) >= PATHSIZE) {
-+               prterror ('f', "Combined dirname and filename too long!\n");
-+               *result = '\0';
-+       }
-+
- 	return (result);
- }
- 

diff --git a/app-arch/zoo/zoo-2.10-r4.ebuild b/app-arch/zoo/zoo-2.10-r4.ebuild
deleted file mode 100644
index a3c48331b10..00000000000
--- a/app-arch/zoo/zoo-2.10-r4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Manipulate archives of files in compressed form"
-HOMEPAGE="ftp://ftp.kiarchive.ru/pub/unix/arcers"
-SRC_URI="ftp://ftp.kiarchive.ru/pub/unix/arcers/${P}pl1.tar.gz
-	mirror://gentoo/${P}-gcc-issues-fix.patch"
-
-LICENSE="zoo"
-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}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${DISTDIR}"/${P}-gcc-issues-fix.patch
-	epatch "${FILESDIR}"/${P}-CAN-2005-2349.patch
-	epatch "${FILESDIR}"/${P}-febz-183426.patch
-	epatch "${FILESDIR}"/${P}-security_pathsize.patch
-	epatch "${FILESDIR}"/${P}-multiple-dos-fix.patch
-	epatch "${FILESDIR}"/${P}-gentoo-fbsd.patch
-}
-
-src_compile() {
-	# emake no workie on FreeBSD
-	make CC="$(tc-getCC)" linux || die
-}
-
-src_install() {
-	dobin zoo fiz || die
-	doman zoo.1 fiz.1
-}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/files/, app-arch/zoo/
@ 2021-05-04 22:17 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-05-04 22:17 UTC (permalink / raw
  To: gentoo-commits

commit:     4047c3d29b22672dbe829c8440617c0ab53bb6b5
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Apr 29 21:46:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  4 22:17:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4047c3d2

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 <AT> sartura.hr>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch | 10 ++++----
 app-arch/zoo/files/zoo-2.10-makefile.patch       | 32 ++++++++++++++++++++++++
 app-arch/zoo/zoo-2.10-r5.ebuild                  | 21 ++++++++--------
 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 ba7d31e4a47..b1e598359f6 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 00000000000..89269b48045
--- /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 6c1f749c178..0cda3159c24 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() {


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/files/, app-arch/zoo/
@ 2023-12-11 13:04 Joonas Niilola
  0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2023-12-11 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8e7cf5cc7b1aef4dfe9ba1598483acf14d1785af
Author:     Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Tue Sep 19 11:43:01 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 13:03:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7cf5cc

app-arch/zoo: revbump, fix implicit ints

Closes: https://bugs.gentoo.org/878611
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32923
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-arch/zoo/files/zoo-2.10-implicit-int.patch | 75 ++++++++++++++++++++++++++
 app-arch/zoo/zoo-2.10-r6.ebuild                | 36 +++++++++++++
 2 files changed, 111 insertions(+)

diff --git a/app-arch/zoo/files/zoo-2.10-implicit-int.patch b/app-arch/zoo/files/zoo-2.10-implicit-int.patch
new file mode 100644
index 000000000000..e29f3dff8f1f
--- /dev/null
+++ b/app-arch/zoo/files/zoo-2.10-implicit-int.patch
@@ -0,0 +1,75 @@
+Clang 16 will not allow implicit int function defitions by default.
+This patch gives all functions a proper definitons.
+
+See also: https://wiki.gentoo.org/wiki/Modern_C_porting
+
+Bug: https://bugs.gentoo.org/878611
+Upstream PR: https://github.com/jduerstock/zoo/pull/1
+
+--- a/fiz.c
++++ b/fiz.c
+@@ -24,6 +24,7 @@ file by supplying the offset of the file.
+ void prtctrl ();
+ void prtch ();
+ 
++int
+ main(argc,argv)
+ register int argc;
+ register char **argv;
+--- a/mstime.i
++++ b/mstime.i
+@@ -12,6 +12,7 @@ static char mstimeid[]="@(#) mstime.i 2.2 88/01/24 12:47:58";
+ Function mstime() converts time in seconds since January 1 of BASEYEAR
+ to MS-DOS format date and time.
+ */
++void
+ mstime(longtime, date, time)
+ long longtime;       /* input:  seconds since Jan 1, BASEYEAR   */
+ int *date, *time;    /* output: MS-DOS format date and time */
+--- a/zoo.c
++++ b/zoo.c
+@@ -44,6 +44,7 @@ int next_arg = FIRST_ARG; /* filenames start at this position */
+ int arg_count;          /* count of arguments supplied to program */
+ char **arg_vector;      /* vector of arguments supplied to program */
+ 
++int
+ main(argc,argv)
+ register int argc;
+ register char **argv;
+--- a/zoofilt.c
++++ b/zoofilt.c
+@@ -41,8 +41,10 @@ char *option;
+ 	unsigned int filetag;							/* tag stored in input */
+ 	int stat1, stat2, stat3;						/* status codes */
+ 	int use_lzh = 0;									/* use lzh instead */
+-	extern lzc(), lzh_encode();					/* possible encoders */
+-	extern lzd(), lzh_decode();					/* and decoders */
++	extern int lzc();					/* possible encoders */
++	extern int lzh_encode();
++	extern int lzd();					/* and decoders */
++	extern int lzh_decode();
+ 
+ 	while (*++option) {
+ 		switch (*option) {
+--- a/nixtime.i
++++ b/nixtime.i
+@@ -20,7 +20,7 @@
+ Function gettime() gets the date and time of the file handle supplied.
+ Date and time is in MSDOS format.
+ */
+-int gettime (file, date, time)
++void gettime (file, date, time)
+ ZOOFILE file;
+ unsigned *date, *time;
+ {
+--- a/zoofns.h
++++ b/zoofns.h
+@@ -46,7 +46,7 @@
+ int exists PARMS ((char *));
+ int getfile PARMS ((ZOOFILE, ZOOFILE, long, int));
+ int getutime PARMS ((char *, unsigned *, unsigned *));
+-int gettime PARMS ((ZOOFILE, unsigned *, unsigned *));
++void gettime PARMS ((ZOOFILE, unsigned *, unsigned *));
+ T_SIGNAL handle_break PARMS ((int));
+ 
+ #ifdef USE_ASCII

diff --git a/app-arch/zoo/zoo-2.10-r6.ebuild b/app-arch/zoo/zoo-2.10-r6.ebuild
new file mode 100644
index 000000000000..af94cc9c6c89
--- /dev/null
+++ b/app-arch/zoo/zoo-2.10-r6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Manipulate archives of files in compressed form"
+HOMEPAGE="https://github.com/jduerstock/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"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches/.
+	"${FILESDIR}"/${P}-gentoo-fbsd-r1.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-implicit-int.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	emake linux
+}
+
+src_install() {
+	dobin zoo fiz
+	doman zoo.1 fiz.1
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-12-11 13:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-04 22:17 [gentoo-commits] repo/gentoo:master commit in: app-arch/zoo/files/, app-arch/zoo/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-12-11 13:04 Joonas Niilola
2017-10-07 12:31 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox