gentoo resync : 16.06.2018

3 files changed, 2 insertions, 56 deletions

diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest
index 15804426d099..ce6b997a906b 100644
--- a/media-libs/libkate/Manifest
+++ b/media-libs/libkate/Manifest
@@ -1,4 +1,3 @@
 DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b
-EBUILD libkate-0.4.1-r2.ebuild 1164 BLAKE2B f7f5e938758e94c9cf3726bdb6042e6df47c54a1ac576c12d5c6b26706d1b4f2beff6ab07b8dee237e4d91a72bdff0a3ac44ef574dcb0d7436625b6760ae0091 SHA512 ed50e21d9de360c16151aa3ccb661f021d86f13af6c8c441bb5fe86be3ede6d8236076abfa68bf6dbb480f41527334ba8dacee77271f2cdac391fd504c022fbf
-EBUILD libkate-0.4.1-r3.ebuild 1312 BLAKE2B 6133b77abbda48df6289c90009a3c5e5a0e64188cab7f1307583173ff6eeaa9358ba5289bdd4c40c631203480eb8115692f509dead03ea2621fe394a4aad2c8c SHA512 a597e12833a3e423c099dfb475114103aa2b85942aec4eb55c2a1740e750d96cc43de20cbf93c7844371e5e384700d04066cc456386da8d3e394c700173097dd
+EBUILD libkate-0.4.1-r3.ebuild 1310 BLAKE2B fb48bc9f30ac6e9e4dcc846b8c7c41182372b2a5b0708c9e6d35dd0d12bb9f89990ec68090ee0efc582420c72208dafe976139b09bdee0afd1f7d2a8962569e5 SHA512 de2b8cfebd28adc1a694625556efc7d9eab191ad663639c7a11c8567f78381785eef1ea4f8d76b17c48682c6eb7b75affeafa7ea041d9f6e3d78bd150b7baa35
 MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29
diff --git a/media-libs/libkate/libkate-0.4.1-r2.ebuild b/media-libs/libkate/libkate-0.4.1-r2.ebuild
deleted file mode 100644
index 279c56974bdc..000000000000
--- a/media-libs/libkate/libkate-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,53 +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 ltprune python-single-r1
-
-DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
-HOMEPAGE="https://code.google.com/p/libkate/"
-SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-
-IUSE="debug doc wxwidgets"
-REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	media-libs/libogg:=
-	media-libs/libpng:0=
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/bison
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="${COMMON_DEPEND}
-	wxwidgets? (
-		${PYTHON_DEPS}
-		dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-		media-libs/liboggz )
-"
-
-pkg_setup() {
-	use wxwidgets && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	if ! use wxwidgets; then
-		sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure || die
-	fi
-
-	econf --disable-static $(use_enable debug) $(use_enable doc)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	use wxwidgets && python_fix_shebang "${D}"
-}
diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r3.ebuild
index 70e8da3949fa..72196cff5575 100644
--- a/media-libs/libkate/libkate-0.4.1-r3.ebuild
+++ b/media-libs/libkate/libkate-0.4.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug doc wxwidgets"
 REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"