Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/cabextract/, app-arch/cabextract/files/
Date: Thu, 18 Aug 2022 02:53:50
Message-Id: 1660791185.b16e7b5a0003bcdca7b9d2e132c8007e3d0aef89.mattst88@gentoo
1 commit: b16e7b5a0003bcdca7b9d2e132c8007e3d0aef89
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 18 02:44:37 2022 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 18 02:53:05 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b16e7b5a
7
8 app-arch/cabextract: Drop old versions
9
10 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12 app-arch/cabextract/Manifest | 2 -
13 app-arch/cabextract/cabextract-1.8.ebuild | 39 ------------
14 app-arch/cabextract/cabextract-1.9-r2.ebuild | 72 ----------------------
15 .../files/cabextract-1.9-fix-bigendian.patch | 17 -----
16 ...cabextract-1.9-remove-spurious-test_files.patch | 17 -----
17 5 files changed, 147 deletions(-)
18
19 diff --git a/app-arch/cabextract/Manifest b/app-arch/cabextract/Manifest
20 index d833dc8f192e..17fd6ea550ec 100644
21 --- a/app-arch/cabextract/Manifest
22 +++ b/app-arch/cabextract/Manifest
23 @@ -1,3 +1 @@
24 -DIST cabextract-1.8.tar.gz 289256 BLAKE2B ba9fea0cd12859b0de97b13362eaf276066650eb7151e0115af7ed2586cfa7497f72be2f9287d3ccb5ce5256ec26ca69e729df5bb0a327bb9f32ded25391460c SHA512 f8d676d6b738b0b13ac1cac7716c2fb46db423ef30b05ee64f00fcb19596131fbd34341c8b417af3de04896e9b6a8abf0d5976ee4bf87d016806a71317246d7a
25 DIST cabextract-1.9.1.tar.gz 469369 BLAKE2B 5bfc697b40cbf47b42ab7857804b703c9622d8dae1648aae1bb5c0ec7c7978bff01b7ca2526f1b6090f193d88c00e3f49ae111f348d03fec9f575bddbb4b4096 SHA512 c354a4b20a222b40813f01baf8311c9a76611da427f9f44e977a3fd09508e24a18b486e3eef889a9debdca459f1b0c28d5d25429ccd555d3a2e4ff92d91cec14
26 -DIST cabextract-1.9.tar.gz 466334 BLAKE2B 1a82bddca826ee35ed13e1c0b50deca3ae1b7e31d7f427f54b5d6cf9651a727b7cbf8049c1a4326237725e007baecb4356721489611bb5e015bd7460e2530758 SHA512 d144c1df9ed8e8c339bcadb3d1be2eb2576bb066e3f75a3480df0d5e81407a633554e4674b3bb43716c0cf33a0f2327e6f798cd6d7825bceefa0ad839fcc3f64
27
28 diff --git a/app-arch/cabextract/cabextract-1.8.ebuild b/app-arch/cabextract/cabextract-1.8.ebuild
29 deleted file mode 100644
30 index acb8183e9aa5..000000000000
31 --- a/app-arch/cabextract/cabextract-1.8.ebuild
32 +++ /dev/null
33 @@ -1,39 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit toolchain-funcs
40 -
41 -DESCRIPTION="Extracts files from Microsoft cabinet archive files"
42 -HOMEPAGE="https://www.cabextract.org.uk/"
43 -SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
44 -
45 -LICENSE="GPL-3"
46 -SLOT="0"
47 -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
48 -IUSE="extras"
49 -
50 -RDEPEND="extras? ( dev-lang/perl )"
51 -
52 -src_prepare() {
53 - default
54 - # the code attempts to set up a fnmatch replacement, but then fails to code
55 - # it properly leading to undefined references to rpl_fnmatch(). This may be
56 - # removed in the future if building still works by setting "yes" to "no".
57 - export ac_cv_func_fnmatch_works=yes
58 -}
59 -
60 -src_compile() {
61 - emake AR="$(tc-getAR)"
62 -}
63 -
64 -src_install() {
65 - local DOCS=( AUTHORS ChangeLog INSTALL NEWS README TODO doc/magic )
66 - default
67 - docinto html
68 - dodoc doc/wince_cab_format.html
69 - if use extras; then
70 - dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
71 - fi
72 -}
73
74 diff --git a/app-arch/cabextract/cabextract-1.9-r2.ebuild b/app-arch/cabextract/cabextract-1.9-r2.ebuild
75 deleted file mode 100644
76 index e8fcac6043f4..000000000000
77 --- a/app-arch/cabextract/cabextract-1.9-r2.ebuild
78 +++ /dev/null
79 @@ -1,72 +0,0 @@
80 -# Copyright 1999-2022 Gentoo Authors
81 -# Distributed under the terms of the GNU General Public License v2
82 -
83 -EAPI="7"
84 -
85 -inherit autotools toolchain-funcs
86 -
87 -if [[ ${PV} == "9999" ]] ; then
88 - EGIT_REPO_URI="https://github.com/kyz/libmspack.git"
89 - inherit git-r3
90 - MY_P="${PN}-9999"
91 -
92 - LIBMSPACK_DEPEND="~dev-libs/libmspack-9999:="
93 -else
94 - KEYWORDS="~alpha amd64 arm hppa ~ia64 ~loong ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
95 - MY_PV="${PV/_alpha/alpha}"
96 - MY_P="${PN}-${MY_PV}"
97 - SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
98 -
99 - LIBMSPACK_DEPEND=">=dev-libs/libmspack-0.8_alpha:="
100 -fi
101 -
102 -DESCRIPTION="Extracts files from Microsoft cabinet archive files"
103 -HOMEPAGE="https://www.cabextract.org.uk/"
104 -
105 -LICENSE="GPL-3"
106 -SLOT="0"
107 -IUSE="extras"
108 -
109 -DEPEND="${LIBMSPACK_DEPEND}
110 - virtual/pkgconfig"
111 -RDEPEND="${LIBMSPACK_DEPEND}
112 - extras? ( dev-lang/perl )"
113 -
114 -PATCHES=(
115 - "${FILESDIR}"/${P}-fix-bigendian.patch
116 - "${FILESDIR}"/${P}-remove-spurious-test_files.patch
117 -)
118 -
119 -src_prepare() {
120 - if [[ ${PV} == "9999" ]] ; then
121 - # Re-create file layout from release tarball
122 - pushd "${WORKDIR}" &>/dev/null || die
123 - cp -aL "${S}"/${PN} "${WORKDIR}"/${PN}-source || die
124 - rm -r "${S}" || die
125 - mv "${WORKDIR}"/${PN}-source "${S}" || die
126 - popd &>/dev/null || die
127 - fi
128 -
129 - default
130 -
131 - eautoreconf
132 -}
133 -
134 -src_configure() {
135 - econf \
136 - --with-external-libmspack=yes
137 -}
138 -
139 -src_compile() {
140 - emake AR="$(tc-getAR)"
141 -}
142 -
143 -src_install() {
144 - local DOCS=( AUTHORS ChangeLog NEWS README TODO doc/magic )
145 - default
146 - docinto html
147 - dodoc doc/wince_cab_format.html
148 - if use extras; then
149 - dobin src/{wince_info,wince_rename,cabinfo,cabsplit}
150 - fi
151 -}
152
153 diff --git a/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
154 deleted file mode 100644
155 index 760dd9dbb013..000000000000
156 --- a/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch
157 +++ /dev/null
158 @@ -1,17 +0,0 @@
159 -https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
160 -
161 ----
162 - configure.ac | 1 +
163 - 1 files changed, 1 insertions(+)
164 -
165 -diff --git a/configure.ac b/configure.ac
166 ---- a/configure.ac
167 -+++ b/configure.ac
168 -@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
169 - # Checks for typedefs, structures, and compiler characteristics.
170 - AC_C_CONST
171 - AC_C_INLINE
172 -+AC_C_BIGENDIAN
173 - AC_TYPE_MODE_T
174 - AC_TYPE_OFF_T
175 - AC_TYPE_SIZE_T
176
177 diff --git a/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
178 deleted file mode 100644
179 index d80b8704834c..000000000000
180 --- a/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch
181 +++ /dev/null
182 @@ -1,17 +0,0 @@
183 -https://github.com/kyz/libmspack/commit/2f78851e3927b05931574b380ca6dccaf91e3807
184 -
185 ----
186 - test/bugs.test | 2 +-
187 - 1 file changed, 1 insertion(+), 1 deletion(-)
188 -
189 ---- a/test/bugs.test
190 -+++ b/test/bugs.test
191 -@@ -2,7 +2,7 @@
192 - # test that known crash bugs remain fixed
193 - . test/testcase
194 -
195 --$cabextract -t $test_files/bugs/*.cab
196 -+$cabextract -t bugs/*.cab
197 -
198 - # fail if exit code indicates a crash (SIGBUS, SIGSEGV, etc.)
199 - test $? -le 1