From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Sep 2018 11:19:18 +0100 Subject: gentoo resync : 30.09.2018 --- profiles/Manifest.gz | Bin 186626 -> 186308 bytes profiles/arch/alpha/package.use.force | 4 - profiles/arch/amd64/package.use.stable.mask | 6 +- profiles/arch/arm/package.use.stable.mask | 2 +- profiles/arch/arm/use.stable.mask | 4 - profiles/arch/arm64/package.use.force | 4 - profiles/arch/arm64/package.use.mask | 9 +- profiles/arch/hppa/package.use.force | 6 -- profiles/arch/ia64/package.use.force | 4 - profiles/arch/m68k/package.use.force | 4 - profiles/arch/mips/package.use.force | 4 - profiles/arch/mips/use.mask | 8 -- profiles/arch/powerpc/package.use.force | 4 - profiles/arch/s390/package.use.force | 4 - profiles/arch/sh/package.use.force | 6 -- profiles/arch/sparc/package.use.force | 4 - profiles/arch/sparc/package.use.mask | 4 + profiles/arch/x86/package.use.mask | 8 ++ profiles/arch/x86/package.use.stable.mask | 7 +- profiles/base/package.use.force | 5 - profiles/base/package.use.mask | 17 +-- profiles/features/selinux/package.mask | 1 + profiles/hardened/linux/amd64/package.mask | 6 +- profiles/hardened/linux/powerpc/package.mask | 10 +- profiles/hardened/linux/powerpc/package.use.mask | 5 + profiles/hardened/linux/x86/package.mask | 6 +- profiles/package.mask | 130 +++-------------------- profiles/releases/13.0/package.mask | 4 + profiles/use.local.desc | 58 +++++----- 29 files changed, 111 insertions(+), 223 deletions(-) delete mode 100644 profiles/arch/hppa/package.use.force delete mode 100644 profiles/arch/sh/package.use.force (limited to 'profiles') diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz index a9e7f32f5b74..3f79e32c7ecc 100644 Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ diff --git a/profiles/arch/alpha/package.use.force b/profiles/arch/alpha/package.use.force index f386f109f7fb..78a0be60eff0 100644 --- a/profiles/arch/alpha/package.use.force +++ b/profiles/arch/alpha/package.use.force @@ -1,10 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua - # Tobias Klausmann 2014-12-04 # The Firefox/Mozilla build system is broken in regards to linking the shipped # ICU library. Bug 529944 diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index 680d1ab861f8..85ead1a21bea 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -17,8 +17,12 @@ #--- END OF EXAMPLES --- +# Thomas Deutschmann (27 Sep 2018) +# sys-devel/lld is unstable +www-client/firefox clang + # Mikle Kolyada (15 Sep 2018) -# the de[endency is unstable +# the dependency is unstable media-video/libav nvidia # Thomas Deutschmann (01 Jun 2018) diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask index cc8171866a0d..f539a292fd5a 100644 --- a/profiles/arch/arm/package.use.stable.mask +++ b/profiles/arch/arm/package.use.stable.mask @@ -47,7 +47,7 @@ media-sound/mpd fluidsynth # Alexis Ballier (29 May 2017) # frei0r-plugins is not stable yet, mask it on stable versions - (18 Apr 2017) diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask index bc9c137a4408..89f0809db8d7 100644 --- a/profiles/arch/arm/use.stable.mask +++ b/profiles/arch/arm/use.stable.mask @@ -4,10 +4,6 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Brian Evans (14 Aug 2017) -# Needs dev-lang/php:7.2 stable -php_targets_php7-2 - # Mike Gilbert (08 Jun 2017) # dev-lang/python:3.7 is not stable. python_targets_python3_7 diff --git a/profiles/arch/arm64/package.use.force b/profiles/arch/arm64/package.use.force index cadd4e1b4c97..65ff7bc3be78 100644 --- a/profiles/arch/arm64/package.use.force +++ b/profiles/arch/arm64/package.use.force @@ -14,7 +14,3 @@ sys-devel/llvm llvm_targets_AArch64 # For reasons best known to themselves, Oracle do not ship the # libawt_xawt.so library on arm64 even though they do on arm32. dev-java/oracle-jdk-bin headless-awt - -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 643cc53cd616..800fe51e91a6 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -1,6 +1,12 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Dirkjan Ochtman (29 Sep 2018) +# Upstream doesn't build docs for tier 2 and lower architectures. +# Bug #660512. +dev-lang/rust doc +dev-lang/rust-bin doc + # Michał Górny (20 Sep 2018) # dev-libs/libpfm not keyworded here (and unclear if it supports ARM64). # Bug #666651. @@ -8,8 +14,9 @@ sys-devel/llvm exegesis # Virgil Dupras (06 Sep 2018) # sci-electronics/ngspice not yet keyworded, bug #665416 +# sci-libs/opencascade not yet keyworded # sci-libs/oce not yet keyworded -sci-electronics/kicad oce ngspice +sci-electronics/kicad occ oce ngspice # Ulrich Müller (02 Sep 2018) # =media-gfx/imagemagick-6* not keyworded diff --git a/profiles/arch/hppa/package.use.force b/profiles/arch/hppa/package.use.force deleted file mode 100644 index 35f334005f39..000000000000 --- a/profiles/arch/hppa/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua diff --git a/profiles/arch/ia64/package.use.force b/profiles/arch/ia64/package.use.force index d21f658825d4..e56b9ebfa187 100644 --- a/profiles/arch/ia64/package.use.force +++ b/profiles/arch/ia64/package.use.force @@ -1,10 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua - # Raúl Porcel (21 Oct 2007) # It segfaults without debug use-flags # Remove when http://bugs.php.net/bug.php?id=42893 is fixed diff --git a/profiles/arch/m68k/package.use.force b/profiles/arch/m68k/package.use.force index db154e8efd5c..95e99635bb0c 100644 --- a/profiles/arch/m68k/package.use.force +++ b/profiles/arch/m68k/package.use.force @@ -1,10 +1,6 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua - # Ulrich Müller (10 Aug 2013) # Building from source requires TeX Live as dependency app-doc/pms binary diff --git a/profiles/arch/mips/package.use.force b/profiles/arch/mips/package.use.force index 713307fcb402..42de426a5838 100644 --- a/profiles/arch/mips/package.use.force +++ b/profiles/arch/mips/package.use.force @@ -5,7 +5,3 @@ # Force the host target to avoid dependency hell sys-devel/clang llvm_targets_Mips sys-devel/llvm llvm_targets_Mips - -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask index 74d1069dd3fe..23ca48272997 100644 --- a/profiles/arch/mips/use.mask +++ b/profiles/arch/mips/use.mask @@ -4,14 +4,6 @@ # Unmask the flag which corresponds to ARCH. -mips -# Michał Górny (16 Jul 2018) -# Python 3.7 support requires fresh versions of packages which are stuck -# at keywordreqs. -# bug #661306: dev-python/pytest -# bug #661320: dev-python/twisted -python_targets_python3_7 -python_single_target_python3_7 - # Matt Turner (25 Mar 2018) # Unmask systemd since it is keyworded here. -systemd diff --git a/profiles/arch/powerpc/package.use.force b/profiles/arch/powerpc/package.use.force index 447d4135aff6..139a21813030 100644 --- a/profiles/arch/powerpc/package.use.force +++ b/profiles/arch/powerpc/package.use.force @@ -6,10 +6,6 @@ sys-devel/clang llvm_targets_PowerPC sys-devel/llvm llvm_targets_PowerPC -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua - # Kacper Kowalik (16 Jan 2011) # bug 303931 # sci-chemistry/arp-warp-bin is not available for ppc diff --git a/profiles/arch/s390/package.use.force b/profiles/arch/s390/package.use.force index 48d418769933..bb8eae84de63 100644 --- a/profiles/arch/s390/package.use.force +++ b/profiles/arch/s390/package.use.force @@ -1,10 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua - # Mike Frysinger (09 Dec 2016) # The ABI changes when the flag is disabled. Force it for now. # https://gmplib.org/list-archives/gmp-bugs/2016-December/004039.html diff --git a/profiles/arch/sh/package.use.force b/profiles/arch/sh/package.use.force deleted file mode 100644 index 3961c343ce92..000000000000 --- a/profiles/arch/sh/package.use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua diff --git a/profiles/arch/sparc/package.use.force b/profiles/arch/sparc/package.use.force index 26b496cc3225..dbbc84463184 100644 --- a/profiles/arch/sparc/package.use.force +++ b/profiles/arch/sparc/package.use.force @@ -5,7 +5,3 @@ # Force the host target to avoid dependency hell sys-devel/clang llvm_targets_Sparc sys-devel/llvm llvm_targets_Sparc - -# Mike Frysinger (16 Mar 2015) -# Needs dev-lang/luajit tested #499974 -dev-libs/efl oldlua diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask index b1349107c236..2aba42b23ef7 100644 --- a/profiles/arch/sparc/package.use.mask +++ b/profiles/arch/sparc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Sergei Trofimovich (28 Sep 2018) +# mpir fails to build at least on sparc: bug #640424 +dev-python/gmpy mpir + # Sergei Trofimovich (30 Aug 2018) # dev-games/openscenegraph is a heavy unkeyworded dependency. # Skip keywording it for now. diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index b6c69adf7e09..0fbc759c8e5f 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -3,6 +3,14 @@ # This file requires >=portage-2.1.1 +# Tomáš Mózes (28 Sep 2018) +# Requires dev-db/mongodb which has dropped x86 support +dev-python/pymongo test + +# Bernard Cafarelli (27 Sep 2018) +# media-libs/qtav not keyworded +media-video/orion qtav + # Virgil Dupras (06 Sep 2018) # sci-libs/oce not yet keyworded sci-electronics/kicad oce diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask index 708da806b6ba..483832a095b7 100644 --- a/profiles/arch/x86/package.use.stable.mask +++ b/profiles/arch/x86/package.use.stable.mask @@ -17,10 +17,9 @@ #--- END OF EXAMPLES --- -# Andreas Sturmlechner (18 Sep 2018) -# >=media-video/libav-12 not stable yet, bug #617508 -media-libs/mlt libav -media-video/vlc libav +# Thomas Deutschmann (27 Sep 2018) +# sys-devel/lld is unstable +www-client/firefox clang # Thomas Deutschmann (01 Jun 2018) net-analyzer/wireshark -doc diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index e437d8d4a1de..a43023cc367c 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -19,11 +19,6 @@ sys-cluster/glusterfs libtirpc # to avoid automagic deps. >=x11-apps/intel-gpu-tools-9999 alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv -# Michał Górny (05 Jun 2017) -# (on behalf of Treecleaner project) -# www-apache/mod_python is masked for removal, force agent-only builds. -net-analyzer/check_mk agent-only - # NP-Hardass (10 Apr 2017) # Always force patch on appropriate variant to ensure # similar experience when using app-emulation/wine-any diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 273a60536a3c..7ebcd86cfe06 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -7,6 +7,17 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Dirkjan Ochtman (29 Sep 2018) +# Clippy is broken for now, can't find libraries (bug 667286) +dev-lang/rust clippy +dev-lang/rust-bin clippy + +# Virgil Dupras (26 Sep 2018) +# Server feature in paramiko is patched out for security reasons. It can +# be re-enabled with the 'server' USE flag, but this flag is hard +# masked. bug #666619 +dev-python/paramiko server + # Andreas Sturmlechner (16 Sep 2018) # media-libs/celt is going away, superseded by opus, bug #664154 media-sound/jack2 celt @@ -170,12 +181,6 @@ sys-boot/refind custom-cflags # Needs patch to even build, subs are broken and not supported anymore. media-video/mpv libav -# Michał Górny (05 Jun 2017) -# (on behalf of Treecleaner project) -# www-apache/mod_python is masked for removal, mask flags that -# require it. -net-analyzer/check_mk livestatus wato - # Andreas K. Hüttel (29 May 2017) # Does not build sci-libs/linux-gpib php diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask index 370aa149e56a..0cd856701fd5 100644 --- a/profiles/features/selinux/package.mask +++ b/profiles/features/selinux/package.mask @@ -45,3 +45,4 @@ sys-apps/dbus-broker >=app-admin/abrt-2.10 app-admin/gnome-abrt >=dev-libs/libreport-2.9 +games-util/gamemode diff --git a/profiles/hardened/linux/amd64/package.mask b/profiles/hardened/linux/amd64/package.mask index 33e09b35488a..d4ef19634383 100644 --- a/profiles/hardened/linux/amd64/package.mask +++ b/profiles/hardened/linux/amd64/package.mask @@ -1,10 +1,6 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Magnus Granberg (20 Nov 2012) -# Need X -media-video/nvidia-settings - # Depends on x11-drivers/nvidia-drivers #dev-python/pyopencl diff --git a/profiles/hardened/linux/powerpc/package.mask b/profiles/hardened/linux/powerpc/package.mask index 21a5ea1f3d4b..4ccfde4f70b3 100644 --- a/profiles/hardened/linux/powerpc/package.mask +++ b/profiles/hardened/linux/powerpc/package.mask @@ -1,7 +1,13 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (29 Sep 2018) +# All nodejs versions with ppc keywords are masked in 13.0 profile. +dev-ruby/coffee-rails +dev-ruby/coffee-script +dev-ruby/execjs +dev-ruby/uglifier + # Wulf C. Krueger (22 Sep 2007) # Needs OOo. app-text/bibus - diff --git a/profiles/hardened/linux/powerpc/package.use.mask b/profiles/hardened/linux/powerpc/package.use.mask index 9b6e65acf510..b61fa6ddef75 100644 --- a/profiles/hardened/linux/powerpc/package.use.mask +++ b/profiles/hardened/linux/powerpc/package.use.mask @@ -1,3 +1,8 @@ +# Michał Górny (29 Sep 2018) +# All nodejs versions with ppc keywords are masked in 13.0 profile. +dev-ruby/rails asset-pipeline +dev-ruby/tilt test + # Diego Pettenò (10 Nov 2007) # Tests for Linux-PAM 0.99 require >=sys-libs/glibc-2.4 >=sys-libs/pam-0.99.8 test diff --git a/profiles/hardened/linux/x86/package.mask b/profiles/hardened/linux/x86/package.mask index 6312ebcd3402..5b60d78864ce 100644 --- a/profiles/hardened/linux/x86/package.mask +++ b/profiles/hardened/linux/x86/package.mask @@ -1,9 +1,5 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# Rick Farina (26 Nov 2012) -# Need X -media-video/nvidia-settings - # Depends on x11-drivers/nvidia-drivers #dev-python/pyopencl diff --git a/profiles/package.mask b/profiles/package.mask index 3bc0f8ccd954..8ffab13352db 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,11 +29,23 @@ #--- END OF EXAMPLES --- -# Ulrich Müller (17 Sep 2018) -# ebuild-mode-1.46 supports GLEP 76 copyright policy, bug 666358. -# Masked for testing until other tools like repoman support it too. -~app-emacs/ebuild-mode-1.46 -~app-xemacs/ebuild-mode-1.46 +# Matt Turner (29 Sep 2018) +# Removal in 30 days, bug #576334 +app-eselect/eselect-mesa + +# Virgil Dupras (27 Sep 2018) +# Outdated, unmaintained, no revdeps. +# Removal in 30 days, bug #623292 +dev-python/tinydb + +# Mike Gilbert (24 Sep 2018) +# Breaks multilib builds. +# https://bugs.gentoo.org/666968 +=dev-util/meson-0.48.0 + +# Michał Górny (24 Sep 2018) +# Apparently breaks sys-devel/gcc. Bug #666954. +=dev-util/debugedit-4.14.2 # Michał Górny (17 Sep 2018) # Obsolete LogiLab packages that are full of issues and were never @@ -88,11 +100,6 @@ dev-lang/solidity =dev-db/postgresql-11_beta2 =dev-db/postgresql-11_beta3 -# Lars Wendler (05 Sep 2018) -# Broken "killall -SIG". Breaks many scripts. -# See https://bugs.gentoo.org/664066 -=sys-process/psmisc-23.2 - # Joerg Bornkessel (02/Sep/2018) # homepage dead # dead on upstream @@ -147,85 +154,11 @@ media-plugins/vdr-autosort ~dev-lang/julia-0.7.0 ~dev-lang/julia-1.0.0 -# Michał Górny (31 Aug 2018) -# (on behalf of QA) -# Major file→dir replacement that is both a PMS violation and leaves -# a lot of unmanaged cruft on the filesystem. Bug #664938. -=media-gfx/gimp-2.10.6 - -# Mikle Kolyada (30 Aug 2018) -# Dead upstream, does not work properly. -# Unmaintained. -# Use sys-boot/woeusb instead. -sys-boot/winusb - # Chí-Thanh Christopher Nguyễn (29 Aug 2018) # Masked for removal in 30 days. Multiple build failures. Upstream inactive. # (bugs #321017, #581284, #588692, #602786, #649006, #654140) www-plugins/gnash -# Virgil Dupras (27 Aug 2018) -# Unmaintained for a long time, outdated, no revdep. Removal in 30 days. -# Bug #626550 -dev-python/scrapy -dev-python/w3lib -dev-python/queuelib - -# James Le Cuirot (26 Aug 2018) -# Unused Java virtual from the days when the JDK was proprietary. Now -# we assume that com.sun is always available. Removal in 30 days. -java-virtuals/jdk-with-com-sun - -# Joerg Bornkessel (26 Aug 2018) -# masked for removal in ~30 Days -# the plugin is written to manage the vdr2gentoo distribution, -# useless in gentoo -# bug 664670 -media-plugins/vdr-admin - -# Joerg Bornkessel (26 Aug 2018) -# masked for removal in ~30 Days -# do not work anymore since paytv provider provider has changed to paytv provider sky -# no converted to gettext handling -# old makefile handling -# dead on upstream since years.. -# bug 664672 -media-plugins/vdr-arghdirector - -# Joerg Bornkessel (26 Aug 2018) -# masked for removal in ~30 Days -# full integrated in core vdr -# dead on upstream thince years -# useless -#bug 664676 -media-plugins/vdr-rotor - -# Joerg Bornkessel (26 Aug 2018) -# masked for removal in ~30 Days -# no converted to gettext handling -# use old makefile handling -# no upstream -# dead since years -# Bug 664678 -media-plugins/vdr-videosystem - -# Michał Górny (26 Aug 2018) -# Live ebuild only. Dependencies can no longer be satisfied by ::gentoo -# packages. Bug #664658. Removal in 30 days. -net-im/hangups - -# Michał Górny (26 Aug 2018) -# mod_python removal caused it to be reduced to agent-only, which is -# apparently redundant to net-analyzer/check_mk_agent. The package -# is unmaintained and potentially vulnerable. Bug #632648. -# Removal in 30 days. -net-analyzer/check_mk - -# Michał Górny (26 Aug 2018) -# Live ebuild only. Dependencies can no longer be satisfied by ::gentoo -# packages. Unmaintained. Bug #659370. Removal in 30 days. -app-crypt/simp_le - # Virgil Dupras (23 Aug 2018) # Vulnerable and can't be removed yet because of alpha. Bug #664346 =dev-libs/openssl-1.1.0 >=net-misc/nextcloud-client-2.5.0_beta1 -# Michael Orlitzky (16 Aug 2018) -# Obsolete! Use net-analyzer/nagios-icinga-openvpn instead. -# Will be removed in 30 days (bug 663774). -net-analyzer/nagios-check_openvpn-simple - # Bernard Cafarelli (13 Aug 2018) # Beta release with new features, masked for testing =app-text/tesseract-4.0.0_beta* @@ -420,13 +348,6 @@ sys-libs/uclibc virtual/jdk:9 virtual/jre:9 -# Patrice Clement (12 Dec 2017) -# Masked due to a hard dependency on an ancient versions of dev-libs/msgpack -# (<0.6) that have been punted from the tree. -# Michał Górny (26 Aug 2018) -# Removal in 30 days. Bug #664662. -net-misc/cocaine-core - # Andreas K. Hüttel (22 Oct 2017) # Broken with recent Perl (5.26) and not used by anything # in the Gentoo repository. Please uninstall. @@ -588,12 +509,6 @@ media-plugins/gst-plugins-ffmpeg # Needs openssl-1.1 >=dev-libs/opencryptoki-3.6 -# Jeroen Roovers (12 Jan 2017) -# Use x11-drivers/nvidia-drivers[tools] instead. -# Michał Górny (26 Aug 2018) -# Removal in 30 days. Bug #664638. -media-video/nvidia-settings - # Michael Orlitzky (07 Jan 2017) # This package has some dangerous quality and security issues, but # people may still find it useful. It is masked to prevent accidental @@ -624,17 +539,6 @@ app-admin/amazon-ec2-init # Masked while being tested and reverse deps aren't fully compatible =dev-libs/openssl-1.1* -# James Le Cuirot (26 Aug 2018) -# Although the Spring Framework is very much alive, our packages are -# ancient and our infrastructure is not ready to update it any time -# soon. If you want this then join the Java team and be prepared to do -# a lot of work. Removal in 30 days. -dev-java/spring-aop -dev-java/spring-beans -dev-java/spring-core -dev-java/spring-expression -dev-java/spring-instrument - # Andreas K. Hüttel (03 Apr 2016) # Can exhaust all available memory depending on task # but is made available for experts who heed this warning diff --git a/profiles/releases/13.0/package.mask b/profiles/releases/13.0/package.mask index eff23bec8066..275165ccf6c2 100644 --- a/profiles/releases/13.0/package.mask +++ b/profiles/releases/13.0/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Tomáš Mózes (17 Sep 2018) +# requires >=nodejs-8 which is not available in 13.0 based profiles. +>=www-apps/kibana-bin-6 + # Mike Gilbert (16 Sep 2018) # requires >=nodejs-7.6.0 which is not available in 13.0 based profiles. >=www-client/chromium-70 diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 0fb0104bdb01..eeee41a2b80d 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -47,7 +47,7 @@ app-admin/conky:math - Enable support for glibc's libm math library app-admin/conky:moc - Enable monitoring of music played by media-sound/moc app-admin/conky:mpd - Enable monitoring of music controlled by media-sound/mpd app-admin/conky:nano-syntax - Enable syntax highlighting for app-editors/nano -app-admin/conky:nvidia - Enable reading of nvidia card temperature sensors via media-video/nvidia-settings +app-admin/conky:nvidia - Enable reading of nvidia card temperature sensors via x11-drivers/nvidia-drivers app-admin/conky:portmon - Enable support for tcp (ip4) port monitoring app-admin/conky:thinkpad - Enable support for IBM/Lenovo notebooks app-admin/conky:weather-metar - Enable support for metar weather service @@ -109,7 +109,6 @@ app-admin/puppet:diff - Enable diff support app-admin/puppet:experimental - Add patches for things in testing app-admin/puppet:rrdtool - Enable rrdtool support app-admin/puppet:shadow - Enable shadow support -app-admin/puppet-agent:experimental - Add patches for things in testing app-admin/puppet-agent:puppetdb - Adds puppetdb support app-admin/puppetserver:puppetdb - Adds support for connecting to puppetdb app-admin/pwgen:livecd - Install init script for root password scrambling on boot @@ -208,6 +207,7 @@ app-antivirus/clamtk:thunar - Install the Thunar plugin. app-arch/cabextract:extras - Install experimental extra tools: wince_info and wince_rename for examining and processing Windows CE installation cabinet header files; cabinfo for examining the structure of a cab file. app-arch/cfv:bittorrent - Enable support for checking .torrent files app-arch/deltarpm:system-zlib - Use system sys-libs/zlib. Do not enable features of rsync friendly. +app-arch/dpkg:libmd - Use app-crypt/libmd library for message digest functions app-arch/dpkg:update-alternatives - Install update-alternatives app-arch/dump:ermt - encrypted rmt support app-arch/dump:uuid - Enable UUID support @@ -2060,12 +2060,14 @@ dev-lang/ruby:rdoc - Install dev-ruby/rdoc after installing Ruby. dev-lang/ruby:readline - Use the sys-libs/readline library to provide the readline extension, used for instance by the irb tool. This flag is meaningful only if the libedit USE flag is disabled. If neither libedit nor readline USE flags are enabled, the readline extension will not be built (and irb will lose line editing functionality). dev-lang/ruby:rubytests - Install ruby tests that can only be run after ruby is installed dev-lang/rust:cargo - Install cargo component +dev-lang/rust:clippy - Install clippy component dev-lang/rust:extended - Build and install rls, rustfmt and cargo alongside the compiler and stdlib dev-lang/rust:jemalloc - Use dev-libs/jemalloc as the standard memory allocator dev-lang/rust:rls - Install rls component dev-lang/rust:rustfmt - Install rustfmt component dev-lang/rust:wasm - Build support for the wasm32-unknown-unknown target dev-lang/rust-bin:cargo - Install cargo component +dev-lang/rust-bin:clippy - Install clippy component dev-lang/rust-bin:rustfmt - Install rustfmt component dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build. dev-lang/smlnj:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel @@ -2462,7 +2464,6 @@ dev-libs/oniguruma:crnl-as-line-terminator - enable CR+NL as line terminator dev-libs/opencryptoki:tpm - Enable support for Trusted Platform Module (TPM) using app-crypt/trousers dev-libs/openct:debug - Add debug output to the driver library for pcsc-lite. dev-libs/openct:pcsc-lite - Build a driver library for sys-apps/pcsc-lite, providing PC/SC API access to devices supported by OpenCT. -dev-libs/openct:udev - Install rules for sys-fs/udev to auto-start openct. dev-libs/openobex:irda - Enable IrDA support dev-libs/opensc:ctapi - Use CT-API for accessing Smartcard hardware dev-libs/opensc:notify - Enable notifications @@ -2495,6 +2496,8 @@ dev-libs/softhsm:migration-tool - Build db migration tool dev-libs/starpu:cuda - Enable NVIDIA CUDA toolkit support dev-libs/starpu:gcc-plugin - Enable GCC extension plugin (experimental) dev-libs/starpu:opencl - Enable OpenCL support +dev-libs/starpu:spinlock-check - Enable spinlock check +dev-libs/starpu:valgrind - Enable dev-util/valgrind support dev-libs/sway:gdk-pixbuf - Enable additional image format support via the x11-libs/gdk-pixbuf library. dev-libs/sway:swaybar - Build 'swaybar': sway's status bar component. dev-libs/sway:swaybg - Build 'swaybg': allows to set a desktop background image. @@ -2776,6 +2779,7 @@ dev-python/networkx:yaml - Provides YAML format reading and writing dev-python/nltk:numpy - Use numpy for the saved word tokenizer dev-python/numexpr:mkl - Enable support for Intel Vector Math Library, part of sci-libs/mkl. dev-python/pandas:full-support - Pull all packages to give pandas full support +dev-python/paramiko:server - Enable server feature dev-python/passlib:bcrypt - bcrpyt hash algoryptm support dev-python/passlib:scrypt - accelerated scrypt algoythm support dev-python/passlib:totp - time based one time password support @@ -2810,8 +2814,6 @@ dev-python/pyzor:redis - Enables the redis back-end database engine for pyzord t dev-python/rarfile:compressed - Enables the module to support compressed v3 archives by calling the app-arch/unrar. dev-python/rdflib:redland - enable support for Redland triplestore dev-python/restkit:cli - Install the restcli command line interface/tool, based on dev-python/ipython -dev-python/scrapy:boto - Add support for Amazon S3 via dev-python/boto -dev-python/scrapy:ibl - Use Instace Based Learning algorithm for automatic extraction dev-python/setuptools_scm:mercurial - Enables mercurial backend dev-python/simplecv:shell - Enable the iPython SimpleCV shell dev-python/simplespectral:faster - Use sci-libs/scipy to speed up drawing @@ -2940,7 +2942,6 @@ dev-qt/qtwebkit:multimedia - Enable HTML5 audio/video support via dev-qt/qtmulti dev-qt/qtwebkit:orientation - Enable device orientation detection via dev-qt/qtsensors dev-qt/qtwebkit:printsupport - Enable printing via dev-qt/qtprintsupport dev-qt/qtwebkit:qml - Build QML/QtQuick bindings -dev-qt/qtwebkit:webchannel - Enable integration with dev-qt/qtwebchannel dev-qt/qtwebkit:webp - Add support for WebP image format dev-qt/qtwebsockets:qml - Build QML bindings dev-qt/qtwidgets:gles2 - Use GLES 2.0 or later instead of full OpenGL @@ -2961,6 +2962,7 @@ dev-ruby/faraday_middleware:parsexml - Include FaradayMiddleware::ParseXml dev-ruby/faraday_middleware:rashify - Include FaradayMiddleware::Rashify dev-ruby/maruku:highlight - Enable source code highlighting via dev-ruby/syntax dev-ruby/mysql2:mariadb - Use mariadb bindings +dev-ruby/net-ssh:ed25519 - Use dev-ruby/ed25519 for Ed25519 support dev-ruby/net-ssh:sodium - Use dev-libs/libsodium via dev-ruby/rbnacl for Ed25519 support dev-ruby/rails:asset-pipeline - Also install the default components for the asset pipeline. These are not required but they are activated automatically in new Rails projects by default. dev-ruby/rrdtool-bindings:graph - Enable support for graphing functions @@ -3005,6 +3007,8 @@ dev-scheme/scm:unix - Support for: nice, acct, lstat, readlink, symlink, mknod a dev-scheme/slib:gambit - Support for gambit scheme implementation dev-scheme/slib:scm - Support for scm scheme implementation dev-tcltk/expect-lite:debug - pull in packages needed for runtime interactive debugger +dev-tcltk/tcl3d:ode - Enable support for physics engine from dev-games/ode +dev-tcltk/tcl3d:osg - Enable support for 3D toolkit from dev-games/openscenegraph dev-tcltk/tktreectrl:shellicon - shellicon extension dev-tex/abntex:lyx - Install with app-office/lyx layout dev-tex/biblatex:biber - Install the unicode compatible backend processor @@ -3551,10 +3555,14 @@ gnome-base/gnome-extra-apps:tracker - Install the app-misc/tracker indexer and t gnome-base/gnome-keyring:ssh-agent - Use GNOME Keyring to unlock SSH keys. Recommended unless you are using ECDSA or Ed25519 keys. gnome-base/gnome-light:gnome-shell - Install gnome-base/gnome-shell and x11-wm/mutter for the standard GNOME 3 desktop mode gnome-base/gnome-settings-daemon:colord - Support color management using x11-misc/colord +gnome-base/gnome-settings-daemon:elogind - Rely on sys-auth/elogind as runtime logind provider gnome-base/gnome-settings-daemon:openrc-force - Skip systemd dependency (#480336), enabling this flag will become your setup to be fully unsupported by upstream and downstream Gnome team. Do not try to enable it unless completely needed +gnome-base/gnome-settings-daemon:systemd - Rely on sys-apps/systemd as runtime logind provider gnome-base/gnome-shell:browser-extension - Ensure the presence of extensions.gnome.org native connector gnome-extra/chrome-gnome-shell +gnome-base/gnome-shell:elogind - Use sys-auth/elogind for session tracking and suspend support. gnome-base/gnome-shell:ibus - Enable support for enhanced input methods through app-i18n/ibus gnome-base/gnome-shell:openrc-force - Skip systemd dependency (#480336), enabling this flag will become your setup to be fully unsupported by upstream and downstream Gnome team. Do not try to enable it unless completely needed +gnome-base/gnome-shell:telepathy - Ensure presence of telepathy chat integration gnome-base/gvfs:afp - Enables support for accessing AFP (Apple Filing Protocol) network shares gnome-base/gvfs:archive - Enables support for accessing files in archives transparently via app-arch/libarchive gnome-base/gvfs:bluray - Enable playback of Blu-ray filesystems using media-libs/libbluray @@ -3897,6 +3905,7 @@ mail-client/roundcube:ldap - Add dependencies to support connecting to an LDAP a mail-client/roundcube:managesieve - Add dependencies to support the sieverules plugin mail-client/sylpheed:oniguruma - Use dev-libs/oniguruma for regular expression mail-client/thunderbird:bindist - Disable official Thunderbird branding (icons, name) which are not binary-redistributable according to upstream. +mail-client/thunderbird:clang - Use Clang compiler instead of GCC mail-client/thunderbird:crypt - Enable encryption support with enigmail mail-client/thunderbird:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported) mail-client/thunderbird:gtk2 - Use the cairo-gtk2 rendering engine instead of the default cairo-gtk3 @@ -4317,6 +4326,9 @@ media-libs/cogl:kms - Enable KMS support. media-libs/cogl:pango - Build cogl-pango library for x11-libs/pango integration media-libs/coin:qthelp - Build API documentation in QtHelp format media-libs/coin:simage - Texture loading via media-libs/simage library +media-libs/dav1d:10bit - Add support for building 10-bit AV1. +media-libs/dav1d:8bit - Add support for decoding 8-bit AV1. +media-libs/dav1d:asm - Enable custom x86 assembly for faster decoding. media-libs/devil:allegro - Add support for Allegro media-libs/devil:nvtt - Add support for media-gfx/nvidia-texture-tools media-libs/esdl:image - Enable image support @@ -4369,7 +4381,6 @@ media-libs/libbdplus:aacs - Add support for decryption of AACS media-libs/libbluray:aacs - Add support for decryption of AACS media-libs/libbluray:bdplus - Use media-libs/libbdplus for BD+ decryption media-libs/libbluray:java - Add support for BD-J -media-libs/libbluray:udf - Add UDF (Universal Disk Format) support media-libs/libbluray:utils - Install command-line utilities and examples media-libs/libcanberra:alsa - Enables ALSA sound driver. media-libs/libcanberra:gstreamer - Enables gstreamer sound driver. Not useful when alsa or pulseaudio is available. @@ -4671,7 +4682,7 @@ media-sound/alsa-utils:libsamplerate - install utils that use libsamplerate (e.g media-sound/alsa-utils:ncurses - install utils that use ncurses (e.g. alsamixer) media-sound/alsaplayer:id3tag - Enables ID3 tagging with id3tag library media-sound/amsynth:dssi - Enable support for DSSI Soft Synth Interface -media-sound/apulse:pa-headers - Install PulseAudio headers +media-sound/apulse:sdk - Install PulseAudio headers and pkg-config files. Be aware apulse is not a full PulseAudio replacement by design and some functionality may be missing. media-sound/aqualung:ifp - Enable support for iRiver iFP portable audio players media-sound/aqualung:lua - Enable support for programmable title formatting with dev-lang/lua media-sound/aqualung:mac - Enable support for decoding Monkey's Audio files @@ -5247,7 +5258,6 @@ media-video/mpv:tools - Install extra tools: mpv_identify.sh, mpv_idet.sh, and u media-video/mpv:uchardet - Enable subtitles charset discovery via app-i18n/uchardet media-video/mpv:vulkan - Enable support for various Vulkan-based video backends media-video/noad:libmpeg2 - Build support for mpeg2 over media-libs/libmpeg2 rather than using ffmpeg -media-video/nvidia-settings:gtk3 - Additionally build the GTK 3 library media-video/nvidia_video_sdk:tools - Build and install example tools. media-video/obs-studio:fdk - Enable libfdk support for AAC encoding. media-video/obs-studio:imagemagick - Use ImageMagick for image loading instead of FFmpeg. @@ -5257,7 +5267,9 @@ media-video/obs-studio:python - Build support for scripting via Python 3. media-video/obs-studio:speexdsp - Enable noise suppression filter support via media-libs/speexdsp. media-video/ogmrip:ogm - Support for OGM container format media-video/ogmrip:srt - Support for SRT subtitle format -media-video/orion:mpv - Use the media-video/mpv player (upstream default) instead of the dev-qt/qtmultimedia one +media-video/orion:mpv - Use the media-video/mpv player (upstream default) +media-video/orion:qtav - Use the media-libs/qtav player +media-video/orion:qtmedia - Use the dev-qt/qtmultimedia media-video/parole:clutter - Compile in Clutter GTK+ support media-video/peek:keybinder - Enable support for global hotkeys using dev-libs/keybinder media-video/simplescreenrecorder:asm - Enable x86 assembly optimisation. @@ -5292,7 +5304,7 @@ media-video/vdr:permashift - permanent timeshift by recording live TV on hard di media-video/vdr:permashift_v1 - permanent timeshift by recording live TV on RAM, need plugin >=mediaplugins/vdr-permashift-1 media-video/vdr:pinplugin - Support for media-plugins/vdr-pin media-video/vdr:resumereset - rreset resume of EOF -media-video/vdr:rotor - Enable support for plugin media-plugins/vdr-rotor for dish-positioner. +media-video/vdr:rotor - Enable support for plugin vdr-rotor for dish-positioner. media-video/vdr:ttxtsubs - support for media-plugins/vdr-ttxtsubs media-video/vdr:vasarajanauloja - replacement for the liemikuutio patch, adds some nice must haves features media-video/vdr:wareagleicon - Replace original icon set in menu @@ -5379,18 +5391,6 @@ net-analyzer/bro:tools - Small auxiliary tools for Bro net-analyzer/bwm-ng:csv - Enable csv output net-analyzer/bwm-ng:html - Enable html output net-analyzer/cacti:doc - install html documentation -net-analyzer/check_mk:agent-only - Install only the check_mk agent. -net-analyzer/check_mk:apache_status - Install check_mk-agent apache-status plugin. -net-analyzer/check_mk:dmi_sysinfo - Install check_mk-agent dmi_sysinfo plugin. -net-analyzer/check_mk:livestatus - Enable livestatus. -net-analyzer/check_mk:logwatch - Install check_mk-agent logwatch plugin. -net-analyzer/check_mk:mysql - Install check_mk-agent mysql plugin. -net-analyzer/check_mk:nagios4 - Depend on net-analyzer/nagios-core-4 -net-analyzer/check_mk:nfsexports - Install check_mk-agent nfsexports plugin. -net-analyzer/check_mk:postgres - Install check_mk-agent postgres plugin. -net-analyzer/check_mk:smart - Install check_mk-agent S.M.A.R.T plugin. -net-analyzer/check_mk:wato - Enable check_mk WATO - check_mk's Web Administration Tool. -net-analyzer/check_mk:zypper - Install check_mk-agent zypper plugin. net-analyzer/check_mk_agent:apache_status - Install check_mk-agent apache-status plugin. net-analyzer/check_mk_agent:inventory - Install check_mk-agent linux inventory plugin. net-analyzer/check_mk_agent:logwatch - Install check_mk-agent logwatch plugin. @@ -6676,6 +6676,10 @@ net-misc/nextcloud-client:shibboleth - Build support for Shibboleth single sign- net-misc/ntp:openntpd - Allow ntp to be installed alongside openntpd net-misc/ntp:parse-clocks - Add support for PARSE clocks net-misc/ntp:samba - Provide support for Samba's signing daemon (needed for Active Directory domain controllers) +net-misc/ntpclient:debug - Enable analysis code path and debugging of NTP protocol. +net-misc/ntpclient:embedded - Build a very small ntpclient, from OpenWRT project. +net-misc/ntpclient:obsolete - Enable obsolete features, to use with kernel versions older than 3.0 +net-misc/ntpclient:syslog - Enable logging to syslog instead of logging to stderr. net-misc/ntpsec:early - Drop root privileges early net-misc/ntpsec:gdb - Enable debugging with gdb net-misc/ntpsec:heat - Install contrib heat generating scripts @@ -7338,6 +7342,7 @@ sci-electronics/kicad:github - Add github support into PCB editor sci-electronics/kicad:i18n - Allow GUI internationalization through l10n_* use flags sci-electronics/kicad:minimal - Build only binaries without parts library and examples sci-electronics/kicad:ngspice - Enable circuit simulation +sci-electronics/kicad:occ - Enable viewing 3D rendering of designs via opencascade sci-electronics/kicad:oce - Enable viewing 3D rendering of designs via OCE sci-electronics/kicad:python - Enable python scripting support sci-electronics/ngspice:shared - Build ngspice as a shared library @@ -7396,7 +7401,6 @@ sci-libs/ViSP:coin - Enables Coin3D support. sci-libs/ViSP:demos - Installs demo programs. sci-libs/ViSP:dmtx - Enables barcode data matrix support. sci-libs/ViSP:ogre - Enables dev-games/ogre support. -sci-libs/ViSP:ois - Enables dev-games/ois support via ogre. sci-libs/ViSP:opencv - Enables media-libs/opencv support. sci-libs/ViSP:tutorials - Installs tutorials. sci-libs/ViSP:zbar - Enables barcodes reading. @@ -7802,6 +7806,7 @@ sys-apps/flashrom:bitbang_spi - Bitbanging SPI infrastructure sys-apps/flashrom:buspirate_spi - Enable Bus Pirate SPI programmer sys-apps/flashrom:ch341a_spi - Enable WCH CH341A SPI programmer sys-apps/flashrom:dediprog - Dediprog SF100 support +sys-apps/flashrom:developerbox_spi - Enable Devloperbox SPI recovery support sys-apps/flashrom:digilent_spi - Enable support for Digilent iCEblink40 development board sys-apps/flashrom:drkaiser - Enable Dr. Kaiser programmer sys-apps/flashrom:dummy - Enable dummy tracing @@ -7919,6 +7924,7 @@ sys-apps/proot:care - Build dynamic CARE binary (more info - http://reproducible sys-apps/qingy:consolekit - Enable native consolekit support sys-apps/qingy:opensslcrypt - Encrypt communications between qingy and its GUI using dev-libs/openssl sys-apps/razercfg:pm-utils - Installs the pm-utils hooks for suspend/resume and requires sys-power/pm-utils +sys-apps/ripgrep:man - Build and install man pages. sys-apps/rng-tools:jitterentropy - Enable Jitter RNG entropy support sys-apps/rng-tools:nistbeacon - Enable NIST beacon entropy support sys-apps/roccat-tools:input_devices_roccat_ryosmkfx - Enable support for Ryos Mk FX keyboard. @@ -8337,6 +8343,7 @@ sys-freebsd/freebsd-usbin:floppy - Enable floppy disk utilities (fdcontrol, fdfo sys-freebsd/freebsd-usbin:netware - Build libraries and tools to work with NetWare protocols (IPX and NCP). sys-freebsd/freebsd-usbin:zfs - Enable ZFS support. sys-fs/android-file-transfer-linux:fuse - Add FUSE mount helper +sys-fs/bees:tools - Build extra tools useful for debugging (fiemap, feiwalk, beestop) sys-fs/btrfs-progs:convert - Build ext2 conversion utility (btrfs-convert) sys-fs/btrfs-progs:reiserfs - Enable reiserfs support in btrfs-convert tool. sys-fs/btrfs-progs:static - Build static binaries in addition to the dynamic ones @@ -8693,12 +8700,15 @@ www-client/elinks:tre - Enable support for regex searches via dev-libs/tre www-client/elinks:xml - Enable support for bookmarks via dev-libs/expat www-client/falkon:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet www-client/firefox:bindist - Disable official Firefox branding (icons, name) which are not binary-redistributable according to upstream. +www-client/firefox:clang - Use Clang compiler instead of GCC www-client/firefox:custom-optimization - Build with user-specified compiler optimizations (-Os, -O0, -O1, -O2, -O3) from CFLAGS (unsupported) www-client/firefox:eme-free - Disable EME (DRM plugin) cabability at build time +www-client/firefox:geckodriver - Enable WebDriver support www-client/firefox:gmp-autoupdate - Allow Gecko Media Plugins (binary blobs) to be automatically downloaded and kept up-to-date in user profiles www-client/firefox:gtk2 - Use the cairo-gtk2 rendering engine www-client/firefox:hwaccel - Force-enable hardware-accelerated rendering (Mozilla bug 594876) www-client/firefox:jemalloc - Enable or disable jemalloc +www-client/firefox:lto - Enable Link Time Optimization (LTO). Requires Gold linker when using GCC or LDD linker when using Clang www-client/firefox:pgo - Add support for profile-guided optimization using gcc-4.5, for faster binaries. This option will double the compile time. www-client/firefox:rust - Enable support for using rust compiler (experimental) www-client/firefox:screenshot - Allow to disable screenshot extension in global profile -- cgit v1.2.3