gentoo resync : 11.05.2018

24 files changed, 246 insertions, 636 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 07874f19c33f..c69389dbf31c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/atlas-c++/Manifest b/media-libs/atlas-c++/Manifest
deleted file mode 100644
index 4f50e7a03a3b..000000000000
--- a/media-libs/atlas-c++/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX atlas-c++-0.6.3-Werror.patch 481 BLAKE2B f1727a1eb22ce4f0aaaa6ce2382d827cb02a7f310d52a84877ecf228595f0c418858e2a917122b4a2b4cc525f10e19f079cd5ce2f1ffa50f1c8e524f5d6eab35 SHA512 20c806939d1f99a178856d594a4965f3e0887326a17c786015022866f0d6dc12b827d950fbf8a567a3d473d70032fa9d1f08ab08a879bdc3687106cc420a32a1
-DIST Atlas-C++-0.6.3.tar.bz2 527537 BLAKE2B ab3c0251b9937763ebaf769921c094f6d010be342ef3b9c9ff71985cc5bdadea459260c77591d898b09208814c8ecaf94befb7c109b6d78f68fb4bb4108f1091 SHA512 3063a7fabbd5937cd4c9be72596a2fd1885a8ed8e8586f0014077a40477d124b3222280bb26f2034fa2e23aed14a1c6fa800cc40636af986a78a71d68ed40606
-EBUILD atlas-c++-0.6.3.ebuild 769 BLAKE2B 5dd254d0049fb545ddb7e95d707c0ba05ce10a714e9cde5951432bf450e8d200096d5f70757f197c5b55cd22ffd3b72faaa9413c0e2cb05c2d873c7a6b3c16ed SHA512 86ba0b7eccb1992ddaad12adb2c85f41828dae8f5221a77f92fec2a0be6a84e03244c76d027e40ef192b1290a0a7d399dd889227766289c5ce6f90acea204d35
-MISC metadata.xml 495 BLAKE2B e5bea0f6e9543088b56907c5ed3fdab9edf57237b163a84269c180254951c84831f99b6386e0d02805f9f43f3f3ad25b56eb1336c3ffb1e93d5f0728bb78229a SHA512 4d4391d5e10f240ac8b1643de52f59802479ff1c7af8c42e253fce0106a77cef22eb6e609f9f6276a3a248a9df801e06cff4f156e04b5f0092ce277a4c42ca8d
diff --git a/media-libs/atlas-c++/atlas-c++-0.6.3.ebuild b/media-libs/atlas-c++/atlas-c++-0.6.3.ebuild
deleted file mode 100644
index 638090b293f4..000000000000
--- a/media-libs/atlas-c++/atlas-c++-0.6.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-MY_PN="Atlas-C++"
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Atlas protocol, used in role playing games at worldforge"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/atlas_cpp"
-SRC_URI="mirror://sourceforge/worldforge/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Werror.patch
-	eautoreconf
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		emake docs
-	fi
-}
-
-src_install() {
-	default
-	use doc && dohtml -r doc/html/*
-	use doc && doman doc/man/man3/[^i]*
-	dodoc HACKING ROADMAP
-}
diff --git a/media-libs/atlas-c++/files/atlas-c++-0.6.3-Werror.patch b/media-libs/atlas-c++/files/atlas-c++-0.6.3-Werror.patch
deleted file mode 100644
index b13384ab5a12..000000000000
--- a/media-libs/atlas-c++/files/atlas-c++-0.6.3-Werror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.ac.old	2011-05-02 11:16:53.851733207 +0200
-+++ configure.ac	2011-05-02 11:17:18.489283901 +0200
-@@ -35,10 +35,10 @@
-         if test "$enableval" = "yes"; then
-             CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG"
-         else
--            CXXFLAGS="$CXXFLAGS -Wall -Werror -DNDEBUG"
-+            CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
-         fi
-     ],[
--        CXXFLAGS="$CXXFLAGS -Wall -Werror -DNDEBUG"
-+        CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
-     ]
- )
- 
diff --git a/media-libs/atlas-c++/metadata.xml b/media-libs/atlas-c++/metadata.xml
deleted file mode 100644
index 9eee47fc1c94..000000000000
--- a/media-libs/atlas-c++/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tupone@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-Atlas-C++ is the current C++ implementation of the Atlas protocol, a
-communications layer designed to be used in the WorldForge MMORPG gaming
-system.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">worldforge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index f16bb4478721..dc445109c7bb 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -10,7 +10,8 @@ DIST ft2demos-2.8.tar.bz2 225274 BLAKE2B b8b02b8b03b84709b7d274d1c8dff323051051c
 DIST ft2demos-2.9.1.tar.bz2 233462 BLAKE2B c689942b222b2c600b5ec3963791621ae87acefb9b01caa5dc35af52525d03e3a1094e48c0789d5eaabbce787bddd7c3055e12454e54ea3c7fae92bca47614de SHA512 38bee59184b20c2eb983deaa5c1f241e31c1b4793e47dc06b1b419601489cfece3b11fde4cf4fb6c5af12254ad0c1ce9a1547885c208e8e715655e9c48f22a46
 DIST ft2demos-2.9.tar.bz2 230926 BLAKE2B 8c8e02101243468d52953aeeee7ad985a5aa3fabc82c19a3404ce301348fd32e5f89aa56798613658d5d29a8c3a6c7d4a70eae038ef6095005f8c10354b3f288 SHA512 3dfaf97619d585d6e4db20002c69f9c46cb8991c4faf86d9d92884a80001235ef01010148156cb4879d7869e6121fc27ef03c13288af011df26fe85c3fb7e6a1
 EBUILD freetype-2.8.ebuild 5276 BLAKE2B ab6ab026dec672db2407ace0cb9b3037cee83b2100f3432ee1ec140754f6a204449590a07dc82789d7b53fdb1ca3834852bec506763bc7dcafd852abdbb78889 SHA512 2d38568b0d55fbbb8e54600c5c1ce75088faa47009982840ed5e287b33e3cefe110e7ea3f00e22bee30b348d40af73a30f86724d6e21364aaa9aa1c476831a68
-EBUILD freetype-2.9.1-r1.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
+EBUILD freetype-2.9.1-r1.ebuild 6657 BLAKE2B cc3b2f8bcc0c3c10ce70936d66074654763f290d4a288c8b1a650dedc08b016f70908501ddf5c7a01bab283917e2e524899029c42748aa8133359184c7d5d69e SHA512 660dc53ed5e0e0a723cbff7d3319d3d0b0a3979d2a88ca6ee6f298be51900eb06de8f14dc1e37b06a2f1675f8f69be6a358e08bdf11385c6e623d8290fce5ee2
+EBUILD freetype-2.9.1-r2.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
 EBUILD freetype-2.9.ebuild 5288 BLAKE2B 439147ccd14d1fa1b022c491fbc6233fa86b1f545229b3abb85d2f186f53b26fd8098d228588c843801cb343b9fa3a615f25663a432c0c96a8f1cd4c949b25bf SHA512 47904142a2fd8c80658f18a472f6838926434297d8b39f243e6fa19e9a0f7896130d2e6e7337bb7ad8ad5b71b819b5c6de3cfff7a82d5563985c4c28e0c21b26
 EBUILD freetype-9999.ebuild 6659 BLAKE2B 0201fee0a5459e361c12bc3d0c67e31ac99c86af837c1d23eee60d00372a54d68a2953d169491267ade78b6a038accc4fdc66e73bf80381c4b2b70738c7af8eb SHA512 826b44091c3bf85f63241a4fe678069a9613c7477b46e377d4d15b55d17d403452ec6aecd851bf4cbb27843c19833397c98b39ba7a5d71d1a3378e02ea6d0f1d
 MISC metadata.xml 1363 BLAKE2B 2cadaca7ada476301e4fa15dabaf7e823a9bcf6e59fb018876e3d2ca61c528c7096cb65ac44d8311a8e9a5eada744f41db3ca2960622980a8f5438d2f003202c SHA512 a9272c439ffb4c9ca6597b2ef26e86e99830ff298940abf38fdecf5c8d794ffdb96a212c67e2e23526a0e2686deff48664da4a5af01d2977256038846e7221f8
diff --git a/media-libs/freetype/freetype-2.9.1-r1.ebuild b/media-libs/freetype/freetype-2.9.1-r1.ebuild
index f8e4fb37a31a..af4cd85ca024 100644
--- a/media-libs/freetype/freetype-2.9.1-r1.ebuild
+++ b/media-libs/freetype/freetype-2.9.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then
 			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
 		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
 			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 	IUSE+=" doc"
 else
 	inherit autotools git-r3
@@ -162,8 +162,8 @@ multilib_src_configure() {
 	type -P gmake &> /dev/null && export GNUMAKE=gmake
 
 	local myeconfargs=(
-		--disable-freetype-config
 		--enable-biarch-config
+		--enable-freetype-config
 		--enable-shared
 		$(use_with bzip2)
 		$(use_with harfbuzz)
diff --git a/media-libs/freetype/freetype-2.9.1-r2.ebuild b/media-libs/freetype/freetype-2.9.1-r2.ebuild
new file mode 100644
index 000000000000..f8e4fb37a31a
--- /dev/null
+++ b/media-libs/freetype/freetype-2.9.1-r2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
+
+DESCRIPTION="A high-quality and portable font engine"
+HOMEPAGE="https://www.freetype.org/"
+IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
+
+if [[ "${PV}" != 9999 ]] ; then
+	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
+		mirror://nongnu/freetype/${P/_/}.tar.bz2
+		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
+			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
+		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
+			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	IUSE+=" doc"
+else
+	inherit autotools git-r3
+fi
+
+LICENSE="|| ( FTL GPL-2+ )"
+SLOT="2"
+RESTRICT="!bindist? ( bindist )" # bug 541408
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
+	utils? (
+		X? (
+			>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+			>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
+		)
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
+
+PATCHES=(
+	# This is the same as the 01 patch from infinality
+	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
+
+	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
+)
+
+_egit_repo_handler() {
+	if [[ "${PV}" == 9999 ]] ; then
+		local phase="${1}"
+		case ${phase} in
+			fetch|unpack)
+				:;
+			;;
+			*)
+				die "Please use this function with either \"fetch\" or \"unpack\""
+			;;
+		esac
+
+		local EGIT_REPO_URI
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2.git"
+		git-r3_src_${phase}
+		if use utils ; then
+			EGIT_REPO_URI="https://git.savannah.gnu.org/r/freetype/freetype2-demos.git"
+			local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
+			git-r3_src_${phase}
+		fi
+	else
+		default
+	fi
+}
+
+src_fetch() {
+	_egit_repo_handler fetch
+}
+
+src_unpack() {
+	_egit_repo_handler unpack
+}
+
+src_prepare() {
+	if [[ "${PV}" == 9999 ]] ; then
+		# inspired by shipped autogen.sh script
+		eval $(sed -nf version.sed include/freetype/freetype.h)
+		pushd builds/unix &>/dev/null || die
+		sed -e "s;@VERSION@;$freetype_major$freetype_minor$freetype_patch;" \
+			< configure.raw > configure.ac || die
+		# eautoheader produces broken ftconfig.in
+		eautoheader() { return 0 ; }
+		AT_M4DIR="." eautoreconf
+		unset freetype_major freetype_minor freetype_patch
+		popd &>/dev/null || die
+	fi
+
+	default
+
+	enable_option() {
+		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to enable option $1"
+	}
+
+	disable_option() {
+		sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
+			include/${PN}/config/ftoption.h \
+			|| die "unable to disable option $1"
+	}
+
+	# Will be the new default for >=freetype-2.7.0
+	disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+
+	if use infinality && use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  ( 1 | 2 )"
+	elif use infinality; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  1"
+	elif use cleartype_hinting; then
+		enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING  2"
+	fi
+
+	# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
+	# via environment (new since v2.8)
+	enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+	if ! use bindist; then
+		# See http://freetype.org/patents.html
+		# ClearType is covered by several Microsoft patents in the US
+		enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+	fi
+
+	if ! use adobe-cff; then
+		enable_option CFF_CONFIG_OPTION_OLD_ENGINE
+	fi
+
+	if use debug; then
+		enable_option FT_DEBUG_LEVEL_TRACE
+		enable_option FT_DEBUG_MEMORY
+	fi
+
+	if use utils; then
+		cd "${WORKDIR}/ft2demos-${PV}" || die
+		# Disable tests needing X11 when USE="-X". (bug #177597)
+		if ! use X; then
+			sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
+		fi
+		cd "${S}" || die
+	fi
+
+	# we need non-/bin/sh to run configure
+	if [[ -n ${CONFIG_SHELL} ]] ; then
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure || die
+	fi
+
+	elibtoolize --patch-only
+}
+
+multilib_src_configure() {
+	append-flags -fno-strict-aliasing
+	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	local myeconfargs=(
+		--disable-freetype-config
+		--enable-biarch-config
+		--enable-shared
+		$(use_with bzip2)
+		$(use_with harfbuzz)
+		$(use_with png)
+		$(use_enable static-libs static)
+
+		# avoid using libpng-config
+		LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
+		LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
+	)
+
+	case ${CHOST} in
+		mingw*|*-mingw*) ;;
+		# Workaround windows mis-detection: bug #654712
+		# Have to do it for both ${CHOST}-windres and windres
+		*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
+	esac
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Building utils"
+		# fix for Prefix, bug #339334
+		emake \
+			X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
+			FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
+	fi
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use utils; then
+		einfo "Installing utils"
+		rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die
+		dodir /usr/bin #654780
+		local ft2demo
+		for ft2demo in ../ft2demos-${PV}/bin/*; do
+			./libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
+				"${ED%/}"/usr/bin || die
+		done
+	fi
+}
+
+multilib_src_install_all() {
+	if use fontforge; then
+		# Probably fontforge needs less but this way makes things simplier...
+		einfo "Installing internal headers required for fontforge"
+		local header
+		find src/truetype include/freetype/internal -name '*.h' | \
+		while read header; do
+			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
+		done
+	fi
+
+	dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
+	if [[ "${PV}" != 9999 ]] && use doc ; then
+		docinto html
+		dodoc -r docs/*
+	fi
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
index 06897f3d2993..19542fde6709 100644
--- a/media-libs/jasper/Manifest
+++ b/media-libs/jasper/Manifest
@@ -2,6 +2,6 @@ AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b0
 DIST jasper-2.0.12.tar.gz 1311323 BLAKE2B bc9922bfc4765ea4630f9a504c9e5a1c0992f78c2ef68cd077ba0c8a36332debd5db9fc5c639accc7eaa0eda64e478c1e615da9f2eaf363446635dd94a253fa0 SHA512 a308983511119d85e6580772f5164c188e2e170500fa4b98c8831aa63aa87cb661b88952b278e390497571f9ebf9286855a8aa946037692309ba5f41cffe265a
 DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
 EBUILD jasper-2.0.12.ebuild 1807 BLAKE2B 724d504c046501904f8da136be0042665b453f02320574ec807f069b1b6f246b3ec11d53908ab03681f456d10888f35dabcf6c9e771975837336799d773974e9 SHA512 7fd349ca1e0f5f8c3bbded01685dbc8dd699811f98f3d781e32ef42e94c4c3c2c08af9b6b1ef8988e6c4b4b84a4f0c11d647bdb4aca1239b38000efe90fc84e1
-EBUILD jasper-2.0.14.ebuild 1914 BLAKE2B 69a77aa13d49503b02a3df848b32e1e9bf65d8c2c7307c9cc87360cc2cf3f41acdfdb99119dd7bac3717f2372e401bdd14bbccb3d64467b7e4ddf7fc30f45dc2 SHA512 8112b83152eeffa0515b13fbfcbfffcd9967668f79bfde74747898901f97991ab7341f300d64858f59b989ec5ef48d1a0f9e7d0bc0780a0fbe75d3e233b81372
+EBUILD jasper-2.0.14.ebuild 1913 BLAKE2B 541191df7ed9dd4817558e63e245cc59931cd3ff7a3b7c782544219748ac8e039fc988229f747a6abc7e747d4ebe12ac67ecd3a141f7fcaf53d44bcf6578aafc SHA512 334d3da15982c086eb85d456551c988ad315e9db40fa575beba37475c6f35455276f82e66300f0ea5409aa9a29686467f7c9e24db95750267eb7272281742806
 EBUILD jasper-9999.ebuild 1814 BLAKE2B ff6b0d726b1988d0b1fbbf8e737808839f29fbd253c18d9a0c1b2b451b8ff8e7966672d45f04963c5c104dbcf3f2b9656d2c3ecc939b871a4210fd061c1126ab SHA512 3d137d1caac04177169b847a5fc1b8ae3148f8dc215fcfb51881d7a793c6d889ac818f03bf670b97999a461ec4810eb6ec19d1a34a58aa915e4aedb15a00e5f2
 MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
index bea8a9231ead..7109e0380511 100644
--- a/media-libs/jasper/jasper-2.0.14.ebuild
+++ b/media-libs/jasper/jasper-2.0.14.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	inherit vcs-snapshot
 	SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # We limit memory usage to 128 MiB by default, specified in bytes
diff --git a/media-libs/libmp3splt/Manifest b/media-libs/libmp3splt/Manifest
index 6746eec7b788..fef130cda5dc 100644
--- a/media-libs/libmp3splt/Manifest
+++ b/media-libs/libmp3splt/Manifest
@@ -3,6 +3,6 @@ AUX libmp3splt-0.7-libltdl.patch 672 BLAKE2B adca950fbde7d41e6c657711964b8db2ce0
 DIST libmp3splt-0.9.1a.tar.gz 702948 BLAKE2B 96661e2fdc96d1ce4555bfc9b84f44bb1ecf9bd05f6b6038274a3097a657707bb6c6ef8b2b6ecf673c390f52a1885a6c91b555c1971d490df7089523d0739329 SHA512 07229c048c4f999c7c723ab2f7bb06807d264609c8c1e38f8ff40f11e54285212de71548bbd66ba3100287d563673d80a8704bd384d7ffcd2145a098faabd389
 DIST libmp3splt-0.9.2.tar.gz 707598 BLAKE2B 4e8223472a7cd05d71d7df81a88b7d545a726a45d62dc6284d694e8cf8ad9406b037e274dbe28f2cf95febc87d8ba30aa15291f58df95b83a3aa0b5d3469ffea SHA512 e5c98e8b173bc86302ccee4ca5eb0c8a8d93f225357eb7b14dea8d0700ed62ed6316506c182f6b295130f7924ff0b38e865d5e49fa9cd7882c648360d68872ed
 EBUILD libmp3splt-0.9.1a.ebuild 1244 BLAKE2B 1809d4d5b3da03405fa6080259ddd79967f51ec40c9975f0a22a785f26aec47eeebd34005a592164c43f9d1798320af7813828e6a2fdd76ba02ae606abf0dfd9 SHA512 39cd447f9f20810b14b4864df837d58952ffc52d6947cb0ba672e1b4bed87da12eba7391a19cab3fcda5336b9de36d565da917a1f99f140d455a72eb3a96e285
-EBUILD libmp3splt-0.9.2-r1.ebuild 1290 BLAKE2B 50c5e57bf90178aeafeb959d927c95e29a4400224134c8945bf31ef2d8daae2253d41e0d1fbc614ce423754206efc66ad807fc02d63c387f010a822161db8ebb SHA512 cb3e489de08fd00128321ee8d6ded88341004c4784b83685bad92c09e42dc098ead85445e3c124d66bdd511bd12c36256f8d02fbd76e5643a525d9addef6237d
+EBUILD libmp3splt-0.9.2-r1.ebuild 1289 BLAKE2B 514a8c4c8d479a48f013ab5e1263207d5c971be53d0bba4c7beabc0f67922904c5d137758fbc96b33e046e81cebf65f83ef133ff27eb73ee9f3a0cfd3dc6c495 SHA512 dc2618e6a91b711e889e745f2f7d642e0a4a2eb58feef4660f0f7d5f76a72c5df1e685fec8bc807255ab27d0068f80d72693bcafcd58572402f39b67f468b1f6
 EBUILD libmp3splt-0.9.2.ebuild 1245 BLAKE2B 23dda3aa0055c03908bc81994f2e7e819be9e79066b939d4fc23bf3f0cc55ce66b85d7bd3194a9405ea3e43c8829285f94319c149568aba6febbb6f8afe9980a SHA512 899074eb64a40a328a0ec8afa7784ae362cf13d76167d6427417f0c99a4aad3068134ce7ae866c55e6a855c83bb0507f8afd0b407b9479197f16dc47dcfe9005
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
index 9c0c926646ca..29e8e0e2e9e6 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="doc flac pcre"
 
 RDEPEND="media-libs/libmad
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 0a041afffd59..0f1730ff5138 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -8,5 +8,5 @@ DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56
 EBUILD libpng-1.2.57.ebuild 876 BLAKE2B f0cb7b05dc3482ce809203e21cb68b6e85aaf6ca8aff492fd9d30349a0c11f927e263a2edbfad9ac615acc174338a128b3d01fcad5465b6e319ffb34b9751ad8 SHA512 3619d150972189cb9d9a3f7d72f7df74f5377f52405006b99dfa6cef66291c1eae2bb4e157180d1eaa8b2a217e6d321a5bc3f6e368f5c8efa2eade305f14a370
 EBUILD libpng-1.5.28.ebuild 1651 BLAKE2B b651d04efd3f74d50225ebe18bd06aec7e38f933e44a4913ff973a17ee4799151171dfc78ccea2921be8e9b364c68f09f2d0bbd1e3ebb377f23667438b9a9a60 SHA512 94a6c624ce02d7b03071653184ac91acf949244c1c0c1d2cc51483e3ca8bda9860e6ba76e2a77513dcf4a08d717888bebb91c1b464c5c201d3766499cd01fd9d
 EBUILD libpng-1.6.29.ebuild 1333 BLAKE2B afb45e4346f2dc5c307c3d5a1c03a8ce9202b1182475fbf2153c7c0ac8b4398227e68e9d65b5d26ad4415a0472373fdd70ac89b6f06c599b245514d4a753a481 SHA512 0fd0d8cf9b06a6fdf8276bd7f1d7656d7211b01e42180aa8d69ae79f227f669d04460e6749e04a4ab03fabf55de8449faac6db5994aaa49c56049e8351941093
-EBUILD libpng-1.6.34.ebuild 1376 BLAKE2B fda9a870045ca13ee8f2026e9e7ea32e52c10a19c26f13cb422c157141ae6e610fc4746aea948f4a509f053bc5247bc7c859c7ceb0f7f256ead818d661255ee7 SHA512 8f2ec1684283457b8ce6fb0ee894e89d2c944f91eb138b74327abeb614d8f7f553892f0eed3a70b9882050be6014a25da473a50a09915f560804a571532a0396
+EBUILD libpng-1.6.34.ebuild 1375 BLAKE2B 2e28d00203b0cbbbd88512107791a9a275cbfe8cdbe187a4500be290c81d3e4b006eb9f13065b6f08413691aedfcacb2557471ae9bdc880c9dbcadfe19abebf1 SHA512 e22e6928bfa12bf2fca79975fc5061752f5478796c4635dc87527dcd3ca10e934b4676d0871eb1b635f1c33c0b404955886037dc619148cea247942ed8aa1e20
 MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
index e621970e82c6..f88b0b274431 100644
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ b/media-libs/libpng/libpng-1.6.34.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
 
 LICENSE="libpng"
 SLOT="0/16"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="apng cpu_flags_x86_sse neon static-libs"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/varconf/Manifest b/media-libs/varconf/Manifest
deleted file mode 100644
index baf5291aa7cf..000000000000
--- a/media-libs/varconf/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST varconf-0.6.6.tar.bz2 251689 BLAKE2B e0e46249c5d0b07b0bfe5df8777bc4f67ea0c2683230cc292964b880ad90b1e6af307ce079c076814cd9538c0dac5258967acb49ba1633881bf74b1f7f01f56c SHA512 44f1d59c188bb2560e1c119d2bcb18e4da1d847634ec55181c8777ba57d2424a3bfa177c63603f814791d45e70e34f92f22f98c12936edde7977af94c1178ac6
-DIST varconf-0.6.7.tar.bz2 272485 BLAKE2B b19abdb76ef49cd630d82484bb526ba4cd59650adb32fd3a5b86a352358854befb05ca02748f2c36f6dcae1097fe9da19a9939ffa7855c3a34ae967fcf667897 SHA512 7fc281834b6dbf4872cd6af42f1d59f7c47e0ed253feb4b39af3b7e8f7d0e0a05160ff37ba4210aefc02792ca33a3f9706cb73128fb92d8acd8143d76dae1834
-EBUILD varconf-0.6.6.ebuild 598 BLAKE2B 3d17e6c6aede61fa5a5c61df663f2763143a7f060d5b75b7135f2271587c639bdb0b915195c10421dc583552ce08c756deee063fdedb2e1e0d4912cd0d3517a3 SHA512 071f2ff582933080ba2b85818ca84f77e3f97fa832d6190d726c3cabc8c11dc9dde2e607580f6e81a941e9a44470f0542b7d3b80e40ba0b77d91eaad5ee46615
-EBUILD varconf-0.6.7-r1.ebuild 512 BLAKE2B 31e5ffc28560bae3192a49566a68adae33a003e3a3c7e4e7d0b4540a67138fe454ad3f629899375b761bc160b804127da04b7bb788cb7ab30ff3b7b0b12b6d46 SHA512 cb4a23850688b7a043740d219dd94b8a134d07ea985ab585088a263b028e1a5f5bf9b04f6aef8571b082d3d994cb6d464a93adb49c65d4969a799dbd7096f5fe
-EBUILD varconf-0.6.7.ebuild 601 BLAKE2B 7b930a1c8233d83f23a73f803c1d15a0873dc318527a088a2328d28e56db39949ad65e25eb08a7ef1e6a098ff4b063da8bf04622f2f6a5b6fdc62cdcb22801f3 SHA512 2666a9c1e1d680c9a95452454ca0f60f3d4d51f130fd5a0d8f40a3c6b30b6a0c830f6c9668628896730cbb04586fc4ba20ec8bc3b732ef8dbcbeccae412843a4
-MISC metadata.xml 634 BLAKE2B de92aa3d3b491466d0f034bb49fe09eaf1feb08b3337916ab1cfa2452158ab50d36b0f6ffc7bb0da65474b83a93ff80a1b682e0249e8f5fdbcd1b0f4547308e3 SHA512 cb3491dbf5a96a9e17c6132198262825c19889dbec9f34deaa63eda3e16c4458c673273a9efcbaa7653746adcb9e1383fad9ab0a44228736329000d722df808e
diff --git a/media-libs/varconf/metadata.xml b/media-libs/varconf/metadata.xml
deleted file mode 100644
index 9024ee604a54..000000000000
--- a/media-libs/varconf/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tupone@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-Varconf is a configuration system designed for the STAGE server.
-Varconf can parse configuration files, command-line arguments and environment
-variables.  It supports callbacks and can store its configuration information
-in separate Config objects or in one global configuration instance.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">worldforge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-libs/varconf/varconf-0.6.6.ebuild b/media-libs/varconf/varconf-0.6.6.ebuild
deleted file mode 100644
index ff95f242f8e6..000000000000
--- a/media-libs/varconf/varconf-0.6.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A configuration system designed for the STAGE server"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libsigc++-2.0"
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO \
-		|| die "Installing doc failed"
-}
diff --git a/media-libs/varconf/varconf-0.6.7-r1.ebuild b/media-libs/varconf/varconf-0.6.7-r1.ebuild
deleted file mode 100644
index 6b539b9c870f..000000000000
--- a/media-libs/varconf/varconf-0.6.7-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic
-
-DESCRIPTION="A configuration system designed for the STAGE server"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libsigc++-2.0"
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_prepare() {
-	append-cxxflags -std=c++11 #566328
-}
diff --git a/media-libs/varconf/varconf-0.6.7.ebuild b/media-libs/varconf/varconf-0.6.7.ebuild
deleted file mode 100644
index 400f45c61737..000000000000
--- a/media-libs/varconf/varconf-0.6.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A configuration system designed for the STAGE server"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/varconf"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libsigc++-2.0"
-DEPEND="$RDEPEND
-	virtual/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO \
-		|| die "Installing doc failed"
-}
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e34392c27fb2..da22feeadb4e 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -3,11 +3,8 @@ AUX xine-lib-1.2.6-imagemagick7.patch 384 BLAKE2B 876c66e9e06b8f2437b1ec9945d4f1
 AUX xine-lib-1.2.6-libxcb-1.12.patch 1304 BLAKE2B e60d0d5ee86fc7cd9e9d7f846d06662659d59c8f15e0b378518117ba55b7ee5a5fd55cc8fb7c896e2cbc80d297fd1b89e8437c6278d7e442453779e5f933f930 SHA512 c3415c9a0f65ec35dcb59b6880905ae525c6cfc38a42578d96ac713a4426b642069613e4234903e46e852e8f33b4eeab3ffce3864ca672efe8170ae987121783
 AUX xine-lib-1.2.6-sysmacros.patch 425 BLAKE2B df1e3569716777e15737248b30be7491eae9099d8e0126e71eca6fd7622b128b1600c212f2a481117ac780ce11ab74032fb15089aab51753b5a2e80f00f1bae1 SHA512 fed191b8d1c4d1a4b4c5f399a720f07065feda2962f760b7b03bbfc7c19dfbd92e5a621172b84ee6776a55c052b79ecf06707a6d406417796c5f08adced79fe0
 DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 832a05897b233773569d74caf5320b5a11fddf6290310b51ab68e61f329faa2aeed2e3410ebc0aee8f4584ef441d97c279522eabca052e96783e389a5bdc4dd7 SHA512 ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
-DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B e0b62aa74545aa40737673e8fb4b6f493f65cbb14f059aaafdeab52f0ad6a34832558b0e1f6cad3bc288e584594de3a4e842d1e770dbc1244247431bb5bd1829 SHA512 ef7cdf1090f4e113f441055963dce9751b548398ff1a4da5e45b7fea45d4f8b5443622e675d343984ec956f3fc054ff9214a2aee3edd3a79d8ddb77afc3e17b2
 DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
 EBUILD xine-lib-1.2.6-r2.ebuild 5726 BLAKE2B 47bc92135d960c6d94970e86c3e02b7e325feb5aa2ba73cf62c43d4a15b0b87c3fec03978f5345c043b12482383668e7b86c968298fb87d51ea8e31da8fe35b2 SHA512 5b92b1712da307acd84b3e0afa091cbb395e169d434b640cb3b44e4b02fae0d7c48e8296511124679e1e478a948b8a261933b27f8ce64d4f669bdc3ed445bd79
-EBUILD xine-lib-1.2.8.ebuild 5696 BLAKE2B 7560e459258e066d5df9bd939e559845e22f86a63213bababdd6f98febbd26c616c1659ac06dc79bcad3e10d670b539ec735170d257ffa96c57c6123d3164be2 SHA512 4e84e6312fb3df90291680cd338ef336dae7a7835c282c16fd792b33b4112782c8ea77dbca2f72ca42ee9aaa2f4f0940e50184d4e77be2b3e4ff5f33fe58df45
 EBUILD xine-lib-1.2.9-r1.ebuild 5497 BLAKE2B aaba38e048f06472cd2aea6f0b46fc7b7210016caebf45d31699fb11fb82b2d228db1d5f8ec2a8bc24ee6c6bd17b25f90b664a15f8c03cfc24169ce40eae49b4 SHA512 da46ba5be24111bc6ff5102db146d419849b606d14b8e265e1c19700f0724d1c2282aaa376d392ed2a35fb00441fbce3ba883eb52275b7218c223492f52330b7
-EBUILD xine-lib-1.2.9.ebuild 5565 BLAKE2B 6e5ca0d27be4dae22f23dbc822e849c2b24696ebfbc2dd788b1391470cea49c9ad5ee5ebc44b2c76c55c94e256e80cf1c95d8d91d630a933eb1b4ddee2bfbf05 SHA512 7cd31a34ec4cb49b0faf0c56a3b6e672b5d602f50a3d732ddcab8934808531599f49bce3ef599bb72fef30b2b4a7de735f43b53f996d3671590aafe1fffd4763
 EBUILD xine-lib-1.2.9999.ebuild 5385 BLAKE2B 5be07886ffa9a495a74ecb5c8ba77ac1fb833260a22b17423651ad84ab560111cf9959e67b4e8e5a349e8724cbc51de9bea444e62ac1303b6eced26eee742bbf SHA512 312298cf43fe939a7cdfa489677445dcd04b8be19c94d8ac35132f82c450ca679c3b4a3369ea32937a15c68f21d6de4e38f858b5fd015308fd4c3feed3a708c2
 MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
diff --git a/media-libs/xine-lib/xine-lib-1.2.8.ebuild b/media-libs/xine-lib/xine-lib-1.2.8.ebuild
deleted file mode 100644
index 09a56a22a579..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.8.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic libtool multilib eutils
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
-	inherit mercurial eutils
-	unset NLS_IUSE
-	NLS_DEPEND="sys-devel/gettext"
-	NLS_RDEPEND="virtual/libintl"
-else
-	KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
-	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-	NLS_IUSE="nls"
-	NLS_DEPEND="nls? ( sys-devel/gettext )"
-	NLS_RDEPEND="nls? ( virtual/libintl )"
-fi
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
-	dev-libs/libxdg-basedir
-	media-libs/libdvdnav
-	sys-libs/zlib
-	!libav? ( media-video/ffmpeg:0= )
-	libav? (
-		media-libs/libpostproc:0=
-		media-video/libav:0=
-	)
-	virtual/libiconv
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	css? ( >=media-libs/libdvdcss-1.2.10 )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac )
-	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	jpeg? ( virtual/jpeg:0 )
-	libcaca? ( media-libs/libcaca )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
-	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		)
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		)
-	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva[X,opengl] )
-	vcd? (
-		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:0=[-minimal]
-		)
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-		)
-	vpx? ( media-libs/libvpx:0= )
-	wavpack? ( media-sound/wavpack )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		)
-	xcb? ( x11-libs/libxcb )
-	xinerama? ( x11-libs/libXinerama )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )"
-DEPEND="${RDEPEND}
-	${NLS_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2.6b
-	oss? ( virtual/os-headers )
-	v4l? ( virtual/os-headers )
-	X? (
-		x11-libs/libXt
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
-		)
-	xv? ( x11-proto/videoproto )
-	xvmc? ( x11-proto/videoproto )
-	xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )"
-
-src_prepare() {
-	default
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
-	fi
-
-	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
-
-	eautoreconf
-
-	local x
-	for x in 0 1 2 3; do
-		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
-	done
-}
-
-src_configure() {
-	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
-
-	local win32dir #197236
-	if has_multilib_profile; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	local myconf=()
-	[[ ${PV} == *9999* ]] || myconf=( $(use_enable nls) )
-
-	if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
-		myconf+=( --enable-avformat ) #507474
-	fi
-
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable altivec) \
-		$(use_enable vis) \
-		--disable-optimizations \
-		$(use_enable mmap) \
-		$(use_enable oss) \
-		$(use_enable aalib) \
-		$(use_enable directfb) \
-		$(use_enable dxr3) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) $(use_enable opengl glu) \
-		$(use_enable vidix) \
-		$(use_enable xinerama) \
-		$(use_enable xvmc) \
-		$(use_enable vdpau) \
-		$(use_enable vaapi) \
-		$(use_enable dvb) \
-		--disable-gnomevfs \
-		$(use_enable samba) \
-		--disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \
-		$(use_enable vcd) \
-		$(use_enable vdr) \
-		$(use_enable bluray) \
-		$(use_enable a52 a52dec) \
-		$(use_enable aac faad) \
-		$(use_enable gtk gdkpixbuf) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable dts) \
-		$(use_enable mad) \
-		$(use_enable modplug) \
-		$(use_enable musepack) \
-		$(use_enable mng) \
-		--disable-real-codecs \
-		--disable-w32dll \
-		$(use_enable vpx) \
-		$(use_with truetype freetype) $(use_with truetype fontconfig) \
-		$(use_with X x) \
-		$(use_with alsa) \
-		--without-esound \
-		$(use_with fusionsound) \
-		$(use_with jack) \
-		$(use_with pulseaudio) \
-		$(use_with libcaca caca) \
-		$(use_with sdl) \
-		$(use_with xcb) \
-		--with-xv-path=/usr/$(get_libdir) \
-		$(use_with imagemagick) \
-		--with-external-dvdnav \
-		$(use_with flac libflac) \
-		$(use_with speex) \
-		$(use_with theora) \
-		$(use_with vorbis) \
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
-		--with-w32-path=${win32dir} \
-		$(use_with wavpack) \
-		"${myconf[@]}"
-}
-
-src_compile() {
-	# enable verbose building, bug #448140
-	emake V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		htmldir="/usr/share/doc/${PF}/html" \
-		install
-
-	rm -f \
-		"${ED}"usr/lib*/libxine*.la \
-		"${ED}"usr/share/doc/${PF}/COPYING
-}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9.ebuild b/media-libs/xine-lib/xine-lib-1.2.9.ebuild
deleted file mode 100644
index 993b8a7a53ec..000000000000
--- a/media-libs/xine-lib/xine-lib-1.2.9.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic libtool multilib
-
-if [[ ${PV} == *9999* ]]; then
-	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
-	inherit autotools mercurial
-	unset NLS_IUSE
-	NLS_DEPEND="sys-devel/gettext"
-	NLS_RDEPEND="virtual/libintl"
-else
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-	NLS_IUSE="nls"
-	NLS_DEPEND="nls? ( sys-devel/gettext )"
-	NLS_RDEPEND="nls? ( virtual/libintl )"
-fi
-
-DESCRIPTION="Core libraries for Xine movie player"
-HOMEPAGE="http://xine.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
-
-RDEPEND="${NLS_RDEPEND}
-	dev-libs/libxdg-basedir
-	media-libs/libdvdnav
-	sys-libs/zlib
-	virtual/libiconv
-	a52? ( media-libs/a52dec )
-	aac? ( media-libs/faad2 )
-	aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	bluray? ( >=media-libs/libbluray-0.2.1:= )
-	css? ( >=media-libs/libdvdcss-1.2.10 )
-	directfb? ( dev-libs/DirectFB )
-	dts? ( media-libs/libdca )
-	dxr3? ( media-libs/libfame )
-	flac? ( media-libs/flac )
-	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
-	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( virtual/imagemagick-tools )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
-	jpeg? ( virtual/jpeg:0 )
-	!libav? ( media-video/ffmpeg:0= )
-	libav? (
-		media-libs/libpostproc:0=
-		media-video/libav:0=
-		)
-	libcaca? ( media-libs/libcaca )
-	mad? ( media-libs/libmad )
-	mng? ( media-libs/libmng )
-	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		)
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( net-fs/samba )
-	sdl? ( media-libs/libsdl )
-	speex? (
-		media-libs/libogg
-		media-libs/speex
-		)
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		)
-	truetype? (
-		media-libs/fontconfig
-		media-libs/freetype:2
-		)
-	v4l? ( media-libs/libv4l )
-	vaapi? ( x11-libs/libva[X,opengl] )
-	vcd? (
-		>=media-video/vcdimager-0.7.23
-		dev-libs/libcdio:0=[-minimal]
-		)
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-		)
-	vpx? ( media-libs/libvpx:0= )
-	wavpack? ( media-sound/wavpack )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		)
-	xcb? ( x11-libs/libxcb )
-	xinerama? ( x11-libs/libXinerama )
-	xv? ( x11-libs/libXv )
-	xvmc? ( x11-libs/libXvMC )"
-DEPEND="${RDEPEND}
-	${NLS_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-	>=sys-devel/libtool-2.2.6b
-	oss? ( virtual/os-headers )
-	v4l? ( virtual/os-headers )
-	X? (
-		x11-libs/libXt
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
-		)
-	xv? ( x11-proto/videoproto )
-	xvmc? ( x11-proto/videoproto )
-	xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="vidix? ( || ( X fbcon ) )
-	xv? ( X )
-	xinerama? ( X )"
-
-src_prepare() {
-	default
-
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
-	fi
-
-	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
-
-	if [[ "${PV}" = *9999* ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	local x
-	for x in 0 1 2 3; do
-		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
-	done
-}
-
-src_configure() {
-	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
-
-	local win32dir #197236
-	if has_multilib_profile; then
-		win32dir=/usr/$(ABI="x86" get_libdir)/win32
-	else
-		win32dir=/usr/$(get_libdir)/win32
-	fi
-
-	local myconf=(
-		--disable-gnomevfs
-		--disable-optimizations
-		--disable-real-codecs
-		--disable-v4l
-		--disable-w32dll
-		--with-external-dvdnav
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs
-		--with-w32-path=${win32dir}
-		--with-xv-path=/usr/$(get_libdir)
-		--without-esound
-		$(use_enable a52 a52dec)
-		$(use_enable aac faad)
-		$(use_enable aalib)
-		$(use_enable altivec)
-		$(use_enable bluray)
-		$(use_enable directfb)
-		$(use_enable dts)
-		$(use_enable dvb)
-		$(use_enable dxr3)
-		$(use_enable fbcon fb)
-		$(use_enable gtk gdkpixbuf)
-		$(use_enable ipv6)
-		$(use_enable jpeg libjpeg)
-		$(use_enable mad)
-		$(use_enable mmap)
-		$(use_enable mng)
-		$(use_enable modplug)
-		$(use_enable musepack)
-		$(use_enable opengl)
-		$(use_enable opengl glu)
-		$(use_enable oss)
-		$(use_enable samba)
-		$(use_enable v4l libv4l)
-		$(use_enable v4l v4l2)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable vis)
-		$(use_enable vidix)
-		$(use_enable xinerama)
-		$(use_enable xvmc)
-		$(use_enable vcd)
-		$(use_enable vdr)
-		$(use_enable vpx)
-		$(use_with alsa)
-		$(use_with flac libflac)
-		$(use_with fusionsound)
-		$(use_with imagemagick)
-		$(use_with jack)
-		$(use_with libcaca caca)
-		$(use_with pulseaudio)
-		$(use_with sdl)
-		$(use_with speex)
-		$(use_with theora)
-		$(use_with truetype fontconfig)
-		$(use_with truetype freetype)
-		$(use_with vorbis)
-		$(use_with wavpack)
-		$(use_with X x)
-		$(use_with xcb)
-	)
-	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
-
-	if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
-		myconf+=( --enable-avformat ) #507474
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	# enable verbose building, bug #448140
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	rm -f \
-		"${ED%/}"usr/lib*/libxine*.la \
-		"${ED%/}"usr/share/doc/${PF}/COPYING
-}
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 60cd3a2c46e6..4df4ef22c972 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -3,7 +3,7 @@ DIST zimg-2.5.tar.gz 213054 BLAKE2B 0532693c11c1b2bcc0d5bde3a0bc16bf4f736ceff5fc
 DIST zimg-2.6.3.tar.gz 238372 BLAKE2B 4651381c61b978bedd78871117fbe0b1be7e40e3b0d32b399ab47cab06d596befb61078a6f979f2a2ea962ba66046f776e18a2bbf304dee4a2428b303a3094a7 SHA512 497d3b5b0c004fe720c9be2460f251196789ed055a0081b774c78f8c311dc097c2b5d975cb0a7d41e819ca21527e961186b665b5791032787c3b30647011e7da
 DIST zimg-2.7.4.tar.gz 246376 BLAKE2B b6a21a1f7ca5106810485a69bb4e8f1d59d67fe3a619fd0ac412b1e441fe2d8892f64826666fbdfa48ae441fa5a21512b5ba0977eeaca7dcb7e0fcc43447f6e4 SHA512 adbb525b2611ef5267a4c0d4e8c6dd164c2814241c4d58d5356545b23dcf0cbeabb140141ae6ff0e70ef8e0741e351cbfadbadd60923061ddd693a2c3d9e5fde
 EBUILD zimg-2.5.1.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
-EBUILD zimg-2.5.ebuild 824 BLAKE2B 90ca6baceb71c7d2918f3e54a44978630c25cdbdcccc7965c6389fa92960cff631d45c3e2393203d6ed2f92b194a840e421ee69e763611c807f39864d1fdeb25 SHA512 29eea5cf1b3ac94b0b09933ac9bec0b0c2c2e6d646e4079891da7e284f822878701a2283b820be67d4bdbbfb94ab9375c889142b2c29c40914567c9226a64b93
+EBUILD zimg-2.5.ebuild 823 BLAKE2B 1b5643d3bb640c804cf63b3a8242a4af066265ccc909e10181b87a02b32f5a1c112e672fb95f339c05ef33811311f7bdfc4f84b5cc61ac8ffd642559da083edf SHA512 cca5c262169ef0ccff3a739a346f0f17f48b24aefb56aecf3102a2851ab256d8a2f4fe3645bf6f45d6f3dc05cb0b0f85c10465f5ef8c3e298c6663911a254325
 EBUILD zimg-2.6.3.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
 EBUILD zimg-2.7.4.ebuild 838 BLAKE2B cf992d8f8f0260970a7733ac91b73727b4a93755461f7143fa3c459f8a784de812c2d4be13d7b8495ae9968f8fbe605809364a66fdfa95489652b2f39669e0f4 SHA512 c8dd9475806bd117ba55989f72c7b7bf0fdc051009f6c395d4d3717c62dff7dd1a110926cdc5b4e06fe9a69d623ad6ec6872aaadd31e87767d56f414fde2414f
 EBUILD zimg-9999.ebuild 831 BLAKE2B 0abe9fd5f08a84b02a1cda0247532b13f0ba27ce0ed566995c1e3257c6f64e0e0fbf972aa4f3a7421817772089a4e46612e3fbe10ca2eca30376394f3284405e SHA512 c0bb801fbae480836447c87e888c2c96f834d39e24c815fb52bb4e681ddf1b73ebf9b5f69e63382de7327d26b64ba874783607dcb5874bf2efbd86e3b7a7e7a9
diff --git a/media-libs/zimg/zimg-2.5.ebuild b/media-libs/zimg/zimg-2.5.ebuild
index 3debf52018e5..5abc7d61bbb8 100644
--- a/media-libs/zimg/zimg-2.5.ebuild
+++ b/media-libs/zimg/zimg-2.5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/sekrit-twc/zimg"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi