move firewire from 0.18.1-r1 to -r2. mark -r1 stable. remove old ebuilds.

(Portage version: 2.0.51.22-r1)

6 files changed, 48 insertions, 164 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index ac8383a23ffd..cd05e59280a9 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.62 2005/05/30 07:15:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.63 2005/05/30 07:43:09 cardoe Exp $
+
+*mythtv-0.18.1-r2 (30 May 2005)
+
+  30 May 2005; Doug Goldstein <cardoe@gentoo.org> -mythtv-0.18-r2.ebuild,
+  -mythtv-0.18.1.ebuild, mythtv-0.18.1-r1.ebuild, +mythtv-0.18.1-r2.ebuild:
+  remove old ebuilds.
+  move firewire stuff from mythtv-0.18.1-r1 to -r2.
+  mark -r1 stable on x86
 
   30 May 2005; Doug Goldstein <cardoe@gentoo.org> mythtv-0.18.1-r1.ebuild:
   Firewire support!!! Hoorah!
diff --git a/media-tv/mythtv/files/digest-mythtv-0.18-r2 b/media-tv/mythtv/files/digest-mythtv-0.18-r2
deleted file mode 100644
index af9b82960007..000000000000
--- a/media-tv/mythtv/files/digest-mythtv-0.18-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8480c534508a2530c1ba35d295870faf mythtv-0.18.tar.bz2 8801515
diff --git a/media-tv/mythtv/files/digest-mythtv-0.18.1 b/media-tv/mythtv/files/digest-mythtv-0.18.1-r2
index c19a91ec4aa3..c19a91ec4aa3 100644
--- a/media-tv/mythtv/files/digest-mythtv-0.18.1
+++ b/media-tv/mythtv/files/digest-mythtv-0.18.1-r2
diff --git a/media-tv/mythtv/mythtv-0.18-r2.ebuild b/media-tv/mythtv/mythtv-0.18-r2.ebuild
deleted file mode 100644
index 5b7c3c7efc8d..000000000000
--- a/media-tv/mythtv/mythtv-0.18-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18-r2.ebuild,v 1.2 2005/05/16 08:57:07 cardoe Exp $
-
-inherit flag-o-matic eutils debug
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org/"
-SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa altivec arts debug dvb ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome xv"
-
-DEPEND=">=media-libs/freetype-2.0
-	>=media-sound/lame-3.93.1
-	virtual/x11
-	>=x11-libs/qt-3.1.1
-	dev-db/mysql
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	arts? ( kde-base/arts )
-	dvb? ( media-libs/libdvb )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	nvidia? ( media-video/nvidia-glx )
-	oggvorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	ieee1394? ( >=sys-libs/libraw1394-1.2.0 )
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )
-	!x11-base/xfree
-	!<x11-base/xorg-x11-6.8"
-
-# ieee1394 also needs >=sys-libs/libiec61883-1.0.0
-
-RDEPEND="${DEPEND}
-	!media-tv/mythfrontend"
-
-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 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 "Please note, this ebuild does not use your CFLAGS and CXXFLAGS. It determines"
-	einfo "a sane set and uses those. Please do not attempt to override this behavior."
-	einfo
-}
-
-#src_unpack() {
-#	unpack ${A}
-#	
-#	# Fix bugs 40964 and 42943.
-#	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
-#	is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-#}
-
-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="$(use_enable altivec)
-		$(use_enable oss audio-oss)
-		$(use_enable alsa audio-alsa)
-		$(use_enable arts audio-arts)
-		$(use_enable jack audio-jack)
-		$(use_enable lirc)
-		$(use_enable joystick joystick-menu)
-		$(use_enable unichrome xvmc-vld)
-		$(use_enable dvb)
-		$(use_enable dvb dvb-eit)
-		--dvb-path=/usr/include
-		$(use_enable opengl opengl-vsync)
-		$(use_enable oggvorbis vorbis)
-		$(use_enable nvidia xvmc)
-		$(use_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
-
-	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	hasq ccache ${FEATURES} || myconf="${myconf} --distable-ccache"
-
-	# depends on bug # 89799
-	# $(use_enable ieee1394 firewire)
-
-	# let MythTV come up with our CFLAGS. Upstream will support this
-	CFLAGS=""
-	CXXFLAGS=""
-	econf ${myconf} || die "configure died"
-
-	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
-
-	newbin "setup/mythtv-setup" "mythsetup"
-
-	insinto /usr/share/mythtv/database
-	doins database/*
-
-	exeinto /usr/share/mythtv
-	doexe "${FILESDIR}/mythfilldatabase.cron"
-
-	newinitd ${FILESDIR}/0.18-mythbackend.rc mythbackend
-	newconfd ${FILESDIR}/0.18-mythbackend.conf mythbackend
-
-	dodoc keys.txt docs/*.{txt,pdf}
-	dohtml docs/*.html
-
-	keepdir /var/log/mythtv
-}
diff --git a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
index fd515cb9ef70..25df59227214 100644
--- a/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.3 2005/05/30 07:15:53 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r1.ebuild,v 1.4 2005/05/30 07:43:09 cardoe Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -10,8 +10,8 @@ SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa altivec arts debug dvb frontendonly ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome xv"
+KEYWORDS="x86 ~amd64"
+IUSE="alsa altivec arts debug dvb frontendonly jack joystick lcd lirc mmx nvidia oggvorbis opengl oss unichrome xv"
 
 DEPEND=">=media-libs/freetype-2.0
 	>=media-sound/lame-3.93.1
@@ -27,8 +27,6 @@ DEPEND=">=media-libs/freetype-2.0
 	nvidia? ( media-video/nvidia-glx )
 	oggvorbis? ( media-libs/libvorbis )
 	opengl? ( virtual/opengl )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=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"
@@ -54,6 +52,7 @@ pkg_setup() {
 	einfo "Only additional CFLAG issues that will be addressed are for binary"
 	einfo "package building."
 	einfo
+	einfo "To get ieee1394 support (firewire) you must use mythtv-0.18.1-r2"
 }
 
 src_unpack() {
@@ -84,7 +83,6 @@ src_compile() {
 		$(use_enable oggvorbis vorbis)
 		$(use_enable nvidia xvmc)
 		$(use_enable xv)
-		$(use_enable ieee1394 firewire)
 		--disable-directfb
 		--enable-x11
 		--enable-proc-opt"
diff --git a/media-tv/mythtv/mythtv-0.18.1.ebuild b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
index d84af96dcb2b..57963ce50ef1 100644
--- a/media-tv/mythtv/mythtv-0.18.1.ebuild
+++ b/media-tv/mythtv/mythtv-0.18.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1.ebuild,v 1.2 2005/05/20 17:10:32 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18.1-r2.ebuild,v 1.1 2005/05/30 07:43:09 cardoe Exp $
 
 inherit flag-o-matic eutils debug
 
@@ -27,16 +27,12 @@ DEPEND=">=media-libs/freetype-2.0
 	nvidia? ( media-video/nvidia-glx )
 	oggvorbis? ( media-libs/libvorbis )
 	opengl? ( virtual/opengl )
-	ieee1394? ( >=sys-libs/libraw1394-1.2.0 )
+	ieee1394? (	>=sys-libs/libraw1394-1.2.0
+			>=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"
 
-# ieee1394 also needs >=sys-libs/libiec61883-1.0.0
-
-RDEPEND="${DEPEND}
-	!media-tv/mythfrontend"
-
 pkg_setup() {
 
 	if ! built_with_use x11-libs/qt mysql ; then
@@ -53,18 +49,23 @@ pkg_setup() {
 	fi
 
 	einfo
-	einfo "Please note, this ebuild does not use your CFLAGS and CXXFLAGS. It determines"
-	einfo "a sane set and uses those. Please do not attempt to override this behavior."
+	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}
-#	
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-opengl-fix.patch
+
 #	# Fix bugs 40964 and 42943.
 #	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
 #	is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-#}
+}
 
 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."
@@ -83,6 +84,7 @@ src_compile() {
 		$(use_enable oggvorbis vorbis)
 		$(use_enable nvidia xvmc)
 		$(use_enable xv)
+		$(use_enable ieee1394 firewire)
 		--disable-directfb
 		--enable-x11
 		--enable-proc-opt"
@@ -99,12 +101,29 @@ src_compile() {
 		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-cflags=${CFLAGS}"
+
 	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
 	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
 
-	# depends on bug # 89799
-	# $(use_enable ieee1394 firewire)
-
 	if use frontendonly; then
 		##Backend Removal
 		cd ${S}