gentoo resync : 06.05.2018

19 files changed, 266 insertions, 187 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6f51b95802ae..2153cfc2f401 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
index 9dfe7367a5a2..dd7c6f1660fd 100644
--- a/net-misc/csync/Manifest
+++ b/net-misc/csync/Manifest
@@ -1,3 +1,3 @@
 DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a
-EBUILD csync-0.50.0.ebuild 1197 BLAKE2B a9a2d71fc35631051bf1eefff9829f2727c627a71cc9a313a2301ed7210e8c04e2a320662b24eb6b0f6fa41b2de6d04a65fa333f2dbf490ecd77b99830afff7d SHA512 48e914abb6744fba051f82ffab50db54f7e963fe21fcc3a0125941c333e96a2539fe2cafaba672caa86c0679c588ba4568e6e8aaa87b7fd410b433fa6de451b7
+EBUILD csync-0.50.0.ebuild 1202 BLAKE2B 1332fa048c525811d42889ae8a36e7a3b02faf815455b0e9d274d705c13d29ee47818fde2b529e5fe75a8935528124272dcc0bfce4eb7c8290a66da0444f6b96 SHA512 ac9d02accd433cc1b07675503c3104416a6e948c0e5be52ebf0ca794749db68d5253b3ddf51b1bfa75f6cece33e5e7d48cde4c828812db39a2956926a369b36f
 MISC metadata.xml 354 BLAKE2B 5a0ff4b19f98eefe67e4b6dc04ea59cdb76abfb4f8799163cf2c87a565660e84182ca565eb641b43b66083d9d9dde12cb156edc84b06e889edf0cc9a60e07d68 SHA512 513b19184444fb46882523fc160043d7d530d202aa253f44ace9fc97fad8dda7748083bd992921d93ebd62a12397e69a086932818e317f75fb7dfa478ab3f1ba
diff --git a/net-misc/csync/csync-0.50.0.ebuild b/net-misc/csync/csync-0.50.0.ebuild
index 89a33ce131c1..e94ffa92f273 100644
--- a/net-misc/csync/csync-0.50.0.ebuild
+++ b/net-misc/csync/csync-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit cmake-utils
 
 DESCRIPTION="lightweight file synchronizer utility"
-HOMEPAGE="http://csync.org/"
+HOMEPAGE="https://www.csync.org/"
 SRC_URI="https://open.cryptomilk.org/attachments/download/27/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 6c8853650e76..c344e8fa84fd 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -6,11 +6,13 @@ DIST dhcpcd-7.0.0.tar.xz 207924 BLAKE2B bd24f22b4852596ef4a076d1ab15ac4411dd676b
 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
 DIST dhcpcd-7.0.2.tar.xz 208736 BLAKE2B 958118a7acdb6d55e06b88ec8b1fe342600e49caefc7e0e6745a20aafb9588f1c83af171c47e7b6ba1faa664290b052530271f5dd588f82db5933af315b8eea7 SHA512 f5b1407199163fb994519bc1b5a70ad043f00f263e3b254da5d519d1c6b689a4a5a8bcef3bf42401826984e273c2ead38249fcfe99129b87034f90de2fc46ecd
 DIST dhcpcd-7.0.3.tar.xz 208856 BLAKE2B d11f1845cae74470cd9982f5957911ac5fd7cc284b455254fef5c462e516018d94d56f970d758e81cd86a7f918e5cf0d3bd6d2087bda701b299436c4253220f4 SHA512 a2d4e8ea6a310090c2795c596c80a76f0e42dc6654ba50d2900e2af4239dbc542e857d20b2983ea97675903b85cdbd0e9212424390a62081837821bbdaf7ce83
+DIST dhcpcd-7.0.4.tar.xz 209860 BLAKE2B 12c9524d6cd012665479a91f2966ae8123cc38bd3a47d81490f3dc0efecda2a787a0d55e883906e536c989054d25e00fa96d06d11062013d154de88882f31414 SHA512 32382b17a00e6ff7a80868a35424d1cc25410f012048ef099a90fbcb15a43ef6e73d2e65094ac90ccb18ecd92c6fc2c7e2116e19669ad0084ee39182b5cbd7db
 EBUILD dhcpcd-6.11.3.ebuild 3277 BLAKE2B cba51124fe3369c9dce1c5aaed67f99120c5514230212c0b375156aa1af3a59a272cabd6012e071bfb33666876562f645ce575e096e4d3d810d5c3766f38d3ec SHA512 b83545d0c64adb2be1c1a34beb0018fe21f0b0bee5b2dc9bfc1ed16f9433c213b3fed1cc5db3d63ba65fcaaec40bc19217cb110af84654bd5e6e2f66db21b6cc
 EBUILD dhcpcd-6.11.5.ebuild 3281 BLAKE2B 6d98c09002122c9044e10aaaefe442f941db4686227d6e7a052c96dfaab68c276f9fc6b3230d3ec0bc9fa4f6fb0ea5933b574d23fd8860cf1e33c3a4eb10121b SHA512 94b13653b8202a4c402f1f52618a9f5bc414cb92ab1376098dc70e12dc5fb963ebb83ba517b100eaea0cd2cc248152b038115ef14e588abb0ae78c024c13316a
 EBUILD dhcpcd-7.0.0.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
 EBUILD dhcpcd-7.0.1.ebuild 4437 BLAKE2B be75ed49f0477924807faf02e3adc6596257f9a026db8dc5583a24264686ab543aba839c33146ddb2368d632291a8b685d7bb18eb7157023f8f137071c4c7798 SHA512 98596cf6a5ecd4009fe02cab49cae6ac39283da3d3c9dce8ee1144063da4030a3433ac1ffef7d84edbf8bfd2c2a430c43a3791e77988e40b865b8b110fc7607f
 EBUILD dhcpcd-7.0.2.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
 EBUILD dhcpcd-7.0.3.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
-EBUILD dhcpcd-9999.ebuild 4447 BLAKE2B fe90c2b3f429f5d41f47238eeb08f705155617b6f85f1505bb62d2e07089f38ce69d860b79b82e14e0457cb05b32f3bbd6229da689138c13123adfe7d7b8f6fa SHA512 0c12c9f1d198bb3dba8b6f1788680f47e647d442177bc0bf5d635836908882e43a1d5d4515521d1ab1bad16218a117e7836cc3ed20eef6390c6502d1327caec9
+EBUILD dhcpcd-7.0.4.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
+EBUILD dhcpcd-9999.ebuild 4472 BLAKE2B 0e8cb71f788b522f5e4d255fb13d5fba7586c61b97003914dbb51bfba3083ad5d931578a8d18f29b1d257c1724b8ee08fdb09a56dd4c326dd1bfa65853c5d881 SHA512 bcac460ab5524e7069d766d21a38a245d51f5a12f6b9145b53df5ce8bdfdfbaafa87c1a658285415666333ee6f0e7e7f13255788d52e2401d2b02147ff76a130
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
new file mode 100644
index 000000000000..3d93853bedc3
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.4.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://roy.marples.name/dhcpcd"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="http://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="http://roy.marples.name/projects/dhcpcd/"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 2723156dac92..3d93853bedc3 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.ebuild
@@ -50,6 +50,7 @@ src_configure()
 src_install()
 {
 	default
+	keepdir /var/lib/dhcpcd
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	systemd_dounit "${FILESDIR}"/${PN}.service
 }
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 5704e652a7c6..2c4362bd4ee9 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -3,6 +3,8 @@ AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.1.0-build-failure.patch 455 BLAKE2B f8c52b6d37b999f3ba6765fa61c732a8b5b00151a8b2dc4bb0292b39282e6cbc28b7348eca41b645fd95997731fa36cc628c8850d43366e048c91d57abcea079 SHA512 5def64f7d94b9005890d56b16385df8b78701fb139dbc379f29818413f4bea03eb1e2b87db0e4b4206b710d9e80f646061dd223f3370deced72667ece9b5f25d
 DIST gerbera-1.1.0.tar.gz 1308827 BLAKE2B bb8d59702fef7b1048cc11d19d5de73ad5d5ca92908831b3c0d7d075c2a3c00d94a6a6bb5f5ba45a6cf0ef688294d041e1b71ac98e19235bce0f050928a5f873 SHA512 975b6f2f5d7538d94eec55ef76467be6b2c94e78cc1735c364053f1cc08dc3b59f8d1c8987dbef3b8fc82896c433f69228d713f03addce5f3ddc643fe4c05d8b
+DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
 EBUILD gerbera-1.1.0-r1.ebuild 2568 BLAKE2B c9fefab7500b37b5e131e07aef0fd8bb0d1f42ada759732462d48ef24961521d96191b23468796eae11b81a52fe466bcd42c0e11f13368a027199b1b015228c0 SHA512 d06efa376c453b02e2288de8e759a675242b8b9c2940f2155072c1abf3c8730f6a22fbd5c4654600a18ca5f0ef1284dcafc8a94e9d2cab1aa53f5ecf7c53fcf5
+EBUILD gerbera-1.2.0-r1.ebuild 2550 BLAKE2B ee61c800fd3199a7ee85e6acd09b97ea4a2d0af54350df57ae757f042d0f985806db720edbbd24172e86117d93530f2d85b2564d0ed6857b526ab3b41e889074 SHA512 3e89539be06f7b0a735f8bbd7bd86d4241daebbd818ed6193a402466b85cfc80c498a7b9506c47222ad657182462717f1a914bc541e004000513c0559c55a97a
 EBUILD gerbera-9999.ebuild 2546 BLAKE2B e4aa8ba229f02ce99a5919efa5067b2949f46c2d1bc3550283d705789c1556746373a67650c68aec53726161d3bc8148833451cb40bb9fc5cda8d5965a311684 SHA512 40ec0a3190befc41b40a92a45971d9ced41cb76ea51719118a63ad7b557c5cc6c80e4d532b7198edcbc2a8d6aae75b780d6aabb70e43efe60bb04ee188ea8f26
 MISC metadata.xml 1209 BLAKE2B b724abc66f5a3111c66a94331e61f9a50ae67344dab4695e7fc68154ddc9843e0295c7a12438e342be409b9429a4f9c60abce02422594df708d7933521bf9673 SHA512 c91dddacee6beab0a3cec3ab317810f77d3715a84384ceeafd3bdc872fff6d352d6bd4312d8194b59a159604794b0197780db6c27b20a327afa1e7bb9cba6a26
diff --git a/net-misc/gerbera/gerbera-1.2.0-r1.ebuild b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..80b003ed0721
--- /dev/null
+++ b/net-misc/gerbera/gerbera-1.2.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils linux-info systemd tmpfiles user
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
+	KEYWORDS=""
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${P}"
+fi
+
+DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
+HOMEPAGE="https://github.com/gerbera/gerbera"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
+
+DEPEND="
+	!!net-misc/mediatomb
+	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
+	>=dev-db/sqlite-3
+	dev-libs/expat
+	mysql? ( virtual/mysql )
+	javascript? ( dev-lang/duktape )
+	taglib? ( >=media-libs/taglib-1.11 )
+	lastfm? ( >=media-libs/lastfmlib-0.4 )
+	exif? ( media-libs/libexif )
+	exiv2? ( media-gfx/exiv2 )
+	ffmpeg? (
+		libav? ( >=media-video/libav-10:0= )
+		!libav? ( >=media-video/ffmpeg-2.2:0= )
+	)
+	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
+	curl? ( net-misc/curl net-misc/youtube-dl )
+	magic? ( sys-apps/file )
+	sys-apps/util-linux
+	sys-libs/zlib
+	virtual/libiconv
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /dev/null ${PN}
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CURL="$(usex curl)" \
+		-DWITH_DEBUG="$(usex debug)" \
+		-DWITH_EXIF="$(usex exif)" \
+		-DWITH_EXIV2="$(usex exiv2)" \
+		-DWITH_AVCODEC="$(usex ffmpeg)" \
+		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
+		-DWITH_JS="$(usex javascript)" \
+		-DWITH_LASTFM="$(usex lastfm)" \
+		-DWITH_MAGIC="$(usex magic)" \
+		-DWITH_MYSQL="$(usex mysql)"
+		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
+		-DWITH_SYSTEMD="$(usex systemd)" \
+		-DWITH_TAGLIB="$(usex taglib)" \
+		-DWITH_INOTIFY=1
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
+
+	insinto /etc/${PN}
+	newins "${FILESDIR}/${PN}-1.0.0.config" config.xml
+	fperms 0640 /etc/${PN}/config.xml
+	fowners root:gerbera /etc/${PN}/config.xml
+
+	keepdir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog "Gerbera has been built with MySQL support and needs"
+		elog "to be configured before being started. By default"
+		elog "SQLite will be used."
+	fi
+}
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 9c4a5e462ff7..e387b84bb866 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,13 +1,9 @@
 AUX miniupnpd-conf.d-r1 301 BLAKE2B 90ead95141ec0ef6591113a352a6a1341496f273d33c5d8ba66756349af8e7b9e1d8dc1b1ec585e32c3c783d9d9ecc456383375527f14c1d48bebfb170eabacd SHA512 47ab1626f5102e26ef8788bb5f90138d178a798c106e377139453d80e687b61bea1262a8429b39fa6f2dee5fc5f112628e580975d8e2e5ab40d43473d38a6c5b
 AUX miniupnpd-init.d-r1 659 BLAKE2B fc2cfeabf10b4e163ea47fb5ba814df0a52a181380bc6c8485daf007a40a352d413833586ea537195bd87e5303a262363bbf71ec71119280329a4996d2a08342 SHA512 11b05eb9d33afbce7b1bee1bf0159875ee0dfb52048aa4f379a0d21b117b04cf0775885d06cc24735d46611aae4a78cc66ba19cf3d8f7db3611909a565e75771
-DIST miniupnpd-2.0.20171212.tar.gz 222617 BLAKE2B 6ac33048b18d9f8aeb5103f57c9982fec956a61155f8592118c38dea70801597d9e867690ef2f1cdfaf848a25d7ddb4891b3ebf37cd391b33518d6b02e6f9b4a SHA512 3ab81c840953736c662bcb6f074421052a846c7827768acd7a961a23906b9e3d3389f5b593fb6f8011c8e717dae6cd3907b6d34e7904d560378671a7fc1dd3b2
-DIST miniupnpd-2.0.20180203.tar.gz 223084 BLAKE2B 14d7b1f8136be5e211ee2e5374b8ee77dfeb3e64e1308f918d9334a8600234e38581caa293b613cd3736d4a8cfc196a54839cffa8091a36961f4e0e79c727455 SHA512 ef02e33cd93225992c193a13be2320de02255610532de77cf704573384c777d82a4cb89c295982bb660ce056e38ef341223ab362bab74b2cb6954ed4e62b0219
-DIST miniupnpd-2.0.20180222.tar.gz 223697 BLAKE2B f551c9219a3a0a0eda905c953c5f9f45df3f192d3d253111cb35ce51351561ae2547351cb901b91eafc1765bd89b75760063e109bacfae625ff8090563913883 SHA512 a7ee306ccac0673e55780129b3c61de025ec63a653383ae475f08695a95647ae83e5e5978ce6ee166e8d0270a5bd08250613593acaabd0b730178ca2e52dc482
 DIST miniupnpd-2.0.20180410.tar.gz 224736 BLAKE2B 76bb4eba8cd3985ff46b1e46543018171a44cee636affb6db75c7b4bfcfa5ef19a678a23467280cf7d199b8fe332cfae6595848c4a2446da2095aecadb82d5f6 SHA512 4a3392b3883e72689e6160941b80533f7254dbaf54407fe2899caef8848d7dbe82ece6079fc39446c162053c1ea1dc10912af0a31d71eb16fbfbec0029dbc645
 DIST miniupnpd-2.0.20180422.tar.gz 224942 BLAKE2B 62ec30de6d3551b9f31ed7eb81ceffaf75eeaa91236114f5532218d748e148574fdc195447beecc5cfd6898c2fe28f3e9bf15755979cf34633388194301a51dc SHA512 338ebb03edfd9448a91277c3cc47843a45c1ee9d9e43ba52cd5f897cca8ddc5cbb53dd291056d30a906c68a5dfe0e5eb50169f7ffefab003fcf440de46b83f42
-EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
-EBUILD miniupnpd-2.0.20180203.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
-EBUILD miniupnpd-2.0.20180222.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
+DIST miniupnpd-2.0.20180503.tar.gz 225454 BLAKE2B d08c1fe050fce4a6f2348ff17f9d03feae04ca99a1b70fd7cc1734f56374f2be73708c5b495cf1a23ae76bd1f0042a90442793a87adb3ed9d0c49678dd8eb0b8 SHA512 7615f28d8e41bbe5b7343159a526ba33e643d14e2be7c2382461fda36ecfb3420ef2903e0cc9fa92ffe376f8609feb9403a316244eec0459e78a6b5ad96462ee
 EBUILD miniupnpd-2.0.20180410.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
 EBUILD miniupnpd-2.0.20180422.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
+EBUILD miniupnpd-2.0.20180503.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
 MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild
deleted file mode 100644
index cbdc231611f5..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20171212.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(use igd2 && printf -- '--igd2\n')
-		$(use ipv6 && printf -- '--ipv6\n')
-		$(use leasefile && printf -- '--leasefile\n')
-		$(use portinuse && printf -- '--portinuse\n')
-		$(use pcp-peer && printf -- '--pcp-peer\n')
-		$(use strict && printf -- '--strict\n')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild
deleted file mode 100644
index 9f786c4d43a2..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.0.20180222.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="http://miniupnp.free.fr/"
-SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+leasefile igd2 ipv6 pcp-peer portinuse strict"
-
-RDEPEND=">=net-firewall/iptables-1.4.6:0=[ipv6?]
-	net-libs/libnfnetlink:=
-	net-libs/libmnl:=
-	dev-libs/gmp:0=
-	sys-apps/util-linux
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	sys-apps/lsb-release"
-
-src_prepare() {
-	default
-	mv Makefile.linux Makefile || die
-}
-
-src_configure() {
-	local -a opts
-	opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-	)
-
-	emake CONFIG_OPTIONS="${opts[*]}" config.h
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r1 ${PN}
-	newconfd "${FILESDIR}"/${PN}-conf.d-r1 ${PN}
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.0.20180203.ebuild b/net-misc/miniupnpd/miniupnpd-2.0.20180503.ebuild
index 9f786c4d43a2..9f786c4d43a2 100644
--- a/net-misc/miniupnpd/miniupnpd-2.0.20180203.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.0.20180503.ebuild
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index dd91d9831ad7..b9a585e1d924 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.6.12.tar.xz 1402364 BLAKE2B 11335c495cc428936c9b0dd319449a7bf4c58a95ccd53b7a5bb276d78030272a7f29e5f0fa96a96613c5e0cb6a62239d864a23de6260fb55f6ecab09a18e6454 SHA512 2ac72fb2d36530204528cc0cd4815d0b93a1a8c8539ac345101e5e15bbfffd3eda888bbdc54298d3547b9aeacb94c75be5c600e993099671da2f9f27e8ee93cd
 DIST ModemManager-1.6.4.tar.xz 1464276 BLAKE2B 5c5688c678f7b511d8097e47f143c04733b1d8e6624d7b1deb9dad286ccafa3f37455956f19d6d76a00230a044662a7c59275c41f7530b9829a602f968214ca2 SHA512 6b31ce186adce445cec8964df751b6146a86271e6c14d860740ae66cfe296ac2ac4df21079357775ac5f7a5837c80a7f8db21a2680bc6b45802f9928565f1c73
-EBUILD modemmanager-1.6.12.ebuild 3146 BLAKE2B 5dc7196332175b5e09b0260a0107211ca330a230b671dad087d0d180847ed1e0948e6717b0b883c4b224250dec76aa7f2f8fdce3abce27ab17f75c67b9a1fc32 SHA512 0e7ae27ae0bc2a1f03aea18c958382a5b77171ec0a9df237cb4492cfc91606ce1bd63f66e0e805b2d94126c00eccef6412309a00f65d53eae2d31cea423ae4f0
+EBUILD modemmanager-1.6.12.ebuild 3145 BLAKE2B 564c89078c5004a856fd11a60d1250449df3729ea8d55ff11e0c71a4c53b6f86c62c63c3c8f956f7ca4d5e0357e638f77c2a7942b7aec8e0470d4308cab06512 SHA512 0aba6f47661135f43a5e885216f21d7e467e275a81d9b86a0fd58ca0dedb21ee213930954d995c4f3b167065e068ac09412aa1dafc649a5fd136b04ba9f59e8c
 EBUILD modemmanager-1.6.4.ebuild 3143 BLAKE2B f8aa5e15ddc777b96ae2230a97437ebcefa1f36074e15bc880efa90920fdd4ceb28449e453f3cb39b11589fc0cd5110117b09edd87c1aac1b3d216c518658fce SHA512 edbe21effd6e22319d1f859d0f8c868725d6574633f2b311c191fd57d33ad6930547b84fbab8cc7a39303748b61dbc990fff63181e1710ca17b02ac72352376d
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.6.12.ebuild b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
index 5365c6538b71..acdbe601c4bf 100644
--- a/net-misc/modemmanager/modemmanager-1.6.12.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+introspection mbim policykit +qmi systemd vala"
 REQUIRED_USE="
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 64b118b85d05..4746b9406430 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,3 @@
-DIST smb4k-2.0.2.tar.xz 3588608 BLAKE2B b5598486cd144a28c868d0c3271035bf7117e7db09c302f77bb06f541653d2c78a4ea75eaa39274d8bc8a481b28f8cda59e80a38bbb67018d686d35f6cae6d48 SHA512 de210b059757525c6e5b6db733c70f43f62ba14cdc447848c84325d3b838d2ac6d8aa591ef67881decb39801b9519ef05fc805e94bc02b93c629457194e1a974
 DIST smb4k-2.1.0.tar.xz 3714936 BLAKE2B c105909034acbdb3c8593bb06d787a6602290dadc87982ff45703e574bf978ea8a93d88cd91d062a87683559cda020d4971a7784687a74901e97c0c4a6d66d90 SHA512 632d916d6a9cf08c883d4a17747cf036d8d6e285ee149c487cc305d036977e86a7ef4d3ba4630b3b8f29ca9123d894418348e687b0c009653297d77059fb535c
-EBUILD smb4k-2.0.2.ebuild 1201 BLAKE2B 1da510df154b598f1fac9ecaca536c9bfb7213b1c619c7610cb1d69b6aa3cc223fe508ee1867edc92be1293069cd83a8db428b3a3ac3b72f06a3baa992b1d012 SHA512 70e72e0305b6815d8eec39e03fd8addc9d37ca71ea7be28158f0cf3e18f7cade714ba1fcf72952aa215fa6f29e541173d4a57d0a770b9559f4fcfb3e95aa2c1d
-EBUILD smb4k-2.1.0.ebuild 1357 BLAKE2B 15e02964186f102e9e5da73232a1d60bbd3ee882d5917216706b698db26360649a311e8912635e1968aa80c96b47ed0fa2808e54419765439d7582e147717bf2 SHA512 18716b09cc5962f1a2b478e546bb5695abdfe93a06521bd25699374e267d3c02235bf7088e9ee6d481463a643435c4528bae6bd4e6cead0f4da33cd9d42a6250
+EBUILD smb4k-2.1.0.ebuild 1355 BLAKE2B 88ba77eca88e4a8526859dfde99fc719f8c79a9f950c9f82c17f0dbe4e74a36b13b3dc1ef19b96614d254c2cbb8dcc026bf95284e034f250542c4e79422d7caf SHA512 d8d40ded13a6eea5062174a992badada8e1b609a65ff9b44954792841e5b4b07d9f39614273e0b98bff630a12dadc2f6970916fac5b09df85f90801fea9a1b5b
 MISC metadata.xml 386 BLAKE2B 2b2a77496eb840ec0c8889b480c2aa5472d31b90f4e66a18150d8b9571debddbc23613df30a385165effb9a9233fa1406788aba54df4550db105b75f68d390be SHA512 7a3a3b97ae2091efca39e99a45034c9a0ef06168ca3dd74ce1a73fdada365b0b1f5fbb68a84bd7505451d1075abe593077c472ca76d23da3368872b87e06d530
diff --git a/net-misc/smb4k/smb4k-2.0.2.ebuild b/net-misc/smb4k/smb4k-2.0.2.ebuild
deleted file mode 100644
index a9bd71df9866..000000000000
--- a/net-misc/smb4k/smb4k-2.0.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Advanced network neighborhood browser"
-HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
-[[ ${PV} != 9999 ]] && SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-[[ ${PV} != 9999 ]] && KEYWORDS="amd64 x86"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!net-misc/smb4k:4
-	>=net-fs/samba-3.4.2[cups]
-"
diff --git a/net-misc/smb4k/smb4k-2.1.0.ebuild b/net-misc/smb4k/smb4k-2.1.0.ebuild
index 74eb7914f02f..dcc591316293 100644
--- a/net-misc/smb4k/smb4k-2.1.0.ebuild
+++ b/net-misc/smb4k/smb4k-2.1.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/stargazer/Manifest b/net-misc/stargazer/Manifest
index 0443c8c843d7..065e57d23158 100644
--- a/net-misc/stargazer/Manifest
+++ b/net-misc/stargazer/Manifest
@@ -23,4 +23,4 @@ AUX rscriptd 453 BLAKE2B fb7d771ad0c29223d8a24196da05c05faf852291530fef644b60bf8
 AUX sgauth 462 BLAKE2B 9aeb1dfe4ce08f7626d6275813e8a3b2f3023ebc11b10841c7a6b01ff9110ed1193e3b2b367c7c1056c473d41f481c93ad25f4252f774fd7df5392af710255bd SHA512 a2d6ba8c2200095072a73342fab4cb5706470d52d9dc6a57f023b16dc895957d4377bc089a4a3cd57126bc9628020c2c1bb60347758e53576eccbc0c854c2364
 DIST stg-2.408.tar.gz 5100291 BLAKE2B c5e50d5607f7c5253dcbb9d48fffdd55bf44829bfc3dba1e45227fa819d2592212366baff6b19dce70ef7a565f8b03e8f580204225441b12653de6271a030554 SHA512 200e08cfd629dbacda31ffd3134c2908a1ad58604421cc288ad0ec1bdcd60fe021d51fed50fdc2517bb7c2b61ef23b0b9c71a606babd09bc7804cb899e0b7f75
 EBUILD stargazer-2.408.ebuild 19983 BLAKE2B f6b68aa085104310f82c6461763ae12b4d891f1355c151a11cd3e6e807e2b9a26c1c4f7842a443f436afd620aef4c8cccd33dad6c851b0b2e45a6dc060269795 SHA512 a385d94e92c6407230dbe57f23830f19561561625d97d5c1c0d3c8db533693aa1241b84c509e4bab25d83bc3965a2dbbaa7e862a6a5eccb45eeb6a9fd705fc70
-MISC metadata.xml 4445 BLAKE2B ae2c3f2b10ed74dd849469a37cf69fd508a1046e67dbfa349a6f6d08ea01d419548dde6e2027555e06eb5fad1453ff691bae434a2a8639e14d38b982c88aff56 SHA512 5aaa8af05691632190e6f786a948198875cad069fa9f015552d7987627c78a5dab6015b1c4f3d95c343b86caac47e74b91a9b18c4f6169269977062bad8d903a
+MISC metadata.xml 4383 BLAKE2B 0e840802cac1aa54489d9bb240268747c5999907589493a3d19f9530746da10800b20b3229a1e58097e649a8b095bec2e384faa6f17a9850572ca45372838b9f SHA512 7dd2c022fd3b70e063ed9d513e1a148183be4a288ba22ef5b081f3fac35847d8d38f64262ff1ac2a274e24e2ef6331cadb3c8a364366657331911a03f5163de1
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
index 7aac8da7bb30..bfed7e617ab5 100644
--- a/net-misc/stargazer/metadata.xml
+++ b/net-misc/stargazer/metadata.xml
@@ -28,7 +28,6 @@
     <flag name="debug">Enable extra debug codepaths, like asserts and extra output.</flag>
     <flag name="doc">Adds extra documentation (API, doc, etc).</flag>
     <flag name="examples">Install examples, usually source code.</flag>
-    <flag name="static-libs">Install static libraries.</flag>
     <flag name="module_auth_always_online">Enable build of "Always Online" authentication module for Stargazer.</flag>
     <flag name="module_auth_internet_access">Enable build of "InetAccess" authentication module for Stargazer. InetAccess is a Stargazer specific authentication protocol.</flag>
     <flag name="module_auth_freeradius">Enable build of "Radius" authentication module for Stargazer. This module capable of using RADIUS procotol for user authentication.</flag>