1 |
commit: e7258ea623a87d533f0860c5d298dc2e74c5fc8a |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 5 16:39:13 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 5 16:44:03 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7258ea6 |
7 |
|
8 |
sys-fs/squashfs-tools-ng: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
sys-fs/squashfs-tools-ng/Manifest | 2 - |
13 |
...0-extras-Pass-flags-argument-to-fix-build.patch | 65 ---------------------- |
14 |
.../squashfs-tools-ng-0.9.1.ebuild | 51 ----------------- |
15 |
.../squashfs-tools-ng-1.0.0.ebuild | 55 ------------------ |
16 |
4 files changed, 173 deletions(-) |
17 |
|
18 |
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest |
19 |
index ec198d9b12e..3c4ad20a177 100644 |
20 |
--- a/sys-fs/squashfs-tools-ng/Manifest |
21 |
+++ b/sys-fs/squashfs-tools-ng/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST squashfs-tools-ng-0.9.1.tar.xz 1026036 BLAKE2B 3e0a0acf5b11ea42bad2149a9b97442739f1eceacfc0f5b009403d4616fcd02d69082e2e0721be3a1d6d9ba67ce6287b12ea13fba6409cb751e844f5d48ce7ea SHA512 eb550430917f267ec1ef1d11795167a6893031fc184f914170679cd24c16930a8f73a2b04a349ce1602e80a327957db7935369965a892fbe4904b6e01bb48b5c |
24 |
-DIST squashfs-tools-ng-1.0.0.tar.xz 1079912 BLAKE2B b7a9e4cafc31c0058d73b1a8b69125f92d753214f6e9f0372558271bbd8df163d9b3bf3fea45b96da5044c86e75affc2bfd27826d3725a35fbb417e443cf6ccb SHA512 536f12aa53214f88739cea0d26c55e04434c284935ff1d59ee8f5108acd92fc11e800e42e3a112524d09dbd1fa50c4f15c3211ff5d02ae50b7fa137600d2ae15 |
25 |
DIST squashfs-tools-ng-1.0.1.tar.xz 1079720 BLAKE2B efc4d715c65d42876d5ac51364d195267c6bc6c2219fea5746231bc4efbd9adac3fa23ea58f837da8610179f3d96ec9422efebe4ae231f4ab243cf948e64fa9b SHA512 3b597b7bf654c6897e04dc6c18cec6034a8f0c0fe070c8d6eb3c8f4a06f4ab2ea8c970ac18c12f05ccb3015cf911790e945798a34361fdb7d1a442a1ca646a04 |
26 |
|
27 |
diff --git a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch |
28 |
deleted file mode 100644 |
29 |
index e61d881c74b..00000000000 |
30 |
--- a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch |
31 |
+++ /dev/null |
32 |
@@ -1,65 +0,0 @@ |
33 |
-From 4c10a491a2ddfcdc3226431a71aefd6ca71135d4 Mon Sep 17 00:00:00 2001 |
34 |
-From: Matt Turner <mattst88@×××××.com> |
35 |
-Date: Sat, 13 Jun 2020 11:05:49 -0700 |
36 |
-Subject: [PATCH] extras: Pass flags argument to fix build |
37 |
- |
38 |
-Missed in commit 259a98985b4f (Add flags to functions that might |
39 |
-logically be expanded in the future) |
40 |
- |
41 |
-Signed-off-by: Matt Turner <mattst88@×××××.com> |
42 |
---- |
43 |
- extras/browse.c | 10 +++++----- |
44 |
- 1 file changed, 5 insertions(+), 5 deletions(-) |
45 |
- |
46 |
-diff --git a/extras/browse.c b/extras/browse.c |
47 |
-index ef4e223..86ce788 100644 |
48 |
---- a/extras/browse.c |
49 |
-+++ b/extras/browse.c |
50 |
-@@ -63,7 +63,7 @@ static void list_directory(const char *dirname) |
51 |
- |
52 |
- /* Get the directory inode we want to dump and open the directory */ |
53 |
- if (dirname == NULL) { |
54 |
-- ret = sqfs_dir_reader_open_dir(dr, working_dir); |
55 |
-+ ret = sqfs_dir_reader_open_dir(dr, working_dir, 0); |
56 |
- if (ret) |
57 |
- goto fail_open; |
58 |
- } else if (*dirname == '/') { |
59 |
-@@ -74,7 +74,7 @@ static void list_directory(const char *dirname) |
60 |
- if (ret) |
61 |
- goto fail_resolve; |
62 |
- |
63 |
-- ret = sqfs_dir_reader_open_dir(dr, inode); |
64 |
-+ ret = sqfs_dir_reader_open_dir(dr, inode, 0); |
65 |
- free(inode); |
66 |
- if (ret) |
67 |
- goto fail_open; |
68 |
-@@ -84,7 +84,7 @@ static void list_directory(const char *dirname) |
69 |
- if (ret) |
70 |
- goto fail_resolve; |
71 |
- |
72 |
-- ret = sqfs_dir_reader_open_dir(dr, inode); |
73 |
-+ ret = sqfs_dir_reader_open_dir(dr, inode, 0); |
74 |
- free(inode); |
75 |
- if (ret) |
76 |
- goto fail_open; |
77 |
-@@ -526,7 +526,7 @@ int main(int argc, char **argv) |
78 |
- } |
79 |
- |
80 |
- /* create a directory reader and get the root inode */ |
81 |
-- dr = sqfs_dir_reader_create(&super, cmp, file); |
82 |
-+ dr = sqfs_dir_reader_create(&super, cmp, file, 0); |
83 |
- if (dr == NULL) { |
84 |
- fprintf(stderr, "%s: error creating directory reader.\n", |
85 |
- argv[1]); |
86 |
-@@ -539,7 +539,7 @@ int main(int argc, char **argv) |
87 |
- } |
88 |
- |
89 |
- /* create a data reader */ |
90 |
-- data = sqfs_data_reader_create(file, super.block_size, cmp); |
91 |
-+ data = sqfs_data_reader_create(file, super.block_size, cmp, 0); |
92 |
- |
93 |
- if (data == NULL) { |
94 |
- fprintf(stderr, "%s: error creating data reader.\n", |
95 |
--- |
96 |
-2.26.2 |
97 |
- |
98 |
|
99 |
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild |
100 |
deleted file mode 100644 |
101 |
index 79c567828dd..00000000000 |
102 |
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild |
103 |
+++ /dev/null |
104 |
@@ -1,51 +0,0 @@ |
105 |
-# Copyright 2019-2020 Gentoo Authors |
106 |
-# Distributed under the terms of the GNU General Public License v2 |
107 |
- |
108 |
-EAPI=7 |
109 |
- |
110 |
-DESCRIPTION="A new set of tools for working with SquashFS images" |
111 |
-HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng" |
112 |
-if [[ ${PV} = 9999* ]]; then |
113 |
- inherit autotools git-r3 |
114 |
- EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" |
115 |
-else |
116 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
117 |
- SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" |
118 |
-fi |
119 |
- |
120 |
-LICENSE="LGPL-3+ tools? ( GPL-3+ )" |
121 |
-SLOT="0" |
122 |
-IUSE="lz4 lzo selinux +tools +xz zstd" |
123 |
- |
124 |
-DEPEND=" |
125 |
- sys-libs/zlib:= |
126 |
- lz4? ( app-arch/lz4:= ) |
127 |
- lzo? ( dev-libs/lzo:= ) |
128 |
- xz? ( app-arch/xz-utils:= ) |
129 |
- selinux? ( sys-libs/libselinux:= ) |
130 |
- zstd? ( app-arch/zstd:= ) |
131 |
-" |
132 |
-RDEPEND="${DEPEND}" |
133 |
- |
134 |
-src_prepare() { |
135 |
- default |
136 |
- [[ ${PV} == "9999" ]] && eautoreconf |
137 |
-} |
138 |
- |
139 |
-src_configure() { |
140 |
- local myconf=( |
141 |
- --disable-static |
142 |
- $(use_with lz4) |
143 |
- $(use_with lzo) |
144 |
- $(use_with selinux) |
145 |
- $(use_with tools) |
146 |
- $(use_with xz) |
147 |
- $(use_with zstd) |
148 |
- ) |
149 |
- econf "${myconf[@]}" |
150 |
-} |
151 |
- |
152 |
-src_install() { |
153 |
- default |
154 |
- find "${D}" -name "*.la" -delete || die |
155 |
-} |
156 |
|
157 |
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild |
158 |
deleted file mode 100644 |
159 |
index e9e3aff7cec..00000000000 |
160 |
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild |
161 |
+++ /dev/null |
162 |
@@ -1,55 +0,0 @@ |
163 |
-# Copyright 2019-2020 Gentoo Authors |
164 |
-# Distributed under the terms of the GNU General Public License v2 |
165 |
- |
166 |
-EAPI=7 |
167 |
- |
168 |
-DESCRIPTION="A new set of tools for working with SquashFS images" |
169 |
-HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng" |
170 |
-if [[ ${PV} = 9999* ]]; then |
171 |
- inherit autotools git-r3 |
172 |
- EGIT_REPO_URI="https://github.com/AgentD/${PN}.git" |
173 |
-else |
174 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" |
175 |
- SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz" |
176 |
-fi |
177 |
- |
178 |
-LICENSE="LGPL-3+ tools? ( GPL-3+ )" |
179 |
-SLOT="0" |
180 |
-IUSE="lz4 lzo selinux +tools +xz zstd" |
181 |
- |
182 |
-DEPEND=" |
183 |
- sys-libs/zlib:= |
184 |
- lz4? ( app-arch/lz4:= ) |
185 |
- lzo? ( dev-libs/lzo:= ) |
186 |
- xz? ( app-arch/xz-utils:= ) |
187 |
- selinux? ( sys-libs/libselinux:= ) |
188 |
- zstd? ( app-arch/zstd:= ) |
189 |
-" |
190 |
-RDEPEND="${DEPEND}" |
191 |
- |
192 |
-PATCHES=( |
193 |
- "${FILESDIR}"/${P}-extras-Pass-flags-argument-to-fix-build.patch |
194 |
-) |
195 |
- |
196 |
-src_prepare() { |
197 |
- default |
198 |
- [[ ${PV} == "9999" ]] && eautoreconf |
199 |
-} |
200 |
- |
201 |
-src_configure() { |
202 |
- local myconf=( |
203 |
- --disable-static |
204 |
- $(use_with lz4) |
205 |
- $(use_with lzo) |
206 |
- $(use_with selinux) |
207 |
- $(use_with tools) |
208 |
- $(use_with xz) |
209 |
- $(use_with zstd) |
210 |
- ) |
211 |
- econf "${myconf[@]}" |
212 |
-} |
213 |
- |
214 |
-src_install() { |
215 |
- default |
216 |
- find "${D}" -name "*.la" -delete || die |
217 |
-} |