1 |
commit: d5304be70fcdef2cf1fc53d30aecc8b23c08cbee |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 18 10:15:51 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 18 10:30:06 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5304be7 |
7 |
|
8 |
app-arch/unrar: Removed old |
9 |
|
10 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
app-arch/unrar/Manifest | 2 - |
14 |
app-arch/unrar/files/unrar-5.5.5-build.patch | 44 ----------------- |
15 |
app-arch/unrar/unrar-5.9.2.ebuild | 70 ---------------------------- |
16 |
app-arch/unrar/unrar-5.9.3.ebuild | 70 ---------------------------- |
17 |
4 files changed, 186 deletions(-) |
18 |
|
19 |
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest |
20 |
index 57e0194c4ab..ad8ad1daad1 100644 |
21 |
--- a/app-arch/unrar/Manifest |
22 |
+++ b/app-arch/unrar/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST unrar-5.9.2.tar.gz 229900 BLAKE2B a941ef6566a5b58990d88e6e99cc23c169fd7d99fe2c8ef1313db860f9f220510ea002990740c4b3a3f980c037f9b3be4cdad84624a9a6f5094b1074721800d4 SHA512 e48dd3327d57522aa676e8fd6e29b7133ee9921eb1525d90ddedc61716ecfeefb51a7eb3a667f4f81f21a5ce8654727617d33463a5b6a40a7bc32252fa9f25df |
25 |
-DIST unrar-5.9.3.tar.gz 229917 BLAKE2B 6ab2141970535753197d3ed74521f80d3b20ecc2a0f620932c31bd1b5ce4c70bc3e2671fed0a9a77ceb4f42f6423d315f3eac0a00dac334ee2c3dd60a569c78a SHA512 38b2e2e527a4d2df627072acb4c205f46c96771969db4558be04adf9166502b3b9c3d1cc60fe290b6c4ce56db68bb5e0b0ac3bf0698d9820d4840d56cc5f3e2f |
26 |
DIST unrar-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1 |
27 |
|
28 |
diff --git a/app-arch/unrar/files/unrar-5.5.5-build.patch b/app-arch/unrar/files/unrar-5.5.5-build.patch |
29 |
deleted file mode 100644 |
30 |
index 5d69a25d65a..00000000000 |
31 |
--- a/app-arch/unrar/files/unrar-5.5.5-build.patch |
32 |
+++ /dev/null |
33 |
@@ -1,44 +0,0 @@ |
34 |
-Makefile: Fix parallel build issue |
35 |
- |
36 |
-If clean runs in parallel with $(OBJECTS), it is possible to build some |
37 |
-objects first, then the clean target fires and deletes some, and then we |
38 |
-try to link and fail. |
39 |
- |
40 |
-Gentoo-Bug: https://bugs.gentoo.org/528218 |
41 |
- |
42 |
---- a/makefile |
43 |
-+++ b/makefile |
44 |
-@@ -139,23 +139,23 @@ uninstall: uninstall-unrar |
45 |
- |
46 |
- clean: |
47 |
- @rm -f *.o *.bak *~ |
48 |
-- |
49 |
--unrar: clean $(OBJECTS) $(UNRAR_OBJ) |
50 |
- @rm -f unrar |
51 |
-+ @rm -f default.sfx |
52 |
-+ @rm -f libunrar.so |
53 |
-+ @rm -f libunrar.a |
54 |
-+ |
55 |
-+unrar: $(OBJECTS) $(UNRAR_OBJ) |
56 |
- $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) |
57 |
- $(STRIP) unrar |
58 |
- |
59 |
- sfx: WHAT=SFX_MODULE |
60 |
--sfx: clean $(OBJECTS) |
61 |
-- @rm -f default.sfx |
62 |
-+sfx: $(OBJECTS) |
63 |
- $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) |
64 |
- $(STRIP) default.sfx |
65 |
- |
66 |
- lib: WHAT=RARDLL |
67 |
- lib: CXXFLAGS+=$(LIBFLAGS) |
68 |
--lib: clean $(OBJECTS) $(LIB_OBJ) |
69 |
-- @rm -f libunrar.so |
70 |
-- @rm -f libunrar.a |
71 |
-+lib: $(OBJECTS) $(LIB_OBJ) |
72 |
- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) |
73 |
- $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) |
74 |
- |
75 |
--- |
76 |
-2.13.1 |
77 |
- |
78 |
|
79 |
diff --git a/app-arch/unrar/unrar-5.9.2.ebuild b/app-arch/unrar/unrar-5.9.2.ebuild |
80 |
deleted file mode 100644 |
81 |
index 9496c0025da..00000000000 |
82 |
--- a/app-arch/unrar/unrar-5.9.2.ebuild |
83 |
+++ /dev/null |
84 |
@@ -1,70 +0,0 @@ |
85 |
-# Copyright 1999-2020 Gentoo Authors |
86 |
-# Distributed under the terms of the GNU General Public License v2 |
87 |
- |
88 |
-EAPI=7 |
89 |
- |
90 |
-inherit flag-o-matic multilib toolchain-funcs |
91 |
- |
92 |
-MY_PN="${PN}src" |
93 |
- |
94 |
-DESCRIPTION="Uncompress rar files" |
95 |
-HOMEPAGE="https://www.rarlab.com/rar_add.htm" |
96 |
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" |
97 |
- |
98 |
-LICENSE="unRAR" |
99 |
-# subslot = soname version |
100 |
-SLOT="0/5" |
101 |
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
102 |
-IUSE="" |
103 |
- |
104 |
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417" |
105 |
- |
106 |
-S="${WORKDIR}/unrar" |
107 |
- |
108 |
-PATCHES=( |
109 |
- "${FILESDIR}"/${PN}-5.5.5-build.patch |
110 |
- "${FILESDIR}"/${PN}-5.5.5-honor-flags.patch |
111 |
-) |
112 |
- |
113 |
-src_prepare() { |
114 |
- default |
115 |
- |
116 |
- local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" ) |
117 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
118 |
- sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" ) |
119 |
- else |
120 |
- sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" ) |
121 |
- fi |
122 |
- sed -i "${sed_args[@]}" makefile || die |
123 |
-} |
124 |
- |
125 |
-src_configure() { |
126 |
- mkdir -p build-{lib,bin} |
127 |
- printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die |
128 |
- cp build-{lib,bin}/Makefile || die |
129 |
-} |
130 |
- |
131 |
-src_compile() { |
132 |
- unrar_make() { |
133 |
- emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@" |
134 |
- } |
135 |
- |
136 |
- unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib |
137 |
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die |
138 |
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die |
139 |
- |
140 |
- unrar_make -C build-bin |
141 |
-} |
142 |
- |
143 |
-src_install() { |
144 |
- dobin build-bin/unrar |
145 |
- dodoc readme.txt |
146 |
- |
147 |
- dolib.so build-lib/libunrar* |
148 |
- |
149 |
- insinto /usr/include/libunrar${PV%.*.*} |
150 |
- doins *.hpp |
151 |
- dosym libunrar${PV%.*.*} /usr/include/libunrar |
152 |
- |
153 |
- find "${ED}" -type f -name "*.a" -delete || die |
154 |
-} |
155 |
|
156 |
diff --git a/app-arch/unrar/unrar-5.9.3.ebuild b/app-arch/unrar/unrar-5.9.3.ebuild |
157 |
deleted file mode 100644 |
158 |
index 7a4b90b3f3b..00000000000 |
159 |
--- a/app-arch/unrar/unrar-5.9.3.ebuild |
160 |
+++ /dev/null |
161 |
@@ -1,70 +0,0 @@ |
162 |
-# Copyright 1999-2020 Gentoo Authors |
163 |
-# Distributed under the terms of the GNU General Public License v2 |
164 |
- |
165 |
-EAPI=7 |
166 |
- |
167 |
-inherit flag-o-matic multilib toolchain-funcs |
168 |
- |
169 |
-MY_PN="${PN}src" |
170 |
- |
171 |
-DESCRIPTION="Uncompress rar files" |
172 |
-HOMEPAGE="https://www.rarlab.com/rar_add.htm" |
173 |
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz" |
174 |
- |
175 |
-LICENSE="unRAR" |
176 |
-# subslot = soname version |
177 |
-SLOT="0/5" |
178 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
179 |
-IUSE="" |
180 |
- |
181 |
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417" |
182 |
- |
183 |
-S="${WORKDIR}/unrar" |
184 |
- |
185 |
-PATCHES=( |
186 |
- "${FILESDIR}"/${PN}-5.9.3-build.patch |
187 |
- "${FILESDIR}"/${PN}-5.5.5-honor-flags.patch |
188 |
-) |
189 |
- |
190 |
-src_prepare() { |
191 |
- default |
192 |
- |
193 |
- local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" ) |
194 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
195 |
- sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" ) |
196 |
- else |
197 |
- sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" ) |
198 |
- fi |
199 |
- sed -i "${sed_args[@]}" makefile || die |
200 |
-} |
201 |
- |
202 |
-src_configure() { |
203 |
- mkdir -p build-{lib,bin} |
204 |
- printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die |
205 |
- cp build-{lib,bin}/Makefile || die |
206 |
-} |
207 |
- |
208 |
-src_compile() { |
209 |
- unrar_make() { |
210 |
- emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@" |
211 |
- } |
212 |
- |
213 |
- unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib |
214 |
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die |
215 |
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die |
216 |
- |
217 |
- unrar_make -C build-bin |
218 |
-} |
219 |
- |
220 |
-src_install() { |
221 |
- dobin build-bin/unrar |
222 |
- dodoc readme.txt |
223 |
- |
224 |
- dolib.so build-lib/libunrar* |
225 |
- |
226 |
- insinto /usr/include/libunrar${PV%.*.*} |
227 |
- doins *.hpp |
228 |
- dosym libunrar${PV%.*.*} /usr/include/libunrar |
229 |
- |
230 |
- find "${ED}" -type f -name "*.a" -delete || die |
231 |
-} |