Version bump fixing bugs #156497, #167893, #175607 and #165026.

(Portage version: 2.1.2.9)

5 files changed, 229 insertions, 5 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index a90ba52c16ec..1f1637843cf5 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.47 2007/07/02 15:20:44 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.48 2007/07/15 19:16:42 rbu Exp $
+
+*freevo-1.7.2 (15 Jul 2007)
+
+  15 Jul 2007; Robert Buchholz <rbu@gentoo.org> +files/freevo.desktop,
+  metadata.xml, +freevo-1.7.2.ebuild:
+  Version bump fixing bugs #156497, #167893, #175607 and #165026. Thanks to
+  all contributors in the bugs. Metadata change: Added media-tv herd, Ian
+  Stakenvicius and myself as maintainers.
 
   02 Jul 2007; Piotr Jaroszyński <peper@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.7.2 b/media-tv/freevo/files/digest-freevo-1.7.2
new file mode 100644
index 000000000000..f4c65c76cde9
--- /dev/null
+++ b/media-tv/freevo/files/digest-freevo-1.7.2
@@ -0,0 +1,3 @@
+MD5 1c05c080cd89d70e07e393f74aaa1730 freevo-1.7.2.tar.gz 16225723
+RMD160 e3d793eb55c8f14291a8c3d843b76181521d9b8f freevo-1.7.2.tar.gz 16225723
+SHA256 305a11be94cc354bc98ae56afefd7155df6fc533a2439d8daa05efe05c62a6aa freevo-1.7.2.tar.gz 16225723
diff --git a/media-tv/freevo/files/freevo.desktop b/media-tv/freevo/files/freevo.desktop
new file mode 100644
index 000000000000..d7dc62042f0f
--- /dev/null
+++ b/media-tv/freevo/files/freevo.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Freevo
+Comment=Freevo
+TryExec=/usr/bin/freevo
+Exec=/usr/bin/freevo
+Icon=
+Type=Application
diff --git a/media-tv/freevo/freevo-1.7.2.ebuild b/media-tv/freevo/freevo-1.7.2.ebuild
new file mode 100644
index 000000000000..cf1e2a83ea3f
--- /dev/null
+++ b/media-tv/freevo/freevo-1.7.2.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.2.ebuild,v 1.1 2007/07/15 19:16:42 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.5.0-r1
+	>=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"
+
+	echo
+	ewarn "The way of starting Freevo for freevo-only-systems has changed"
+	ewarn "and does not require Freevo to run as root anymore."
+	ewarn "Please use freevoboot, a wrapper to be run as a user."
+	ewarn "Configuration is still in /etc/conf.d/freevo"
+	ewarn "and you can always start freevo directly."
+	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/metadata.xml b/media-tv/freevo/metadata.xml
index 8b3f31d352fc..96affa05a125 100644
--- a/media-tv/freevo/metadata.xml
+++ b/media-tv/freevo/metadata.xml
@@ -1,8 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-	<email>mattepiu@gentoo.org</email>
-</maintainer>
+	<herd>media-tv</herd>
+	<maintainer>
+		<email>ian@syndicated-productions.com</email>
+		<name>Ian Stakenvicius</name>
+		<description>Proxy maintaining through rbu</description>
+	</maintainer>
+	<maintainer>
+		<email>rbu@gentoo.org</email>
+		<name>Robert Buchholz</name>
+	</maintainer>
+	<longdescription>Freevo is an open-source home theatre PC platform based
+		on Linux and a number of open-source audio/video tools. MPlayer
+		and/or Xine can be used to play audio and video files in most
+		popular formats. Freevo can be used both for a standalone PVR
+		computer with a TV+remote, as well as on a regular desktop
+		computer using the monitor and keyboard.  It is mostly written
+		in the Python programming language.
+	</longdescription>
 </pkgmetadata>