summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-editors/xemacs/xemacs-21.4.24-r1.ebuild4
-rw-r--r--app-editors/xemacs/xemacs-21.4.24.ebuild4
-rw-r--r--app-editors/xemacs/xemacs-21.5.34-r4.ebuild4
-rw-r--r--app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild67
-rw-r--r--app-eselect/eselect-php/eselect-php-9999.ebuild3
-rw-r--r--app-eselect/eselect-php/files/php-fpm-launcher-r311
-rw-r--r--app-text/sablotron/sablotron-1.0.3-r1.ebuild2
-rw-r--r--dev-ada/gps/files/gps-2017-gentoo.patch59
-rw-r--r--dev-ada/gps/gps-2017.ebuild6
-rw-r--r--dev-java/java-sdk-docs/Manifest4
-rw-r--r--dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild48
-rw-r--r--dev-java/java-sdk-docs/java-sdk-docs-9.0.1.ebuild37
-rw-r--r--dev-java/jdbc-mssqlserver/Manifest2
-rw-r--r--dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild35
-rw-r--r--dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild27
-rw-r--r--dev-java/oracle-jdk-bin/Manifest28
-rw-r--r--dev-libs/openssl/openssl-1.0.2n.ebuild2
-rw-r--r--games-action/descent1-data/Manifest2
-rw-r--r--games-action/descent2-data/Manifest2
-rw-r--r--games-fps/alephone-infinity/Manifest2
-rw-r--r--games-fps/urbanterror-data/Manifest1
-rw-r--r--games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild4
-rw-r--r--games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild64
-rw-r--r--games-fps/urbanterror/Manifest6
-rw-r--r--games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch53
-rw-r--r--games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild152
-rw-r--r--games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild152
-rw-r--r--games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild152
-rw-r--r--games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild148
-rw-r--r--games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild (renamed from games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild)4
-rw-r--r--games-fps/ut2004-crossfire/Manifest2
-rw-r--r--games-fps/ut2004-deathball/Manifest2
-rw-r--r--games-fps/xonotic/Manifest4
-rw-r--r--games-rpg/vendetta-online-bin/Manifest4
-rw-r--r--games-server/ut2004-ded/Manifest2
-rw-r--r--games-util/lutris/Manifest4
-rw-r--r--games-util/lutris/lutris-0.3.6.3.ebuild67
-rw-r--r--games-util/lutris/lutris-0.3.8.ebuild67
-rw-r--r--games-util/lutris/lutris-0.4.14.ebuild (renamed from games-util/lutris/lutris-0.4.13.ebuild)0
-rw-r--r--licenses/oracle-java-documentation-795
-rw-r--r--licenses/oracle-java-documentation-965
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.7.2.ebuild2
-rw-r--r--media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild2
-rw-r--r--media-libs/mesa/Manifest3
-rw-r--r--media-libs/mesa/mesa-17.0.6.ebuild513
-rw-r--r--media-libs/mesa/mesa-17.3.0.ebuild (renamed from media-libs/mesa/mesa-17.3.0_rc5.ebuild)0
-rw-r--r--media-libs/openexr/openexr-2.2.0-r2.ebuild2
-rw-r--r--media-sound/spotify/Manifest2
-rw-r--r--media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild2
-rw-r--r--net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild55
-rw-r--r--net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild2
-rw-r--r--net-libs/ldns/ldns-1.7.0-r2.ebuild98
-rw-r--r--net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch33
-rw-r--r--net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch39
-rw-r--r--net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch22
-rw-r--r--net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch33
-rw-r--r--net-misc/rsync/rsync-3.1.2-r2.ebuild95
-rw-r--r--profiles/default/linux/uclibc/package.mask3
-rw-r--r--profiles/hardened/linux/musl/package.mask6
-rw-r--r--sci-libs/mkl/Manifest2
-rw-r--r--sys-apps/baselayout/baselayout-2.4.1-r2.ebuild2
-rw-r--r--sys-apps/baselayout/baselayout-9999.ebuild2
-rw-r--r--sys-apps/dbus-broker/Manifest6
-rw-r--r--sys-apps/dbus-broker/dbus-broker-9.ebuild (renamed from sys-apps/dbus-broker/dbus-broker-8.ebuild)8
-rw-r--r--sys-apps/dbus-broker/dbus-broker-9999.ebuild8
-rw-r--r--sys-apps/iproute2/iproute2-4.14.1-r1.ebuild2
-rw-r--r--www-client/chromium/chromium-63.0.3239.84.ebuild2
67 files changed, 713 insertions, 1628 deletions
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 980a68d80e3d..6975de5d4292 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -7,7 +7,7 @@
EAPI="5"
WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
DESCRIPTION="highly customizable open source text editor and application development system"
HOMEPAGE="http://www.xemacs.org/"
@@ -233,9 +233,11 @@ src_install() {
pkg_postinst() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+ xdg_desktop_database_update
}
pkg_postrm() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+ xdg_desktop_database_update
}
diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 4c1eaa52fd03..a1297fa36999 100644
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -7,7 +7,7 @@
EAPI="5"
WANT_AUTOCONF="2.1"
-inherit autotools eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs xdg-utils
DESCRIPTION="highly customizable open source text editor and application development system"
HOMEPAGE="http://www.xemacs.org/"
@@ -235,9 +235,11 @@ src_install() {
pkg_postinst() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+ xdg_desktop_database_update
}
pkg_postrm() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+ xdg_desktop_database_update
}
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index d806967cce40..c060855e5924 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -7,7 +7,7 @@
EAPI=5
WANT_AUTOCONF="2.5"
-inherit eutils flag-o-matic multilib
+inherit eutils flag-o-matic multilib xdg-utils
DESCRIPTION="highly customizable open source text editor and application development system"
HOMEPAGE="http://www.xemacs.org/"
@@ -235,6 +235,7 @@ src_install() {
pkg_postinst() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+ xdg_desktop_database_update
einfo "If you are upgrading from XEmacs 21.4 you should note the following"
einfo "incompatibilities:"
@@ -252,4 +253,5 @@ pkg_postinst() {
pkg_postrm() {
eselect emacs update ifunset
eselect gnuclient update ifunset
+ xdg_desktop_database_update
}
diff --git a/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild b/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild
new file mode 100644
index 000000000000..9d383514ec4f
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.4-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+ apache2? ( www-servers/apache[apache2_modules_dir] )
+ fpm? ( sys-apps/gentoo-functions )"
+
+src_configure(){
+ # We expect localstatedir to be "var"ish, not "var/lib"ish, because
+ # that's what PHP upstream expects. See for example the FPM
+ # configuration where they put logs in @localstatedir@/log.
+ #
+ # The libdir is passed explicitly in case the /usr/lib symlink
+ # is not present (bug 624528).
+ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --localstatedir="${EPREFIX}/var" \
+ --with-piddir="${EPREFIX}/run" \
+ $(use_enable apache2) \
+ $(use_enable fpm)
+}
+
+src_install() {
+ default
+
+ # This can be removed after a while...
+ if use apache2 ; then
+ insinto /etc/apache2/modules.d
+ newins "${FILESDIR}/70_mod_php5.backcompat.conf" 70_mod_php5.conf
+ fi
+
+ if use fpm ; then
+ systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+ sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
+ exeinto /usr/libexec
+ doexe "${T}"/php-fpm-launcher
+ fi
+}
+
+pkg_postinst() {
+ if use apache2 ; then
+ elog
+ elog "If you are upgrading, be warned that our mod_php configuration"
+ elog "file has changed! You should now define -DPHP for the apache2"
+ elog "daemon, and inspect the new 70_mod_php.conf which has been"
+ elog "installed. Module loading involves eselect as of this version."
+ elog
+ elog "You must run eselect at least once to choose your apache2 target"
+ elog "before the new configuration will work. Afterwards, and after you"
+ elog "have reviewed your new configuration, you are advised to remove"
+ elog "the obsolete 70_mod_php5.conf file."
+ elog
+ fi
+}
diff --git a/app-eselect/eselect-php/eselect-php-9999.ebuild b/app-eselect/eselect-php/eselect-php-9999.ebuild
index f695558d423a..a8aa5bb8f4a5 100644
--- a/app-eselect/eselect-php/eselect-php-9999.ebuild
+++ b/app-eselect/eselect-php/eselect-php-9999.ebuild
@@ -49,8 +49,9 @@ src_install() {
if use fpm ; then
systemd_dotmpfilesd "${FILESDIR}/php-fpm.conf"
+ sed -e "s,@libdir@,$(get_libdir),g" "${FILESDIR}/php-fpm-launcher-r3" > "${T}"/php-fpm-launcher || die
exeinto /usr/libexec
- newexe "${FILESDIR}/php-fpm-launcher-r2" php-fpm-launcher
+ doexe "${T}"/php-fpm-launcher
fi
}
diff --git a/app-eselect/eselect-php/files/php-fpm-launcher-r3 b/app-eselect/eselect-php/files/php-fpm-launcher-r3
new file mode 100644
index 000000000000..a2b6eabc4da5
--- /dev/null
+++ b/app-eselect/eselect-php/files/php-fpm-launcher-r3
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# If there are no arguments, then "shift" will fail (bug 626496).
+if [ $# -eq 0 ]; then
+ PHP_SLOT=$(eselect php show fpm)
+else
+ PHP_SLOT=$1
+ shift
+fi
+
+exec "/usr/@libdir@/${PHP_SLOT}/bin/php-fpm" "${@}"
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index 4bceeb87bd16..d5a8a6a898e1 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
# Sablotron can optionally be built under GPL, using MPL for now
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="perl"
RDEPEND=">=dev-libs/expat-1.95.6-r1"
diff --git a/dev-ada/gps/files/gps-2017-gentoo.patch b/dev-ada/gps/files/gps-2017-gentoo.patch
index e6ff1453189d..631e6dc92ef9 100644
--- a/dev-ada/gps/files/gps-2017-gentoo.patch
+++ b/dev-ada/gps/files/gps-2017-gentoo.patch
@@ -244,7 +244,7 @@
----------------------------
--- gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb.old 2017-11-23 22:02:52.819994229 +0100
+++ gps-gpl-2017-src/toolchains_editor/core/src/toolchains.adb 2017-11-23 22:07:20.326248295 +0100
-@@ -309,12 +309,12 @@
+@@ -309,12 +309,13 @@
else
Set_Command
(Tc, GNAT_Driver,
@@ -255,7 +255,8 @@
Set_Command
(Tc, GNAT_List,
- To_String (Full_Path) & "gnatls",
-+ To_String (Full_Path) & "@GNATLS@",
++ To_String (Full_Path) &
++ "@GNATLS@",
From_Default,
Is_Default_Path);
Set_Command
@@ -278,10 +279,10 @@
- Set_Command (Native_Toolchain, GNAT_Driver, "gnat", From_Default, True);
- Set_Command (Native_Toolchain, GNAT_List, "gnatls", From_Default, True);
-+ Set_Command (Native_Toolchain, GNAT_Driver, "@GNAT@", From_Default,
-+ True);
-+ Set_Command (Native_Toolchain, GNAT_List, "@GNATLS@", From_Default,
-+ True);
++ Set_Command (Native_Toolchain, GNAT_Driver,
++ "@GNAT@", From_Default, True);
++ Set_Command (Native_Toolchain, GNAT_List,
++ "@GNATLS@", From_Default, True);
Set_Command (Native_Toolchain, Debugger, "gdb", From_Default, True);
Set_Command (Native_Toolchain, CPP_Filt, "c++filt", From_Default, True);
@@ -289,8 +290,50 @@
if Get_Compiler (Native_Toolchain, "Ada") = No_Compiler then
- Add_Compiler (Native_Toolchain, "Ada", "gnatmake", From_Default);
-+ Add_Compiler (Native_Toolchain, "Ada", "@GNATMAKE@",
-+ From_Default);
++ Add_Compiler (Native_Toolchain, "Ada",
++ "@GNATMAKE@", From_Default);
end if;
if Get_Compiler (Native_Toolchain, "C") = No_Compiler then
+--- gps-gpl-2017-src/gps/Makefile.old 2017-12-10 20:29:18.267622400 +0100
++++ gps-gpl-2017-src/gps/Makefile 2017-12-10 20:29:34.564312700 +0100
+@@ -45,7 +45,8 @@
+ for f in ../kernel/generated/*; do cat $$f | tr -d '\015' > $$f-aux; mv -f $$f-aux $$f; done
+ endif
+ $(GPRBUILD) $(GPRBUILD_FLAGS) -m -p -ws -XTP_TASKING=No_Tasking \
+- $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs`
++ $(GPRBUILD_BUILD_TYPE_FLAGS) -Pgps -largs `pkg-config gmodule-2.0 --libs` \
++ -cargs:Ada $(ADAFLAGS) -cargs:C ${CFLAGS}
+
+ resources:
+ ifeq ($(OS),Windows_NT)
+--- gps-gpl-2017-src/common/common_no_xmlada.gpr.in.old 2017-12-10 20:48:13.986166250 +0100
++++ gps-gpl-2017-src/common/common_no_xmlada.gpr.in 2017-12-10 20:48:29.654872055 +0100
+@@ -22,6 +22,7 @@
+ for Switches ("dynamic_arrays.adb") use No_Checks;
+ when "Debug" =>
+ end case;
++ for Driver ("C") use External ("CC", "gcc");
+ end Compiler;
+
+ package Naming is
+--- gps-gpl-2017-src/common/common_with_xmlada.gpr.in.old 2017-12-10 20:48:37.352727540 +0100
++++ gps-gpl-2017-src/common/common_with_xmlada.gpr.in 2017-12-10 20:48:50.423482155 +0100
+@@ -23,6 +23,7 @@
+ for Switches ("dynamic_arrays.adb") use No_Checks;
+ when "Debug" =>
+ end case;
++ for Driver ("C") use External ("CC", "gcc");
+ end Compiler;
+
+ package Binder is
+--- gps-gpl-2017-src/shared.gpr.in.old 2017-12-10 20:52:51.117967249 +0100
++++ gps-gpl-2017-src/shared.gpr.in 2017-12-10 20:53:15.627507886 +0100
+@@ -56,6 +56,7 @@
+ );
+ for Switches ("C") use Optimize & ("-g", "-O2");
+ end case;
++ for Driver ("C") use External ("CC", "gcc");
+ end Compiler;
+
+ package Binder is
diff --git a/dev-ada/gps/gps-2017.ebuild b/dev-ada/gps/gps-2017.ebuild
index 1425084ddd95..7ab72b50e19c 100644
--- a/dev-ada/gps/gps-2017.ebuild
+++ b/dev-ada/gps/gps-2017.ebuild
@@ -45,9 +45,9 @@ src_prepare() {
GCC_PV=6.3.0
mv configure.{in,ac} || die
sed -i \
- -e "s:@GNATMAKE@:gnatmake-${GCC_PV}:g" \
- -e "s:@GNAT@:gnat-${GCC_PV}:g" \
- -e "s:@GNATLS@:gnatls-${GCC_PV}:g" \
+ -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \
+ -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \
+ -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \
aclocal.m4 \
share/support/core/gnat_help_menus.py \
share/support/core/toolchains.py \
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index ac2f8ca4de68..f53ec1e5a615 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,2 +1,2 @@
-DIST jdk-7u80-docs-all.zip 61168809 SHA256 0494bd49bc9cb3cbe3203120ae8b2c8e0aeb1579cb15c0fbd3cd780d19aa200a SHA512 c673c00e55c9a19938c42512cb9c6ae65de9803a1307d11a2043903d87cc36d9ed1f5a1e287040d8570e430cfe55f496354c1242fe6e242f1245f8271394ea1a WHIRLPOOL ad18886c401ec42735665081a0dd5ba3dc7678de0171f3aa8151c2e4ce3392e467be65c602f393da38373e589fa9800ed1afd3601d2cef4e48b06e57f491698e
-DIST jdk-8u152-docs-all.zip 93495668 SHA256 68d1f0f7827d86c6309b04c0f089c219f203158e993a88b47a6acaa0e4b40823 SHA512 5aa49103685fc466bf2c5ff32aeee9ccf5b51359bb8e558bc8f23dc399fb108cba7fd282b669ce3b8062865fc4507afc809f8fb0ca844587eb168ad44c69ad77 WHIRLPOOL a0eff7c33c37c286a69e03340e1ccf5f4c59be40f0a03ff9c800960c2a26971cee22b94829bd1b064b77332b17590969cbcc31f291b7f8da0eebd63e5009aeeb
+DIST jdk-8u152-docs-all.zip 93495668 BLAKE2B 9bb791ef4ace0fd180953e12501900a21583cf9cd8c256246c0d8b1fe139aa7c21fffd073cf6cfc27c206f00eb9d77fd510f8ced752f7c690a4762a9f52f3e8d SHA512 5aa49103685fc466bf2c5ff32aeee9ccf5b51359bb8e558bc8f23dc399fb108cba7fd282b669ce3b8062865fc4507afc809f8fb0ca844587eb168ad44c69ad77
+DIST jdk-9.0.1_doc-all.zip 70497837 BLAKE2B 437aeae172d5a2133eb34f305925898aa80b52f15ae9860d148e3eda7de34b635c4defa0683009c4232658414c81d1f01fbea4201ea179347508caf63d13cd82 SHA512 c031497e5644abe9e9d72f9b2af6c11cf9842ee2f1001184704d994ec62b46a3620930e63944253c777d8ec9248418369579e439cf5c13c66805364669e54063
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
deleted file mode 100644
index 42915862de63..000000000000
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.7.0.80.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)"
-
-DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/java-se-7-doc-download-435117.html#jdk-${MY_PV}-apidocs-oth-JPR"
-ORIG_NAME="jdk-${MY_PV}-docs-all.zip"
-
-DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
-HOMEPAGE="http://download.oracle.com/javase/7/docs/"
-SRC_URI="${ORIG_NAME}"
-
-LICENSE="oracle-java-documentation-7"
-SLOT="1.7"
-KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-RESTRICT="fetch"
-
-S="${WORKDIR}/docs"
-
-pkg_nofetch() {
- einfo "Please download ${ORIG_NAME} from "
- einfo "${DOWNLOAD_URL}"
- einfo "(agree to the license) and place it in ${DISTDIR}"
-
- einfo "If you find the file on the download page replaced with a higher"
- einfo "version, please report to the bug 67266 (link below)."
- einfo "If emerge fails because of a checksum error it is possible that"
- einfo "the upstream release changed without renaming. Try downloading the file"
- einfo "again (or a newer revision if available). Otherwise report this to"
- einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
-}
-
-src_install(){
- insinto /usr/share/doc/${P}/html
- doins index.html
-
- for i in *; do
- [[ -d $i ]] && doins -r $i
- done
-}
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-9.0.1.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-9.0.1.ebuild
new file mode 100644
index 000000000000..865ee06d1665
--- /dev/null
+++ b/dev-java/java-sdk-docs/java-sdk-docs-9.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/documentation/jdk9-doc-downloads-3850606.html"
+
+SLOT="${PV%%.*}"
+DESCRIPTION="Oracle's documentation bundle (including API) for Java SE"
+HOMEPAGE="https://docs.oracle.com/javase/${SLOT}"
+SRC_URI="jdk-${PV}_doc-all.zip"
+LICENSE="oracle-java-documentation-${SLOT}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+RESTRICT="fetch"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/docs"
+
+pkg_nofetch() {
+ einfo "Please download ${SRC_URI} from"
+ einfo "${DOWNLOAD_URL}"
+ einfo "by agreeing to the license and place it in ${DISTDIR}"
+ einfo ""
+ einfo "If you find the file on the download page replaced with a higher"
+ einfo "version, please report it in bug #67266 (link below)."
+ einfo ""
+ einfo "If emerge fails because of a checksum error, it is possible that"
+ einfo "the upstream release changed without renaming. Try downloading the file"
+ einfo "again (or a newer revision if available). Otherwise report this to"
+ einfo "https://bugs.gentoo.org/67266 and we will make a new revision."
+}
+
+src_install() {
+ insinto /usr/share/doc/${PN}-${SLOT}/html
+ doins -r index.html */
+}
diff --git a/dev-java/jdbc-mssqlserver/Manifest b/dev-java/jdbc-mssqlserver/Manifest
index 5825ea4d4208..f83642448c85 100644
--- a/dev-java/jdbc-mssqlserver/Manifest
+++ b/dev-java/jdbc-mssqlserver/Manifest
@@ -1 +1 @@
-DIST sqljdbc_4.0.2206.100_enu.tar.gz 2391092 SHA256 9bc2b6c216e1a82eedcde2ad10ef2fbd9629aab6806544596639fe080f914423 SHA512 7b18d56552f08976b2da5216f3f5504bc8b3db02c072a696115bbee1f5bb35e7125d4880e8e0e034116378b479465315df530eee7eb8a73e90467e1a67265084 WHIRLPOOL 92d20517c6068475c916cffde922fa597eaad4d08eae62f5c74ff59698f0caf0509d19ea1f07cabfed861b0b725ed13a2e4e1416c6dd67d34ba6119303e869bc
+DIST mssql-jdbc-6.2.2.jre8.jar 825389 BLAKE2B 3b3290e80652e1085729f7a3391bea7f3542af6598ea855c6e1430fef2b12009dbfccc761d347491ea85c22d2acfa12d5a55e79b44f23306b6c4f4b6a5aa2ebb SHA512 e381fe9444c706a8a019c5006fe5d238065c20387d3c5b9a4c632ff30033596cea26036b804fc4f6610ad1418bb7d94b024871c7deb865028f5770ffca353d49
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
deleted file mode 100644
index cd682cee9f58..000000000000
--- a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-4.0.2206.100.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit java-pkg-2 versionator
-
-MY_PN="sqljdbc"
-MY_P="${MY_PN}-${PV}"
-MY_ID="02AAE597-3865-456C-AE7F-613F99F850A8"
-
-DESCRIPTION="JDBC driver for Microsoft SQL Server"
-HOMEPAGE="http://msdn.microsoft.com/en-US/data/aa937724.aspx"
-SRC_URI="http://download.microsoft.com/download/${MY_ID:0:1}/${MY_ID:1:1}/${MY_ID:2:1}/${MY_ID}/${MY_PN}_${PV}_enu.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="MSjdbcEULA40"
-SLOT="4.0"
-
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.6"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_PN}_$(get_version_component_range 1-2)/enu"
-
-src_install() {
- dodoc release.txt || die
- if use doc; then
- dohtml -r help/*
- fi
- java-pkg_dojar *.jar
-}
diff --git a/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild
new file mode 100644
index 000000000000..4dbbc416dc05
--- /dev/null
+++ b/dev-java/jdbc-mssqlserver/jdbc-mssqlserver-6.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 versionator
+
+DESCRIPTION="JDBC driver for Microsoft SQL Server"
+HOMEPAGE="https://github.com/Microsoft/mssql-jdbc"
+SRC_URI="https://github.com/Microsoft/mssql-jdbc/releases/download/v${PV}/mssql-jdbc-${PV}.jre8.jar"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="4.2"
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ :
+}
+
+src_install() {
+ java-pkg_newjar "${DISTDIR}/${A}"
+}
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index eee50b1bac3c..44ca4f553d7a 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,14 +1,14 @@
-DIST jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz 10405226 SHA256 5dba4af988562661f4543f210e0e16be9f4e11885e8addd9b7f8f6e2aa18741b SHA512 774b1957142ca489e362ef6ab48ce152196b64c00d779d051f76421fdf4a52cd7a741cfe3336b02c05f432fd2cb95728cdfd992f4ea3fee56047b40e7ce95053 WHIRLPOOL 1196d099f307f21b22e08c3b4badba33ee0475ebd70091ed98510730f7c492032e02a8dd475bd72b380eb9ceb8980e5a012c0be906d76afd2073e048d94f5909
-DIST jdk-8u152-linux-arm32-vfp-hflt.tar.gz 81729798 SHA256 35ab532355c72310c4c7add2b7c7f9d1eb0e045cf59d3fd69ee08fa6a9e610f0 SHA512 c548c18e2e2c9e2c87ad24841348b676628a33023a70aa0a5dab56d031c1d9c7a4813240a046db96631025d034ed333fec81c8099f02a7c9efd39fecd4592e32 WHIRLPOOL 32119379086fc008957bb6a00012d17e2f7d2a22ebd26f8b6e04a3d6476ab5d98a25bcc51cd5ce3c0eba6422581a050b809ffed2539819295aadef37d6e79383
-DIST jdk-8u152-linux-arm64-vfp-hflt-demos.tar.gz 10434504 SHA256 59c1787ad8b5f604293b09576fc8e872ad3fe32c0df3f3a62c9149dddfe25b24 SHA512 c41cb3f8394f98516e7dce52d8aaaea87d0e1675560292009eba0b4b3e993d1aaef7a7895dd83af2570486af6ca8913f280940d5f7e0051c3cc198a6387d9cd7 WHIRLPOOL ae3189cb9393ae9039ddb7a0c87db4ed30defc9cea5cc7d86de8bc32003f5d33c4200c20a3a10658c21f3099c2d455c3660fd1b4d0b222398cf084d776e36ae6
-DIST jdk-8u152-linux-arm64-vfp-hflt.tar.gz 78513081 SHA256 732609dd090a7d20e09b48b90f8f447497879bb6da1b786a9dd1ea6e91ea178f SHA512 fe35360a9ffa73e9745360560db6a5dee9665d31801ea58bd8be676588c93955f47077dbcb5a415c0074f9759a9cace77916e3b322c572b4d3b23a1d99f16578 WHIRLPOOL 9b1abcfa123d783b4caeaab8f469084647fa8deea3056aba910710e525dc7a89a096909111c24e869557d26db2a363be7008b1bddfaff7f9123b168767b78bf7
-DIST jdk-8u152-linux-i586-demos.tar.gz 55096721 SHA256 0a12f9f08e863a75685b11a66f31e990140777b1a8762cb30d9d617a3a0144a5 SHA512 44776eafd70306a392fae5cf269036d7500c7cbaee13a9fcda14b9f7191376dbfcbb03262693e3114a08f5d4ff27ede1ef570fa6008c9ef71ab3b24d44f9ad2c WHIRLPOOL a4b63c7d05a7b69d0525a1ee743e571ecc289c9abbf283c42ffa99dfa17ac98e822a523ca8d021d4fe3d89b51cfa6072ebed4ed272b772aadbab26cc2e479d8d
-DIST jdk-8u152-linux-i586.tar.gz 192699649 SHA256 fc60b121d4b194fa70084fd0ca0d69e8b78e5db01a071efe200e90eed83c4c3e SHA512 6b7576ec40b0ddd0a54fbcd61c22b95f472192be5855d143387f1b56220dd68e851a8b87894802c181b1039c14f5a278d950f100c4bd10b862fe4049d9294ce2 WHIRLPOOL a4bd3b3eed55c42ae51599783c6a2743edb9aaa090e84dd49708930ea712b9d262c565fcaf1e59d5b48f362ec84cca22da920699b9ef8abfd6e9ec93025bbce5
-DIST jdk-8u152-linux-x64-demos.tar.gz 55162003 SHA256 7f0858d204c952fddc402379c187952fcf75dbe5a02b31e51b8a961320f24afa SHA512 51303580a702c1fd1227d8f57c546b6e11de6a87d3ba32123a3e001688c5ff308efa1feaa6da8d2bcff8143fa61726ba9e4aec959a70e82817d628480b0a576f WHIRLPOOL a42cd6a7f0e3619f6408e7f9a923a48cf05c749b945b2e29999344375f146dd408abc774ca153f2d6ec659ebc14229255bee9b850fe182ad5b6f4394313e3a2f
-DIST jdk-8u152-linux-x64.tar.gz 189784266 SHA256 218b3b340c3f6d05d940b817d0270dfe0cfd657a636bad074dcabe0c111961bf SHA512 b0851d46bf0385b7595f8d60da0f06ccdcd59aac75efa9b48635ba77a3e4eb557cbda5585fa5886787a0e549d9e5cfa4a992741349cfc224b36f180907838321 WHIRLPOOL c1d7030f94585725ae4bbf65893456a376ebd5d8ad9cbd63ef7dc86c0b7b6103c98140bbe955234cf8605b422c00d213f9089b56d36f1c920fdb25835ff45e62
-DIST jdk-8u152-macosx-x64.dmg 259130998 SHA256 9f9008e2b05e431838c8ee5f0d54f7715da386bc70b14d4910766c71e9f7923f SHA512 9b3b8ea5119a2f5d3e221244ec07e6da6405041a65fec6299643133a89434d44719e4ccea35498749c00bc400c125dae7a1f4f41fc44d0d6748235bf92601eb8 WHIRLPOOL 0abda8fa87e1b2d525ba401b6b842fc30728c936d05372bb0e2680b602dcd3cc15fc293a1932c716e9904c4d97b9e57a8f7ac66c8ac4080ea342800f4c57542e
-DIST jdk-8u152-macosx-x86_64-demos.zip 55705509 SHA256 3d05061a5c58da669797cd9f8583412eca34e8b0f8779aa6a45b93daac2d2b43 SHA512 5b17f84aeda22a145d8171c8789a8fa1127d1e9b3b6acabdc9e2ad42e4ac5b8c95f2afc0e1736096bec246ca87a22908a5ede492fde34a081984a02382c19ac3 WHIRLPOOL 261e6b89dbb73aa94f4d3d4dacf2353d11a4bae66d446315c0d588de995dee76d7cda9f89fa325656bc8e39657f4d4faafac6f9a06843a12b3045416f93e9969
-DIST jdk-8u152-solaris-sparcv9-demos.tar.gz 9769313 SHA256 2675ad1157ba9a2db3e5d72e8aa658e0f3388731a435b01f890091aaf509f326 SHA512 32e35cb2b3f9e3cb5b5d77a84612fe37f90879e7eb38578af6a922157f12878d1b5f893a3119df055facf7457a5516f502a7da5cb93fa3d5614fdf1f855ecfb8 WHIRLPOOL d38bf520351be78a9eeae4de8696a5fccabb8fd09a9196f14cdd91db457441c341de6854d922e1bcc4d89e1635ac0912e3bd68c166c457b0b86265a617211c0a
-DIST jdk-8u152-solaris-sparcv9.tar.gz 104117809 SHA256 bb23f8813c99b99130e2a7bc076b22712801f19aa600832cd7ce590995ed0ba2 SHA512 9b87d11325e22bfb5f8e852ef4dcd182f091dcedfe71e5b19cc5a7d82f9f7ccb060b53512bc938d0e617648a8aa766bb722690751521b9a2cc3820507342548d WHIRLPOOL 33a11de9b2969eea74251c1dbe217d311ae0db9ff7190c1c9713898212b9c5b537ff5382d15ce27f45bc362901809f2ad7b8a50a3f01904454c9f6be262743d4
-DIST jdk-8u152-solaris-x64-demos.tar.gz 9756596 SHA256 ea6468eca72d715db7e3e4494fb316b25872b91276b156a598a5ea0bd9baf919 SHA512 1aeaf732ad3956ede4baa005f34024750e03919ef81b608229a3df556b47db1255ce027e4278891644433db0c360225a3e81e9a547d298a4b958beb8691f8ff2 WHIRLPOOL f56dec7bc4e156a5058aec0ed7e6274a043dd8069a0b5f95592155a062e133c04dbbe98e1d91ff7e30f71abd863a90022f3fa4363b4fbffd6bb41f5e0701c7e5
-DIST jdk-8u152-solaris-x64.tar.gz 101758540 SHA256 2bf02d98d0eca1ed55fcf274e6254c3e6e71d8e07700fd1ff9e82c44006abace SHA512 4dd9606be347a61a03c0f670915c4e790d4f5eef80a67922342b539dcae7132b3157df04cd33e5f72fdc7e6fcb43e21b3b387e2da159cdfea0feb01183c68aa0 WHIRLPOOL 476c5af0b835643b4d8605deb8f67ef7448bfb0887088cb632a7464d28863b92a9fae2315ef9e454cbd6e1f693910f329dae84acca0d9cb42b4a986e834a1e1e
+DIST jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz 10405226 BLAKE2B 07abee47a2911e2f98220e3152be1d037931c1afa36bd95d197e8fa611a8dd3a9e9755afbf9b348497ac93471cbfe43348f9d72bc719714746c22eb5c4785d6c SHA512 774b1957142ca489e362ef6ab48ce152196b64c00d779d051f76421fdf4a52cd7a741cfe3336b02c05f432fd2cb95728cdfd992f4ea3fee56047b40e7ce95053
+DIST jdk-8u152-linux-arm32-vfp-hflt.tar.gz 81729798 BLAKE2B 794f20dd05088aea228365b8e27af4475e90bc0d905bfc600651ffbe11cb92d1ebaa212f0e700572d0016eec952373c0f0b7463073205324d81b22ea0538e491 SHA512 c548c18e2e2c9e2c87ad24841348b676628a33023a70aa0a5dab56d031c1d9c7a4813240a046db96631025d034ed333fec81c8099f02a7c9efd39fecd4592e32
+DIST jdk-8u152-linux-arm64-vfp-hflt-demos.tar.gz 10434504 BLAKE2B 895b99311add1b91a1436af52e8a36c2c29ca21df5ac1c44046a2aa963fa04035b3601485cc7d10fdd671db2dc5da666960af2f21a2faa4cded05850a92dc3f4 SHA512 c41cb3f8394f98516e7dce52d8aaaea87d0e1675560292009eba0b4b3e993d1aaef7a7895dd83af2570486af6ca8913f280940d5f7e0051c3cc198a6387d9cd7
+DIST jdk-8u152-linux-arm64-vfp-hflt.tar.gz 78513081 BLAKE2B 4c3fcbff1ede3b79aedcfbe44fcc3387dbc3a76e6d912ce7f6b312eb85e4e8e9c7dbf961790a2ebfcff7690d48f1b04fc8447b136ff28514933b3481f0fcb7ad SHA512 fe35360a9ffa73e9745360560db6a5dee9665d31801ea58bd8be676588c93955f47077dbcb5a415c0074f9759a9cace77916e3b322c572b4d3b23a1d99f16578
+DIST jdk-8u152-linux-i586-demos.tar.gz 55096721 BLAKE2B 22a890eb6a392817138412973d3494f4fc993bdb599d04dbd458e56939cb271424ee5e9c19458f840b05d271baf867fb392fb6f69a60b473f50f7f933d8cfe03 SHA512 44776eafd70306a392fae5cf269036d7500c7cbaee13a9fcda14b9f7191376dbfcbb03262693e3114a08f5d4ff27ede1ef570fa6008c9ef71ab3b24d44f9ad2c
+DIST jdk-8u152-linux-i586.tar.gz 192699649 BLAKE2B d6a4f5528ef5659d280e2dce954abb96672fb2228c520830ed514b475eee5f9d53e503b96919c087db5f7f3578d515aadb20b2682c7defede2121091d6c5882b SHA512 6b7576ec40b0ddd0a54fbcd61c22b95f472192be5855d143387f1b56220dd68e851a8b87894802c181b1039c14f5a278d950f100c4bd10b862fe4049d9294ce2
+DIST jdk-8u152-linux-x64-demos.tar.gz 55162003 BLAKE2B 5658107413e2de4887b65eea85bde84e5b8adae8d5f4d048574eb7cbbc0a0ded5b9d89ac6e2f88276116758bedd837c984ea265a0efee20e2310a08f31b473cb SHA512 51303580a702c1fd1227d8f57c546b6e11de6a87d3ba32123a3e001688c5ff308efa1feaa6da8d2bcff8143fa61726ba9e4aec959a70e82817d628480b0a576f
+DIST jdk-8u152-linux-x64.tar.gz 189784266 BLAKE2B 64867e595da97e5e447df49f7d7c84d3fc1786ec30d348c5e0122bea17e21db8da16fb612b86758056ff4796c7efe823bc6fb50561804a9c3d237b385518977b SHA512 b0851d46bf0385b7595f8d60da0f06ccdcd59aac75efa9b48635ba77a3e4eb557cbda5585fa5886787a0e549d9e5cfa4a992741349cfc224b36f180907838321
+DIST jdk-8u152-macosx-x64.dmg 259130998 BLAKE2B 60908860a4510150b7cb44ae54dd93f68f32c31c9013bdd37a5622b528299c1be3bf6f36d4e0c17df25f363dfbc123e609fba632135b9b78367940ae36bf959b SHA512 9b3b8ea5119a2f5d3e221244ec07e6da6405041a65fec6299643133a89434d44719e4ccea35498749c00bc400c125dae7a1f4f41fc44d0d6748235bf92601eb8
+DIST jdk-8u152-macosx-x86_64-demos.zip 55705509 BLAKE2B df58db3779c412076a070fdfaac10a13d03fc5c449410a6257b767cca8907149d8d0562c949a1dd1e4ef3bfbb3319d15b4d0842276fdfd8d2c3befe90cdc17a8 SHA512 5b17f84aeda22a145d8171c8789a8fa1127d1e9b3b6acabdc9e2ad42e4ac5b8c95f2afc0e1736096bec246ca87a22908a5ede492fde34a081984a02382c19ac3
+DIST jdk-8u152-solaris-sparcv9-demos.tar.gz 9769313 BLAKE2B a811ceae2a7ee8d6081b0bd594058986985d953b5895935bde8c305e7b6ebfdaab76a53f09cae414f4e16cd445dce199fd318e0b08d67b6183dfe2ae4ca27015 SHA512 32e35cb2b3f9e3cb5b5d77a84612fe37f90879e7eb38578af6a922157f12878d1b5f893a3119df055facf7457a5516f502a7da5cb93fa3d5614fdf1f855ecfb8
+DIST jdk-8u152-solaris-sparcv9.tar.gz 104117809 BLAKE2B 1dc8e1297594bdd84186d4422dfc8fff94a78e0316f8873920c79342e7d0ab504794296622f0357acf137a3170f263acd0b2c1dd7179e50ff538b5648abf5a4b SHA512 9b87d11325e22bfb5f8e852ef4dcd182f091dcedfe71e5b19cc5a7d82f9f7ccb060b53512bc938d0e617648a8aa766bb722690751521b9a2cc3820507342548d
+DIST jdk-8u152-solaris-x64-demos.tar.gz 9756596 BLAKE2B 4a5ca101e20d1693eaca23120bc3244412276d51dcf7700dd5142b9d23b90a7ff0d3599dce7862e38a183ea9e1ea67afbc075bdfe84908811bec700a928f46f6 SHA512 1aeaf732ad3956ede4baa005f34024750e03919ef81b608229a3df556b47db1255ce027e4278891644433db0c360225a3e81e9a547d298a4b958beb8691f8ff2
+DIST jdk-8u152-solaris-x64.tar.gz 101758540 BLAKE2B 18b04a0eebc618148bdb215d4ca286fce141fb91dc9c0f05de2520eb073a819161af7a1533b3ecdab9961080ad52acd523b771c23a8a3da8797f0adaf974164e SHA512 4dd9606be347a61a03c0f670915c4e790d4f5eef80a67922342b539dcae7132b3157df04cd33e5f72fdc7e6fcb43e21b3b387e2da159cdfea0feb01183c68aa0
diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild
index d717370f8d56..bdd87f5457fc 100644
--- a/dev-libs/openssl/openssl-1.0.2n.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2n.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
diff --git a/games-action/descent1-data/Manifest b/games-action/descent1-data/Manifest
index 2c53556c15a3..ecef8f3a04c5 100644
--- a/games-action/descent1-data/Manifest
+++ b/games-action/descent1-data/Manifest
@@ -1,2 +1,2 @@
-DIST descent-game-content-10to14a-patch.zip 439853 SHA256 0f63b3c50b78b584f41b6c7d6bf71d43ea5fb5b48d173435a4e69ab9ff2c8b8b SHA512 b71ec888509c77dc8ebc94d5a172a27ab0b16ddfdcb47ac243cefe33b87bbca82df843d9a4bffad8c6f345bfefd89e9e3564353922b00c81ef993e409950eb59 WHIRLPOOL 2daf1713173b0b964133daae6122d444da0691b029a2ffbc8de6818b197d631cede855a7111495689abe32c85c0ee6c656ba2198792f7049e181e2ecd8c0ae6f
+DIST descent-game-content-10to14a-patch.zip 439853 BLAKE2B 75f90bbbf664237bbbfbe1aed3ff500c24b72b45beee1361b7823c6758c5dd5daf2693de8c4f3bc8deb77e915811237f28464628caf17c58478cfb111524354c SHA512 b71ec888509c77dc8ebc94d5a172a27ab0b16ddfdcb47ac243cefe33b87bbca82df843d9a4bffad8c6f345bfefd89e9e3564353922b00c81ef993e409950eb59
DIST setup_descent_2.1.0.8.exe 25876928 SHA256 0d2d3e436e0011ec3eb888c8980bb8fd1c9258b0d4f9a0a7ad20a7a85c0d3046 SHA512 bab4269900b7ff0808d4495d5e01d2ebe987b5c37544e3651ff215fe8632b31ad4880ef3f968bd551b1462b9c5d1d392317f1ffec26c5314c76d8341800da876 WHIRLPOOL 1a3c09e59d36f9a2a02c7225846d76246e9612a2bc7e15559380a16cebac25453df0e084a82d9953978e1baf23715ee01f3a26a8def9c4add66e54dd821f6519
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index 1c4606943d9e..2680c7103c74 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,2 +1,2 @@
-DIST d2xptch12.tgz 158419 SHA256 61743c19baecde602c778e6ea44ef4a28bab9b8aa16a5f2772e3799863487a80 SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b WHIRLPOOL ea2d14205eaa8978f22b9e9c3e20d99cf4c9ea8f43a4c688cb4cd9fc85b41b1dfdfed9fa38161ba776357a16370ede00fcc191a5d01ba1e7c4635720f0d1e77c
+DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
DIST setup_descent2_2.1.0.10.exe 554371624 SHA256 e787d95574f8a4bf3c442ad49e837186319d3bb041a33a00df726be3be7c9750 SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618 WHIRLPOOL 1f13b652c79752772cf2a151ca7663443e8936be352ddb100e140b00bc6f88a13ba5d4dfad17cb07ed78ed5b629fad1aaeeb7424a2216b68761c4065b6f8ac3c
diff --git a/games-fps/alephone-infinity/Manifest b/games-fps/alephone-infinity/Manifest
index d038c6e33917..5cff9bd87793 100644
--- a/games-fps/alephone-infinity/Manifest
+++ b/games-fps/alephone-infinity/Manifest
@@ -1,2 +1,2 @@
-DIST MarathonInfinity.zip 30109883 SHA256 e8294df4dcd81b11d74ceedd6d13580ea13ca62d3952eb535b009387a9a4b90a SHA512 1f347615b96d2c07914cda78bdc6971311f3933af78debfcd9fa87a0a3048220726a082602b7a76f516f7b3dd3240d1ea843794ab34e4e9e7733342d9d9fe5b1 WHIRLPOOL a8fefe0dc8c625fcb2fba9da65148d622513189bbb62ae27545b27f39d610f96045498aeabe1a2b35487524e078041e14a17089dda488280fc038a6191ce0710
+DIST MarathonInfinity.zip 30109883 BLAKE2B 5412c172e3f3066250912d9e818b172c9b036c4a71d090d36c3ef7e078d7e37ca7d676282176bd79d3e87b212d40245e7d16d0f8016a3094de24c4434570fdbd SHA512 1f347615b96d2c07914cda78bdc6971311f3933af78debfcd9fa87a0a3048220726a082602b7a76f516f7b3dd3240d1ea843794ab34e4e9e7733342d9d9fe5b1
DIST alephone-infinity.png 19193 SHA256 cb2e18364347b5e4e256401f2fd9b35b92ed3763375f2f4ea2c190915a7df5c0 SHA512 ad5c683aae4ee0afa306aaf33c9ad93a2eee59a4283166aada58a48a8dbbe8de62c8af0b04b143366448ef101ba8b2530cbc8bc5b3e1de62c5177775fae6bfd3 WHIRLPOOL b1179b771dc2b43823a648eb44b8197c3d777976820cc6650a7be7e8e415bfdff77b76a5331f9f56e8e49b7efd5df335b98f72e2e0645beb0c317e12706640c5
diff --git a/games-fps/urbanterror-data/Manifest b/games-fps/urbanterror-data/Manifest
index c5a1425fb952..75f0a116fba2 100644
--- a/games-fps/urbanterror-data/Manifest
+++ b/games-fps/urbanterror-data/Manifest
@@ -1,4 +1,3 @@
DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B a4562c81169274e6f7685c9ca771c0e004ec40aa123d0757794e89c019bbd6e280f22e0929dc6917b0a43d9fe6e6ea90a4f190ce01ff2e6be087299a9bb64cab SHA512 f05564babadff73793778926411bc7914bfef4a5f7dfc1003c36e8a549c568ab520adcff8a38e7dd905238738d242aa865e7c6d7db36ed6d592b144e497ed823
DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d SHA512 cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
DIST urbanterror-data-4.3.2.zip 1491207564 BLAKE2B 3a292079d92895fa28567e8773d504a9f4b179de6d49607e9d589674374690a1fa673b0b8b08790b126140c8e8583ca3ee6f8439ea28e0f868fab6f4bc1a6268 SHA512 397aa5ba7f869049844d52a9dec234d020b856e16ba3ff295d97775e4e1d48730aecfba3992baf7d55c643c0073ceda32ada18d1473dadd55f561f27a8b9c4ed
-DIST urbanterror-data.svg 1592 BLAKE2B 03b84da826882cb73e0cf589626b6e6959f08b6435c18481fce9fa2f1583b4fdb80032bb7638258558f5429ff5ae16f369aa53305260b4f370ed92860d86865c SHA512 ff789b35d9b1a2282485495b0d1918c7169906aeac094e7a33c7d77cd51d4787733400e1b9851ce19b38e886508d5fdd09f6cfc96b37a5b41bd0cf403e456b98
diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild b/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
index 95dea99a4f67..7eebf9e788fb 100644
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
+++ b/games-fps/urbanterror-data/urbanterror-data-4.3.2-r1.ebuild
@@ -11,6 +11,10 @@ MY_PV=43_full
DESCRIPTION="Data files for UrbanTerror"
HOMEPAGE="http://www.urbanterror.info"
+
+# Todo in the next release: save into ${PN}-4.3.0.zip
+# I just made a mistake, but loading some GiB just for
+# a mostly cosmetical fix isn’t worth the bandwith.
SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}.zip -> ${P}.zip"
# fetch updates recursively for |4.3.x-4.3.0|
diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild b/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
deleted file mode 100644
index 5b0059e6f3ce..000000000000
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit check-reqs eutils
-
-ENGINE_PV=${PV}
-
-MY_PN=UrbanTerror
-MY_PV=43_full
-
-DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info"
-SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}.zip -> ${P}.zip
- https://upload.wikimedia.org/wikipedia/commons/5/56/Urbanterror.svg -> ${PN}.svg"
-
-# fetch updates recursively for |4.3.x-4.3.0|
-if [[ "${PV}" != "4.3.0" ]]; then
- MY_CTR=0
- while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
- SRC_URI="${SRC_URI} https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
- MY_CTR=$(( ${MY_CTR} + 1 ))
- done
-fi
-unset MY_CTR
-
-LICENSE="Q3AEULA-20000111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}43"
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1400M"
-
-src_prepare() {
- default
-
- # apply updates we fetched before
- # again recursively for |4.3.x - 4.3.0|
- local MY_CTR
- if [[ "${PV}" != "4.3.0" ]]; then
- MY_CTR=0
- while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
- cp -dfpr \
- "${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 ))/* "${S}"
- MY_CTR=$(( ${MY_CTR} + 1 ))
- done
- fi
-}
-
-src_install() {
- newicon -s scalable "${DISTDIR}"/${PN}.svg urbanterror.svg
- insinto /usr/share/urbanterror/q3ut4
- doins q3ut4/*.pk3
- # These files are *essential* for startup
- newins q3ut4/server_example.cfg server.cfg
- newins q3ut4/autoexec_example.cfg autoexec.cfg
-
- dodoc q3ut4/readme43.txt
- docinto examples
- dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
-}
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
index f9031204037d..f49cff1d924b 100644
--- a/games-fps/urbanterror/Manifest
+++ b/games-fps/urbanterror/Manifest
@@ -1,5 +1 @@
-DIST urbanterror-4.3.2_p20170426.tar.gz 10058308 BLAKE2B 7ce3f2abd00a71194160fcde4185733f1232a232237fb50d8d59ee188b2c40d117cdb3b3a03e0f0f6a9456ccf7e7dea030a96de438fcaa408ea6ff52cd23892c SHA512 e8107ab44fdb40bc14a548239185905a01120bbe960b8713e5959df18330fd845761350c5e8e5efd5fbfec10ad62ff9fef68420406cc4cfbe2af69ee66eff1f3
-DIST urbanterror-4.3.2_p20170713.tar.gz 9984763 BLAKE2B 4771e5ecf997334d33ae4b2040e6a2c9e7e2e85990152efef14f071db656e2712fed078dd117c9701ffd1be2e36360cee3d1c7126e10706a12013f5cc8a9625d SHA512 09fd2232c3cbdde001b8d037f2667a55a584378615f2da10c6815797748028f36b75c899ca4fd1d7d97a33f4b3ddbaa4d271b36b5eabf3bf9e81852ef15864a4
-DIST urbanterror-4.3.2_p20170915.tar.gz 10061394 BLAKE2B 9e42de663b1ae0ae9e16a279233c88eb419f424c3db0b4d14276cbb9ab59fba3f32b43593f5901e0a6299ef8c2e4fe1d39a789d107a7bd9c15422a3acf553cea SHA512 d22bc3a0d8d191f797f5b1e7a0671424ca6dafbe5a3bd7fbfcd0e7249b9b4b6e790a64cdf7c93690d032b38f92aee703e9e302701084703d7a79d8f60cc2433e
-DIST urbanterror-4.3.2_p20171016.tar.gz 10061989 BLAKE2B 12cc4cd40f85c8d15c93fbafa5cc0c5fe2b8c2d35962aa6a24e8878525b262bab47a5f8cfef6e7a4e4d506c47a5d56fb22db99e341efac06cd1b16e1d845027b SHA512 b35bd08f6058d73eecd48304609f7064637e9f1fcad7b22a93a9fdb43f003b93c3c52f3e9a7fc4c468d70fed4ba687bcdcfa0c8749252a12d2eab1cf3ab956ea
-DIST urbanterror-4.3.2_p20171105.tar.gz 10067127 BLAKE2B e843623976ad1d2379121bb834eabac634d57185c0b15ee298cf900474a7879ba0d2f45e1e6eb002d963fa83d895f8962110dc7f5dc5a209cde1aee3a9a8234a SHA512 7a9ac15a0508706c17a390a5105badbaaba3b3c0e7e23b3ab9dd16751b1d946c108febba5c2f6af3046d5431fd1c5978a2abc267a740eca1d89d77d7172b41ad
+DIST urbanterror-4.3.2_p20171208.tar.gz 10072373 BLAKE2B 9934317fb649e652628639f9ea35cdaa0466363b52ea7325198aaaa6360e07e41ec590342cd35fa1bb352ff35ba5994e9152caaf308aa0e0d8c3c2d94ea36a91 SHA512 1dd3affa8fe23f8cca4ee3c90a8d6fc86f5df2122e0121d57263be745d0af13f52cb47802636a22cb09b1bae8a100b491dc8cc0c81c413dd9cbb2ad29a69039a
diff --git a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch b/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
deleted file mode 100644
index 5ce13342ab58..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.3-respect_CFLAGS.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Author: holgersson <holgersson@posteo.de>
-Date: Fri Mar 31 12:13:00 2017 +0200
-
-Respect CFLAGS - inspired by hasufell’s patch
-
---- a/Makefile 2017-03-31 11:08:58.419210817 +0200
-+++ b/Makefile 2017-03-31 12:06:52.559412054 +0200
-@@ -290,34 +290,33 @@
- CLIENT_EXTRA_FILES=
-
- ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
-- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-- -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-+ BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
- CLIENT_CFLAGS += $(SDL_CFLAGS)
-
-- OPTIMIZEVM = -O3
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+ OPTIMIZEVM =
-+ OPTIMIZE = $(OPTIMIZEVM)
-
- ifeq ($(ARCH),x86_64)
-- OPTIMIZEVM = -O3
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+ OPTIMIZEVM =
-+ OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED = true
- else
- ifeq ($(ARCH),x86)
-- OPTIMIZEVM = -O3 -march=i586
-- OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+ OPTIMIZEVM =
-+ OPTIMIZE = $(OPTIMIZEVM)
- HAVE_VM_COMPILED=true
- else
- ifeq ($(ARCH),ppc)
-- BASE_CFLAGS += -maltivec
-+ BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
- endif
- ifeq ($(ARCH),ppc64)
-- BASE_CFLAGS += -maltivec
-+ BASE_CFLAGS +=
- HAVE_VM_COMPILED=true
- endif
- ifeq ($(ARCH),sparc)
-- OPTIMIZE += -mtune=ultrasparc3 -mv8plus
-- OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
-+ OPTIMIZE +=
-+ OPTIMIZEVM +=
- HAVE_VM_COMPILED=true
- endif
- ifeq ($(ARCH),armv7l)
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
deleted file mode 100644
index 522657485a43..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170426.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="60b17a27ecaa30bffc44114cb94df82af7febfdd"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
-
-RDEPEND="
- client? (
- media-libs/libsdl2[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble )
- openal? ( media-libs/openal )
- opus? ( media-libs/opusfile )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- # Workaround for used zlib macro, wrt bug #44951
- append-flags "-DOF=_Z_OF"
-
- emake \
- ARCH=$(usex amd64 "x86_64" "i386") \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(buildit client) \
- BUILD_SERVER=$(buildit server) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=$(buildit openal) \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=$(buildit curl) \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_CODEC_OPUS=$(buildit opus) \
- USE_MUMBLE=$(buildit mumble) \
- USE_VOIP=$(buildit voip) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(buildit altgamma)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_preinst() {
- use client && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
deleted file mode 100644
index ba228d054171..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170713.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="8eb3e10163c62331b77171a71ca6102d3d63c3e7"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
-
-RDEPEND="
- client? (
- media-libs/libsdl2[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble )
- openal? ( media-libs/openal )
- opus? ( media-libs/opusfile )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- # Workaround for used zlib macro, wrt bug #44951
- append-flags "-DOF=_Z_OF"
-
- emake \
- ARCH=$(usex amd64 "x86_64" "i386") \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(buildit client) \
- BUILD_SERVER=$(buildit server) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=$(buildit openal) \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=$(buildit curl) \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_CODEC_OPUS=$(buildit opus) \
- USE_MUMBLE=$(buildit mumble) \
- USE_VOIP=$(buildit voip) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(buildit altgamma)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_preinst() {
- use client && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild
deleted file mode 100644
index 6265e8c10cd1..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20170915.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="0b3e62a00bd05d337f2ab6dad2cdb311a5d76464"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
-
-RDEPEND="
- client? (
- media-libs/libsdl2[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble )
- openal? ( media-libs/openal )
- opus? ( media-libs/opusfile )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_compile() {
- buildit() { use $1 && echo 1 || echo 0 ; }
- nobuildit() { use $1 && echo 0 || echo 1 ; }
-
- # Workaround for used zlib macro, wrt bug #44951
- append-flags "-DOF=_Z_OF"
-
- emake \
- ARCH=$(usex amd64 "x86_64" "i386") \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(buildit client) \
- BUILD_SERVER=$(buildit server) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(buildit openal) \
- USE_OPENAL_DLOPEN=$(buildit openal) \
- USE_CURL=$(buildit curl) \
- USE_CURL_DLOPEN=$(buildit curl) \
- USE_CODEC_VORBIS=$(buildit vorbis) \
- USE_CODEC_OPUS=$(buildit opus) \
- USE_MUMBLE=$(buildit mumble) \
- USE_VOIP=$(buildit voip) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(buildit altgamma)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_preinst() {
- use client && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
deleted file mode 100644
index 468e8992705d..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20171016.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == "9999" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
- EGIT_BRANCH="urt"
-else
- COMMIT_ID="3e555ab1405c38556cbfcdd42eac23a4af49e633"
- SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/ioq3-${COMMIT_ID}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server voip vorbis"
-REQUIRED_USE=" || ( client server )"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3-respect_CFLAGS.patch )
-
-RDEPEND="
- client? (
- media-libs/libsdl2[X,sound,joystick,opengl,video]
- mumble? ( media-sound/mumble )
- openal? ( media-libs/openal )
- opus? ( media-libs/opusfile )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- )
- curl? ( net-misc/curl )
- ~games-fps/urbanterror-data-4.3.2
- sys-libs/zlib[minizip]
- virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
- if use client; then
- if ! use openal && ! use opus && ! use vorbis; then
- ewarn
- ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
- fi
- fi
-}
-
-src_compile() {
- # Workaround for used zlib macro, wrt bug #449510
- append-flags "-DOF=_Z_OF"
- local my_arch=$(usex amd64 "x86_64" "i386")
-
- emake \
- ARCH=${my_arch} \
- DEFAULT_BASEDIR="/usr/share/urbanterror" \
- BUILD_CLIENT=$(usex "client" 1 0) \
- BUILD_SERVER=$(usex "server" 1 0) \
- BUILD_BASEGAME=1 \
- BUILD_MISSIONPACK=0 \
- BUILD_GAME_SO=0 \
- BUILD_GAME_QVM=0 \
- BUILD_STANDALONE=1 \
- SERVERBIN="Quake3-UrT-Ded" \
- CLIENTBIN="Quake3-UrT" \
- USE_RENDERER_DLOPEN=0 \
- USE_YACC=0 \
- BASEGAME="q3ut4"\
- BASEGAME_CFLAGS="${CFLAGS}" \
- USE_OPENAL=$(usex "openal" 1 0) \
- USE_OPENAL_DLOPEN=$(usex "openal" 1 0) \
- USE_CURL=$(usex "curl" 1 0) \
- USE_CURL_DLOPEN=$(usex "curl" 1 0) \
- USE_CODEC_VORBIS=$(usex "vorbis" 1 0) \
- USE_CODEC_OPUS=$(usex "opus" 1 0) \
- USE_MUMBLE=$(usex "mumble" 1 0) \
- USE_VOIP=$(usex "mumble" 1 0) \
- USE_INTERNAL_LIBS=0 \
- USE_LOCAL_HEADERS=0 \
- USE_ALTGAMMA=$(usex "altgamma" 1 0)
-}
-
-src_install() {
- local my_arch=$(usex amd64 "x86_64" "i386")
- # docs from ioq3, not from UrbanTerror ZIP file
- dodoc ChangeLog README.md README.ioq3.md md4-readme.txt
-
- if use client; then
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT.${my_arch} ${PN}
- # Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
- make_desktop_entry ${PN} "UrbanTerror" ${PN}
- fi
-
- if use server && ! use client; then
- # dedicated server only
- newbin build/$(usex debug "debug" "release")-linux-${my_arch}/Quake3-UrT-Ded.${my_arch} ${PN}-ded
- fi
-}
-
-pkg_preinst() {
- use client && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use client && gnome2_icon_cache_update
-
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- # This is a new installation
- if use openal; then
- elog ""
- elog "You might need to set:"
- elog " seta s_useopenal \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
- fi
-
- if use altgamma; then
- elog ""
- elog "You might need to set:"
- elog " seta r_altgamma \"1\""
- elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
- fi
-
- if ! use altgamma; then
- elog ""
- elog "If you are using a modesetting graphics driver you might"
- elog "consider setting USE=\"altgamma\"."
- elog "For details take a look at:"
- elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
- fi
- if ! use client; then
- elog ""
- elog "You disabled client support. You won't be able to connect"
- elog "to any servers and play. If you want to do so, enable"
- elog "USE=\"client\"."
- fi
- fi
-}
-
-pkg_postrm() {
- use client && gnome2_icon_cache_update
-}
diff --git a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild b/games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild
index 4bcbbaa4605a..32cf683aeac4 100644
--- a/games-fps/urbanterror/urbanterror-4.3.2_p20171105.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.3.2_p20171208.ebuild
@@ -7,12 +7,12 @@ inherit eapi7-ver flag-o-matic toolchain-funcs xdg-utils
DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
HOMEPAGE="http://urbanterror.info https://github.com/mickael9/ioq3"
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
EGIT_BRANCH="urt"
else
- COMMIT_ID="59594a771796ae3b02e24a23807a808129931d1a"
+ COMMIT_ID="e3bc50248c9d6c319d4822ca23caa5d46fc118ab"
SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/ioq3-${COMMIT_ID}"
KEYWORDS="~amd64 ~x86"
diff --git a/games-fps/ut2004-crossfire/Manifest b/games-fps/ut2004-crossfire/Manifest
index ff7a3f0d583e..61ba8a3b46fd 100644
--- a/games-fps/ut2004-crossfire/Manifest
+++ b/games-fps/ut2004-crossfire/Manifest
@@ -1 +1 @@
-DIST TOCrossfire_beta_1.95_full.zip 1243833907 SHA256 67d9ec864d0ff2303edb003a6eeebf015143d61999640074c4bd5b205f216d3c SHA512 a02c8221f7687e4a2276f6da9f9fc480b0c8aaf3f98517134614079699a0ecda088e781d5d0251b7da8588493afa394acc5eed99f40034d3555feeef6e175bbe WHIRLPOOL 70a154ba253cb983bf0e4558c833abfcaca624124a2a1d7edff962f3fc3e9dceb09f66cfca54cbe72d287ae77ce7f493e88b71fe6dfcbba8f0b53232920697ef
+DIST TOCrossfire_beta_1.95_full.zip 1243833907 BLAKE2B ec6ce5ecec8357ed0a3b90eb7c64b25f372a37224454840bb2f55f0080d0f722fa4cd436d3299f11670627e7da1c46ad92ea6459cdbe734ed7d075117403b9e0 SHA512 a02c8221f7687e4a2276f6da9f9fc480b0c8aaf3f98517134614079699a0ecda088e781d5d0251b7da8588493afa394acc5eed99f40034d3555feeef6e175bbe
diff --git a/games-fps/ut2004-deathball/Manifest b/games-fps/ut2004-deathball/Manifest
index 83dbfc77923a..0785c954bf39 100644
--- a/games-fps/ut2004-deathball/Manifest
+++ b/games-fps/ut2004-deathball/Manifest
@@ -1 +1 @@
-DIST deathball24w.zip 79276308 SHA256 564a7d93f0eec438f1f7f5da873805429e4a2827eb67a33f506e7313be763343 SHA512 b310c38dcc5889fc3f56861fe8d05e53c4b399b33e318614bfeb86b899051c8870b23bc39a82eda7eb7d469d7d2d32c361df922bcba18f01d03aa66239b133bc WHIRLPOOL f6d208f166a6ac47b25d09429a11fb3e79255fef313bda78018995c6999982e677e3de81e40e017f7571da51afc4e94b8bfd2d18cd57215de1bbefd2fc153682
+DIST deathball24w.zip 79276308 BLAKE2B 4e060e5f4f3dc8df7ee22b1c703531e5e1f97842aaf01fef9b87ef00895525f81cb1560cabdf5946fc8b7120c458557816857fba6e24f253da858133039d92b1 SHA512 b310c38dcc5889fc3f56861fe8d05e53c4b399b33e318614bfeb86b899051c8870b23bc39a82eda7eb7d469d7d2d32c361df922bcba18f01d03aa66239b133bc
diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest
index a18db6cb7b8e..6f7576a7cb1f 100644
--- a/games-fps/xonotic/Manifest
+++ b/games-fps/xonotic/Manifest
@@ -1,2 +1,2 @@
-DIST xonotic-0.8.1.zip 984854761 SHA256 be8bcc41e2993a2f26d4d04c65a7eab810443bd98b11b45e482ffdbbf284c46f SHA512 adfce546257bdc7cfebe94f53eaa9cc9b19eaa546c6405e31ed6af080e3948732c960a024126202e5853cb98b955daadeeb5a96c602a6d4d83e284d3540214a4 WHIRLPOOL 4359263c98352a8b5d169147d9bfecb4258628f212d9a965f0d1577d0a8b2469648ae1ce21d8dc0ff622d20e126ea52e1464363f69fcf514991aefad71c1bee7
-DIST xonotic-0.8.2.zip 991045679 SHA256 a22f7230f486c5825b55cfdadd73399c9b0fae98c9e081dd8ac76eca08359ad5 SHA512 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5 WHIRLPOOL aff99ae1e995265c832747923afb5ee1048719d4410cc6b55ec773e51dc0920acffe627541209b5450f572e78ef7c74c8822ae2f6ebec2a8888f80dbfd34afba
+DIST xonotic-0.8.1.zip 984854761 BLAKE2B 442e4660903552c65e0dbc552013ae237ab8d0d9278a04e6e1d83f7957e7306ea95f3c0e4c7523823191a4458825ba3813bbd92e43e77448a4b351f0e041edc4 SHA512 adfce546257bdc7cfebe94f53eaa9cc9b19eaa546c6405e31ed6af080e3948732c960a024126202e5853cb98b955daadeeb5a96c602a6d4d83e284d3540214a4
+DIST xonotic-0.8.2.zip 991045679 BLAKE2B 3005473da954492bb7387f9e0e13c2415e638877fa8b83e14872f3b04ed0fc21b82e18f51aa6c68e8bf02d09d4a73f290cbcaebdfa8c0a12ceb6582309baee8a SHA512 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5
diff --git a/games-rpg/vendetta-online-bin/Manifest b/games-rpg/vendetta-online-bin/Manifest
index c8f9f8439ee1..7274d79f185d 100644
--- a/games-rpg/vendetta-online-bin/Manifest
+++ b/games-rpg/vendetta-online-bin/Manifest
@@ -1,2 +1,2 @@
-DIST vendetta-online-bin-1.8.296-amd64.sh 235822235 SHA256 fcd0e96d1e48f49289ef00d3e8a9f05013389916012c0c8d5ace18af83b348ab SHA512 f57b8da6b2364df7ca78c0a8df66cadbc568927376548f95b49da5d641d49a155315583d4323599f59e982b0569b972311fa4717e11dab48e4da95ab235d05a4 WHIRLPOOL 320aaaae6cdcbe799036ead0c50cc97e808eda018d4d5475c01c89eb499cf7adfb3ef704b1ce2eb0a90ba39dfabdf500c6685bdf36b6051d4ae4122468fb3009
-DIST vendetta-online-bin-1.8.296-x86.sh 235890404 SHA256 93693050c1431b6cd7ad77972b0995b76696d2e4ef3fd17246fa09a4ae764c20 SHA512 909e4960fe85c7bc71cf1530cd8fd9fa096b28c9ba621e3c16e14d1264858939e859fad182e76301322eb45b7c451bd21d87a90274eefb9e71e1fd1eb1f498b0 WHIRLPOOL fc85dfbd059773b68201d5294a30cc1b6a05d7be43c7497c05d07d84be8b9b245da7e6d584541f8a47231fbf975b1c550399e3fa80457c9475700410aa4b1fb7
+DIST vendetta-online-bin-1.8.296-amd64.sh 235822235 BLAKE2B d5b3218a6928da2f6b0ad8e12d7dbf7052140bb194aceee948ab89d019b59d361c8ddc7eff6d97cf361a9b9b99a7f1b1b8af91339245201203b9aa6d3c4a60ee SHA512 f57b8da6b2364df7ca78c0a8df66cadbc568927376548f95b49da5d641d49a155315583d4323599f59e982b0569b972311fa4717e11dab48e4da95ab235d05a4
+DIST vendetta-online-bin-1.8.296-x86.sh 235890404 BLAKE2B cb59204f54a60a42639e542527a7b07019c4d9873bd7b4027abede84f6e2ca321449dabdacb082d7fd3fce343de1db5039d4da8f230ee52a2c0d64b5d5c41cc0 SHA512 909e4960fe85c7bc71cf1530cd8fd9fa096b28c9ba621e3c16e14d1264858939e859fad182e76301322eb45b7c451bd21d87a90274eefb9e71e1fd1eb1f498b0
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
index 5acd13b37620..564526719ea8 100644
--- a/games-server/ut2004-ded/Manifest
+++ b/games-server/ut2004-ded/Manifest
@@ -1,3 +1,3 @@
-DIST dedicatedserver3339-bonuspack.zip 914213907 SHA256 b8fc94fc843483b18c225e100736d10cb2690ba8666d6abbb274ea6ad718b18e SHA512 353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26 WHIRLPOOL e9a046530d5e1bddd38f3e4f2e3f424c665fbca4a2c38ef0c36eaea621cbd18f9ae28434c2b266ad69f90306cfa047fb205cc8757c356d5e597964894d3a8410
+DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B 883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325 SHA512 353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3 SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1 WHIRLPOOL 2e04124aa7eb4e2689b048aceeb8c085a5756bad4c0f084da764055ea7a403623107bc6bb29d00b9b93b45675f4475e145edb4e6a3faf208d9fe36f4a65c9e78
DIST ut2004-v3369-3-linux-dedicated.7z 5013927 SHA256 799f00deccb7ee1e3db3963deeb50a41b05a262e6f7363654c4f0438e06d7192 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf WHIRLPOOL ef459d7c053ac70be6313c65edaff095053cab840588d5762834b4402e299d8782401ebf1341ff61a150efed8420bf377b7a7ba10dbed6608d86791e2569e733
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index d390e0b4246f..f4836fa54ddb 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,3 +1 @@
-DIST lutris-0.4.13.tar.gz 1028111 BLAKE2B 46abb83a5ed27c5f7d7bb8a6183e4b950c79cc811e6eade996789df4d81fb73d51d202bf3cc9ac46abc30d2a2b8291a001b4df1d0dd4912d7e6c30705fc65912 SHA512 006e4cc237a60bd925cee87046664f766686a15c692f7717e6fd25bee377880bd96f788309966e8e0dabdf2c938e0da0f8914c7e70554f216b8513aa41bc808a
-DIST lutris_0.3.6.3.tar.gz 515606 BLAKE2B 5c23c26419b1fa0bb836aa90c5b9bec8fceff544ddefb314c5b4c5c060be278eccbb7f9c21b4a2190e5232d6abfa31e25b141e4a2d72f941385c94db6d6b9871 SHA512 548a3a79ffb1c378d923f404634acc3b5eb1055d087ff212cf8a35b7db56650bf616f3b7374ab9fdf996c8f10d80ab602d35d126ef3bb183b9ce55b36d270e97
-DIST lutris_0.3.8.tar.xz 658408 BLAKE2B 2a31206052a87873146609d229fb93b9a991ffb5f92f9d4f5b2a576b41d16815b5122168a5073ea44883d73223aa0fcc6dec46d9b909d594750d06300263f3e4 SHA512 165e9c045e82407dfd6dd35fa73a98b68d095119596b9f0e66867c92071d1178526ddf991fc6b05449446c9d7c1a573ffea564d93d440cebdaa788c61e57fcfe
+DIST lutris-0.4.14.tar.gz 1617493 BLAKE2B c97d0e31657252c4ae5c6718151f028d273831cdb9f21b748ada651686cf3aa51a618a007db87528d84f21dca292509399f9bb1f0c0444c57e369b13b9ae79a0 SHA512 d229d7f79b3395db22ad49abc02ca5e08db9465258be33fcefe743c0a099e1ca507b6b9c28f03d2a6857489f7f2e19fca38803f6876df88a96b060ed5f7f94bc
diff --git a/games-util/lutris/lutris-0.3.6.3.ebuild b/games-util/lutris/lutris-0.3.6.3.ebuild
deleted file mode 100644
index 391ecd58bad0..000000000000
--- a/games-util/lutris/lutris-0.3.6.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit distutils-r1 gnome2-utils games
-
-DESCRIPTION="Gaming platform for GNU/Linux"
-HOMEPAGE="http://lutris.net/"
-SRC_URI="http://lutris.net/releases/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- gnome-base/gvfs[http]
- x11-apps/xrandr
- x11-apps/xgamma
- x11-misc/xdg-utils"
-
-# INSTALL contains list of optional deps
-DOCS=( AUTHORS README.rst INSTALL )
-
-S=${WORKDIR}/${PN}
-
-python_install() {
- distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
-}
-
-src_prepare() {
- distutils-r1_src_prepare
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_install() {
- distutils-r1_src_install
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
- gnome2_schemas_update
-
- elog "For a list of optional deps (runners), see"
- elog "/usr/share/doc/${PF}/INSTALL"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/games-util/lutris/lutris-0.3.8.ebuild b/games-util/lutris/lutris-0.3.8.ebuild
deleted file mode 100644
index da95d81a19e0..000000000000
--- a/games-util/lutris/lutris-0.3.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit distutils-r1 gnome2-utils games
-
-DESCRIPTION="Gaming platform for GNU/Linux"
-HOMEPAGE="http://lutris.net/"
-SRC_URI="http://lutris.net/releases/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/pyxdg[${PYTHON_USEDEP}]
- gnome-base/gvfs[http]
- x11-apps/xrandr
- x11-apps/xgamma
- x11-misc/xdg-utils"
-
-# INSTALL contains list of optional deps
-DOCS=( AUTHORS README.rst INSTALL.rst )
-
-S=${WORKDIR}/${PN}
-
-python_install() {
- distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
-}
-
-src_prepare() {
- distutils-r1_src_prepare
-}
-
-src_compile() {
- distutils-r1_src_compile
-}
-
-src_install() {
- distutils-r1_src_install
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
- gnome2_icon_savelist
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- games_pkg_postinst
- gnome2_icon_cache_update
- gnome2_schemas_update
-
- elog "For a list of optional deps (runners), see"
- elog "/usr/share/doc/${PF}/INSTALL"
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/games-util/lutris/lutris-0.4.13.ebuild b/games-util/lutris/lutris-0.4.14.ebuild
index 960cafec846a..960cafec846a 100644
--- a/games-util/lutris/lutris-0.4.13.ebuild
+++ b/games-util/lutris/lutris-0.4.14.ebuild
diff --git a/licenses/oracle-java-documentation-7 b/licenses/oracle-java-documentation-7
deleted file mode 100644
index d8297140409c..000000000000
--- a/licenses/oracle-java-documentation-7
+++ /dev/null
@@ -1,95 +0,0 @@
-ORACLE AMERICA, INC. ("ORACLE") IS WILLING TO LICENSE THIS SPECIFICATION
-TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS AGREEMENT. PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THE AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE.
-
-
-Specification: JSR-336 Java(tm) SE 7 Release Contents ("Specification")
-
-
-Version: 7
-
-
-Status: Final Release
-
-
-Release: July 2011
-
-
-Copyright 2011 Oracle America, Inc. and/or its affiliates. All rights reserved.
-
-500 Oracle Parkway M/S 5op7, California 94065, U.S.A
-
-
-LIMITED LICENSE GRANTS
-
-
-1. License for Evaluation Purposes. Oracle hereby grants you a fully-paid, non-exclusive, non-transferable, worldwide, limited license (without the right to sublicense), under Oracle's applicable intellectual property rights to view, download, use and reproduce the Specification only for the purpose of internal evaluation. This includes (i) developing applications intended to run on an implementation of the Specification, provided that such applications do not themselves implement any portion(s) of the Specification, and (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the Specification in oral or written communications which discuss the Specification provided that such excerpts do not in the aggregate constitute a significant portion of the Specification.
-
-
-2. License for the Distribution of Compliant Implementations. Oracle also grants you a perpetual, non-exclusive, non-transferable, worldwide, fully paid-up, royalty free, limited license (without the right to sublicense) under any applicable copyrights or, subject to the provisions of subsection 4 below, patent rights it may have covering the Specification to create and/or distribute an Independent Implementation of the Specification that: (a) fully implements the Specification including all its required interfaces and functionality; (b) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include any public or protected packages, classes, Java interfaces, fields or methods within the Licensor Name Space other than those required/authorized by the Specification or Specifications being implemented; and (c) passes the Technology Compatibility Kit (including satisfying the requirements of the applicable TCK Users Guide) for such Specification ("Compliant Implementation"). In addition, the foregoing license is expressly conditioned on your not acting outside its scope.
-No license is granted hereunder for any other purpose (including, for example, modifying the Specification, other than to the extent of your fair use rights, or distributing the Specification to third parties). Also, no right, title, or interest in or to any trademarks, service marks, or trade names of Oracle or Oracle's licensors is granted hereunder. Java, and Java-related logos, marks and names are trademarks or registered trademarks of Oracle in the U.S. and other countries.
-
-
-3. Pass-through Conditions. You need not include limitations (a)-(c) from the previous paragraph or any other particular "pass through" requirements in any license You grant concerning the use of your Independent Implementation or products derived from it. However, except with respect to Independent Implementations (and products derived from them) that satisfy limitations (a)-(c) from the previous paragraph, You may neither: (a) grant or otherwise pass through to your licensees any licenses under Oracle's applicable intellectual property rights; nor (b) authorize your licensees to make any claims concerning their implementation's compliance with the Specification in question.
-
-
-4. Reciprocity Concerning Patent Licenses.
-
-
-a. With respect to any patent claims covered by the license granted under subparagraph 2 above that would be infringed by all technically feasible implementations of the Specification, such license is conditioned upon your offering on fair, reasonable and non-discriminatory terms, to any party seeking it from You, a perpetual, non-exclusive, non-transferable, worldwide license under Your patent rights which are or would be infringed by all technically feasible implementations of the Specification to develop, distribute and use a Compliant Implementation.
-
-
-b With respect to any patent claims owned by Oracle and covered by the license granted under subparagraph 2, whether or not their infringement can be avoided in a technically feasible manner when implementing the Specification, such license shall terminate with respect to such claims if You initiate a claim against Oracle that it has, in the course of performing its responsibilities as the Specification Lead, induced any other entity to infringe Your patent rights.
-
-
-c Also with respect to any patent claims owned by Oracle and covered by the license granted under subparagraph 2 above, where the infringement of such claims can be avoided in a technically feasible manner when implementing the Specification such license, with respect to such claims, shall terminate if You initiate a claim against Oracle that its making, having made, using, offering to sell, selling or importing a Compliant Implementation infringes Your patent rights.
-
-
-5. Definitions. For the purposes of this Agreement: "Independent
-Implementation" shall mean an implementation of the Specification that neither derives from any of Oracle's source code or binary code materials nor, except with an appropriate and separate license from Oracle, includes any of Oracle's source code or binary code materials; "Licensor Name Space" shall mean the public class or interface declarations whose names begin with "java", "javax", "com.sun" or their equivalents in any subsequent naming convention adopted by Oracle through the Java Community Process, or any recognized successors or replacements thereof; and "Technology Compatibility Kit" or "TCK" shall mean the test suite and accompanying TCK User's Guide provided by Oracle which corresponds to the Specification and that was available either (i) from Oracle 120 days before the first release of Your Independent Implementation that allows its use for commercial purposes, or (ii) more recently than 120 days from such release but against which You elect to test Your implementation of the Specification.
-
-
-This Agreement will terminate immediately without notice from Oracle if you breach the Agreement or act outside the scope of the licenses granted above.
-
-
-DISCLAIMER OF WARRANTIES
-
-
-THE SPECIFICATION IS PROVIDED "AS IS". ORACLE MAKES NO REPRESENTATIONS OR
-WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT (INCLUDING AS A CONSEQUENCE OF ANY PRACTICE OR IMPLEMENTATION OF THE SPECIFICATION), OR THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE. This document does not represent any commitment to release or implement any portion of the Specification in any product. In addition, the Specification could include technical inaccuracies or typographical errors.
-
-
-LIMITATION OF LIABILITY
-
-
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED IN ANY WAY TO YOUR HAVING, IMPLEMENTING OR OTHERWISE USING THE SPECIFICATION, EVEN IF ORACLE AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-You will indemnify, hold harmless, and defend Oracle and its licensors from any claims arising or resulting from: (i) your use of the Specification; (ii) the use or distribution of your Java application, applet and/or implementation; and/or (iii) any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
-
-
-RESTRICTED RIGHTS LEGEND
-
-
-U.S. Government: If this Specification is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
-
-
-REPORT
-
-
-If you provide Oracle with any comments or suggestions concerning the Specification ("Feedback"), you hereby: (i) agree that such Feedback is provided on a non-proprietary and non-confidential basis, and (ii) grant Oracle a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the Feedback for any purpose.
-
-
-GENERAL TERMS
-
-
-Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply.
-
-
-The Specification is subject to U.S. export control laws and may be subject to export or import regulations in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges that it has the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to Licensee.
-
-
-This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
-
-
-Rev. November 11, 2010
-
-Oracle/Final/Full
diff --git a/licenses/oracle-java-documentation-9 b/licenses/oracle-java-documentation-9
new file mode 100644
index 000000000000..ae342071a46c
--- /dev/null
+++ b/licenses/oracle-java-documentation-9
@@ -0,0 +1,65 @@
+ORACLE AMERICA, INC. IS WILLING TO LICENSE THIS SPECIFICATION TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS LICENSE AGREEMENT ("AGREEMENT"). PLEASE READ THE TERMS AND CONDITIONS OF THIS AGREEMENT CAREFULLY. BY DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY THEM, SELECT THE "DECLINE" BUTTON AT THE BOTTOM OF THIS PAGE AND THE DOWNLOADING PROCESS WILL NOT CONTINUE.
+
+Specification: JSR-376 Java Platform Module System ("Specification") Version: 9
+
+Status: Final Release
+
+Release: September 2017
+
+Copyright 2017 Oracle America, Inc.
+500 Oracle Parkway, Redwood City, California 94065, U.S.A.
+All rights reserved.
+
+NOTICE
+The Specification is protected by copyright and the information described therein may be protected by one or more U.S. patents, foreign patents, or pending applications. Except as provided under the following license, no part of the Specification may be reproduced in any form by any means without the prior written authorization of Oracle America, Inc. ("Oracle") and its licensors, if any. Any use of the Specification and the information described therein will be governed by the terms and conditions of this Agreement.
+
+Subject to the terms and conditions of this license, including your compliance with Paragraphs 1 and 2 below, Oracle hereby grants you a fully-paid, non-exclusive, non-transferable, limited license (without the right to sublicense) under Oracle's intellectual property rights to:
+
+1.Review the Specification for the purposes of evaluation. This includes: (i) developing implementations of the Specification for your internal, non-commercial use; (ii) discussing the Specification with any third party; and (iii) excerpting brief portions of the Specification in oral or written communications which discuss the Specification provided that such excerpts do not in the aggregate constitute a significant portion of the Technology.
+
+2.Distribute implementations of the Specification to third parties for their testing and evaluation use, provided that any such implementation:
+(i) does not modify, subset, superset or otherwise extend the Licensor Name Space, or include any public or protected packages, classes, Java interfaces, fields or methods within the Licensor Name Space other than those required/authorized by the Specification or Specifications being implemented;
+(ii) is clearly and prominently marked with the word "UNTESTED" or "EARLY ACCESS" or "INCOMPATIBLE" or "UNSTABLE" or "BETA" in any list of available builds and in proximity to every link initiating its download, where the list or link is under Licensee's control; and
+(iii) includes the following notice:
+"This is an implementation of an early-draft specification developed under the Java Community Process (JCP) and is made available for testing and evaluation purposes only. The code is not compatible with any specification of the JCP."
+
+The grant set forth above concerning your distribution of implementations of the specification is contingent upon your agreement to terminate development and distribution of your "early draft" implementation as soon as feasible following final completion of the specification. If you fail to do so, the foregoing grant shall be considered null and void.
+
+No provision of this Agreement shall be understood to restrict your ability to make and distribute to third parties applications written to the Specification.
+Other than this limited license, you acquire no right, title or interest in or to the Specification or any other Oracle intellectual property, and the Specification may only be used in accordance with the license terms set forth herein. This license will expire on the earlier of: (a) two (2) years from the date of Release listed above; (b) the date on which the final version of the Specification is publicly released; or (c) the date on which the Java Specification Request (JSR) to which the Specification corresponds is withdrawn. In addition, this license will terminate immediately without notice from Oracle if you fail to comply with any provision of this license. Upon termination, you must cease use of or destroy the Specification.
+
+"Licensor Name Space" means the public class or interface declarations whose names begin with "java", "javax", "com.oracle" or their equivalents in any subsequent naming convention adopted by Oracle through the Java Community Process, or any recognized successors or replacements thereof
+TRADEMARKS
+
+No right, title, or interest in or to any trademarks, service marks, or trade names of Oracle or Oracle's licensors is granted here under. Oracle, the Oracle logo, and Java are trademarks or registered trademarks of Oracle America, Inc. in the U.S. and other countries.
+
+DISCLAIMER OF WARRANTIES
+
+THE SPECIFICATION IS PROVIDED "AS IS" AND IS EXPERIMENTAL AND MAY CONTAIN DEFECTS OR DEFICIENCIES WHICH CANNOT OR WILL NOT BE CORRECTED BY ORACLE. ORACLE MAKES NO REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT THAT THE CONTENTS OF THE SPECIFICATION ARE SUITABLE FOR ANY PURPOSE OR THAT ANY PRACTICE OR IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADE SECRETS OR OTHER RIGHTS.
+
+This document does not represent any commitment to release or implement any portion of the Specification in any product.
+
+THE SPECIFICATION COULD INCLUDE TECHNICAL INACCURACIES OR TYPOGRAPHICAL ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE INFORMATION THEREIN; THESE CHANGES WILL BE INCORPORATED INTO NEW VERSIONS OF THE SPECIFICATION, IF ANY. ORACLE MAY MAKE IMPROVEMENTS AND/OR CHANGES TO THE PRODUCT(S) AND/OR THE PROGRAM(S) DESCRIBED IN THE SPECIFICATION AT ANY TIME. Any use of such changes in the Specification will be governed by the then-current license for the applicable version of the Specification.
+
+LIMITATION OF LIABILITY
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY DAMAGES, INCLUDING WITHOUT LIMITATION, LOST REVENUE, PROFITS OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO ANY FURNISHING, PRACTICING,
+
+MODIFYING OR ANY USE OF THE SPECIFICATION, EVEN IF ORACLE AND/OR ITS LICENSORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+You will hold Oracle (and its licensors) harmless from any claims based on your use of the Specification for any purposes other than the limited right of evaluation as described above, and from any claims that later versions or releases of any Specification furnished to you are incompatible with the Specification provided to you under this license.
+
+
+RESTRICTED RIGHTS LEGEND
+
+If this Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in the Software and accompanying documentation shall be only as set forth in this license; this is in accordance with 48 C.F.R. 227.7201 through 227.7202-4 (for Department of Defense (DoD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 (for non-DoD acquisitions).
+REPORT
+
+You may wish to report any ambiguities, inconsistencies or inaccuracies you may find in connection with your evaluation of the Specification ("Feedback"). To the extent that you provide Oracle with any Feedback, you hereby: (i) agree that such Feedback is provided on a non-proprietary and non- confidential basis, and (ii) grant Oracle a perpetual, non-exclusive, worldwide, fully paid-up, irrevocable license, with the right to sublicense through multiple levels of sublicensees, to incorporate, disclose, and use without limitation the Feedback for any purpose related to the Specification and future versions, implementations, and test suites thereof.
+
+GENERAL TERMS
+Any action related to this Agreement will be governed by California law and controlling U.S. federal law. The U.N. Convention for the International Sale of Goods and the choice of law rules of any jurisdiction will not apply.
+
+The Specification is subject to U.S. export control laws and may be subject to export or import regulations in other countries. Licensee agrees to comply strictly with all such laws and regulations and acknowledges that it has the responsibility to obtain such licenses to export, re-export or import as may be required after delivery to Licensee.
+
+This Agreement is the parties' entire agreement relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, conditions, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification to this Agreement will be binding, unless in writing and signed by an authorized representative of each party.
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
index da388e5fba70..ab982d2d5c5d 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
index 0fbeb31e7019..c9932b271a3b 100644
--- a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/12" # based on SONAME
-KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="static-libs"
DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index e37a7345f309..64ff7f68785a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,4 +1,3 @@
-DIST mesa-17.0.6.tar.xz 9494872 BLAKE2B 1e83b0d40bb911c26880f25b281ba6e065dbf47555812c53e7d6fbccbc36a11a80531b8887eef6fbcb58e91d1eb5425151fdc03588d4ea36c2f268e5a6fcb604 SHA512 537d28aa694c2d48811d2467e33b3adc841067d5f1cdb7e0809ba100f71869090285bbb246e57e5f0177401a539b44cc32b1ccfcb32a1855c14b011b92d32eaf
DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b
DIST mesa-17.2.6.tar.xz 10387604 BLAKE2B 43bd60f9e61bb04e3a2afe4bc6e18099a524cdec3c7948d9ccfffa5bfe50eb3e0625ba6da7bb3b32959ef4a5e3db982daf2f90d3ee555cf65084d70849b3ca12 SHA512 739645d963da2ff79fa0f2bfcc4948516c4f0a768f9d21f98eff049edc88218847afd3786003ccf7b10deec585f4f1d7f70fcc5e5f6e33186ebbb86cd8cb0202
-DIST mesa-17.3.0-rc5.tar.xz 10663464 BLAKE2B 0706e3175358f43ce70707e9f18c22df60c387d1260c4dfae13a55f9278a266d9885483c6e794d913c8ad5f4b9dd3d852f309e0ef3f042b9ae62b371d9dfba84 SHA512 b53e40f39850067e97dcf9d1eb10d1f5d3a8729933057bacf3648b86ef55c43d7b2f2f5444ae8c6f1b8677c2c3fd12f7484ee08139bd388dc4cebd8dbaf28c83
+DIST mesa-17.3.0.tar.xz 10667896 BLAKE2B 4786f1ac3fa2d2f07895c829f2c0770861d64f606d72635eb206cb9f0a1e84c061950fbf33b2c7b27055399da43d705ed9abd5d8f46c7bb3e3d9a6497f4bd71d SHA512 b0a616ce9a534a19c42eb0a626a178c6a7171aae1989351ea7c2a9e775a7478758b805dbfb754056720b1ef0454c3d3beb64aa59543be27f249ce97efae8e47e
diff --git a/media-libs/mesa/mesa-17.0.6.ebuild b/media-libs/mesa/mesa-17.0.6.ebuild
deleted file mode 100644
index 3b5142a6ccf8..000000000000
--- a/media-libs/mesa/mesa-17.0.6.ebuild
+++ /dev/null
@@ -1,513 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git"
-
-if [[ ${PV} = 9999 ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ $PV == 9999 ]]; then
- SRC_URI=""
-else
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau
- vulkan wayland xvmc xa"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
- video_cards_radeonsi? ( llvm ) )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_imx? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.74"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- vulkan? (
- || (
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] ) )
- )
- video_cards_r600? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_radeon? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- || (
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
- )
- <sys-devel/llvm-5:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? (
- >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}]
- video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
-# LLVM < 3.9 is out of the game
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- llvm? (
- video_cards_radeonsi? ( || (
- sys-devel/llvm[llvm_targets_AMDGPU]
- sys-devel/llvm[video_cards_radeon]
- ) )
- )
- opencl? (
- || (
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.6.0:0[${MULTILIB_USEDEP}]
- )
- || (
- sys-devel/clang:4[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.6.0:0[${MULTILIB_USEDEP}]
- )
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- valgrind? ( dev-util/valgrind )
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == 9999 ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- if use llvm || use opencl; then
- LLVM_MAX_SLOT=4 llvm_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- [[ ${PV} == 9999 ]] && eautoreconf
-
- eapply_user
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+=" --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_imx imx
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_radeonsi radeon
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if [[ ${ABI} == x86 ]]; then
- myconf+=" $(use_enable pax_kernel glx-read-only-text)"
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- if use gallium; then
- myconf+=" $(use_enable osmesa gallium-osmesa)"
- else
- myconf+=" $(use_enable osmesa)"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- --enable-valgrind=$(usex valgrind auto no) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- --with-vulkan-drivers=${VULKAN_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-vulkan_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- VULKAN_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- VULKAN_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-17.3.0_rc5.ebuild b/media-libs/mesa/mesa-17.3.0.ebuild
index 14e934a13216..14e934a13216 100644
--- a/media-libs/mesa/mesa-17.3.0_rc5.ebuild
+++ b/media-libs/mesa/mesa-17.3.0.ebuild
diff --git a/media-libs/openexr/openexr-2.2.0-r2.ebuild b/media-libs/openexr/openexr-2.2.0-r2.ebuild
index 91e85f36c2b7..039e62091ea2 100644
--- a/media-libs/openexr/openexr-2.2.0-r2.ebuild
+++ b/media-libs/openexr/openexr-2.2.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/22" # based on SONAME
-KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="cpu_flags_x86_avx examples static-libs"
RDEPEND="
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index a8356e041b0d..2e0be280389d 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,4 +1,4 @@
-DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 SHA256 8c97a95ade46ce9f8e2bbe565cd2e79396ed31fc4f0646a907a6f3e028db887d SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb WHIRLPOOL db9d74ce31d57704184e6a00b18b3cc417cdffeb6e582d0c41ddc0ba5c822fa4dfebad9d9cf151ebecc46d3b3892714e0fec91ced356d57f3c51dd94a8cce370
+DIST spotify-client_1.0.64.407.g9bd02c2d-26_amd64.deb 93425432 BLAKE2B ffa3e929fbbded412fca680708c15ed0ab5a4358e713fa70932788bc4780cb7a291f6f176abfb6a219b98b311be48b687d423df7046e5328e06c4348fc86bebe SHA512 78352ed0cd116b8ef8c2b9ffc3c186d2fecd3dd5f49f0f732ccf0a3a796b72faf60cd4997355bb4f34f450f8af0b7684e28e8e21a14b7902cba2ea49fe4a81eb
DIST spotify-client_1.0.64.407.g9bd02c2d-26_i386.deb 97705428 SHA256 0e32bc8b21d591f8def932403b8ef3632e95eba4b5628506dfdf6d521dce7941 SHA512 43342faf26b7530dbb3fecafebcb7dac6ed6b7323c845f373bb63760ab309f4f01c6f4dd1cb4ab1bfd9a97b383fb863ba5f2aa7e73d32d1575bf8964dcdf30a5 WHIRLPOOL f3c42136e0682bddaec17829a05a9237d95b6d8f79b9ed27e2cdd77d011ea015fb4532d5f5878c03e15661207779a65e7e228a46821c13899b17513f12612863
DIST spotify-client_1.0.67.582.g19436fa3-28_amd64.deb 90723508 BLAKE2B 9551bcaae09895fd73b35b2e95a0dd4fff64e0cd70af9bd88fcf1a288f79195f99dae89852164fe66e6aebc6efb45ea6b258457e39727c0f6081cf68ff95cc42 SHA512 f9db71c5bce18fc4e2121316e1f229f06ca5510211698f79f75b5ff6b297d9603ff50810bf2b7dae38d8625ed9c5a09c17549d6989eaef1ebe1f856e63858b3c
DIST spotify-client_1.0.67.582.g19436fa3-28_i386.deb 95004956 BLAKE2B 751e14573f5dd7aac7134545f147da293b1051dbcb37c055ad18224e5df4c155ba7142997ed77e5f90940850982e4a7162b66aa621ea5133d782b12e5cb9fb3a SHA512 7fcfb0b39bdbe1427c35c56f78cc5129d07630863553c025505a5bbe9c216f4dd8af123512e9853c75f9791b0a0a819e076d95a20788cd759ea8033b485b47e3
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
index b5a666c3046d..040a329e40be 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac kate nls +ogg123 speex"
RDEPEND=">=media-libs/libvorbis-1.3.0
diff --git a/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..fa3472999ef4
--- /dev/null
+++ b/net-dns/ldns-utils/ldns-utils-1.7.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=${P/-utils}
+
+DESCRIPTION="Set of utilities to simplify various dns(sec) tasks"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/ldns/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+dane ecdsa examples gost ssl"
+
+DEPEND=">=net-libs/ldns-${PV}[dane?,ecdsa?,gost?]
+ examples? ( net-libs/libpcap )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ cd "${S}"/drill
+ econf $(use_with ssl)
+
+ if use examples; then
+ cd "${S}"/examples
+ econf \
+ $(use_enable dane) \
+ $(use_enable ecdsa) \
+ $(use_enable gost) \
+ $(use_enable ssl sha2) \
+ $(use_with ssl)
+ fi
+}
+
+src_compile() {
+ emake -C drill
+ if use examples; then
+ emake -C examples
+ fi
+}
+
+src_install() {
+ cd "${S}"/drill
+ emake DESTDIR="${D}" install
+ dodoc ChangeLog.22-nov-2005 README REGRESSIONS
+
+ if use examples; then
+ cd "${S}"/examples
+ emake DESTDIR="${D}" install
+ newdoc README README.examples
+ fi
+}
diff --git a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
index c9dd8f8091fe..21ac82a52ad2 100644
--- a/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-5.3.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fwbuilder/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
IUSE=""
DEPEND="
diff --git a/net-libs/ldns/ldns-1.7.0-r2.ebuild b/net-libs/ldns/ldns-1.7.0-r2.ebuild
new file mode 100644
index 000000000000..054d81a0e12d
--- /dev/null
+++ b/net-libs/ldns/ldns-1.7.0-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib-minimal python-single-r1
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/"
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+dane doc +ecdsa gost libressl python ssl static-libs vim-syntax"
+
+# configure will die if ecdsa is enabled and ssl is not
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ python? ( ${PYTHON_DEPS} )
+ ecdsa? (
+ !libressl? ( >=dev-libs/openssl-1.0.1e:0[-bindist,${MULTILIB_USEDEP}] )
+ )
+ !libressl? ( >=dev-libs/openssl-1.0.1e:0[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ python? ( dev-lang/swig )
+ doc? ( app-doc/doxygen )
+"
+
+RESTRICT="test" # 1.6.9 has no test directory
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/ldns-config
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable gost) \
+ $(use_enable ecdsa) \
+ $(use_enable dane) \
+ $(multilib_native_use_with python pyldns) \
+ $(multilib_native_use_with python pyldnsx) \
+ --with-ssl="${EPREFIX}"/usr \
+ --enable-sha2 \
+ --without-drill \
+ --without-examples \
+ --disable-dane-ta-usage \
+ --disable-rpath
+
+ # >=openssl-1.1.0 required for dane-ta
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-CVE-2017-1000231.patch"
+ epatch "${FILESDIR}/${P}-CVE-2017-1000232.patch"
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use doc ; then
+ emake doxygen
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use doc ; then
+ dohtml -r doc/html/.
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc Changelog README*
+
+ prune_libtool_files --modules
+ use python && python_optimize
+
+ if use vim-syntax ; then
+ insinto /usr/share/vim/vimfiles/ftdetect
+ doins libdns.vim
+ fi
+
+ einfo
+ elog "Install net-dns/ldns-utils if you want drill and examples"
+ einfo
+}
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
new file mode 100644
index 000000000000..0cc9b8256dd2
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433-fixup.patch
@@ -0,0 +1,33 @@
+From: Wayne Davison <wayned@samba.org>
+Date: Sun, 3 Dec 2017 23:49:56 +0000 (-0800)
+Subject: Fix issue with earlier path-check (fixes "make check")
+X-Git-Url: https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=f5e8a17e093065fb20fea00a29540fe2c7896441;hp=5509597decdbd7b91994210f700329d8a35e70a1
+
+Fix issue with earlier path-check (fixes "make check")
+---
+
+diff --git a/receiver.c b/receiver.c
+index 9c46242..75cb00d 100644
+--- a/receiver.c
++++ b/receiver.c
+@@ -574,15 +574,15 @@ int recv_files(int f_in, int f_out, char *local_name)
+ file = dir_flist->files[cur_flist->parent_ndx];
+ fname = local_name ? local_name : f_name(file, fbuf);
+
+- if (daemon_filter_list.head
+- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
++ if (DEBUG_GTE(RECV, 1))
++ rprintf(FINFO, "recv_files(%s)\n", fname);
++
++ if (daemon_filter_list.head && (*fname != '.' || fname[1] != '\0')
++ && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
+ rprintf(FERROR, "attempt to hack rsync failed.\n");
+ exit_cleanup(RERR_PROTOCOL);
+ }
+
+- if (DEBUG_GTE(RECV, 1))
+- rprintf(FINFO, "recv_files(%s)\n", fname);
+-
+ #ifdef SUPPORT_XATTRS
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers
+ && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE)))
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
new file mode 100644
index 000000000000..0ab8de1fce3b
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17433.patch
@@ -0,0 +1,39 @@
+From 3e06d40029cfdce9d0f73d87cfd4edaf54be9c51 Mon Sep 17 00:00:00 2001
+From: Jeriko One <jeriko.one@gmx.us>
+Date: Thu, 2 Nov 2017 23:44:19 -0700
+Subject: [PATCH] Check fname in recv_files sooner.
+
+---
+ receiver.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+Index: rsync-3.1.2/receiver.c
+===================================================================
+--- rsync-3.1.2.orig/receiver.c
++++ rsync-3.1.2/receiver.c
+@@ -580,6 +580,12 @@ int recv_files(int f_in, int f_out, char
+ file = dir_flist->files[cur_flist->parent_ndx];
+ fname = local_name ? local_name : f_name(file, fbuf);
+
++ if (daemon_filter_list.head
++ && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
++ rprintf(FERROR, "attempt to hack rsync failed.\n");
++ exit_cleanup(RERR_PROTOCOL);
++ }
++
+ if (DEBUG_GTE(RECV, 1))
+ rprintf(FINFO, "recv_files(%s)\n", fname);
+
+@@ -651,12 +657,6 @@ int recv_files(int f_in, int f_out, char
+
+ cleanup_got_literal = 0;
+
+- if (daemon_filter_list.head
+- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0) {
+- rprintf(FERROR, "attempt to hack rsync failed.\n");
+- exit_cleanup(RERR_PROTOCOL);
+- }
+-
+ if (read_batch) {
+ int wanted = redoing
+ ? we_want_redo(ndx)
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
new file mode 100644
index 000000000000..aeb8c2ee33cb
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part1.patch
@@ -0,0 +1,22 @@
+From 5509597decdbd7b91994210f700329d8a35e70a1 Mon Sep 17 00:00:00 2001
+From: Jeriko One <jeriko.one@gmx.us>
+Date: Thu, 16 Nov 2017 17:26:03 -0800
+Subject: [PATCH] Check daemon filter against fnamecmp in recv_files().
+
+---
+ receiver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: rsync-3.1.2/receiver.c
+===================================================================
+--- rsync-3.1.2.orig/receiver.c
++++ rsync-3.1.2/receiver.c
+@@ -728,7 +728,7 @@ int recv_files(int f_in, int f_out, char
+ break;
+ }
+ if (!fnamecmp || (daemon_filter_list.head
+- && check_filter(&daemon_filter_list, FLOG, fname, 0) < 0)) {
++ && check_filter(&daemon_filter_list, FLOG, fnamecmp, 0) < 0)) {
+ fnamecmp = fname;
+ fnamecmp_type = FNAMECMP_FNAME;
+ }
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
new file mode 100644
index 000000000000..5b94efa0c1a8
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-17434-part2.patch
@@ -0,0 +1,33 @@
+From 70aeb5fddd1b2f8e143276f8d5a085db16c593b9 Mon Sep 17 00:00:00 2001
+From: Jeriko One <jeriko.one@gmx.us>
+Date: Thu, 16 Nov 2017 17:05:42 -0800
+Subject: [PATCH] Sanitize xname in read_ndx_and_attrs.
+
+---
+ rsync.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: rsync-3.1.2/rsync.c
+===================================================================
+--- rsync-3.1.2.orig/rsync.c
++++ rsync-3.1.2/rsync.c
+@@ -50,6 +50,7 @@ extern int flist_eof;
+ extern int file_old_total;
+ extern int keep_dirlinks;
+ extern int make_backups;
++extern int sanitize_paths;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+ extern struct chmod_mode_struct *daemon_chmod_modes;
+ #ifdef ICONV_OPTION
+@@ -397,6 +398,11 @@ int read_ndx_and_attrs(int f_in, int f_o
+ if (iflags & ITEM_XNAME_FOLLOWS) {
+ if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
+ exit_cleanup(RERR_PROTOCOL);
++
++ if (sanitize_paths) {
++ sanitize_path(buf, buf, "", 0, SP_DEFAULT);
++ len = strlen(buf);
++ }
+ } else {
+ *buf = '\0';
+ len = -1;
diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.2-r2.ebuild
new file mode 100644
index 000000000000..d91316b29b77
--- /dev/null
+++ b/net-misc/rsync/rsync-3.1.2-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_pre ]] ; then
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="acl examples iconv ipv6 static stunnel xattr"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+ xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+ >=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433.patch
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part1.patch
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17434-part2.patch
+ "${FILESDIR}"/${PN}-3.1.2-CVE-2017-17433-fixup.patch
+)
+
+S=${WORKDIR}/${P/_/}
+
+src_configure() {
+ use static && append-ldflags -static
+ econf \
+ --without-included-popt \
+ $(use_enable acl acl-support) \
+ $(use_enable xattr xattr-support) \
+ $(use_enable ipv6) \
+ $(use_enable iconv) \
+ --with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+ touch proto.h-tstamp #421625
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+ newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+ dodoc NEWS OLDNEWS README TODO tech_report.tex
+ insinto /etc
+ newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+ # Install stunnel helpers
+ if use stunnel ; then
+ emake DESTDIR="${D}" install-ssl-client
+ emake DESTDIR="${D}" install-ssl-daemon
+ fi
+
+ # Install the useful contrib scripts
+ if use examples ; then
+ exeinto /usr/share/rsync
+ doexe support/*
+ rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+ fi
+
+ eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+ systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+ if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+ "${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+ ewarn "You have disabled chroot support in your rsyncd.conf. This"
+ ewarn "is a security risk which you should fix. Please check your"
+ ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+ fi
+ if use stunnel ; then
+ einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+ einfo
+ einfo "You maybe have to update the certificates configured in"
+ einfo "${EROOT}/etc/stunnel/rsync.conf"
+ fi
+}
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index b257ae14c4fe..da2e709730f9 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -12,6 +12,9 @@ sys-fs/udev
# Working on it, bug #470884
dev-libs/elfutils
+# packages that unconditionally depend on dev-libs/elfutils
+<net-firewall/fwbuilder-5.3.7
+
# These binary pkgs have a hard dep on glibc; make repoman shut up
app-arch/rar
dev-games/gtkradiant
diff --git a/profiles/hardened/linux/musl/package.mask b/profiles/hardened/linux/musl/package.mask
index 0a53545f7613..c4367eb84875 100644
--- a/profiles/hardened/linux/musl/package.mask
+++ b/profiles/hardened/linux/musl/package.mask
@@ -11,9 +11,13 @@ sys-libs/glibc
# We use eudev which is tested on both uclibc and musl
sys-apps/systemd
sys-fs/udev
-#
+
+# dev-libs/elfutils needs a port to musl, bug #602126
dev-libs/elfutils
+# packages that unconditionally depend on dev-libs/elfutils
+<net-firewall/fwbuilder-5.3.7
+
# packages that need masked packages or multilib
dev-games/gtkradiant
dev-games/ps2-packer
diff --git a/sci-libs/mkl/Manifest b/sci-libs/mkl/Manifest
index 4f160bc69e22..015a339f3b95 100644
--- a/sci-libs/mkl/Manifest
+++ b/sci-libs/mkl/Manifest
@@ -1 +1 @@
-DIST l_mkl_p_10.0.5.025.tgz 230389719 SHA256 c98f2c5c652c02ac7200cba40d996b1f11b567278d849016b7ee3b0320e26e3c SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84 WHIRLPOOL 6c96123254aebd897e061ee971f487bd5d51586e74572da18bb5461ab8f7fb2cbb34e5f782c11712a7ece8b58b348554c07a68dd91ff5fc9771894e3aef04352
+DIST l_mkl_p_10.0.5.025.tgz 230389719 BLAKE2B 622dd0076c8e6d747f170685b6a378db95aa2453d15a53c93ef863729bb8dc76409d7bf72f8bab8ef9a07d8efe1e448cb9e7fc8e6f0c0b2cbbf0a0f6944e2a86 SHA512 621c3bfdecb57313e375424e391c0630a29efd70196e3e4bfc5b4ddd03aa45fda4761523652d875f2e60d466a0010c06659306b11f20966fba4943c308fa6f84
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index d137c15e5274..bc82d2ddcdb2 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -93,7 +93,7 @@ multilib_layout() {
case ${CHOST} in
*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
i?86*|x86_64*|powerpc*|sparc*|s390*)
- if [ -d "${prefix}lib32" ] ; then
+ if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
rm -f "${prefix}lib32"/.keep
if ! rmdir "${prefix}lib32" 2>/dev/null ; then
ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 7e43ea7af598..a7d95e53ed43 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -111,7 +111,7 @@ multilib_layout() {
case ${CHOST} in
*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
i?86*|x86_64*|powerpc*|sparc*|s390*)
- if [ -d "${prefix}lib32" ] ; then
+ if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
rm -f "${prefix}lib32"/.keep
if ! rmdir "${prefix}lib32" 2>/dev/null ; then
ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index e3fb5774c229..73606f490f20 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,5 +1,5 @@
DIST c-dvar-7706828ecda2d8c508d6fc233dc9d198bab482ad.tar.gz 28454 BLAKE2B e109755fc3392f1c91820606af81852464a45b32ef43a9bce6fe32095f463336df8c5fe2410573830a1ac368d99d7e3da4cedb7e5ec89761459a5c6b9f54af11 SHA512 b6d69b11b3e47e8538c8eab04780966480db3881bf642f732b883f0b995ba374382fff54abe81eabe377d029445cc4af5bf52c8740282b0c03b959d8d5ae944d
-DIST c-list-9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574.tar.gz 20459 BLAKE2B d2d884a1eb865fc929bf1a17c8f898ff04295ed627617cef4e1ce943525805eadda5e5940fbc6158a0576800f1fbffb27193eb2dbff5ca78c112fa10199662b6 SHA512 d45630c8a54ca9145862b673afc3a15a19d330f46c9a1eb451c2282c2701d596cead45e6bb57a9e32aab344a3732f70ff8fe27d13065ebd8b402dd37a252ad05
-DIST c-rbtree-6181232360c9b517a6af3d82ebdbdce5fe36933a.tar.gz 24927 BLAKE2B 89b0cbf67d83bc40aa8300366a93d2b410678a5b6152ba781151a08676c9f404de6209c26d7486d5e3503682e7dc215db1dcb6c5c1fc6b51d90e2798924d6c8c SHA512 4ff8d8def07882850b1983f8eb9b4c82e444429beafbf249385717805a5a89427bb91bde6dcfb60565866f90ee3daa8d35e681ab65cb0a1f20dcb96dcd9e0756
+DIST c-list-72c59181d677a3f50b201d51f190b1bff02d4279.tar.gz 20474 BLAKE2B e1459b064cf0bfd7656338b03f2f591b56308bab8541f72be0822a7849630d05d11c5f9df31753ae9cb6ca25389eef1e24a2e50791c81faea1d6e487bd06a46e SHA512 9f271160d1f3e40128ba158409730216c829060fa9f9844e7243826fd0219c3f678980eed5b8e15e13d65c6408b959bd47e07197791e06d03f6864fe9a9cf359
+DIST c-rbtree-825f626a16257c5f0b0c523c11ce1bca16851180.tar.gz 27988 BLAKE2B 9a6b47cee256e96c3cd7db1e3de684b7628427e90f3000cb69f7d177085322e37d8636b3d14d659c3619316e248ec9e970466b066491483c2e8787d1d8942d04 SHA512 649aff910fb38b49462f794fd908d6d6071c9b064ed8445255d674df2184277bd54ff04c2c1789b61585f377aa1fd611c4e241b5104641d60ae5ec803d675894
DIST c-sundry-50c8ccf01b39b3f11e59c69d1cafea5bef5a9769.tar.gz 26702 BLAKE2B c67af60b180b80c358c94d43961423cd18b147ec98dd71fa9e858ae6b67ad29d1d1484816be9eff1ce5c7193aa22b7b754f4cc535888c2a62b88ea43155f71c6 SHA512 44fccf4509ad752f7ef8aef7e1afd62eb51660f2daba42f0ad8b1711a62ec53aa2bde78b895fbdd939ba9a1ba1fc06621c2506eb068948da4d6e7192cb8df29e
-DIST dbus-broker-8.tar.gz 153824 BLAKE2B c8bee2d3fbbb09842a70d69a1e5944318f36bdefcd0d8c79bd2291f7a170e7e864c434e94232339d039492c1142b54e7f1f9397f138c0655594794672bac7760 SHA512 423d78569ce23c04bdc6639f3a3e554ffaec32f9c81076edefc84cb691b10a096a177edc677aed8b136709ffafe611a53b5e34f7cd5ee2147b0500fba81b5221
+DIST dbus-broker-9.tar.gz 155810 BLAKE2B ebb64f35303de988ea081b6dc9186a53317c5e610ca826afc4243191148f6d8d7038d6aa6f94bdd7b5225ebd2f2d93394d467605e5f878617becfd487ad0dfb6 SHA512 4eed5dede2ba6d45b883b1a484d59b774655063334611413e165558cb1e2efb21a5e17a182e836ae43cbfbfd366737c709d53ed0b9ec29ba3a9cd3718b29ec40
diff --git a/sys-apps/dbus-broker/dbus-broker-8.ebuild b/sys-apps/dbus-broker/dbus-broker-9.ebuild
index ba718173881c..62c8053832d1 100644
--- a/sys-apps/dbus-broker/dbus-broker-8.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9.ebuild
@@ -10,8 +10,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
else
dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
- list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574
- rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a
+ list=72c59181d677a3f50b201d51f190b1bff02d4279
+ rbtree=825f626a16257c5f0b0c523c11ce1bca16851180
sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
@@ -27,8 +27,7 @@ HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="audit +launcher selinux test"
-RESTRICT="!test? ( test )"
+IUSE="audit +launcher selinux"
RDEPEND="
audit? ( sys-process/audit )
@@ -42,7 +41,6 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-python/docutils
virtual/pkgconfig
- test? ( >=sys-apps/dbus-1.10 )
"
src_prepare() {
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index ba718173881c..62c8053832d1 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -10,8 +10,8 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
else
dvar=7706828ecda2d8c508d6fc233dc9d198bab482ad
- list=9e50b8b08e0b0b75e1c651d5aa4e3cf94368a574
- rbtree=6181232360c9b517a6af3d82ebdbdce5fe36933a
+ list=72c59181d677a3f50b201d51f190b1bff02d4279
+ rbtree=825f626a16257c5f0b0c523c11ce1bca16851180
sundry=50c8ccf01b39b3f11e59c69d1cafea5bef5a9769
SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://github.com/c-util/c-dvar/archive/${dvar}.tar.gz -> c-dvar-${dvar}.tar.gz
@@ -27,8 +27,7 @@ HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="audit +launcher selinux test"
-RESTRICT="!test? ( test )"
+IUSE="audit +launcher selinux"
RDEPEND="
audit? ( sys-process/audit )
@@ -42,7 +41,6 @@ RDEPEND="
DEPEND="${RDEPEND}
dev-python/docutils
virtual/pkgconfig
- test? ( >=sys-apps/dbus-1.10 )
"
src_prepare() {
diff --git a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
index e0476f1e13ac..5f4ca143355a 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
fi
DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/www-client/chromium/chromium-63.0.3239.84.ebuild b/www-client/chromium/chromium-63.0.3239.84.ebuild
index 71a061010b7a..a23443e9896f 100644
--- a/www-client/chromium/chromium-63.0.3239.84.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.84.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"