1 |
commit: 003354d5bed49856916fc5c9bff93410b143480a |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 23 23:02:51 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 28 15:19:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=003354d5 |
7 |
|
8 |
sys-devel/libtool: Sync live ebuild |
9 |
|
10 |
Acked-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.82, Repoman-2.3.20 |
12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
sys-devel/libtool/libtool-9999.ebuild | 67 +++++++++++++++-------------------- |
16 |
1 file changed, 29 insertions(+), 38 deletions(-) |
17 |
|
18 |
diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild |
19 |
index 96ef613ccee..a929635d35d 100644 |
20 |
--- a/sys-devel/libtool/libtool-9999.ebuild |
21 |
+++ b/sys-devel/libtool/libtool-9999.ebuild |
22 |
@@ -1,19 +1,18 @@ |
23 |
-# Copyright 1999-2018 Gentoo Foundation |
24 |
+# Copyright 1999-2019 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
-EAPI=6 |
28 |
+EAPI=7 |
29 |
|
30 |
LIBTOOLIZE="true" #225559 |
31 |
WANT_LIBTOOL="none" |
32 |
-inherit autotools epunt-cxx multilib unpacker prefix |
33 |
+inherit autotools prefix |
34 |
|
35 |
-if [[ ${PV} == "9999" ]] ; then |
36 |
- EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git |
37 |
- http://git.savannah.gnu.org/r/${PN}.git" |
38 |
+if [[ ${PV} == *9999 ]] ; then |
39 |
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git" |
40 |
inherit git-r3 |
41 |
else |
42 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
43 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~x86-winnt" |
44 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~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 ~x86-winnt" |
45 |
fi |
46 |
|
47 |
DESCRIPTION="A shared library tool for developers" |
48 |
@@ -24,14 +23,13 @@ SLOT="2" |
49 |
IUSE="vanilla" |
50 |
|
51 |
# Pull in libltdl directly until we convert packages to the new dep. |
52 |
-RDEPEND="sys-devel/gnuconfig |
53 |
- >=sys-devel/autoconf-2.69 |
54 |
- >=sys-devel/automake-1.13 |
55 |
- dev-libs/libltdl:0 |
56 |
- !<sys-apps/sandbox-2.10-r4" |
57 |
-DEPEND="${RDEPEND} |
58 |
- app-arch/xz-utils" |
59 |
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man" |
60 |
+RDEPEND=" |
61 |
+ sys-devel/gnuconfig |
62 |
+ >=sys-devel/autoconf-2.69:* |
63 |
+ >=sys-devel/automake-1.13:* |
64 |
+ dev-libs/libltdl:0" |
65 |
+DEPEND="${RDEPEND}" |
66 |
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man" |
67 |
|
68 |
PATCHES=( |
69 |
"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105 |
70 |
@@ -40,27 +38,25 @@ PATCHES=( |
71 |
"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch |
72 |
) |
73 |
|
74 |
-src_unpack() { |
75 |
- if [[ ${PV} == "9999" ]] ; then |
76 |
- git-r3_src_unpack |
77 |
- else |
78 |
- unpacker_src_unpack |
79 |
- fi |
80 |
-} |
81 |
- |
82 |
src_prepare() { |
83 |
- if [[ "${PV}" = 9999 ]] ; then |
84 |
+ if [[ ${PV} == *9999 ]] ; then |
85 |
eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876 |
86 |
./bootstrap || die |
87 |
else |
88 |
PATCHES+=( |
89 |
- "${FILESDIR}"/${P}-pthread_bootstrapped.patch #650876 |
90 |
+ "${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch #650876 |
91 |
) |
92 |
fi |
93 |
|
94 |
- use vanilla && return 0 |
95 |
+ # WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway |
96 |
+ chmod +w build-aux/ltmain.sh || die |
97 |
|
98 |
- default |
99 |
+ if use vanilla ; then |
100 |
+ eapply_user |
101 |
+ return 0 |
102 |
+ else |
103 |
+ default |
104 |
+ fi |
105 |
|
106 |
if use prefix ; then |
107 |
# seems that libtool has to know about EPREFIX a little bit |
108 |
@@ -73,15 +69,15 @@ src_prepare() { |
109 |
eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch |
110 |
eprefixify m4/libtool.m4 |
111 |
fi |
112 |
- pushd libltdl >/dev/null |
113 |
+ |
114 |
+ pushd libltdl >/dev/null || die |
115 |
AT_NOELIBTOOLIZE=yes eautoreconf |
116 |
- popd >/dev/null |
117 |
+ popd >/dev/null || die |
118 |
AT_NOELIBTOOLIZE=yes eautoreconf |
119 |
- epunt_cxx |
120 |
|
121 |
# Make sure timestamps don't trigger a rebuild of man pages. #556512 |
122 |
- if [[ ${PV} != "9999" ]] ; then |
123 |
- touch doc/*.1 |
124 |
+ if [[ ${PV} != *9999 ]] ; then |
125 |
+ touch doc/*.1 || die |
126 |
export HELP2MAN=false |
127 |
fi |
128 |
} |
129 |
@@ -96,15 +92,10 @@ src_configure() { |
130 |
# Do not bother hardcoding the full path to sed. Just rely on $PATH. #574550 |
131 |
export ac_cv_path_SED="$(basename "$(type -P sed)")" |
132 |
|
133 |
- local myconf |
134 |
- [[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g" |
135 |
+ [[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g" |
136 |
ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install |
137 |
} |
138 |
|
139 |
-src_test() { |
140 |
- emake check |
141 |
-} |
142 |
- |
143 |
src_install() { |
144 |
default |