gentoo resync : 04.08.2018

29 files changed, 402 insertions, 338 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 2db61eb2bc9f..ba9b94eebf65 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bijiben/Manifest b/app-misc/bijiben/Manifest
index 62c3d54ed6f7..877156348148 100644
--- a/app-misc/bijiben/Manifest
+++ b/app-misc/bijiben/Manifest
@@ -1,3 +1,5 @@
 DIST bijiben-3.24.2.tar.xz 843548 BLAKE2B 2441e3e9f672c7a9796dd1786bedf29ae1b5a6c4563b07943c4bfc252dc2ad9be0e8ab0569cbceb2b2c839a93d45ef3cd671d68d9b6717f880ffbb3f80d3392f SHA512 e5571c793fc75b1038a024f0f73b539079ca4415c7f4fd0756314a14baa1fe679d9513bf8c291aa20170f35616be409ebd0360e3d3ec8f962f2d3d143e02185e
+DIST bijiben-3.26.1.tar.xz 864676 BLAKE2B 8c15939d356af70ed30c8bf7dcb9cb8d81ac6f1ad5969b0b6e9fefd08efd267c65454f582e368d5183425d3cfba9fe6d2d227d1825f1c7be52fbdc5ff53ef0ff SHA512 a057fcd0400eecff90bd8feb67c775ca036d0f40e92b44cc1f35fe418288ad9aec5cfb080c8c47ba862bfbecfd94ec69a0bbd811e0364d2e273901b7d4a8b2f9
 EBUILD bijiben-3.24.2.ebuild 746 BLAKE2B 7412677816ed6c312d161368aaad02a409b0305ae7bb18146f490cb76026bbfd09c65a77e8fa7725afa85e938ac7289856e608905df8bf4d5e21f68233a6fc34 SHA512 d46b0891c5fa2c9268f8f667be70bb9a95b7fa7df75b090837d7cf1f156df09977ba1879b139f1a913324da3bac70f84328c5d8a21c415e5c16323ddc5f4142d
+EBUILD bijiben-3.26.1.ebuild 695 BLAKE2B 04654cb51f822a9bae0542fbe5c868557e11765ab7a551a81731a52d208238f70c740353b0343beb86f51e46cfbde6fbf1f0f835d863f74310c15292ec4e435b SHA512 4aad745279633e09caa3fe35c16940b98d3053c1a741b4197d31b52717dd0d170fc484085e857131944c41f2f2aa3a6e68d45bf3840c47f084c666da62cd5ee5
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-misc/bijiben/bijiben-3.26.1.ebuild b/app-misc/bijiben/bijiben-3.26.1.ebuild
new file mode 100644
index 000000000000..c73d26287367
--- /dev/null
+++ b/app-misc/bijiben/bijiben-3.26.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Note editor designed to remain simple to use"
+HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=x11-libs/gtk+-3.11.4:3
+	>=gnome-extra/evolution-data-server-3.13.90:=
+	>=net-libs/webkit-gtk-2.10.0:4
+	net-libs/gnome-online-accounts:=
+	dev-libs/libxml2:2
+	>=app-misc/tracker-1:=
+	sys-apps/util-linux
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
diff --git a/app-misc/cdircmp/Manifest b/app-misc/cdircmp/Manifest
index 872949edd513..a5f50352c87c 100644
--- a/app-misc/cdircmp/Manifest
+++ b/app-misc/cdircmp/Manifest
@@ -1,4 +1,3 @@
 DIST cdircmp-0.3.tar.gz 17253 BLAKE2B 090e73d2d60ff10e8ba01c77c172b6e4b4603c778f4ad8b29dbcedd8e214f54377c171bc964c14ab4f08dc8e995b5c6b55601f75977b35669cbcfb23d0c19fea SHA512 66fa27a3c06aa4bd6584da2c6a38ad0798f5f10eb9b021080c473d03733bd2dba344549e95c22485bf72536a03a4e91a7497192296b6c297166e47a679cf0079
-EBUILD cdircmp-0.3-r1.ebuild 756 BLAKE2B 85ff26a39b82cb2bcd1b6ad1ed8215ade2d1f986c63a75215db444598bb933510eeac73a6b42a52164e4c8053c97ad247051f4981faf5ccd81b50968cfaf2ed1 SHA512 1f208a84a06f735e3631ec55159528ab24712cf74228d9f8e7957d3383202c8953a40815ebf339b812cf41cc1323d2eab41194384b795533b5c78499be68325d
-EBUILD cdircmp-0.3-r2.ebuild 663 BLAKE2B 371d80aa2cb1f654a0bba24d9cf21a2d418184ca73fa067d5a542594d9f7d44433deeeaed0db98c7aad01fb7ca6ada50096ca40be452cce03a4468e3f4b4d872 SHA512 2be97f0c1bed5525e7f1bb04ad123dedd83c6d3894909fce94838605b12d157cbe594c4fa21fada0e8e859f361945dbcef9cad0f843530f08628c43296220c96
+EBUILD cdircmp-0.3-r2.ebuild 661 BLAKE2B 765f4f6ffc232b57178724fecd2f17791fd36977ed6de2b04775011411918d9df3bfd27d4af582780a15e6d13c06c370640a5a7b627d8f75995adba8cd70293f SHA512 b040bfdcb52a22d3579420b993c8a3a02bdf1afbb2e4f20192c6caf17e2675b9925c5dbb29713f99b882c37c8533d4cb72e087f35511f9318ea5764e731d8274
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdircmp/cdircmp-0.3-r1.ebuild b/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
deleted file mode 100644
index f7851f0207a2..000000000000
--- a/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Compare directories and select files to copy"
-HOMEPAGE="http://home.hccnet.nl/paul.schuurmans/"
-SRC_URI="http://home.hccnet.nl/paul.schuurmans/linux/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5.4"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_prepare() {
-	sed -i Makefile \
-		-e 's| -o | $(LDFLAGS)&|g' \
-		|| die "sed Makefile"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-
-	dobin ${PN} || die "dobin failed"
-}
diff --git a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
index ea5818e44538..928b138f683c 100644
--- a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
+++ b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://home.hccnet.nl/paul.schuurmans/linux/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/ncurses-5.4:0="
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 7e6d06778afe..6bd8516fb40a 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -1,4 +1,7 @@
 AUX datefudge-1.17-bsd.patch 2751 BLAKE2B d6d5bd6048126bb4f95dfba76eb538b555829c16272e846f3c470ee882ab9313b5d5974d29b6e73835278c61c032ba3d6acaf2026e9d3e91c5cac825bc4006c6 SHA512 390ff54428a4ffbdf5cc383aa6229f3ed7be7070d62567a0a04bf169efb6e7fe21c756d34d7865f51523a26204e6014edf936800523723d5f8370997f06dd858
+AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
 DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff55f5cf076a6a66af2f17ff7677501ef9a6d9a8aedc7cd531093e7efe59b9146abe250fe2a1fc44e05bbedf313 SHA512 6d335f2c1f42792756d3a81264be0bdf4cde5efab86bec5b62de9ccb2488deaff67e4a4f6c7984fa7a5336156df2d76e366bf486436052d2c5ee5ff88067335e
+DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
 EBUILD datefudge-1.17.ebuild 972 BLAKE2B de096b081d3d0f8050ae187b7206caed8385c4f024b6254cf7953cef65de367effac0b933d0514446058bd59cbae873cdba4e2c0d46974f3d469dc8719a24a74 SHA512 5490d0eeed9d1c2ac6a1f2aff174f8b5411876983bbcf1e8194f8d882617563d3a2ffac14e5e0b4d4a72727ea0b85b08c5461a90366626f264667fb049e67b86
+EBUILD datefudge-1.22.ebuild 1011 BLAKE2B 4054e31fb2d326c829659adce961be253c41c39c835e12dc6f5073e0fa8664f1738479dddbae7dc4ea3674068f170a20459c086ceb6e55b38ec5b308ba274cfc SHA512 bb12d1583f021703bf2f7567808c72c92124788751bd12fff40613dca2bec9964a717dc4188cc78d86254bfcd383fe3e9b194e89d11ef3c6da8ef124588dfb67
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-misc/datefudge/datefudge-1.22.ebuild b/app-misc/datefudge/datefudge-1.22.ebuild
new file mode 100644
index 000000000000..82e8be0176c4
--- /dev/null
+++ b/app-misc/datefudge/datefudge-1.22.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs eutils
+
+DESCRIPTION="A program (and preload library) to fake system date"
+HOMEPAGE="https://packages.qa.debian.org/d/datefudge.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+PATCHES=()
+
+pkg_setup() {
+	use userland_BSD && PATCHES+=( "${FILESDIR}"/${P}-bsd.patch )
+}
+
+src_prepare() {
+	default
+	sed -i \
+		-e '/dpkg-parsechangelog/d' \
+		Makefile || die
+	use prefix && sed -i -e '/-o root -g root/d' Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" libdir="/usr/$(get_libdir)" VERSION="${PV}"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" CC="$(tc-getCC)" libdir="/usr/$(get_libdir)" install
+	einstalldocs
+}
diff --git a/app-misc/datefudge/files/datefudge-1.22-bsd.patch b/app-misc/datefudge/files/datefudge-1.22-bsd.patch
new file mode 100644
index 000000000000..87ce6ddb9586
--- /dev/null
+++ b/app-misc/datefudge/files/datefudge-1.22-bsd.patch
@@ -0,0 +1,60 @@
+From 3731c2da347dfffef34209fd779e67738b34ec88 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Tue, 24 Jul 2018 22:58:34 +0300
+Subject: [PATCH] bsd support
+
+---
+ Makefile | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 8855b49..5526cbf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,11 +20,11 @@ all compile: datefudge datefudge.so datefudge.1
+ 
+ install: datefudge datefudge.so datefudge.1
+ 	install -d $(DESTDIR)$(libdir)/$(libarch)/datefudge
+-	$(INSTALL_PROGRAM) -o root -g root -m 644 datefudge.so $(DESTDIR)$(libdir)/$(libarch)/datefudge/datefudge.so
++	$(INSTALL_PROGRAM) -o root -g wheel -m 644 datefudge.so $(DESTDIR)$(libdir)/$(libarch)/datefudge/datefudge.so
+ 	install -d $(DESTDIR)$(bindir)
+-	$(INSTALL_PROGRAM) -o root -g root -m 755 datefudge $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) -o root -g wheel -m 755 datefudge $(DESTDIR)$(bindir)
+ 	install -d $(DESTDIR)$(mandir)/man1
+-	install -o root -g root -m 644 datefudge.1 $(DESTDIR)$(mandir)/man1
++	install -o root -g wheel -m 644 datefudge.1 $(DESTDIR)$(mandir)/man1
+ 
+ datefudge: datefudge.sh
+ datefudge.1: datefudge.man
+@@ -34,7 +34,7 @@ datefudge datefudge.1:
+ 	< $< > $@
+ 
+ datefudge.so: datefudge.o
+-	$(CC) $(LDFLAGS) -o $@ -shared $< -ldl -lc
++	$(CC) $(LDFLAGS) -o $@ -shared $< -lc
+ 
+ datefudge.o: datefudge.c
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+@@ -48,8 +48,8 @@ test: compile
+ 	export TZ=UTC								 ;\
+ 	ret1=1; ret2=1                                                           ;\
+ 	for i in 1 2; do                                                         \
+-	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
+-	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date --date=12:15 +%F.%T` ;\
++	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
++	        dt=`LC_ALL=C LD_PRELOAD=$(CURDIR)/datefudge.so date -v12H -v15M +%F.%T` ;\
+ 	        exp="1970-01-02.12:15:00"                                       ;\
+ 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret1=0; break; }          ;\
+ 	        echo "failed: expected: $$exp, actual: $$dt"                    ;\
+@@ -58,7 +58,7 @@ test: compile
+ 	echo -n "Running a simple perl localtime() test... "                    ;\
+ 	pscr='@t=localtime(time);$$t[5]+=1900;$$t[4]++;printf "%04d-%02d-%02d\n",$$t[5],$$t[4],$$t[3];';\
+ 	for i in 1 2; do                                                         \
+-	        export DATEFUDGE=`LC_ALL=C date --date='yesterday 0:00'  +%s`   ;\
++	        export DATEFUDGE=`LC_ALL=C date -v-1d -v0H -v0M +%s`   ;\
+ 	        dt=`LD_PRELOAD=$(CURDIR)/datefudge.so perl -e "$$pscr"`         ;\
+ 	        exp="1970-01-02"                                                ;\
+ 	        [ "$$dt" != "$$exp" ] || { echo "OK"; ret2=0; break; }          ;\
+-- 
+2.16.4
+
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 7dfb9b720e98..96c2fdea335b 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -4,6 +4,7 @@ AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd
 AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
 AUX elasticsearch.init.3 1873 BLAKE2B 58c1fa6be05b4fc28ee0b65bb5f95522b5dee4fed706f8a207a48279a5be135e841dc7228f851ed0f8318d1717b810eb4a6048de2590336f31d7de6f72193f57 SHA512 8b4738042882fdbab3979a48174aee2e389570e4fcf5c07b2d2ef990fe9f38097f29c424ff9a7a50bc2b9f2fb0612b0b5d160e31901d34f5b33e21d5fff99b0c
 AUX elasticsearch.init.4 2018 BLAKE2B 5cce066d530afb57e4bc55026d68f57ab41419c6967145efa621051159efdeb5f12e5cbf97d50048d7b7266cc3d2c41e2957c212623cc9139d4b8558dda42864 SHA512 648bb8cf6a5223920db6685be68e439a6854a3d7532ecf6f2fcfaabfc95a5cb768982e7168063926b40eabb0e3a8d4e0a3b4a30213b2a8cbe59eafbeae5cb7c6
+AUX elasticsearch.init.5 2050 BLAKE2B 51908266d476c0fe21ceeb01e4fb9aede5ef70944025a26dbbaea582253e32442a938e39842371397b15c70ecfc9ae4abc8f549f75c3fdf55e1d09e16c25f871 SHA512 127f050a322ba2fd1ca92352ccfc9e3abf5e768b0c1b6e6fbb73633f4aa8fb3dbc8c9118428ed56070e91e2141edda2cd488185a272f0d0022e88ca32172cd7f
 AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.2 1544 BLAKE2B bb66a0e945df66f84937804461ed51216f8bc4585dbdfbd5e834aad0632cc7fbf1005322509183705b62fdfe0f0d105bcc238810056ec066102d8ea84dbb1020 SHA512 33dc3efc736501d6e04ab1aa1b13a4d5f5cb235f7d9ff9674715dd47afdf1e8da8db0a4b82ce46c8c6b71d8258917e8943613eff8a0371a82b5d2e490acefd77
 AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc
@@ -16,4 +17,5 @@ DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d9530239
 EBUILD elasticsearch-5.6.10.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
 EBUILD elasticsearch-6.2.4.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
 EBUILD elasticsearch-6.3.1-r1.ebuild 2106 BLAKE2B fab4c1d557642ef3cb4728e297a5e95e0752272a19180d5febb7d2a4b5a3174533840d37e9aaa43cb931f278ff25e93d8dcdc200b03c2bbcc94b7e61608def1b SHA512 315019c24210c3f28f3e8359c5a2cabc2f3efa005ebf3e812b0539ad1a4b6af81ffa47d79ec7a76b26766f65babbd944d55556004b8f4d95c2027d4179c5a2e2
+EBUILD elasticsearch-6.3.1-r2.ebuild 2106 BLAKE2B 45e4525eca1113cc02438b0b2f5b6a40223357aa46382bcf90ffaa3944ed13dc7f2d5d21b044793946fa86d838ba81319020c15e6379a23083ef74d5b09afd00 SHA512 f7e94b4d03dfbbc7975051eda8579412d4d0db883b5e35904304260f0ac7de285e1c66408f4b291cabe7cab4401d94c2974ef710122d4aae77134380fd076ce9
 MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
diff --git a/app-misc/elasticsearch/elasticsearch-6.3.1-r2.ebuild b/app-misc/elasticsearch/elasticsearch-6.3.1-r2.ebuild
new file mode 100644
index 000000000000..1b8deddcf8cc
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.3.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	rm -v bin/*.{bat,exe} LICENSE.txt || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -rv config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.5" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.5 b/app-misc/elasticsearch/files/elasticsearch.init.5
new file mode 100644
index 000000000000..b9dba6ca5d58
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.5
@@ -0,0 +1,68 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${RC_SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${RC_SVCNAME} != "elasticsearch" ]; then
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_args_background="--daemonize --pidfile=${pidfile}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	# fails to start without keystore
+	if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
+		"${ES_HOME}/bin/elasticsearch-keystore" create
+	fi
+}
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index 5360e15458da..f6fb261a0b50 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,3 +1,5 @@
 DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
+DIST go-jira-1.0.19.tar.gz 1292750 BLAKE2B 2377b5d677878e83d764d65fe3ef9c3388aa5999004adce956549b327e00554142f7fc82c724593652fd5b5a2d23e161b926bb3c34285f971df0bdac90c94a0a SHA512 42fb89f0886df19eac6cc7098da1e03a0e091876777de896a1b035b6f9d0cb5b546b8fb4c8d4469450da11e2a52b158256f959a63fc57ffeb4541cf792bf3b0f
 EBUILD go-jira-1.0.17.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
+EBUILD go-jira-1.0.19.ebuild 686 BLAKE2B ab33305d1c3a5d86616dbe74f431e787a2f9580ae778467fd98c9f5f70b3054182036611d19d843137919b44f1662606b2811e53a263789a6d86d5210c7f81d4 SHA512 93c12cbaf1c43389ca3e96adcb78f63bdcc9057adf66b75d01841b9420f72d83b663e4e306997dbe1aae5306f786a0f7dd060591297ddc7a0a0c0ba6cd6f0b98
 MISC metadata.xml 336 BLAKE2B e4bdd5129c1bc5e5a26f4ae70fa1528c9a5ee2811fa5df2e5876ea3f1044afa3327a3b9897b199b2f18b451bae57da965371f8184196b299a036843bce3ed494 SHA512 37e0c43ce89345c1e0136e8e1f162abd77def9f295ddd8abc3b49f638847a1c08c41cb1055415aeb5a3ce5d1eab37b9ca2654764255ea6ccf9d76adc0a5f8009
diff --git a/app-misc/go-jira/go-jira-1.0.19.ebuild b/app-misc/go-jira/go-jira-1.0.19.ebuild
new file mode 100644
index 000000000000..513090c2a8f9
--- /dev/null
+++ b/app-misc/go-jira/go-jira-1.0.19.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A simple JIRA commandline client in Go"
+HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
+SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${WORKDIR}/${P}" go build -v -o jira  cmd/jira/main.go || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/jira
+	dodoc src/${EGO_PN}/{CHANGELOG,README}.md
+}
diff --git a/app-misc/jira-cli/Manifest b/app-misc/jira-cli/Manifest
deleted file mode 100644
index dcb3da86e3f1..000000000000
--- a/app-misc/jira-cli/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jira-cli-2.1.5.tar.gz 122947 BLAKE2B 981f2df0e695da4c7a1db312f148f848f633a65a4fdf74e0235bfc69c1940697558a3c0ab49cab85ea7c7833e7c7ee754d6cd8db01a90370250ec46a8c66d0ee SHA512 8d8cad01d93fcca63ac9420856bca4825bba1e1954e674378c2a3f501c7716125afbda96c5ef12ba4d90e4e771b1d80165aaff1db883af5706510476bd9d8799
-EBUILD jira-cli-2.1.5.ebuild 1227 BLAKE2B d45b3945ec815be085357a6dd94ec20bbf74ca96248c44cc70e6e554a8131df6a2d3d0ebe9e33a7cae53c0f79d2c152a58ea55a50dc6e15d57ada9ce33b03828 SHA512 27db6baac917b364e22338653a4957d92bee9a94bd6cd3221dad41c5500d553a664f9a33f60ca4902fdd8aef9a2633936ff4b14890979c8bda35331d7daa7c55
-MISC metadata.xml 250 BLAKE2B e7d7932fc0bcee598bd952a4eae1b4d987781e4760bbff47cf76fb07cd0c20e11c5f4cd2435a142a95061903894fe4f19436b90dbc2b90fa0a69916e98da2d7a SHA512 a83961ae0675dc47814c64d67093438c96266c1714be601841bc2836dabc9b1ae8fb9c9f2c6f412f2b88aee8b3638648ea9232f7c49faa4c88f1bd4ea00a02bd
diff --git a/app-misc/jira-cli/jira-cli-2.1.5.ebuild b/app-misc/jira-cli/jira-cli-2.1.5.ebuild
deleted file mode 100644
index 8965187ccee3..000000000000
--- a/app-misc/jira-cli/jira-cli-2.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple command line utility to interact with your jira instance"
-HOMEPAGE="https://github.com/alisaifee/jira-cli"
-SRC_URI="https://github.com/alisaifee/jira-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="${CDEPEND}
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/termcolor[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jira[${PYTHON_USEDEP},oauth]
-	dev-python/suds[${PYTHON_USEDEP}]
-	>=dev-python/keyring-10.0.2-r1[${PYTHON_USEDEP}]
-	dev-python/keyrings_alt[${PYTHON_USEDEP}]"
-
-DEPEND="${CDEPEND}
-	test? (	${RDEPEND}
-		>=dev-python/coverage-4.0.3[${PYTHON_USEDEP}]
-		dev-python/hiro[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/vcrpy-1.7.4[${PYTHON_USEDEP}] )"
-
-RESTRICT="test"
-
-python_prepare_all() {
-	sed -i -e '/ordereddict/d' -e '/argparse/d' requirements/main.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-misc/jira-cli/metadata.xml b/app-misc/jira-cli/metadata.xml
deleted file mode 100644
index 1b73437545ed..000000000000
--- a/app-misc/jira-cli/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">alisaifee/jira-cli</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 5a166f2416a4..4b7222198460 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -19,10 +19,8 @@ AUX lircmd 364 BLAKE2B 71971476198f92bb2d26cbacc8fe330c4d73e0b36370180cfc6438047
 AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
-DIST lirc-0.10.0.tar.bz2 2523528 BLAKE2B 5c133b40936060fbaa0a9463b1b07d9197d935388e3eb4e46791b1f844b82ea6b6d42ae0c6ce249ca306688fa5d15718f5a3a54b497fc9f168b8b736b06bdd1e SHA512 06ccc1c8c80bfd17a6d180ae39a17779cbba341086f90a03a2e552bfb71e3abcb13f991312fba0e57df79c1882c1e29a2f273dddcd46a9ff53160b556e1547ab
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
 DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431
-EBUILD lirc-0.10.0.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
-EBUILD lirc-0.10.1.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3
+EBUILD lirc-0.10.1.ebuild 3739 BLAKE2B 7370130d197f6243429cd1395dfdf2bbd6ebcd5afb14cb2234fc84769925618c12e5193553f6d425732b3419f23c851ccccd37029bbfc5393d49be875d5c9175 SHA512 95dc993ba6e9b3abf3f58c9a76e5831659fa5fc9c01e457f7e1cbb24eb4ef28f91714e191e7050cf54a6a1803e68cf2a7c440eee498d948c2fc001296f30cbf7
 EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b
 MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c
diff --git a/app-misc/lirc/lirc-0.10.0.ebuild b/app-misc/lirc/lirc-0.10.0.ebuild
deleted file mode 100644
index 9b8d2c10c013..000000000000
--- a/app-misc/lirc/lirc-0.10.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_{5,6} )
-
-inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
-HOMEPAGE="http://www.lirc.org/"
-
-LIRC_DRIVER_DEVICE="/dev/lirc0"
-
-MY_P=${PN}-${PV/_/-}
-
-if [[ "${PV/_pre/}" = "${PV}" ]]; then
-	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
-else
-	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	gtk? ( X )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	audio? (
-		>media-libs/portaudio-18
-		media-libs/alsa-lib
-	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	ftdi? ( dev-embedded/libftdi:0 )
-	systemd? ( sys-apps/systemd )
-	usb? ( virtual/libusb:0 )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )
-	sys-apps/kmod
-	sys-kernel/linux-headers
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	gtk? (
-		x11-libs/vte[introspection]
-		dev-python/pygobject[${PYTHON_USEDEP}]
-	)
-	inputlirc? ( app-misc/inputlircd )
-"
-
-pkg_setup() {
-	use uinput && CONFIG_CHECK="INPUT_UINPUT"
-}
-
-src_configure() {
-	xdg_environment_reset
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable static-libs static) \
-		$(use_enable devinput) \
-		$(use_enable uinput) \
-		$(use_with X x)
-}
-
-src_install() {
-	default
-
-	if use !gtk ; then
-		# lirc-setup requires gtk
-		rm "${ED%/}"/usr/bin/lirc-setup || die
-	fi
-
-	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
-	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
-	newconfd "${FILESDIR}"/lircd.conf.4 lircd
-	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
-
-	insinto /etc/modprobe.d/
-	newins "${FILESDIR}"/modprobed.lirc lirc.conf
-
-	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
-	newconfd "${FILESDIR}"/irexec-confd irexec
-
-	keepdir /etc/lirc
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# Avoid QA notice
-	rm -d "${ED%/}"/var/run/lirc || die
-	rm -d "${ED%/}"/var/run || die
-}
-
-pkg_preinst() {
-	local dir="${EROOT%/}/etc/modprobe.d"
-	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
-		elog "Renaming ${dir}/lirc to lirc.conf"
-		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
-	fi
-
-	# copy the first file that can be found
-	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
-		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
-		MOVE_OLD_LIRCD_CONF=1
-	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
-	fi
-
-	# stop portage from touching the config file
-	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
-		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
-	fi
-}
-
-pkg_postinst() {
-	# copy config file to new location
-	# without portage knowing about it
-	# so it will not delete it on unmerge or ever touch it again
-	if [[ -e "${T}"/lircd.conf ]]; then
-		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
-		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
-			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
-			rm -f "${EROOT%/}"/etc/lircd.conf || die
-		fi
-	fi
-
-	einfo "The new default location for lircd.conf is inside of"
-	einfo "${EROOT%/}/etc/lirc/ directory"
-}
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index 9b8d2c10c013..9b775a2c3457 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_4 python3_{5,6} )
+PYTHON_COMPAT=( python3_4 python3_{5,6,7} )
 
 inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
 
@@ -52,6 +52,7 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	dev-libs/libxslt
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( app-doc/doxygen )
 	sys-apps/kmod
 	sys-kernel/linux-headers
@@ -66,8 +67,12 @@ RDEPEND="
 	inputlirc? ( app-misc/inputlircd )
 "
 
+MAKEOPTS+=" -j1"
+
 pkg_setup() {
 	use uinput && CONFIG_CHECK="INPUT_UINPUT"
+	python-single-r1_pkg_setup
+	linux-info_pkg_setup
 }
 
 src_configure() {
diff --git a/app-misc/mkcert/Manifest b/app-misc/mkcert/Manifest
new file mode 100644
index 000000000000..7dbe54a50ece
--- /dev/null
+++ b/app-misc/mkcert/Manifest
@@ -0,0 +1,3 @@
+DIST mkcert-1.0.1.tar.gz 1695474 BLAKE2B eeef86a3e626f044c7b83d86be55082ce256752d834bf1388890db18f74678df57f2fc0050874dd4ff9ec4b849aa5b8d339e09e6af7e08a8f0b5236e0ac7aa09 SHA512 9e4ebadf19134fee7bf637fbb402df46a70d1f99ad06685a6a49da929fdd61b1ae9bea6b3f287201f488aec90505c60a58b454abb2efe584114d814023789600
+EBUILD mkcert-1.0.1.ebuild 638 BLAKE2B 63edba0e65ce29bcd23e26be4d4573208d1ed457966338d663587800c583b4f60daaf823fece40397781060e2c5fe6d08d0be907fe2eea5a7201b1af7364482f SHA512 ea148834a727dee96adf0c7b863ed220bd5b3559761c552b004e8db35ec5c72f3ae77ba9beee63b35e637e781cb1b8ac401ad8df6cec58e2f4b6b9879625844a
+MISC metadata.xml 328 BLAKE2B 3c961622fca93f814611fa3d638ef222e948f23dc6b2c6e7b3364bdb078160048fabf095428be1f6819203a0fff6885827fc1d7070cb723402701f0d7ef8ca96 SHA512 0ebd158cbbe26c3dedf768237c45868e02f47f0af99cf96ec045c94663752bb211d6bda738519e7437d18cdc0cb4ba8a559181cfdd9e9c4dae2bf10bbc8ae460
diff --git a/app-misc/mkcert/metadata.xml b/app-misc/mkcert/metadata.xml
new file mode 100644
index 000000000000..696d5b96b047
--- /dev/null
+++ b/app-misc/mkcert/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>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">FiloSottile/mkcert</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/mkcert/mkcert-1.0.1.ebuild b/app-misc/mkcert/mkcert-1.0.1.ebuild
new file mode 100644
index 000000000000..0176c20c9259
--- /dev/null
+++ b/app-misc/mkcert/mkcert-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/FiloSottile/mkcert"
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A zero-config tool to make locally trusted development certificates"
+HOMEPAGE="https://github.com/FiloSottile/mkcert"
+SRC_URI="https://github.com/FiloSottile/mkcert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" go install -v ${EGO_PN} || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/mkcert
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 6cee465e682f..bc82f0557693 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,10 +1,8 @@
 AUX searchd.rc 656 BLAKE2B 5ba2679b18b0a26d7779a69896958b6ed0cca32e4fa22303d5f3ba593e71cc26f17042d037fdd5e298acb7005f1a7767f38e49acaa62a0f1eb34ddea1e14f657 SHA512 0b24b6dfe10a99c9bb18b7acdaadf2f5d7e3fab2ea80a719bd65b9ea6f6dc83f249d4c2ecb52c48eed73e515f8e76bff294ff39b1ab6375a947a9a137211949c
 AUX sphinx-2.0.1_beta-darwin8.patch 538 BLAKE2B aaac41e383404736d2f18421af2cf2bd03404d99488b778bcab5bec85a36d75a32234d5e4184ae912027b189fd31d41d07caa3e10b35b28318dd0a4369982039 SHA512 342d4ecd3e75c208e358a39de6e5cd2a2bd9dc627f53893869c2280ba5b50546c7edf8476c07cf681c8d1921eeadbeaf48c75337efba0349b951c7a4569f0c14
-DIST libstemmer_c-20091122.tgz 129207 BLAKE2B 8ebf49f4d2b7dd5d0e56e5a032f16e807cc7c400b4c4a0e73601ace17908b441789ceca87c0258c17b4201b43751df5fad890fecc3a1aaeba60f83c80beecf32 SHA512 d1b2203dcc3d0f421526d3ec2f7e04889f93221222efe50501b4a1c7e74dfc51905141d4ada5a76feab5cec8dbc64f55dd55b53f6e89f658c67e72dc6667091d
-DIST sphinx-2.0.10-release.tar.gz 2016687 BLAKE2B 176a14c2e1ecc859f5499eab2b2ee9cb9047ec6d07b407c0dbd3a405a9ca6198e1480166a245f7f523e3c3555bf8fe7ad7f0733bce5371f1b35ce6894dfafa6c SHA512 d22a0ce261cd6decda2e9e91fc9806699c818bb45a9c9c5e11a0944a698d47b5862c577eb55e7b57dd208db982e7f8bfc7163af37aaedc1c537841aff1409952
 DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34ef5d772d2bdf07aecb3a704dc0c5ef551e9d3829af200b1c96e41be2a037552c28a83647af78e827d7a9627f1d9d536a8 SHA512 7f4538011db5d68bd00c00978d476f780fc2d355113bd2819996bacbaef90b0de5b14c946a9aad83157b818d9b6b01ee0a26bc72862cfd151067ad9967c18f56
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
-EBUILD sphinx-2.0.10.ebuild 2641 BLAKE2B a081bc6185d715bb9d0555bf84cba6c8aa4c0b492cc2d7154d7cb35dff8fd26266acb1dd90551c19868972b7a3aa55a96faa1947591dab69fc1903b47150e995 SHA512 a842cbc275b4139f09aa0b60ace1a15bf5b2c42c4bddcccbbcb22431b16d2c0d33e3af842e3dc2c189c9d94cb31b8a3f145b3b4bbed85cfa5204d2aeab553db6
 EBUILD sphinx-2.1.9.ebuild 2376 BLAKE2B 996c4d2a42f92a73a74baa7716abd352b2fa446373dbdeff5f936e9eb7db664df2584ffa17e09f315d2f26558e41f0699691545721bed32ed4ab1c976c8e1265 SHA512 79c16793a6c613234adc6f892ecbf939c8431bdb76f685501872328113618beea8d1d5181eb4ab1a53b91b9e00cb1b9bc681d1c9462894078b5f45aa708e6ab0
+EBUILD sphinx-2.2.11-r1.ebuild 2745 BLAKE2B 52ebf6d9a8ab39b2ce44154ec60da4b956355e26862b64962e62c5c1d51e2d86c59548c28cb3e6655b898a1b8bb36eac942491fec82387365a77be45d056f08c SHA512 d6ffd41b782bf57a92bac828fdc060b67f0b4fec7430c5060bb06607efca861821221870cda211ecae28bd4bc7e8513c69297c4eb5b433a3754f89fe7f5acf4f
 EBUILD sphinx-2.2.11.ebuild 2400 BLAKE2B d2339f0893edfd12ba370ffade39d9bf40ee585dac4efcf8858d2bc2e193bff70c2c18a93fa743ac6ff7d980cfad31387837afb46158e494d7d4240366d83de1 SHA512 629d6374605f457f009744a32183ce31086e93faa0ce82d436822c18866927fb5badfd8a7f8a4fc4036970f05ff4abcc6b570abe17b69e2f0d42136d0f481a4c
-MISC metadata.xml 436 BLAKE2B fd5aeae58f468becae46cbc4c5efb4d42507590f85d881427357c220a36db5ebb775e163bfdeab34199dbbffb2fbcc4d1c9aae8a831d3ecfd7b4505e39eb6a89 SHA512 3083764b80745c3f6dd81c1bc9c2f406edcef6a451d49a79f952969db07c7741447df2b82a82a627b5ebe680f3ea36f99128ae701b553895f15b7bed0d8abecd
+MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml
index 80a8842e3c97..397dd2466c73 100644
--- a/app-misc/sphinx/metadata.xml
+++ b/app-misc/sphinx/metadata.xml
@@ -6,6 +6,7 @@
 </maintainer>
 <use>
   <flag name="id64">use 64-bit document and word IDs</flag>
+  <flag name="mariadb">Add mariadb database support</flag>
   <flag name="re2">use the <pkg>dev-libs/re2</pkg> regular expression library</flag>
   <flag name="stemmer">Enable language stemming support</flag>
 </use>
diff --git a/app-misc/sphinx/sphinx-2.0.10.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
index b33e16db8467..32f06578cd75 100644
--- a/app-misc/sphinx/sphinx-2.0.10.ebuild
+++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 WANT_AUTOMAKE=1.15
 
@@ -10,37 +10,29 @@ inherit eutils autotools toolchain-funcs
 #MY_P=${P/_/-}
 MY_P=${P}-release
 
-# This has been added by Gentoo, to explicitly version libstemmer.
-# It is the date that http://snowball.tartarus.org/dist/libstemmer_c.tgz was
-# fetched.
-STEMMER_PV="20091122"
 DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
 HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz
-	stemmer? ( mirror://gentoo/libstemmer_c-${STEMMER_PV}.tgz )"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug id64 mysql odbc postgres stemmer test"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
 
-RDEPEND="mysql? ( virtual/mysql )
+REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
+
+RDEPEND="
+	mysql? ( dev-db/mysql-connector-c )
+	mariadb? ( dev-db/mariadb-connector-c )
 	postgres? ( dev-db/postgresql:* )
 	odbc? ( dev-db/unixODBC )
+	re2? ( dev-libs/re2 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	xml? ( dev-libs/expat )
 	virtual/libiconv"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/php )"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	if use stemmer; then
-		cd "${S}"
-		unpack libstemmer_c-${STEMMER_PV}.tgz
-	fi
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
 
@@ -49,26 +41,46 @@ src_prepare() {
 	# eautoreconf twice and that causes problems, bug 425380
 	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
 
+	if use mariadb ; then
+		sed -i -e 's/mysql_config/mariadb_config/g' configure || die
+	fi
+
 	# Fix QA compilation warnings.
 	sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
 
+	eapply_user
+
 	pushd api/libsphinxclient || die
 	eautoreconf
 	popd || die
+
+	# Drop bundled code to ensure building against system versions. We
+	# cannot remove libstemmer_c since configure updates its Makefile.
+	rm -rf libexpat libre2 || die
 }
 
 src_configure() {
 	# fix libiconv detection
 	use !elibc_glibc && export ac_cv_search_iconv=-liconv
 
+	local mysql_with
+	if use mysql || use mariadb ; then
+		mysql_with="--with-mysql"
+	else
+		mysql_with="--without-mysql"
+	fi
+
 	econf \
 		--sysconfdir="${EPREFIX}/etc/${PN}" \
 		$(use_enable id64) \
 		$(use_with debug) \
-		$(use_with mysql) \
+		${mysql_with} \
 		$(use_with odbc unixodbc) \
 		$(use_with postgres pgsql) \
-		$(use_with stemmer libstemmer)
+		$(use_with re2) \
+		$(use_with stemmer libstemmer) \
+		$(use_with syslog syslog) \
+		$(use_with xml libexpat )
 
 	cd api/libsphinxclient || die
 	econf STRIP=:
@@ -81,8 +93,9 @@ src_compile() {
 }
 
 src_test() {
-	elog "Tests require access to a live MySQL database and may require configuration."
-	elog "You will find them in /usr/share/${PN}/test and they require dev-lang/php"
+	# Tests require a live database and only work from the source
+	# directory.
+	:
 }
 
 src_install() {
@@ -95,9 +108,4 @@ src_install() {
 	dodir /var/log/sphinx
 
 	newinitd "${FILESDIR}"/searchd.rc searchd
-
-	if use test; then
-		insinto /usr/share/${PN}
-		doins -r test
-	fi
 }
diff --git a/app-misc/wyrd/Manifest b/app-misc/wyrd/Manifest
deleted file mode 100644
index 59dd61b4385a..000000000000
--- a/app-misc/wyrd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wyrd-1.4.6.tar.gz 425829 BLAKE2B f732b0d69ebb200913f51ab5ea1d42f551469ebd4bc4fd22862499a01db6a6a5bfc21caac7b14e7bf247b75b73a64c3d7ed7c9249d0bc4123a6fc1a27d5017db SHA512 fc09c4567ea8d6225638ee6851ddab716665913b7d7b2f6b5a3cc7f2af9144df617e2a95ca78c74874bec3ff355aba028c7c51eafe1426d9ae803ab77ce84477
-EBUILD wyrd-1.4.6-r1.ebuild 653 BLAKE2B 292c6f86f35e078526610e5303aeef5defd6073b9c404aa0936cb9a16b0686468d1a5eef3fe9d0e4d64e3cfd87980bab49d02b8f0ff91144db4628162adee336 SHA512 791ebbaec3b630cad1a5392319948a39df0a5ad6289e7caea04d8884854d9e02890f9a226c116cc8616a3bc16d0c4ada6a14fcfdb799a11d2ca91cb2fa90c165
-MISC metadata.xml 685 BLAKE2B 53ba89c84de3ae5d0a70c8c2f6aef9000aea4d201f4998557a2fec17d525400f143c279782fd63189f794737163c1172ac4392fde5c5c0f1cdfd29a0b24ddc87 SHA512 96684d600777e987e9cc7b5ff08713d1292e2413778cfb2775127043e4685acd2df50294b72186eedacbeb448601a3064e98a4851198df6875491cc20d01681a
diff --git a/app-misc/wyrd/metadata.xml b/app-misc/wyrd/metadata.xml
deleted file mode 100644
index 4920b59165e4..000000000000
--- a/app-misc/wyrd/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>Gentoo ML Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Wyrd is a text-based front-end to Remind, a sophisticated calendar and alarm
-		program. Remind's power lies in its programmability, and Wyrd does not hide this
-		capability behind flashy GUI dialogs. Rather, Wyrd is designed to make you more
-		efficient at editing your reminder files directly. It also offers a scrollable
-		timetable suitable for visualizing your schedule at a glance.
-	</longdescription>
-</pkgmetadata>
diff --git a/app-misc/wyrd/wyrd-1.4.6-r1.ebuild b/app-misc/wyrd/wyrd-1.4.6-r1.ebuild
deleted file mode 100644
index 531160d57311..000000000000
--- a/app-misc/wyrd/wyrd-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Text-based front-end to Remind"
-HOMEPAGE="http://pessimization.com/software/wyrd/"
-SRC_URI="http://pessimization.com/software/wyrd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="unicode"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	>=app-misc/remind-03.01
-	dev-ml/camlp4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/ocaml-3.08
-"
-
-src_configure() {
-	econf \
-		$(use_enable unicode utf8)
-}
-
-src_install() {
-	export STRIP_MASK="/usr/bin/wyrd"
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog
-	dohtml doc/manual.html
-}