commit: 564494be253c18be8838fa5f52a05a390793fdb3 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> AuthorDate: Sat Mar 31 13:58:39 2018 +0000 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> CommitDate: Sat Mar 31 13:58:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564494be
www-client/w3mmee: update to EAPI 6 Closes: https://bugs.gentoo.org/601130 Package-Manager: Portage-2.3.24, Repoman-2.3.6 www-client/w3mmee/metadata.xml | 8 +- www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild | 165 ++++++++++++++++++++++++++ www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild | 158 ------------------------ 3 files changed, 169 insertions(+), 162 deletions(-) diff --git a/www-client/w3mmee/metadata.xml b/www-client/w3mmee/metadata.xml index c921b96adf6..6f2ca22da23 100644 --- a/www-client/w3mmee/metadata.xml +++ b/www-client/w3mmee/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Cjk</name> -</maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <name>Cjk</name> + </maintainer> </pkgmetadata> diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild new file mode 100644 index 00000000000..f96eff96014 --- /dev/null +++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild @@ -0,0 +1,165 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit alternatives multilib toolchain-funcs + +MY_PV="${PV##*_}-22" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="A variant of w3m with support for multiple character encodings" +HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"; +SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"; + +SLOT="0" +LICENSE="public-domain" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gpm imlib libressl nls ssl xface" + +DEPEND=">=dev-libs/boehm-gc-7.2 + dev-libs/libmoe + dev-lang/perl + sys-libs/ncurses:0= + sys-libs/zlib + imlib? ( + media-libs/imlib + xface? ( media-libs/compface ) + ) + gpm? ( sys-libs/gpm ) + nls? ( sys-devel/gettext ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +RDEPEND="${DEPEND}" +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-boehm-gc.patch + "${FILESDIR}"/${PN}-gcc-4.4.patch + "${FILESDIR}"/${PN}-gcc-4.5.patch + "${FILESDIR}"/${PN}-glibc-2.14.patch + "${FILESDIR}"/${PN}-tinfo.patch + "${FILESDIR}"/${PN}-w3mman-gentoo.patch +) +DOCS=( ChangeLog NEWS{,.mee} README ) +HTML_DOCS=( 00INCOMPATIBLE.html ) + +src_prepare() { + default + + sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile +} + +src_configure() { + local myconf=( + -locale_dir=$(usex nls "${EPREFIX}/usr/share/locale" '(NONE)' ) + ) + local myuse=( + display_code=E + system_code=E + use_ansi_color=y + use_cookie=y + use_history=y + use_mouse=$(usex gpm y n) + ) + + if use ssl; then + myconf+=( + --ssl-includedir="${EPREFIX}/usr/include/openssl" + --ssl-libdir="${EPREFIX}/usr/$(get_libdir)" + ) + myuse+=( + use_digest_auth=y + use_ssl=y + use_ssl_verify=y + ) + else + myuse+=( use_ssl=n ) + fi + if use imlib; then + myuse+=( + use_image=y + use_w3mimg_fb=n + use_w3mimg_x11=y + use_xface=$(usex xface y n) + w3mimgdisplay_setuid=n + ) + else + myuse+=( use_image=n ) + fi + + cat <<-EOF >> config.param + lang=MANY + accept_lang=en + EOF + + env CC=$(tc-getCC) "${myuse[@]}" ./configure \ + -nonstop \ + -prefix="${EPREFIX}/usr" \ + -suffix=mee \ + -auxbindir="${EPREFIX}/usr/$(get_libdir)/${PN}" \ + -libdir="${EPREFIX}/usr/$(get_libdir)/${PN}/cgi-bin" \ + -helpdir="${EPREFIX}/usr/share/${PN}" \ + -mandir="${EPREFIX}/usr/share/man" \ + -sysconfdir="${EPREFIX}/etc/${PN}" \ + -model=custom \ + -libmoe="${EPREFIX}/usr/$(get_libdir)" \ + -mb_h="${EPREFIX}/usr/include/moe" \ + -mk_btri="${EPREFIX}/usr/libexec/moe" \ + -cflags="${CFLAGS}" \ + -ldflags="${LDFLAGS}" \ + "${myconf[@]}" \ + || die +} + +src_install() { + emake DESTDIR="${D}" install + einstalldocs + + # w3mman and manpages conflict with those from w3m + mv "${ED}"/usr/share/man/man1/w3m{,mee}.1 || die + mv "${ED}"/usr/share/man/ja/man1/w3m{,mee}.1 || die + + docinto html/en + dodoc doc/*.html + rm -f doc/*.html + docinto en + dodoc doc/{HISTORY,README,keymap,menu}* + + docinto html/ja + dodoc doc-jp/*.html + rm -f doc-jp/*.html + docinto ja + dodoc doc-jp/{HISTORY,README,keymap,menu}* +} + +pkg_postinst() { + w3m_alternatives + einfo + einfo "If you want to render multilingual text, please refer to" + einfo "/usr/share/doc/${PF}/en/README.mee or" + einfo "/usr/share/doc/${PF}/jp/README.mee" + einfo "and set W3MLANG variable respectively." + einfo +} + +pkg_postrm() { + w3m_alternatives +} + +w3m_alternatives() { + if [[ ! -f /usr/bin/w3m ]]; then + alternatives_makesym /usr/bin/w3m \ + /usr/bin/w3m{m17n,mee} + alternatives_makesym /usr/bin/w3mman \ + /usr/bin/w3m{man-m17n,meeman} + alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \ + /usr/share/man/ja/man1/w3m{m17n,mee}.1.gz + alternatives_makesym /usr/share/man/man1/w3m.1.gz \ + /usr/share/man/man1/w3m{m17n,mee}.1.gz + alternatives_makesym /usr/share/man/man1/w3mman.1.gz \ + /usr/share/man/man1/w3m{man-m17n,meeman}.1.gz + fi +} diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild deleted file mode 100644 index 9aec0de8636..00000000000 --- a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit alternatives eutils toolchain-funcs multilib - -IUSE="gpm imlib libressl nls ssl xface" - -MY_PV=${PV##*_}-22 -MY_P=${PN}-${MY_PV} - -DESCRIPTION="A variant of w3m with support for multiple character encodings" -SRC_URI="http://pub.ks-and-ks.ne.jp/prog/pub/${MY_P}.tar.gz"; -HOMEPAGE="http://pub.ks-and-ks.ne.jp/prog/w3mmee/"; - -SLOT="0" -LICENSE="public-domain" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPEND="sys-libs/ncurses:0= - >=sys-libs/zlib-1.1.3-r2 - >=dev-libs/boehm-gc-7.2 - dev-lang/perl - >=dev-libs/libmoe-1.5.3 - imlib? ( >=media-libs/imlib-1.9.8 - xface? ( media-libs/compface ) ) - gpm? ( >=sys-libs/gpm-1.19.3-r5 ) - nls? ( sys-devel/gettext ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-boehm-gc.patch - epatch "${FILESDIR}"/${PN}-gcc-4.4.patch - epatch "${FILESDIR}"/${PN}-gcc-4.5.patch - epatch "${FILESDIR}"/${PN}-glibc-2.14.patch - epatch "${FILESDIR}"/${PN}-tinfo.patch - epatch "${FILESDIR}"/${PN}-w3mman-gentoo.patch - sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile -} - -src_compile() { - - local myconf myuse - myuse="use_cookie=y use_ansi_color=y use_history=y - display_code=E system_code=E" - - if use ssl ; then - myconf="${myconf} --ssl-includedir=/usr/include/openssl - --ssl-libdir=/usr/$(get_libdir)" - myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y" - else - myuse="${myuse} use_ssl=n" - fi - - if use gpm ; then - myuse="${myuse} use_mouse=y" - else - myuse="${myuse} use_mouse=n" - fi - - if use nls ; then - myconf="${myconf} -locale_dir=/usr/share/locale" - else - myconf="${myconf} -locale_dir='(NONE)'" - fi - - if use imlib ; then - myuse="${myuse} use_image=y use_w3mimg_x11=y - use_w3mimg_fb=n w3mimgdisplay_setuid=n" - if use xface ; then - myuse="${myuse} use_xface=y" - else - myuse="${myuse} use_xface=n" - fi - else - myuse="${myuse} use_image=n" - fi - - cat >>config.param<<-EOF - lang=MANY - accept_lang=en - EOF - - env CC=$(tc-getCC) ${myuse} ./configure -nonstop \ - -prefix=/usr \ - -suffix=mee \ - -auxbindir=/usr/$(get_libdir)/w3mmee \ - -libdir=/usr/$(get_libdir)/w3mmee/cgi-bin \ - -helpdir=/usr/share/w3mmee \ - -mandir=/usr/share/man \ - -sysconfdir=/etc/w3mmee \ - -model=custom \ - -libmoe=/usr/$(get_libdir) \ - -mb_h=/usr/include/moe \ - -mk_btri=/usr/libexec/moe \ - -cflags="${CFLAGS}" -ldflags="${LDFLAGS}" \ - ${myconf} || die - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die - - # w3mman and manpages conflict with those from w3m - mv "${D}"/usr/share/man/ja/man1/w3m{,mee}.1 || die - mv "${D}"/usr/share/man/man1/w3m{,mee}.1 || die - - dodoc ChangeLog NEWS* README - dohtml 00INCOMPATIBLE.html - - docinto en - dodoc doc/HISTORY doc/README* doc/keymap.* doc/menu.* - dohtml doc/* - - docinto jp - dodoc doc-jp/HISTORY doc-jp/README* doc-jp/keymap* doc-jp/menu.* - dohtml doc-jp/* -} - -pkg_postinst() { - - w3m_alternatives - einfo - einfo "If you want to render multilingual text, please refer to" - einfo "/usr/share/doc/${PF}/en/README.mee or" - einfo "/usr/share/doc/${PF}/jp/README.mee" - einfo "and set W3MLANG variable respectively." - einfo -} - -pkg_postrm() { - - w3m_alternatives -} - -w3m_alternatives() { - - if [ ! -f /usr/bin/w3m ] ; then - alternatives_makesym /usr/bin/w3m \ - /usr/bin/w3m{m17n,mee} - alternatives_makesym /usr/bin/w3mman \ - /usr/bin/w3m{man-m17n,meeman} - alternatives_makesym /usr/share/man/ja/man1/w3m.1.gz \ - /usr/share/man/ja/man1/w3m{m17n,mee}.1.gz - alternatives_makesym /usr/share/man/man1/w3m.1.gz \ - /usr/share/man/man1/w3m{m17n,mee}.1.gz - alternatives_makesym /usr/share/man/man1/w3mman.1.gz \ - /usr/share/man/man1/w3m{man-m17n,meeman}.1.gz - fi -}
