gentoo resync : 21.12.2017

7 files changed, 45 insertions, 21 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9aa174a49c11..9bc5d6e287f0 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index fea4ccc48359..52e139cb6344 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (20 Dec 2017)
+# Mask USE=rados for net-analyzer/rrdtool since sys-cluster/ceph is not
+# keyworded (bug #597174)
+net-analyzer/rrdtool rados
+
 # Sergei Trofimovich <slyfox@gentoo.org> (09 Nov 2017)
 # pulls in many dev-ruby/asciidoctor dependencies (bug #599048)
 net-misc/chrony html
diff --git a/profiles/package.mask b/profiles/package.mask
index 9fff45e25134..b1741b29fa8f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (21 Dec 2017)
+# Dead upstream, depends on dead Qt4.
+# Bug #629032. Masked for removal in 30 days.
+media-gfx/wally
+
+# Andreas Sturmlechner <asturm@gentoo.org> (21 Dec 2017)
+# Dead upstream, depends on dead Qt4.
+# Bug #637108. Masked for removal in 30 days.
+app-cdr/qpxtool
+
 # Patrice Clement <monsieurp@gentoo.org> (19 Dec 2017)
 # A slightly better syntax file for PAM configuration files is shipped with Vim
 # since version 8.0. The one we package is old and out of date.
@@ -387,11 +397,6 @@ net-analyzer/aimsniff
 # Masked for removal in 30 days. Bug #638432
 dev-perl/Mail-SPF-Query
 
-# Andreas Sturmlechner <asturm@gentoo.org> (21 Nov 2017)
-# Totally broken, depends on dead Qt4. Use sci-mathematics/octave[gui].
-# Masked for removal in 30 days. Bugs #598930, #615284, #614582, #631524
-sci-mathematics/qtoctave
-
 # Alice Ferrazzi <alicef@gentoo.org> (21 Nov 2017)
 # A regression in kernel 4.14.0
 # Data corruption issue that affects at minimum bcache. 
@@ -555,10 +560,6 @@ sys-kernel/tuxonice-sources
 # Mask Atom betas for testing.
 app-editors/atom:beta
 
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Sep 2017)
-# Unfortunately broken esp. with USE=python. Bugs #623780, #631064
-=sci-geosciences/qgis-2.18.12-r100
-
 # Patrice Clement <monsieurp@gentoo.org> (09 Sep 2017)
 # Python 3 port is almost complete with version 0.6.0. Users might run into
 # minor bumps here and there which is why the mask is still in place for the
diff --git a/profiles/prefix/windows/cygwin/profile.bashrc b/profiles/prefix/windows/cygwin/profile.bashrc
new file mode 100644
index 000000000000..f016c87b0d4f
--- /dev/null
+++ b/profiles/prefix/windows/cygwin/profile.bashrc
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [[ ${CATEGORY}/${PN} == app-arch/xz-utils
+   && ${EBUILD_PHASE} == setup
+   && ${CPPFLAGS} == *-isystem*
+]]; then
+	# During bootstrap-prefix.sh we set CPPFLAGS="-isystem $EPREFIX/usr/include",
+	# but on Cygwin xz-utils eventually does use the windres compiler,
+	# which fails to understand -isystem.
+	# As xz-utils has no need for -isystem here, we can use -I instead.
+	CPPFLAGS=${CPPFLAGS//-isystem /-I}
+fi
diff --git a/profiles/releases/17.0/package.mask b/profiles/releases/17.0/package.mask
index dae3af845f76..a717a29def8b 100644
--- a/profiles/releases/17.0/package.mask
+++ b/profiles/releases/17.0/package.mask
@@ -22,4 +22,4 @@ dev-java/gcj-jdk
 # The following packages require pdftk and are therefore
 # masked in the 17.0 profiles.
 app-office/auto-multiple-choice
-app-office/impressive
+<app-office/impressive-0.11.2
diff --git a/profiles/updates/4Q-2017 b/profiles/updates/4Q-2017
index 7f12db68bf03..a9311ede2183 100644
--- a/profiles/updates/4Q-2017
+++ b/profiles/updates/4Q-2017
@@ -3,3 +3,4 @@ move dev-perl/HTML-Format dev-perl/HTML-Formatter
 move dev-perl/MARC-XML dev-perl/MARC-File-XML
 move dev-perl/MARC-file-XML dev-perl/MARC-File-XML
 move dev-util/gogland dev-util/goland
+move app-crypt/zuluCrypt app-crypt/zulucrypt
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index cb190f158c97..fd2de20835b3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -333,9 +333,9 @@ app-crypt/rhash:openssl - Add support for hashes from dev-libs/openssl
 app-crypt/seahorse:ldap - Enable seahorse to manipulate GPG keys on a LDAP server.
 app-crypt/tpm-tools:pkcs11 - Build Token data management utilities based on OpenCryptoki's (dev-libs/opencryptoki) PKCS#11 implementation.
 app-crypt/veracrypt:asm - Enable assembly for optimization
-app-crypt/zuluCrypt:gnome - Enable support for the freedesktop.org Secret Service API via app-crypt/libsecret
-app-crypt/zuluCrypt:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
-app-crypt/zuluCrypt:udev - Whether udev will be consulted when deciding if a volume is system or not
+app-crypt/zulucrypt:gnome - Enable support for the freedesktop.org Secret Service API via app-crypt/libsecret
+app-crypt/zulucrypt:kwallet - Enable encrypted storage of passwords with kde-frameworks/kwallet
+app-crypt/zulucrypt:udev - Whether udev will be consulted when deciding if a volume is system or not
 app-dicts/aspell-be:classic - Support classic spelling by default
 app-dicts/gwaei:hunspell - Enable app-text/hunspell spellchecking and morphological analysis
 app-dicts/gwaei:mecab - Enable app-text/mecab support
@@ -1423,8 +1423,9 @@ dev-db/percona-server:tokudb - Add support for TokuDB storage engine
 dev-db/percona-server:tokudb-backup-plugin - Builds the TokuDB backup plugin
 dev-db/percona-server:yassl - Enable SSL connections and crypto functions using the bundled yaSSL
 dev-db/pgadmin3:databasedesigner - Enable the Database Designer component
+dev-db/pgbouncer:c-ares - Use c-ares as the DNS backend instead of evdns (libevent).
 dev-db/pgbouncer:libevent - Use libevent 2.0+ and evdns as the DNS backend
-dev-db/pgbouncer:udns - Use udns as the DNS backend. Supports IPv4 only.
+dev-db/pgbouncer:udns - Use udns as the DNS backend instead of evdns (libevent). Supports IPv4 only.
 dev-db/pgpool2:memcached - Use memcached for query caching.
 dev-db/pgrouting:drivingdistance - Enable to calculate driving distance
 dev-db/pgrouting:html - Install HTML formatted documentation
@@ -3129,9 +3130,6 @@ games-emulation/dosbox:glide - Enable unofficial Glide emulation via media-libs/
 games-emulation/fceux:logo - Enable the ability to add a logo screen when creating AVIs
 games-emulation/generator:sdlaudio - Enable SDL Audio
 games-emulation/higan:icarus - Build icarus library manager
-games-emulation/higan:profile_accuracy - Compile a binary optimized for accuracy
-games-emulation/higan:profile_balanced - Compile a binary with balanced optimization
-games-emulation/higan:profile_performance - Compile a binary optimized for performance
 games-emulation/higan:udev - Enable udev based input
 games-emulation/mednafen:debugger - Build with internal debugger
 games-emulation/mednafen:pax_kernel - Triggers a paxmarking of the binary
@@ -3331,7 +3329,6 @@ games-strategy/megaglest:tools - Build model import/export tools
 games-strategy/megaglest:unicode - Use unicode strings for wxwidgets
 games-strategy/megaglest:wxuniversal - Use the wxUniversal port which implements the various GUI controls by drawing them itself
 games-strategy/naev:mixer - Enables media-libs/sdl-mixer sound backend in addition to media-libs/openal one.
-games-strategy/openra:tools - Install some development tools such as editor.
 games-strategy/seven-kingdoms:network - Enable support for multiplayer via media-libs/sdl-net
 games-strategy/ufo-ai:editor - Build map editor
 games-strategy/uqm:music - download and install music files (large)
@@ -4554,7 +4551,6 @@ media-sound/fapg:xspf - Enable support for saving XSPF playlists.
 media-sound/forked-daapd:itunes - Enable support for iTunes library XML
 media-sound/forked-daapd:lastfm - Enable LastFM scrobbling support
 media-sound/forked-daapd:mpd - Enable streaming to mpd
-media-sound/frescobaldi:portmidi - Enable media-libs/portmidi support
 media-sound/gimmix:cover - Enable cover art fetching
 media-sound/gimmix:lyrics - Enable lyric fetching
 media-sound/gmpc:unique - Enable single instance support using dev-libs/libunique
@@ -6362,6 +6358,14 @@ net-misc/electrum:qrcode - Enable QR code scanning with media-gfx/zbar
 net-misc/electrum:sync - Enable plugin to sync wallet metadata across multiple Electrum clients
 net-misc/electrum:trustedcoin_com - Enable plugin to use two-factor service by TrustedCoin.com
 net-misc/electrum:vkb - Enable plugin for virtual keyboard
+net-misc/electrum-ltc:audio_modem - Enable plugin to support Audio Modem
+net-misc/electrum-ltc:cli - Enables the CLI interface
+net-misc/electrum-ltc:cosign - Enable plugin to support multisig wallets between multiple Electrum clients
+net-misc/electrum-ltc:digitalbitbox - Enable plugin to support Digital Bitbox hardware wallet
+net-misc/electrum-ltc:email - Enable plugin to support emailing invoices
+net-misc/electrum-ltc:qrcode - Enable QR code scanning with media-gfx/zbar
+net-misc/electrum-ltc:sync - Enable plugin to sync wallet metadata across multiple Electrum clients
+net-misc/electrum-ltc:vkb - Enable plugin for virtual keyboard
 net-misc/eventd:libcanberra - Enable plugin for sounds via media-libs/libcanberra
 net-misc/eventd:libnotify - Enable plugin to relay events to notification daemon (Note: not required for local notifications via net-misc/eventd)
 net-misc/eventd:notification - Enable plugin to display on-screen notifications
@@ -6703,7 +6707,7 @@ net-p2p/eiskaltdcpp:json - Enable JSON for cli and daemon
 net-p2p/eiskaltdcpp:libcanberra - Enable sound notifications support over libcanberra in EiskaltDC++ Gtk
 net-p2p/eiskaltdcpp:minimal - Don't install headers
 net-p2p/fms:frost - Add support for frost boards
-net-p2p/go-ethereum:evm - Build Ethereum Virtual Machine (EVM)
+net-p2p/go-ethereum:devtools - Build Ethereum development tools (evm, abigen, puppeth, ...)
 net-p2p/go-ethereum:opencl - Add OpenCL GPU mining support
 net-p2p/go-ipfs-bin:fuse - Enable runtime support for sys-fs/fuse
 net-p2p/ktorrent:bwscheduler - Schedule upload and download limits over a period of a week
@@ -7145,7 +7149,7 @@ sci-geosciences/qgis:designer - Build custom widgets for dev-qt/designer
 sci-geosciences/qgis:georeferencer - Determines whether georeferencer plugin should be built
 sci-geosciences/qgis:grass - Add support for sci-geosciences/grass
 sci-geosciences/qgis:mapserver - Determines whether mapserver should be built
-sci-geosciences/qgis:touch - Enable support for touch input devices
+sci-geosciences/qgis:polar - Enable support for the polar coordinate system via x11-libs/qwtpolar
 sci-geosciences/viking:libexif - Use media-libs/libexif for EXIF support
 sci-geosciences/viking:magic - Use libmagic to determine mimetypes
 sci-geosciences/viking:mapnik - Enable a layer based on sci-geosciences/mapnik