13 files changed, 121 insertions, 56 deletions
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index ae5f9bc1c798..92213a34744d 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+<<<<<<< HEAD
+=======
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2019-09-27)
+# some testsuite deps are not keyworded
+sys-fs/zfs test-suite
+
+>>>>>>> next
 # Luke Dashjr <luke-jr+gentoobugs@utopios.org> (2019-09-21)
 # iasl is keyworded ~arm64
 sys-firmware/seabios -debug
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 34da891f5c12..14940369710f 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -34,10 +34,6 @@ games-fps/doomsday fmod
 www-client/elinks guile
 
 # Michał Górny <mgorny@gentoo.org> (2019-08-27)
-# sci-libs/grib_api is slated for removal.
-dev-lang/gdl grib
-
-# Michał Górny <mgorny@gentoo.org> (2019-08-27)
 # net-misc/tokyotyrant is slated for removal.
 app-metrics/collectd collectd_plugins_tokyotyrant
 
@@ -78,7 +74,6 @@ media-libs/netpbm jpeg2k
 media-libs/opencv jpeg2k
 media-libs/simage jpeg2k
 net-proxy/ziproxy jpeg2k
-sci-libs/grib_api jasper jpeg2k
 x11-libs/gdk-pixbuf jpeg2k
 
 # James Le Cuirot <chewi@gentoo.org> (2019-05-21)
diff --git a/profiles/features/prefix/package.mask b/profiles/features/prefix/package.mask
index 6c331738314b..c2367c0c1f86 100644
--- a/profiles/features/prefix/package.mask
+++ b/profiles/features/prefix/package.mask
@@ -1,22 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Jeremy Olexa <darkside@gentoo.org> (2009-06-30)
-# The PAM auth system just will not work in Gentoo Prefix, instead the host auth
-# system should be used.
-sys-libs/pam
-sys-auth/pambase
+# Benda Xu <heroxbd@gentoo.org> (2019-08-20)
+# systemd is set to invade pid 1, which is not possible for Prefix.
+# The following are its reverse dependencies.
+sys-apps/systemd
+dev-libs/libreport
+app-admin/abrt
+app-admin/gnome-abrt
+app-admin/systemdgenie
+dev-python/python-systemd
+games-util/gamemode
+gnome-extra/gnome-logs
+gnome-extra/gnome-user-share
+gnome-extra/office-runner
+kde-misc/systemd-kcm
+<sys-apps/bolt-0.5
+sys-apps/gentoo-systemd-integration
+sys-apps/systemd-readahead
+sys-process/systemd-cron
+www-misc/profile-sync-daemon
+<x11-wm/mutter-3.30
+<gnome-base/gnome-shell-3.30
+<virtual/service-manager-1
 
-# Jeremy Olexa <darkside@gentoo.org> (2009-06-02)
-# If you have MacFuse or some other implementation of fuse installed, you can
-# probably use this by placing sys-fs/fuse in package.provided, bug 272210
-net-fs/curlftpfs
-
-# Jeremy Olexa <darkside@gentoo.org> (2008-12-02)
-# Reported to work. However, you will need to package.provide some deps. 
-# See bug 248809 for more details.
-net-fs/openafs
-
-# Fabian Groffen <grobian@gentoo.org> (2008-01-11)
-# Screws up things, see bug #204998
-<sys-devel/gcc-3.4.0
diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask
index bb3817c570ac..b54fd4ab047d 100644
--- a/profiles/features/prefix/package.use.mask
+++ b/profiles/features/prefix/package.use.mask
@@ -1,6 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Benda Xu <heroxbd@gentoo.org> (2019-08-20)
+# avoid gnome-extra/gnome-user-share, which depends on systemd.
+gnome-base/gnome-extra-apps share
+
+# Benda Xu <heroxbd@gentoo.org> (2019-08-20)
+# avoid sys-apps/systemd
+net-analyzer/wireshark sdjournal
+sys-apps/dbus-broker launcher
+www-servers/uwsgi uwsgi_plugins_systemd_logger
+
 # Benda Xu <heroxbd@gentoo.org> (2016-07-28)
 # Needs root privilege.
 sys-fs/eudev hwdb kmod
diff --git a/profiles/features/prefix/rpath/package.mask b/profiles/features/prefix/rpath/package.mask
new file mode 100644
index 000000000000..e3f46170a20a
--- /dev/null
+++ b/profiles/features/prefix/rpath/package.mask
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Jeremy Olexa <darkside@gentoo.org> (2009-06-30)
+# The PAM auth system just will not work in Gentoo Prefix, instead the host auth
+# system should be used.
+sys-libs/pam
+sys-auth/pambase
+
+# Jeremy Olexa <darkside@gentoo.org> (2008-12-02)
+# Reported to work. However, you will need to package.provide some deps. 
+# See bug 248809 for more details.
+net-fs/openafs
+
+# Jeremy Olexa <darkside@gentoo.org> (2009-06-02)
+# If you have MacFuse or some other implementation of fuse installed, you can
+# probably use this by placing sys-fs/fuse in package.provided, bug 272210
+net-fs/curlftpfs
+
+# Fabian Groffen <grobian@gentoo.org> (2008-01-11)
+# Screws up things, see bug #204998
+<sys-devel/gcc-3.4.0
diff --git a/profiles/features/prefix/rpath/use.mask b/profiles/features/prefix/rpath/use.mask
index 0ad2254fd545..297038e128fb 100644
--- a/profiles/features/prefix/rpath/use.mask
+++ b/profiles/features/prefix/rpath/use.mask
@@ -1,12 +1,23 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Benda Xu <heroxbd@gentoo.org> (2019-08-20)
+# Migrated from features/prefix:
+# USE flags inherited by the base/use.defaults file that shouldn't be
+# in Prefix rpath.
+cups
+# USE=pam just does not make sense in Gentoo Prefix. Should be using the host
+# auth system.
+pam
+# USE=udev just does not make sense in Gentoo Prefix. bug 293480
+udev
+
+# Benda Xu <heroxbd@gentoo.org> (2019-06-26)
+# Not supported
+eselect-ldso
+
 # prefix-guest USE flag should be set in prefix rpath profiles
 -prefix-guest
 
 # multilib is never going to work as expected in Prefix rpath
 multilib
-
-# Benda Xu <heroxbd@gentoo.org> (2019-06-26)
-# Not supported
-eselect-ldso
diff --git a/profiles/features/prefix/standalone/package.use.mask b/profiles/features/prefix/standalone/package.use.mask
index 9b7d78715112..7653e7fd7c1d 100644
--- a/profiles/features/prefix/standalone/package.use.mask
+++ b/profiles/features/prefix/standalone/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Benda Xu <heroxbd@gentoo.org> (2019-01-26)
diff --git a/profiles/features/prefix/use.mask b/profiles/features/prefix/use.mask
index 4340ef9aa4c4..be9e1433e84b 100644
--- a/profiles/features/prefix/use.mask
+++ b/profiles/features/prefix/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # prefix USE flag should always be unmasked in prefix profiles
@@ -8,12 +8,7 @@
 -userland_GNU
 
 # USE flags inherited by the base/use.defaults file that shouldn't be in Prefix
-cups
 gpm
 
-# USE=pam just does not make sense in Gentoo Prefix. Should be using the host
-# auth system.
-pam
-
-# USE=udev just does not make sense in Gentoo Prefix. bug 293480
-udev
+# need to invade pid 1, which is not possible for Prefix.
+systemd
diff --git a/profiles/package.mask b/profiles/package.mask
index a2b96537a400..72798308a697 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,24 @@
 
 #--- END OF EXAMPLES ---
 
+<<<<<<< HEAD
+=======
+# Stefan Strogin <steils@gentoo.org> (2019-09-27)
+# Requires >=dev-lang/lua-5.3 which is masked
+>=dev-util/bam-0.5.0
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-27)
+# The virtual is not really useful since all reverse dependencies
+# support only Python 2.7.  All its uses were replaced with direct
+# dependencies on dev-python/pmw.
+# Removal in 30 days.
+virtual/python-pmw
+
+# Ulrich Müller <ulm@gentoo.org> (2019-09-26)
+# Blocks its own dependency. Bug #695606.
+=x11-libs/libXvMC-1.0.12
+
+>>>>>>> next
 # Joonas Niilola <juippis@gentoo.org> (2019-09-24)
 # Upstream decided to deprecate this service, and app. Removal in 
 # ~30 days. Bug #695562
@@ -1081,6 +1099,7 @@ net-misc/libss7
 games-rpg/eternal-lands-bloodsucker
 games-rpg/eternal-lands-data
 
+<<<<<<< HEAD
 # Michał Górny <mgorny@gentoo.org> (2019-08-28)
 # Last touched in 2010.  EAPI=0.  Last upstream release in 2011 (pending
 # bump).  No reverse dependencies.
@@ -1131,6 +1150,8 @@ dev-tcltk/tkTheme
 # Removal in 30 days.  Bug #681044.
 net-misc/tokyotyrant
 
+=======
+>>>>>>> next
 # Miroslav Šulc <fordfrog@gentoo.org> (2019-08-19)
 # Depends on >=virtual/{jdk,jre}-11 which is masked
 =www-servers/tomcat-9.0.24
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index b45c90b1902e..79d81595933a 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -258,7 +258,7 @@ ppc64-linux		prefix/linux/ppc64				exp
 x86-linux		prefix/linux/x86				exp
 
 # Linux Standalone Profiles
-amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+		exp
+amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+		dev
 amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+	exp
 amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+	exp
 x86-linux		default/linux/x86/17.0/prefix/kernel-3.2+	exp
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 1af2f3ed3d8e..f24c1293174e 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -22,7 +22,10 @@ mysql		https://artfiles.org/mysql/ https://www.mirrorservice.org/sites/ftp.mysql
 nongnu		http://download.savannah.nongnu.org/releases/ http://ftp.cc.uoc.gr/mirrors/nongnu.org/ http://ftp.twaren.net/Unix/NonGNU/ http://mirror.csclub.uwaterloo.ca/nongnu/ ftp://mirror.csclub.uwaterloo.ca/nongnu/ http://mirrors.fe.up.pt/pub/nongnu/ ftp://mirrors.fe.up.pt/pub/nongnu/ http://nongnu.askapache.com/ http://nongnu.uib.no/ ftp://nongnu.uib.no/pub/nongnu/ http://savannah.c3sl.ufpr.br/ ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ ftp://ftp.twaren.net/Unix/NonGNU/
 openbsd		https://cdn.openbsd.org/pub/OpenBSD https://cloudflare.cdn.openbsd.org/pub/OpenBSD https://fastly.cdn.openbsd.org/pub/OpenBSD
 openssl		https://artfiles.org/openssl.org/ https://www.mirrorservice.org/sites/ftp.openssl.org/ ftp://ftp.openssl.org
+<<<<<<< HEAD
 postgresql	https://ftp.postgresql.org/pub/
+=======
+>>>>>>> next
 pypi		https://pypi.org/packages/source https://files.pythonhosted.org/packages/source
 qmail		http://www.qmail.org/ http://qmail.geto.net/ http://qmail-mirror.jms1.net/ http://qmail.pandakc.com/ http://qmail.mirrors.auchnet.org/ http://qmail.glasswings.com.au/ http://qmail.ii.net/ http://infobase.ibase.com.hk/qmail/ http://qmail.morva.net/ http://qmail.teraren.com/ http://qmail.mirror.cdnetworks.com/ http://qmail.yongbok.net/ http://qmail.mirror.choon.net/ http://qmail.cbox.biz/ http://qmail.cbox.biz/ http://qmail.mirrors.ovh.net/ftp.qmail.org/ http://qmail.rasjonell.net/ http://qmail.europnews.de/ http://qmail.kendzorra.org/ http://qmail.mirror.gsnw.org/ http://mirrors.ntua.gr/qmail/ http://qmail.cti.gr/ http://qmail.dnsbeans.com/ http://qmail.hypergrid.it/ http://qmail.omnis.ch/ http://qmail.linorg.usp.br/ http://qmail.cavsystems.net/ http://qmail.mivzakim.net/ http://qmail.mirror.rise.ph/
 quakeunity	http://www.mirrorservice.org/sites/quakeunity.com
diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 4f2646ec7f48..8cbde629a082 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -1,6 +1,5 @@
 move kde-base/kactivitymanagerd kde-plasma/kactivitymanagerd
 move app-portage/cpuinfo2cpuflags app-portage/cpuid2cpuflags
-move app-crypt/openssl-af_alg-engine app-crypt/af_alg
 slotmove >=dev-php/pecl-mailparse-3.0 0 7
 move dev-perl/class-loader dev-perl/Class-Loader
 move x11-apps/xkbset x11-misc/xkbset
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 786411214bf5..6712f5cb7372 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -172,7 +172,6 @@ app-admin/salt:zeromq - Add support for the zeromq transport.
 app-admin/sudo:gcrypt - Use message digest functions from dev-libs/libgcrypt instead of sudo's
 app-admin/sudo:libressl - Use message digest functions from dev-libs/libressl instead of sudo's
 app-admin/sudo:offensive - Let sudo print insults when the user types the wrong password
-app-admin/sudo:openssl - Use message digest functions from dev-libs/openssl instead of sudo's
 app-admin/sudo:secure-path - Replace PATH variable with compile time secure paths
 app-admin/sudo:sendmail - Allow sudo to send emails with sendmail
 app-admin/sudo:sssd - Add System Security Services Daemon support
@@ -1262,7 +1261,7 @@ app-text/mathtex:png - Generate png images by default instead of gif
 app-text/msort:heap - Use heap instead of alloca()
 app-text/msort:icu - Use dev-libs/icu instead of dev-libs/libutf8proc.
 app-text/msort:libuninum - Use dev-libs/libuninum for conversion.
-app-text/pandoc:embed_data_files - Embed data files in binary for relocatable executable.
+app-text/pandoc:embed-data-files - Embed data files in binary for relocatable executable.
 app-text/pandoc:http-conduit - Enable downloading of resources over https.
 app-text/pandoc:https - Enable support for downloading of resources over https.
 app-text/pandoc:make-pandoc-man-pages - Build program to regenerate pandoc man pages from README.
@@ -1652,7 +1651,7 @@ dev-haskell/contravariant:semigroups - You can disable the use of the `semigroup
 dev-haskell/contravariant:statevar - You can disable the use of the `StateVar` package using `-f-StateVar`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/contravariant:tagged - You can disable the use of the `tagged` package on older versons of GHC using `-f-tagged`. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/cpu:executable - build 'cpuid' tool
-dev-haskell/crypto-api:all_cpolys - Build all the CMAC polynomes up to 10000 bits instead of just the usual ones
+dev-haskell/crypto-api:all-cpolys - Build all the CMAC polynomes up to 10000 bits instead of just the usual ones
 dev-haskell/crypto-conduit:conduit11 - Use conduit >= 1.1.
 dev-haskell/cryptohash:cryptoapi - Defines crypto-api instances
 dev-haskell/cryptonite:integer-gmp - Whether or not to use GMP for some functions
@@ -1666,7 +1665,7 @@ dev-haskell/distributive:lib-werror - Compile with the ghc -Werror option
 dev-haskell/encoding:systemencoding - Provide the getSystemEncoding action to query the locale.
 dev-haskell/entropy:halvm - Build for the HaLVM.
 dev-haskell/filestore:maxcount - Make use of a recent (>= 2.3.0) Darcs feature which vastly improves the performance of 'latest'. You should disable this flag if you plan to use gitit with an older version of Darcs, or 'latest' will raise an error.
-dev-haskell/glib:closure_signals - Use the the GClosure-based signals implementation.
+dev-haskell/glib:closure-signals - Use the the GClosure-based signals implementation.
 dev-haskell/gtk:deprecated - Include definitions in this library that are considered obsolete.
 dev-haskell/gtk:fmode-binary - Set the default file translation mode for file I/O operations to _O_BINARY.
 dev-haskell/gtk:gio - Depend on GIO package, thereby enabling certain features.
@@ -1731,7 +1730,7 @@ dev-haskell/monad-control:instancest - If enabled this package will export Monad
 dev-haskell/monad-logger:template-haskell - Enable Template Haskell support.
 dev-haskell/monad-par:chaselev - Use Chase-Lev Deques for higher-perf work-stealing.
 dev-haskell/nats:hashable - You can disable the use of the `hashable` package using USE=-hashable. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users. If set we will not supply an instance of `Hashable`.
-dev-haskell/network-data:small_base - Build the split-up base package.
+dev-haskell/network-data:small-base - Build the split-up base package.
 dev-haskell/pandoc-citeproc:bibutils - use Chris Putnam's app-text/bibutils
 dev-haskell/pandoc-citeproc:embed_data_files - Embed locale files into the library (needed for windows packaging)
 dev-haskell/pandoc-citeproc:hexpat - use dev-haskell/hexpat instead of dev-haskell/xml for XML parsing
@@ -1774,12 +1773,12 @@ dev-haskell/semigroups:transformers - provide instances for transformers package
 dev-haskell/semigroups:unordered-containers - You can disable the use of the `unordered-containers` package using USE=-unordered-containers. Disabling this is an unsupported configuration, but it may be useful for accelerating builds in sandboxes for expert users.
 dev-haskell/sendfile:portable - Explicitly enable portable sendfile support (implemented in Haskell)
 dev-haskell/sha:exe - Build a sha1 and a sha384 executable similar to 'md5sum'.
-dev-haskell/shakespeare:test_coffee - Render tests through coffeescript render function.
-dev-haskell/shakespeare:test_export - Test export.
-dev-haskell/shakespeare:test_roy - Render tests through roy render function.
-dev-haskell/shakespeare-js:test_coffee - Test coffee.
-dev-haskell/shakespeare-js:test_export - Test export.
-dev-haskell/shakespeare-js:test_roy - Test roy.
+dev-haskell/shakespeare:test-coffee - Render tests through coffeescript render function.
+dev-haskell/shakespeare:test-export - Test export.
+dev-haskell/shakespeare:test-roy - Render tests through roy render function.
+dev-haskell/shakespeare-js:test-coffee - Test coffee.
+dev-haskell/shakespeare-js:test-export - Test export.
+dev-haskell/shakespeare-js:test-roy - Test roy.
 dev-haskell/shelly:lifted - run the tests against Shelly.Lifted
 dev-haskell/shuffle:network-uri - Get Network.URI from the network-uri package.
 dev-haskell/simple-sendfile:allow-bsd - Allow use of BSD sendfile (disable on GNU/kFreeBSD)
@@ -1936,7 +1935,6 @@ dev-lang/erlang:kpoll - Enable kernel polling support
 dev-lang/erlang:pgo - Build erts with profile-guided optimizations
 dev-lang/fpc:ide - Build and install the Free Pascal Compiler IDE
 dev-lang/gdl:eigen - Build matrix manipulation with dev-cpp/eigen
-dev-lang/gdl:grib - Add support for the meteorological GRIB format with sci-libs/grib_api
 dev-lang/gdl:gshhs - Add support for projection adn continent maps with sci-geosciences/gshhs-data
 dev-lang/gdl:hdf - Add support for the Hierarchical Data Format v.4
 dev-lang/gdl:proj - Add support for sci-libs/proj (geographic projections)
@@ -5689,8 +5687,8 @@ net-dns/dnsmasq:script - Enable support for calling scripts when leases change.
 net-dns/dnsmasq:tftp - Enables built in TFTP server for netbooting.
 net-dns/dnssec-validator:dlv - Enable support for the DNSSEC look-aside validation
 net-dns/dnssec-validator:nsec3 - Enable support for the NSEC3 Resource Record
-net-dns/getdns:getdns_query - Add getdns_query tool
-net-dns/getdns:getdns_server_mon - Add getdns_server_mon tool
+net-dns/getdns:getdns-query - Add getdns_query tool
+net-dns/getdns:getdns-server-mon - Add getdns_server_mon tool
 net-dns/getdns:libev - Enable dev-libs/libev support
 net-dns/getdns:libevent - Enable dev-libs/libevent support
 net-dns/getdns:libuv - Enable dev-libs/libuv support
@@ -6649,6 +6647,7 @@ net-misc/mosh:mosh-hardening - Enable compiler and linker options to frustrate m
 net-misc/mosh:server - Build network server
 net-misc/mosh:ufw - Install net-firewall/ufw rule set
 net-misc/mosh:utempter - Include libutempter support
+net-misc/mrouted:rsrr - Enable Routing Support for Resource Reservations, for RSVP
 net-misc/mulk:checksum - Enable checksum verification for Metalink from dev-libs/openssl
 net-misc/mulk:metalink - Enable support for media-libs/libmetalink
 net-misc/ncp:diet - Compile against dev-libs/dietlibc
@@ -7497,7 +7496,6 @@ sci-libs/gmsh:metis - Enables metis support
 sci-libs/gmsh:netgen - Enable 3D Frontal triangulation using netgen lib
 sci-libs/gmsh:opencascade - Enable OpenCASCADE support
 sci-libs/gmsh:petsc - Enable sci-mathematics/petsc support
-sci-libs/grib_api:aec - Build with Adaptive Entropy Coding compression, needs sci-libs/libaec
 sci-libs/gsl:cblas-external - Link gsl with external cblas provided by (virtual/cblas) instead of shipped internal version
 sci-libs/gsl:deprecated - Enable deprecated functions
 sci-libs/hdf5:hl - Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)