a little cleanup, and mark 1.5.1 x86

10 files changed, 9 insertions, 406 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index 2152ddfb7bb2..8053a72d2e8d 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/freevo
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.23 2004/10/31 16:16:40 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.24 2004/10/31 17:01:30 iggy Exp $
+
+*freevo-1.5.1 (31 Oct 2004)
+
+  31 Oct 2004; <iggy@gentoo.org> -freevo-1.4.1.ebuild, -freevo-1.4.ebuild,
+  -freevo-1.5.0-r1.ebuild, -freevo-1.5.0.ebuild, freevo-1.5.1.ebuild:
+  a little cleanup, and mark 1.5.1 x86
 
 *freevo-1.5.2 (31 Oct 2004)
 
diff --git a/media-tv/freevo/files/digest-freevo-1.4 b/media-tv/freevo/files/digest-freevo-1.4
deleted file mode 100644
index 42e33b8b7e91..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6ddf389132fffce8627a394a13e80a3 freevo-1.4.tar.gz 2973059
diff --git a/media-tv/freevo/files/digest-freevo-1.4.1 b/media-tv/freevo/files/digest-freevo-1.4.1
deleted file mode 100644
index 1452ba6ce3d9..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c9c45fc0efc6fe39972f5324371792a4 freevo-1.4.1.tar.gz 3107468
diff --git a/media-tv/freevo/files/digest-freevo-1.5.0 b/media-tv/freevo/files/digest-freevo-1.5.0
deleted file mode 100644
index d7098acde89d..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ee13c4469aae34b54943acd4fe83fe9 freevo-1.5.0.tar.gz 4125468
diff --git a/media-tv/freevo/files/digest-freevo-1.5.0-r1 b/media-tv/freevo/files/digest-freevo-1.5.0-r1
deleted file mode 100644
index d7098acde89d..000000000000
--- a/media-tv/freevo/files/digest-freevo-1.5.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ee13c4469aae34b54943acd4fe83fe9 freevo-1.5.0.tar.gz 4125468
diff --git a/media-tv/freevo/freevo-1.4.1.ebuild b/media-tv/freevo/freevo-1.4.1.ebuild
deleted file mode 100644
index fadcc72600e7..000000000000
--- a/media-tv/freevo/freevo-1.4.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.4.1.ebuild,v 1.6 2004/07/19 21:58:24 kloeri 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="~x86 ~ppc"
-
-DEPEND="${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
-	>=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="${myconf} --geometry=768x576 --display=mga"
-	elif use X ; then
-		myconf="${myconf} --geometry=800x600 --display=x11"
-	else
-		myconf="${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
-
-	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}/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
-}
diff --git a/media-tv/freevo/freevo-1.4.ebuild b/media-tv/freevo/freevo-1.4.ebuild
deleted file mode 100644
index 2291a6543f4f..000000000000
--- a/media-tv/freevo/freevo-1.4.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.4.ebuild,v 1.7 2004/07/19 21:58:24 kloeri 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="~x86"
-
-DEPEND="${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
-	>=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="${myconf} --geometry=768x576 --display=mga"
-	elif use X ; then
-		myconf="${myconf} --geometry=800x600 --display=x11"
-	else
-		myconf="${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
-
-	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}/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
-}
diff --git a/media-tv/freevo/freevo-1.5.0-r1.ebuild b/media-tv/freevo/freevo-1.5.0-r1.ebuild
deleted file mode 100644
index 9d6f90fefb33..000000000000
--- a/media-tv/freevo/freevo-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.0-r1.ebuild,v 1.2 2004/09/11 15:15:21 aliz 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="~x86 ~amd64"
-
-DEPEND="${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.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 )
-	X? ( virtual/x11 )"
-
-S="${WORKDIR}/${P}"
-
-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
-
-	exeinto /etc/init.d
-	newexe "${FILESDIR}/freevo.rc6" freevo
-	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}/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.5.0.ebuild b/media-tv/freevo/freevo-1.5.0.ebuild
deleted file mode 100644
index b1904ea45211..000000000000
--- a/media-tv/freevo/freevo-1.5.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.0.ebuild,v 1.2 2004/08/19 09:56:42 mr_bones_ 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="~x86"
-
-DEPEND="${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.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 )
-	X? ( virtual/x11 )"
-
-S="${WORKDIR}/${P}"
-
-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
-
-	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}/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 Europe`" ] ; then
-		myconf="${myconf} --tv=pal"
-	fi
-	if 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.5.1.ebuild b/media-tv/freevo/freevo-1.5.1.ebuild
index 3a87ffa91fbb..656c0abf85e2 100644
--- a/media-tv/freevo/freevo-1.5.1.ebuild
+++ b/media-tv/freevo/freevo-1.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.1.ebuild,v 1.1 2004/09/11 17:49:08 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.1.ebuild,v 1.2 2004/10/31 17:01:30 iggy Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 DEPEND="${DEPEND}
 	>=dev-python/pygame-1.5.6