Version bump (bug #199580)

(Portage version: 2.1.3.19)

9 files changed, 206 insertions, 546 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index 8d2e144cc8d1..97557fb3b368 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-tv/freevo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.54 2007/11/27 11:14:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.55 2007/12/01 21:04:50 rbu Exp $
+
+*freevo-1.7.4 (01 Dec 2007)
+
+  01 Dec 2007; Robert Buchholz <rbu@gentoo.org> -freevo-1.5.4-r2.ebuild,
+  -freevo-1.6.0.ebuild, -freevo-1.6.1.ebuild, +freevo-1.7.4.ebuild:
+  Version bump (bug #199580), changes include:
+  * Lots of translation updates
+  * New plug-ins: DVB, eject, fxd, internet tv, lastfm, mplayer aspect,
+    podcast, youtube
+  * Lots of updates and bugfixes
+  * Fix for bug #163052 (twisted-2.5 breaks recordserver)
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> freevo-1.5.4.ebuild,
   freevo-1.5.4-r2.ebuild, freevo-1.6.0.ebuild, freevo-1.6.1.ebuild,
diff --git a/media-tv/freevo/files/digest-freevo-1.5.4-r2 b/media-tv/freevo/files/digest-freevo-1.5.4-r2
deleted file mode 100644
index 00efc312fb28..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.5.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 22ada48e84e5e3d7f80110c842ed18ca freevo-1.5.4.tar.gz 4425484
-RMD160 a5538af486ce6926f57f40abd90a7f655137f225 freevo-1.5.4.tar.gz 4425484
-SHA256 d9a7c9455a94c281acb8c5e3f0fc68e4289af7a557af413db2244a254dd48090 freevo-1.5.4.tar.gz 4425484
diff --git a/media-tv/freevo/files/digest-freevo-1.6.0 b/media-tv/freevo/files/digest-freevo-1.6.0
deleted file mode 100644
index 63a400cc9d01..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c454414a2453817ae5a73241d61fac2f freevo-1.6.0.tar.gz 12996075
-RMD160 99c38a99f49bac8b5bb69a30e6b2298fb6bf27f5 freevo-1.6.0.tar.gz 12996075
-SHA256 3204ede221f37a72c326b28d403a6b5acead084adeb6cb0ee950c7efaa441150 freevo-1.6.0.tar.gz 12996075
diff --git a/media-tv/freevo/files/digest-freevo-1.6.1 b/media-tv/freevo/files/digest-freevo-1.6.1
deleted file mode 100644
index 3e22360d8891..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5e0358da4637efb7d68a40c4368d5660 freevo-1.6.1.tar.gz 13024966
-RMD160 814d28f9057228af659e2d386db70299f5c249be freevo-1.6.1.tar.gz 13024966
-SHA256 8e18aa169c0b6031e6ff798403db1fcd91ecfee0c5e638e7c09ac1b04e8832e3 freevo-1.6.1.tar.gz 13024966
diff --git a/media-tv/freevo/files/digest-freevo-1.7.4 b/media-tv/freevo/files/digest-freevo-1.7.4
new file mode 100644
index 000000000000..20185fbb75c4
--- /dev/null
+++ b/media-tv/freevo/files/digest-freevo-1.7.4
@@ -0,0 +1,3 @@
+MD5 7a7afcdf88afbc1facc2e824d36be1ae freevo-1.7.4.tar.gz 20540153
+RMD160 e5e2ce8fa9ac5b19bbfee01c446aa5eccd60f0b8 freevo-1.7.4.tar.gz 20540153
+SHA256 5d377f4cb6ad29bc2b4fc8fe9501d055e9cd1b6b068fcf1d2928481bcba5b752 freevo-1.7.4.tar.gz 20540153
diff --git a/media-tv/freevo/freevo-1.5.4-r2.ebuild b/media-tv/freevo/freevo-1.5.4-r2.ebuild
deleted file mode 100644
index 9773a63ff8df..000000000000
--- a/media-tv/freevo/freevo-1.5.4-r2.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.4-r2.ebuild,v 1.6 2007/11/27 11:14:27 zzam Exp $
-
-inherit distutils
-
-IUSE="matrox dvd encode lirc X nls"
-DESCRIPTION="Digital video jukebox (PVR, DVR)."
-HOMEPAGE="http://www.freevo.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-python/pygame-1.5.6
-	>=dev-python/imaging-1.1.3
-	>=dev-python/pyxml-0.8.2
-	>=dev-python/twisted-2
-	>=dev-python/twisted-web-0.5.0-r1
-	>=dev-python/mmpython-0.4.5
-	>=media-video/mplayer-0.92
-	>=media-libs/freetype-2.1.4
-	>=media-libs/libsdl-1.2.5
-	dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
-	encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 )
-	matrox? ( >=media-video/matroxset-0.3 )
-	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use media-libs/sdl-image png; then
-		eerror "media-libs/sdl-image must be emerged with the 'png' use flag"
-		eerror "Please fix and re-emerge freevo."
-		die "fix use flags"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cp "${FILESDIR}/freevo.rc6" "${WORKDIR}/"
-	if use X ; then
-		sed -e 's/lircd/lircd xdm/g' "${WORKDIR}/freevo.rc6" > "${WORKDIR}/freevo.rc6b"
-	else
-		sed -e 's/lircd/lircd local/g' "${WORKDIR}/freevo.rc6" > "${WORKDIR}/freevo.rc6b"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	insinto /etc/freevo
-	doins "${T}/freevo.conf"
-	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
-
-		KDFREEVO=`kde-config --prefix`
-		if [ "x$KDFREEVO" != "x" ]; then
-			FREEVOSESSION=`grep ^SessionsDirs= ${KDFREEVO}/share/config/kdm/kdmrc | cut -d= -f 2 | cut -d: -f1`
-			if [ "x${FREEVOSESSION}" != "x" ]; then
-				insinto ${FREEVOSESSION}
-				doins "${FILESDIR}"/freevo.desktop freevo.desktop
-			fi
-		fi
-
-		insinto /etc/X11/dm/Sessions
-		doins "${FILESDIR}"/freevo.desktop freevo.desktop
-	fi
-
-	exeinto /usr/bin
-	newexe "${FILESDIR}/freevo.boot" freevoboot
-	newconfd "${FILESDIR}/freevo.conf" freevo
-
-	rm -rf "${D}/usr/share/doc"
-	newdoc Docs/README README.docs
-	dodoc BUGS COPYING ChangeLog FAQ INSTALL PKG-INFO README TODO \
-		Docs/{CREDITS,NOTES,plugins/*.txt}
-	cp -r Docs/{installation,plugin_writing} "${D}/usr/share/doc/${PF}"
-
-	use nls || rm -rf "${D}"/usr/share/locale
-}
-
-pkg_postinst() {
-	elog "If you want to schedule programs, emerge xmltv now."
-	elog
-
-	elog "Please check /etc/freevo/freevo.conf and"
-	elog "/etc/freevo/local_conf.py before starting Freevo."
-	elog "To rebuild freevo.conf with different parameters,"
-	elog "please run:"
-	elog "    freevo setup"
-	elog
-
-	if [ -e "${ROOT}/etc/init.d/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo because is no longer used"
-		ewarn "and runnining freevo as root could be a security risk"
-	fi
-	ewarn
-	ewarn "Freevo starting method for freevo-only-systems is changed, cause"
-	ewarn "initscript would run it as root and this may cause unsecurity."
-	ewarn "That is now substituted with freevoboot, a wrapper to be runned"
-	ewarn "as user. Configuration is still in /etc/conf.d/freevo"
-	ewarn "and you can always use freevo directly."
-	ewarn
-	if use X ; then
-		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 as always."
-		ewarn
-		ewarn "Should you decide to personalize your freevo.desktop"
-		ewarn "session, keep inside /usr/bin/freevoboot startx (wrapper)."
-		ewarn
-	else
-		ewarn "Freevo initscript is changed and should not be run as root"
-		ewarn
-		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"
-		ewarn
-		ewarn "*NOTE: you can use mingetty or provide a login"
-		ewarn "program for getty to autologin as limited privileges user"
-		ewarn "a tutorial for getty is at:"
-		ewarn "http://ubuntuforums.org/showthread.php?t=152274"
-		ewarn
-		ewarn "Sorry for the disadvantage, this is done for bug #150568."
-		ewarn
-	fi
-
-	if [ -e "${ROOT}/etc/init.d/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo as is a security"
-		ewarn "threat. To set autostart read above."
-	fi
-
-	if [ -e "${ROOT}/opt/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/opt/freevo because it is no longer used."
-	fi
-	if [ -e "${ROOT}/etc/freevo/freevo_config.py" ] ; then
-		ewarn "Please remove ${ROOT}/etc/freevo/freevo_config.py."
-	fi
-	if [ -e "${ROOT}/etc/init.d/freevo-record" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo-record"
-	fi
-	if [ -e "${ROOT}/etc/init.d/freevo-web" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo-web"
-	fi
-
-	local myconf
-	if [ "`/bin/ls -l /etc/localtime | grep -e "Europe\|GMT"`" ] ; then
-		myconf="${myconf} --tv=pal"
-	fi
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		myconf="${myconf} --geometry=640x480 --display=x11"
-	elif use matrox ; then
-		myconf="${myconf} --geometry=768x576 --display=mga"
-	elif use X ; then
-		myconf="${myconf} --geometry=800x600 --display=x11"
-	else
-		myconf="${myconf} --geometry=800x600 --display=fbdev"
-	fi
-
-	"/usr/bin/freevo" setup ${myconf} || die "configure problem"
-}
diff --git a/media-tv/freevo/freevo-1.6.0.ebuild b/media-tv/freevo/freevo-1.6.0.ebuild
deleted file mode 100644
index 8f5d8017b993..000000000000
--- a/media-tv/freevo/freevo-1.6.0.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.6.0.ebuild,v 1.7 2007/11/27 11:14:27 zzam Exp $
-
-inherit distutils
-
-IUSE="matrox dvd encode lirc X nls"
-DESCRIPTION="Digital video jukebox (PVR, DVR)."
-HOMEPAGE="http://www.freevo.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-python/pygame-1.5.6
-	>=dev-python/imaging-1.1.3
-	>=dev-python/pyxml-0.8.2
-	>=dev-python/twisted-2
-	>=dev-python/twisted-web-0.5.0-r1
-	>=dev-python/mmpython-0.4.10
-	>=media-video/mplayer-0.92
-	>=media-libs/freetype-2.1.4
-	>=media-libs/libsdl-1.2.5
-	dev-python/elementtree
-	dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
-	encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 )
-	matrox? ( >=media-video/matroxset-0.3 )
-	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use media-libs/sdl-image png; then
-		eerror "media-libs/sdl-image must be emerged with the 'png' use flag"
-		eerror "Please fix and re-emerge freevo."
-		die "fix use flags"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cp "${FILESDIR}/freevo.rc6" "${WORKDIR}/"
-	if use X ; then
-		sed -e 's/lircd/lircd xdm/g' "${WORKDIR}/freevo.rc6" > "${WORKDIR}/freevo.rc6b"
-	else
-		sed -e 's/lircd/lircd local/g' "${WORKDIR}/freevo.rc6" > "${WORKDIR}/freevo.rc6b"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	insinto /etc/freevo
-	doins "${T}/freevo.conf"
-	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
-
-		KDFREEVO=`kde-config --prefix`
-		if [ "x$KDFREEVO" != "x" ]; then
-			FREEVOSESSION=`grep ^SessionsDirs= ${KDFREEVO}/share/config/kdm/kdmrc | cut -d= -f 2 | cut -d: -f1`
-			if [ "x${FREEVOSESSION}" != "x" ]; then
-				insinto ${FREEVOSESSION}
-				doins "${FILESDIR}"/freevo.desktop freevo.desktop
-			fi
-		fi
-
-		insinto /etc/X11/dm/Sessions
-		doins "${FILESDIR}"/freevo.desktop freevo.desktop
-	fi
-
-	exeinto /usr/bin
-	newexe "${FILESDIR}/freevo.boot" freevoboot
-	newconfd "${FILESDIR}/freevo.conf" freevo
-
-	rm -rf "${D}/usr/share/doc"
-	newdoc Docs/README README.docs
-	dodoc BUGS COPYING ChangeLog FAQ INSTALL PKG-INFO README TODO \
-		Docs/{CREDITS,NOTES,plugins/*.txt}
-	cp -r Docs/{installation,plugin_writing} "${D}/usr/share/doc/${PF}"
-
-	use nls || rm -rf "${D}"/usr/share/locale
-}
-
-pkg_postinst() {
-	elog "If you want to schedule programs, emerge xmltv now."
-	elog
-
-	elog "Please check /etc/freevo/freevo.conf and"
-	elog "/etc/freevo/local_conf.py before starting Freevo."
-	elog "To rebuild freevo.conf with different parameters,"
-	elog "please run:"
-	elog "    freevo setup"
-	elog
-
-	if [ -e "${ROOT}/etc/init.d/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo because is no longer used"
-		ewarn "and runnining freevo as root could be a security risk"
-	fi
-	ewarn
-	ewarn "Freevo starting method for freevo-only-systems is changed, cause"
-	ewarn "initscript would run it as root and this may cause unsecurity."
-	ewarn "That is now substituted with freevoboot, a wrapper to be runned"
-	ewarn "as user. Configuration is still in /etc/conf.d/freevo"
-	ewarn "and you can always use freevo directly."
-	ewarn
-	if use X ; then
-		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 as always."
-		ewarn
-		ewarn "Should you decide to personalize your freevo.desktop"
-		ewarn "session, keep inside /usr/bin/freevoboot startx (wrapper)."
-		ewarn
-	else
-		ewarn "Freevo initscript is changed and should not be run as root"
-		ewarn
-		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"
-		ewarn
-		ewarn "*NOTE: you can use mingetty or provide a login"
-		ewarn "program for getty to autologin as limited privileges user"
-		ewarn "a tutorial for getty is at:"
-		ewarn "http://ubuntuforums.org/showthread.php?t=152274"
-		ewarn
-		ewarn "Sorry for the disadvantage, this is done for bug #150568."
-		ewarn
-	fi
-
-	if [ -e "${ROOT}/etc/init.d/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo as is a security"
-		ewarn "threat. To set autostart read above."
-	fi
-
-	if [ -e "${ROOT}/opt/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/opt/freevo because it is no longer used."
-	fi
-	if [ -e "${ROOT}/etc/freevo/freevo_config.py" ] ; then
-		ewarn "Please remove ${ROOT}/etc/freevo/freevo_config.py."
-	fi
-	if [ -e "${ROOT}/etc/init.d/freevo-record" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo-record"
-	fi
-	if [ -e "${ROOT}/etc/init.d/freevo-web" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo-web"
-	fi
-
-	local myconf
-	if [ "`/bin/ls -l /etc/localtime | grep -e "Europe\|GMT"`" ] ; then
-		myconf="${myconf} --tv=pal"
-	fi
-	if [ "${PROFILE_ARCH}" == "xbox" ]; then
-		myconf="${myconf} --geometry=640x480 --display=x11"
-	elif use matrox ; then
-		myconf="${myconf} --geometry=768x576 --display=mga"
-	elif use X ; then
-		myconf="${myconf} --geometry=800x600 --display=x11"
-	else
-		myconf="${myconf} --geometry=800x600 --display=fbdev"
-	fi
-
-	"/usr/bin/freevo" setup ${myconf} || die "configure problem"
-	ewarn
-	ewarn "please note that your local_conf.py should be changed,"
-	ewarn "modify the example in /etc/freevo/local.conf.py with"
-	ewarn "your settings."
-}
diff --git a/media-tv/freevo/freevo-1.6.1.ebuild b/media-tv/freevo/freevo-1.6.1.ebuild
deleted file mode 100644
index b2221c2c7872..000000000000
--- a/media-tv/freevo/freevo-1.6.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.6.1.ebuild,v 1.6 2007/11/27 11:14:27 zzam Exp $
-
-inherit distutils
-
-IUSE="matrox dvd encode lirc X nls directfb"
-DESCRIPTION="Digital video jukebox (PVR, DVR)."
-HOMEPAGE="http://www.freevo.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-python/pygame-1.5.6
-	>=dev-python/imaging-1.1.3
-	>=dev-python/pyxml-0.8.2
-	>=dev-python/twisted-2
-	>=dev-python/twisted-web-0.5.0-r1
-	>=dev-python/mmpython-0.4.5
-	>=media-video/mplayer-0.92
-	>=media-libs/freetype-2.1.4
-	>=media-libs/libsdl-1.2.5
-	dev-python/elementtree
-	dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
-	encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 )
-	matrox? ( >=media-video/matroxset-0.3 )
-	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use media-libs/sdl-image png; then
-		eerror "media-libs/sdl-image must be emerged with the 'png' use flag"
-		eerror "Please fix and re-emerge freevo."
-		die "fix use flags"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cp "${FILESDIR}/freevo.rc6" "${WORKDIR}/"
-	if use X ; then
-		sed -e 's/lircd/lircd xdm/g' "${WORKDIR}/freevo.rc6" > "${WORKDIR}/freevo.rc6b"
-	else
-		sed -e 's/lircd/lircd local/g' "${WORKDIR}/freevo.rc6" > "${WORKDIR}/freevo.rc6b"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	insinto /etc/freevo
-	doins "${T}/freevo.conf"
-	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
-
-		KDFREEVO=`kde-config --prefix`
-		if [ "x$KDFREEVO" != "x" ]; then
-			FREEVOSESSION=`grep ^SessionsDirs= ${KDFREEVO}/share/config/kdm/kdmrc | cut -d= -f 2 | cut -d: -f1`
-			if [ "x${FREEVOSESSION}" != "x" ]; then
-				insinto ${FREEVOSESSION}
-				doins "${FILESDIR}"/freevo.desktop freevo.desktop
-			fi
-		fi
-
-		insinto /etc/X11/dm/Sessions
-		doins "${FILESDIR}"/freevo.desktop freevo.desktop
-	fi
-
-	exeinto /usr/bin
-	newexe "${FILESDIR}/freevo.boot" freevoboot
-	newconfd "${FILESDIR}/freevo.conf" freevo
-
-	rm -rf "${D}/usr/share/doc"
-	newdoc Docs/README README.docs
-	dodoc BUGS COPYING ChangeLog FAQ INSTALL PKG-INFO README TODO \
-		Docs/{CREDITS,NOTES,plugins/*.txt}
-	cp -r Docs/{installation,plugin_writing} "${D}/usr/share/doc/${PF}"
-
-	use nls || rm -rf "${D}"/usr/share/locale
-}
-
-pkg_postinst() {
-	elog "If you want to schedule programs, emerge xmltv now."
-	elog
-
-	elog "Please check /etc/freevo/freevo.conf and"
-	elog "/etc/freevo/local_conf.py before starting Freevo."
-	elog "To rebuild freevo.conf with different parameters,"
-	elog "please run:"
-	elog "    freevo setup"
-	elog
-
-	if [ -e "${ROOT}/etc/init.d/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo because is no longer used"
-		ewarn "and runnining freevo as root could be a security risk"
-	fi
-	ewarn
-	ewarn "Freevo starting method for freevo-only-systems is changed, cause"
-	ewarn "initscript would run it as root and this may cause unsecurity."
-	ewarn "That is now substituted with freevoboot, a wrapper to be runned"
-	ewarn "as user. Configuration is still in /etc/conf.d/freevo"
-	ewarn "and you can always use freevo directly."
-	ewarn
-	if use X ; then
-		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 as always."
-		ewarn
-		ewarn "Should you decide to personalize your freevo.desktop"
-		ewarn "session, keep inside /usr/bin/freevoboot startx (wrapper)."
-		ewarn
-	else
-		ewarn "Freevo initscript is changed and should not be run as root"
-		ewarn
-		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"
-		ewarn
-		ewarn "*NOTE: you can use mingetty or provide a login"
-		ewarn "program for getty to autologin as limited privileges user"
-		ewarn "a tutorial for getty is at:"
-		ewarn "http://ubuntuforums.org/showthread.php?t=152274"
-		ewarn
-		ewarn "Sorry for the disadvantage, this is done for bug #150568."
-		ewarn
-	fi
-
-	if [ -e "${ROOT}/etc/init.d/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo as is a security"
-		ewarn "threat. To set autostart read above."
-	fi
-
-	if [ -e "${ROOT}/opt/freevo" ] ; then
-		ewarn "Please remove ${ROOT}/opt/freevo because it is no longer used."
-	fi
-	if [ -e "${ROOT}/etc/freevo/freevo_config.py" ] ; then
-		ewarn "Please remove ${ROOT}/etc/freevo/freevo_config.py."
-	fi
-	if [ -e "${ROOT}/etc/init.d/freevo-record" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo-record"
-	fi
-	if [ -e "${ROOT}/etc/init.d/freevo-web" ] ; then
-		ewarn "Please remove ${ROOT}/etc/init.d/freevo-web"
-	fi
-
-	local myconf
-	if [ "`/bin/ls -l /etc/localtime | grep -e "Europe\|GMT"`" ] ; then
-		myconf="${myconf} --tv=pal"
-	fi
-	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
-
-	"/usr/bin/freevo" setup ${myconf} || die "configure problem"
-	ewarn
-	ewarn "please note that your local_conf.py should be changed,"
-	ewarn "modify the example in /etc/freevo/local.conf.py with"
-	ewarn "your settings."
-}
diff --git a/media-tv/freevo/freevo-1.7.4.ebuild b/media-tv/freevo/freevo-1.7.4.ebuild
new file mode 100644
index 000000000000..dd24aab3a599
--- /dev/null
+++ b/media-tv/freevo/freevo-1.7.4.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.7.4.ebuild,v 1.1 2007/12/01 21:04:50 rbu Exp $
+
+inherit distutils
+
+DESCRIPTION="Digital video jukebox (PVR, DVR)."
+HOMEPAGE="http://www.freevo.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+IUSE="dvd lirc matrox minimal mixer nls sqlite tv X directfb fbcon doc"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+
+RDEPEND=">=dev-python/pygame-1.5.6
+	>=dev-python/pyxml-0.8.2
+	>=dev-python/imaging-1.1.3
+	>=dev-python/twisted-2.4
+	>=dev-python/twisted-web-0.6
+	>=media-video/mplayer-0.92
+	>=media-libs/freetype-2.1.4
+	>=media-libs/libsdl-1.2.5
+	>=sys-apps/sed-4
+	>=dev-python/elementtree-1.2.6
+	>=dev-python/beautifulsoup-3.0
+	>=dev-python/kaa-base-0.1.3
+	>=dev-python/kaa-metadata-0.6.1
+	>=dev-python/kaa-imlib2-0.2.1
+	dvd? ( >=media-video/xine-ui-0.9.22 >=media-video/lsdvd-0.10 )
+	tv? ( media-tv/tvtime !minimal? ( media-tv/xmltv ) )
+	mixer? ( media-sound/aumix )
+	matrox? ( >=media-video/matroxset-0.3 )
+	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )
+	sqlite? ( ~dev-python/pysqlite-1.0.1 )"
+
+pkg_setup() {
+	if use directfb ; then
+		use dvd && ! (built_with_use media-libs/xine-lib directfb) \
+			&& ewarn "media-libs/xine-lib was not built with directfb support"
+		! (built_with_use media-video/mplayer directfb) \
+			&& ewarn "media-video/mplayer was not built with directfb support"
+		if ! (built_with_use media-libs/libsdl directfb) ; then
+			eerror "media-libs/libsdl was not built with directdb support"
+			eerror "Please re-emerge libsdl with the directfb use flag"
+			die "directfb use flag specified but no support in libsdl and others"
+		fi
+	fi
+
+	if use fbcon ; then
+		use dvd && ! (built_with_use media-libs/xine-lib fbcon) \
+			&& ewarn "media-libs/xine-lib was not built with fbcon support"
+		! (built_with_use media-video/mplayer fbcon) \
+			&& ewarn "media-video/mplayer was not built with fbcon support"
+		if ! (built_with_use media-libs/libsdl fbcon) ; then
+			eerror "media-libs/libsdl was not built with fbcon support"
+			eerror "Please re-emerge libsdl with the fbcon use flag"
+			die "fbcon use flag specified but no support in media-libs/libsdl and others"
+		fi
+	fi
+
+	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
+
+	if ! (     (built_with_use  media-libs/sdl-image jpeg) \
+		&& (built_with_use  media-libs/sdl-image png ) ) ; then
+		eerror "media-libs/sdl-image needs more image format support (USE=\"png jpeg\")"
+		die "re-emerge media-libs/sdl-image with the given USE flags"
+	fi
+}
+
+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() {
+	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
+}