Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
Date: Sun, 24 Feb 2019 08:24:35
Message-Id: 1550996651.7a6557e4d6cd4af8a1543a0cfc3f07617c5c89f1.zlogene@gentoo
1 commit: 7a6557e4d6cd4af8a1543a0cfc3f07617c5c89f1
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 24 08:24:11 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 24 08:24:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6557e4
7
8 sys-apps/file: Drop old
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 sys-apps/file/Manifest | 2 -
14 sys-apps/file/file-5.34.ebuild | 126 -----------------------------------------
15 sys-apps/file/file-5.35.ebuild | 126 -----------------------------------------
16 3 files changed, 254 deletions(-)
17
18 diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
19 index ca6ed6122e4..0fda7fc6ffc 100644
20 --- a/sys-apps/file/Manifest
21 +++ b/sys-apps/file/Manifest
22 @@ -1,3 +1 @@
23 -DIST file-5.34.tar.gz 840219 BLAKE2B 20f34684e583d1cb42967f1106d979a42f55fd78097e26929ab4e6cd470b0d3a12c9f1fad89c982ed42869455ba0f3381c812ed00c31112e5ad17edcd50783e0 SHA512 57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8
24 -DIST file-5.35.tar.gz 865425 BLAKE2B 325b95bc45b8e21b568ad816f8c1817dc170f56b78e460ac9bb18c70f22df2491c37f7f9c38c3d85010a7a609e75c26b19b6adef208137cb04c4c40fbe8c1d05 SHA512 cbecc52e9209be8bc090752d0672efa181625d4e1e688e63edd1f5657b29bad69364a477fb4ed85d1fa413b8002c8578c86153d2acaaecce78446c0ca6ea9e38
25 DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
26
27 diff --git a/sys-apps/file/file-5.34.ebuild b/sys-apps/file/file-5.34.ebuild
28 deleted file mode 100644
29 index adb95f5f213..00000000000
30 --- a/sys-apps/file/file-5.34.ebuild
31 +++ /dev/null
32 @@ -1,126 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
39 -DISTUTILS_OPTIONAL=1
40 -
41 -inherit distutils-r1 libtool toolchain-funcs multilib-minimal
42 -
43 -if [[ ${PV} == "9999" ]] ; then
44 - EGIT_REPO_URI="https://github.com/glensc/file.git"
45 - inherit autotools git-r3
46 -else
47 - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
48 - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
49 -fi
50 -
51 -DESCRIPTION="identify a file's format by scanning binary data for patterns"
52 -HOMEPAGE="https://www.darwinsys.com/file/"
53 -
54 -LICENSE="BSD-2"
55 -SLOT="0"
56 -IUSE="python static-libs zlib"
57 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
58 -
59 -DEPEND="
60 - python? (
61 - ${PYTHON_DEPS}
62 - dev-python/setuptools[${PYTHON_USEDEP}]
63 - )
64 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
65 -RDEPEND="${DEPEND}
66 - python? ( !dev-python/python-magic )"
67 -
68 -src_prepare() {
69 - default
70 -
71 - [[ ${PV} == "9999" ]] && eautoreconf
72 - elibtoolize
73 -
74 - # don't let python README kill main README #60043
75 - mv python/README.md python/README.python.md || die
76 - sed 's@××××××.md@README.python.md@' -i python/setup.py || die #662090
77 -}
78 -
79 -multilib_src_configure() {
80 - local myeconfargs=(
81 - --disable-libseccomp
82 - --enable-fsect-man5
83 - $(use_enable static-libs static)
84 - $(use_enable zlib)
85 - )
86 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
87 -}
88 -
89 -src_configure() {
90 - # when cross-compiling, we need to build up our own file
91 - # because people often don't keep matching host/target
92 - # file versions #362941
93 - if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
94 - mkdir -p "${WORKDIR}"/build || die
95 - cd "${WORKDIR}"/build || die
96 - tc-export_build_env BUILD_C{C,XX}
97 - ECONF_SOURCE="${S}" \
98 - ac_cv_header_zlib_h=no \
99 - ac_cv_lib_z_gzopen=no \
100 - CHOST=${CBUILD} \
101 - CFLAGS=${BUILD_CFLAGS} \
102 - CXXFLAGS=${BUILD_CXXFLAGS} \
103 - CPPFLAGS=${BUILD_CPPFLAGS} \
104 - LDFLAGS="${BUILD_LDFLAGS} -static" \
105 - CC=${BUILD_CC} \
106 - CXX=${BUILD_CXX} \
107 - econf --disable-shared --disable-libseccomp
108 - fi
109 -
110 - multilib-minimal_src_configure
111 -}
112 -
113 -multilib_src_compile() {
114 - if multilib_is_native_abi ; then
115 - emake
116 - else
117 - cd src || die
118 - emake magic.h #586444
119 - emake libmagic.la
120 - fi
121 -}
122 -
123 -src_compile() {
124 - if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
125 - emake -C "${WORKDIR}"/build/src magic.h #586444
126 - emake -C "${WORKDIR}"/build/src file
127 - PATH="${WORKDIR}/build/src:${PATH}"
128 - fi
129 - multilib-minimal_src_compile
130 -
131 - if use python ; then
132 - cd python || die
133 - distutils-r1_src_compile
134 - fi
135 -}
136 -
137 -multilib_src_install() {
138 - if multilib_is_native_abi ; then
139 - default
140 - else
141 - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
142 - fi
143 -}
144 -
145 -multilib_src_install_all() {
146 - dodoc ChangeLog MAINT README
147 -
148 - # Required for `file -C`
149 - dodir /usr/share/misc/magic
150 - insinto /usr/share/misc/magic
151 - doins -r magic/Magdir/*
152 -
153 - if use python ; then
154 - cd python || die
155 - distutils-r1_src_install
156 - fi
157 - find "${ED}" -name "*.la" -delete || die
158 -}
159
160 diff --git a/sys-apps/file/file-5.35.ebuild b/sys-apps/file/file-5.35.ebuild
161 deleted file mode 100644
162 index 9ac215be618..00000000000
163 --- a/sys-apps/file/file-5.35.ebuild
164 +++ /dev/null
165 @@ -1,126 +0,0 @@
166 -# Copyright 1999-2018 Gentoo Authors
167 -# Distributed under the terms of the GNU General Public License v2
168 -
169 -EAPI=6
170 -
171 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
172 -DISTUTILS_OPTIONAL=1
173 -
174 -inherit distutils-r1 libtool toolchain-funcs multilib-minimal
175 -
176 -if [[ ${PV} == "9999" ]] ; then
177 - EGIT_REPO_URI="https://github.com/glensc/file.git"
178 - inherit autotools git-r3
179 -else
180 - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
181 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
182 -fi
183 -
184 -DESCRIPTION="identify a file's format by scanning binary data for patterns"
185 -HOMEPAGE="https://www.darwinsys.com/file/"
186 -
187 -LICENSE="BSD-2"
188 -SLOT="0"
189 -IUSE="python static-libs zlib"
190 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
191 -
192 -DEPEND="
193 - python? (
194 - ${PYTHON_DEPS}
195 - dev-python/setuptools[${PYTHON_USEDEP}]
196 - )
197 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
198 -RDEPEND="${DEPEND}
199 - python? ( !dev-python/python-magic )"
200 -
201 -src_prepare() {
202 - default
203 -
204 - [[ ${PV} == "9999" ]] && eautoreconf
205 - elibtoolize
206 -
207 - # don't let python README kill main README #60043
208 - mv python/README.md python/README.python.md || die
209 - sed 's@××××××.md@README.python.md@' -i python/setup.py || die #662090
210 -}
211 -
212 -multilib_src_configure() {
213 - local myeconfargs=(
214 - --disable-libseccomp
215 - --enable-fsect-man5
216 - $(use_enable static-libs static)
217 - $(use_enable zlib)
218 - )
219 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
220 -}
221 -
222 -src_configure() {
223 - # when cross-compiling, we need to build up our own file
224 - # because people often don't keep matching host/target
225 - # file versions #362941
226 - if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
227 - mkdir -p "${WORKDIR}"/build || die
228 - cd "${WORKDIR}"/build || die
229 - tc-export_build_env BUILD_C{C,XX}
230 - ECONF_SOURCE="${S}" \
231 - ac_cv_header_zlib_h=no \
232 - ac_cv_lib_z_gzopen=no \
233 - CHOST=${CBUILD} \
234 - CFLAGS=${BUILD_CFLAGS} \
235 - CXXFLAGS=${BUILD_CXXFLAGS} \
236 - CPPFLAGS=${BUILD_CPPFLAGS} \
237 - LDFLAGS="${BUILD_LDFLAGS} -static" \
238 - CC=${BUILD_CC} \
239 - CXX=${BUILD_CXX} \
240 - econf --disable-shared --disable-libseccomp
241 - fi
242 -
243 - multilib-minimal_src_configure
244 -}
245 -
246 -multilib_src_compile() {
247 - if multilib_is_native_abi ; then
248 - emake
249 - else
250 - cd src || die
251 - emake magic.h #586444
252 - emake libmagic.la
253 - fi
254 -}
255 -
256 -src_compile() {
257 - if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
258 - emake -C "${WORKDIR}"/build/src magic.h #586444
259 - emake -C "${WORKDIR}"/build/src file
260 - PATH="${WORKDIR}/build/src:${PATH}"
261 - fi
262 - multilib-minimal_src_compile
263 -
264 - if use python ; then
265 - cd python || die
266 - distutils-r1_src_compile
267 - fi
268 -}
269 -
270 -multilib_src_install() {
271 - if multilib_is_native_abi ; then
272 - default
273 - else
274 - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
275 - fi
276 -}
277 -
278 -multilib_src_install_all() {
279 - dodoc ChangeLog MAINT README
280 -
281 - # Required for `file -C`
282 - dodir /usr/share/misc/magic
283 - insinto /usr/share/misc/magic
284 - doins -r magic/Magdir/*
285 -
286 - if use python ; then
287 - cd python || die
288 - distutils-r1_src_install
289 - fi
290 - find "${ED}" -name "*.la" -delete || die
291 -}