Sync with portage [Thu Sep 3 08:39:41 MSK 2020].

4 years ago · c0b458e4fe
parent 010b6961db
commit c0b458e4fe
3085 changed files with 7516 additions and 11486 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/SphinxTrain/Manifest
+++ b/app-accessibility/SphinxTrain/Manifest
@ -1 +0,0 @@
-DIST sphinxtrain-1.0.8.tar.gz 8925803 BLAKE2B e268c00843445cb69ae2a88f93fb4aa640556179417d44f6297d87f7e509418778b4808885bb19ab163efbd71565a3b6d75d269b420e9e366c0c6553a04b3053 SHA512 465d2c4ade9acc7b49c1d975449c38ac01d5a3ff332f9841be66cd8ca9d2f0b68fd36cc8a46384c8b510042efa91c3887a080481e84f2d0deb9775a598835f2b
--- a/app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild
+++ b/app-accessibility/SphinxTrain/SphinxTrain-1.0.8.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit multilib python-single-r1
-
-DESCRIPTION="Speech Recognition (Training Module)"
-HOMEPAGE="http://cmusphinx.sourceforge.net/html/cmusphinx.php"
-SRC_URI="mirror://sourceforge/cmusphinx/sphinxtrain-${PV}.tar.gz"
-
-LICENSE="BSD-with-attribution"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="app-accessibility/sphinxbase
-	dev-lang/perl
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/sphinxtrain-${PV}
-
-src_install() {
-	default
-	dodoc README etc/*cfg
-
-	python_fix_shebang "${D}"/usr/bin/sphinxtrain
-	python_optimize "${D}"/usr/$(get_libdir)/sphinxtrain/python/cmusphinx
-}
-
-pkg_postinst() {
-	elog "Detailed usage and training instructions can be found at"
-	elog "http://cmusphinx.sourceforge.net/wiki/"
-}
--- a/app-accessibility/SphinxTrain/metadata.xml
+++ b/app-accessibility/SphinxTrain/metadata.xml
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<longdescription lang="en">
-	SphinxTrain is CMU Sphinx's training package.
-</longdescription>
-	<longdescription lang="ja">
-	SphinxTrainはCMU Sphinxの調教パッケージです。
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">cmusphinx</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-accessibility/sphinx3/Manifest
+++ b/app-accessibility/sphinx3/Manifest
@ -1 +0,0 @@
-DIST sphinx3-0.8.tar.gz 25226326 BLAKE2B 0eb2c6474ec32ef1aed277816b0b596ba561c1705b389b19de7dfd969212bc24e5eec0a920aaeb15ed3a90f464552b4e24e964b94380dc292a9299b4651793bc SHA512 85b8e574e2f92a758c8c56ef11b873c49ef8a376e964f30a12d75850d4a0db56e3108eaea25fa5587675ef2ffa4531a13f0f182a85cc8e434c6bcee42058e050
--- a/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch
+++ b/app-accessibility/sphinx3/files/sphinx3-0.8-libutil.patch
@ -1,18 +0,0 @@
--- src/libs3decoder/libsearch/fsg_history.c
-+++ src/libs3decoder/libsearch/fsg_history.c
-@@ -55,7 +55,6 @@
- #include <kb.h>
- /*#include <phone.h>*/
- #include <search.h>
-#include "libutil.h"
- 
- 
- #define __FSG_DBG__	0
--- src/libs3decoder/libcfg/s3_cfg_convert.c
-+++ src/libs3decoder/libcfg/s3_cfg_convert.c
-@@ -1,5 +1,4 @@
- 
-#include <libutil.h>
- #include "s3_cfg.h"
- #include "fsg.h"
- 
--- a/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
+++ b/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
@ -1,34 +0,0 @@
-diff -uNr sphinx3-0.8.orig/python/setup.py sphinx3-0.8/python/setup.py
--- sphinx3-0.8.orig/python/setup.py	2008-12-31 23:20:08.000000000 -0500
-+++ sphinx3-0.8/python/setup.py	2011-11-17 09:46:57.000000000 -0500
-@@ -8,15 +8,10 @@
-     define_macros = []
- 
- module = Extension('_sphinx3',
-                   include_dirs = ['../../sphinxbase/include',
-                                   '../include',
-                                   '/usr/local/include/sphinxbase/',
-                                   '/usr/local/include/sphinx3',
-                                   ],
-+                   include_dirs = ['../include',
-+                                   '@GENTOO_PORTAGE_EPREFIX@/usr/include/sphinxbase'],
- 		   define_macros = define_macros,
-		   library_dirs = ['../../sphinxbase/src/libsphinxbase/.libs',
-				'../src/libs3decoder/.libs',
-				'../../sphinxbase/lib/debug',
-+		   library_dirs = ['../src/libs3decoder/.libs',
- 				'../lib/debug',
- 				],
-                    libraries = ['sphinxbase', 's3decoder'],
-diff -uNr sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c sphinx3-0.8/src/libs3decoder/libsearch/vithist.c
--- sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c	2008-12-31 13:27:56.000000000 -0500
-+++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c	2011-11-17 09:46:24.000000000 -0500
-@@ -647,7 +647,7 @@
- {
-     int32 se, fe, filler_done, th;
-     vithist_entry_t *ve;
-    heap_t h;
-+    heap_t *h;
-     s3wid_t *wid;
-     int32 i;
- 
--- a/app-accessibility/sphinx3/metadata.xml
+++ b/app-accessibility/sphinx3/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cmusphinx</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
+++ b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# disable automatic phase exports and deps
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils distutils-r1 prefix eutils
-
-DESCRIPTION="CMU Speech Recognition engine"
-HOMEPAGE="http://cmusphinx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc python static-libs"
-
-RDEPEND=">=app-accessibility/sphinxbase-0.7[static-libs?,python?,${PYTHON_USEDEP}]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Due to generated Python setup.py.
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_heap_fix.patch" \
-		"${FILESDIR}/${P}-libutil.patch"
-	eprefixify 'python/setup.py'
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	if use python; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README )
-	autotools-utils_src_install
-
-	if use doc; then
-		cd doc || die
-		dohtml -r -x CVS s3* s3 *.html
-	fi
-
-	if use python; then
-		unset DOCS
-
-		cd "${S}"/python || die
-		distutils-r1_src_install
-	fi
-}
--- a/app-accessibility/sphinxbase/Manifest
+++ b/app-accessibility/sphinxbase/Manifest
@ -1 +0,0 @@
-DIST sphinxbase-0.8.tar.gz 3313197 BLAKE2B ec2dcd232194d32d851924099ffb64fa9da6bdccb973fe1311d2b4b0506073cfd35b548ba8d8f64c2ee757f3b5ba87ae23c95d0f67c95be1110b7e2a995c9be2 SHA512 fdb13c07e591e868c395d5f8209ec389fb9d5a93d99104a00cb82382e84d320091ae7e74d53225706331d4959ab5e248fa622582a148bfdb6ab5c38470d1963c
--- a/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch
+++ b/app-accessibility/sphinxbase/files/sphinxbase-0.8-automake113.patch
@ -1,25 +0,0 @@
-diff -Naur sphinxbase-0.8/test/regression/Makefile.am sphinxbase-0.8.new/test/regression/Makefile.am
--- sphinxbase-0.8/test/regression/Makefile.am	2012-12-05 06:05:39.000000000 -0800
-+++ sphinxbase-0.8.new/test/regression/Makefile.am	2013-10-08 13:05:15.498853962 -0700
-@@ -33,9 +33,19 @@
- 
- # Disable sphinx_fe tests for now if fixed-point due to imprecision
- if FIXED_POINT
-TESTS = $(srcdir)/test-cepview.sh $(srcdir)/test-sphinx_pitch.sh
-+TESTS = test-cepview.sh test-sphinx_pitch.sh
- else
-TESTS = $(srcdir)/test-*.sh
-+TESTS = \
-+	test-cepview.sh \
-+	test-sphinx_fe-ctl.sh \
-+	test-sphinx_fe-dct.sh \
-+	test-sphinx_fe-dither-seed.sh \
-+	test-sphinx_fe-logspec2cep.sh \
-+	test-sphinx_fe-logspec.sh \
-+	test-sphinx_fe.sh \
-+	test-sphinx_fe-smoothspec.sh \
-+	test-sphinx_jsgf2fsg.sh \
-+	test-sphinx_pitch.sh
- endif
- 
- EXTRA_DIST += $(TESTS)
--- a/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch
+++ b/app-accessibility/sphinxbase/files/sphinxbase-0.8-unbundle-lapack.patch
@ -1,85 +0,0 @@
- configure.in                  | 40 +++++++++++++++++++++-------------------
- src/libsphinxbase/Makefile.am |  1 +
- 2 files changed, 22 insertions(+), 19 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e10629c..b5d6ea9 100644
--- a/configure.in
-+++ b/configure.in
-@@ -62,13 +62,15 @@ if test x$withval = xno; then
-    use_lapack=false
- fi
- ])
-if test x$use_lapack = xtrue; then
-   AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true)
-   if test x$use_internal_lapack != xtrue; then
-      AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true)
-   fi
-+AS_IF([test "x$with_lapack" = "xyes"], [
-+   PKG_CHECK_MODULES([LAPACK], [lapack],,
-+                     AC_CHECK_LIB(lapack, sgesv_,,use_internal_lapack=true))
-+   AS_IF([test "x$use_internal_lapack" != "xtrue"], [
-+      PKG_CHECK_MODULES([BLAS], [blas],,
-+                        AC_CHECK_LIB(blas, sgemm_,,use_internal_lapack=true))
-+   ])
-    AC_DEFINE(WITH_LAPACK, [], [Enable matrix algebra with LAPACK])
-fi
-+])
- AM_CONDITIONAL(LAPACK_LITE, test x$use_internal_lapack = xtrue)
- AM_CONDITIONAL(USE_LAPACK, test x$use_lapack = xtrue)
- 
-@@ -208,9 +210,15 @@ AM_PROG_LIBTOOL
- dnl
- dnl Check for Doxygen, and build dox if present
- dnl
-AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no)
-+AC_ARG_ENABLE([doc],
-+   AS_HELP_STRING([--enable-doc], [Build docs using doxygen]))
-+AS_IF([test "x$enable_doc" = "xyes"], [
-+   AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, yes, no)
-+	AS_IF([test "x$HAVE_DOXYGEN" != "xyes"], [
-+      AC_MSG_ERROR([--enable-doc given, but doxygen not found.]); exit 1
-+   ])
-+])
- AM_CONDITIONAL(BUILD_DOXYGEN, test "x$HAVE_DOXYGEN" = "xyes")
-
- dnl
- dnl Check for Python, and build python module if present
- dnl
-@@ -260,19 +268,13 @@ fi
- AM_CONDITIONAL(BUILD_CYTHON, test "x$HAVE_CYTHON" = "xyes")
- 
- dnl
-dnl Check for pkgconfig
-dnl
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-
-dnl
- dnl Check for libsndfile
- dnl
-if test "x$HAVE_PKGCONFIG" = "xyes"; then
-   PKG_CHECK_MODULES(SNDFILE,sndfile,,true)
-   AC_CHECK_HEADERS([sndfile.h])
-   PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true)
-   AC_CHECK_HEADERS([samplerate.h])
-fi
-+PKG_CHECK_MODULES(SNDFILE,sndfile,,true)
-+AC_CHECK_HEADERS([sndfile.h])
-+PKG_CHECK_MODULES(SAMPLERATE,samplerate,,true)
-+AC_CHECK_HEADERS([samplerate.h])
-+
- AC_SUBST(SNDFILE_LIBS)
- AC_SUBST(SNDFILE_CFLAGS)
- AC_SUBST(SAMPLERATE_LIBS)
-diff --git a/src/libsphinxbase/Makefile.am b/src/libsphinxbase/Makefile.am
-index 52ee3e1..f4efd8a 100644
--- a/src/libsphinxbase/Makefile.am
-+++ b/src/libsphinxbase/Makefile.am
-@@ -8,6 +8,7 @@ libsphinxbase_la_SOURCES =
- # This is API version 2, software release 1, which also supports API version 1
- libsphinxbase_la_LDFLAGS = -version-info 2:1:1
- libsphinxbase_la_LIBADD = $(LTLIBICONV) \
-+	@LAPACK_LIBS@ \
- 	util/libsphinxutil.la \
- 	fe/libsphinxfe.la \
- 	feat/libsphinxfeat.la \
--- a/app-accessibility/sphinxbase/metadata.xml
+++ b/app-accessibility/sphinxbase/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>accessibility@gentoo.org</email>
-    <name>Gentoo Accessibility Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">cmusphinx</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
+++ b/app-accessibility/sphinxbase/sphinxbase-0.8.ebuild
@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils distutils-r1
-
-DESCRIPTION="Support library required by the Sphinx Speech Recognition Engine"
-HOMEPAGE="http://cmusphinx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
-
-LICENSE="BSD-2 HPND MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc lapack python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# automagic dep on pulseaudio
-RDEPEND="
-	media-sound/pulseaudio
-	lapack? ( virtual/lapack )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( >=app-doc/doxygen-1.4.7 )"
-
-# Due to generated Python setup.py.
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-unbundle-lapack.patch
-	"${FILESDIR}"/${P}-automake113.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with lapack)
-		$(use_enable doc)
-		# python modules are built through distutils
-		# so disable the ugly wrapper
-		--without-python
-	)
-	autotools-utils_src_configure
-}
-
-run_distutils() {
-	if use python; then
-		pushd python > /dev/null || die
-		distutils-r1_"${@}"
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-
-	run_distutils ${FUNCNAME}
-}
-
-python_test() {
-	LD_LIBRARY_PATH="${S}"/src/lib${PN}/.libs \
-		"${PYTHON}" sb_test.py || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	autotools-utils_src_test
-
-	run_distutils ${FUNCNAME}
-}
-
-src_install() {
-	run_distutils ${FUNCNAME}
-
-	use doc && local HTML_DOCS=( doc/html/. )
-	autotools-utils_src_install
-}
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@ -1,2 +1 @@
-DIST exo-1.15.0.tar.gz 4267440 BLAKE2B 5b5f38df929c538528084ecae8ae73f2c2486b2a3ad45c7c4ba55021680912490c90d820c72ac1e858caf023382b2de3a573a6e7f096b3b84abf3da237a3bca0 SHA512 d42887a24de2385acc7e66daab0c51b413304fd96589755874716702747aaea74ea0f080e334f2a4ebcf8b6c6699257f6e36e5ddf9acf9c7aca2693555edbfb2
-DIST exo-1.16.0.tar.gz 4245980 BLAKE2B 3215d001b6c0864e2798e34976e6c7c67c9e4457729a149280721d7cc00c648c273fc2bfd03d6678aad1ac7217d0d3a22dd6c53fcf7822c19410bb556a5d41f9 SHA512 ce75261e09f906030a2fbe7aae2f9aaa2bf631db0f6c8876f9e7baba6622026d2d127a6935fa5dfb9c1bffb4953eb0a7149c345a4eb9b9423e52047588442e74
+DIST exo-1.16.1.tar.gz 4247537 BLAKE2B e7990c51abec26ee486fa3ed08af168f2dc2ae5747cc8770d9bca2baeb151caa8075c903c742c3a19431587e483e1ec324ae46b95bdf71901f5e5cb4baac2f57 SHA512 63caf78a3c79d47dac956b3b35d0e84e86782f6d2c3bb57c2435dc457c91dab26cb5754fdd41bff80c5a336c81031d138a88519a38fb639b511b6692066d8d90
--- a/app-admin/exo/exo-1.16.0.ebuild
+++ b/app-admin/exo/exo-1.16.0.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command-line tool for everything at Exoscale: compute, storage, dns."
-HOMEPAGE="https://github.com/exoscale/cli"
-SRC_URI="https://github.com/exoscale/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE=""
-DEPEND="dev-lang/go:="
-RESTRICT="strip"
-QA_FLAGS_IGNORED=".*"
-
-S="${WORKDIR}/cli-${PV}"
-
-src_compile() {
-	go build -mod vendor -o ${PN} || die "build failed"
-}
-
-src_test() {
-	# run at least 'exo version' for test
-	./exo version > /dev/null 2>&1
-	if [[ $? -ne 0 ]]
-	then
-		die "Test failed"
-	fi
-}
-
-src_install() {
-	dobin ${PN}
-}
--- a/app-admin/exo/exo-1.16.1.ebuild
+++ b/app-admin/exo/exo-1.16.1.ebuild
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@ -1,2 +1,3 @@
 DIST hcloud-1.17.0.tar.xz 687880 BLAKE2B c83530946dd04afc59d45a2bbb12b6a4034dfe5b8c3826e4e78f29e88891672c21e896fd9d24394ce943f9b6574928ae144a564abde3fec8a243cc5fc87e8bdb SHA512 5025357392e9b7661876f059a416e6d6f9eea89e16a9abaacaeb72506aaa5d4d6a193e266d23f01cd0f5d32048f66a3f6e22a1c9c042c2e3183a1e164da2ccc6
 DIST hcloud-1.18.0.tar.xz 691988 BLAKE2B 1d0d6cac56cefa9023796f259fce238952766e038568d843259845d8ebeb040b75dab9dc18908003fba1a10fc76fd45936e46db50536e26dd90a47354feba34a SHA512 39b09b5b79f1e8715fbc17c8576e51955b7729032385fd1aed3f171c56d041d0576dc99662fc9e222f5fe1837a4fddbd57cd406d98fd38a5b9eb116d2a83af3a
+DIST hcloud-1.19.1.tar.xz 781068 BLAKE2B 74362fae9255121771a9e03f187ea6f101e71ed4ab226c218d33a335b740dc72d0df78e76d4c28e1b4760e1c76fe4dcba40f6a41db99cd0955ecb221d5314767 SHA512 24434de9396b30843698feff549163a23443f8536f3e2298edf23620f107dcf5287701c10aba10c4f6ecd61fa4b6a1a80661d9a330c3a4a11d1c986f750550ec
--- a/app-admin/hcloud/hcloud-1.19.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.19.1.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A command-line interface for Hetzner Cloud"
+HOMEPAGE="https://github.com/hetznercloud/cli"
+SRC_URI="https://dev.gentoo.org/~ago/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+DEPEND="dev-lang/go:="
+RESTRICT="strip"
+QA_FLAGS_IGNORED=".*"
+
+src_compile() {
+	go build -mod vendor -o ${PN} -ldflags "-w -X github.com/hetznercloud/cli/cli.Version=${PV}-gentoo" ./cmd/${PN} || die "build failed"
+}
+
+src_test() {
+	# For upstream a simple test is run 'hcloud version'
+	./hcloud version
+	if [[ $? -ne 0 ]]
+	then
+		die "Test failed"
+	fi
+}
+
+src_install() {
+	dobin ${PN}
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/ipkg-utils/Manifest
+++ b/app-arch/ipkg-utils/Manifest
@ -1 +0,0 @@
-DIST ipkg-utils-050831.tar.gz 29175 BLAKE2B 4f1d4b5efb7f808e6987a7b62f830463e28fca998c49b4d6683a58c2d2225e24820e6f2b47642e5cceafa34e0ab3ff8172267ef734bbbf1c8f94b8777172efc8 SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa
--- a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch
+++ b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch
@ -1,25 +0,0 @@
-diff --git i/ipkg.py w/ipkg.py
-index 02aab22..145686c 100644
--- i/ipkg.py
-+++ w/ipkg.py
-@@ -36,10 +36,10 @@ import tempfile
- import os
- import sys
- import glob
-import md5
- import re
- import string
- import commands
-+from hashlib import md5
- from stat import ST_SIZE
- 
- class Version:
-@@ -136,7 +136,7 @@ class Package:
- 
-             # compute the MD5.
-             f = open(fn, "r")
-            sum = md5.new()
-+            sum = md5()
-             while 1:
-                 data = f.read(1024)
-                 if not data: break
--- a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild
+++ b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils toolchain-funcs versionator
-
-MY_P="${PN}-$(get_version_component_range 3)"
-
-DESCRIPTION="Tools for working with the ipkg binary package format"
-HOMEPAGE="http://www.openembedded.org/"
-SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
-IUSE="minimal"
-
-DEPEND="
-	!minimal? (
-		app-crypt/gnupg
-		net-misc/curl
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${P}-hashlib-r2.patch")
-
-src_prepare() {
-	default
-
-	sed '/python setup.py build/d' -i Makefile
-
-	if use minimal; then
-		elog "ipkg-upload is not installed when the \`minimal' USE flag is set.  If you"
-		elog "need ipkg-upload then rebuild this package without the \`minimal' USE flag."
-	fi
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake CC="$(tc-getCC)"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	if use minimal; then
-		rm "${ED}usr/bin/ipkg-upload" \
-			"${D}$(python_get_scriptdir)/ipkg-upload" || die
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	dobin ipkg-compare-versions
-}
-
-pkg_postinst() {
-	elog "Consider installing sys-apps/fakeroot for use with the ipkg-build "
-	elog "command, that makes it possible to build packages as a normal user."
-}
--- a/app-arch/ipkg-utils/metadata.xml
+++ b/app-arch/ipkg-utils/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jnrowe@gmail.com</email>
-		<name>James Rowe</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/cachedir/Manifest
+++ b/app-backup/cachedir/Manifest
@ -1 +0,0 @@
-DIST cachedir-1.4.tar.gz 16254 BLAKE2B f70fe693d614ab90c4b235c2979e9323eb41976ea8a97c4d3107af26f411553a86e0409b354483a6e3c9af956597c9a4114dc28829cc2ed55abe7c7dd3bb8a99 SHA512 dabeb36a4b99febafbfcc3bff4de625491eee6649cac6c03ef782415cfdd519d36911bed8ae6e7bb94b0afe6279b17fd99fcb87f0c2d2e37032a76fa516dd6c7
--- a/app-backup/cachedir/cachedir-1.4.ebuild
+++ b/app-backup/cachedir/cachedir-1.4.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tag/untag cache directories"
-HOMEPAGE="https://liw.fi/cachedir/"
-SRC_URI="http://git.liw.fi/${PN}/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-# test deps not supporting python 3
-RESTRICT="test"
-
-RDEPEND="dev-python/cliapp[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-#	test? (
-#		dev-util/cmdtest[${PYTHON_USEDEP}]
-#	)
-#	"
-
-python_prepare_all() {
-	2to3 -w setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_compile() {
-	addwrite /proc/self/comm
-	distutils-r1_src_compile
-}
-
-src_test() {
-	addwrite /proc/self/comm
-	distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py check
-}
--- a/app-backup/cachedir/metadata.xml
+++ b/app-backup/cachedir/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
@ -0,0 +1,87 @@
+From 70acc386b6afb726d4576a3d4368b51114e92530 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 1 Sep 2020 12:54:19 +0100
+Subject: [PATCH] stress-ng.h: build in target clone types if gcc supports the
+ feature
+
+Add in more build time optimization checks, try to build smarter with
+various gcc compatibility support checks.
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+---
+ stress-ng.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 61 insertions(+), 1 deletion(-)
+
+diff --git a/stress-ng.h b/stress-ng.h
+index 3803bc71..6ce7d72e 100644
+--- a/stress-ng.h
+++ b/stress-ng.h
+@@ -1686,7 +1686,67 @@ extern void pr_dbg_lock(bool *locked, const char *fmt, ...)  FORMAT(printf, 2, 3
+ 
+ /* GCC5.0+ target_clones attribute */
+ #if defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_X86)
+-#define TARGET_CLONES	__attribute__((target_clones("mmx","sse","sse2","ssse3", "sse4.1", "sse4a", "avx", "avx2", "arch=skylake-avx512", "default")))
+#if defined(__MMX_WITH_SSE__)
+#define TARGET_CLONE_MMX	"mmx",
+#else
+#define TARGET_CLONE_MMX
+#endif
+
+#if defined(__AVX__)
+#define TARGET_CLONE_AVX	"avx",
+#else
+#define TARGET_CLONE_AVX
+#endif
+
+#if defined(__AVX2__)
+#define TARGET_CLONE_AVX2	"avx2",
+#else
+#define TARGET_CLONE_AVX2
+#endif
+
+#if defined(__SSE__)
+#define TARGET_CLONE_SSE	"sse",
+#else
+#define TARGET_CLONE_SSE
+#endif
+
+#if defined(__SSE2__)
+#define TARGET_CLONE_SSE2	"sse2",
+#else
+#define TARGET_CLONE_SSE2
+#endif
+
+#if defined(__SSE3__)
+#define TARGET_CLONE_SSE3	"sse3",
+#else
+#define TARGET_CLONE_SSE3
+#endif
+
+#if defined(__SSSE3__)
+#define TARGET_CLONE_SSSE3	"ssse3",
+#else
+#define TARGET_CLONE_SSSE3
+#endif
+
+#if defined(__SSE4_1__)
+#define TARGET_CLONE_SSE4_1	"sse4.1",
+#else
+#define TARGET_CLONE_SSE4_1
+#endif
+
+#if defined(__SSE4_2__)
+#define TARGET_CLONE_SSE4_2	"sse4.2",
+#else
+#define TARGET_CLONE_SSE4_2
+#endif
+
+#if defined(__AVX512F__)
+#define TARGET_CLONE_SKYLAKE_AVX512	"arch=skylake-avx512",
+#else
+#define TARGET_CLONE_SKYLAKE_AVX512
+#endif
+
+#define TARGET_CLONES	__attribute__((target_clones(TARGET_CLONE_AVX TARGET_CLONE_AVX2 TARGET_CLONE_MMX TARGET_CLONE_SSE TARGET_CLONE_SSE2 TARGET_CLONE_SSE3 TARGET_CLONE_SSSE3 TARGET_CLONE_SSE4_1 TARGET_CLONE_SSE4_2 TARGET_CLONE_SKYLAKE_AVX512 "default")))
+ #elif defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_PPC64)
+ #define TARGET_CLONES	__attribute__((target_clones("cpu=power9,default")))
+ #else
--- a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
@ -27,7 +27,10 @@ RDEPEND="${DEPEND}"

 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )

-PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.17-makefile.patch"
+	"${FILESDIR}/${PN}-0.11.19-optimization-checks.patch"
+)

 src_compile() {
 	tc-export CC
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/openssl-blacklist/Manifest
+++ b/app-crypt/openssl-blacklist/Manifest
@ -1,2 +0,0 @@
-DIST openssl-blacklist_0.5-3.diff.gz 20228 BLAKE2B d09a6288ceb15e186855f52aef9c76fdeb94907555b8d6c8fa07963d629f0adade2f433bbf6a390a065e5ec0b336c2d2d57ecfd347fbf96d3497404eab16d1b5 SHA512 5e5b7fdc97248ccc44f3ffa306a23f9d3ed9585cee15f1ad55dffcf4e70a50463c05382b393bc07e4bd18ea530eea7d36a508f40c1e03b0932eb3cde43f886bd
-DIST openssl-blacklist_0.5.orig.tar.gz 32908393 BLAKE2B 75cbc1bb5780ded04ba84cd8cb7ea93fe271d0075a854e94dea81ff49b54e48a8207290f5e06426a090c0e913bad95b0f0d6992a1cdacfa1ea044521786ac8f1 SHA512 b0ecab15f4357b56508b048a0648263f118aa8eeda8ad6a15caab8c38b2270a5daf897026daf376a561b292c64c2651269182732e0ae3e4bbac455cc1d3985ab
--- a/app-crypt/openssl-blacklist/metadata.xml
+++ b/app-crypt/openssl-blacklist/metadata.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hanno@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">ubuntu/+source/openssl-blacklist</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild
+++ b/app-crypt/openssl-blacklist/openssl-blacklist-0.5.3.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils versionator python-single-r1
-
-MY_PV=$(get_version_component_range 1-2)
-MY_P="${PN}-${MY_PV}"
-DEB_P="${PN}_${MY_PV}"
-DEB_PVER=$(get_version_component_range 3)
-DEB_PATCH="${DEB_P}-${DEB_PVER}.diff"
-
-DESCRIPTION="Detection of weak ssl keys produced by certain debian versions in 2006-2008"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/openssl-blacklist/"
-SRC_URI="mirror://debian/pool/main/o/${PN}/${DEB_P}.orig.tar.gz
-	mirror://debian/pool/main/o/${PN}/${DEB_PATCH}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${DEB_PATCH}
-}
-
-src_install() {
-	dobin openssl-vulnkey
-	doman openssl-vulnkey.1
-	insinto /usr/share/openssl-blacklist
-
-	# ripped from debian/rules "install" target
-	local keysize
-	for keysize in 512 1024 2048 4096 ; do
-		(
-		cat debian/blacklist.prefix
-		cat blacklists/{be32,le32,le64}/blacklist-${keysize}.db \
-			| cut -d ' ' -f 5 | cut -b21- | sort
-		) > blacklist.RSA-${keysize}
-		doins blacklist.RSA-${keysize}
-	done
-
-	python_fix_shebang "${ED}/usr/bin/openssl-vulnkey"
-}
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@ -1,3 +1,4 @@
 DIST signify-20.tar.gz 97765 BLAKE2B c2b086b59310cd364d28ee7f8802daa7f170eb2a19a5d6722d0b59202b7ee302f4b810a2809f8badfab38ae4d8402dec82141207be3d1b64f747c2e27b2c54f7 SHA512 993f02b10ef9c74a98455e2c93e094de40a40710c38ff35752decb87430895bd276cb5e6a46b5f7cf3f098d66562f1f0e134158d221a87fb33cfff09199a8773
 DIST signify-23.tar.gz 95335 BLAKE2B 4cdbee5dae7f217644a5df41d4253938c5cb8fb1f621f945addfceb64090234199e8dd81d7ef42c41aae13e9e5158541f40062296ca07562977473e39f68cd0b SHA512 f0330994f3d308e9ad7c7bf4b6d6f8e8bef914d6d10d83507002ad97f853b4e0a829997a0225373e2c34829a611b70980d7d3674247d4b5b447204ad7f039608
 DIST signify-24.tar.gz 92038 BLAKE2B 4d9413a423534fb4f9adfb50494802b737e6099b47933eed9686ba751f7ffb6999b084c5a5431652a33baab11d7384e762c4709bab52bb0de4694a885c8eb570 SHA512 d612aca617f44ea7bf32a31d65da7e265dfdbe67f7983fc095b1f2d5c83cfa27f4c857279d98f6928199d15193c706cf3c77022fec70529a7b5d38b16ce64df5
+DIST signify-29.tar.gz 94553 BLAKE2B eba286618c5ea9fb9515c44330297276504009078a09d7b36c208225e4fd33e014623829dd582ededc2f35f207058ad2c93412ad006852966c37466ed87e7b9a SHA512 a0fc07c176f3e0e6ea32d059fb6cc27849159dcc3975c47b2b0a54f7047cb1f1dc0e032f2c55eaf84096b0a84288193afec0777e669851a7c7f97a880fb0f0ab
--- a/app-crypt/signify/signify-29.ebuild
+++ b/app-crypt/signify/signify-29.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="OpenBSD tool to sign and verify signatures on files"
+HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
+SRC_URI="https://github.com/aperezdc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/libbsd-0.8"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	dobin signify
+	doman signify.1
+}
--- a/app-crypt/ssh-multiadd/Manifest
+++ b/app-crypt/ssh-multiadd/Manifest
@ -1 +0,0 @@
-DIST ssh-multiadd-1.3.2.tar.gz 14035 BLAKE2B 1de9e8593be128b792d6babe9ada37e7f611045d573e3430c0bc08a66d9c6acb00f5f6c453b22fd2308233cc8e58c62ab116de1aae702d066f664036bb029027 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3
--- a/app-crypt/ssh-multiadd/metadata.xml
+++ b/app-crypt/ssh-multiadd/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>k_f@gentoo.org</email>
-		<name>Kristian Fiskerstrand</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
+++ b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.2-r1.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Adds multiple ssh keys to the ssh authentication agent"
-HOMEPAGE="http://code.fluffytapeworm.com/projects"
-SRC_URI="http://code.fluffytapeworm.com/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="X"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="
-	${PYTHON_DEPS}
-	X? ( >=net-misc/x11-ssh-askpass-1.2.2 )"
-
-src_prepare() {
-	python_fix_shebang .
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin ssh-multiadd
-	doman ssh-multiadd.1
-	dodoc Changelog README todo
-}
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/sword-Dan/Manifest
+++ b/app-dicts/sword-Dan/Manifest
@ -1 +0,0 @@
-DIST Dan-2.1.zip 1396887 BLAKE2B 374aaf90a3eee5d0a5c00c5e894421caadf5488bca04c171beb87f4ed51d7833da3e7c3ea0cc0b67696b5c31305d4425fed8b06c55d5ad475a0855a1aa323544 SHA512 e9b3553e4dc0aa4d668b005eb0dbca08a435a2775c5449d2e54e60f44abac3ebfb54de8eca9dee77c740d545e2d732f6b2044d297a384d8538ba53ed4cd24c83
--- a/app-dicts/sword-Dan/metadata.xml
+++ b/app-dicts/sword-Dan/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-dicts/sword-Dan/sword-Dan-2.1.ebuild
+++ b/app-dicts/sword-Dan/sword-Dan-2.1.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="Dan"
-
-inherit sword-module
-
-DESCRIPTION="Danske Bibel"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=Dan"
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-FreLSG/Manifest
+++ b/app-dicts/sword-FreLSG/Manifest
@ -1 +0,0 @@
-DIST FreLSG-1.3.zip 2317480 BLAKE2B 7aec1088410e12ea7627c045079765bb76b01c2f56237c24c59a3156a69a63f765d4caaa9a021f57ac886bf0dbfd4dca9c27ee9f2d76ec8bf0a69b93bbd0427a SHA512 3ace5e302caf20a91c3f0e1565a97f44e0a440f28d23b8f5fee2af8623094b17a52f8e5bf083c40f418aa65fb5c1464eedaea40a965f7b243780730c2ba2fba7
--- a/app-dicts/sword-FreLSG/metadata.xml
+++ b/app-dicts/sword-FreLSG/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-dicts/sword-FreLSG/sword-FreLSG-1.3.ebuild
+++ b/app-dicts/sword-FreLSG/sword-FreLSG-1.3.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="FreLSG"
-
-inherit sword-module
-
-DESCRIPTION="French Louis Segond (1910)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLSG"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-HNV/Manifest
+++ b/app-dicts/sword-HNV/Manifest
@ -1 +0,0 @@
-DIST HNV-1.8.zip 1515718 BLAKE2B c9765df4ba8b580df2aaada66a88dbaba42b462e616ef6a690a5c8b812d01e981a4b001566a40a6c5a12215356a676d94bcb2091f3b216d585d9e510acbbb0b4 SHA512 49bc4713c82de8bc51823a2f2b55bb331a14e6a673781e1534216209754d7b754b1c71b9b9e9e8984ca9c27a1c17a020bad5852c7de714916f729fcc6d693b73
--- a/app-dicts/sword-HNV/metadata.xml
+++ b/app-dicts/sword-HNV/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-dicts/sword-HNV/sword-HNV-1.8.ebuild
+++ b/app-dicts/sword-HNV/sword-HNV-1.8.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="HNV"
-
-inherit sword-module
-
-DESCRIPTION="Hebrew Names Version of the World English Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=HNV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-KJVD/Manifest
+++ b/app-dicts/sword-KJVD/Manifest
@ -1 +0,0 @@
-DIST KJVD-1.1.zip 102890 BLAKE2B 70f9bc653e77209f32983564ab5386101c6d1b60b157b76271cb19dbd9bd709f11878a89319ac9a178151352995565688a82f4689ddcf326c76f4aa78cc2850b SHA512 80f761b4ea83af42d36a46df92002de100ba37cade66d8c06528d0a5a52ac8a029e0add06433887c256771323324393e9bd18e9b1e043768e878a818cc17b9fb
--- a/app-dicts/sword-KJVD/metadata.xml
+++ b/app-dicts/sword-KJVD/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-dicts/sword-KJVD/sword-KJVD-1.1.ebuild
+++ b/app-dicts/sword-KJVD/sword-KJVD-1.1.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="KJVD"
-
-inherit sword-module
-
-DESCRIPTION="King James Dictionary"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJVD"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-RST/Manifest
+++ b/app-dicts/sword-RST/Manifest
@ -1 +0,0 @@
-DIST RST-1.6.zip 5813471 BLAKE2B 498c36b5551829e359dc25c6ef2b2e1296bf23f2375bd8f602750d8a5e063b7fb883b206de70624d0614794882afcbc702404d9ae779c89f322346f06bd2601e SHA512 0d66eee67f2a4fe3db06ded456a6e97812de349546b33821708f93a1072a85ed19b3e2792a5daba3dd38d2bb17246abb8b9ac1b0154e68afbd52fb049bf80385
--- a/app-dicts/sword-RST/metadata.xml
+++ b/app-dicts/sword-RST/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-dicts/sword-RST/sword-RST-1.6.ebuild
+++ b/app-dicts/sword-RST/sword-RST-1.6.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="RST"
-
-inherit sword-module
-
-DESCRIPTION="Russian Synodal Translation"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=RST"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-SpaSEV/Manifest
+++ b/app-dicts/sword-SpaSEV/Manifest
@ -1 +0,0 @@
-DIST SpaSEV-1.1.zip 1449569 BLAKE2B 2be47bbdd3f95ea4b18f26dc06a9234ca55e17655c3424ae81345301f3a15d074ac322c87e33e5eac62a96e80aba3b0e018979979d92e15f3f5916cbe865a857 SHA512 e2669082909ce00550928dee3be01655efb5830c42741cf9d4611096d0c4a575ccca6a4beac6b474fba7ed5b3676aaf0d166ceaad3af1e0633aa0183008a6d92
--- a/app-dicts/sword-SpaSEV/metadata.xml
+++ b/app-dicts/sword-SpaSEV/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-dicts/sword-SpaSEV/sword-SpaSEV-1.1.ebuild
+++ b/app-dicts/sword-SpaSEV/sword-SpaSEV-1.1.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="SpaSEV"
-
-inherit sword-module
-
-DESCRIPTION="Spanish Sagradas Escrituras Version Antigua (1569)"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaSEV"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-dicts/sword-WEB/Manifest
+++ b/app-dicts/sword-WEB/Manifest
@ -1 +0,0 @@
-DIST WEB-1.8.zip 1520597 BLAKE2B 193888d73c8ce68cdec8ad6a5c2becb754d44fe212b29528bb6450e4dcb6c15061fc2c79fa33bfe048f21ab12789306b279a694f3255b7f9495240b9c1b0ea12 SHA512 1abccad5f98c49152195cf3a31ae80a19d88d49dd7bec292afc7c22a1e04e1f8bdca9dbcd2f5572354a05fe5cf951718cdb9173af1ee5e822a09ba8512759e20
--- a/app-dicts/sword-WEB/metadata.xml
+++ b/app-dicts/sword-WEB/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-</pkgmetadata>
--- a/app-dicts/sword-WEB/sword-WEB-1.8.ebuild
+++ b/app-dicts/sword-WEB/sword-WEB-1.8.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-SWORD_MODULE="WEB"
-
-inherit sword-module
-
-DESCRIPTION="World English Bible"
-HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=WEB"
-LICENSE="public-domain"
-KEYWORDS="~amd64 ~ppc ~x86"
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild
@ -1,9 +1,9 @@
 # Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils

 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@ -24,18 +24,19 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""

-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/sunpinyin-2.0.4_alpha:=
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-i18n/sunpinyin-data"

 DOCS=(AUTHORS)

 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
--- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild
@ -1,9 +1,9 @@
 # Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

-inherit cmake-utils gnome2-utils
+inherit cmake xdg-utils

 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@ -24,18 +24,19 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""

-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND="virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/sunpinyin-2.0.4_alpha:=
 	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-i18n/sunpinyin-data"

 DOCS=(AUTHORS)

 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }

 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@ -1,2 +1,2 @@
-DIST ibus-m17n-1.3.4.tar.gz 436687 BLAKE2B 66c1138101b1c3634ebeef4657ef9d4accb30e9db0047d7232d1c25a5d061e705fb1f1bd2800c951baadeddf999a4eb24a581d59e261df4fd68d23b29ef3c530 SHA512 9e9bc290b0f0d68558d408f6e69aa3bd9bb767db827a95839b576b58c7a5056dedcbd9b0bf1aab5e26ab21e601acd67a53404a5fd54b436efaf2a706489f25c4
 DIST ibus-m17n-1.4.2.tar.gz 488603 BLAKE2B b916e1cc799eca2f042a0496a1184ccf32174eef1399f9ef7e3b7f3fc6ef2177514159706f1f4a4d696df136e7a5e7967af90ce0e1b4a021ac84e44973fe446c SHA512 5f865bd5d6dcd29828b14ea991effa6e883777173c48dd88cf676890dd2a980f95b3859b90fb44fb8cfe84df6da14335d3060605c4ce517f5eb179497a7b146b
+DIST ibus-m17n-1.4.3.tar.gz 489392 BLAKE2B bd37fb1f7160d4306be008e4f27fc5852db54318e6075f0887294f7ce30406ff697f41c5cc56734cffa4605b37f28cb89b3eb04a942e6acf352be50a273bd71f SHA512 8b42bcac8662b4924f54b6fe56427b32603746a3d1b0dfafb6dfec1296ec52847119f94fabb0a276f9de5918414fdf5f7b5aceaaabd8c01632cfd677344598ab
--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk gtk2 nls"
 REQUIRED_USE="gtk2? ( gtk )"

--- a/app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.3.ebuild
@ -3,13 +3,15 @@

 EAPI="7"

+inherit gnome2-utils xdg
+
 DESCRIPTION="M17N engine for IBus"
 HOMEPAGE="https://github.com/ibus/ibus/wiki"
-SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz"
+SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk gtk2 nls"
 REQUIRED_USE="gtk2? ( gtk )"

@ -30,3 +32,18 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_with gtk gtk $(usex gtk2 2.0 3.0))
 }
+
+pkg_preinst() {
+	xdg_pkg_preinst
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
--- a/app-i18n/ibus-skk/Manifest
+++ b/app-i18n/ibus-skk/Manifest
@ -1 +1,2 @@
 DIST ibus-skk-1.4.2.tar.gz 491882 BLAKE2B 999eb9f1b36406a8d665b2c929fcdef5e57bef5c6206075333435f46774445497d6d953bc695c22f6afa5700283c32a20c2d4e9227fd30e5552f5688cd524aab SHA512 cec7fbffaa78c406f3b9502bc64e2290fec579102a37ce61cb6424c3e06d159653f165b48e09f1256f38491bce6819460c6d226cd765ab150a8dfa80e2707fe1
+DIST ibus-skk-1.4.3.tar.xz 321344 BLAKE2B f761cf7c97ecf5830715a7bbae657c72d437e0be69a0867780ee574f9ea17f3d612dc5a76e3b4499fd203878702abdd2e37fdc980123a80daf5f03db7645b1f4 SHA512 c05302878f9c4b0a59daa1d285ab44501f63c0f7890149412137d3f6124fc4a7ebfe16172de311cbb5f2b9035255b5784a715a7832e6734d76e11bf19e2c9d3b
--- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

 inherit vala

@ -9,7 +9,7 @@ DESCRIPTION="Japanese SKK engine for IBus"
 HOMEPAGE="https://github.com/ueno/ibus-skk"
 SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="nls"
--- a/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit vala
+
+DESCRIPTION="Japanese SKK engine for IBus"
+HOMEPAGE="https://github.com/ueno/ibus-skk"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+CDEPEND="app-i18n/ibus
+	>=app-i18n/libskk-1.0.2
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )"
+RDEPEND="${CDEPEND}
+	app-i18n/skk-jisyo"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
--- a/app-i18n/ibus-skk/metadata.xml
+++ b/app-i18n/ibus-skk/metadata.xml
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    The SKK engine for IBus. It provides Japanese input method from
-    <pkg>app-i18n/libskk</pkg>.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">ueno/ibus-skk</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		The SKK engine for IBus. It provides Japanese input method from
+		<pkg>app-i18n/libskk</pkg>.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">ueno/ibus-skk</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@ -1 +1,2 @@
 DIST libskk-1.0.2.tar.gz 867572 BLAKE2B 32f599e83bf7ced796d2f37f6f4bf5e45f47c90e144784b7b3e082866cc619a26e3aca4f16051685baa4d8ac54b0462930193f978bc1e8220b378679269c5833 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0
+DIST libskk-1.0.5.tar.xz 564488 BLAKE2B e7108bd2f44e5a0a0756cd25da4b07376b36604d6d2159b283e8a5f4ef76006210ff993d58b653cbce01ae4c9e003acf4acbd93ebc40711fec2600e514c49e9f SHA512 6db675edba89b83da0c29afb42644c39bcb0ccfc47f067a18e0eda817df4f58a86c86e8747080018c132d8734754a6fd8a30fe6578050eb93ff636edeed534ab
--- a/app-i18n/libskk/libskk-1.0.2.ebuild
+++ b/app-i18n/libskk/libskk-1.0.2.ebuild
@ -1,15 +1,15 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

-inherit ltprune vala virtualx
+inherit vala virtualx

 DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
 HOMEPAGE="https://github.com/ueno/libskk"
 SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz"

-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+introspection nls static-libs"
@ -44,5 +44,5 @@ src_test() {

 src_install() {
 	default
-	prune_libtool_files
+	use static-libs || find "${ED}" -name '*.la' -delete || die
 }
--- a/app-i18n/libskk/libskk-1.0.5.ebuild
+++ b/app-i18n/libskk/libskk-1.0.5.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit vala virtualx
+
+DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
+HOMEPAGE="https://github.com/ueno/libskk"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	x11-libs/libxkbcommon
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_test() {
+	export GSETTINGS_BACKEND="memory"
+	virtx emake check
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete || die
+}
--- a/app-i18n/libskk/metadata.xml
+++ b/app-i18n/libskk/metadata.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ueno/libskk</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ueno/libskk</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="6"
+EAPI="7"

 DICT_VERSION="20131214"
 LM_VERSION="${PV}"

-DESCRIPTION="Data sets for Sunpinyin"
+DESCRIPTION="Data sets for SunPinyin"
 HOMEPAGE="https://github.com/sunpinyin/open-gram"
 SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
 	mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2"
@ -16,7 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""

-DEPEND="=app-i18n/sunpinyin-3*"
+# https://github.com/sunpinyin/sunpinyin/commit/0fff1e78d9a409205e025736286838721a2ccbf8
+BDEPEND=">=app-i18n/sunpinyin-2.0.4_pre20140819192400"
+DEPEND=""
+RDEPEND=""

 src_unpack() {
 	default
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@ -1,2 +1,3 @@
 DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
+DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild
@ -0,0 +1,64 @@
+# Copyright 2009-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+inherit python-any-r1 scons-utils toolchain-funcs
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
+elif [[ "${PV}" == *_pre* ]]; then
+	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
+fi
+
+DESCRIPTION="Statistical Language Model (SLM) based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/sunpinyin/${PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+else
+	SRC_URI="https://github.com/sunpinyin/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="|| ( CDDL LGPL-2.1 )"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl
+	virtual/pkgconfig"
+DEPEND="dev-db/sqlite:3"
+RDEPEND="${DEPEND}"
+
+if [[ "${PV}" == *_pre* ]]; then
+	S="${WORKDIR}/${PN}-${SUNPINYIN_GIT_REVISION}"
+elif [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${PN}-${PV/_/-}"
+fi
+
+src_prepare() {
+	default
+	sed -e "/^docdir =/s:/sunpinyin:/${PF}:" -i SConstruct || die
+
+	# https://github.com/sunpinyin/sunpinyin/issues/109
+	sed -e "/^Requires: sqlite3$/s/^Requires:/Requires.private:/" -i sunpinyin-2.0.pc.in || die
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_compile() {
+	escons \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	escons --install-sandbox="${D}" install
+}
--- a/app-i18n/xsunpinyin/Manifest
+++ b/app-i18n/xsunpinyin/Manifest
@ -1 +1,2 @@
+DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33
 DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
--- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
+++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild
@ -0,0 +1,74 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+inherit python-any-r1 scons-utils toolchain-funcs
+
+MY_PN="sunpinyin"
+MY_P="${MY_PN}-${PV}"
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin"
+elif [[ "${PV}" == *_pre* ]]; then
+	SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf"
+fi
+
+DESCRIPTION="Standalone XIM server for SunPinyin"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz"
+else
+	SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+LICENSE="|| ( CDDL LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig"
+DEPEND="~app-i18n/sunpinyin-${PV}
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango"
+RDEPEND="${DEPEND}
+	app-i18n/sunpinyin-data"
+
+if [[ "${PV}" == *_pre* ]]; then
+	S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}"
+elif [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/${MY_PN}-${PV/_/-}"
+fi
+
+src_prepare() {
+	default
+
+	# https://github.com/sunpinyin/sunpinyin/pull/101
+	sed -e "/^[[:space:]]*print /s/print \(.*\)/print(\1)/" -i wrapper/xim/SConstruct || die
+
+	# https://github.com/sunpinyin/sunpinyin/issues/110
+	sed -e "s/^\( *\)('CXX', 'CXX'),/&\n\1('AR', 'AR'),\n\1('RANLIB', 'RANLIB'),/" -i wrapper/xim/SConstruct || die
+}
+
+src_configure() {
+	tc-export AR CC CXX RANLIB
+}
+
+src_compile() {
+	escons -C wrapper/xim \
+		--prefix="${EPREFIX}/usr"
+}
+
+src_install() {
+	escons -C wrapper/xim --install-sandbox="${D}" install
+}
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/evemu/Manifest
+++ b/app-misc/evemu/Manifest
@ -1 +0,0 @@
-DIST evemu-2.7.0.tar.xz 509308 BLAKE2B 0fec24d4cbd57a2b8d9eb6c7e4734a069148e20dea819bf8409adc95928410bfdabc93dbe58faad1137fb086d4534668e2cbd77f939f9a44a9aee99835fa7d2d SHA512 a8b09717f84df440c230bb65d3d50d81ce6a722a7cdb281981792435ea591186c28dbec215a0314542e0e36bab06bb1800851bbe32cf2a0e7712adaeaceaeb76
--- a/app-misc/evemu/evemu-2.7.0.ebuild
+++ b/app-misc/evemu/evemu-2.7.0.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit ltprune python-single-r1
-
-DESCRIPTION="tools and bindings for kernel evdev device emulation, data capture, and replay"
-HOMEPAGE="https://www.freedesktop.org/wiki/Evemu/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	>=dev-libs/libevdev-1.2.99.902"
-DEPEND="app-arch/xz-utils
-	${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable python python-bindings)
-}
-
-src_test() {
-	if use python ; then
-		if [[ ! ${EUID} -eq 0 ]] || has sandbox $FEATURES || has usersandbox $FEATURES ; then
-			ewarn "Tests require userpriv, sandbox, and usersandbox to be disabled in FEATURES."
-		else
-			emake check
-		fi
-	fi
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
--- a/app-misc/evemu/metadata.xml
+++ b/app-misc/evemu/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-misc/task/files/task-2.5.1-clang-build-system.patch
+++ b/app-misc/task/files/task-2.5.1-clang-build-system.patch
@ -0,0 +1,17 @@
+Do not force the use of libc++ when compiling with Clang
+Fix by David Denoncin
+https://bugs.gentoo.org/729560
+
+--- a/CMakeLists.txt	2020-08-09 14:04:40.095904996 -0000
+++ b/CMakeLists.txt	2020-08-09 14:04:59.449238208 -0000
+@@ -43,10 +43,6 @@
+  message (FATAL_ERROR "C++11 support missing. Try upgrading your C++ compiler. If you have a good reason for using an outdated compiler, please let us know at support@taskwarrior.org.")
+ endif (_HAS_CXX11)
+ 
+-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+-  set (_CXX11_FLAGS "${_CXX11_FLAGS} -stdlib=libc++")
+-endif (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+-
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+   set (LINUX true)
+ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--- a/app-misc/task/metadata.xml
+++ b/app-misc/task/metadata.xml
@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="sync">Enable "task sync" support</flag>
 	</use>
--- a/app-misc/task/task-2.5.1-r2.ebuild
+++ b/app-misc/task/task-2.5.1-r2.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="Taskwarrior is a command-line todo list manager"
+HOMEPAGE="https://taskwarrior.org/"
+SRC_URI="https://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="+sync"
+
+DEPEND="
+	sync? ( net-libs/gnutls )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/0001-TW-1778-Unicode-strings-are-truncated-in-task-descri.patch"
+	"${FILESDIR}/${P}-clang-build-system.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# don't automatically install scripts
+	sed -i '/scripts/d' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_SYNC=$(usex sync)
+		-DTASK_DOCDIR=share/doc/${PF}
+		-DTASK_RCDIR=share/${PN}/rc
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newbashcomp scripts/bash/task.sh task
+
+	# vim syntax
+	rm scripts/vim/README || die
+	insinto /usr/share/vim/vimfiles
+	doins -r scripts/vim/*
+
+	# zsh-completions
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh/*
+
+	exeinto "/usr/share/${PN}/scripts"
+	doexe scripts/add-ons/*
+}
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
--- a/app-mobilephone/obexftp/Manifest
+++ b/app-mobilephone/obexftp/Manifest
@ -1 +0,0 @@
-DIST obexftp-0.24.2-Source.tar.gz 110291 BLAKE2B 7de93f5f5a367481b22b49c7812357ab5f704830c83770378de13f9c4ffb5f114d48beafca193b52670563b397656ec185519a8d004eb1f9785787e8cc5caaff SHA512 91a5d7e52c00bbaf24837384ceadc987a89297e672b246df1370bbd669fae05459281bc46bb60ba562607bfbead321926cdf11422059cd918819d80321e190c2
--- a/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.23-gentoo.patch
@ -1,22 +0,0 @@
--- a/obexftp/client.c
-+++ b/obexftp/client.c
-@@ -51,8 +51,6 @@
- 
- #ifdef HAVE_BLUETOOTH
- #include "bt_kit.h"
-#else
-#define ESOCKTNOSUPPORT	WSAESOCKTNOSUPPORT
- #endif /* HAVE_BLUETOOTH */
- 
- #include <openobex/obex.h>
--- a/apps/obexftp.c
-+++ b/apps/obexftp.c
-@@ -29,6 +29,8 @@
- 
- #include <sys/types.h>
- 
-+#include <config.h>
-+
- #ifdef HAVE_SYS_TIMES_H
- #include <sys/times.h>
- #endif
--- a/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-config.patch
@ -1,11 +0,0 @@
--- a/apps/obexftp.c
-+++ b/apps/obexftp.c
-@@ -43,8 +43,6 @@
- 
- #include <common.h>
- 
-#include <config.h>
-
- #ifdef HAVE_SYS_TIMES_H
- #include <sys/times.h>
- #endif
--- a/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-enable_bluetooth.patch
@ -1,16 +0,0 @@
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,11 +52,13 @@
- #
- # some code is only included if bluetooth is available
- #
-+if ( ENABLE_BLUETOOTH )
- find_package ( Bluetooth )
- if ( Bluetooth_FOUND )
-   include_directories ( ${Bluetooth_INCLUDE_DIRS} )
-   add_definitions ( -DHAVE_BLUETOOTH -DHAVE_SDP )
- endif ( Bluetooth_FOUND )
-+endif ( ENABLE_BLUETOOTH )
- 
- add_subdirectory ( bfb )
- add_subdirectory ( multicobex )
--- a/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-norpath.patch
@ -1,11 +0,0 @@
--- obexftp-0.22/swig/perl/Makefile.PL.in.norpath	2007-07-11 21:22:30.000000000 +0200
-+++ obexftp-0.22/swig/perl/Makefile.PL.in	2007-08-06 20:17:39.000000000 +0200
-@@ -11,7 +11,7 @@ WriteMakefile(
-     'INC'       =>	q[-I@top_srcdir@ @CPPFLAGS@],
- # Default value for LDDLFLAGS is $Config{lddlflags}="-shared -L/usr/local/lib"
- # but we want rpath to be @libdir@ or @exec_prefix@/lib
-    'LDDLFLAGS' =>      q[-shared -Wl,-rpath=@prefix@/lib],
-+    'LDDLFLAGS' =>      q[-shared],
-     'LIBS'      =>	q[-L@top_builddir@/obexftp/.libs -lobexftp
-     			  -L@top_builddir@/multicobex/.libs -lmulticobex
- 			  -L@top_builddir@/bfb/.libs -lbfb
--- a/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.24-python_sitedir.patch
@ -1,16 +0,0 @@
--- a/swig/python/CMakeLists.txt
-+++ b/swig/python/CMakeLists.txt
-@@ -40,11 +40,13 @@
-   OUTPUT_VARIABLE PYTHON_PREFIX
- )
- file ( TO_CMAKE_PATH "${PYTHON_PREFIX}" PYTHON_PREFIX )
-+if ( NOT PYTHON_SITE_DIR )
- execute_process (
-   COMMAND ${PYTHON_EXECUTABLE} -c
-   	"import site, sys; sys.stdout.write(site.getsitepackages()[-1])"
-   OUTPUT_VARIABLE PYTHON_SITE_DIR
- )
-+endif ( PYTHON_SITE_DIR )
- file ( TO_CMAKE_PATH "${PYTHON_SITE_DIR}" PYTHON_SITE_DIR )
- string ( REGEX REPLACE "^${PYTHON_PREFIX}/" ""
-   PYTHON_SITE_DIR "${PYTHON_SITE_DIR}"
--- a/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch
+++ b/app-mobilephone/obexftp/files/obexftp-0.24.2-parallel-build.patch
@ -1,53 +0,0 @@
-diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
-index b5c84e4..63af134 100644
--- a/apps/CMakeLists.txt
-+++ b/apps/CMakeLists.txt
-@@ -5,14 +5,23 @@ add_definitions( -DVERSION="${obexftp_VERSION}" )
- add_definitions ( -DHAVE_USB )
- 
- add_executable ( obexftp_app obexftp.c )
-target_link_libraries ( obexftp_app obexftp )
-+target_link_libraries ( obexftp_app
-+  PRIVATE multicobex
-+  PRIVATE bfb
-+  obexftp
-+)
- set_target_properties ( obexftp_app PROPERTIES
-   OUTPUT_NAME obexftp
- )
- 
- 
- add_executable ( obexftpd_app obexftpd.c )
-target_link_libraries ( obexftpd_app obexftp openobex )
-+target_link_libraries ( obexftpd_app
-+  PRIVATE multicobex
-+  PRIVATE bfb
-+  obexftp
-+  openobex
-+)
- set_target_properties ( obexftpd_app PROPERTIES
-   OUTPUT_NAME obexftpd
- )
-diff --git a/fuse/CMakeLists.txt b/fuse/CMakeLists.txt
-index 0c80d3d..ff5e3cd 100644
--- a/fuse/CMakeLists.txt
-+++ b/fuse/CMakeLists.txt
-@@ -13,6 +13,8 @@ if ( Fuse_FOUND )
-   )
- 
-   target_link_libraries ( obexfs
-+    PRIVATE multicobex
-+    PRIVATE bfb
-     obexftp
-     ${Fuse_LIBRARIES}
-     ${EXPAT_LIBRARIES}
-@@ -23,6 +25,8 @@ if ( Fuse_FOUND )
-   )
- 
-   target_link_libraries ( obexautofs
-+    PRIVATE multicobex
-+    PRIVATE bfb
-     obexftp
-     ${Fuse_LIBRARIES}
-   )
-
--- a/app-mobilephone/obexftp/metadata.xml
+++ b/app-mobilephone/obexftp/metadata.xml
@ -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="sourceforge">openobex</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.24.2.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit cmake-utils python-single-r1 ruby-single
-
-DESCRIPTION="File transfer over OBEX for mobile phones"
-HOMEPAGE="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"
-SRC_URI="mirror://sourceforge/openobex/${P}-Source.tar.gz"
-SLOT="0"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ppc x86"
-
-# bluetooth support is not really optional, bug #529068
-IUSE="perl python ruby tcl"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/openobex-1.7
-	net-wireless/bluez
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	tcl? ( dev-lang/swig )
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P}-Source
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.23-gentoo.patch
-	"${FILESDIR}"/${PN}-0.24-config.patch
-	"${FILESDIR}"/${PN}-0.24-enable_bluetooth.patch
-	"${FILESDIR}"/${PN}-0.24-python_sitedir.patch
-	"${FILESDIR}"/${PN}-0.24-norpath.patch
-	"${FILESDIR}"/${P}-parallel-build.patch
-)
-
-src_configure() {
-# -DENABLE_BLUETOOTH=$(usex bluetooth)
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DCMAKE_SKIP_RPATH=ON
-		-DENABLE_PERL=$(usex perl)
-		-DENABLE_BLUETOOTH=yes
-		-DENABLE_PYTHON=$(usex python)
-		$(usex python -DPYTHON_SITE_DIR=$(python_get_sitedir) '')
-		-DENABLE_RUBY=$(usex ruby)
-		-DENABLE_TCL=$(usex tcl)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN}/html || die #524866
-}
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST sphinxtrain-1.0.8.tar.gz 8925803 BLAKE2B e268c00843445cb69ae2a88f93fb4aa640556179417d44f6297d87f7e509418778b4808885bb19ab163efbd71565a3b6d75d269b420e9e366c0c6553a04b3053 SHA512 465d2c4ade9acc7b49c1d975449c38ac01d5a3ff332f9841be66cd8ca9d2f0b68fd36cc8a46384c8b510042efa91c3887a080481e84f2d0deb9775a598835f2b`
				`@ -1 +0,0 @@`
				`DIST sphinx3-0.8.tar.gz 25226326 BLAKE2B 0eb2c6474ec32ef1aed277816b0b596ba561c1705b389b19de7dfd969212bc24e5eec0a920aaeb15ed3a90f464552b4e24e964b94380dc292a9299b4651793bc SHA512 85b8e574e2f92a758c8c56ef11b873c49ef8a376e964f30a12d75850d4a0db56e3108eaea25fa5587675ef2ffa4531a13f0f182a85cc8e434c6bcee42058e050`
				`@ -1 +0,0 @@`
				`DIST sphinxbase-0.8.tar.gz 3313197 BLAKE2B ec2dcd232194d32d851924099ffb64fa9da6bdccb973fe1311d2b4b0506073cfd35b548ba8d8f64c2ee757f3b5ba87ae23c95d0f67c95be1110b7e2a995c9be2 SHA512 fdb13c07e591e868c395d5f8209ec389fb9d5a93d99104a00cb82382e84d320091ae7e74d53225706331d4959ab5e248fa622582a148bfdb6ab5c38470d1963c`
				`@ -1 +0,0 @@`
				`DIST ipkg-utils-050831.tar.gz 29175 BLAKE2B 4f1d4b5efb7f808e6987a7b62f830463e28fca998c49b4d6683a58c2d2225e24820e6f2b47642e5cceafa34e0ab3ff8172267ef734bbbf1c8f94b8777172efc8 SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa`
				`@ -1 +0,0 @@`
				`DIST cachedir-1.4.tar.gz 16254 BLAKE2B f70fe693d614ab90c4b235c2979e9323eb41976ea8a97c4d3107af26f411553a86e0409b354483a6e3c9af956597c9a4114dc28829cc2ed55abe7c7dd3bb8a99 SHA512 dabeb36a4b99febafbfcc3bff4de625491eee6649cac6c03ef782415cfdd519d36911bed8ae6e7bb94b0afe6279b17fd99fcb87f0c2d2e37032a76fa516dd6c7`
				`@ -1 +0,0 @@`
				`DIST ssh-multiadd-1.3.2.tar.gz 14035 BLAKE2B 1de9e8593be128b792d6babe9ada37e7f611045d573e3430c0bc08a66d9c6acb00f5f6c453b22fd2308233cc8e58c62ab116de1aae702d066f664036bb029027 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3`
				`@ -1 +0,0 @@`
				`DIST Dan-2.1.zip 1396887 BLAKE2B 374aaf90a3eee5d0a5c00c5e894421caadf5488bca04c171beb87f4ed51d7833da3e7c3ea0cc0b67696b5c31305d4425fed8b06c55d5ad475a0855a1aa323544 SHA512 e9b3553e4dc0aa4d668b005eb0dbca08a435a2775c5449d2e54e60f44abac3ebfb54de8eca9dee77c740d545e2d732f6b2044d297a384d8538ba53ed4cd24c83`
				`@ -1 +0,0 @@`
				`DIST FreLSG-1.3.zip 2317480 BLAKE2B 7aec1088410e12ea7627c045079765bb76b01c2f56237c24c59a3156a69a63f765d4caaa9a021f57ac886bf0dbfd4dca9c27ee9f2d76ec8bf0a69b93bbd0427a SHA512 3ace5e302caf20a91c3f0e1565a97f44e0a440f28d23b8f5fee2af8623094b17a52f8e5bf083c40f418aa65fb5c1464eedaea40a965f7b243780730c2ba2fba7`
				`@ -1 +0,0 @@`
				`DIST HNV-1.8.zip 1515718 BLAKE2B c9765df4ba8b580df2aaada66a88dbaba42b462e616ef6a690a5c8b812d01e981a4b001566a40a6c5a12215356a676d94bcb2091f3b216d585d9e510acbbb0b4 SHA512 49bc4713c82de8bc51823a2f2b55bb331a14e6a673781e1534216209754d7b754b1c71b9b9e9e8984ca9c27a1c17a020bad5852c7de714916f729fcc6d693b73`
				`@ -1 +0,0 @@`
				`DIST KJVD-1.1.zip 102890 BLAKE2B 70f9bc653e77209f32983564ab5386101c6d1b60b157b76271cb19dbd9bd709f11878a89319ac9a178151352995565688a82f4689ddcf326c76f4aa78cc2850b SHA512 80f761b4ea83af42d36a46df92002de100ba37cade66d8c06528d0a5a52ac8a029e0add06433887c256771323324393e9bd18e9b1e043768e878a818cc17b9fb`