rev bump for SVN 9094. All the fixes since the release

(Portage version: 2.1_pre4-r1)

7 files changed, 251 insertions, 102 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 5accc575f18c..17f63e9cee74 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.86 2006/02/17 03:38:25 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.87 2006/02/22 20:03:02 cardoe Exp $
+
+*mythtv-0.19-r1 (22 Feb 2006)
+
+  22 Feb 2006; Doug Goldstein <cardoe@gentoo.org>
+  -files/mythtv-0.19_pre8554-chanutil-schar.patch,
+  -files/mythtv-0.19_pre8554-freetype.patch,
+  -files/mythtv-0.19_pre8554-xrandr.patch, +mythtv-0.19-r1.ebuild:
+  rev bump for SVN 9094. All the fixes since the release
 
   17 Feb 2006; Doug Goldstein <cardoe@gentoo.org> mythtv-0.19.ebuild:
   MythTV needs Qt with OpenGL support always.
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index f7d83f237c85..c22cce71fce7 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a8da3085ab9f5130c9ed089e31ad8a7a ChangeLog 15801
-RMD160 ecb8b974c0e88aaddaffcca3b6bccd4c21bb2196 ChangeLog 15801
-SHA256 c33e79d59543b7445666134a42701184f5d3c454bd4a6bc20f49c43edcd5bf94 ChangeLog 15801
+MD5 6166c540996ac7cf3d7a36afad503db9 ChangeLog 16103
+RMD160 24094344df5ee7203e14c6bcb229248c9180c4cd ChangeLog 16103
+SHA256 2c65dd396f4fee562b83e58368a8d0906db2a9bf8d1f7f3724dea39d5dbdd641 ChangeLog 16103
 MD5 4985a61b90909b7f1c926f79a3ba34bf files/0.18-mythbackend.conf 931
 RMD160 626d1a051ad5d9d724e1450e0bd0da21c57fe2d2 files/0.18-mythbackend.conf 931
 SHA256 ecb82a5de903a63df0c5821ace68a845cf49faa90d754fead240542980e95b2f files/0.18-mythbackend.conf 931
@@ -19,6 +16,9 @@ SHA256 c16789e34d2e5c3d5b0162a87a9bf758145aa3bfaaeb55e05438e4a30a235bb9 files/di
 MD5 469774c8a2aebf913ddd8388e7945f7d files/digest-mythtv-0.19 244
 RMD160 df9a35cde9765eb16364c65f7ec6d316d107f380 files/digest-mythtv-0.19 244
 SHA256 0dfe196cf023e37679f736fec817dad08e4bd7b235e88c7ad573b05e849a5d0d files/digest-mythtv-0.19 244
+MD5 303b4a5328ff542c6549fb38c0079773 files/digest-mythtv-0.19-r1 515
+RMD160 a4ebb7c455ca79633b657211309500374150f607 files/digest-mythtv-0.19-r1 515
+SHA256 0a59555e59531490be10397769f5e116eaba0921c17b92574827a55d05c7d86f files/digest-mythtv-0.19-r1 515
 MD5 95c29c3a4ebd800a939425c30ba9f362 files/digest-mythtv-0.19_pre8642 74
 RMD160 386fa70567278ba2611d323ad44f03e49f513285 files/digest-mythtv-0.19_pre8642 74
 SHA256 87953c4b915d313efbdc6fc21d5c2f5ce9d9ce9d9d6fd08d986d3754a7d99112 files/digest-mythtv-0.19_pre8642 74
@@ -43,15 +43,6 @@ SHA256 ef3d468144e216135ffd1973a7f78544b62a6201f8b4fc885fd30d16c84fb872 files/my
 MD5 fde2b2886b037b199cc815dbcb12617e files/mythtv-0.18.1-x86_64-configure.patch 631
 RMD160 295c6fadffb8fad17703556d09959b58972a6b22 files/mythtv-0.18.1-x86_64-configure.patch 631
 SHA256 d3d4283d7d7d53cfea564cd83165f8f75c8d0d536d987c5fe02480da3d013d51 files/mythtv-0.18.1-x86_64-configure.patch 631
-MD5 6aa61436d9eed3e1792a745a6d1f3dcc files/mythtv-0.19_pre8554-chanutil-schar.patch 1208
-RMD160 bbd90f9e3e055312d889e4a31a5d20b03ed6b447 files/mythtv-0.19_pre8554-chanutil-schar.patch 1208
-SHA256 46413d1537e03d9127297a6b232b9e5c3c2b58920d987598f3e6843e2ac864f2 files/mythtv-0.19_pre8554-chanutil-schar.patch 1208
-MD5 c89433c53aa0030c59598b7403ffbe94 files/mythtv-0.19_pre8554-freetype.patch 1209
-RMD160 e9a7ff171315621197654b77abcc629714f1cd90 files/mythtv-0.19_pre8554-freetype.patch 1209
-SHA256 4e6b1ac1513d9aff1fe89646d2bff44eafd64ea3e85df528e13d8d503950ebda files/mythtv-0.19_pre8554-freetype.patch 1209
-MD5 96e1efbc2a12349e4c5ada14422868af files/mythtv-0.19_pre8554-xrandr.patch 744
-RMD160 7177c3ddd3c264ee85bfe8f54ccd4f02e1f91842 files/mythtv-0.19_pre8554-xrandr.patch 744
-SHA256 1bee47aabecb13711ae045733e898cc7ccf15eb12a626f57e50c47426f6e25d1 files/mythtv-0.19_pre8554-xrandr.patch 744
 MD5 0d20a49cff965a0f3ab35cb0600b65b4 files/runmythfe 104
 RMD160 61d825641aae0b77ea0995f5b9b59855e33b9027 files/runmythfe 104
 SHA256 7d3c316ec3af8f8cac23a1645c537f90feb09f7cb6d510dc2185d799080dd675 files/runmythfe 104
@@ -64,16 +55,12 @@ SHA256 8bbf3b1c856ceeb623dc3ff016044a20afba27e7092e30666832f73c8512f766 mythtv-0
 MD5 cac72423d3f6c98d2ef628c3e83c4ff2 mythtv-0.18.1-r2.ebuild 5488
 RMD160 7cc27e0730e0a4b16aa64a1943b14487ffb0bfac mythtv-0.18.1-r2.ebuild 5488
 SHA256 7986004e945ce90abfb6bce7a87299932b1eb80a75e4423dbc5bc296ac1d3443 mythtv-0.18.1-r2.ebuild 5488
+MD5 9d75b9053f287191565d062913f3783b mythtv-0.19-r1.ebuild 6381
+RMD160 299098cf6a14f7d8fee2416760cec721f592aeec mythtv-0.19-r1.ebuild 6381
+SHA256 9bd05f3f394f47fa8fa49bc97d8a2f17a6ee2080b6153c8264ea20f20709bbe8 mythtv-0.19-r1.ebuild 6381
 MD5 d3e3b07e51556dc0bcec9b8b6109c5aa mythtv-0.19.ebuild 6667
 RMD160 a0e4b46367ba6696ebffa42b46059adb7f0443fb mythtv-0.19.ebuild 6667
 SHA256 8de1da4d472c7aa999d1c06efcebdca70e0b3639159ec632f6aadc7b02f70970 mythtv-0.19.ebuild 6667
 MD5 f256d2f2c05115f870d545590fd8e210 mythtv-0.19_pre8642.ebuild 6342
 RMD160 176e25cb5b29c1df2fe2855d61b2dac3605e5cf4 mythtv-0.19_pre8642.ebuild 6342
 SHA256 6f932b53a35be6e110d05f24021d56c2cf323bd17c278dd79673ae6c25fe83f0 mythtv-0.19_pre8642.ebuild 6342
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD9wB7BtvusYtCZMsRAjc7AJ4p2oUZaU+4SYuZLFkn4vDefpmbHgCeNvTz
-lND+2WUUpp3QJ5gElhGJH18=
-=jp2m
------END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/digest-mythtv-0.19-r1 b/media-tv/mythtv/files/digest-mythtv-0.19-r1
new file mode 100644
index 000000000000..e0b338669812
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.19-r1
@@ -0,0 +1,6 @@
+MD5 ebba5829d264bb4de2f75cae936141f4 mythtv-0.19.tar.bz2 10162049
+RMD160 cd90bb3629df55f9e803d867cf59e378e9cace07 mythtv-0.19.tar.bz2 10162049
+SHA256 ca73641116d3bbc7d353a99348f9f8c9a156bcc756c90a6ed06f1498d9d9cd8f mythtv-0.19.tar.bz2 10162049
+MD5 b22b01596b793a377b62eab852cd383f mythtv-0.19_8926_9094.patch.bz2 14061
+RMD160 66ab6cde98b811c3ae57f9ba591b1f88102dc00b mythtv-0.19_8926_9094.patch.bz2 14061
+SHA256 28e5df50334895729f89f618462e3bb379d69fbd8d282f670f3cffe8325628eb mythtv-0.19_8926_9094.patch.bz2 14061
diff --git a/media-tv/mythtv/files/mythtv-0.19_pre8554-chanutil-schar.patch b/media-tv/mythtv/files/mythtv-0.19_pre8554-chanutil-schar.patch
deleted file mode 100644
index bfdb011ec768..000000000000
--- a/media-tv/mythtv/files/mythtv-0.19_pre8554-chanutil-schar.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libs/libmythtv/channelutil.cpp
-===================================================================
---- libs/libmythtv/channelutil.cpp     (revision 8554)
-+++ libs/libmythtv/channelutil.cpp     (working copy)
-@@ -11,11 +11,11 @@
-                                  // DVB specific
-                                  int transport_id,      int network_id,
-                                  bool set_odfm_info,
--                                 int symbol_rate,       char bandwidth,
--                                 char polarity,         char inversion,
--                                 char trans_mode,
-+                                 int symbol_rate,       signed char bandwidth,
-+                                 signed char polarity,         signed char inversion,
-+                                 signed char trans_mode,
-                                  QString inner_FEC,     QString constellation,
--                                 char hierarchy,        QString hp_code_rate,
-+                                 signed char hierarchy,        QString hp_code_rate,
-                                  QString lp_code_rate,  QString guard_interval)
- {
-     MSqlQuery query(MSqlQuery::InitCon());
-
diff --git a/media-tv/mythtv/files/mythtv-0.19_pre8554-freetype.patch b/media-tv/mythtv/files/mythtv-0.19_pre8554-freetype.patch
deleted file mode 100644
index 98f1a922293a..000000000000
--- a/media-tv/mythtv/files/mythtv-0.19_pre8554-freetype.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: configure
-===================================================================
---- configure   (revision 8554)
-+++ configure   (working copy)
-@@ -2383,6 +2383,8 @@
- fi
- if test "$freetype2" = "yes" ; then
-   echo "HAVE_FREETYPE2=yes" >> $MYTH_CONFIG_MAK
-+  echo "FREETYPE_CFLAGS=`freetype-config --cflags`" >> $MYTH_CONFIG_MAK
-+  echo "FREETYPE_LIBS=`freetype-config --libs`" >> $MYTH_CONFIG_MAK
- fi
- if test "$sunmlib" = "yes" ; then
-   echo "HAVE_MLIB=yes" >> $MYTH_CONFIG_MAK
-Index: libs/libmythtv/libmythtv.pro
-===================================================================
---- libs/libmythtv/libmythtv.pro        (revision 8554)
-+++ libs/libmythtv/libmythtv.pro        (working copy)
-@@ -33,10 +33,11 @@
- TARGETDEPS += ../libmythmpeg2/libmythmpeg2-$${LIBVERSION}.$${QMAKE_EXTENSION_LIB}
-
- DEFINES += _LARGEFILE_SOURCE
--QMAKE_CXXFLAGS_RELEASE += `freetype-config --cflags`
--QMAKE_CXXFLAGS_DEBUG += `freetype-config --cflags`
--QMAKE_LFLAGS_SHLIB += `freetype-config --libs`
-
-+QMAKE_CXXFLAGS_RELEASE += $${FREETYPE_CFLAGS}
-+QMAKE_CXXFLAGS_DEBUG += $${FREETYPE_CFLAGS}
-+QMAKE_LFLAGS_SHLIB += $${FREETYPE_LIBS}
-+
- macx {
-     # Mac OS X Frameworks
-     FWKS = ApplicationServices Carbon QuickTime
-
diff --git a/media-tv/mythtv/files/mythtv-0.19_pre8554-xrandr.patch b/media-tv/mythtv/files/mythtv-0.19_pre8554-xrandr.patch
deleted file mode 100644
index 7e3dd087db6c..000000000000
--- a/media-tv/mythtv/files/mythtv-0.19_pre8554-xrandr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: configure
-===================================================================
---- configure   (revision 8554)
-+++ configure   (working copy)
-@@ -2844,6 +2844,7 @@
-
- if test x"$xrandr" = x"yes" ; then
-   CCONFIG="$CCONFIG using_xrandr"
-+  echo "CONFIG_XRANDR_LIBS=-lXrandr -lX11" >> $MYTH_CONFIG_MAK
- fi
-
- if test x"$xvmc" = x"yes" ; then
-Index: settings.pro
-===================================================================
---- settings.pro        (revision 8554)
-+++ settings.pro        (working copy)
-@@ -82,6 +82,7 @@
-
- EXTRA_LIBS += $$LOCAL_LIBDIR_OGL
- EXTRA_LIBS += $$LOCAL_LIBDIR_X11
-+EXTRA_LIBS += $$CONFIG_XRANDR_LIBS
- EXTRA_LIBS += $$CONFIG_XV_LIBS
- EXTRA_LIBS += $$CONFIG_XVMC_LIBS
- EXTRA_LIBS += $$CONFIG_OPENGL_VSYNC_LIBS
-
diff --git a/media-tv/mythtv/mythtv-0.19-r1.ebuild b/media-tv/mythtv/mythtv-0.19-r1.ebuild
new file mode 100644
index 000000000000..4c31c70dac27
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.19-r1.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.19-r1.ebuild,v 1.1 2006/02/22 20:03:02 cardoe Exp $
+
+inherit flag-o-matic eutils debug qt3
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org/"
+SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2
+	http://dev.gentoo.org/~cardoe/files/${P}_8926_9094.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa altivec arts debug dbox2 dvb dvd frontendonly ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome"
+
+RDEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	|| ( (	x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXv
+		x11-libs/libXrandr
+		x11-libs/libXxf86vm
+		)
+	virtual/x11 )
+	$(qt_min_version 3.3)
+	dev-db/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	arts? ( kde-base/arts )
+	dvd? ( media-libs/libdvdnav )
+	dvb? ( media-libs/libdvb )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	nvidia? ( media-video/nvidia-glx
+		|| ( x11-libs/libXvMC virtual/x11 ) )
+	oggvorbis? ( media-libs/libvorbis )
+	opengl? ( virtual/opengl )
+	ieee1394? (	>=sys-libs/libraw1394-1.2.0
+			sys-libs/libavc1394
+			>=media-libs/libiec61883-1.0.0 )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
+	!x11-base/xfree
+	!<x11-base/xorg-x11-6.8"
+
+DEPEND="${RDEPEND}
+	|| ( x11-apps/xinit virtual/x11 )"
+
+PDEPEND="~x11-themes/mythtv-themes-${PV}"
+
+MYTHTV_GROUPS="video,audio"
+
+pkg_setup() {
+
+	if ! built_with_use x11-libs/qt mysql ; then
+		eerror "Qt is missing MySQL support. Please add"
+		eerror "'mysql' to your USE flags, and re-emerge Qt."
+		die "Qt needs MySQL support"
+	fi
+
+	if ! built_with_use x11-libs/qt opengl ; then
+		eerror "Qt requires OpenGL support. Please add"
+		eerror "'opengl' to your USE flags, and re-emerge Qt."
+		die "Qt needs OpenGL support."
+	fi
+
+	if ! has_version x11-libs/libXv && ! built_with_use x11-base/xorg-x11 xv; then
+		eerror "xorg-x11 is missing XV support. Please add"
+		eerror "'xv' to your USE flags, and re-emerge xorg-x11."
+		die "xorg-x11 needs XV support"
+	fi
+
+	if use nvidia; then
+		echo
+		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
+		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
+		echo
+	fi
+
+	einfo
+	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
+	einfo "Don't complain because your -momfg-fast-speed CFLAG is being stripped"
+	einfo "Only additional CFLAG issues that will be addressed are for binary"
+	einfo "package building."
+	einfo
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#Fixes of the bugs found in the 0.19 release
+	#Release rev: 8926
+	#Patch rev: 9094
+	epatch "${WORKDIR}"/${P}_8926_9094.patch
+}
+
+src_compile() {
+	use unichrome && use nvidia && die "You can not have USE="unichrome" and USE="nvidia" at the same time. Must disable one or the other."
+	local myconf="--prefix=/usr --mandir=/usr/share/man"
+	use oss || myconf="${myconf} --disable-audio-oss"
+	use alsa || myconf="${myconf} --disable-audio-alsa"
+	use arts || myconf="${myconf} --disable-audio-arts"
+	use jack || myconf="${myconf} --disable-audio-jack"
+	use altivec || myconf="${myconf} --disable-altivec"
+	use unichrome && myconf="${myconf} --enable-xvmc"
+	use nvidia && myconf="${myconf} --enable-xvmc"
+	myconf="${myconf}
+		$(use_enable lirc)
+		$(use_enable joystick joystick-menu)
+		$(use_enable dbox2)
+		$(use_enable dvb)
+		$(use_enable dvb dvb-eit)
+		--dvb-path=/usr/include
+		$(use_enable dvd)
+		$(use_enable opengl opengl-vsync)
+		$(use_enable ieee1394 firewire)
+		--enable-xrandr
+		--enable-xv
+		--disable-directfb
+		--enable-x11
+		--enable-proc-opt"
+
+	if use mmx || use amd64; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+	fi
+
+	## CFLAG cleaning so it compiles
+	MARCH=$(get-flag "march")
+	MTUNE=$(get-flag "mtune")
+	MCPU=$(get-flag "mcpu")
+	strip-flags
+	filter-flags "-march=*" "-mtune=*" "-mcpu=*"
+	filter-flags "-O" "-O?"
+
+	if [[ -n "${MARCH}" ]]; then
+		myconf="${myconf} --arch=${MARCH}"
+	fi
+	if [[ -n "${MTUNE}" ]]; then
+		myconf="${myconf} --tune=${MTUNE}"
+	fi
+	if [[ -n "${MCPU}" ]]; then
+		myconf="${myconf} --cpu=${MCPU}"
+	fi
+
+#	myconf="${myconf} --extra-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+#	if use frontendonly; then
+#		##Backend Removal
+#		cd ${S}
+#		sed -e "s:CCONFIG linux backend:CCONFIG linux:" \
+#			-i 'configure' || die "Removal of mythbackend failed"
+#	fi
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+	einfo "Running ./configure ${myconf}"
+	./configure ${myconf} || die "configure died"
+
+	${QTDIR}/bin/qmake QMAKE=${QTDIR}/bin/qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	for doc in AUTHORS COPYING FAQ UPGRADING ChangeLog README; do
+		test -e "${doc}" && dodoc ${doc}
+	done
+
+	if ! use frontendonly; then
+		insinto /usr/share/mythtv/database
+		doins database/*
+
+		exeinto /usr/share/mythtv
+		doexe "${FILESDIR}/mythfilldatabase.cron"
+
+		newinitd ${FILESDIR}/mythbackend-0.18.2.rc mythbackend
+		newconfd ${FILESDIR}/mythbackend-0.18.2.conf mythbackend
+	fi
+
+	dobin ${FILESDIR}/runmythfe
+
+	ewarn "Want MythFrontend to always? Add the following to your"
+	ewarn "myth user. i.e. My user is mythtv"
+	echo "crontab -e -u mythtv"
+	echo "* * * * * /usr/bin/runmythfe &"
+	ewarn "And you're all set."
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${D}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${D}"/var/log/mythtv
+}
+
+pkg_preinst() {
+	enewuser mythtv -1 "-1" -1 ${MYTHTV_GROUPS} || die "Problem adding mythtv user"
+	usermod -G ${MYTHTV_GROUPS} mythtv
+}
+
+pkg_postinst() {
+	einfo "Want MythFrontend to alway run? Run the following:"
+	echo " #crontab -e -u mythtv"
+	einfo "And add the following:"
+	echo "* * * * * /usr/bin/runmythfe &"
+	echo
+	echo
+	einfo "To always have MythBackend running and available run the following:"
+	echo "rc-update add mythbackend default"
+}
+