gentoo resync : 31.12.2018

6 files changed, 323 insertions, 219 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 5f8fc9bfffb1..e0bae95ded4c 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 7051dac1b80c..073af8d99bb0 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -14,6 +14,7 @@ DIST kodi-17.6-generated-addons.tar.xz 57564 BLAKE2B 9b3000ac23a6aab24b703a2b660
 DIST kodi-17.6.tar.gz 58275293 BLAKE2B 538675b7a3400d9182f957da9bbf609ce5ece502c3a7f4a32e26c802bae9795979554204148e06d1923d8e68ba1f06f9d92bf11416f73cf9431381642ca00639 SHA512 1f1ba91e6129ab423f9ad47b63d7bb75775dbf18638a96413a572aaa790f4f0d738ca35486513e158a7f55d501f78f08dd9d68aabe2fbb80a729c6091b264111
 DIST kodi-18.0rc2.tar.gz 50969888 BLAKE2B 982d660c6f87706fa5d50c5ece84ea3d27adcd3ad561a77082cb2c1abfdd378b233aeaa8102682f0c89bb6f3c28481fa03b6070d4e9c3ba9b37b66096211071e SHA512 2f5bba021221cdc45242abc90a993dd033c2d7839f1031159869ac7a777a0675324ec2858868ff5060b16a8d5f367a6135a20ac570a099e907032678c91eac0c
 DIST kodi-18.0rc3.tar.gz 50978485 BLAKE2B 791053553f475dbcacc2bc7c3a1e420849de3f48d3eb3d788f958b2b2c3fb47454cfd909f36cefee37050923c39173690b5d48d517a042254d796aeafb39fcb8 SHA512 622e3fff01e8d856bb524339796410d3fc3226539ae91c69a367464e8f5aeb28ca3ffd605dc4a4f9944e4cc59a1949d7da6fec70175d978a44f3b5bbb59190c3
+DIST kodi-18.0rc4.tar.gz 50985659 BLAKE2B 5b2475d98e084e007aebf0a5e142d03ddd08b11c9067ddf0c978892ce15a4b8f22009156bfe4e26df1ebab55bf724182c4573207440e1e9f50dd5f6b739f8a3e SHA512 cec2af70e6babed79ed649846342cbcfe979ad90a4ef4dde250e114477991c48dcfffac56a6234dc16913c9896a9a31337ebbb19488f0abf68e6c1f410d12607
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 BLAKE2B fb3973e098201d177309ad7ca50131725eee4bc6f30f425efa5fea406411f6143ba03abd82cd6c91a250419d3e0a29aafcbf981ba015f6e14cd0ceb001222c12 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9
 DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 BLAKE2B 0a211fcedb216567bcd929048af01486ff91efbb8d31592fd116676b6ae95de3cd7bfab7cd79853b3d15e96c27e62cce8c79eeb9baee68a1bad4f3fce8a207a0 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e
@@ -28,5 +29,6 @@ EBUILD kodi-17.6-r9.ebuild 8989 BLAKE2B 5e94d368233d04132dc112615da4d28bafc8aba1
 EBUILD kodi-17.6.ebuild 8670 BLAKE2B e8ea1e0dc347c5e891ccad4b05ea5f21c19284e0d5c4b8dc01041e9f582b513e5d6d469e34890b497fc2fa57e1ee5a295209727894c3126a4341dd6095da4cff SHA512 c17607cfc393474ba61bddb29ff9eafeabc1dde7ef4ecead7cca1044695f03c64a5c18a9fc4da0b19fb854e20de49f05290add100f5e4258349fe2809283b44a
 EBUILD kodi-18.0_rc2.ebuild 9366 BLAKE2B d11bbfae54b8b67923d6574255bdb67efcd2caa2c54617e5fea31b71fbb7fed17e102868e024323a17415c9906de9bdc373fb8a267d9153d31ebf8f034a85e99 SHA512 7db29341f1eb28928c6ce004dc5e7745ae77e8d072ea1caecb209f73a557d2d89b1a6633cd22a9da8f850123665e2fd289bead4f28b541a5596360f16210786d
 EBUILD kodi-18.0_rc3.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
+EBUILD kodi-18.0_rc4.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
 EBUILD kodi-9999.ebuild 9403 BLAKE2B d073a91f5978d43efdf5c949212f8ddf85c5b7c420efa23f0fc6cbdf68ccbd25938d51e6c2b9a9ea4f15d087d0f8b6056e40e4e869126d5d2e8ffb7eb392ec0e SHA512 8f7d21e27df2b1c6140e5b6f307c7bde22ef7392f9d99743708d7ea57cf96de30dc1deeb7d592702fcb639206010f3a2bcd951e96b085bd05bccf4744fa9c15e
 MISC metadata.xml 1766 BLAKE2B 53c734014a9d366496190b89c31c2988751ab9bb0065b4c98e2e0162a5e2a0431c8e1bc0ef944b74403492e463e879bf0c68c7efad485a60549a2051cffd6aee SHA512 389444c93cd6e15a1773663db5705bc7658e957435ede722f5e3bd6ef2ea9f761ff352e2e06f1baeff21e66bcb63203cb4a5ad47c0544a0577dbaf734d4a1ba8
diff --git a/media-tv/kodi/kodi-18.0_rc4.ebuild b/media-tv/kodi/kodi-18.0_rc4.ebuild
new file mode 100644
index 000000000000..f981572f1b73
--- /dev/null
+++ b/media-tv/kodi/kodi-18.0_rc4.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.0.1"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="Alpha3-1"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	^^ ( gbm wayland X )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.0.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/flatbuffers
+	>=dev-libs/fribidi-0.19.7
+	cec? ( >=dev-libs/libcec-4.0 )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/libinput-1.10.5
+	>=dev-libs/libxml2-2.9.4
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+	>=dev-libs/libcdio-0.94
+	dev-libs/libfmt
+	dev-libs/libfstrcmp
+	gbm? (	media-libs/mesa[gbm] )
+	gles? ( media-libs/mesa[gles2] )
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.8
+	>=media-libs/libass-0.13.4
+	media-libs/mesa[egl]
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+		libressl? ( media-video/ffmpeg[libressl,-openssl] )
+		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.56.1
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	>=sys-libs/zlib-1.2.11
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		opengl? ( x11-libs/libva[opengl] )
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva[vdpau] )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		>=dev-cpp/waylandpp-0.2.3:=
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+		>=x11-libs/libxkbcommon-0.4.1
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? ( app-misc/lirc )
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-libs/rapidjson
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	virtual/jre
+	x86? ( dev-lang/nasm )
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if use gbm; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="gbm"
+			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="wayland"
+			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all
+	use test && emake -C "${BUILD_DIR}" kodi-test
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 9c70280c3431..b2fd2ddfcb22 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,3 @@
-DIST xmltv-0.5.57.tar.bz2 778254 BLAKE2B 0eae024d8bc709835cbaf4bcbe67b41a25f0d56b0450eea158bceb34d9654cd305a330369e197b7047b62f85adcb7ea53cb1522d0677f73b7f82379c493f3457 SHA512 78e79b75b23cd8815403a0a5835036c67c80ff45fba79fae68e50a041ae384f427e18717d6122ea2d5eb57163370acac115946e24a8934a94b1cc72cb24314cc
 DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
-EBUILD xmltv-0.5.57.ebuild 5402 BLAKE2B 0a677f74fb1957529815c547607fe55170e350029a95860b9a3ae06aa375fdddd66434efb9799257cf72e77e0f01621fc3a605d8f50f0f133aa3316d44a34b5e SHA512 0f6bff446308b31e1999a24848dd7a93106cce6b83df998fa3dded5d7f207a43d39b22e7e28943128c3d7bc0c4296a8f23105a1c837a02ea0ebac7db6f0a67ec
 EBUILD xmltv-0.5.70.ebuild 5268 BLAKE2B f08901b76bca3199e163e3c68493271b7969e65e1b238205255c7646093738a7c873ee251ff0d8d09e622e242899ce72a793b22e94e5e91f990aa209c3ad435d SHA512 d3ef25035c6b4bf8323578c089bcd7abaaad6138470e15afb82c9423ff3272e706b78b6381ad7e18795c6f7c4b59654ac1d8ec33229554ae8cd0980ed4f29661
-MISC metadata.xml 2675 BLAKE2B c02ab345bdb7b4f2df20a022e3f0b888320a21e59e7117d747ed9d17bfdd1a323d38325879cdc3a73e08a41a7f1a5acdd1a9dec166088f49ac45713197ea67f6 SHA512 cc02bc6f243d234735dd9b7b66a20dbdf638943a7a74c7a8c73e7a3a50da2b99fdc8297d7d0e1aa661142195ad976f0c8b95c7054106f791dc7d2cb38e2b410b
+MISC metadata.xml 2086 BLAKE2B 95ac2c882571d789911d751d7e1770e1aeca175a3fba6387ca432189a31369b245c6a92dbfeaf995a5c21387b99238d2eae6517fc965f40afc77439edf6e737c SHA512 c6ab124a269b53533ac9c3e1f9bd7edfce41a6ccdc46666b24389d390297c01d734579f629f35ca836f80a7976beafe02192a6ec02ee92a01702b77161744402
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 7cdc27ff32f7..8dd395986c76 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -4,34 +4,26 @@
 	<!-- maintainer-needed -->
 	<use>
 		<flag name="ar">Argentina tv listing grabber</flag>
-		<flag name="ch">Switzerland bluewin tv listing grabber</flag>
 		<flag name="ch_search">Grabber for Switzerland</flag>
 		<flag name="dk">Denmark tv listing grabber</flag>
 		<flag name="dtvla">Latin America digital tv listing grabber</flag>
-		<flag name="ee">Estonia tv listing grabber</flag>
 		<flag name="es_laguiatv">Spain alternative grabber</flag>
-		<flag name="es_miguiatv">Spain alternative grabber</flag>
 		<flag name="eu_dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
 		<flag name="eu_epg">EPG grabber for some European countries.</flag>
 		<flag name="fi">Finland tv listing grabber</flag>
 		<flag name="fi_sv">Grabber for Finland (Swedish)</flag>
 		<flag name="fr">France tv listing grabber</flag>
 		<flag name="fr_kazer">France (Kazer) tv listing grabber</flag>
-		<flag name="hr">Croatia tv listing grabber</flag>
 		<flag name="huro">Hungarian tv listing grabber</flag>
-		<flag name="in">India tv listing grabber</flag>
 		<flag name="il">Israel tv listing grabber</flag>
 		<flag name="is">Iceland tv listing grabber</flag>
 		<flag name="it">Italy tv listing grabber</flag>
 		<flag name="na_dd">North America tv listing grabber</flag>
 		<flag name="na_dtv">North America Direct TV grabber</flag>
 		<flag name="na_tvmedia">Grabber for North America (TVMedia)</flag>
-		<flag name="na_icons">option for na_dd to download icons</flag>
 		<flag name="nl">Netherlands tv listing grabber</flag>
 		<flag name="no_gf">Norway Gfeed tv listing grabber</flag>
-		<flag name="pt">Portugal tv listing grabber</flag>
 		<flag name="pt_meo">Grabber for Portugal (MEO)</flag>
-		<flag name="re">Reunion Island (France) tv listing grabber</flag>
 		<flag name="se_swedb">Sweden tv listing grabber</flag>
 		<flag name="se_tvzon">Sweden (tvzon.se) tv listing grabber</flag>
 		<flag name="tr">Turkey (Digiturk) tv listing grabber</flag>
@@ -39,9 +31,7 @@
 		<flag name="tv_combiner">enable grabbers combiner</flag>
 		<flag name="tv_pick_cgi">enable CGI support</flag>
 		<flag name="uk_bleb">Britain tv listing grabber</flag>
-		<flag name="uk_rt">Britain alternative tv listing grabber</flag>
 		<flag name="uk_tvguide">UK and Ireland tv listing grabber using TV Guide website</flag>
-		<flag name="za">South Africa tv listing grabber</flag>
 		<flag name="zz_sdjson">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag>
 	</use>
 	<upstream>
diff --git a/media-tv/xmltv/xmltv-0.5.57.ebuild b/media-tv/xmltv/xmltv-0.5.57.ebuild
deleted file mode 100644
index d89721e55819..000000000000
--- a/media-tv/xmltv/xmltv-0.5.57.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils perl-module
-
-DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
-HOMEPAGE="http://xmltv.org"
-SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux"
-
-IUSE="ar ch dtvla uk_rt uk_bleb is it na_dd na_icons fi es_laguiatv es_miguiatv ee re huro dk se_swedb hr no_gf fr pt eu_epg tv_combiner tv_pick_cgi tv_check na_dtv
-za nl in il"
-
-# NOTE: you can customize the xmltv installation by
-#       defining USE FLAGS (custom ones in
-#	/etc/portage/package.use for example).
-#
-#	Do "equery u media-tv/xmltv" for the complete
-#	list of the flags you can set, with description.
-
-# EXAMPLES:
-# enable just North American grabber
-#  in /etc/portage/package.use : media-tv/xmltv na_dd
-#
-# enable graphical front-end, Italy grabber
-#  in /etc/portage/package.use : media-tv/xmltv tv_check it
-
-RDEPEND=">=dev-perl/libwww-perl-5.65
-	>=dev-perl/XML-Parser-2.34
-	>=dev-perl/XML-Twig-3.10
-	>=dev-perl/Date-Manip-5.42
-	>=dev-perl/XML-Writer-0.6
-	virtual/perl-Memoize
-	virtual/perl-Storable
-	>=dev-perl/Lingua-Preferred-0.2.4
-	>=dev-perl/Term-ProgressBar-2.03
-	virtual/perl-IO-Compress
-	dev-perl/Unicode-String
-	dev-perl/TermReadKey
-	dev-perl/File-Slurp
-	>=dev-lang/perl-5.6.1
-	dev-perl/XML-LibXML"
-DEPEND="${RDEPEND}
-	nl? ( dev-perl/HTML-Tree )
-	na_icons? ( dev-perl/HTML-TableExtract >=dev-perl/WWW-Mechanize-1.02 )
-	dk? ( dev-perl/HTML-Tree dev-perl/DateTime dev-perl/Parse-RecDescent )
-	fi? ( dev-perl/HTML-Tree )
-	fr? ( >=dev-perl/HTML-Parser-3.34 dev-perl/HTML-Tree )
-	huro? ( dev-perl/HTML-Tree )
-	it? ( dev-perl/XML-Simple )
-	is? ( dev-perl/XML-LibXSLT )
-	na_dd? ( dev-perl/SOAP-Lite dev-perl/TermReadKey )
-	no_gf? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
-	pt? ( dev-perl/HTML-Tree dev-perl/Unicode-UTF8simple )
-	eu_epg? ( dev-perl/Archive-Zip )
-	se_swedb? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
-	hr? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy dev-perl/XML-LibXML )
-	uk_rt? ( dev-perl/HTTP-Cache-Transparent dev-perl/IO-stringy )
-	uk_bleb? ( dev-perl/Archive-Zip dev-perl/IO-stringy )
-	ee? ( dev-perl/IO-stringy )
-	re? ( dev-perl/Lingua-EN-Numbers-Ordinate )
-	tv_combiner? ( dev-perl/XML-LibXML )
-	tv_check? ( dev-perl/Tk dev-perl/Tk-TableMatrix )
-	tv_pick_cgi? ( dev-perl/CGI dev-perl/Lingua-EN-Numbers-Ordinate )
-	na_dtv? ( >=dev-perl/WWW-Mechanize-1.02 dev-perl/TimeDate dev-perl/IO-stringy dev-perl/XML-LibXML )
-	"
-
-REQUIRED_USE="na_icons? ( na_dd )"
-
-PREFIX="/usr"
-
-src_prepare() {
-	sed -i \
-		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
-		-e "/^@docs/s:doc/COPYING ::" \
-		Makefile.PL || die
-
-	epatch_user
-}
-
-src_configure() {
-	make_config() {
-		# Never except default configuration
-		echo "no"
-
-		# Enable Australian
-		#use au && echo "yes" || echo "no"
-		# Enable Agentina
-		usex ar
-		# Enable Brazil
-		#use br && echo "yes" || echo "no"
-		# Enable Brazil Cable
-		#use brnet && echo "yes" || echo "no"
-		# Enable Switzerland Search
-		usex ch
-		# Enable Latin America
-		usex dtvla
-		# Enable Alternate Brittain
-		usex uk_rt
-		# Enable Alternate Brittain 2
-		usex uk_bleb
-		# Enable Belgium and Luxemburg
-		#use be && echo "yes" || echo "no"
-		#Enable Iceland
-		usex is
-		# Enable Italy
-		usex it
-		# Enable Italy from DVB-S stream
-		echo "no" # missing Linux::DVB
-		# Enable India (experimental)
-		usex in
-		# Enable North America using DataDirect
-		usex na_dd
-		# Enable North America channel icons
-		usex na_icons
-		# Enable Finland
-		usex fi
-		# Enable Israel
-		usex il
-		# Enable Spain
-		#use es  && echo "yes" || echo "no"
-		# Enable Spain Digital
-		# use es_digital && echo "yes" || echo "no"
-		# Israel Temporary Disabled
-		# use il && echo "yes" || echo "no"
-		#echo "no"
-		# Enable Spain Alternatives
-		usex es_laguiatv
-		usex es_miguiatv
-		# Enable Netherlands
-		usex nl
-		# Enable Alternate Netherlands
-		#use nl_wolf  && echo "yes" || echo "no"
-		# Enable Hungary and Romania
-		usex huro
-		# Enable Denmark
-		usex dk
-		# Enable Japan
-		#use jp  && echo "yes" || echo "no"
-		# Enable Sweden
-		usex se_swedb
-		# Enable Croatia
-		usex hr
-		# Enable Norway Gfeed
-		usex no_gf
-		# Enable France
-		usex fr
-		# Enable Norway
-		#use no  && echo "yes" || echo "no"
-		# Enable Portugal
-		usex pt
-		# Enable South Africa
-		usex za
-		# Enable Europe epg
-		usex eu_epg
-		# Enable combiner
-		usex tv_combiner
-		# Enable GUI checking.
-		usex tv_check
-		# Enable CGI support
-		usex tv_pick_cgi
-		# Enable Estonia
-		usex ee
-		# Enable Reunion Island
-		usex re
-		# Enable Caledonie Island
-		#use nc && echo "yes" || echo "no"
-		# Enable North America DirecTV
-		usex na_dtv
-	}
-
-	pm_echovar=`make_config`
-	perl-module_src_configure
-}
-
-src_install() {
-	# actually make test should be unneede, but if non na grabbers
-	# start to not install remove comment below
-	#make test
-	#make
-
-	# to bypass build issue
-	#make DESTDIR=${D} install || die "error installing"
-
-	perl-module_src_install
-
-	for i in `grep -rl "${D}" "${D}"` ; do
-		sed -e "s:${D}::g" -i "${i}"
-	done
-
-	if use tv_pick_cgi ; then
-		dobin choose/tv_pick/tv_pick_cgi
-	fi
-}
-
-pkg_postinst() {
-	if use tv_pick_cgi ; then
-		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		elog "to where the ScriptAlias directive is configured."
-	fi
-}