Fix desktop file

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 32 insertions, 209 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/Manifest b/media-tv/freevo/Manifest
index 5353d4de5b06..9ee24b841976 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -1,36 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX freevo-1.8.2.boot 1632 SHA256 36d047e29c8707d73c7e63538ee0ea2b77f64045954f73e0838f5ef7532982bc SHA512 b8bf95ea34e9c77d8f8df170a3b1455361634265bd1205a03760d51b647efb74635a7776d7c94a92799e9be4cc2aaad3e72b6df87e29c07cf6595e1c1b3b6ec4 WHIRLPOOL 90c5329c5ea1231b0d6eee20befb16e7e96f107fe3c22626465189d4fa16d30b8ce40e9908c075a145940ba084fe3c7ddd6580f284c3f95f0827ff6188b4486f
 AUX freevo-1.9.0-PIL.patch 905 SHA256 208f1ec7d72443548f58dd4491b8b86b9c3a20b529a4c89504c0740178c2afaa SHA512 324ea349ce6c2a860e2f13c445ea3d21631e6400541d48c294a745df1f73e5366e82988dd59712470edbb0228e518e2387ff08f40fbe718e52c2a49eeaa99984 WHIRLPOOL caaa551cdd12975ce38fe19c0554c76b51e34494a5a5d0fecbe19d94fec65f3b6557e99ec380ae15694d5cde9d3fcdb655efc6916c766e1747ff287f5a012dc9
 AUX freevo-1.9.0-distutils-r1.patch 663 SHA256 9f7bf9da4821d1298d23ecfc8ad72e237979844ae48f42b363657be9627736ee SHA512 6cd4ac470896ba2a77a937b3b5539831045972c61e142b0f5fc1c309e5220d5deb59622d81992615a4da2d2d6f41fd778e2997f38c9424e8dbee70f4a97e21a5 WHIRLPOOL 9180ee3db9b8bf404ccfb31adfcaf9b1c65daa30bdbcef6af2d8d7b0f0ca7d5811800a607efeced6e0d8b8ac824111e0b62436407af8c4d506235339c0e6c758
 AUX freevo.boot 1553 SHA256 754c16099054887a178372759aac0bab7104cb6dd0a829f6f534c6523e31002d SHA512 17931938c5079c64290a5fe2f9683f29b2e324e7361a83779c0467912ebc6337f8a0e1504e2a4625fad9d41a30ab50ff2c5abd949f7bcb9ce78ee74ca404f084 WHIRLPOOL 271f9bc7d2ddb1ad4e52bd8f5e2617c075b902fba6dadaf8ceb0da15caeabde56ee869a3ee97a59ac202a515a3a4a6182770407a75d642cdd3433291844a2ece
 AUX freevo.conf 1265 SHA256 c74b609e3b1177cbbbd3ca507e65b5392eed18fcd488e327c63478664fbd6143 SHA512 80b3282408e4343dba1eb45f4c8221c14e7e6b0199fc6283daf470371530563ebfdcef13f88b008c0b8c96f4133282ed75d55d9f9dae3ce3634e518c53d30905 WHIRLPOOL 48f51c010efb8f1ef402241bae2995a994956389a8a4071aec5c3c07d7c6ce0744493ab3ed191b5f905499b832b339e0aaed3754c01eec08e50cf53f0f6b76b8
-AUX freevo.desktop 126 SHA256 9553d646d154710af8d22b300c5a792433fad47efcd75224f416c46cd45e03e4 SHA512 d7f4d4368bf911b6dc2911609a6fa0bc897610347a8846840289ddaa05cd7c3a94f7297eed8d40f57aefeb97cea330413b24aa6d07c63f0980de6859bda0ea4e WHIRLPOOL f9ba175247e985a5fee02a070a87af17b2208aed662fde963e78ec88d55da210f2eaf2a8e63aed6d59b245cc5b9d969b561c0cc88de932f3a5390d170198d63f
+AUX freevo.desktop 96 SHA256 d7d8662ac1116c48c8180e7e88d1b0cb0a26ff8f61ce81dacb9c6a7b552dfddd SHA512 91642e741bc65b58a19231f755638855ed45e50aebddb6b3a84d1818884602201173ef76ae2678a034a0d8ca9caf98a8ddf82028727423163ceaa1a15f745578 WHIRLPOOL 5c98fcb258adfb249d312ded3a5b165a38837f5f6fb95c22b4da6d693c44191cbf1f79e8914ee7a605386d85c36473ddaf9991057e1dd2208aeb66b6f50612b9
 AUX xbox-lircrc 1690 SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187098ae1dd1070 SHA512 ff9a286fa59bfbb6af47d41530c908ed393b0ee9b8c0ca6e63d71b494ffbc88d04cfeb03ca50ef1da9d457b2d3c1359d9491c75469781ffd7e95b051bdfda519 WHIRLPOOL 6f9618277ea42dca833fc00cec71c5e86b8d441200cff9466a34a683ac0b86157079480b2506e5c37f20b8fccbffcd33acd565c3ca983ce84d21d5cadff7fcbd
-DIST freevo-1.7.6.1.tar.gz 20856412 SHA256 1a0392a858ef428b3a511107322921eb9f45ad0ed02f7f05543486aafba0221e SHA512 f8562990ac4137042bfd9657bffb3b5f38bc02c3809a528cb798de67fbfa0c6fe2ba87b3cc0a6a2f65fbc11bc456ebba4dd27b4975202859835858893414f9b8 WHIRLPOOL 44019711a03a8736ff05518f1bbd3f0173facbe3ebf2f104e4f1b3820ccdca6e8be6785bc3d6b18569e334b2512fcaf00f64225b4dfa04d2b32b6837afc2e0df
 DIST freevo-1.9.0.tar.gz 27182867 SHA256 e3c97e1404bc5a171350d0c0edf8decaa6d4eb3eaa9e42112a903d375aaf8722 SHA512 4dc722efbf81101bda1ab4437516faa6d4471d4106553617d30dd6de860bb7ca5a3c7bfc9865f4a7589d6726c7ef838161213f86c679889e1cd086362921ebac WHIRLPOOL 16abf397c20b9dd18271c5933e343c846746cbbbf5bef8a126a364ce945c820e8e0f164e66fb56a61d86f256e6d7b98ba110a39395d8d26c278c6e54ede8a543
-EBUILD freevo-1.7.6.1.ebuild 5408 SHA256 99db6b3f5575fbcaf7d0684bcf11e659baac0f03cf94ef1e556c03f91ac48123 SHA512 6f6d65eea6b78b3bd224b9a432092183b3623b8f4598dc6b669c218db9422c36a23855fcc5a55a2f2a3e9d3b4fd7fbb43af1702cac756b304eea47edfb1e1925 WHIRLPOOL e05be474a9cbc3d074ac6cb7a51bb354f049971e409e5fc0050bfe3cd14583139188e395083dd9b96d366caac59f9917c7cdcea312ca34f160929f1bd6a97c38
-EBUILD freevo-1.9.0-r1.ebuild 6077 SHA256 b2e1eab2716b391f1d1e6cc961f12de7e3c6cda202fd6575e82bc640a990e336 SHA512 305c7a52bd0b1208a8cf4cfa510400aaaa9b8d3f57023c1a98ca401df6c76f032d52fc6a9b3d2fbe93623deaf74fb184a4140849382b6720e1bbaf4080b9566a WHIRLPOOL 33de6e6d3c23fee95104280f5375be93380eadf9846ec0ee6bf89b2db7a2671f875d201c0e5647ac0aaf7d345fb31693a8bd365cc225ab7c73d5eeb39e9e960e
+EBUILD freevo-1.9.0-r1.ebuild 6068 SHA256 7cc4fa2a05c62bae987b7225b5ed6dd224df3eab8eeb693f6ff9fca0f90fe7b8 SHA512 17bec204c7f848e1c998076497f95549ebfbbe0eb437a3d4157c12ade2a0c2e2f514462513456d66db962208889b6a5c72b703e4b8a5db2ecc4ef5122bbe9aad WHIRLPOOL 8aed5eac88d21ff1a3325c14dbc02c73fcf84b4b06704cf72aa8297c02d5eddb0dde6b611bcdbbcd91512e74be3b6a49e8f0208d114d4ce894d287a33f80d84a
 EBUILD freevo-1.9.0.ebuild 5815 SHA256 022a612f6d0555e65636699110840ca562ecef2af68571e60e3388063b13769f SHA512 1949647fd0888d1f095d88d60aeee630857af6265f8d13a936eedb1bd1f5133d456d06711a75708ed585c79d5a50f990410b6880156af09ffe8108809a9f3ba8 WHIRLPOOL e1d6cf792033524d23e9b14879e7564f6f8296430850fab52f5677ef50958fa79eae64657260ae4be353227c8ce71305c1ceea8801134a96b059cf47d170d6b9
-MISC ChangeLog 13525 SHA256 083af01e45ef08baa8428e99ce6a2571d3791ef6f03ce6c39eabdf8d566876ce SHA512 4c847707c6deb05bc0a26382c5e8f7a135e41aaece10bb9b8a1de17618fc9e6bbd698e2f52e5169b6641d55c5d289346929bcddcd6bd42e3c7deb51d0f278eb5 WHIRLPOOL 7d4e36efa68bfc802c0b6a126412a3104c8b9372e8fc400ba73403830b051d08ad65e4e872c503792a6754ab60898158b6da97a997d58e45be5789afd5325205
+MISC ChangeLog 13662 SHA256 f3653c72bf20137983d78a286c4d3dd5953a68400b0be86b7ffd1f7740a32d5c SHA512 feae2e72a26cd288fc1b192bd61d3cb2c92116454bde046e50de33bd9340ed45485303110413e79c2a3781d61dcdfb0ff2c5a69ddd14a7c94cc1c1453b1419fa WHIRLPOOL 1074ecdf4e178fd8cd5fe242c86d75080d755543765e3b986b9e9369f69e68dae8a133f0b0c4478cf4c8b54c1f5564f737fe38ff15bcaaf0baeac20e9609310e
 MISC metadata.xml 798 SHA256 b7ebe5b40248cb8bd1aad4533cec8430c73a0734a378b679d5a1c5f0fd799674 SHA512 be9be1db80da67a6e6284fd314eaaab92c03335454a663dc8a4664194b52ff06bcced552556e8ac9ce78c05b8dd64100eeb4dc9f7d93b3fec6c2906e4de083c0 WHIRLPOOL 5eb59bf2c9b7014672e83991c6629849a16df97a7a7cad79a949d254b41f5afb808c619c34ce56665af176f0bc8e57edb90e9f80a378405dc5ff15203a070779
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUi3jkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOb+kP/i8P2NaxzAj76FiU2kV/uNlS
-3G0qgK8+Yy0It10CEbhgc+0qEMYnBhnv5I7W0/W+MTAkM/vmiBjkfcYNy9jwuCLA
-p0V4hb5VriaxU0jhs61cx77tm5eHhfWqhIqjFXEFQDS/ZcFLEJlDL9TsaxOJfclF
-05fXQzmp0DdaZZPDXaG3sLm6VeBhsEP84pG8tEUT6vCA8urN4W9UQTfIEU3NqbVy
-v8Q3O/lmgdw6MaKNJYVHVxCFbQgzf/U/GQ/Ei8waEI7rApW1eJDNdGZtU6Fv8+2a
-OvbV+w6+qHcydvtTMmnZVtyrqXDBPCdhaHwWRFf+qKfgK1fJXUClzUO3/fBqFqQe
-YSqExcdi4hbdi/E0Zq8KU87+3TSR98a2k6WqhQ1GqNI2Zvxfn8oDWp7talWnKZkC
-rUzhI25Kvuc0thsjBacHYx8A6ycqUPSNUyoi6XnqcwpN09K6cesW6T+x90idHmKF
-O2b4bvSZ1EHqMcQxNn1c64VTfxvd5tE2HKLFNZtWfkTtr2IJkOBCXB7KS7kKXgJU
-FcJd5QOHZwB/tcIaLt6zCz8CoGJC9AziVE138KSudF2yvSTrnp+ilCQLBYs0doVb
-omWStP4+rc3BbMVanK/CJg1j+NWKnAmlfHpnNO/9Pq9ttoNTc7c9LZvcMrWCNqUJ
-rJA3r60ipS/Zt1fS8k1T
-=FCaO
+iQJ8BAEBCgBmBQJVC9HlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirDO0P/jCf48+SbITgayVF0nNCPyu8
+yqBQoeu0X6b9qPTWkAUjHpWi//7VfIkGKEz4e+TUz0oGL4L1vcRgfzfmytzS7std
+q8nZyI6lftYXfDi3Ls6JB9WedjVPjQr8kznttXcHpWoXKIokz/MVYvV2Ja3qRbJb
+Aimd+8Eu4qn4IYZkENf0dW2RayqG7PIS3M00UVlL4NqotsnfIaK0pxF8Pjbq8kqU
+BeqR7dJoJ8TUqwc0AhfQN+LoqpvJWLNmRJMvmjF1F0zkjJ8a8HVVPeP1mG4bN1GM
+MOMQZkRZkclULHoev4kyuMSEm0SqipOTYlQjKWW4HCaEjww3ORh/3P3XvjbIbVXz
+Z81dWofdONjfbjGIkRioxonVIdvqOCb1JrFvUWquL5JXox0KE5RVTHgV/V2h+DA4
+Z2tDNq6W0WNCiz34OkIWv/ldBHPTOY+LH+LbRpjQNF7istvohBZBbYG1iQ/5d2b3
+RW9eJXZHQrHO6v+Re/jquW9f30R6kZXibGHe0KrnG/GPpMHgLfZWGdkolBsla+m3
+KI0yzVG0ofvkMwsbPeX2MUFfmGcsNO+CPUkeUUeIIkUucz+JBohON1qSHzWkjp8F
+c3l9ExbW/IqG9UN5nYsrKFRXFDA+IHqhLA5x6NEsOCUjJYU25g85EXACva0B847K
+8d3xZr3MK+TxjEX3OqUJ
+=Z7DQ
 -----END PGP SIGNATURE-----
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}]