Fix desktop file

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 12 insertions, 187 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index f875619e6734..b70b0793b93c 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/freevo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.86 2014/12/12 23:23:14 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.87 2015/03/20 07:53:08 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -freevo-1.7.6.1.ebuild,
+  files/freevo.desktop, freevo-1.9.0-r1.ebuild:
+  Fix desktop file
 
   12 Dec 2014; Michał Górny <mgorny@gentoo.org> freevo-1.9.0-r1.ebuild,
   freevo-1.9.0.ebuild:
diff --git a/media-tv/freevo/files/freevo.desktop b/media-tv/freevo/files/freevo.desktop
index d7dc62042f0f..cacbcc66d379 100644
--- a/media-tv/freevo/files/freevo.desktop
+++ b/media-tv/freevo/files/freevo.desktop
@@ -1,7 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Freevo
-Comment=Freevo
 TryExec=/usr/bin/freevo
 Exec=/usr/bin/freevo
 Icon=
diff --git a/media-tv/freevo/freevo-1.7.6.1.ebuild b/media-tv/freevo/freevo-1.7.6.1.ebuild
deleted file mode 100644
index df3bec2685dc..000000000000
--- a/media-tv/freevo/freevo-1.7.6.1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.6.1.ebuild,v 1.13 2014/08/10 21:02:58 slyfox Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="xml"
-
-inherit distutils
-
-DESCRIPTION="Digital video jukebox (PVR, DVR)"
-HOMEPAGE="http://www.freevo.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-IUSE="directfb doc dvd fbcon gphoto2 lirc matrox minimal mixer nls tv X"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND=">=dev-python/pygame-1.5.6
-	>=dev-python/pyxml-0.8.2
-	virtual/python-imaging
-	>=dev-python/twisted-core-2.4
-	>=dev-python/twisted-web-0.6
-	>=media-video/mplayer-0.92[directfb?,fbcon?]
-	>=media-libs/freetype-2.1.4
-	>=media-libs/libsdl-1.2.5[directfb?,fbcon?]
-	media-libs/sdl-image[jpeg,png]
-	>=sys-apps/sed-4
-	>=dev-python/beautifulsoup-3.0
-	>=dev-python/kaa-base-0.2.0
-	>=dev-python/kaa-metadata-0.7.1
-	>=dev-python/kaa-imlib2-0.2.2
-	dvd? (
-		>=media-video/xine-ui-0.9.22
-		>=media-video/lsdvd-0.10
-		media-libs/xine-lib[directfb?,fbcon?]
-	)
-	gphoto2? ( media-gfx/gphoto2 )
-	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )
-	matrox? ( >=media-video/matroxset-0.3 )
-	mixer? ( media-sound/aumix )
-	tv? ( media-tv/xmltv )"
-
-pkg_setup() {
-	if ! { use X || use directfb || use fbcon || use matrox ; } ; then
-		echo
-		ewarn "WARNING - no video support specified in USE flags."
-		ewarn "Please be sure that media-libs/libsdl supports whatever video"
-		ewarn "support (X11, fbcon, directfb, etc) you plan on using."
-		echo
-	fi
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	distutils_src_prepare
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	distutils_src_install
-
-	insinto /etc/freevo
-	newins local_conf.py.example local_conf.py
-
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		sed -i -e "s/# MPLAYER_AO_DEV.*/MPLAYER_AO_DEV='alsa1x'/" "${D}"/etc/freevo/local_conf.py
-		newins "${FILESDIR}"/xbox-lircrc lircrc
-	fi
-
-	if use X; then
-		echo "#!/bin/bash" > freevo
-		echo "/usr/bin/freevoboot startx" >> freevo
-		exeinto /etc/X11/Sessions/
-		doexe freevo
-
-		#insinto /etc/X11/dm/Sessions
-		#doins "${FILESDIR}/freevo.desktop"
-
-		insinto /usr/share/xsessions
-		doins "${FILESDIR}/freevo.desktop"
-	fi
-
-	exeinto /usr/bin
-	newexe "${FILESDIR}/freevo.boot" freevoboot
-	newconfd "${FILESDIR}/freevo.conf" freevo
-
-	rm -rf "${D}/usr/share/doc"
-
-	dodoc ChangeLog FAQ INSTALL PKG-INFO README TODO \
-		Docs/{CREDITS,NOTES,*.txt,plugins/*.txt}
-	use doc &&
-		cp -r Docs/{installation,html,plugin_writing} "${D}/usr/share/doc/${PF}"
-
-	use nls || rm -rf "${D}"/usr/share/locale
-
-	# Create a default freevo setup
-	cd "${S}/src"
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		myconf="${myconf} --geometry=640x480 --display=x11"
-	elif use matrox && use directfb; then
-		myconf="${myconf} --geometry=768x576 --display=dfbmga"
-	elif use matrox ; then
-		myconf="${myconf} --geometry=768x576 --display=mga"
-	elif use directfb; then
-		myconf="${myconf} --geometry=768x576 --display=directfb"
-	elif use X ; then
-		myconf="${myconf} --geometry=800x600 --display=x11"
-	else
-		myconf="${myconf} --geometry=800x600 --display=fbdev"
-	fi
-	sed -i "s:/etc/freevo/freevo.conf:${D}/etc/freevo/freevo.conf:g" setup_freevo.py || die "Could not fix setup_freevo.py"
-	"$(PYTHON)" setup_freevo.py ${myconf} || die "Could not create new freevo.conf"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	echo
-	einfo "Please check /etc/freevo/freevo.conf and"
-	einfo "/etc/freevo/local_conf.py before starting Freevo."
-	einfo "To rebuild freevo.conf with different parameters,"
-	einfo "please run:"
-	einfo "  # freevo setup"
-
-	einfo "To update your local configuration, please run"
-	einfo "  # freevo convert_config /etc/freevo/local_conf.py -w"
-
-	echo
-	einfo "To build a freevo-only system, please use the freevoboot"
-	einfo "wrapper to be run it as a user. It can be configured in /etc/conf.d/freevo"
-	if use X ; then
-		echo
-		ewarn "If you're using a Freevo-only system with X, you'll need"
-		ewarn "to setup the autologin (as user) and choose freevo as"
-		ewarn "default session. If you need to run recordserver/webserver"
-		ewarn "at boot, please use /etc/conf.d/freevo"
-		echo
-		ewarn "Should you decide to personalize your freevo.desktop"
-		ewarn "session, keep the definition for '/usr/bin/freevoboot starx'"
-	else
-		echo
-		ewarn "If you want Freevo to start automatically,you'll need"
-		ewarn "to follow instructions at :"
-		ewarn "http://freevo.sourceforge.net/cgi-bin/doc/BootFreevo"
-		echo
-		ewarn "*NOTE: you can use mingetty or provide a login"
-		ewarn "program for getty to autologin as a user with limited privileges."
-		ewarn "A tutorial for getty is at:"
-		ewarn "http://ubuntuforums.org/showthread.php?t=152274"
-	fi
-
-	if [ -e "${ROOT}/etc/init.d/freevo" ] ; then
-		echo
-		ewarn "Please remove /etc/init.d/freevo as it is a security"
-		ewarn "threat. To set autostart read above."
-	fi
-
-	if [ -e "${ROOT}/opt/freevo" ] ; then
-		echo
-		ewarn "Please remove ${ROOT}/opt/freevo because it is no longer used."
-	fi
-	if [ -e "${ROOT}/etc/freevo/freevo_config.py" ] ; then
-		echo
-		ewarn "Please remove ${ROOT}/etc/freevo/freevo_config.py."
-	fi
-	if [ -e "${ROOT}/etc/init.d/freevo-record" ] ; then
-		echo
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo-record"
-	fi
-	if [ -e "${ROOT}/etc/init.d/freevo-web" ] ; then
-		echo
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo-web"
-	fi
-}
diff --git a/media-tv/freevo/freevo-1.9.0-r1.ebuild b/media-tv/freevo/freevo-1.9.0-r1.ebuild
index 210e5c5a07dd..32da67906487 100644
--- a/media-tv/freevo/freevo-1.9.0-r1.ebuild
+++ b/media-tv/freevo/freevo-1.9.0-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0-r1.ebuild,v 1.4 2014/12/12 23:23:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0-r1.ebuild,v 1.5 2015/03/20 07:53:08 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
+
 inherit eutils distutils-r1
 
 DESCRIPTION="Digital video jukebox (PVR, DVR)"
@@ -18,7 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="directfb cdparanoia doc dvd encode fbcon flac gphoto2 jpeg lame lirc matrox mixer nls tv vorbis xine X"
 
-RDEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
 	virtual/python-imaging[${PYTHON_USEDEP}]
 	dev-python/pygame[${PYTHON_USEDEP}]
 	>=dev-python/twisted-core-2.5[${PYTHON_USEDEP}]