Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/
Date: Thu, 29 Aug 2019 05:45:04
Message-Id: 1567057498.33109f2939460910f07472f87b3b322313e35ec1.jer@gentoo
1 commit: 33109f2939460910f07472f87b3b322313e35ec1
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 29 05:43:18 2019 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 29 05:44:58 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33109f29
7
8 sys-fs/squashfs-tools: Old
9
10 Package-Manager: Portage-2.3.73, Repoman-2.3.17
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 sys-fs/squashfs-tools/Manifest | 1 -
14 .../squashfs-tools-4.3_p11-r1.ebuild | 85 ----------------------
15 .../squashfs-tools/squashfs-tools-4.3_p11.ebuild | 84 ---------------------
16 3 files changed, 170 deletions(-)
17
18 diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
19 index 41d0f3cbd34..b612ae3571a 100644
20 --- a/sys-fs/squashfs-tools/Manifest
21 +++ b/sys-fs/squashfs-tools/Manifest
22 @@ -1,5 +1,4 @@
23 DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308
24 -DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a
25 DIST squashfs-tools_4.3-12.debian.tar.xz 27300 BLAKE2B 60e127f0ab2fde08c58bf255926b47812b8103793ee187633bf0ee12c9b74ae55faf930f992be3eee87b998da9ed7bb42b1150e58903b2855b159b861b542669 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
26 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
27 DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf
28
29 diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild
30 deleted file mode 100644
31 index b0c96a39261..00000000000
32 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild
33 +++ /dev/null
34 @@ -1,85 +0,0 @@
35 -# Copyright 1999-2019 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=7
39 -inherit flag-o-matic toolchain-funcs
40 -
41 -DESCRIPTION="tools to create and extract Squashfs filesystems"
42 -HOMEPAGE="http://squashfs.sourceforge.net"
43 -SRC_URI="
44 - mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
45 - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
46 -"
47 -
48 -LICENSE="GPL-2"
49 -SLOT="0"
50 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
51 -IUSE="debug lz4 lzma lzo static xattr +xz zstd"
52 -
53 -LIB_DEPEND="
54 - sys-libs/zlib[static-libs(+)]
55 - !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
56 - lz4? ( app-arch/lz4[static-libs(+)] )
57 - lzma? ( app-arch/xz-utils[static-libs(+)] )
58 - lzo? ( dev-libs/lzo[static-libs(+)] )
59 - xattr? ( sys-apps/attr[static-libs(+)] )
60 - xz? ( app-arch/xz-utils[static-libs(+)] )
61 - zstd? ( app-arch/zstd[static-libs(+)] )
62 -"
63 -RDEPEND="
64 - !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
65 -"
66 -DEPEND="
67 - ${RDEPEND}
68 - static? ( ${LIB_DEPEND} )
69 -"
70 -PATCHES=(
71 - "${FILESDIR}"/${P/_p*}-sysmacros.patch
72 - "${FILESDIR}"/${P/_p*}-aligned-data.patch
73 - "${FILESDIR}"/${P/_p*}-local-cve-fix.patch
74 - "${FILESDIR}"/${P/_p*}-mem-overflow.patch
75 - "${FILESDIR}"/${P/_p*}-extmatch.patch
76 - "${FILESDIR}"/${P/_p*}-musl.patch
77 -)
78 -
79 -S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
80 -
81 -src_prepare() {
82 - mv "${WORKDIR}"/debian/patches/0016-remove-frag_deflator_thread.patch "${WORKDIR}"/ || die
83 - eapply -p2 "${WORKDIR}"/debian/patches/*.patch
84 - eapply -p2 ${PATCHES[@]}
85 - eapply_user
86 -}
87 -
88 -use10() { usex $1 1 0 ; }
89 -
90 -src_configure() {
91 - # restore GNU89 inline semantics to
92 - # emit function symbols, bug 595290
93 - append-cflags -std=gnu89
94 -
95 - # set up make command line variables in EMAKE_SQUASHFS_CONF
96 - EMAKE_SQUASHFS_CONF=(
97 - LZMA_XZ_SUPPORT=$(use10 lzma)
98 - LZO_SUPPORT=$(use10 lzo)
99 - LZ4_SUPPORT=$(use10 lz4)
100 - XATTR_SUPPORT=$(use10 xattr)
101 - XZ_SUPPORT=$(use10 xz)
102 - ZSTD_SUPPORT=$(use10 zstd)
103 - )
104 -
105 - tc-export CC
106 - use debug && append-cppflags -DSQUASHFS_TRACE
107 - use static && append-ldflags -static
108 -}
109 -
110 -src_compile() {
111 - emake "${EMAKE_SQUASHFS_CONF[@]}"
112 -}
113 -
114 -src_install() {
115 - dobin mksquashfs unsquashfs
116 - cd ..
117 - dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
118 - doman "${WORKDIR}"/debian/manpages/*.[0-9]
119 -}
120
121 diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild
122 deleted file mode 100644
123 index 48c56a33545..00000000000
124 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild
125 +++ /dev/null
126 @@ -1,84 +0,0 @@
127 -# Copyright 1999-2019 Gentoo Authors
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI=7
131 -inherit flag-o-matic toolchain-funcs
132 -
133 -DESCRIPTION="tools to create and extract Squashfs filesystems"
134 -HOMEPAGE="http://squashfs.sourceforge.net"
135 -SRC_URI="
136 - mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
137 - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
138 -"
139 -
140 -LICENSE="GPL-2"
141 -SLOT="0"
142 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
143 -IUSE="debug lz4 lzma lzo static xattr +xz zstd"
144 -
145 -LIB_DEPEND="
146 - sys-libs/zlib[static-libs(+)]
147 - !xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
148 - lz4? ( app-arch/lz4[static-libs(+)] )
149 - lzma? ( app-arch/xz-utils[static-libs(+)] )
150 - lzo? ( dev-libs/lzo[static-libs(+)] )
151 - xattr? ( sys-apps/attr[static-libs(+)] )
152 - xz? ( app-arch/xz-utils[static-libs(+)] )
153 - zstd? ( app-arch/zstd[static-libs(+)] )
154 -"
155 -RDEPEND="
156 - !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
157 -"
158 -DEPEND="
159 - ${RDEPEND}
160 - static? ( ${LIB_DEPEND} )
161 -"
162 -PATCHES=(
163 - "${FILESDIR}"/${P/_p*}-sysmacros.patch
164 - "${FILESDIR}"/${P/_p*}-aligned-data.patch
165 - "${FILESDIR}"/${P/_p*}-local-cve-fix.patch
166 - "${FILESDIR}"/${P/_p*}-mem-overflow.patch
167 - "${FILESDIR}"/${P/_p*}-extmatch.patch
168 - "${FILESDIR}"/${P/_p*}-musl.patch
169 -)
170 -
171 -S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
172 -
173 -src_prepare() {
174 - eapply -p2 "${WORKDIR}"/debian/patches/*.patch
175 - eapply -p2 ${PATCHES[@]}
176 - eapply_user
177 -}
178 -
179 -use10() { usex $1 1 0 ; }
180 -
181 -src_configure() {
182 - # restore GNU89 inline semantics to
183 - # emit function symbols, bug 595290
184 - append-cflags -std=gnu89
185 -
186 - # set up make command line variables in EMAKE_SQUASHFS_CONF
187 - EMAKE_SQUASHFS_CONF=(
188 - LZMA_XZ_SUPPORT=$(use10 lzma)
189 - LZO_SUPPORT=$(use10 lzo)
190 - LZ4_SUPPORT=$(use10 lz4)
191 - XATTR_SUPPORT=$(use10 xattr)
192 - XZ_SUPPORT=$(use10 xz)
193 - ZSTD_SUPPORT=$(use10 zstd)
194 - )
195 -
196 - tc-export CC
197 - use debug && append-cppflags -DSQUASHFS_TRACE
198 - use static && append-ldflags -static
199 -}
200 -
201 -src_compile() {
202 - emake "${EMAKE_SQUASHFS_CONF[@]}"
203 -}
204 -
205 -src_install() {
206 - dobin mksquashfs unsquashfs
207 - cd ..
208 - dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
209 - doman "${WORKDIR}"/debian/manpages/*.[0-9]
210 -}