Bump to version 1.4_rc2. At the request of developers, remove the old version.

11 files changed, 213 insertions, 185 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index de6516752f19..99f210036d79 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/freevo
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.3 2003/09/24 18:34:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.4 2003/11/03 17:24:58 max Exp $
+
+*freevo-1.4_rc2 (03 Nov 2003)
+
+  03 Nov 2003; Max Kalika <max@gentoo.org> freevo-1.3.4.ebuild,
+  freevo-1.4_rc2.ebuild, files/freevo-record.rc6, files/freevo-setup.patch,
+  files/freevo-web.rc6, files/freevo.conf, files/freevo.rc6:
+  Bump to version 1.4_rc2. At the request of developers, remove the old version.
 
   25 Sep 2003; Martin Holzer <mholzer@gentoo.org> files/freevo-web.rc6:
   fixed pid.
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index a07adbd89a8f..4841ee58bf58 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -1,8 +1,6 @@
-MD5 caf0d8f743a368e8f170bdaa5586b534 ChangeLog 621
-MD5 c6970faa8d03f5e555af85051d7b8b71 freevo-1.3.4.ebuild 2485
+MD5 e66e89bedf638af8f22add5ae47c075b freevo-1.4_rc2.ebuild 2858
+MD5 ee11518b9f5c302fae9a01dcc95ee641 ChangeLog 931
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 a91ed039c66549b1437fd99e8cb99636 files/digest-freevo-1.3.4 66
-MD5 8a81bdd96ceab6db0d16dd3cc9d79f27 files/freevo-record.rc6 667
-MD5 de65719260908aee1422a8dbbffcb1c9 files/freevo-setup.patch 838
-MD5 bde1bbfe45c3d6747ba04d6e9e9f03e8 files/freevo-web.rc6 652
-MD5 707e75bca17292c9760d6c8492a40d60 files/freevo.rc6 685
+MD5 ecbc21c21e5996efe8c072cf10bc52c3 files/digest-freevo-1.4_rc2 66
+MD5 936115d5e7580fee8e59a4a422098881 files/freevo.rc6 1726
+MD5 e816499a4e6301448aaee6fc477fa85c files/freevo.conf 1153
diff --git a/media-tv/freevo/files/digest-freevo-1.3.4 b/media-tv/freevo/files/digest-freevo-1.3.4
deleted file mode 100644
index 2d24a6d4b8bd..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.3.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a6f9a33cb6fd09b02869043de5168c3 freevo-src-1.3.4.tgz 2512311
diff --git a/media-tv/freevo/files/digest-freevo-1.4_rc2 b/media-tv/freevo/files/digest-freevo-1.4_rc2
new file mode 100644
index 000000000000..3167002c2adc
--- /dev/null
+++ b/media-tv/freevo/files/digest-freevo-1.4_rc2
@@ -0,0 +1 @@
+MD5 2392ef11679d4996266507ea0622309a freevo-1.4rc2.tar.gz 2956388
diff --git a/media-tv/freevo/files/freevo-record.rc6 b/media-tv/freevo/files/freevo-record.rc6
deleted file mode 100644
index 2c0142796969..000000000000
--- a/media-tv/freevo/files/freevo-record.rc6
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/files/freevo-record.rc6,v 1.1 2003/09/10 18:57:14 max Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Freevo record server"
-	start-stop-daemon --start --quiet --background --make-pidfile \
-		--pidfile /var/run/freevo_record.pid --exec /opt/freevo/freevo \
-		-- execute /opt/freevo/src/tv/record_server.py &>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Freevo record server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/freevo_record.pid
-	eend $?
-}
-
diff --git a/media-tv/freevo/files/freevo-setup.patch b/media-tv/freevo/files/freevo-setup.patch
deleted file mode 100644
index e6898d937529..000000000000
--- a/media-tv/freevo/files/freevo-setup.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-*** freevo	Sun Aug  3 11:56:14 2003
---- ../gentoo-freevo/freevo	Sun Aug  3 16:05:57 2003
-***************
-*** 69,74 ****
---- 69,75 ----
-  if [ "$1" = "setup" ] ; then
-      shift 1
-      ./runapp python src/setup_freevo.py $@
-+     mv freevo.conf /etc/freevo
-      exit 0
-  fi
-  
-*** src/setup_freevo.py	Sun Aug  3 11:56:15 2003
---- ../gentoo-freevo/src/setup_freevo.py	Sun Aug  3 16:06:22 2003
-***************
-*** 276,288 ****
-      # Build everything
-      create_config(conf)
-  
--     print
--     print 'Now you can type "freevo" to run freevo if you have the full '
--     print 'binary release.'
--     print
--     print 'Please read the manual on how to build the CVS/src Freevo version.'
--     print
--     print 'Do "make install" as root to install the binaries in /usr/local/freevo'
--     print
-- 
-      sys.exit()
---- 276,279 ----
diff --git a/media-tv/freevo/files/freevo-web.rc6 b/media-tv/freevo/files/freevo-web.rc6
deleted file mode 100644
index d76735bb54c6..000000000000
--- a/media-tv/freevo/files/freevo-web.rc6
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/files/freevo-web.rc6,v 1.2 2003/09/24 18:34:03 mholzer Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Freevo web server"
-	start-stop-daemon --start --quiet --background --make-pidfile \
-		--pidfile /var/run/freevo_web.pid --exec /opt/freevo/freevo \
-		-- execute /opt/freevo/src/www/webserver.py &>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Freevo web server"
-	start-stop-daemon --stop --quiet --pidfile /var/run/freevo_web.pid
-	eend $?
-}
diff --git a/media-tv/freevo/files/freevo.conf b/media-tv/freevo/files/freevo.conf
new file mode 100644
index 000000000000..c52a1ae99ba4
--- /dev/null
+++ b/media-tv/freevo/files/freevo.conf
@@ -0,0 +1,31 @@
+# /etc/conf.d/freevo: configuration options for the freevo init script.
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/files/freevo.conf,v 1.1 2003/11/03 17:24:58 max Exp $
+#
+# Before using this, make sure your settings in /etc/freevo are correct.
+
+
+# Mode to start Freevo itself. Possible values are
+#
+# no:     don't start Freevo
+# yes:    start Freevo on startup. You should only use this when the
+#         computer is for Freevo only or you use Freevo with a DXR3
+# daemon: start Freevo in daemon mode. The daemon will wait for you to
+#         press QUIT or POWER on your remote and will than start
+#         Freevo. After Freevo shut down, the daemon will wait again.
+#
+# You don't need a X server running to start Freevo from init. If
+# needed, Freevo will start a X server on its own. Make sure your X
+# server can handle the resolution defined in /etc/freevo/freevo.conf
+
+freevo="no"
+
+
+# Mode the start the webserver. Possible values are "no" and "yes".
+# If you start the webserver with Freevo itself, you should say "no" here.
+
+webserver="no"
+
+
+# Mode the start the recordserver. Possible values are "no" and "yes". 
+
+recordserver="no"
diff --git a/media-tv/freevo/files/freevo.rc6 b/media-tv/freevo/files/freevo.rc6
index c3d574d83618..55c9179bb4d0 100644
--- a/media-tv/freevo/files/freevo.rc6
+++ b/media-tv/freevo/files/freevo.rc6
@@ -1,27 +1,76 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/files/freevo.rc6,v 1.1 2003/09/10 18:57:14 max Exp $
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/files/freevo.rc6,v 1.2 2003/11/03 17:24:58 max Exp $
 
 depend() {
-	use lircd
+	need net
+	need xfs
+	need lircd
+}
+
+checkconfig() {
+	if [ -z "${freevo}" -o "${freevo}" = "no" ] && \
+		[ -z "${webserver}" -o "${webserver}" = "no" ] && \
+		[ -z "${recordserver}" -o "${recordserver}" = "no" ] ; then
+		eerror "All services are disabled."
+		eerror "Please check /etc/conf.d/freevo"
+		return 1
+	fi
+
+	sysctl -w dev.rtc.max-user-freq=1024 &> /dev/null
 }
 
 start() {
-	export DISPLAY=""
-	ebegin "Setting max-user-freq"
-	sysctl -w dev.rtc.max-user-freq=1024 &>/dev/null
-	eend $?
-
-	ebegin "Starting Freevo"
-	start-stop-server --start --quiet --background --make-pidfile \
-		--pidfile /var/run/freevo.pid --exec /opt/freevo/freevo \
-		-- &>/dev/null
-	eend $?
+	checkconfig || return 1
+
+	if [ "${freevo}" == "daemon" ] ; then
+		ebegin "Starting Freevo daemon"
+		/usr/bin/freevo daemon start
+		eend $?
+	elif [ "${freevo}" == "yes" ]; then
+		ebegin "Starting Freevo"
+		if egrep -q '^display.*(x11|dga)' /etc/freevo/freevo.conf ; then
+			/usr/bin/freevo -fs & &>/dev/null
+		else
+			/usr/bin/freevo start
+		fi
+		eend $?
+	fi
+
+	if [ "${recordserver}" == "yes" ]; then
+		ebegin "Starting Freevo recordserver"
+		/usr/bin/freevo recordserver start
+		eend $?
+	fi
+
+	if [ "${webserver}" == "yes" ]; then
+		ebegin "Starting Freevo webserver"
+		/usr/bin/freevo webserver start
+		eend $?
+	fi
 }
 
 stop() {
-	ebegin "Stopping Freevo"
-	start-stop-server --stop --quiet --pidfile /var/run/freevo.pid
-	eend $?
+	if [ "${webserver}" == "yes" ]; then
+		ebegin "Stopping Freevo webserver"
+		/usr/bin/freevo webserver stop
+		eend $?
+	fi
+
+	if [ "${recordserver}" == "yes" ]; then
+		ebegin "Stopping Freevo recordserver"
+		/usr/bin/freevo recordserver stop
+		eend $?
+	fi
+
+	if [ "${freevo}" == "daemon" ]; then
+		ebegin "Stopping Freevo daemon"
+		/usr/bin/freevo daemon stop
+		eend $?
+	elif [ "${freevo}" == "yes" ]; then
+		ebegin "Stopping Freevo"
+		/usr/bin/freevo stop
+		eend $?
+	fi
 }
diff --git a/media-tv/freevo/freevo-1.3.4.ebuild b/media-tv/freevo/freevo-1.3.4.ebuild
deleted file mode 100644
index 0ecf557309ac..000000000000
--- a/media-tv/freevo/freevo-1.3.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.3.4.ebuild,v 1.2 2003/09/22 18:23:37 max Exp $
-
-DESCRIPTION="Digital video jukebox (PVR, DVR)."
-HOMEPAGE="http://www.freevo.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="matrox dvd encode lirc X"
-
-DEPEND=">=dev-python/pygame-1.5.5
-	>=dev-python/Imaging-1.1.3
-	>=dev-python/pyxml-0.8.1
-	>=dev-python/twisted-1.0.6
-	>=dev-python/mmpython-0.1
-	>=media-video/mplayer-0.90
-	>=media-libs/freetype-2.1.4
-	>=media-libs/libsdl-1.2.5
-	>=media-tv/xmltv-0.5.16
-	>=sys-apps/sed-4
-	dvd? ( >=media-video/xine-ui-0.9.22 )
-	encode? ( >=media-sound/cdparanoia-3.9.8 >=media-sound/lame-3.93.1 )
-	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )
-	X? ( virtual/x11 )"
-
-src_compile() {
-	local myconf
-
-	if [ "`/bin/ls -l /etc/localtime | grep Europe`" ] ; then
-		myconf="$myconf --tv=pal"
-	fi
-	if [ "`use matrox`" ] ; then
-		myconf="--geometry=768x576 --display=mga"
-	else
-		myconf="--geometry=800x600 --display=sdl"
-	fi
-	if [ ! "`use X`" ] ; then
-		sed -e 's:\(all.*\)freevo_xwin:\1:' -i Makefile
-	fi
-
-	emake || die "compile problem"
-	./freevo setup ${myconf} || die "configure problem"
-}
-
-src_install() {
-	epatch "${FILESDIR}/freevo-setup.patch"
-	einstall PREFIX="${D}/opt/freevo" \
-		LOGDIR="${D}/var/log/freevo" \
-		CACHEDIR="${D}/var/cache/freevo"
-
-	insinto /etc/freevo
-	doins freevo.conf local_conf.py
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/freevo-record.rc6" freevo-record
-	newexe "${FILESDIR}/freevo-web.rc6" freevo-web
-	if [ "`use matrox`" ] ; then
-		newexe "${FILESDIR}/freevo.rc6" freevo
-	fi
-
-	dohtml Docs/html/*
-	dodoc BUGS COPYING ChangeLog FAQ INSTALL README TODO VERSION Docs/{CREDITS,NOTES}
-	cp -r Docs/freevo_howto "${D}/usr/share/doc/${PF}/howto"
-
-	cd "${D}/opt/freevo"
-	rm -rf BUGS COPYING ChangeLog FAQ INSTALL README TODO VERSION Docs \
-		configure setup_build.py runtime freevo.conf local_conf.py \
-		*.c *.h Makefile fbcon/Makefile fbcon/vtrelease.c \
-		contrib boot WIP freevo_setup~ freevo~
-}
-
-pkg_postinst() {
-	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 /opt/freevo/freevo setup"
-	echo
-
-	if [ -e /etc/freevo/freevo_config.py ] ; then
-		ewarn "Please remove /etc/freevo/freevo_config.py"
-	fi
-}
diff --git a/media-tv/freevo/freevo-1.4_rc2.ebuild b/media-tv/freevo/freevo-1.4_rc2.ebuild
new file mode 100644
index 000000000000..7aa876bafba6
--- /dev/null
+++ b/media-tv/freevo/freevo-1.4_rc2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.4_rc2.ebuild,v 1.1 2003/11/03 17:24:58 max Exp $
+
+DESCRIPTION="Digital video jukebox (PVR, DVR)."
+HOMEPAGE="http://www.freevo.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P/_/}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="matrox dvd encode lirc X"
+
+DEPEND=">=dev-python/pygame-1.5.6
+	>=dev-python/Imaging-1.1.3
+	>=dev-python/pyxml-0.8.2
+	>=dev-python/twisted-1.0.7
+	>=dev-python/mmpython-0.3
+	>=media-video/mplayer-0.92
+	>=media-libs/freetype-2.1.4
+	>=media-libs/libsdl-1.2.5
+	>=media-tv/xmltv-0.5.19
+	>=sys-apps/sed-4
+	dvd? ( >=media-video/xine-ui-0.9.22 )
+	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 )
+	X? ( virtual/x11 )"
+
+S="${WORKDIR}/${P/_/}"
+
+inherit distutils
+
+src_compile() {
+	local myconf
+
+	if [ "`/bin/ls -l /etc/localtime | grep Europe`" ] ; then
+		myconf="$myconf --tv=pal"
+	fi
+	if [ "`use matrox`" ] ; then
+		myconf="--geometry=768x576 --display=mga"
+	elif [ "`use X`" ] ; then
+		myconf="--geometry=800x600 --display=x11"
+	else
+		myconf="--geometry=800x600 --display=fbdev"
+	fi
+
+	sed -e "s:/etc/freevo/freevo.conf:${T}/freevo.conf:" \
+		-i "${S}/src/setup_freevo.py" || die "sed failed"
+
+	"${S}/freevo" setup ${myconf} || die "configure problem"
+
+	sed -e "s:${T}/freevo.conf:/etc/freevo/freevo.conf:" \
+		-i "${S}/src/setup_freevo.py" || die "sed failed"
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /etc/freevo
+	doins "${T}/freevo.conf"
+	newins local_conf.py.example local_conf.py
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/freevo.rc6" freevo
+	insinto /etc/conf.d
+	newins "${FILESDIR}/freevo.conf" freevo
+
+	if [ ! "`use lirc`" ] ; then
+		dosed '/need lirc/d' /etc/init.d/freevo
+	fi
+	if [ ! "`use X`" ] ; then
+		dosed '/need xfs/d' /etc/init.d/freevo
+	fi
+
+	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}"
+}
+
+pkg_postinst() {
+	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 "/opt/freevo" ] ; then
+		ewarn "Please remove /opt/freevo because it is no longer used."
+	fi
+	if [ -e "/etc/freevo/freevo_config.py" ] ; then
+		ewarn "Please remove /etc/freevo/freevo_config.py."
+	fi
+	if [ -e "/etc/init.d/freevo-record" ] ; then
+		ewarn "Please remove /etc/init.d/freevo-record"
+	fi
+	if [ -e "/etc/init.d/freevo-web" ] ; then
+		ewarn "Please remove /etc/init.d/freevo-web"
+	fi
+}