gentoo resync : 31.01.2018

24 files changed, 556 insertions, 135 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0fe61831da36..93938a3be99e 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 736c7987f730..62c3d54ed6f7 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,3 +1,3 @@
 DIST bijiben-3.24.2.tar.xz 843548 BLAKE2B 2441e3e9f672c7a9796dd1786bedf29ae1b5a6c4563b07943c4bfc252dc2ad9be0e8ab0569cbceb2b2c839a93d45ef3cd671d68d9b6717f880ffbb3f80d3392f SHA512 e5571c793fc75b1038a024f0f73b539079ca4415c7f4fd0756314a14baa1fe679d9513bf8c291aa20170f35616be409ebd0360e3d3ec8f962f2d3d143e02185e
-EBUILD bijiben-3.24.2.ebuild 914 BLAKE2B e12f3b3c65d9527afe15ec443cedb2b4acf1c8966a9a12a4b270e9e32a9050ae69a964fa75e6f3659ce5dea64919458c812a676ca1423d49d8f8ed984595d6b4 SHA512 07d5b7a736034ccc7b8898ade58aa1a4134538f5777afe4a8bb4ab13be5f6d89191fe2a7d604cd05acb58f53e87ea94b64fd098e66f772757b3dd9c85c4acf48
-MISC metadata.xml 363 BLAKE2B a4f7c4f3811e2cecfb5f7977ac819be969e120c12e8c0a0d2cb006f68dabb8e64fe9c9a8258792690b3da217c30d422b37691276ee84d76b487307b0d94715cd SHA512 e891b4270a6c2c77ffe9e5efd945c6e6d7fc058e6315fac0793fbf86ca68251fa9a3d2fce796419fce6be1ca0fca215d50b77e9a4da6667475d0e0a155bcc747
+EBUILD bijiben-3.24.2.ebuild 746 BLAKE2B 7412677816ed6c312d161368aaad02a409b0305ae7bb18146f490cb76026bbfd09c65a77e8fa7725afa85e938ac7289856e608905df8bf4d5e21f68233a6fc34 SHA512 d46b0891c5fa2c9268f8f667be70bb9a95b7fa7df75b090837d7cf1f156df09977ba1879b139f1a913324da3bac70f84328c5d8a21c415e5c16323ddc5f4142d
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.24.2.ebuild b/app-misc/bijiben/bijiben-3.24.2.ebuild
index abe626514cb9..d256e6bbbd16 100644
--- a/app-misc/bijiben/bijiben-3.24.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="zeitgeist"
+IUSE=""
 
 # XXX: raise glib dependency when Gnome 3.26 enters tree
 RDEPEND="
@@ -22,7 +22,6 @@ RDEPEND="
 	dev-libs/libxml2
 	>=app-misc/tracker-1:=
 	sys-apps/util-linux
-	zeitgeist? ( gnome-extra/zeitgeist )
 "
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
@@ -32,9 +31,3 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-# Needed if eautoreconf:
-# sys-devel/autoconf-archive
-
-src_configure() {
-	gnome2_src_configure $(use_enable zeitgeist)
-}
diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
index ef0e02cae353..39980802b1da 100644
--- a/app-misc/bijiben/metadata.xml
+++ b/app-misc/bijiben/metadata.xml
@@ -5,7 +5,4 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<use>
-	<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
-</use>
 </pkgmetadata>
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index 4d3420e1468b..ef5613da20f9 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,5 +1,7 @@
+AUX ddcutil-0.8.6-remove-pedantic-cflag.patch 3848 BLAKE2B f02ad02606aaef927823b7e50c319e4c4cc9a1a31836f3674ce5c7b140a5852fc62d1103c3ae2bb366f75176140c892ebb8381c3675ea3454493c8d2dcf7db17 SHA512 4f946476545a8af53a71d024d2765b26fbb871e04905c62e280ec4855bd1ebe2b0093660e3d9e384a106b512f783ca58cd0de78d40ffba1dae283026dd60bb9a
 DIST ddcutil-0.8.4.tar.gz 558405 BLAKE2B 4bb93d6b9b28a17ef182c1f39e3b6351070c5541fd8eefccde2a6d771e28a8c656abe1e00a58ee935290cba79af09b1c2d6b611532827455b5ec83532bbb46c4 SHA512 e7bf78295a008607ef520e055873acc0bac6d94b850a6ea1f7d4a4ea9e080d23b4b7d82e5725a220ff120ab1523aa320265ba22671982625c10088521c72a14c
 DIST ddcutil-0.8.6.tar.gz 613272 BLAKE2B ce7072a819c5a2aa125ae8f6d5550cf0a516714f0635672015a0c24c9e525d34139c903ce7791955e0b30b8d4c66e94453eed60f8d8d024caccb49204d6fb853 SHA512 4ec473a37dc135700f4ce06634e6aa303199f4d743fba02c04ca509d0c31d45f59da7c6cd9818efc1fd8bc20dae518c5656fc8a38e9f00057677b1e997434fb0
 EBUILD ddcutil-0.8.4.ebuild 2948 BLAKE2B 17189cad5f87ec5f58dfbf9ff4b65edb2acc61a21b5ed7189d48a1e97794e2b2fe4f9493a91e01295200d5a5afb124d2a7bdd6f3eb4ff3d3cc474347a3bad833 SHA512 1a557b9d80cbb683ada7621876be9ad6b5f72d7227a28f292811d4c6460aba95a107dd58e9952d2c139255b1b530c04d5e4f7f09175b7871a0bd3ac593cacfb5
+EBUILD ddcutil-0.8.6-r1.ebuild 2729 BLAKE2B 0fd422fd07caeb03c144e31767ed77e707a6f25c63872e06030d12715bde8d39d9425d2e4fe5f2e5a97aad073b9d8e445f97d60e18c80d52e4aae7fb8399812e SHA512 e3dc3ff5d24f50147670e36cc68aa6ee96e2d79329a023ff7c6624b3de090018812f0a4e25cb39f5200eb7a420e3906afa6fe089d505dcd08806c1d75fbfe03a
 EBUILD ddcutil-0.8.6.ebuild 2671 BLAKE2B 7d1b0e7df93a63bb795c03a985950e1da7f16f36db76bdb2602d31fd014a3016956cf6bccfe98ef48eefc321ab62ed24b6bf26f2d6cac92198486f4819ed486e SHA512 1d0837c24c04c25b64bc4b9da0a528b65ad8a04adce135507d11b26dc8183e9be0e66243de3338298a613527e8e6e581e648f2f0783788d943e160e170db1404
-MISC metadata.xml 1410 BLAKE2B dea4b476258ce356539c12acbd0d12f17fbecf0a260d7842e0cd826fe0a38900d2c88efdad3bd90fa53e1aa9544f08ccf8c736578c12d51863dde14dce3e9be6 SHA512 b4c9b19498494e79fef9898f78674458faad0f790509bc3562dd50d5a26b4620e242e7a2be5d6e13b51aca22c7f93f4b4b30b0e85415998648812750f4d5d01f
+MISC metadata.xml 1293 BLAKE2B 185066701c363efd3520b07a9ea0cd70f94f0adfc10ea4d3cc624904c6bd66ea925bac4ccb53afa22bb7bb24b843e019fcf62e11a26c934ef16729a50f2a7117 SHA512 cb5e342c412ab146f28e75944a47d91b73b7148234c2f25966fe24993c595bff47c5e5b87bec82e07401b41338837d5425ca32f02cfee4df20d176954abb66d3
diff --git a/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
new file mode 100644
index 000000000000..a1402f71b646
--- /dev/null
+++ b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic linux-info udev user
+
+DESCRIPTION="Program for querying and changing monitor settings"
+HOMEPAGE="http://www.ddcutil.com/"
+SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
+REQUIRED_USE="drm? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/i2c-tools
+	virtual/udev
+	drm? ( x11-libs/libdrm )
+	usb-monitor? (
+		dev-libs/hidapi
+		virtual/libusb:1
+		sys-apps/usbutils
+	)
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libX11
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${P}-remove-pedantic-cflag.patch )
+
+pkg_pretend() {
+	# This program needs /dev/ic2-* devices to communicate with the monitor.
+	CONFIG_CHECK="~I2C_CHARDEV"
+	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
+	if use usb-monitor; then
+		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
+		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
+		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
+	fi
+
+	# Now do the actual checks setup above
+	check_extra_config
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Bug 607818.
+	replace-flags -O3 -O2
+
+	local myeconfargs=(
+		$(use_enable drm)
+		$(use_enable usb-monitor usb)
+		$(use_enable X x11)
+		--enable-lib
+		--disable-cffi
+		--disable-cython
+		--disable-swig
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if use user-permissions; then
+		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
+		if use usb-monitor; then
+			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
+		fi
+	fi
+}
+
+pkg_postinst() {
+	if use user-permissions; then
+		enewgroup i2c
+		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
+		einfo "users to the i2c group: usermod -aG i2c user"
+		einfo "Restart the computer or reload the i2c-dev module to activate"
+		einfo "the new udev rule."
+		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
+
+		if use usb-monitor; then
+			enewgroup video
+			einfo "To allow non-root users access to USB monitors, add those users"
+			einfo "to the video group: usermod -aG video user"
+			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
+			einfo "the monitor to activate the new udev rule."
+			einfo "For more information read: http://www.ddcutil.com/usb/"
+		fi
+
+		udev_reload
+	fi
+
+	if use video_cards_nvidia; then
+		ewarn "Please read the following webpage on proper usage with the nVidia "
+		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
+	fi
+}
diff --git a/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
new file mode 100644
index 000000000000..e20cc36459ec
--- /dev/null
+++ b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
@@ -0,0 +1,126 @@
+diff -urN a/src/app_sysenv/Makefile.am b/src/app_sysenv/Makefile.am
+--- a/src/app_sysenv/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/app_sysenv/Makefile.am	2018-01-28 20:16:44.143484825 +0000
+@@ -15,8 +15,8 @@
+ 
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+ 
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/base/Makefile.am b/src/base/Makefile.am
+--- a/src/base/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/base/Makefile.am	2018-01-28 20:21:31.124936834 +0000
+@@ -4,7 +4,7 @@
+   -I$(top_srcdir)/src/public
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # AM_CFLAGS += -Wpedantic
+ 
+ if ENABLE_CALLGRAPH_COND
+diff -urN a/src/cmdline/Makefile.am b/src/cmdline/Makefile.am
+--- a/src/cmdline/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/cmdline/Makefile.am	2018-01-28 20:20:32.178848976 +0000
+@@ -4,7 +4,7 @@
+   -I$(top_srcdir)/src/public
+ 
+ AM_CFLAGS  = -Wall 
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # flags g_option parser structs in cmd_parser_goption.c
+ # AM_CFLAGS += -Wpedantic
+ 
+diff -urN a/src/ddc/Makefile.am b/src/ddc/Makefile.am
+--- a/src/ddc/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/ddc/Makefile.am	2018-01-28 20:18:09.643626498 +0000
+@@ -11,8 +11,8 @@
+ 
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+ 
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/i2c/Makefile.am b/src/i2c/Makefile.am
+--- a/src/i2c/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/i2c/Makefile.am	2018-01-28 20:17:30.271562118 +0000
+@@ -4,8 +4,8 @@
+   -I$(top_srcdir)/src/public
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Werror
++#AM_CFLAGS += -Wpedantic
+ 
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/sample_clients/Makefile.am b/src/sample_clients/Makefile.am
+--- a/src/sample_clients/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/sample_clients/Makefile.am	2018-01-28 20:19:57.230795822 +0000
+@@ -7,7 +7,7 @@
+ -I$(top_srcdir)/src
+ 
+ AM_CFLAGS = -Wall -fPIC
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ 
+ check_PROGRAMS =
+ if ENABLE_SHARED_LIB_COND
+diff -urN a/src/test/Makefile.am b/src/test/Makefile.am
+--- a/src/test/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/test/Makefile.am	2018-01-28 20:19:03.509712410 +0000
+@@ -12,7 +12,7 @@
+ 
+ 
+ 
+-AM_CFLAGS = -Wall -Werror
++AM_CFLAGS = -Wall
+ 
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/usb/Makefile.am b/src/usb/Makefile.am
+--- a/src/usb/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/usb/Makefile.am	2018-01-28 20:18:26.146653076 +0000
+@@ -5,7 +5,7 @@
+ -I$(top_srcdir)/src/public 
+ 
+ AM_CFLAGS  = -Wall 
+-AM_CFLAGS += -Wpedantic
++#AM_CFLAGS += -Wpedantic
+ 
+ if ENABLE_CALLGRAPH_COND
+ AM_CFLAGS += -fdump-rtl-expand
+diff -urN a/src/util/Makefile.am b/src/util/Makefile.am
+--- a/src/util/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/util/Makefile.am	2018-01-28 20:21:07.245901502 +0000
+@@ -3,7 +3,7 @@
+   $(LIBDRM_CFLAGS)
+ 
+ AM_CFLAGS = -Wall 
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # -pedantic issues warnings re code that doesn't conform to ISO C
+ #  Alas, -m modifier on sscanf is a POSIX extension, not ISO C
+ #  In combination with -Werror, causes device_util.c to fail compilation
+diff -urN a/src/vcp/Makefile.am b/src/vcp/Makefile.am
+--- a/src/vcp/Makefile.am	2018-01-20 06:40:55.000000000 +0000
++++ b/src/vcp/Makefile.am	2018-01-28 20:19:28.024750741 +0000
+@@ -4,7 +4,7 @@
+   -I$(top_srcdir)/src/public
+ 
+ AM_CFLAGS  = -Wall 
+-AM_CFLAGS += -Werror
++#AM_CFLAGS += -Werror
+ # vcp_feature_codes.c requires extensive changes if -Wpedantic
+ # AM_CFLAGS += -Wpedantic
+ 
diff --git a/app-misc/ddcutil/metadata.xml b/app-misc/ddcutil/metadata.xml
index 6a7c0c183edf..7a944d0907c0 100644
--- a/app-misc/ddcutil/metadata.xml
+++ b/app-misc/ddcutil/metadata.xml
@@ -5,10 +5,6 @@
 		<email>dracwyrm@gentoo.org</email>
 		<name>Jonathan Scruggs</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		ddcutil primarily uses DDC/CI (Display Data Channel Command Interface)
 		to communicate with monitors implementing MCCS (Monitor Control Command
diff --git a/app-misc/email2trac/Manifest b/app-misc/email2trac/Manifest
index c2177a799c6d..75251ff5718a 100644
--- a/app-misc/email2trac/Manifest
+++ b/app-misc/email2trac/Manifest
@@ -4,4 +4,4 @@ DIST email2trac-2.8.8.tar.gz 108366 BLAKE2B cbe5acac3ca21f19ab630995173dd49b5edf
 EBUILD email2trac-2.6.2-r1.ebuild 981 BLAKE2B 176d7107433347ff792ad41ae201bfea766e85609e3fce98fe2fc42b74e590b863fad540c70972ef03b9b022396890842f5556249f9d2342df6478e94e19b261 SHA512 6a8baee10560e563f1b09de0b042b8b06ff3254212e2f35a3ef07bce79327167a7d7ca85afe89acf0656bcdce5affb2ab999880227ebae7b35ba3d4cd238ad8c
 EBUILD email2trac-2.8.4.ebuild 981 BLAKE2B 4f2ccae782c9287e1440bdf2732efbaa4373371d2a9f6901907753431e47a5bdb90b29dc69015fd9a93ba99de923fd9a18deb4cabe078a5e699b2c38047eebce SHA512 56fc3b70aabae2ff8872b940a92d0c6144d0a96e2e1a5fba88b992dd4a703810fc7a55a2516af7911049e0d635f4d5ff3c62730150e0efc6e0632044df93596f
 EBUILD email2trac-2.8.8.ebuild 981 BLAKE2B 4f2ccae782c9287e1440bdf2732efbaa4373371d2a9f6901907753431e47a5bdb90b29dc69015fd9a93ba99de923fd9a18deb4cabe078a5e699b2c38047eebce SHA512 56fc3b70aabae2ff8872b940a92d0c6144d0a96e2e1a5fba88b992dd4a703810fc7a55a2516af7911049e0d635f4d5ff3c62730150e0efc6e0632044df93596f
-MISC metadata.xml 469 BLAKE2B 7d9035d738b92eb589d453ee62f00777ecc0b150e813c292db6e0caa4400a9f7bc3e31744af4bad4e41badd123fbbac237312e3931a0a06327ae887eaa9d8441 SHA512 1a2c1f355e3e685bf0891acd41850a71a65976a22b0d2be8be155ef7010d64a7ea1090acfd6c7b4caa96c5f1865cb89b411275a1e9f22a82ef1787c70f9c2af2
+MISC metadata.xml 249 BLAKE2B 58e91668bbe25a94a9ee787048ee974f1cb6944ae51bdf9f872f7df04894f44b261855cee2124514219894d93c3b643f9a47bccdf63f9cb0f46adc75528664c9 SHA512 8a900abd5f574a3ada624556efcdc93f5702661e50e03ae696f24ddb8d20a64cbe3bf3f5c71a018c6ad285d580d58eadcf4efc583046532b98405c9629d8d61f
diff --git a/app-misc/email2trac/metadata.xml b/app-misc/email2trac/metadata.xml
index e2500e65d776..ad70e38f24e0 100644
--- a/app-misc/email2trac/metadata.xml
+++ b/app-misc/email2trac/metadata.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>lukas@dzunko.sk</email>
-		<name>Lukas Dzunko</name>
-	</maintainer>
 <maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index 8c619d122a49..2c08573bb65a 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,5 +1,5 @@
 DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
-EBUILD gcal-3.6.3.ebuild 754 BLAKE2B 1b246ad82eafd5eae92372c6a4135d1bd4cdbb9217c399e200713c4888ef4b1a0ade87cdbaa6bef9a437e7e545c2e2cab7be0f26df69b6f93b9d67f491097ccb SHA512 67c6ce485011bc233e014305a3a2a5c5f721fcd5f6e35505e8d0282deb14a633219037e2b13d104abbf6fc7ef79ae630bb0ccdf8981f683ea77aa7f1c90fddc7
-EBUILD gcal-4.1.ebuild 758 BLAKE2B f271e00dda5a0bf25cae855833c05c3a0062ae1e52985ec730f3fe5caa7ab28a465ddb2cbffbb14fb1c0f61bbf78d50945a59e81eeaec42664da517fb2cc7f3d SHA512 3685267017698d218cd46fde8318f43cd33be38bd6727c8f56ab59d481ef82812bc99c0a6a2a0cd0f23194389a7b8ce240e0a59009862b60012927ce2e41dd61
+EBUILD gcal-3.6.3.ebuild 755 BLAKE2B 587f11c595be77c84acb9d7f9fe14be92b76721205e7e0ca3491440d98f37ddc34d4bd973833b1ee1af32a80a9719773e57291b6375900336973e73665d10057 SHA512 56331663a9c6e1ebee5b6acaf66ce3635c8524e6cbee8604c134ec0df68ef4577b89a7c839885102bed0986e9623cf7a60947e8159e2b6687d3cbc04b3bf07e5
+EBUILD gcal-4.1.ebuild 868 BLAKE2B 09ee0f85e3dc79ad692b952e7f189d525682b57e93c8233bf0d8b14c7a291a46390b9d19421cd4dfcc81e7746f0074162326caafcecaabe5e259b6f10b903304 SHA512 306c9790470d422c09f5536f24ae643f2c2ba8c36817aaae361615d89c559c19d5c6618859539776567e8e2a4833d706cc0765ee616c0cdaf99537fa51a2d14d
 MISC metadata.xml 1018 BLAKE2B cb75f985009092bb5b22cc15d4ad11da0f049d6b4fe1ac02479a73d5333102a0abe0a80f7673b408d6991b9c1c862706279a25abbd071f9faf3c1d012d69ecc1 SHA512 44362e0e9926b26bab6a3eef736bb8e6c1d76e33f94ec546a97bde251a5e03d8102d3f17ea48a20f18da957c325b766647e3574bd8e13f0f070a15b105d07ea3
diff --git a/app-misc/gcal/gcal-3.6.3.ebuild b/app-misc/gcal/gcal-3.6.3.ebuild
index c65c73db2e6d..ef7714001f50 100644
--- a/app-misc/gcal/gcal-3.6.3.ebuild
+++ b/app-misc/gcal/gcal-3.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="https://www.gnu.org/software/gcal/"
 SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ncurses nls unicode"
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild
index da50405b5703..7f56acee8cae 100644
--- a/app-misc/gcal/gcal-4.1.ebuild
+++ b/app-misc/gcal/gcal-4.1.ebuild
@@ -1,30 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="https://www.gnu.org/software/gcal/"
 SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="ncurses nls unicode"
 
 DEPEND="
 	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.17 )"
+	nls? ( >=sys-devel/gettext-0.17 )
+	unicode? ( dev-libs/libunistring:= )"
 
-RDEPEND="nls? ( virtual/libintl )"
+RDEPEND="nls? ( virtual/libintl )
+	unicode? ( dev-libs/libunistring:= )"
 
 DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
 
 src_configure() {
 	tc-export CC
 	append-cppflags -D_GNU_SOURCE
+	use unicode && append-libs -lunistring
 	econf \
 		--disable-rpath \
 		$(use_enable nls) \
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 9d4c127df846..1e8e02018f98 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -10,5 +10,6 @@ EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c20
 EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505
 EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353
 EBUILD mc-4.8.20-r1.ebuild 2484 BLAKE2B c21567591935cf0c88af5956661a8b5c7b47d053459b0c73b4927271319bd8cd48a7584c809d09088a6e6d29a4cfa35a4867f2239bfaf3584e753fb7b52e9952 SHA512 1e689261679bde58dce2e4818fb1ff3b413e9d952474d4fa36662c4900deb0526e13abed14979d558db98181471db3a982815215603d1f633ef8b04c650f6f84
-EBUILD mc-9999.ebuild 2585 BLAKE2B c226f71fd8a9ea6abfa2c0b3cf9c731f1271e64d257d34797635738cf634b9159c693ef312cfcbda43f0aa2207b79bbb0d2071f41c3393372da44c547c6fcdd3 SHA512 bab03c4a246785495ff69deaba2c97268ec95449b5887a941dbc54513d0f00d193fec63c26a69f1d95c45612a81c5c8818f12dcf0b0ede5f4e7afa81595d6d91
+EBUILD mc-4.8.20-r2.ebuild 2616 BLAKE2B 47f90ba86acc15004703a6c56839bc5127ec773c37cca21994cfccf8940eefdd4cedfc936b1b090af8dbb3514beb51fa3b2b2ad3d61582367d9538746836f8de SHA512 f74f0f000974f99e2afb21a50732c437fbe19414d8f824ab8aa09fac763834023555f66901e307f8f89f3da9056b7d990c374be20a5d48a0605e61282dc78f23
+EBUILD mc-9999.ebuild 2710 BLAKE2B acbcdaf95260df5b4f34ac03e19b2b674f65d3c95083e79eaf916cd62f99ea0d9008c94bb2c0e030bcd8face202c00a646eca1521461058ae009da1f17a4499e SHA512 0388200a8134818d797d79849bc618a222377c33fb1802dcbf2fdafcbc22d85888171fee546ff5a484aeb4d97074afa1fea23ea5ee2078182bf72277658b65bb
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.20-r2.ebuild b/app-misc/mc/mc-4.8.20-r2.ebuild
new file mode 100644
index 000000000000..5b6a3787b528
--- /dev/null
+++ b/app-misc/mc/mc-4.8.20-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+	"${FILESDIR}"/${PN}-4.8.19-selected-size.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_prepare() {
+	[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')")
+		$(use_enable kernel_linux vfs-undelfs)
+		$(use_enable mclib)
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 1f19e217d3ac..ef5501c8bc47 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	LIVE_EBUILD=yes
 fi
 
-inherit eutils flag-o-matic ${LIVE_ECLASSES}
+inherit flag-o-matic ${LIVE_ECLASSES}
 
 MY_P=${P/_/-}
 
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.midnight-commander.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
 
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/glib-2.26.0:2
 	samba? ( net-fs/samba )
 	sftp? ( net-libs/libssh2 )
 	slang? ( >=sys-libs/slang-2 )
-	!slang? ( sys-libs/ncurses:0= )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
 	spell? ( app-text/aspell )
 	X? ( x11-libs/libX11
 		x11-libs/libICE
@@ -47,6 +47,12 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/check )
 	"
 
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
 src_prepare() {
 	default
 
@@ -54,30 +60,27 @@ src_prepare() {
 }
 
 src_configure() {
-	local myscreen=ncurses
-	use slang && myscreen=slang
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
 
-	local homedir=".mc"
-	use xdg && homedir="XDG"
-
-	econf \
-		--disable-silent-rules \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		--enable-vfs \
-		$(use_enable kernel_linux vfs-undelfs) \
-		--enable-charset \
-		$(use_with X x) \
-		$(use_enable samba vfs-smb) \
-		$(use_enable sftp vfs-sftp) \
-		$(use_enable spell aspell) \
-		$(use_with gpm gpm-mouse) \
-		--with-screen=${myscreen} \
-		$(use_with edit internal-edit) \
-		$(use_enable mclib) \
-		$(use_enable test tests) \
-		--with-homedir=${homedir}
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')")
+		$(use_enable kernel_linux vfs-undelfs)
+		$(use_enable mclib)
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -92,7 +95,7 @@ src_install() {
 
 	if ! use xdg ; then
 		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
+			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
 	fi
 }
 
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
new file mode 100644
index 000000000000..0178d895df45
--- /dev/null
+++ b/app-misc/nnn/Manifest
@@ -0,0 +1,3 @@
+DIST nnn-1.6.tar.gz 37456 BLAKE2B 90a6bcf7123b763585a05d5898ecee129561fa11dddbc40125f536b96315e4847b6187615df2bb6e0262d3df5efeec83d6681092ed69e4b65cd5486cf396e7e6 SHA512 7172f37f98f15b37cd2959c5ad144d32f55cde9cd2fe3221fc7a23887d3326da924c9be0bdc61a01a4d98ceb9b03de2420a66cc2cbf94a2ae1547da206e4c49a
+EBUILD nnn-1.6.ebuild 1079 BLAKE2B d80952f77883811cb91d4c5d9e5a412bf75896fd1827ae70daee380341060d30dd9589dfe0c49587220f2dc53a7dff24aa2e6a2ef537cb20452474c415f639cf SHA512 18eeadc9e37f7853bf2341e96ca1a3a4a6bbe70b8d8576f9dfd92509c0001e8b106a0e8ee34d30a335f9fc68956b82ab23ab6d41f7e34a3f201ba04abb910f99
+MISC metadata.xml 324 BLAKE2B abbc05bbc35735d7a931021eac9e8f9a4584867c885fea581f57d7b4e9d83be1b2b3ec8b5246c1ecafd9c1e55078d66fa1cac22a8321beb5d4912a596c721e48 SHA512 291b497b906b3fdcbee656d90292d5b267c4082d1864e38f64938ce2d3b8aa56ca782d217f3a0776049db5dd7da416a4200e86f91da7075c54998b5901f78ef5
diff --git a/app-misc/nnn/metadata.xml b/app-misc/nnn/metadata.xml
new file mode 100644
index 000000000000..a919cc815a67
--- /dev/null
+++ b/app-misc/nnn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+</maintainer>
+<use>
+	<flag name="fish-completion">Enable fish completion support</flag>
+</use>
+</pkgmetadata>
diff --git a/app-misc/nnn/nnn-1.6.ebuild b/app-misc/nnn/nnn-1.6.ebuild
new file mode 100644
index 000000000000..b1965355b427
--- /dev/null
+++ b/app-misc/nnn/nnn-1.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion fish-completion zsh-completion"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}
+		fish-completion? ( app-shells/fish )
+		zsh-completion? ( app-shells/zsh )"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	use bash-completion &&
+		newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+
+	if use fish-completion; then
+		insinto /usr/share/fish/completions
+		doins scripts/auto-completion/fish/nnn.fish
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/auto-completion/zsh/_nnn
+	fi
+
+	einstalldocs
+}
diff --git a/app-misc/tasque/Manifest b/app-misc/tasque/Manifest
deleted file mode 100644
index 30a319d364bf..000000000000
--- a/app-misc/tasque/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tasque-0.1.12.tar.xz 461576 BLAKE2B 1bf0ccc9ff67056d2ca5f2595a3f7eb14bd7ea0f967e0058e84168eb82eddc6c551e878ae72945b9a97aebd1ddcdf4b9295eeebf06d0ce3295b7085027673316 SHA512 441aa1a13d260e59ef07bb75a0b38b43cbcc30737589922ba4e697220fdd0a9bfe9af8c1c2484b6c0d68a4f33cb0f895822cb04e90d6782db66c0f80de50078b
-EBUILD tasque-0.1.12.ebuild 1302 BLAKE2B f00c2ba934d46eb18071cd2430a45a015a4c88d7ef2e7184256426dbd4f81f548427f1a178172b24f9949d6ddc1f96f4464495aaa1f250999260f5e76302d8af SHA512 484c341062e5d3845019a96f2a6250b31e7138129fa98f7efe526e03073110da7b22a6104c30d7d6f0a9751a0cc66d8a973e11fe294534a60d7f2fd6e28cde82
-MISC metadata.xml 500 BLAKE2B 30d76a992fc5f8c7c1011c0afea16064b10548d123a8572729031de655a59bfb037702b845758d7779ee4c8fb55b1f46b1bbf4cf33ad0b27e615e9d5b5234cb2 SHA512 a3974aeaef52942ec8e4f450c80ef5553921b458c2b2caccec60f08a34ac9efc37779a42d90212b643a86c551329696076f1925b8d33cbe6d2dfe1f859424e94
diff --git a/app-misc/tasque/metadata.xml b/app-misc/tasque/metadata.xml
deleted file mode 100644
index 2989d5474d21..000000000000
--- a/app-misc/tasque/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
-	<use>
-		<flag name="rememberthemilk">
-			Allows you to use http://www.rememberthemilk.com/ as your storage backend.
-		</flag>
-		<flag name="hiveminder">
-			Allows you to use http://www.hiveminder.com/ as your storage backend.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-misc/tasque/tasque-0.1.12.ebuild b/app-misc/tasque/tasque-0.1.12.ebuild
deleted file mode 100644
index aee4663574b9..000000000000
--- a/app-misc/tasque/tasque-0.1.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome.org mono
-
-DESCRIPTION="Simple task management app (TODO list) for the Linux Desktop"
-HOMEPAGE="https://live.gnome.org/Tasque"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+rememberthemilk +sqlite hiveminder debug"
-
-LANGS="ca ca@valencia cs da de el en_GB eo es et fi fr gl hu id it ja lv nb nds nl pl
-	pt pt_BR ro ru sl sr sr@latin sv th tr zh_CN zh_TW"
-
-REQUIRED_USE="|| ( rememberthemilk sqlite hiveminder )"
-
-RDEPEND=">=dev-dotnet/gtk-sharp-2.12.7-r5
-	>=dev-dotnet/notify-sharp-0.4.0_pre20080912
-	dev-dotnet/dbus-sharp:1.0
-	dev-dotnet/dbus-sharp-glib:1.0
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf	--disable-backend-icecore \
-		--disable-backend-eds \
-		--disable-appindicator \
-		--enable-backend-rtm \
-		$(use_enable sqlite backend-sqlite) \
-		$(use_enable hiveminder backend-hiveminder) \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-	mv_command="cp -pPR" mono_multilib_comply
-
-	if [[ -n ${LINGUAS+set} ]]; then
-		einfo "Cleaning up locales..."
-		for lang in ${LANGS}; do
-			if has ${lang} ${LINGUAS}; then
-				einfo "- keeping ${lang}"
-			else
-				rm -Rf "${D}"/usr/share/locale/"${lang}" || die
-			fi
-		done
-	fi
-}
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 5d979fa10a08..e1a42d3997c9 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,5 +1,7 @@
 DIST vifm-0.7.2.tar.bz2 468086 BLAKE2B a83b1f43eb3f6e47afd5a7c810741468857c602b80cad5c91d2033eea9e1f1efb09e19ca7b02f39e93f8f7186b4cb6fb0627f98a30c054a0d7d71d1b454698d8 SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9
+DIST vifm-0.9.1-beta.tar.bz2 1002371 BLAKE2B 435b50294a623e1e0bc1f98b2f4687bb9e85934178c540fda89a8e0d8ff32e9ea1a944cc7fb39190ca741d57e4c5abbd5a46e776d0115cf3892452bff565bb15 SHA512 c8516acf069fb88f8cfc0db663623ab37caf34277b7fd4d07759deb026c11ac70a7d438e419fc8f5d545e2e25b8e9cc40f8220c3b415c97a8e7e8b9d132bdb0c
 DIST vifm-0.9.tar.bz2 971539 BLAKE2B 5d6dd8c399e38886ab3e2d548b93492bf31b464e5661c6f6d54504701bf1eab8338155a9ddc9b220c4cb2a67417d5622094e9ffb717ddf594984fe475214af60 SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a
 EBUILD vifm-0.7.2.ebuild 1471 BLAKE2B 0172539787d0e577b30b4ebfcf260012c3861a2ea0e27821671e981b785ccb0dbc9817e06d8f72164606566efdbcce8082a75627c7a8132f74256abe4dc432e6 SHA512 97f60228c3d17c96913abc074e02f3a67687e82b2b6b961bee0d82d3bebf5079115ebca7cc3bb9d901c0291aeeb91e722f083aac8947fc86947d6259966f18f0
+EBUILD vifm-0.9.1_beta.ebuild 2118 BLAKE2B 84175b7297d3c40ff1cba09b8313b5ababd4de00e2a1359e2c7585ec4d22c9554a2d3fe2c0cf36d7707e02a831798bd34cee0a739f9e166fb21f15486f1c40bd SHA512 7db7685b9d5cad5183c5f62d9bf7370e186ce9c2ec5544e77ef9cdbfee7e840923d7b19c4d91a4474182b8c560af705270592880ae78982469277e5ef263c62b
 EBUILD vifm-0.9.ebuild 1974 BLAKE2B eb32205afdb5c4dfb84934a6875764549495b38341b719ca01b7cf86c8e7ccbab0b1fd5854e5509e88ba3cb3789d281c887e57fbce4545aa5088b9d5a6551ebf SHA512 7469278aeafedd5ae109fc4062a449c074f8750b23dfc99ffee47a7279e2258825214ba5f67c60ead14e87c49e547ed406e24650acd9962ff0724e2db415c5a0
 MISC metadata.xml 1457 BLAKE2B 0728b3f566cb00a2e3e48d84eff80de83629d026de506863a34a283de41cc80b99021da88b81e4332682b79176526cf65378d6b18142ec026c0dfe23447ecec1 SHA512 ea9d05e36d616a6d9588549317307e28acfe19f66493c870dca9767027124ba1ff45369e5f413dcac5697895f854baf148ef0afc687a801157bba40ce1be5f9a
diff --git a/app-misc/vifm/vifm-0.9.1_beta.ebuild b/app-misc/vifm/vifm-0.9.1_beta.ebuild
new file mode 100644
index 000000000000..283cc2139c34
--- /dev/null
+++ b/app-misc/vifm/vifm-0.9.1_beta.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools vim-doc versionator xdg-utils
+
+MY_P=$(replace_version_separator 4 '-' ${PF})
+
+DESCRIPTION="Console file manager with vi(m)-like keybindings"
+HOMEPAGE="http://vifm.info/"
+SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
+
+DEPEND="
+	>=sys-libs/ncurses-5.9-r3:0
+	magic? ( sys-apps/file )
+	gtk? ( x11-libs/gtk+:2 )
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="
+	${DEPEND}
+	vim? ( || ( app-editors/vim app-editors/gvim ) )
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+"
+
+DOCS="AUTHORS FAQ NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
+		|| die
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable developer) \
+		$(use_enable extended-keys) \
+		$(use_with magic libmagic) \
+		$(use_with gtk) \
+		$(use_with X X11)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ${DOCS}
+
+	if use vim; then
+		local t
+		for t in app plugin; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/doc/"${t}"/"${PN}"*
+		done
+	fi
+
+	if use vim-syntax; then
+		local t
+		for t in ftdetect ftplugin syntax; do
+			insinto /usr/share/vim/vimfiles/"${t}"
+			doins "${S}"/data/vim/"${t}"/"${PN}".vim
+		done
+	fi
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	if use vim; then
+		update_vim_helptags
+
+		if [[ -n ${REPLACING_VERSIONS} ]]; then
+			elog
+			elog "You don't need to copy or link any files for"
+			elog "  the vim plugin and documentation to work anymore."
+			elog "If you copied any vifm files to ~/.vim/ manually"
+			elog "  in earlier vifm versions, please delete them."
+		fi
+		elog
+		elog "To use vim in vifm to view the documentation"
+		elog "  edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	use vim && update_vim_helptags
+}