Merge updates from master

4 files changed, 49 insertions, 12 deletions

diff --git a/app-eselect/eselect-gnome-shell-extensions/Manifest b/app-eselect/eselect-gnome-shell-extensions/Manifest
index 98a566877f19..9254e4b14c54 100644
--- a/app-eselect/eselect-gnome-shell-extensions/Manifest
+++ b/app-eselect/eselect-gnome-shell-extensions/Manifest
@@ -1 +1,2 @@
 DIST eselect-gnome-shell-extensions-20120911.tar.xz 2792 BLAKE2B eaa0bf4217b095708131eb3f72b5a420b717f12b9f2088d8772567cd81c2631b68007a3bef0416b9d9016913f096094b3816dff2f1e7ba4495515c76cf03157b SHA512 da54e2a0b74f3e8f8eaa26b1858d26c56fbaa398ec54b079f504377a4079df19ff52485991a9ea153f92c93a9fe871d70c3c2b841bad4b8dba402ad83c9297e2
+DIST eselect-gnome-shell-extensions-20180306.tar.xz 2676 BLAKE2B 846e282f99828ce795ba98557bb97301f576895c46e98ae0c079dfee8461146756c85573c1ce24e4ca3690d2ea8383dd988e40d3fe271a32b1987e027b47e3ae SHA512 2c0b9119219d8f3c54201f9865e1a9dd6889ccf26537802c591e89adb545f38aca13fa6b1119fe52d4183daf4adb6d2b1053b252d2756778b31626688092196d
diff --git a/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
new file mode 100644
index 000000000000..6d497dd4329a
--- /dev/null
+++ b/app-eselect/eselect-gnome-shell-extensions/eselect-gnome-shell-extensions-20180306.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Manages system defaults for GNOME Shell extensions"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~leio/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# gnome-shell schemas are used in pkg_postinst
+COMMON_DEPEND="app-admin/eselect
+	>=dev-libs/glib-2.26:2
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gnome-shell"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	dev-perl/JSON"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils"
+
+src_install() {
+	insinto "/usr/share/eselect/modules"
+	doins gnome-shell-extensions.eselect
+	keepdir "/etc/eselect/gnome-shell-extensions"
+	# The actual gschema override file will be created in pkg_postinst.
+	dosym "../../../../etc/eselect/gnome-shell-extensions/${PN}.gschema.override" \
+		"/usr/share/glib-2.0/schemas/${PN}.gschema.override"
+}
+
+pkg_postinst() {
+	einfo "Updating list of installed extensions"
+	eselect gnome-shell-extensions update || die
+	local keyname="disabled-extensions"
+	has_version ">=gnome-base/gnome-shell-3.1.90" &&
+		keyname="enabled-extensions"
+	elog
+	elog "eselect gnome-shell-extensions manages the system default value of"
+	elog "the org.gnome.shell ${keyname} key. To override the default"
+	elog "for an individual user, use the gsettings command, e.g."
+	elog "\$ gsettings set org.gnome.shell ${keyname} \"['foo', 'bar']\""
+	elog "To undo per-user changes and use the system default, do"
+	elog "\$ gsettings reset org.gnome.shell ${keyname}"
+	elog
+}
diff --git a/net-analyzer/nmap/files/nmap-9999-zlib.patch b/net-analyzer/nmap/files/nmap-9999-zlib.patch
deleted file mode 100644
index 3f260ae48f41..000000000000
--- a/net-analyzer/nmap/files/nmap-9999-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -105,7 +105,7 @@
- NSE_HDRS+=nse_libssh2.h
- NSE_OBJS+=nse_libssh2.o
- endif
--ifneq (@LIBZLIB_LIBS@,)
-+ifneq (@ZLIB_LIBS@,)
- NSE_SRC+=nse_zlib.cc
- NSE_HDRS+=nse_zlib.h
- NSE_OBJS+=nse_zlib.o
diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index ad91a6386b53..a54dd5819b11 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-9999.ebuild
@@ -65,7 +65,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch
 	"${FILESDIR}"/${PN}-7.25-libpcre.patch
 	"${FILESDIR}"/${PN}-7.31-libnl.patch
-	"${FILESDIR}"/${PN}-9999-zlib.patch
 )
 S="${WORKDIR}/${MY_P}"