7 files changed, 152 insertions, 28 deletions
diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index 88209b66dad1..cae5587ee531 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-tv/freevo
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.28 2005/04/15 15:55:15 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.29 2006/02/25 18:08:57 vanquirius Exp $
+
+*freevo-1.5.4 (25 Feb 2006)
+
+  25 Feb 2006; Marcelo Goes <vanquirius@gentoo.org> freevo-1.5.1.ebuild,
+  freevo-1.5.2.ebuild, freevo-1.5.3.ebuild, +freevo-1.5.4.ebuild:
+  1.5.4 version bump for bug 109594. Thanks to Christoph Gysin <cgysin at gmx
+  dot ch>, Matteo Azzali <matte.az at libero dot it> and others. Removing
+  virtual/x11 from dependencies for modular X compatibility. freevo's
+  dependencies should pull in needed components.
 
   15 Apr 2005; David Holm <dholm@gentoo.org> freevo-1.5.3.ebuild:
   What happened to the ~ppc keyword?!
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index 55bfab4369cc..086be56fccde 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -1,21 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6a7865952cccddf09a31c2ee7b4cc6da ChangeLog 4274
+MD5 fa3ed359c73015d1b9f2d3b094a82d1e ChangeLog 4719
+RMD160 ce5b3d806a85e9dbe7dc9f7f2973fc3f858b89ad ChangeLog 4719
+SHA256 1632ab9bf4010fe4f0e06431f92bc08f4e2aced58bb347e42dd9a8fc20abf9dc ChangeLog 4719
 MD5 20137be2595c8c7411bc0082bab68834 files/digest-freevo-1.5.1 65
+RMD160 ef8cb569117a0dc7c7f2426497ba8762b2d0421b files/digest-freevo-1.5.1 65
+SHA256 ae4dfb1d8c27ffcc48a0dccdef0c504e5b632695da1a2a0656d4a7126e07efa5 files/digest-freevo-1.5.1 65
 MD5 84e85cacf67d54ca5f607eaed7b728fc files/digest-freevo-1.5.2 65
+RMD160 f447ac71b7afc6ee777cdaabfc3390ea22f6948c files/digest-freevo-1.5.2 65
+SHA256 28c24226221cd6ef3180e3c38fc1df3968d0414700fd4bfe176f1ba7f5a8e567 files/digest-freevo-1.5.2 65
 MD5 265aeae68ac52ecefc9c67c8ee66dd9a files/digest-freevo-1.5.3 65
+RMD160 d40617d74869b9eb0a886a6762ba84cfc0f63daa files/digest-freevo-1.5.3 65
+SHA256 0433c5bea0be1cb0b0ab237a18ccb433ac85c63658d2846781e863832304f3dc files/digest-freevo-1.5.3 65
+MD5 184c875557413ec1c5bc7072ae220c39 files/digest-freevo-1.5.4 241
+RMD160 61eb8204602ac4fd0bb46cc27fb1c72cee1fa47a files/digest-freevo-1.5.4 241
+SHA256 fffc92b576365886ae6b20c7f3c8a720461e55563ad628c05c16121f3db54a97 files/digest-freevo-1.5.4 241
 MD5 059b24952b8a2cc20aca4572f32a6630 files/freevo.conf 1265
+RMD160 3a64dbd4f6978ff77780c2cfb663e4937e0f84e3 files/freevo.conf 1265
+SHA256 c74b609e3b1177cbbbd3ca507e65b5392eed18fcd488e327c63478664fbd6143 files/freevo.conf 1265
 MD5 b4b9c96e219591f94f781cbb7e023333 files/freevo.rc6 1709
+RMD160 490c9e87bf32c6becdba09c91d8370906df9c873 files/freevo.rc6 1709
+SHA256 5c660c29e212d1828b8596047c962622627c7733bee9faf77d829eb502b28341 files/freevo.rc6 1709
 MD5 bac3c1bd1a66937edf2ce722b769b0af files/xbox-lircrc 1690
-MD5 1ef09a4ee788bec2daf1f196e1cc469e freevo-1.5.1.ebuild 2942
-MD5 e4d0be4338043bdd8bf8b14931568eb5 freevo-1.5.2.ebuild 2942
-MD5 415882f992c0aad6e03d18cf3e79f7a7 freevo-1.5.3.ebuild 2948
+RMD160 8472024be1e467c69346ce0ea87033d76f389a2e files/xbox-lircrc 1690
+SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187098ae1dd1070 files/xbox-lircrc 1690
+MD5 4e8978fa3013b4b75e1784863f421969 freevo-1.5.1.ebuild 2924
+RMD160 48f68c7e1a835285938cde4246e40bf5e76dbf3f freevo-1.5.1.ebuild 2924
+SHA256 b4a7909e5b439926b081975a07725a3bb9e7c65b264d270fcb34124171b65fdd freevo-1.5.1.ebuild 2924
+MD5 83bccff5332b447a68e68cab31e089f1 freevo-1.5.2.ebuild 2924
+RMD160 a6cc22684c7fdfc680c4ad9bc7cae29eec8609a7 freevo-1.5.2.ebuild 2924
+SHA256 1e663db89fd8997fe5d05dc946ae8bfb1a704c5ce496234ff88e26dd9a6eeb58 freevo-1.5.2.ebuild 2924
+MD5 e61168994a422646d6d6e4393edf19e3 freevo-1.5.3.ebuild 2930
+RMD160 f613a9fcccdc9897450f4b30c12ac61ea9ea4839 freevo-1.5.3.ebuild 2930
+SHA256 1c931e16d45c17141474982719b0cb3e6a08e4b724c23a0814da133a1d53fc0a freevo-1.5.3.ebuild 2930
+MD5 0e630227a65b1e87485802ea28c229ff freevo-1.5.4.ebuild 2965
+RMD160 246f5f180b67ddb875a3260ad6ea22a3e17faac0 freevo-1.5.4.ebuild 2965
+SHA256 a3a4e2aed08b728bb7ca01d87b6643c49ea262e4f3b3cee72227e7d0cd8e2566 freevo-1.5.4.ebuild 2965
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0HiAI1lqEGTUzyQRAncMAKCNeBnAF5zKGl26dmgabPbcs4JyRQCgpQ7R
-3cXouT5+Hc8IMgBhBIKyKhc=
-=9WWF
------END PGP SIGNATURE-----
+RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 metadata.xml 161
+SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd metadata.xml 161
diff --git a/media-tv/freevo/files/digest-freevo-1.5.4 b/media-tv/freevo/files/digest-freevo-1.5.4
new file mode 100644
index 000000000000..00efc312fb28
--- /dev/null
+++ b/media-tv/freevo/files/digest-freevo-1.5.4
@@ -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.1.ebuild b/media-tv/freevo/freevo-1.5.1.ebuild
index 006dfcf0146a..4fbf8b12673e 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-2005 Gentoo Foundation
+# 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.1.ebuild,v 1.4 2005/07/10 01:22:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.1.ebuild,v 1.5 2006/02/25 18:08:57 vanquirius Exp $
 
 inherit distutils
 
@@ -26,8 +26,7 @@ DEPEND=">=dev-python/pygame-1.5.6
 	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 )"
+	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
 
 src_install() {
 	distutils_src_install
diff --git a/media-tv/freevo/freevo-1.5.2.ebuild b/media-tv/freevo/freevo-1.5.2.ebuild
index 23009e55faad..16df6d0c6966 100644
--- a/media-tv/freevo/freevo-1.5.2.ebuild
+++ b/media-tv/freevo/freevo-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.2.ebuild,v 1.4 2005/07/10 01:22:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.2.ebuild,v 1.5 2006/02/25 18:08:57 vanquirius Exp $
 
 inherit distutils
 
@@ -26,8 +26,7 @@ DEPEND=">=dev-python/pygame-1.5.6
 	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 )"
+	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
 
 src_install() {
 	distutils_src_install
diff --git a/media-tv/freevo/freevo-1.5.3.ebuild b/media-tv/freevo/freevo-1.5.3.ebuild
index cef64f0fe567..71f47dc9ee65 100644
--- a/media-tv/freevo/freevo-1.5.3.ebuild
+++ b/media-tv/freevo/freevo-1.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.3.ebuild,v 1.3 2005/07/10 01:22:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.5.3.ebuild,v 1.4 2006/02/25 18:08:57 vanquirius Exp $
 
 inherit distutils
 
@@ -26,8 +26,7 @@ DEPEND=">=dev-python/pygame-1.5.6
 	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 )"
+	lirc? ( app-misc/lirc >=dev-python/pylirc-0.0.3 )"
 
 src_install() {
 	distutils_src_install
diff --git a/media-tv/freevo/freevo-1.5.4.ebuild b/media-tv/freevo/freevo-1.5.4.ebuild
new file mode 100644
index 000000000000..c4146d353a39
--- /dev/null
+++ b/media-tv/freevo/freevo-1.5.4.ebuild
@@ -0,0 +1,97 @@
+# 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.ebuild,v 1.1 2006/02/25 18:08:57 vanquirius 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 ~ppc"
+
+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/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_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"
+}