Remove the dosed calls to tweak the startup script. Change the startup script from need to use. Remove xmltv as a dependency. Remove old _rc versions.

8 files changed, 16 insertions, 232 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index 37d63521b241..bafbed1bb058 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2003/11/16 22:17:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.9 2003/11/17 03:32:28 max Exp $
+
+  16 Nov 2003; <max@gentoo.org> freevo-1.4_rc2.ebuild, freevo-1.4_rc3.ebuild,
+  freevo-1.4_rc4.ebuild, files/freevo.rc6:
+  Remove the dosed calls to tweak the startup script. Change the startup script
+  from need to use. Remove xmltv as a dependency. Remove old _rc versions.
 
   16 Nov 2003; Martin Holzer <mholzer@gentoo.org> freevo-1.4_rc2.ebuild,
   freevo-1.4_rc3.ebuild, freevo-1.4_rc4.ebuild:
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index c20c29a7291e..371130d20d28 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -1,10 +1,6 @@
-MD5 313cdf4b5f20b96adef3d4b96043c683 ChangeLog 1403
+MD5 4a5084fabf278b3c99b90cf3f24e88b3 freevo-1.4_rc4.ebuild 2772
+MD5 1b66228fd60ee0c89d99e522052548b2 ChangeLog 1676
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
-MD5 24174e66f944083fa2196ce5a38b7c09 freevo-1.4_rc2.ebuild 2882
-MD5 ba26f0d76df435149438c5b6c03c9c2e freevo-1.4_rc3.ebuild 2882
-MD5 8ef5d32bed0b451975d2e231c6c31c0c freevo-1.4_rc4.ebuild 2882
-MD5 e816499a4e6301448aaee6fc477fa85c files/freevo.conf 1153
 MD5 1bed1849bd8bb80b291b9f1162eff1c1 files/digest-freevo-1.4_rc4 66
-MD5 ba03c01b9a94db915f139db8664819fb files/freevo.rc6 1726
-MD5 ecbc21c21e5996efe8c072cf10bc52c3 files/digest-freevo-1.4_rc2 66
-MD5 4ffbe50bf90800159dd6cf4c2ccc6d43 files/digest-freevo-1.4_rc3 66
+MD5 63ab1e125dd03c6206722d50678551eb files/freevo.rc6 1713
+MD5 e816499a4e6301448aaee6fc477fa85c files/freevo.conf 1153
diff --git a/media-tv/freevo/files/digest-freevo-1.4_rc2 b/media-tv/freevo/files/digest-freevo-1.4_rc2
deleted file mode 100644
index 3167002c2adc..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.4_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2392ef11679d4996266507ea0622309a freevo-1.4rc2.tar.gz 2956388
diff --git a/media-tv/freevo/files/digest-freevo-1.4_rc3 b/media-tv/freevo/files/digest-freevo-1.4_rc3
deleted file mode 100644
index bf21759eaec0..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.4_rc3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8a637ed9e9d8eabb147f9e2ba5cf72a freevo-1.4rc3.tar.gz 2956744
diff --git a/media-tv/freevo/files/freevo.rc6 b/media-tv/freevo/files/freevo.rc6
index 8a3d22622243..820534734b89 100644
--- a/media-tv/freevo/files/freevo.rc6
+++ b/media-tv/freevo/files/freevo.rc6
@@ -1,12 +1,10 @@
 #!/sbin/runscript
 # 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/files/freevo.rc6,v 1.3 2003/11/11 18:00:00 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/files/freevo.rc6,v 1.4 2003/11/17 03:32:28 max Exp $
 
 depend() {
-	need net
-	need xfs
-	need lircd
+	use net xfs lircd
 }
 
 checkconfig() {
diff --git a/media-tv/freevo/freevo-1.4_rc2.ebuild b/media-tv/freevo/freevo-1.4_rc2.ebuild
deleted file mode 100644
index 0a94e751ff09..000000000000
--- a/media-tv/freevo/freevo-1.4_rc2.ebuild
+++ /dev/null
@@ -1,104 +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.4_rc2.ebuild,v 1.3 2003/11/16 22:17:01 mholzer Exp $
-
-inherit distutils
-
-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="~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/_/}"
-
-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
-}
diff --git a/media-tv/freevo/freevo-1.4_rc3.ebuild b/media-tv/freevo/freevo-1.4_rc3.ebuild
deleted file mode 100644
index d5fe1ac421a4..000000000000
--- a/media-tv/freevo/freevo-1.4_rc3.ebuild
+++ /dev/null
@@ -1,104 +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.4_rc3.ebuild,v 1.3 2003/11/16 22:17:01 mholzer Exp $
-
-inherit distutils
-
-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="~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/_/}"
-
-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
-}
diff --git a/media-tv/freevo/freevo-1.4_rc4.ebuild b/media-tv/freevo/freevo-1.4_rc4.ebuild
index 7e964a29e283..a2ba7d98055f 100644
--- a/media-tv/freevo/freevo-1.4_rc4.ebuild
+++ b/media-tv/freevo/freevo-1.4_rc4.ebuild
@@ -1,6 +1,6 @@
 # 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_rc4.ebuild,v 1.2 2003/11/16 22:17:01 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.4_rc4.ebuild,v 1.3 2003/11/17 03:32:28 max Exp $
 
 inherit distutils
 
@@ -22,7 +22,6 @@ DEPEND=">=dev-python/pygame-1.5.6
 	>=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 )
@@ -67,13 +66,6 @@ src_install() {
 	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 \
@@ -82,6 +74,9 @@ src_install() {
 }
 
 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,"