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