diff options
Diffstat (limited to 'app-arch/arj')
| -rw-r--r-- | app-arch/arj/arj-3.10.22-r8.ebuild (renamed from app-arch/arj/arj-3.10.22-r7.ebuild) | 24 | ||||
| -rw-r--r-- | app-arch/arj/files/arj-3.10.22-interix.patch | 45 | ||||
| -rw-r--r-- | app-arch/arj/metadata.xml | 2 |
3 files changed, 8 insertions, 63 deletions
diff --git a/app-arch/arj/arj-3.10.22-r7.ebuild b/app-arch/arj/arj-3.10.22-r8.ebuild index 2d32c5a42f08..411fee4059d2 100644 --- a/app-arch/arj/arj-3.10.22-r7.ebuild +++ b/app-arch/arj/arj-3.10.22-r8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit autotools toolchain-funcs @@ -9,39 +9,29 @@ PATCH_LEVEL=15 MY_P="${PN}_${PV}" DESCRIPTION="Utility for opening arj archives" -HOMEPAGE="http://arj.sourceforge.net/" -SRC_URI="mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz +HOMEPAGE="https://arj.sourceforge.net/" +SRC_URI=" + mirror://debian/pool/main/a/arj/${MY_P}.orig.tar.gz mirror://debian/pool/main/a/arj/${MY_P}-${PATCH_LEVEL}.debian.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="" +KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" PATCHES=( "${FILESDIR}/${P}-implicit-declarations.patch" "${FILESDIR}/${P}-glibc2.10.patch" "${WORKDIR}"/debian/patches/ "${FILESDIR}/${P}-darwin.patch" - "${FILESDIR}/${P}-interix.patch" ) -DOCS=( - doc/compile.txt - doc/debug.txt - doc/glossary.txt - doc/rev_hist.txt - doc/xlation.txt -) +DOCS=( doc/compile.txt doc/debug.txt doc/glossary.txt doc/rev_hist.txt doc/xlation.txt ) src_prepare() { default cd gnu || die 'failed to change to the "gnu" directory' echo -n "" > stripgcc.lnk || die "failed to disable stripgcc.lnk" - # This gets rid of the QA warning, but should be fixed upstream... - mv configure.{in,ac} || die 'failed to move configure.in to configure.ac' - eautoreconf } diff --git a/app-arch/arj/files/arj-3.10.22-interix.patch b/app-arch/arj/files/arj-3.10.22-interix.patch deleted file mode 100644 index 8294f1e96bb4..000000000000 --- a/app-arch/arj/files/arj-3.10.22-interix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ru arj-3.10.22.orig/environ.c arj-3.10.22/environ.c ---- arj-3.10.22.orig/environ.c 2008-03-30 16:51:40 +0200 -+++ arj-3.10.22/environ.c 2008-03-30 16:50:16 +0200 -@@ -61,7 +61,7 @@ - #elif defined(__FreeBSD__)||defined(__NetBSD__)||defined(__APPLE__) - #include <sys/param.h> - #include <sys/mount.h> -- #elif defined(__QNXNTO__) -+ #elif defined(__QNXNTO__) || defined(__INTERIX) - #include <sys/statvfs.h> - #else - #include <sys/statfs.h> -@@ -2286,7 +2286,7 @@ - else - return((LONG_MAX/(spclu*bps)<fclu)?LONG_MAX:spclu*bps*fclu); - #elif TARGET==UNIX -- #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS) -+ #if defined(__QNXNTO__)||defined(__sco__)||defined(SUNOS)||defined(__INTERIX) - struct statvfs vfs; - - if(statvfs(name, &vfs)==-1) -@@ -3802,7 +3802,9 @@ - #elif TARGET==WIN32 - return(0); - #elif TARGET==UNIX -+ #ifndef __INTERIX - sync(); -+ #endif - return(0); - #endif - } -diff -ru arj-3.10.22.orig/gnu/configure.in arj-3.10.22/gnu/configure.in ---- arj-3.10.22.orig/gnu/configure.in 2008-03-30 16:51:40 +0200 -+++ arj-3.10.22/gnu/configure.in 2008-03-30 16:41:37 +0200 -@@ -67,8 +67,9 @@ - DLL_EXT=".dylib" - DLL_FLAGS="" - ;; --interix3*) -+interix*) - # not ELF -+ DYN_LIBS="-ldl" - DLL_FLAGS="-shared" - DLL_CFLAGS="" - ;; diff --git a/app-arch/arj/metadata.xml b/app-arch/arj/metadata.xml index cb9416dc0bb7..18b2cd894649 100644 --- a/app-arch/arj/metadata.xml +++ b/app-arch/arj/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> |