From 171a011ad3a131671aeb5a98b9e3adf219ad2865 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 2 Apr 2018 17:36:40 +0100 Subject: gentoo resync : 02.04.2018 --- www-client/Manifest.gz | Bin 7066 -> 7061 bytes www-client/chromium/Manifest | 4 +- www-client/chromium/chromium-66.0.3359.22.ebuild | 699 --------------------- www-client/chromium/chromium-66.0.3359.66.ebuild | 699 +++++++++++++++++++++ www-client/otter/Manifest | 6 +- www-client/otter/otter-0.9.94.ebuild | 73 --- www-client/otter/otter-0.9.95.ebuild | 73 --- www-client/otter/otter-0.9.97.ebuild | 86 +++ www-client/w3mmee/Manifest | 20 +- .../w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch | 13 - .../w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch | 35 -- .../w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch | 13 - www-client/w3mmee/files/w3mmee-boehm-gc.patch | 11 + www-client/w3mmee/files/w3mmee-gcc-4.4.patch | 11 + www-client/w3mmee/files/w3mmee-gcc-4.5.patch | 15 + www-client/w3mmee/files/w3mmee-gcc44.patch | 12 - www-client/w3mmee/files/w3mmee-gcc45.patch | 17 - www-client/w3mmee/files/w3mmee-glibc-2.14.patch | 31 + www-client/w3mmee/files/w3mmee-rc_name.patch | 11 + www-client/w3mmee/files/w3mmee-time.patch | 32 + www-client/w3mmee/files/w3mmee-tinfo.patch | 11 + www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff | 23 - www-client/w3mmee/files/w3mmee-w3mman.patch | 21 + www-client/w3mmee/metadata.xml | 8 +- www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild | 167 +++++ www-client/w3mmee/w3mmee-0.3.2_p24-r7.ebuild | 93 +-- www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild | 157 ----- 27 files changed, 1161 insertions(+), 1180 deletions(-) delete mode 100644 www-client/chromium/chromium-66.0.3359.22.ebuild create mode 100644 www-client/chromium/chromium-66.0.3359.66.ebuild delete mode 100644 www-client/otter/otter-0.9.94.ebuild delete mode 100644 www-client/otter/otter-0.9.95.ebuild create mode 100644 www-client/otter/otter-0.9.97.ebuild delete mode 100644 www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch delete mode 100644 www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch delete mode 100644 www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch create mode 100644 www-client/w3mmee/files/w3mmee-boehm-gc.patch create mode 100644 www-client/w3mmee/files/w3mmee-gcc-4.4.patch create mode 100644 www-client/w3mmee/files/w3mmee-gcc-4.5.patch delete mode 100644 www-client/w3mmee/files/w3mmee-gcc44.patch delete mode 100644 www-client/w3mmee/files/w3mmee-gcc45.patch create mode 100644 www-client/w3mmee/files/w3mmee-glibc-2.14.patch create mode 100644 www-client/w3mmee/files/w3mmee-rc_name.patch create mode 100644 www-client/w3mmee/files/w3mmee-time.patch create mode 100644 www-client/w3mmee/files/w3mmee-tinfo.patch delete mode 100644 www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff create mode 100644 www-client/w3mmee/files/w3mmee-w3mman.patch create mode 100644 www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild delete mode 100644 www-client/w3mmee/w3mmee-0.3.2_p24-r9.ebuild (limited to 'www-client') diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index f5ec439bd125..18009e7c20d1 100644 Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index f27cf6a592f4..3f6727f6f6b2 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -15,12 +15,12 @@ AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab5 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 DIST chromium-65.0.3325.146.tar.xz 570305180 BLAKE2B b4ac28ea267a673e0c8d22abb41b607ea7f1bca12b43f80f3fffd562bb85af5b298725beca2ac3e3a31297537c2d485912eda3996ab56c45bf8e113cc7ebf764 SHA512 e8227325c0128e6c476006aaba97db24b7458de56fb47a26c5880564b730d6e3c130945bfa1e8f664a270b8f22dc25869633d42860c2a9ac684e37325802fbf5 DIST chromium-65.0.3325.181.tar.xz 570386836 BLAKE2B e170c80dc59ccf84c08430d9685f2d491f609d6217cfea4e0618622dbf53722e9803a41df4e922446be90d8ae70229b3b8bb9a86e9a5fd21a7986aee4665866c SHA512 52472127b46da48699f401ab9c64f80975398bc3e97d032c517736babc327bfa0a0ce6415831ff3f585cd309e2e05e48d5252b15d0873fee118adf70f54d1a05 -DIST chromium-66.0.3359.22.tar.xz 583532916 BLAKE2B 94a09d7aa687697ec572a933fdf032ad27a77bed24a31c7a497222da86bbc44f0a25846c7a925c527d3f8ee601110eaf8cd8f4691a19170ca68098acbfd885be SHA512 7143e6e048d5b370032ab24f231b63fda0044f08c6f2c3f8722a33d43387629d7462434b7c3fea8bab8a4a1e25622d9576cd3eba80d23b8c937b85e61c6bc55f DIST chromium-66.0.3359.45.tar.xz 583703472 BLAKE2B 6ebbc83c870889319b99ba33f0416e2ce5988955890c579b1df38da3bd6938aa0d158c65a574ea48d3a34a2f87f7982f35a9280b017f8471c6ac837e2689303a SHA512 be32c4ab8db1e8d1e2581f015fdbe12ee4c734b77611511c53a5279114ba4d5d4d1dfe9fb1385bea587b530d6551491db70b275615a96fe86e5a525512fc6d73 +DIST chromium-66.0.3359.66.tar.xz 583883464 BLAKE2B af59a0e7296c5d3db02187da79b99cd2eabf4c2cdc04223bca40590529c5dbad3332b1896ebae4a3e99b8e451786adf8300570c074c28126251212bf880c588a SHA512 25f9e897f5fdc2f7dbc3cf3e9f4f135199f1c68ea41f167f94be1018fd337707dfe281ca7774a45d1f03f6a6c9a148bb51be4491b006331dd4f99a4836ce69d1 DIST chromium-67.0.3377.1.tar.xz 585310180 BLAKE2B 9e543ad2796c617e9c6237a938600ddd4fd7f7245f78e7aec25e2160ed8ab128e70c97d5a7d70021fd7b79707ceaf1e5e0a836e25474ad5e2999bc1f6b7e43b1 SHA512 e0e5c092895d676551ad75cf18595a641676cde0a6a414180a7e23046cb47fe61256634ac50fa6b3f05153a75125e88417bada12f662ee3fa71aad3ba7cf7684 EBUILD chromium-65.0.3325.146.ebuild 20899 BLAKE2B 3694430361ce7b8f6a2db0e6a3be5654136174dfad1faf155fe326eefdf1186eeaafdcb27c47018919e91ffbc48237311f880c0b8250358dcccad7b22588dd6c SHA512 08e0737062d30a800e4e8a21b0a715a8610ef49d30040e034ff37c26b53fa48b8ff5544f6e3a8ca4b41bd3738928210ad09bbbbb5dbe7c47e22f1bd98cb6fe3b EBUILD chromium-65.0.3325.181.ebuild 20900 BLAKE2B d93ddc7aa2b11928b47fb508950642f89b4f0b94bb6f6ad6e516cdce42e68b7346cd6095337632e8a15d946d1da6af10be36ac0b23766d04b02fe78de5747a3c SHA512 06453fef8284858d4273f20c30142cc78fd2d047ffb4b9a4444ef93caee07918eb0d6f4b64c95ad71a20228ee561d1256c7b7a9c66e2e49dfeecbeeed5ea4b02 -EBUILD chromium-66.0.3359.22.ebuild 21056 BLAKE2B 2620e59768403975d4bde8c286b020f723ba9d60d2c02b1ba8ac99c71589add05dce3fa7b9e7db6d84f58bbab1b0d1499ae371bcd7fb2b5735b1a8954471dc7f SHA512 5204b782fffe5ebf121e5131dd205e4f1066f4736e4828091e3951d289edcb3e675e7a16910019850730af4fc93b825af1a3dafa7710c9a6aa5c721570bb3530 EBUILD chromium-66.0.3359.45.ebuild 21056 BLAKE2B 2620e59768403975d4bde8c286b020f723ba9d60d2c02b1ba8ac99c71589add05dce3fa7b9e7db6d84f58bbab1b0d1499ae371bcd7fb2b5735b1a8954471dc7f SHA512 5204b782fffe5ebf121e5131dd205e4f1066f4736e4828091e3951d289edcb3e675e7a16910019850730af4fc93b825af1a3dafa7710c9a6aa5c721570bb3530 +EBUILD chromium-66.0.3359.66.ebuild 21056 BLAKE2B 2620e59768403975d4bde8c286b020f723ba9d60d2c02b1ba8ac99c71589add05dce3fa7b9e7db6d84f58bbab1b0d1499ae371bcd7fb2b5735b1a8954471dc7f SHA512 5204b782fffe5ebf121e5131dd205e4f1066f4736e4828091e3951d289edcb3e675e7a16910019850730af4fc93b825af1a3dafa7710c9a6aa5c721570bb3530 EBUILD chromium-67.0.3377.1.ebuild 20722 BLAKE2B 212e18f41c38fa0bb4cb31e23d0302a1111a16e686e323a6dd08bd7aa2fd10585e78ba0a42689d4d5a77b97727c6bcccf2fbad5776797dc5ec9b472a01a7ed24 SHA512 9c64befd569134d02f036f35e2bc146f88ba00ec5843d2faddf5354d31f0661847744bdb79d4a14747a307e57bed6a181c243bf163a3c16ce57ad2d96be6d7b1 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039 diff --git a/www-client/chromium/chromium-66.0.3359.22.ebuild b/www-client/chromium/chromium-66.0.3359.22.ebuild deleted file mode 100644 index cf52ce6305d2..000000000000 --- a/www-client/chromium/chromium-66.0.3359.22.ebuild +++ /dev/null @@ -1,699 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr - sv sw ta te th tr uk vi zh-CN zh-TW" - -inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" - -COMMON_DEPEND=" - app-accessibility/at-spi2-atk:2 - app-arch/bzip2:= - cups? ( >=net-print/cups-1.3.11:= ) - dev-libs/atk - dev-libs/expat:= - dev-libs/glib:2 - system-icu? ( >=dev-libs/icu-59:= ) - >=dev-libs/libxml2-2.9.4-r3:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.26:= - >=dev-libs/re2-0.2016.05.01:= - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/fontconfig:= - media-libs/freetype:= - >=media-libs/harfbuzz-1.6.0:=[icu(-)] - media-libs/libjpeg-turbo:= - media-libs/libpng:= - system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) - >=media-libs/openh264-1.6.0:= - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( - >=media-video/ffmpeg-3:= - || ( - media-video/ffmpeg[-samba] - >=net-fs/samba-4.5.10-r1[-debug(-)] - ) - !=net-fs/samba-4.5.12 - media-libs/opus:= - ) - sys-apps/dbus:= - sys-apps/pciutils:= - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[X] - x11-libs/libX11:= - x11-libs/libXcomposite:= - x11-libs/libXcursor:= - x11-libs/libXdamage:= - x11-libs/libXext:= - x11-libs/libXfixes:= - >=x11-libs/libXi-1.6.0:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - app-arch/snappy:= - media-libs/flac:= - >=media-libs/libwebp-0.4.0:= - sys-libs/zlib:=[minizip] - kerberos? ( virtual/krb5 ) -" -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND="${COMMON_DEPEND} - !=www-client/chromium-9999 - !=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" -} - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Some web pages may require additional fonts to display properly. -Try installing some of the following packages if some characters -are not displayed properly: -- media-fonts/arphicfonts -- media-fonts/bitstream-cyberbit -- media-fonts/droid -- media-fonts/ipamonafont -- media-fonts/noto -- media-fonts/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -To fix broken icons on the Downloads page, you should install an icon -theme that covers the appropriate MIME types, and configure this as your -GTK+ icon theme. -" - -PATCHES=( - "${FILESDIR}/chromium-widevine-r1.patch" - "${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch" - "${FILESDIR}/chromium-webrtc-r0.patch" - "${FILESDIR}/chromium-memcpy-r0.patch" - "${FILESDIR}/chromium-clang-r2.patch" - "${FILESDIR}/chromium-math.h-r0.patch" - "${FILESDIR}/chromium-stdint.patch" - "${FILESDIR}/chromium-clang-r4.patch" - "${FILESDIR}/chromium-ffmpeg-r1.patch" - "${FILESDIR}/chromium-ffmpeg-clang.patch" -) - -pre_build_checks() { - #if [[ ${MERGE_TYPE} != binary ]]; then - # local -x CPP="$(tc-getCXX) -E" - # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then - # # bugs: #601654 - # die "At least clang 3.9.1 is required" - # fi - # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then - # # bugs: #535730, #525374, #518668, #600288, #627356 - # die "At least gcc 5.0 is required" - # fi - #fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - CHECKREQS_DISK_BUILD="5G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - CHECKREQS_DISK_BUILD="25G" - if ! use component-build; then - CHECKREQS_MEMORY="16G" - fi - fi - eshopts_pop - check-reqs_pkg_setup -} - -pkg_pretend() { - pre_build_checks -} - -pkg_setup() { - pre_build_checks - - chromium_suid_sandbox_check_kernel_config -} - -src_prepare() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - default - - mkdir -p third_party/node/linux/node-linux-x64/bin || die - ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die - - local keeplibs=( - base/third_party/dmg_fp - base/third_party/dynamic_annotations - base/third_party/icu - base/third_party/nspr - base/third_party/superfasthash - base/third_party/symbolize - base/third_party/valgrind - base/third_party/xdg_mime - base/third_party/xdg_user_dirs - buildtools/third_party/libc++ - buildtools/third_party/libc++abi - chrome/third_party/mozilla_security_manager - courgette/third_party - net/third_party/mozilla_security_manager - net/third_party/nss - third_party/WebKit - third_party/analytics - third_party/angle - third_party/angle/src/common/third_party/base - third_party/angle/src/common/third_party/smhasher - third_party/angle/src/third_party/compiler - third_party/angle/src/third_party/libXNVCtrl - third_party/angle/src/third_party/trace_event - third_party/angle/third_party/glslang - third_party/angle/third_party/spirv-headers - third_party/angle/third_party/spirv-tools - third_party/angle/third_party/vulkan-validation-layers - third_party/blink - third_party/boringssl - third_party/boringssl/src/third_party/fiat - third_party/breakpad - third_party/breakpad/breakpad/src/third_party/curl - third_party/brotli - third_party/cacheinvalidation - third_party/catapult - third_party/catapult/common/py_vulcanize/third_party/rcssmin - third_party/catapult/common/py_vulcanize/third_party/rjsmin - third_party/catapult/third_party/polymer - third_party/catapult/tracing/third_party/d3 - third_party/catapult/tracing/third_party/gl-matrix - third_party/catapult/tracing/third_party/jszip - third_party/catapult/tracing/third_party/mannwhitneyu - third_party/catapult/tracing/third_party/oboe - third_party/catapult/tracing/third_party/pako - third_party/ced - third_party/cld_3 - third_party/crc32c - third_party/cros_system_api - third_party/devscripts - third_party/dom_distiller_js - third_party/fips181 - third_party/flatbuffers - third_party/flot - third_party/freetype - third_party/glslang-angle - third_party/google_input_tools - third_party/google_input_tools/third_party/closure_library - third_party/google_input_tools/third_party/closure_library/third_party/closure - third_party/googletest - third_party/hunspell - third_party/iccjpeg - third_party/inspector_protocol - third_party/jinja2 - third_party/jstemplate - third_party/khronos - third_party/leveldatabase - third_party/libXNVCtrl - third_party/libaddressinput - third_party/libaom - third_party/libaom/source/libaom/third_party/x86inc - third_party/libjingle - third_party/libphonenumber - third_party/libsecret - third_party/libsrtp - third_party/libudev - third_party/libwebm - third_party/libxml/chromium - third_party/libyuv - third_party/llvm - third_party/lss - third_party/lzma_sdk - third_party/markupsafe - third_party/mesa - third_party/metrics_proto - third_party/modp_b64 - third_party/node - third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 - third_party/openmax_dl - third_party/ots - third_party/pdfium - third_party/pdfium/third_party/agg23 - third_party/pdfium/third_party/base - third_party/pdfium/third_party/bigint - third_party/pdfium/third_party/freetype - third_party/pdfium/third_party/lcms - third_party/pdfium/third_party/libopenjpeg20 - third_party/pdfium/third_party/libpng16 - third_party/pdfium/third_party/libtiff - third_party/pdfium/third_party/skia_shared - third_party/ply - third_party/polymer - third_party/protobuf - third_party/protobuf/third_party/six - third_party/qcms - third_party/s2cellid - third_party/sfntly - third_party/skia - third_party/skia/third_party/gif - third_party/skia/third_party/vulkan - third_party/smhasher - third_party/spirv-headers - third_party/spirv-tools-angle - third_party/sqlite - third_party/swiftshader - third_party/swiftshader/third_party/llvm-subzero - third_party/swiftshader/third_party/subzero - third_party/unrar - third_party/usrsctp - third_party/vulkan - third_party/vulkan-validation-layers - third_party/web-animations-js - third_party/webdriver - third_party/webrtc - third_party/widevine - third_party/woff2 - third_party/zlib/google - url/third_party/mozilla - v8/src/third_party/valgrind - v8/src/third_party/utf8-decoder - v8/third_party/inspector_protocol - - # gyp -> gn leftovers - base/third_party/libevent - third_party/adobe - third_party/speech-dispatcher - third_party/usb_ids - third_party/xdg-utils - third_party/yasm/run_yasm.py - ) - if ! use system-ffmpeg; then - keeplibs+=( third_party/ffmpeg third_party/opus ) - fi - if ! use system-icu; then - keeplibs+=( third_party/icu ) - fi - if ! use system-libvpx; then - keeplibs+=( third_party/libvpx ) - keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) - fi - if use tcmalloc; then - keeplibs+=( third_party/tcmalloc ) - fi - - # Remove most bundled libraries. Some are still needed. - build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die -} - -bootstrap_gn() { - if tc-is-cross-compiler; then - local -x AR=${BUILD_AR} - local -x CC=${BUILD_CC} - local -x CXX=${BUILD_CXX} - local -x NM=${BUILD_NM} - local -x CFLAGS=${BUILD_CFLAGS} - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - einfo "Building GN..." - set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean - echo "$@" - "$@" || die -} - -src_configure() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - local myconf_gn="" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - if ! tc-is-clang; then - # Force clang since gcc is pretty broken at the moment. - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - strip-unsupported-flags - fi - - if tc-is-clang; then - myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" - else - myconf_gn+=" is_clang=false" - fi - - # Define a custom toolchain for GN - myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" - - if tc-is-cross-compiler; then - tc-export BUILD_{AR,CC,CXX,NM} - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" - myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" - else - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" - fi - - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. - myconf_gn+=" is_debug=false" - - # Component build isn't generally intended for use by end users. It's mostly useful - # for development and debugging. - myconf_gn+=" is_component_build=$(usex component-build true false)" - - # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md - myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" - - myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf_gn+=" enable_nacl=false" - - # Use system-provided libraries. - # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #459932). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - - # libevent: https://bugs.gentoo.org/593458 - local gn_system_libraries=( - flac - fontconfig - freetype - # Need harfbuzz_from_pkgconfig target - #harfbuzz-ng - libdrm - libjpeg - libpng - libwebp - libxml - libxslt - openh264 - re2 - snappy - yasm - zlib - ) - if use system-ffmpeg; then - gn_system_libraries+=( ffmpeg opus ) - fi - if use system-icu; then - gn_system_libraries+=( icu ) - fi - if use system-libvpx; then - gn_system_libraries+=( libvpx ) - fi - build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die - - # See dependency logic in third_party/BUILD.gn - myconf_gn+=" use_system_harfbuzz=true" - - # Optional dependencies. - myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" - myconf_gn+=" enable_widevine=$(usex widevine true false)" - myconf_gn+=" use_cups=$(usex cups true false)" - myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" - myconf_gn+=" use_kerberos=$(usex kerberos true false)" - myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" - - # TODO: link_pulseaudio=true for GN. - - myconf_gn+=" fieldtrial_testing_like_official_build=true" - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - # Trying to use gold results in linker crash. - myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" - - # Disable forced lld, bug 641556 - myconf_gn+=" use_lld=false" - - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" - myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" - - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . - # Note: these are for Gentoo use ONLY. For your own distribution, - # please get your own set of keys. Feel free to contact chromium@gentoo.org - # for more info. - local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - myconf_gn+=" google_api_key=\"${google_api_key}\"" - myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" - myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - myconf_gn+=" target_cpu=\"x64\"" - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - myconf_gn+=" target_cpu=\"x86\"" - ffmpeg_target_arch=ia32 - elif [[ $myarch = arm64 ]] ; then - myconf_gn+=" target_cpu=\"arm64\"" - ffmpeg_target_arch=arm64 - elif [[ $myarch = arm ]] ; then - myconf_gn+=" target_cpu=\"arm\"" - ffmpeg_target_arch=$(usex neon arm-neon arm) - else - die "Failed to determine target arch, got '$myarch'." - fi - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf_gn+=" treat_warnings_as_errors=false" - - # Disable fatal linker warnings, bug 506268. - myconf_gn+=" fatal_linker_warnings=false" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - - # Prevent linker from running out of address space, bug #471810 . - if use x86; then - filter-flags "-g*" - fi - - # Prevent libvpx build failures. Bug 530248, 544702, 546984. - if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then - filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 - fi - fi - - # https://bugs.gentoo.org/588596 - #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -p -m 755 "${TMPDIR}" || die - - if ! use system-ffmpeg; then - local build_ffmpeg_args="" - if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then - build_ffmpeg_args+=" --disable-asm" - fi - - # Re-configure bundled ffmpeg. See bug #491378 for example reasons. - einfo "Configuring bundled ffmpeg..." - pushd third_party/ffmpeg > /dev/null || die - chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ - --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die - chromium/scripts/copy_config.sh || die - chromium/scripts/generate_gn.py || die - popd > /dev/null || die - fi - - bootstrap_gn - - einfo "Configuring Chromium..." - set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release - echo "$@" - "$@" || die -} - -src_compile() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die - - # Build mksnapshot and pax-mark it. - local x - for x in mksnapshot v8_context_snapshot_generator; do - if tc-is-cross-compiler; then - eninja -C out/Release "host/${x}" - pax-mark m "out/Release/host/${x}" - else - eninja -C out/Release "${x}" - pax-mark m "out/Release/${x}" - fi - done - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C out/Release chrome chromedriver - use suid && eninja -C out/Release chrome_sandbox - - pax-mark m out/Release/chrome -} - -src_install() { - local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome - - if use suid; then - newexe out/Release/chrome_sandbox chrome-sandbox - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" - fi - - doexe out/Release/chromedriver - - local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die - doexe chromium-launcher.sh - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium - - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver - - # Allow users to override command-line options, bug #357629. - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - if use widevine; then - # These will be provided by chrome-binary-plugins - rm out/Release/libwidevinecdm*.so || die - fi - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.bin - doins out/Release/*.pak - doins out/Release/*.so - - if ! use system-icu; then - doins out/Release/icudtl.dat - fi - - doins -r out/Release/locales - doins -r out/Release/resources - - if [[ -d out/Release/swiftshader ]]; then - insinto "${CHROMIUM_HOME}/swiftshader" - doins out/Release/swiftshader/*.so - fi - - # Install icons and desktop entry. - local branding size - for size in 16 22 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser.png - done - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser \ - "Chromium" \ - chromium-browser \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml - - readme.gentoo_create_doc -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - readme.gentoo_print_elog -} diff --git a/www-client/chromium/chromium-66.0.3359.66.ebuild b/www-client/chromium/chromium-66.0.3359.66.ebuild new file mode 100644 index 000000000000..cf52ce6305d2 --- /dev/null +++ b/www-client/chromium/chromium-66.0.3359.66.ebuild @@ -0,0 +1,699 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +PYTHON_COMPAT=( python2_7 ) + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk vi zh-CN zh-TW" + +inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="http://chromium.org/" +SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" +RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" + +COMMON_DEPEND=" + app-accessibility/at-spi2-atk:2 + app-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + dev-libs/atk + dev-libs/expat:= + dev-libs/glib:2 + system-icu? ( >=dev-libs/icu-59:= ) + >=dev-libs/libxml2-2.9.4-r3:=[icu] + dev-libs/libxslt:= + dev-libs/nspr:= + >=dev-libs/nss-3.26:= + >=dev-libs/re2-0.2016.05.01:= + gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) + >=media-libs/alsa-lib-1.0.19:= + media-libs/fontconfig:= + media-libs/freetype:= + >=media-libs/harfbuzz-1.6.0:=[icu(-)] + media-libs/libjpeg-turbo:= + media-libs/libpng:= + system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) + >=media-libs/openh264-1.6.0:= + pulseaudio? ( media-sound/pulseaudio:= ) + system-ffmpeg? ( + >=media-video/ffmpeg-3:= + || ( + media-video/ffmpeg[-samba] + >=net-fs/samba-4.5.10-r1[-debug(-)] + ) + !=net-fs/samba-4.5.12 + media-libs/opus:= + ) + sys-apps/dbus:= + sys-apps/pciutils:= + virtual/udev + x11-libs/cairo:= + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11:= + x11-libs/libXcomposite:= + x11-libs/libXcursor:= + x11-libs/libXdamage:= + x11-libs/libXext:= + x11-libs/libXfixes:= + >=x11-libs/libXi-1.6.0:= + x11-libs/libXrandr:= + x11-libs/libXrender:= + x11-libs/libXScrnSaver:= + x11-libs/libXtst:= + x11-libs/pango:= + app-arch/snappy:= + media-libs/flac:= + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] + kerberos? ( virtual/krb5 ) +" +# For nvidia-drivers blocker, see bug #413637 . +RDEPEND="${COMMON_DEPEND} + !=www-client/chromium-9999 + !=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && + has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && + has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" +} + +if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then + EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; +fi + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: +- media-fonts/arphicfonts +- media-fonts/bitstream-cyberbit +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/noto +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +To fix broken icons on the Downloads page, you should install an icon +theme that covers the appropriate MIME types, and configure this as your +GTK+ icon theme. +" + +PATCHES=( + "${FILESDIR}/chromium-widevine-r1.patch" + "${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch" + "${FILESDIR}/chromium-webrtc-r0.patch" + "${FILESDIR}/chromium-memcpy-r0.patch" + "${FILESDIR}/chromium-clang-r2.patch" + "${FILESDIR}/chromium-math.h-r0.patch" + "${FILESDIR}/chromium-stdint.patch" + "${FILESDIR}/chromium-clang-r4.patch" + "${FILESDIR}/chromium-ffmpeg-r1.patch" + "${FILESDIR}/chromium-ffmpeg-clang.patch" +) + +pre_build_checks() { + #if [[ ${MERGE_TYPE} != binary ]]; then + # local -x CPP="$(tc-getCXX) -E" + # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then + # # bugs: #601654 + # die "At least clang 3.9.1 is required" + # fi + # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then + # # bugs: #535730, #525374, #518668, #600288, #627356 + # die "At least gcc 5.0 is required" + # fi + #fi + + # Check build requirements, bug #541816 and bug #471810 . + CHECKREQS_MEMORY="3G" + CHECKREQS_DISK_BUILD="5G" + eshopts_push -s extglob + if is-flagq '-g?(gdb)?([1-9])'; then + CHECKREQS_DISK_BUILD="25G" + if ! use component-build; then + CHECKREQS_MEMORY="16G" + fi + fi + eshopts_pop + check-reqs_pkg_setup +} + +pkg_pretend() { + pre_build_checks +} + +pkg_setup() { + pre_build_checks + + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + default + + mkdir -p third_party/node/linux/node-linux-x64/bin || die + ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die + + local keeplibs=( + base/third_party/dmg_fp + base/third_party/dynamic_annotations + base/third_party/icu + base/third_party/nspr + base/third_party/superfasthash + base/third_party/symbolize + base/third_party/valgrind + base/third_party/xdg_mime + base/third_party/xdg_user_dirs + buildtools/third_party/libc++ + buildtools/third_party/libc++abi + chrome/third_party/mozilla_security_manager + courgette/third_party + net/third_party/mozilla_security_manager + net/third_party/nss + third_party/WebKit + third_party/analytics + third_party/angle + third_party/angle/src/common/third_party/base + third_party/angle/src/common/third_party/smhasher + third_party/angle/src/third_party/compiler + third_party/angle/src/third_party/libXNVCtrl + third_party/angle/src/third_party/trace_event + third_party/angle/third_party/glslang + third_party/angle/third_party/spirv-headers + third_party/angle/third_party/spirv-tools + third_party/angle/third_party/vulkan-validation-layers + third_party/blink + third_party/boringssl + third_party/boringssl/src/third_party/fiat + third_party/breakpad + third_party/breakpad/breakpad/src/third_party/curl + third_party/brotli + third_party/cacheinvalidation + third_party/catapult + third_party/catapult/common/py_vulcanize/third_party/rcssmin + third_party/catapult/common/py_vulcanize/third_party/rjsmin + third_party/catapult/third_party/polymer + third_party/catapult/tracing/third_party/d3 + third_party/catapult/tracing/third_party/gl-matrix + third_party/catapult/tracing/third_party/jszip + third_party/catapult/tracing/third_party/mannwhitneyu + third_party/catapult/tracing/third_party/oboe + third_party/catapult/tracing/third_party/pako + third_party/ced + third_party/cld_3 + third_party/crc32c + third_party/cros_system_api + third_party/devscripts + third_party/dom_distiller_js + third_party/fips181 + third_party/flatbuffers + third_party/flot + third_party/freetype + third_party/glslang-angle + third_party/google_input_tools + third_party/google_input_tools/third_party/closure_library + third_party/google_input_tools/third_party/closure_library/third_party/closure + third_party/googletest + third_party/hunspell + third_party/iccjpeg + third_party/inspector_protocol + third_party/jinja2 + third_party/jstemplate + third_party/khronos + third_party/leveldatabase + third_party/libXNVCtrl + third_party/libaddressinput + third_party/libaom + third_party/libaom/source/libaom/third_party/x86inc + third_party/libjingle + third_party/libphonenumber + third_party/libsecret + third_party/libsrtp + third_party/libudev + third_party/libwebm + third_party/libxml/chromium + third_party/libyuv + third_party/llvm + third_party/lss + third_party/lzma_sdk + third_party/markupsafe + third_party/mesa + third_party/metrics_proto + third_party/modp_b64 + third_party/node + third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 + third_party/openmax_dl + third_party/ots + third_party/pdfium + third_party/pdfium/third_party/agg23 + third_party/pdfium/third_party/base + third_party/pdfium/third_party/bigint + third_party/pdfium/third_party/freetype + third_party/pdfium/third_party/lcms + third_party/pdfium/third_party/libopenjpeg20 + third_party/pdfium/third_party/libpng16 + third_party/pdfium/third_party/libtiff + third_party/pdfium/third_party/skia_shared + third_party/ply + third_party/polymer + third_party/protobuf + third_party/protobuf/third_party/six + third_party/qcms + third_party/s2cellid + third_party/sfntly + third_party/skia + third_party/skia/third_party/gif + third_party/skia/third_party/vulkan + third_party/smhasher + third_party/spirv-headers + third_party/spirv-tools-angle + third_party/sqlite + third_party/swiftshader + third_party/swiftshader/third_party/llvm-subzero + third_party/swiftshader/third_party/subzero + third_party/unrar + third_party/usrsctp + third_party/vulkan + third_party/vulkan-validation-layers + third_party/web-animations-js + third_party/webdriver + third_party/webrtc + third_party/widevine + third_party/woff2 + third_party/zlib/google + url/third_party/mozilla + v8/src/third_party/valgrind + v8/src/third_party/utf8-decoder + v8/third_party/inspector_protocol + + # gyp -> gn leftovers + base/third_party/libevent + third_party/adobe + third_party/speech-dispatcher + third_party/usb_ids + third_party/xdg-utils + third_party/yasm/run_yasm.py + ) + if ! use system-ffmpeg; then + keeplibs+=( third_party/ffmpeg third_party/opus ) + fi + if ! use system-icu; then + keeplibs+=( third_party/icu ) + fi + if ! use system-libvpx; then + keeplibs+=( third_party/libvpx ) + keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) + fi + if use tcmalloc; then + keeplibs+=( third_party/tcmalloc ) + fi + + # Remove most bundled libraries. Some are still needed. + build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die +} + +bootstrap_gn() { + if tc-is-cross-compiler; then + local -x AR=${BUILD_AR} + local -x CC=${BUILD_CC} + local -x CXX=${BUILD_CXX} + local -x NM=${BUILD_NM} + local -x CFLAGS=${BUILD_CFLAGS} + local -x CXXFLAGS=${BUILD_CXXFLAGS} + local -x LDFLAGS=${BUILD_LDFLAGS} + fi + einfo "Building GN..." + set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean + echo "$@" + "$@" || die +} + +src_configure() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + local myconf_gn="" + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + if ! tc-is-clang; then + # Force clang since gcc is pretty broken at the moment. + CC=${CHOST}-clang + CXX=${CHOST}-clang++ + strip-unsupported-flags + fi + + if tc-is-clang; then + myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" + else + myconf_gn+=" is_clang=false" + fi + + # Define a custom toolchain for GN + myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" + + if tc-is-cross-compiler; then + tc-export BUILD_{AR,CC,CXX,NM} + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" + myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" + else + myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" + fi + + # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. + myconf_gn+=" is_debug=false" + + # Component build isn't generally intended for use by end users. It's mostly useful + # for development and debugging. + myconf_gn+=" is_component_build=$(usex component-build true false)" + + # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md + myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)" + + myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf_gn+=" enable_nacl=false" + + # Use system-provided libraries. + # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). + # TODO: use_system_hunspell (upstream changes needed). + # TODO: use_system_libsrtp (bug #459932). + # TODO: use_system_protobuf (bug #525560). + # TODO: use_system_ssl (http://crbug.com/58087). + # TODO: use_system_sqlite (http://crbug.com/22208). + + # libevent: https://bugs.gentoo.org/593458 + local gn_system_libraries=( + flac + fontconfig + freetype + # Need harfbuzz_from_pkgconfig target + #harfbuzz-ng + libdrm + libjpeg + libpng + libwebp + libxml + libxslt + openh264 + re2 + snappy + yasm + zlib + ) + if use system-ffmpeg; then + gn_system_libraries+=( ffmpeg opus ) + fi + if use system-icu; then + gn_system_libraries+=( icu ) + fi + if use system-libvpx; then + gn_system_libraries+=( libvpx ) + fi + build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die + + # See dependency logic in third_party/BUILD.gn + myconf_gn+=" use_system_harfbuzz=true" + + # Optional dependencies. + myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" + myconf_gn+=" enable_widevine=$(usex widevine true false)" + myconf_gn+=" use_cups=$(usex cups true false)" + myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" + myconf_gn+=" use_kerberos=$(usex kerberos true false)" + myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" + + # TODO: link_pulseaudio=true for GN. + + myconf_gn+=" fieldtrial_testing_like_official_build=true" + + # Never use bundled gold binary. Disable gold linker flags for now. + # Do not use bundled clang. + # Trying to use gold results in linker crash. + myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" + + # Disable forced lld, bug 641556 + myconf_gn+=" use_lld=false" + + ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" + myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" + myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" + + # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . + # Note: these are for Gentoo use ONLY. For your own distribution, + # please get your own set of keys. Feel free to contact chromium@gentoo.org + # for more info. + local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" + local google_default_client_id="329227923882.apps.googleusercontent.com" + local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" + myconf_gn+=" google_api_key=\"${google_api_key}\"" + myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" + myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" + + local myarch="$(tc-arch)" + if [[ $myarch = amd64 ]] ; then + myconf_gn+=" target_cpu=\"x64\"" + ffmpeg_target_arch=x64 + elif [[ $myarch = x86 ]] ; then + myconf_gn+=" target_cpu=\"x86\"" + ffmpeg_target_arch=ia32 + elif [[ $myarch = arm64 ]] ; then + myconf_gn+=" target_cpu=\"arm64\"" + ffmpeg_target_arch=arm64 + elif [[ $myarch = arm ]] ; then + myconf_gn+=" target_cpu=\"arm\"" + ffmpeg_target_arch=$(usex neon arm-neon arm) + else + die "Failed to determine target arch, got '$myarch'." + fi + + # Make sure that -Werror doesn't get added to CFLAGS by the build system. + # Depending on GCC version the warnings are different and we don't want + # the build to fail because of that. + myconf_gn+=" treat_warnings_as_errors=false" + + # Disable fatal linker warnings, bug 506268. + myconf_gn+=" fatal_linker_warnings=false" + + # Avoid CFLAGS problems, bug #352457, bug #390147. + if ! use custom-cflags; then + replace-flags "-Os" "-O2" + strip-flags + + # Prevent linker from running out of address space, bug #471810 . + if use x86; then + filter-flags "-g*" + fi + + # Prevent libvpx build failures. Bug 530248, 544702, 546984. + if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then + filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 + fi + fi + + # https://bugs.gentoo.org/588596 + #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) + + # Bug 491582. + export TMPDIR="${WORKDIR}/temp" + mkdir -p -m 755 "${TMPDIR}" || die + + if ! use system-ffmpeg; then + local build_ffmpeg_args="" + if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then + build_ffmpeg_args+=" --disable-asm" + fi + + # Re-configure bundled ffmpeg. See bug #491378 for example reasons. + einfo "Configuring bundled ffmpeg..." + pushd third_party/ffmpeg > /dev/null || die + chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ + --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die + chromium/scripts/copy_config.sh || die + chromium/scripts/generate_gn.py || die + popd > /dev/null || die + fi + + bootstrap_gn + + einfo "Configuring Chromium..." + set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release + echo "$@" + "$@" || die +} + +src_compile() { + # Calling this here supports resumption via FEATURES=keepwork + python_setup + + #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die + + # Build mksnapshot and pax-mark it. + local x + for x in mksnapshot v8_context_snapshot_generator; do + if tc-is-cross-compiler; then + eninja -C out/Release "host/${x}" + pax-mark m "out/Release/host/${x}" + else + eninja -C out/Release "${x}" + pax-mark m "out/Release/${x}" + fi + done + + # Even though ninja autodetects number of CPUs, we respect + # user's options, for debugging with -j 1 or any other reason. + eninja -C out/Release chrome chromedriver + use suid && eninja -C out/Release chrome_sandbox + + pax-mark m out/Release/chrome +} + +src_install() { + local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" + exeinto "${CHROMIUM_HOME}" + doexe out/Release/chrome + + if use suid; then + newexe out/Release/chrome_sandbox chrome-sandbox + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + fi + + doexe out/Release/chromedriver + + local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) + sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die + doexe chromium-launcher.sh + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser + # keep the old symlink around for consistency + dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium + + dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver + + # Allow users to override command-line options, bug #357629. + insinto /etc/chromium + newins "${FILESDIR}/chromium.default" "default" + + pushd out/Release/locales > /dev/null || die + chromium_remove_language_paks + popd + + if use widevine; then + # These will be provided by chrome-binary-plugins + rm out/Release/libwidevinecdm*.so || die + fi + + insinto "${CHROMIUM_HOME}" + doins out/Release/*.bin + doins out/Release/*.pak + doins out/Release/*.so + + if ! use system-icu; then + doins out/Release/icudtl.dat + fi + + doins -r out/Release/locales + doins -r out/Release/resources + + if [[ -d out/Release/swiftshader ]]; then + insinto "${CHROMIUM_HOME}/swiftshader" + doins out/Release/swiftshader/*.so + fi + + # Install icons and desktop entry. + local branding size + for size in 16 22 24 32 48 64 128 256 ; do + case ${size} in + 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; + *) branding="chrome/app/theme/chromium" ;; + esac + newicon -s ${size} "${branding}/product_logo_${size}.png" \ + chromium-browser.png + done + + local mime_types="text/html;text/xml;application/xhtml+xml;" + mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 + mime_types+="x-scheme-handler/ftp;" # bug #412185 + mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 + make_desktop_entry \ + chromium-browser \ + "Chromium" \ + chromium-browser \ + "Network;WebBrowser" \ + "MimeType=${mime_types}\nStartupWMClass=chromium-browser" + sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die + + # Install GNOME default application entry (bug #303100). + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml + + readme.gentoo_create_doc +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + readme.gentoo_print_elog +} diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest index 1d733999a07a..1a535972b449 100644 --- a/www-client/otter/Manifest +++ b/www-client/otter/Manifest @@ -1,8 +1,6 @@ -DIST otter-0.9.94.tar.gz 4585316 BLAKE2B 7fd450b1cb0102006680964fa9f858b5bed12094e076b4ab5a0cfdb9f790f5627b67d1521d2715919ff3d469b7c953680833e0f091be1320dade9cfc4ea844a4 SHA512 33943c145d40b9fed0afdfa90cf46d2604978347421ac39bfa7d1e9a90c61542fcd8899d039a4b68fc4e7cd6f9175ac9381966e3bc4a822d45ca70a66b6e9f95 -DIST otter-0.9.95.tar.gz 4592078 BLAKE2B 075a8f7bb9e2e88c4f797328052f3139dc7bbb122d7a5c8485ff8ea7fa111fcabf39863bb5d4fe8a8a3c5883ed78174cd7efa05087bf2dd599c2e23f330e0f36 SHA512 cda1c4e0e8e9fbb78eaaf9317749b5513d972a450a2c88936c120de9646452315067b308c63c8b61c98eff22c4fb7d9e75ca69054b87acd6706a9731f37a1b80 DIST otter-0.9.96.tar.gz 4654502 BLAKE2B e56914aa0926c29de36cee5020b030d488c97801a5186e453941abaf9010cacc598b14ab43eba1d30a1bfc240188eec8d46138a635cd7b240eac40832cdfdd8b SHA512 3ced414122d912a61dca12dcf9e7477ff9eea209c6fa72bad4fbe100f2066e958de09f0d4d986ac1cf0b184f55169966669bebb998cdd033a01a6e3e6df1160b -EBUILD otter-0.9.94.ebuild 1546 BLAKE2B e65b7c8c6616a68c377eac9117167b3de7226be22aa74fe38814d952ec1419032e7836c4f83143697bf19f367861386af9e5ae4bb018c7c65c5e0ee1ad4a5509 SHA512 6a53e5efbd4a6c1fd3c4965b1db558e5a9ff755edaee6866de67fd50f206231b71f5e7c2ffe53c9412969da80cef97c37572219db18b89ebded681e43e853123 -EBUILD otter-0.9.95.ebuild 1546 BLAKE2B e65b7c8c6616a68c377eac9117167b3de7226be22aa74fe38814d952ec1419032e7836c4f83143697bf19f367861386af9e5ae4bb018c7c65c5e0ee1ad4a5509 SHA512 6a53e5efbd4a6c1fd3c4965b1db558e5a9ff755edaee6866de67fd50f206231b71f5e7c2ffe53c9412969da80cef97c37572219db18b89ebded681e43e853123 +DIST otter-0.9.97.tar.gz 4656799 BLAKE2B 0ac51063f5ed87724db0a5072c463f2768810eeb394fd7c0d492bb67ed61520a7a9f5d94468630dbc87447f34f3041158dee9355af4359cce768ea8db29981af SHA512 2e11a20a5888632644b2bb99dcc550092c4132dfbfa72a1f75a9b22082676bf7cf7656d617e7d245763f07692778b0040404151eaf835b306945e92e1ac23efe EBUILD otter-0.9.96.ebuild 1817 BLAKE2B fec0434247425fcfbaa89abfb3b669269acc294dde57f1f84c95445b023b78b48a30e074f927ff5ba15ff1d1ca3da864bb2c71bad2c5856f5a9da2a8b7ca29fb SHA512 d5dd664dc246ee0e15f92214961eb641fa4274da6032870cc8b879c6de0c42cb4dad6423e4486d57b3c8121bf56c4e173875583158aea700cbbe6a38af2b10c2 +EBUILD otter-0.9.97.ebuild 1817 BLAKE2B fec0434247425fcfbaa89abfb3b669269acc294dde57f1f84c95445b023b78b48a30e074f927ff5ba15ff1d1ca3da864bb2c71bad2c5856f5a9da2a8b7ca29fb SHA512 d5dd664dc246ee0e15f92214961eb641fa4274da6032870cc8b879c6de0c42cb4dad6423e4486d57b3c8121bf56c4e173875583158aea700cbbe6a38af2b10c2 EBUILD otter-9999.ebuild 1454 BLAKE2B 44a2b89a5ab1b01a9d16440d25b4de7889e02fac35a5c4e5bb755a3323b8c68baaa27d8518905246bcb6741cec19e81713130dd3b516f23500bf6c3d6dc8e2d5 SHA512 ae93d8bae4b15c1cb99d304d28ce9547bd068bbcc29924091523af470293bce0f077a06042785a76b66a89a431f297af52c5b35eba987de2e7ac769066b983b4 MISC metadata.xml 466 BLAKE2B 95a6b3f8c4a297c6a57f514173a99b2e6a6dda37cd90c0b9a3bb9069a272daad73dc7b9c3a054741331e813b625e14f1a395263409255ad12692f049f557d5ff SHA512 3c07f030c4ae6777cca5e122f32a6b2f5844a2dc5bba27a6ea17b36ae56ef43174deefe0460128a6e31d709857e5b915d340b8e6e50049e43c87bfcf58f95f22 diff --git a/www-client/otter/otter-0.9.94.ebuild b/www-client/otter/otter-0.9.94.ebuild deleted file mode 100644 index ba2a9c83403d..000000000000 --- a/www-client/otter/otter-0.9.94.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils cmake-utils gnome2-utils xdg-utils - -DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5" -HOMEPAGE="http://otter-browser.org/" -SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="spell" - -DEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtxmlpatterns:5 - spell? ( kde-frameworks/sonnet ) -" -RDEPEND=" - ${DEPEND} -" - -S=${WORKDIR}/${PN}-browser-${PV/_p/-dev} -DOCS=( CHANGELOG CONTRIBUTING.md TODO ) - -src_prepare() { - cmake-utils_src_prepare - - if [[ -n ${LINGUAS} ]]; then - local lingua - for lingua in resources/translations/*.qm; do - lingua=$(basename ${lingua}) - lingua=${lingua/otter-browser_/} - lingua=${lingua/.qm/} - if ! has ${lingua} ${LINGUAS}; then - rm resources/translations/otter-browser_${lingua}.qm || die - fi - done - fi - - if ! use spell; then - sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die - fi -} - -src_install() { - cmake-utils_src_install - domenu ${PN}-browser.desktop -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/www-client/otter/otter-0.9.95.ebuild b/www-client/otter/otter-0.9.95.ebuild deleted file mode 100644 index ba2a9c83403d..000000000000 --- a/www-client/otter/otter-0.9.95.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils cmake-utils gnome2-utils xdg-utils - -DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5" -HOMEPAGE="http://otter-browser.org/" -SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="spell" - -DEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtsql:5 - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - dev-qt/qtxmlpatterns:5 - spell? ( kde-frameworks/sonnet ) -" -RDEPEND=" - ${DEPEND} -" - -S=${WORKDIR}/${PN}-browser-${PV/_p/-dev} -DOCS=( CHANGELOG CONTRIBUTING.md TODO ) - -src_prepare() { - cmake-utils_src_prepare - - if [[ -n ${LINGUAS} ]]; then - local lingua - for lingua in resources/translations/*.qm; do - lingua=$(basename ${lingua}) - lingua=${lingua/otter-browser_/} - lingua=${lingua/.qm/} - if ! has ${lingua} ${LINGUAS}; then - rm resources/translations/otter-browser_${lingua}.qm || die - fi - done - fi - - if ! use spell; then - sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die - fi -} - -src_install() { - cmake-utils_src_install - domenu ${PN}-browser.desktop -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/www-client/otter/otter-0.9.97.ebuild b/www-client/otter/otter-0.9.97.ebuild new file mode 100644 index 000000000000..a354d54d965f --- /dev/null +++ b/www-client/otter/otter-0.9.97.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils cmake-utils gnome2-utils xdg-utils + +DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5" +HOMEPAGE="http://otter-browser.org/" +SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="webengine +webkit spell" +REQUIRED_USE=" + || ( webengine webkit ) +" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxmlpatterns:5 + spell? ( kde-frameworks/sonnet ) + webengine? ( >=dev-qt/qtwebengine-5.9:5[widgets] ) + webkit? ( dev-qt/qtwebkit:5 ) +" +RDEPEND=" + ${DEPEND} +" + +S=${WORKDIR}/${PN}-browser-${PV/_p/-dev} +DOCS=( CHANGELOG CONTRIBUTING.md TODO ) + +src_prepare() { + cmake-utils_src_prepare + + if [[ -n ${LINGUAS} ]]; then + local lingua + for lingua in resources/translations/*.qm; do + lingua=$(basename ${lingua}) + lingua=${lingua/otter-browser_/} + lingua=${lingua/.qm/} + if ! has ${lingua} ${LINGUAS}; then + rm resources/translations/otter-browser_${lingua}.qm || die + fi + done + fi + + if ! use spell; then + sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die + fi +} + +src_configure() { + mycmakeargs=( + -DENABLE_QTWEBENGINE="$(usex webengine)" + -DENABLE_QTWEBKIT="$(usex webkit)" + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + domenu ${PN}-browser.desktop +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} 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-0.3.2_p24-boehm-gc.patch deleted file mode 100644 index 81e6a6dea0f3..000000000000 --- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 - #include - main() - { -- extern unsigned GC_version; -+ unsigned GC_version = GC_get_version(); - printf("%d%02d%03d\n",(GC_version>>16)&0xff,(GC_version>>8)&0xff,GC_version&0xff); - } - EOF diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch b/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch deleted file mode 100644 index dc9be94732c6..000000000000 --- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch +++ /dev/null @@ -1,35 +0,0 @@ -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)()) - stream = New(struct input_stream); - init_base_stream(stream, STREAM_BUF_SIZE); - stream->type = IST_FILE; -- stream->handle.file = New(struct file_handle); -+ stream->handle.file = New(struct afile_handle); - 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 { - - typedef struct stream_buffer *StreamBuffer; - --struct file_handle { -+struct afile_handle { - FILE *f; - void (*close)(FILE *); - }; -@@ -121,7 +121,7 @@ struct tee_handle { - union input_handle { - void *gen; - int fd; -- struct file_handle *file; -+ struct afile_handle *file; - struct delimited_handle *delimited; - Str str; - #ifdef USE_SSL diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch b/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch deleted file mode 100644 index 603e30bb4038..000000000000 --- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure b/configure -index 73e247b..32afb35 100755 ---- a/configure -+++ b/configure -@@ -1354,7 +1354,7 @@ main() - EOF - - if [ -z "$dtermlib" ]; then -- TERM_LIBS='termcap termlib terminfo mytinfo curses ncurses' -+ TERM_LIBS='termcap termlib terminfo mytinfo curses ncurses tinfo' - - for lib in $TERM_LIBS; do - for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib; do diff --git a/www-client/w3mmee/files/w3mmee-boehm-gc.patch b/www-client/w3mmee/files/w3mmee-boehm-gc.patch new file mode 100644 index 000000000000..d9bafa069046 --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-boehm-gc.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -1503,7 +1503,7 @@ if [ -n "$gclib" -a -n "$gcinclude" ]; then + #include + main() + { +- extern unsigned GC_version; ++ unsigned GC_version = GC_get_version(); + printf("%d%02d%03d\n",(GC_version>>16)&0xff,(GC_version>>8)&0xff,GC_version&0xff); + } + EOF diff --git a/www-client/w3mmee/files/w3mmee-gcc-4.4.patch b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch new file mode 100644 index 000000000000..e724244ab869 --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch @@ -0,0 +1,11 @@ +--- a/indep.c ++++ b/indep.c +@@ -14,7 +14,7 @@ + { + #ifdef HAVE_STRTOLL + return strtoll(s, NULL, base); +-#elif HAVE_STRTOQ ++#elif defined(HAVE_STRTOQ) + return strtoq(s, NULL, base); + #else + int minus, digit; diff --git a/www-client/w3mmee/files/w3mmee-gcc-4.5.patch b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch new file mode 100644 index 000000000000..3e7d1aa0cc0d --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/317815 + +Author: Kacper Kowalik + +--- a/configure ++++ b/configure +@@ -2636,7 +2636,7 @@ + fi + + cat >do_mk_btri.sh <TABMakefile < - ---- configure -+++ configure -@@ -2636,7 +2636,7 @@ - fi - - cat >do_mk_btri.sh <TABMakefile <type = IST_FILE; +- stream->handle.file = New(struct file_handle); ++ stream->handle.file = New(struct afile_handle); + stream->handle.file->f = f; + + if (closep) +--- a/istream.h ++++ b/istream.h +@@ -20,7 +20,7 @@ struct stream_buffer { + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct afile_handle { + FILE *f; + void (*close)(FILE *); + }; +@@ -121,7 +121,7 @@ struct tee_handle { + union input_handle { + void *gen; + int fd; +- struct file_handle *file; ++ struct afile_handle *file; + struct delimited_handle *delimited; + Str str; + #ifdef USE_SSL 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 + +--- 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-tinfo.patch b/www-client/w3mmee/files/w3mmee-tinfo.patch new file mode 100644 index 000000000000..c29f43ada30d --- /dev/null +++ b/www-client/w3mmee/files/w3mmee-tinfo.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -1354,7 +1354,7 @@ main() + EOF + + if [ -z "$dtermlib" ]; then +- TERM_LIBS='termcap termlib terminfo mytinfo curses ncurses' ++ TERM_LIBS='termcap termlib terminfo mytinfo curses ncurses tinfo' + + for lib in $TERM_LIBS; do + for tlibdir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib $prefix/lib; do 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 @@ - - cjk@gentoo.org - Cjk - + + cjk@gentoo.org + Cjk + 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 -} -- cgit v1.2.3