1 |
commit: a30024c5c33e6c32486c61f07b6cb149b26be71d |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 7 20:40:53 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 7 20:40:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a30024c5 |
7 |
|
8 |
sys-apps/file: drop eautoreconf |
9 |
|
10 |
We no longer patch Makefile.am, so this is not needed. |
11 |
|
12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
13 |
|
14 |
sys-apps/file/file-5.39-r3.ebuild | 10 +++++++--- |
15 |
sys-apps/file/file-9999.ebuild | 10 +++++++--- |
16 |
2 files changed, 14 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/file/file-5.39-r3.ebuild b/sys-apps/file/file-5.39-r3.ebuild |
19 |
index c8425291ed7..d9f6397209d 100644 |
20 |
--- a/sys-apps/file/file-5.39-r3.ebuild |
21 |
+++ b/sys-apps/file/file-5.39-r3.ebuild |
22 |
@@ -6,11 +6,11 @@ EAPI=7 |
23 |
PYTHON_COMPAT=( python3_{6..9} ) |
24 |
DISTUTILS_OPTIONAL=1 |
25 |
|
26 |
-inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal |
27 |
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal |
28 |
|
29 |
if [[ ${PV} == "9999" ]] ; then |
30 |
EGIT_REPO_URI="https://github.com/glensc/file.git" |
31 |
- inherit git-r3 |
32 |
+ inherit autotools git-r3 |
33 |
else |
34 |
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" |
35 |
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
36 |
@@ -44,7 +44,11 @@ PATCHES=( |
37 |
|
38 |
src_prepare() { |
39 |
default |
40 |
- eautoreconf |
41 |
+ |
42 |
+ if [[ ${PV} == 9999 ]]; then |
43 |
+ eautoreconf |
44 |
+ fi |
45 |
+ |
46 |
elibtoolize |
47 |
|
48 |
# don't let python README kill main README #60043 |
49 |
|
50 |
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild |
51 |
index d28938772d6..71c29604e7d 100644 |
52 |
--- a/sys-apps/file/file-9999.ebuild |
53 |
+++ b/sys-apps/file/file-9999.ebuild |
54 |
@@ -6,11 +6,11 @@ EAPI=7 |
55 |
PYTHON_COMPAT=( python3_{6..9} ) |
56 |
DISTUTILS_OPTIONAL=1 |
57 |
|
58 |
-inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal |
59 |
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal |
60 |
|
61 |
if [[ ${PV} == "9999" ]] ; then |
62 |
EGIT_REPO_URI="https://github.com/glensc/file.git" |
63 |
- inherit git-r3 |
64 |
+ inherit autotools git-r3 |
65 |
else |
66 |
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" |
67 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
68 |
@@ -42,7 +42,11 @@ PATCHES=( |
69 |
|
70 |
src_prepare() { |
71 |
default |
72 |
- eautoreconf |
73 |
+ |
74 |
+ if [[ ${PV} == 9999 ]]; then |
75 |
+ eautoreconf |
76 |
+ fi |
77 |
+ |
78 |
elibtoolize |
79 |
|
80 |
# don't let python README kill main README #60043 |