diff options
| author |   Joe Kappus <joe@wt.gd> | 2024-04-17 06:17:17 -0400 |
|---|---|---|
| committer | Joe Kappus <joe@wt.gd> | 2024-04-17 06:25:37 -0400 |
| commit | 681e65013fae37e64f5b37d85179f98ad44bb2fe (patch) | |
| tree | c68658bd8c972e1b82e6de18c54aa17400809ecc /app-arch | |
| parent | app-arch/unalz: add myself as a maintainer (diff) | |
| download | guru-681e65013fae37e64f5b37d85179f98ad44bb2fe.tar.gz guru-681e65013fae37e64f5b37d85179f98ad44bb2fe.tar.bz2 guru-681e65013fae37e64f5b37d85179f98ad44bb2fe.zip | |
app-arch/unalz: update EAPI 7 -> 8, fixups
Major fixups, didn't revbump as nobody
could build this for years.
It needs a little more to work with clang,
but with gcc it's fine.
Closes: https://bugs.gentoo.org/784506
Closes: https://bugs.gentoo.org/900995
Signed-off-by: Joe Kappus <joe@wt.gd>
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/unalz/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/unalz/files/unalz-0.65-respect-compiler-flags.patch | 36 | ||||
| -rw-r--r-- | app-arch/unalz/unalz-0.65-r1.ebuild | 30 |
3 files changed, 56 insertions, 14 deletions
diff --git a/app-arch/unalz/Manifest b/app-arch/unalz/Manifest index c0a9924e3..01106b027 100644 --- a/app-arch/unalz/Manifest +++ b/app-arch/unalz/Manifest @@ -1,3 +1,3 @@ -DIST unalz-0.65-use-system-bz2.patch.bz2 18820 BLAKE2B 7737efd16b9510b981dba46847c8ec9725adeb9a64a1df0473a37bb2aac9dc6fc10c6289c22e8b264d7c676633a1b0bea78922f2a3ec5ac39e0697d045117bef SHA512 4247a39258607bb5c58989c199b0914188c1d3d2ff5021f8c2aa4b5d9c04a1caeab1989fd069326c53073181e5cfdea286a6e750611b10ba421fa22b718c58c2 -DIST unalz-0.65-use-system-zlib.patch.bz2 57637 BLAKE2B eb647a7f8f89314a64d96a46908d17f89776e3e0837a7b483d3a425e0932f7fea4bb7aa7378628c3ce9abf6d91081756ead937696a1577612857fd4dba3d38f3 SHA512 8aa24822b36cf771cf12ae73b958b83bed83696624396cfa3e73dfc39e8f9c924fd6df3c3dd469269bc31845c044990dbb1f21b4f058c195d0eb4414c54621f5 +DIST unalz-0.65-use-system-bz2.patch 1477 BLAKE2B bf92a6682557ca130c9b5e3cfb5e04ad399d7208e0632713ec7f117a2241e3b1863721c02d29b3b66f7c8e4a91369f1abb631e31d4fa9f6c96742b80e24f3ddf SHA512 404bcaf223c61e2a38c802c6eb8b51146a3aba51c4d032d71e915514d795c0a25e0ff6e16314ed15ec536eb430cb2747d2e1980a78a26830eb0c0b7e732f27e4 +DIST unalz-0.65-use-system-zlib.patch 1455 BLAKE2B d9a356523b19d4726c4e70cf97b6819f1a4511e73db57c954757a7df05521595b86c49a92392df50e712e9652118ac53711f27e661bf53d6c85706e153785e59 SHA512 7aa1e5736854d1de372e00cee4ea364b2fd96b7f0533a9526a8dea1f4984e5582a444e78aea7b21f9f3d7878c3865424aa7409e66e4b0c5fc2a07fe5c1fecac4 DIST unalz-0.65.tgz 137985 BLAKE2B d99ca69a46c45ac1e231fe394fbf7f5d4721e10838c8684c8b436f779e2e3286c7586ce345fe3548cc41931c904366f96fbb82fadd9a62faeefa862f924ffb4e SHA512 6e22d1e28c956ced5c9dbfd4d7b5c03f36a8bd3e076801984cc4539e579cefbb1a6001d1086b33e14843e9d5be37a6cf811acffb52bb5dfb5d4a65518b735600 diff --git a/app-arch/unalz/files/unalz-0.65-respect-compiler-flags.patch b/app-arch/unalz/files/unalz-0.65-respect-compiler-flags.patch new file mode 100644 index 000000000..3f6477b3a --- /dev/null +++ b/app-arch/unalz/files/unalz-0.65-respect-compiler-flags.patch @@ -0,0 +1,36 @@ +diff --git a/Makefile b/Makefile +index 31012ca..8357917 100755 +--- a/Makefile ++++ b/Makefile +@@ -1,8 +1,8 @@ +-CPP = g++ +-CC = gcc ++#CPP = g++ ++#CC = gcc + OBJ = main.o UnAlz.o UnAlzUtils.o UnAlzBz2decompress.o UnAlzBzip2.o + BIN = unalz +-LDFLAGS = -lz -lbz2 ++LDFLAGS += -lz -lbz2 + CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + + all: +@@ -12,7 +12,7 @@ all: + @echo "" + @echo "TARGET_SYSTEM is one of" + @echo "" +- @echo " posix-utf8 : POSIX with utf8 filesystem(Most of modern OS, e.g. OSX/Ubuntu)"
++ @echo " posix-utf8 : POSIX with utf8 filesystem(Most of modern OS, e.g. OSX/Ubuntu)" + @echo " posix : POSIX system (FreeBSD/linux/OSX/sparc/Win32)" + @echo " linux-utf8 : LINUX with utf8 filesystem(without -liconv option)" + @echo " posix-noiconv : POSIX without libiconv (Windows(MINGW32,CYGWIN) or EUC-KR file system)" +@@ -34,8 +34,8 @@ posix-noiconv: unalz + $(CPP) $(OBJ) $(LDFLAGS) -o $(BIN) + + linux-utf8: unalz +- $(CPP) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS) +- $(CPP) $(OBJ) $(LDFLAGS) -o $(BIN) ++ $(CXX) -c UnAlz.cpp -c UnAlzUtils.cpp -c main.cpp -D_UNALZ_ICONV -D_UNALZ_UTF8 $(CFLAGS) ++ $(CXX) $(OBJ) $(LDFLAGS) -o $(BIN) + + install: + cp unalz /usr/local/bin/ diff --git a/app-arch/unalz/unalz-0.65-r1.ebuild b/app-arch/unalz/unalz-0.65-r1.ebuild index 469603d31..1dfb5cfcf 100644 --- a/app-arch/unalz/unalz-0.65-r1.ebuild +++ b/app-arch/unalz/unalz-0.65-r1.ebuild @@ -1,31 +1,37 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Extract ALZ archives" HOMEPAGE="http://kippler.com/win/unalz/" -SRC_URI="http://kippler.com/win/${PN}/${P}.tgz - https://alarmpi.no-ip.org/gentoo/${PN}-0.65-use-system-zlib.patch.bz2 - https://alarmpi.no-ip.org/gentoo/${PN}-0.65-use-system-bz2.patch.bz2" +SRC_URI=" + http://kippler.com/win/${PN}/${P}.tgz + https://git.launchpad.net/ubuntu/+source/unalz/patch/?id=b4ade05e7e6dec25fee7d57bac6a055137e332c0 -> ${PN}-0.65-use-system-zlib.patch + https://git.launchpad.net/ubuntu/+source/unalz/patch/?id=00932925e108f186301c5941130fc34c9a76f345 -> ${PN}-0.65-use-system-bz2.patch +" +S="${WORKDIR}"/${PN} LICENSE="ZLIB" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="app-arch/bzip2 sys-libs/zlib virtual/libiconv" +DEPEND=" + app-arch/bzip2 + sys-libs/zlib + virtual/libiconv +" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-0.65-buildfix-wrong-data-type.patch - "${WORKDIR}"/${PN}-0.65-use-system-zlib.patch - "${WORKDIR}"/${PN}-0.65-use-system-bz2.patch + "${FILESDIR}"/${P}-buildfix-wrong-data-type.patch + "${DISTDIR}"/${P}-use-system-zlib.patch + "${DISTDIR}"/${P}-use-system-bz2.patch + "${FILESDIR}"/${P}-respect-compiler-flags.patch ) -S="${WORKDIR}"/${PN} - src_compile() { - emake linux-utf8 LDFLAGS="${LDFLAGS}" + emake linux-utf8 } src_install() { |