diff options
Diffstat (limited to 'www-client/w3mmee')
14 files changed, 299 insertions, 256 deletions
diff --git a/www-client/w3mmee/Manifest b/www-client/w3mmee/Manifest index 03045d8436d1..59347c74f59a 100644 --- a/www-client/w3mmee/Manifest +++ b/www-client/w3mmee/Manifest @@ -1,10 +1,12 @@ -AUX w3mmee-0.3.2_p24-boehm-gc.patch 359 BLAKE2B 30202b021e7de56d54142af49bf39badccf3a1eae28c779f0eeabab124deb581c6404badcbf91a8055222ae97135773802750fa81bc0e309c65bc064ecec87f8 SHA512 e749a2a3b7694c9fc52fce037f23fa60bcab5fe11dd7b25cf32d7924219bb601096a7dd87914a0e8ca029d2be463e9ca2c16e6d95451ac792b5a50a586bd4d47 -AUX w3mmee-0.3.2_p24-glibc214.patch 906 BLAKE2B 75bb724a0507f1daa9c8710fb8e918e38889c045564d0bf1fee03caee4b0c2253f19e024ab33c3d9f73ad392ed56e73903aa9066f88599ef925b294d86cc7514 SHA512 5c5a6d635832c49aee0663eaea1fd27492affc31ce571dd48a4ce1e21c63695a45cadc06b5c4fa4bb4548855842d59259552dbac1988b7f891639b5ed0d17aa3 -AUX w3mmee-0.3.2_p24-tinfo.patch 422 BLAKE2B c3273c52bc444be5204d161910802ebd2585f8069ed881969b6dc454c927d86bb517720545b8bac5e55b452b7a0ea0721b421fd295f2b24fefa88007837b5f46 SHA512 4c7048dedbc90bf2624bfba8fbe0ae6e3dc5119e3cac8e1aa0706419cf660e038d23a20b98a358cf8d4b0360ead7edd1f30030dc349855744e0510ba229fbb22 -AUX w3mmee-gcc44.patch 377 BLAKE2B 385753dcf65111de0a6e652a0bbe8a2417322b68e01e5b6b4077537a0f4574b517462e42d8aa67b9be6257daeb5d8d61e2dc3a2a5f1eb32e421db114a69cea36 SHA512 07d8758ec667ada333dcfe95218b571814462809bb7f1bde46ae53eceb4edeed76ade9e11d471288807d5ea5d0ad7e7cfd195e3a35df765b8c14f8d9652e8f7e -AUX w3mmee-gcc45.patch 406 BLAKE2B 9dfbbadfd6d44615351231e0b856a48d09b50e46a862f7d67b0f268cdb78952af107ecca8319eae8d294bae1450eb63a4c4675c9d9a629c6545371750cb6660e SHA512 337fafa1c9b317a8ce4554b4e8d8609537ba35121f7c214f7f5c1c2e1b70d476dd0474a69172f4162d92bc05215c1119ef391c81f4d11bbf544b3fe7a047f468 -AUX w3mmee-w3mman-gentoo.diff 1037 BLAKE2B 12fe7ec6e6b2606421c00f75ad6edb86c57ea505cb8243858cb52e69e257c1b97212f13ab8a43de366c2e14670ff48365ba8870dd05fbda9de072b0726feb3a7 SHA512 238d5641c3c15242c5cab723f590f143103ec7da72922f076d4f73102c2d5a9e3f3a6b6367a79d4ecc337aae760023941635495f08e6d946634325736dd8b883 +AUX w3mmee-boehm-gc.patch 294 BLAKE2B ea27a7004cb46135cea7cf33925f9e19679346a02eb0c7e1de98419d466d18501d458970c96dbcf1c02342f4b476890ff3dab04082c4484317d3ef2a76066dc8 SHA512 8f1825704a546e6df603bdc7de2caa396ea778510b8e9d7ed4577b0ad197322d23ea175d51f39c9ca95055620385f4aecbc55ef093459647344bc97848dbcc3b +AUX w3mmee-gcc-4.4.patch 218 BLAKE2B fb2d2db581348efbe51479a45d894ef8cac058438baa5817f5678b41b02dd8a6394394ee724d2c9bb12f1a635f3893646ff90f3e04edbea9a1d6be243527c87d SHA512 8da08aa704a2ae05a2ceaf4d0484aeb256261cacbe2fb89c59327a89951e6f23fc32bddc5988a24cfe048ce8f420f465e827e6ffea8ac8c5ef9eba2e1a2bf457 +AUX w3mmee-gcc-4.5.patch 358 BLAKE2B 9d9d4ce582f852b8fb9e81d2ecc756ffb061f988dea39fe094338da619806fbc1ab2fa72bd55b3f9dd2ed190bd2eb0fad0d2c7cab8423d17862fc4bd879d1820 SHA512 b3fe68ed1ab4819edec04306b4399c8f814732dd06f313d4081e38660c4e2b66c49e2fc33bf706f755492e30e15c2eafbb583aa83bfda210db654388970dcb8d +AUX w3mmee-glibc-2.14.patch 776 BLAKE2B 66dd21827ebe0371da39900a9dbede435b27f0a971b25ea5adf71475502584a74c6850bd95394471b12880dfeab1e61b67ae7914a79892cec117f10efb165b3b SHA512 f566b25cd38b4e950a51030a149e137b50df7494eef4e72522bd00552fd9f02f7f1b57402ffe52b1a00d1c6eb25a3ffe64609e3439a8fe9bd3fa44fa5535460b +AUX w3mmee-rc_name.patch 322 BLAKE2B cc0ba425bf0c690ae769b777b2ae456c5723f101046a608226d2b26943f7738d4775e2affa85bf29ee39c0c18f3c5dc8d4ce8d2c4c6670504f0c1091fd079c86 SHA512 13400e6fcf60d807a17962014b71680c9d54f8749f096726f9b59974464889dd0bca254de298f28aa0fbf3d03bb7974aa429be4c2c6f8168af931802ff78b469 +AUX w3mmee-time.patch 608 BLAKE2B 1c380c5af1cfba502e5749810456944aa2eb52a3e73ee11b7972d937b7f5ae29b47d75081e2175ac737201f82f725b0cd4bcd0102e3f53d926a9d5ed485137f0 SHA512 2e70256bf7e328438f6b4e7dae8eb8775937efd70686a5a34dc5f4c25361b26e2356307105dfe1af002abba8bc7fc607a1858e8f0f500547c62ca873cc715b67 +AUX w3mmee-tinfo.patch 357 BLAKE2B 33ef18109515e789debcfe3a0addc67be0a69853bfda0e732ecde65c4271990dd93582c9f6a1e124679bafd75176c1da318a0c4f8d8e6310a792aea66777fa04 SHA512 ec9bb5936d55d2c2edab7c1ae025f72ddf7734a2b8c2dc152c1cb9eeba42db42c2072232924aed92f40cfd7218eafd9d57bd4bf5b5f8380569b0703a6bc1eb25 +AUX w3mmee-w3mman.patch 631 BLAKE2B b155487da7120b5e106c7b747a7cfc0d3157bdd651da8d324dc262b66ac47c88380e4ab4ed546522199ab3c3b89177b3ec83c5dffba56708ca57de0ba19d7281 SHA512 a883127315a7a5d9354c17a05c1dc4127ab7a72bb46b02592953b83bde54ca4c12f756b1ef44127f9d74517ed1ec1640ef2e187f809b15c906769f1e9e699527 DIST w3mmee-p24-22.tar.gz 690094 BLAKE2B 9b779122a10f606fab8cfe9e3ffde7473f60ee65591de3a1eca241e563ced7c70260670da7c56c9eaf39010180733933eba039d743e723b0cc8c230ef8a31d81 SHA512 85d4d373a5a544f8c4fbc37e8344daaa5eae3ae007a0280c693aa8946c8cbf63f3fc92fb69c2597286921254e3234f29ee1b3f21e1c9d498b39a597a51e98761 -EBUILD w3mmee-0.3.2_p24-r7.ebuild 3682 BLAKE2B 99c8942c9bfa60c5d369e30363da5bf0f3de37d9ea161c1d03fc0fe2e9665e3cf20e675ca15bd2b375af0c7b9ff4ce7a6ef91d0d3e1fdecc6f185aec455e393b SHA512 e318ed35823dcb8ccfd660d6ed6aafb834eb1ebae3e2ccff17db8e137475ac6ec690afa1decbd553dfba09d05d070a40c4d5d210b3e14d0b8674d30b71ef53de -EBUILD w3mmee-0.3.2_p24-r9.ebuild 3724 BLAKE2B a501327ce9cef35344746f22b7bf594c4d71fc2bc779b5769ce0cb220d9e1f3c676a4e7b6d6c13b83a8fe6312df960a4658a3c14d2d3c49cac91ffd75585b0b0 SHA512 9ba14710afcd7e36677dc40fbc0b84b7bcab610ed595bcc30b1e916cd2118e8b5fcbf60388ac4133a4c3979f576fb8a6a50ddbb8cc4e7fa950b6f27533e0d974 -MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1 +EBUILD w3mmee-0.3.2_p24-r10.ebuild 3791 BLAKE2B 473c1e982599c572036cdc985f284d0f672401fa5f90eb950b409db40ba7a5d8ecc45a993711206069e3a9b6581847403ac25762bc60876f64d08794e72ddc15 SHA512 84e9176bf693e0a6ef64d2959b366d299b1221ffa7817f1b01978fde41c6f22567a6b194a17d89d260cd09ad849fe93f2fd70399c9aecf9373b2343b41246894 +EBUILD w3mmee-0.3.2_p24-r7.ebuild 3790 BLAKE2B ff932be41db06237ad1d7e36d5389c6692ac871eb8548e970308b5bef3b04eb55bc6141dc62abf6d0971f1bfdf29574c6633cbe8b66894ca66cee53938102e96 SHA512 01e418bcd5f58ac70b44a6a5401b2e0117c0eb3fc573d111cfb6d078989106fbd62f0d3737c11978c9ffe2be2cb16ca72ef10bdedab1a2f4bd17b5e125e9544e +MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441 diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch b/www-client/w3mmee/files/w3mmee-boehm-gc.patch index 81e6a6dea0f3..d9bafa069046 100644 --- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch +++ b/www-client/w3mmee/files/w3mmee-boehm-gc.patch @@ -1,5 +1,3 @@ -diff --git a/configure b/configure -index 32afb35..3be66fd 100755 --- a/configure +++ b/configure @@ -1503,7 +1503,7 @@ if [ -n "$gclib" -a -n "$gcinclude" ]; then diff --git a/www-client/w3mmee/files/w3mmee-gcc44.patch b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch index 092adb5ba40c..e724244ab869 100644 --- a/www-client/w3mmee/files/w3mmee-gcc44.patch +++ b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch @@ -1,6 +1,5 @@ -diff -ur w3mmee-p24-22.orig/indep.c w3mmee-p24-22/indep.c ---- w3mmee-p24-22.orig/indep.c 2002-11-27 16:35:37.000000000 +0200 -+++ w3mmee-p24-22/indep.c 2009-07-25 23:06:52.000000000 +0300 +--- a/indep.c ++++ b/indep.c @@ -14,7 +14,7 @@ { #ifdef HAVE_STRTOLL diff --git a/www-client/w3mmee/files/w3mmee-gcc45.patch b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch index db6f86e4deee..3e7d1aa0cc0d 100644 --- a/www-client/w3mmee/files/w3mmee-gcc45.patch +++ b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch @@ -1,11 +1,9 @@ -Fixing build with gcc-4.5 +https://bugs.gentoo.org/317815 -https://bugs.gentoo.org/show_bug.cgi?id=317815 +Author: Kacper Kowalik <xarthisius.kk@gmail.com> -Patch written by Kacper Kowalik <xarthisius.kk@gmail.com> - ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -2636,7 +2636,7 @@ fi diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch b/www-client/w3mmee/files/w3mmee-glibc-2.14.patch index dc9be94732c6..7a2b0d9cb39e 100644 --- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch +++ b/www-client/w3mmee/files/w3mmee-glibc-2.14.patch @@ -1,5 +1,3 @@ -diff --git a/istream.c b/istream.c -index de5fbd3..6718b41 100644 --- a/istream.c +++ b/istream.c @@ -132,7 +132,7 @@ newFileStream(FILE *f, void (*closep)()) @@ -11,8 +9,6 @@ index de5fbd3..6718b41 100644 stream->handle.file->f = f; if (closep) -diff --git a/istream.h b/istream.h -index 168882f..3e7132f 100644 --- a/istream.h +++ b/istream.h @@ -20,7 +20,7 @@ struct stream_buffer { diff --git a/www-client/w3mmee/files/w3mmee-rc_name.patch b/www-client/w3mmee/files/w3mmee-rc_name.patch new file mode 100644 index 000000000000..a16a7b9cf2c9 --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-rc_name.patch @@ -0,0 +1,11 @@ +--- a/rc_name.mk_btri.h ++++ b/rc_name.mk_btri.h +@@ -2,7 +2,7 @@ + + #define STRING_LITERAL(x) # x + #undef def_rcsect_begin +-#define def_rcsect_begin(n) STRING_LITERAL(* ## n), §ions[secti_ ## n] ++#define def_rcsect_begin(n) STRING_LITERAL(*n), §ions[secti_ ## n] + + #undef def_rcsect_end + #define def_rcsect_end(n) diff --git a/www-client/w3mmee/files/w3mmee-time.patch b/www-client/w3mmee/files/w3mmee-time.patch new file mode 100644 index 000000000000..c63d6542c326 --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-time.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/586258 + +Author: kouyu <ckyoog@gmail.com> + +--- a/terms.c ++++ b/terms.c +@@ -305,11 +305,7 @@ + struct timeval *tout) + { + static struct timeval polltv = { +-#if CLOCKS_PER_SEC > 1 +- 0, 1000000 / CLOCKS_PER_SEC +-#else +- 0, 10000 +-#endif ++ 0, CLOCKS_PER_SEC > 1 ? 1000000 / CLOCKS_PER_SEC : 10000 + }; + int m; + struct timeval tv; +@@ -779,11 +775,7 @@ + #endif + + static struct timeval display_delta = { +-#if CLOCKS_PER_SEC > 1 +- 0, 1000000 / CLOCKS_PER_SEC, +-#else +- 0, 10000 +-#endif ++ 0, CLOCKS_PER_SEC > 1 ? 1000000 / CLOCKS_PER_SEC : 10000 + }; + + static int diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch b/www-client/w3mmee/files/w3mmee-tinfo.patch index 603e30bb4038..c29f43ada30d 100644 --- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch +++ b/www-client/w3mmee/files/w3mmee-tinfo.patch @@ -1,5 +1,3 @@ -diff --git a/configure b/configure -index 73e247b..32afb35 100755 --- a/configure +++ b/configure @@ -1354,7 +1354,7 @@ main() diff --git a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff deleted file mode 100644 index 967e679f02b2..000000000000 --- a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in w3mmee-p24-19/scripts/w3mman/w3mman.in ---- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in 2002-03-17 14:07:08.000000000 +0900 -+++ w3mmee-p24-19/scripts/w3mman/w3mman.in 2003-12-06 20:49:15.000000000 +0900 -@@ -1,7 +1,7 @@ - #!@PERL@ - - @W3M = split(' ', '@W3M@'); --$ENV{'MAN'} = '@MAN@'; -+$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@'; - $SCRIPT = 'file:///$LIB/w3mman2html.cgi'; - - sub usage { -diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in ---- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in 2002-03-17 14:07:08.000000000 +0900 -+++ w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in 2003-12-06 20:49:53.000000000 +0900 -@@ -1,6 +1,6 @@ - #!@PERL@ - --$MAN = $ENV{'MAN'} || '@MAN@'; -+$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@'; - $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0]; - $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0; - $CGI = "file://$SCRIPT_NAME"; diff --git a/www-client/w3mmee/files/w3mmee-w3mman.patch b/www-client/w3mmee/files/w3mmee-w3mman.patch new file mode 100644 index 000000000000..dd669191e763 --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-w3mman.patch @@ -0,0 +1,21 @@ +--- a/scripts/w3mman/w3mman.in ++++ b/scripts/w3mman/w3mman.in +@@ -1,7 +1,7 @@ + #!@PERL@ + + @W3M = split(' ', '@W3M@'); +-$ENV{'MAN'} = '@MAN@'; ++$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@'; + $SCRIPT = 'file:///$LIB/w3mman2html.cgi'; + + sub usage { +--- a/scripts/w3mman/w3mman2html.cgi.in ++++ b/scripts/w3mman/w3mman2html.cgi.in +@@ -1,6 +1,6 @@ + #!@PERL@ + +-$MAN = $ENV{'MAN'} || '@MAN@'; ++$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@'; + $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0]; + $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0; + $CGI = "file://$SCRIPT_NAME"; diff --git a/www-client/w3mmee/metadata.xml b/www-client/w3mmee/metadata.xml index c921b96adf6c..6f2ca22da233 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>cjk@gentoo.org</email> - <name>Cjk</name> -</maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</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 000000000000..d820c40cf569 --- /dev/null +++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild @@ -0,0 +1,167 @@ +# 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}-rc_name.patch + "${FILESDIR}"/${PN}-time.patch + "${FILESDIR}"/${PN}-tinfo.patch + "${FILESDIR}"/${PN}-w3mman.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-r7.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild index a7fcda4f9114..25c92b189b78 100644 --- a/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild +++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild @@ -1,53 +1,55 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -inherit alternatives eutils toolchain-funcs multilib +inherit alternatives eutils multilib toolchain-funcs -IUSE="gpm imlib nls ssl xface" - -MY_PV=${PV##*_}-22 -MY_P=${PN}-${MY_PV} +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/" +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 nls ssl xface" -DEPEND=">=sys-libs/ncurses-5.2-r3 - >=sys-libs/zlib-1.1.3-r2 - >=dev-libs/boehm-gc-7.2 - dev-lang/perl +DEPEND=">=dev-libs/boehm-gc-7.2 >=dev-libs/libmoe-1.5.3 - imlib? ( >=media-libs/imlib-1.9.8 - xface? ( media-libs/compface ) ) + dev-lang/perl + >=sys-libs/ncurses-5.2-r3 + >=sys-libs/zlib-1.1.3-r2 + imlib? ( + >=media-libs/imlib-1.9.8 + xface? ( media-libs/compface ) + ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) nls? ( sys-devel/gettext ) ssl? ( >=dev-libs/openssl-0.9.6b )" RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}"/${PN}-w3mman-gentoo.diff \ - "${FILESDIR}"/${PN}-gcc4{4,5}.patch \ - "${FILESDIR}"/${P}-glibc214.patch \ - "${FILESDIR}"/${P}-tinfo.patch \ - "${FILESDIR}"/${P}-boehm-gc.patch - sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die + 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}-rc_name.patch + epatch "${FILESDIR}"/${PN}-time.patch + epatch "${FILESDIR}"/${PN}-tinfo.patch + epatch "${FILESDIR}"/${PN}-w3mman.patch + sed -i "/^AR=/s:ar:$(tc-getAR):" XMakefile || die } 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 + 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" @@ -55,22 +57,22 @@ src_compile() { myuse="${myuse} use_ssl=n" fi - if use gpm ; then + if use gpm; then myuse="${myuse} use_mouse=y" else myuse="${myuse} use_mouse=n" fi - if use nls ; then + if use nls; then myconf="${myconf} -locale_dir=/usr/share/locale" else myconf="${myconf} -locale_dir='(NONE)'" fi - if use imlib ; then + if use imlib; then myuse="${myuse} use_image=y use_w3mimg_x11=y use_w3mimg_fb=n w3mimgdisplay_setuid=n" - if use xface ; then + if use xface; then myuse="${myuse} use_xface=y" else myuse="${myuse} use_xface=n" @@ -79,50 +81,51 @@ src_compile() { myuse="${myuse} use_image=n" fi - cat >>config.param<<-EOF + cat <<-EOF >> config.param lang=MANY accept_lang=en EOF - env CC=$(tc-getCC) ${myuse} ./configure -nonstop \ + 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 \ + -auxbindir=/usr/$(get_libdir)/${PN} \ + -libdir=/usr/$(get_libdir)/${PN}/cgi-bin \ + -helpdir=/usr/share/${PN} \ -mandir=/usr/share/man \ - -sysconfdir=/etc/w3mmee \ + -sysconfdir=/etc/${PN} \ -model=custom \ -libmoe=/usr/$(get_libdir) \ -mb_h=/usr/include/moe \ -mk_btri=/usr/libexec/moe \ - -cflags="${CFLAGS}" -ldflags="${LDFLAGS}" \ - ${myconf} || die + -cflags="${CFLAGS}" \ + -ldflags="${LDFLAGS}" \ + ${myconf} \ + || die emake || die "emake failed" } src_install() { - make DESTDIR="${D}" install || die + emake DESTDIR="${D}" install || die + dodoc ChangeLog NEWS* README + dohtml 00INCOMPATIBLE.html # 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 + mv "${D}"/usr/share/man/ja/man1/w3m{,mee}.1 || die docinto en - dodoc doc/HISTORY doc/README* doc/keymap.* doc/menu.* + dodoc doc/{HISTORY,README,keymap,menu}* dohtml doc/* docinto jp - dodoc doc-jp/HISTORY doc-jp/README* doc-jp/keymap* doc-jp/menu.* + dodoc doc-jp/{HISTORY,README,keymap,menu}* dohtml doc-jp/* } pkg_postinst() { - w3m_alternatives einfo einfo "If you want to render multilingual text, please refer to" @@ -133,13 +136,11 @@ pkg_postinst() { } pkg_postrm() { - w3m_alternatives } w3m_alternatives() { - - if [ ! -f /usr/bin/w3m ] ; then + if [[ ! -f /usr/bin/w3m ]]; then alternatives_makesym /usr/bin/w3m \ /usr/bin/w3m{m17n,mee} alternatives_makesym /usr/bin/w3mman \ 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 d475f7bc2ae4..000000000000 --- a/www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2016 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}-w3mman-gentoo.diff \ - "${FILESDIR}"/${PN}-gcc4{4,5}.patch \ - "${FILESDIR}"/${P}-glibc214.patch \ - "${FILESDIR}"/${P}-tinfo.patch \ - "${FILESDIR}"/${P}-boehm-gc.patch - sed -ie "/^AR=/s:ar:$(tc-getAR):" XMakefile || die -} - -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 -} |