1 |
commit: 7e56ae0eb71a58bb96dd2b942806d294a2b01b22 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 1 12:21:24 2018 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 1 12:23:59 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e56ae0e |
7 |
|
8 |
www-client/w3mmee: fix build |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild | 80 ++++++++++++++-------------- |
13 |
1 file changed, 40 insertions(+), 40 deletions(-) |
14 |
|
15 |
diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild |
16 |
index d49a167a56c..25c92b189b7 100644 |
17 |
--- a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild |
18 |
+++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild |
19 |
@@ -1,34 +1,34 @@ |
20 |
# Copyright 1999-2018 Gentoo Foundation |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
-inherit alternatives eutils toolchain-funcs multilib |
24 |
+inherit alternatives eutils multilib toolchain-funcs |
25 |
|
26 |
-IUSE="gpm imlib nls ssl xface" |
27 |
- |
28 |
-MY_PV=${PV##*_}-22 |
29 |
-MY_P=${PN}-${MY_PV} |
30 |
+MY_PV="${PV##*_}-22" |
31 |
+MY_P="${PN}-${MY_PV}" |
32 |
|
33 |
DESCRIPTION="A variant of w3m with support for multiple character encodings" |
34 |
-SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz" |
35 |
HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/" |
36 |
+SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz" |
37 |
|
38 |
SLOT="0" |
39 |
LICENSE="public-domain" |
40 |
KEYWORDS="amd64 ppc x86" |
41 |
+IUSE="gpm imlib nls ssl xface" |
42 |
|
43 |
-DEPEND=">=sys-libs/ncurses-5.2-r3 |
44 |
- >=sys-libs/zlib-1.1.3-r2 |
45 |
- >=dev-libs/boehm-gc-7.2 |
46 |
- dev-lang/perl |
47 |
+DEPEND=">=dev-libs/boehm-gc-7.2 |
48 |
>=dev-libs/libmoe-1.5.3 |
49 |
- imlib? ( >=media-libs/imlib-1.9.8 |
50 |
- xface? ( media-libs/compface ) ) |
51 |
+ dev-lang/perl |
52 |
+ >=sys-libs/ncurses-5.2-r3 |
53 |
+ >=sys-libs/zlib-1.1.3-r2 |
54 |
+ imlib? ( |
55 |
+ >=media-libs/imlib-1.9.8 |
56 |
+ xface? ( media-libs/compface ) |
57 |
+ ) |
58 |
gpm? ( >=sys-libs/gpm-1.19.3-r5 ) |
59 |
nls? ( sys-devel/gettext ) |
60 |
ssl? ( >=dev-libs/openssl-0.9.6b )" |
61 |
RDEPEND="${DEPEND}" |
62 |
- |
63 |
-S=${WORKDIR}/${MY_P} |
64 |
+S="${WORKDIR}/${MY_P}" |
65 |
|
66 |
src_unpack() { |
67 |
unpack ${A} |
68 |
@@ -37,18 +37,19 @@ src_unpack() { |
69 |
epatch "${FILESDIR}"/${PN}-gcc-4.4.patch |
70 |
epatch "${FILESDIR}"/${PN}-gcc-4.5.patch |
71 |
epatch "${FILESDIR}"/${PN}-glibc-2.14.patch |
72 |
+ epatch "${FILESDIR}"/${PN}-rc_name.patch |
73 |
+ epatch "${FILESDIR}"/${PN}-time.patch |
74 |
epatch "${FILESDIR}"/${PN}-tinfo.patch |
75 |
epatch "${FILESDIR}"/${PN}-w3mman.patch |
76 |
- sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die |
77 |
+ sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile || die |
78 |
} |
79 |
|
80 |
src_compile() { |
81 |
- |
82 |
local myconf myuse |
83 |
myuse="use_cookie=y use_ansi_color=y use_history=y |
84 |
display_code=E system_code=E" |
85 |
|
86 |
- if use ssl ; then |
87 |
+ if use ssl; then |
88 |
myconf="${myconf} --ssl-includedir=/usr/include/openssl |
89 |
--ssl-libdir=/usr/$(get_libdir)" |
90 |
myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y" |
91 |
@@ -56,22 +57,22 @@ src_compile() { |
92 |
myuse="${myuse} use_ssl=n" |
93 |
fi |
94 |
|
95 |
- if use gpm ; then |
96 |
+ if use gpm; then |
97 |
myuse="${myuse} use_mouse=y" |
98 |
else |
99 |
myuse="${myuse} use_mouse=n" |
100 |
fi |
101 |
|
102 |
- if use nls ; then |
103 |
+ if use nls; then |
104 |
myconf="${myconf} -locale_dir=/usr/share/locale" |
105 |
else |
106 |
myconf="${myconf} -locale_dir='(NONE)'" |
107 |
fi |
108 |
|
109 |
- if use imlib ; then |
110 |
+ if use imlib; then |
111 |
myuse="${myuse} use_image=y use_w3mimg_x11=y |
112 |
use_w3mimg_fb=n w3mimgdisplay_setuid=n" |
113 |
- if use xface ; then |
114 |
+ if use xface; then |
115 |
myuse="${myuse} use_xface=y" |
116 |
else |
117 |
myuse="${myuse} use_xface=n" |
118 |
@@ -80,50 +81,51 @@ src_compile() { |
119 |
myuse="${myuse} use_image=n" |
120 |
fi |
121 |
|
122 |
- cat >>config.param<<-EOF |
123 |
+ cat <<-EOF >> config.param |
124 |
lang=MANY |
125 |
accept_lang=en |
126 |
EOF |
127 |
|
128 |
- env CC=$(tc-getCC) ${myuse} ./configure -nonstop \ |
129 |
+ env CC=$(tc-getCC) ${myuse} ./configure \ |
130 |
+ -nonstop \ |
131 |
-prefix=/usr \ |
132 |
-suffix=mee \ |
133 |
- -auxbindir=/usr/$(get_libdir)/w3mmee \ |
134 |
- -libdir=/usr/$(get_libdir)/w3mmee/cgi-bin \ |
135 |
- -helpdir=/usr/share/w3mmee \ |
136 |
+ -auxbindir=/usr/$(get_libdir)/${PN} \ |
137 |
+ -libdir=/usr/$(get_libdir)/${PN}/cgi-bin \ |
138 |
+ -helpdir=/usr/share/${PN} \ |
139 |
-mandir=/usr/share/man \ |
140 |
- -sysconfdir=/etc/w3mmee \ |
141 |
+ -sysconfdir=/etc/${PN} \ |
142 |
-model=custom \ |
143 |
-libmoe=/usr/$(get_libdir) \ |
144 |
-mb_h=/usr/include/moe \ |
145 |
-mk_btri=/usr/libexec/moe \ |
146 |
- -cflags="${CFLAGS}" -ldflags="${LDFLAGS}" \ |
147 |
- ${myconf} || die |
148 |
+ -cflags="${CFLAGS}" \ |
149 |
+ -ldflags="${LDFLAGS}" \ |
150 |
+ ${myconf} \ |
151 |
+ || die |
152 |
|
153 |
emake || die "emake failed" |
154 |
} |
155 |
|
156 |
src_install() { |
157 |
- make DESTDIR="${D}" install || die |
158 |
+ emake DESTDIR="${D}" install || die |
159 |
+ dodoc ChangeLog NEWS* README |
160 |
+ dohtml 00INCOMPATIBLE.html |
161 |
|
162 |
# w3mman and manpages conflict with those from w3m |
163 |
- mv "${D}"/usr/share/man/ja/man1/w3m{,mee}.1 || die |
164 |
mv "${D}"/usr/share/man/man1/w3m{,mee}.1 || die |
165 |
- |
166 |
- dodoc ChangeLog NEWS* README |
167 |
- dohtml 00INCOMPATIBLE.html |
168 |
+ mv "${D}"/usr/share/man/ja/man1/w3m{,mee}.1 || die |
169 |
|
170 |
docinto en |
171 |
- dodoc doc/HISTORY doc/README* doc/keymap.* doc/menu.* |
172 |
+ dodoc doc/{HISTORY,README,keymap,menu}* |
173 |
dohtml doc/* |
174 |
|
175 |
docinto jp |
176 |
- dodoc doc-jp/HISTORY doc-jp/README* doc-jp/keymap* doc-jp/menu.* |
177 |
+ dodoc doc-jp/{HISTORY,README,keymap,menu}* |
178 |
dohtml doc-jp/* |
179 |
} |
180 |
|
181 |
pkg_postinst() { |
182 |
- |
183 |
w3m_alternatives |
184 |
einfo |
185 |
einfo "If you want to render multilingual text, please refer to" |
186 |
@@ -134,13 +136,11 @@ pkg_postinst() { |
187 |
} |
188 |
|
189 |
pkg_postrm() { |
190 |
- |
191 |
w3m_alternatives |
192 |
} |
193 |
|
194 |
w3m_alternatives() { |
195 |
- |
196 |
- if [ ! -f /usr/bin/w3m ] ; then |
197 |
+ if [[ ! -f /usr/bin/w3m ]]; then |
198 |
alternatives_makesym /usr/bin/w3m \ |
199 |
/usr/bin/w3m{m17n,mee} |
200 |
alternatives_makesym /usr/bin/w3mman \ |