diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-07 01:33:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-07 01:33:16 +0100 |
commit | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (patch) | |
tree | 3ee550255947da075650f1a551dcc278f9a1b7f8 /app-arch/zoo | |
parent | a978c074e4272bb901fbe4a10de0a7b2af574f17 (diff) |
gentoo resync : 07.05.2021
Diffstat (limited to 'app-arch/zoo')
-rw-r--r-- | app-arch/zoo/Manifest | 5 | ||||
-rw-r--r-- | app-arch/zoo/files/zoo-2.10-gentoo-fbsd-r1.patch | 10 | ||||
-rw-r--r-- | app-arch/zoo/files/zoo-2.10-makefile.patch | 32 | ||||
-rw-r--r-- | app-arch/zoo/zoo-2.10-r5.ebuild | 21 |
4 files changed, 51 insertions, 17 deletions
diff --git a/app-arch/zoo/Manifest b/app-arch/zoo/Manifest index 7b2f4b9db227..00e2268446ed 100644 --- a/app-arch/zoo/Manifest +++ b/app-arch/zoo/Manifest @@ -1,5 +1,6 @@ -AUX zoo-2.10-gentoo-fbsd-r1.patch 744 BLAKE2B 76c60ceef76f9325ed6212b8a879da4b11808e0fa1445f765f8fd60b2627b7b1b9becb844bca43de5e9eb82dada9050a732971f48914a7e79f4670332e8f9140 SHA512 083e94a0ab2089b046f6ddf469ec21d0c9d31223a9ae109c360de368b815e551f1ad28b53fb2e1497290b231a8fc6d67e5716c5cf604b3e8088569ddc439a068 +AUX zoo-2.10-gentoo-fbsd-r1.patch 634 BLAKE2B 79740ca1ca60733d67d2d614673bf4e62f5ff3d5bc740cb00658a806006d884a3ebc551863b1f537bc6d9edc55e4f43b3154ba1c9e0551af315db6b850bd49cb SHA512 c34169a11640a1852a284a93415e0cb5e3423cb2ca0a0413a8fb6cc8896c990ff5f6eebdec965f2efd4b3cfcf823e839908f8588705d2fa827e09558bc87e49c +AUX zoo-2.10-makefile.patch 774 BLAKE2B 07ead9b6957163358b76b9f7b9e1497543e66e0d1462fd9cb306ca385d724f95ccc52682950f2d30e6c592132e8d55a45de501ab1f7e8cde9622fa8c297b6cda SHA512 b3d78a86c4808cd561d819bc061175107e983c5693581890704928c1726effe2adcf187ad10457296a9106b26b2b2aaed4e0fe7d319aa732de7d12d614f081e7 DIST zoo_2.10-28.debian.tar.xz 14984 BLAKE2B e45ed5381e64d7ccac0e8100df12a8f55abbf7961e54a05ad6d3f07cca1a939f9320caa69196895a35dbea5d4aa82975ee2e5fb2202f793f33f4ebd7d5ff65e8 SHA512 07fdb16bf011ae8c8badbb0040ebd82777f11560dc231b70060fe8f71ba706707769934411043197e44b10ad38d7efd8432fdbea03e265f9f6aa58acb1cc2708 DIST zoo_2.10.orig.tar.gz 172629 BLAKE2B 9789f0ca53b2dd538e0032c31fa945f3f4f0fc739cadf536ec38621824cc89409d9def036e5df893a7cd4c5873302273d638c087a51cf7b1477501567c6578b5 SHA512 1847fd6a6aac534386736ca04fa5a88db26c7c06315a0ea2c8e86ff944a133b7506c297cda67e44f797d9ef39446c132e847714732b9f138bf9b46c1525e574f -EBUILD zoo-2.10-r5.ebuild 819 BLAKE2B 63ab99ddbd1516e22535d341cb8f9bf6146c2cef38f4fbe937ef7e877e555f4cfc3a9e4ce44e78324dfd6882ec188d05db369014a0637ca680a5c15fc5da4537 SHA512 03bf01cac9c4a398c9484fb00039a0c50c51026a4f3fc28afcf62002b722e0664e26273c8fc7d1f6de7f77cd130200ebe33c42c2888d5f03f9c112c7cdbcb38f +EBUILD zoo-2.10-r5.ebuild 819 BLAKE2B 72cc0f4dd3bf3475ca9e42c03b2f2313a2b90e9ae9693c0d087e751bc017cd82c21c7757e34e7b72dda6d19237902cd1432c677842d7c6d950e8556f88b07dda SHA512 a6c7ff781001b686925681b3100f64fbf889025384c2e68cc297fda71ac53497b184a021a83a9475190436d79cca8bae2f306df8efdbae68259fada56063278d MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 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 ba7d31e4a47d..b1e598359f6c 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 000000000000..89269b480457 --- /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 6c1f749c178c..0cda3159c240 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() { |