Fixed freevoboot install and some language issue.

Package-Manager: portage-2.1.2_pre3-r7

4 files changed, 187 insertions, 5 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index d7541290f012..33d4db5dace7 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/freevo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.37 2006/10/19 16:48:32 mattepiu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.38 2006/10/24 18:38:21 mattepiu Exp $
+
+*freevo-1.5.4-r2 (24 Oct 2006)
+
+  24 Oct 2006; Matteo Azzali <mattepiu@gentoo.org> +freevo-1.5.4-r2.ebuild:
+  Fixed freevoboot install, corrected some english.
 
 *freevo-1.5.4-r1 (19 Oct 2006)
 
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index 783af160a56d..996d50427007 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -19,14 +19,18 @@ EBUILD freevo-1.5.4-r1.ebuild 5387 RMD160 a7019b773c83e88e638f87f23a83a6c1952fe1
 MD5 5d2cbaa37e7766b10fe2d3ad95d436b8 freevo-1.5.4-r1.ebuild 5387
 RMD160 a7019b773c83e88e638f87f23a83a6c1952fe1b5 freevo-1.5.4-r1.ebuild 5387
 SHA256 2ab078cdaf31db3fcac25c329bb0c749e6290ccb71711f27fb9499fb4f568769 freevo-1.5.4-r1.ebuild 5387
+EBUILD freevo-1.5.4-r2.ebuild 5445 RMD160 38c9b933918780cd3b2ce581c914a4ff85dedc24 SHA1 e994955a5102b529ca47c597e09787386d031dc9 SHA256 8c76a64a7daab4408f9e8ebd23b93d7033c5f40fb0d3ae943b1ea63f028c6e08
+MD5 ea6cc0ef72bb3a7fb46f0672c39262af freevo-1.5.4-r2.ebuild 5445
+RMD160 38c9b933918780cd3b2ce581c914a4ff85dedc24 freevo-1.5.4-r2.ebuild 5445
+SHA256 8c76a64a7daab4408f9e8ebd23b93d7033c5f40fb0d3ae943b1ea63f028c6e08 freevo-1.5.4-r2.ebuild 5445
 EBUILD freevo-1.5.4.ebuild 2953 RMD160 5276bf2dea721078a4241e61364f389970e540d7 SHA1 33ac23f777211b8e4defe28abb45e334819b753e SHA256 403afb1fb5cd395d5b3dd478e196797a081ec3256915747eace901eceae1c955
 MD5 3daec6ca1d40ae4e131525a3da76e888 freevo-1.5.4.ebuild 2953
 RMD160 5276bf2dea721078a4241e61364f389970e540d7 freevo-1.5.4.ebuild 2953
 SHA256 403afb1fb5cd395d5b3dd478e196797a081ec3256915747eace901eceae1c955 freevo-1.5.4.ebuild 2953
-MISC ChangeLog 5947 RMD160 899e78dd0eefc73cdd18322d729d08f744c787f8 SHA1 2b030bf53f6cccdcd17407dcd6172c181c8ec63c SHA256 5e36ea74a665394ca460f61b8081d4dc79f0b2c204bb4e72c3e9860b5f7b1682
-MD5 8890d7c0103a11e79bbb2e1d4dd13e95 ChangeLog 5947
-RMD160 899e78dd0eefc73cdd18322d729d08f744c787f8 ChangeLog 5947
-SHA256 5e36ea74a665394ca460f61b8081d4dc79f0b2c204bb4e72c3e9860b5f7b1682 ChangeLog 5947
+MISC ChangeLog 6108 RMD160 0628c9af9e1b4cd805b71df7f6fa4be73468077f SHA1 af042546780d2cd5c8976f991aa1447131e99119 SHA256 06308db1c199284eb2efc03f6a0c4847aa6f71a625765901bf77a69b8b944fde
+MD5 b979d10959bae7296e31f875331e79ba ChangeLog 6108
+RMD160 0628c9af9e1b4cd805b71df7f6fa4be73468077f ChangeLog 6108
+SHA256 06308db1c199284eb2efc03f6a0c4847aa6f71a625765901bf77a69b8b944fde ChangeLog 6108
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 metadata.xml 161
@@ -37,3 +41,6 @@ SHA256 fffc92b576365886ae6b20c7f3c8a720461e55563ad628c05c16121f3db54a97 files/di
 MD5 184c875557413ec1c5bc7072ae220c39 files/digest-freevo-1.5.4-r1 241
 RMD160 61eb8204602ac4fd0bb46cc27fb1c72cee1fa47a files/digest-freevo-1.5.4-r1 241
 SHA256 fffc92b576365886ae6b20c7f3c8a720461e55563ad628c05c16121f3db54a97 files/digest-freevo-1.5.4-r1 241
+MD5 184c875557413ec1c5bc7072ae220c39 files/digest-freevo-1.5.4-r2 241
+RMD160 61eb8204602ac4fd0bb46cc27fb1c72cee1fa47a files/digest-freevo-1.5.4-r2 241
+SHA256 fffc92b576365886ae6b20c7f3c8a720461e55563ad628c05c16121f3db54a97 files/digest-freevo-1.5.4-r2 241
diff --git a/media-tv/freevo/files/digest-freevo-1.5.4-r2 b/media-tv/freevo/files/digest-freevo-1.5.4-r2
new file mode 100644
index 000000000000..00efc312fb28
--- /dev/null
+++ b/media-tv/freevo/files/digest-freevo-1.5.4-r2
@@ -0,0 +1,3 @@
+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/freevo-1.5.4-r2.ebuild b/media-tv/freevo/freevo-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..d40df7c28675
--- /dev/null
+++ b/media-tv/freevo/freevo-1.5.4-r2.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2006 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.1 2006/10/24 18:38:21 mattepiu 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="nomirror"
+
+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
+	>=sys-apps/sed-4
+	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 )"
+
+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
+	insinto /etc/conf.d
+	newins "${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() {
+	einfo "If you want to schedule programs, emerge xmltv now."
+	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
+
+	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
+	echo
+	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."
+	echo
+	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."
+		echo
+		ewarn "Should you decide to personalize your freevo.desktop"
+		ewarn "session, keep inside /usr/bin/freevoboot startx (wrapper)."
+		echo
+	else
+		ewarn "Freevo initscript is changed and should not be run as root"
+		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 limited privileges user"
+		ewarn "a tutorial for getty is at:"
+		ewarn "http://ubuntuforums.org/showthread.php?t=152274"
+		echo
+		ewarn "Sorry for the disadvantage, this is done for bug #150568."
+		echo
+	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"
+}