gentoo resync : 22.01.2021

3 files changed, 2 insertions, 91 deletions

diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 766d9e891c2e..6b416785556d 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,5 +1,4 @@
 AUX gxine-0.5.909-fno-common.patch 559 BLAKE2B 070ac7218be823a96287e067fec31c3f7f70ab4d6aaff495eaea940e3cd77c3ef27d3f11b64c84a47bb5dd5352d855d996b91e32dd993a895771f2f5cd3a88a8 SHA512 6bff8ce76588f9a25e3006f0b669332d1f0dc0326334f449e7dd3b7f3840d8c0e631e8c301b7d7726d5ad9e3630dc50d318b2f918ab4f2508c60de06568a8030
 DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215
-EBUILD gxine-0.5.909-r1.ebuild 1532 BLAKE2B d228dacbd8115e5c5033f911b466aac2208c75e687ab66f8691f7bb7909437f957c2f35568ad71db30e840a8a88c72ad00347c76dcbc5ef686c029d4b64d24eb SHA512 604509ec7e0dc6a8d963a33358e4477e3a1138bcff69d4386767ca27163b225326b016cbbe690943d848e20cc7557b88d03af9eeaad5a10e29292e2c6b86f8b3
-EBUILD gxine-0.5.909.ebuild 2040 BLAKE2B 68a161a5a1639615b8d976df2e78ba22a969140377e3bce3d4f900617b5074875e87243f8e1c76efd0eb9741dc193e0ff52e0fd7733b4de13a8624109dbe057e SHA512 4705f92285382af777273ae36d77ea72fae400f3cdc82ec5b1b6c9e21bc13848da73e1b968aa444b1f791c9ebb1422739155241fa6a55999ea968e8784e30e4b
+EBUILD gxine-0.5.909-r1.ebuild 1528 BLAKE2B bb7a0e47538d2cd5c1b3e2f64b095818a6f082562f03f29b721dcbdc18b16220ad15421dc3d1bdf4a571f509aeb81e1bf402223f22241b3266633a7d60dae58d SHA512 a432b8022a6926f917151e6d619fbc9b375d2fc1b853f34b9a3ac6716ecff86e73b9622e5c4918439c7b8acabdf947c6129d6521e747c8f1feee669ba458165a
 MISC metadata.xml 305 BLAKE2B 0704c2d6ae4a0e249d693a63f719b4ec470a08e1cf1b64342571dad7514fd2a14616bf0812aa8f6a0732049c702ee3e00ab005c5b650723577526413c8337ad5 SHA512 396865e52e9dc380cbf6d3dbf33deb69877495356dc6c6a09ba35ab3062608a93e7ab3d5d22564192070ddc186f3a5ff9ceea639911cc554ca6db5084a413587
diff --git a/media-video/gxine/gxine-0.5.909-r1.ebuild b/media-video/gxine/gxine-0.5.909-r1.ebuild
index 5c5965807691..f8dca86551cf 100644
--- a/media-video/gxine/gxine-0.5.909-r1.ebuild
+++ b/media-video/gxine/gxine-0.5.909-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="l10n_cs l10n_de lirc nls udev xinerama"
 
 DEPEND="
diff --git a/media-video/gxine/gxine-0.5.909.ebuild b/media-video/gxine/gxine-0.5.909.ebuild
deleted file mode 100644
index 76f6aac1d19a..000000000000
--- a/media-video/gxine/gxine-0.5.909.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils gnome2-utils multilib nsplugins xdg-utils
-
-DESCRIPTION="GTK+ Front-End for libxine"
-HOMEPAGE="http://xine.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="l10n_cs l10n_de lirc nls nsplugin udev xinerama"
-
-COMMON_DEPEND=">=media-libs/xine-lib-1.1.20[gtk]
-	x11-libs/gtk+:2
-	>=dev-libs/glib-2
-	>=dev-lang/spidermonkey-1.8.2.15:0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	nsplugin? ( dev-libs/nspr
-		x11-libs/libXaw
-		x11-libs/libXt )
-	udev? ( dev-libs/libgudev:= )
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}"
-
-src_prepare() {
-	# need to disable calling of xine-list when running without
-	# userpriv, otherwise we get sandbox violations (bug #233847)
-	if [[ ${EUID} == "0" ]]; then
-		sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable lirc) \
-		--enable-watchdog \
-		--with-xcb \
-		$(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \
-		$(use_with nsplugin browser-plugin) \
-		$(use_with udev gudev) \
-		--without-hal \
-		--without-dbus \
-		$(use_with xinerama)
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		docsdir=/usr/share/doc/${PF} \
-		install
-
-	dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO
-
-	use l10n_cs && dodoc README.cs
-	use l10n_de && dodoc README.de
-
-	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}