remove opengl USE flag since it does nothing. Use EAPI 2 USE dep short form. Remove nearly dup version

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 14 insertions, 315 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index edd4edd31fca..b7ec61b15ae8 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.257 2008/10/03 14:46:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.258 2008/10/03 21:13:40 cardoe Exp $
+
+  03 Oct 2008; Doug Goldstein <cardoe@gentoo.org>
+  -mythtv-0.22_alpha18528.ebuild, mythtv-0.22_alpha18535.ebuild:
+  remove opengl USE flag since it does nothing. Use EAPI 2 USE dep short
+  form. Remove nearly dup version
 
   03 Oct 2008; Doug Goldstein <cardoe@gentoo.org> mythtv-0.21_p17637.ebuild,
   mythtv-0.21_p17722.ebuild, mythtv-0.21_p18116.ebuild,
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 298a0efc6d8f..2d951d992275 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -16,14 +16,13 @@ EBUILD mythtv-0.21_p18116.ebuild 9045 RMD160 7059f5c2d43c98e2c6cbe73b429cf5d4745
 EBUILD mythtv-0.21_p18314.ebuild 9067 RMD160 4bbed063b06415645ed460aaef230ff4ad2923d9 SHA1 d3aca72ce6523388272fb519d3c4baaec66a9345 SHA256 e9e832b8a8e600bd6f3b4a2315235387ffb2a2b381e823c2454d115ee04f2cfb
 EBUILD mythtv-0.21_p18501.ebuild 9013 RMD160 6bdf93038209ccc734a8bb0f5880dd445ab57fec SHA1 179306bc7aacddfd986692835ee1f7a20e27a143 SHA256 376c8716c9c5538736c3b452fe31eb9c4c2aa926224cedcd986bd2835f05f3bf
 EBUILD mythtv-0.22_alpha17733.ebuild 8674 RMD160 361c557cc7c791c093aec30ad5e07d6108226e5f SHA1 96929b6de9bd39c30480e6ea4d260e20cabc4903 SHA256 660807ed885101a901e6cd55cf44df3072ddf659cd2bea282c88a31a465ef16c
-EBUILD mythtv-0.22_alpha18528.ebuild 8667 RMD160 bf279a8105ca5efec18490bd4cf942c9f4308d88 SHA1 b281edfcc4d1189a908f76edac51bd64d47ac417 SHA256 8dc550e705d5158fb487f02ebcd0c5557fe128fc40af9d82671df9ed53295f39
-EBUILD mythtv-0.22_alpha18535.ebuild 8644 RMD160 79603256aa1c42c380cb675391c2b09eb08c8aef SHA1 05117d5f8edbe53da4bab78074e8fb5a0dfdae57 SHA256 9c4a43ceccdd3ed9ae2c8b2b59b21282f23328b59ba62957e366e28a2fb26e61
-MISC ChangeLog 50862 RMD160 76143dbe6ca414202ff970b2eb7a75df9f8dd3c8 SHA1 1a33da0e68535da9d3a257e09f741a5d8b812d3e SHA256 eaadb3231419276c4e5e87e49e4ce6d102a227292eae34c542778fa42dc07b5a
+EBUILD mythtv-0.22_alpha18535.ebuild 8561 RMD160 a6531b9bbf10dfde02c9c992ade2da075ac1f714 SHA1 f6b57acff4b65256a9690aeebf070ae21fe34a44 SHA256 8e01e0476850eacaf872cbdaf2d6c490327974179debbaee275850e336680a29
+MISC ChangeLog 51085 RMD160 5a0dea0826360ee018321a59e48c746dcc80c684 SHA1 5df0fe9e1e1c4850b7bdde467f6616462c870239 SHA256 88cdd5b5ef60becb3ac6021ae4fb51f6a0c150221a3c56dca124c46b735fa848
 MISC metadata.xml 4844 RMD160 0b620c4698e23467c7811be942b0bd9d24ee2208 SHA1 684ac9148eee29189fbb9a94f81802ad2cbd22dc SHA256 89dd2fa121bab4de5c58b62103fcbafc2468539f29c27fa93f81e2f411f96fa3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjmMIsACgkQoeSe8B0zEfyoDgCbBHd62A1b2PUOnqPvrRPKBpWx
-XpIAn0Y49FgbytjWspronMMoEuDnZZxT
-=EHi9
+iEYEARECAAYFAkjmiyQACgkQoeSe8B0zEfyhVwCePNyoRoCH4ZjNIGTnbo1wxtvi
+hlcAn0bNO53e0E3JhuM4TK1fYYKvjTel
+=lKpU
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild b/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild
deleted file mode 100644
index 3c8402360e62..000000000000
--- a/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha18528.ebuild,v 1.4 2008/10/03 14:46:01 cardoe Exp $
-
-EAPI=2
-inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
-
-DESCRIPTION="Homebrew PVR project"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE_VIDEO_CARDS="video_cards_nvidia"
-IUSE="alsa altivec autostart debug directv dvb dvd \
-fftw ieee1394 jack lcd lirc mmx opengl perl python \
-tiff xvmc ${IUSE_VIDEO_CARDS}"
-
-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
-	x11-libs/qt-core:4[qt3support]
-	tiff? ( x11-libs/qt-gui:4[qt3support,tiff] )
-	!tiff? ( x11-libs/qt-gui:4[qt3support] )
-	x11-libs/qt-sql:4[qt3support,mysql]
-	x11-libs/qt-opengl:4[qt3support]
-	x11-libs/qt-webkit:4
-	virtual/mysql
-	virtual/opengl
-	virtual/glu
-	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.43 )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	autostart? ( net-dialup/mingetty
-				x11-wm/evilwm
-				x11-apps/xset )
-	directv? ( virtual/perl-Time-HiRes )
-	dvb? ( media-libs/libdvb media-tv/linuxtv-dvb-headers )
-	dvd? ( media-libs/libdvdcss )
-	fftw? ( sci-libs/fftw:3.0 )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.3
-			>=media-libs/libiec61883-1.0.0 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	lcd? ( app-misc/lcdproc )
-	lirc? ( app-misc/lirc )
-	perl? ( dev-perl/DBD-mysql )
-	python? ( dev-python/mysql-python )
-	xvmc? ( x11-libs/libXvMC )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xineramaproto
-	x11-proto/xf86vidmodeproto
-	x11-apps/xinit"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
-	die "Don't use me yet"
-
-	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
-
-	if use xvmc && use video_cards_nvidia; then
-		elog
-		elog "For NVIDIA based cards, the XvMC renderer only works on"
-		elog "the NVIDIA 4, 5, 6 & & series cards."
-	fi
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_unpack() {
-	subversion_src_unpack
-
-	# upstream wants the revision number in their version.cpp
-	# since the subversion.eclass strips out the .svn directory
-	# svnversion in MythTV's build doesn't work
-	sed -e "s:\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`:${MYTHTV_REV}:" \
-		-i "${S}"/version.pro || die "svnversion sed failed"
-
-	# Perl bits need to go into vender_perl and not site_perl
-	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
-		-i "${S}"/bindings/perl/perl.pro
-}
-
-src_configure() {
-	local myconf="--prefix=/usr
-		--mandir=/usr/share/man
-		--libdir-name=$(get_libdir)"
-	use alsa || myconf="${myconf} --disable-audio-alsa"
-	use altivec || myconf="${myconf} --disable-altivec"
-	use fftw && myconf="${myconf} --enable-libfftw3"
-	use jack || myconf="${myconf} --disable-audio-jack"
-
-	#from bug #220857
-	use xvmc && myconf="${myconf} --enable-xvmc --enable-xvmcw \
-		--disable-xvmc-vld"
-
-	# according to the Ubuntu guys, this works better being always on
-	myconf="${myconf} --enable-glx-procaddrarb"
-
-	myconf="${myconf}
-		$(use_enable dvb)
-		$(use_enable ieee1394 firewire)
-		$(use_enable lirc)
-		--disable-audio-arts
-		--disable-directfb
-		--dvb-path=/usr/include
-		--enable-opengl-vsync
-		--enable-xrandr
-		--enable-xv
-		--enable-x11"
-
-	if use mmx || use amd64; then
-		myconf="${myconf} --enable-mmx"
-	else
-		myconf="${myconf} --disable-mmx"
-	fi
-
-	if use perl && use python; then
-		myconf="${myconf} --with-bindings=perl,python"
-	elif use perl; then
-		myconf="${myconf} --with-bindings=perl"
-	elif use python; then
-		myconf="${myconf} --with-bindings=python"
-	else
-		myconf="${myconf} --without-bindings=perl,python"
-	fi
-
-	if use debug; then
-		myconf="${myconf} --compile-type=debug"
-	else
-		myconf="${myconf} --compile-type=profile"
-	fi
-
-	## CFLAG cleaning so it compiles
-	MARCH=$(get-flag "march")
-	MTUNE=$(get-flag "mtune")
-	strip-flags
-	filter-flags "-march=*" "-mtune=*" "-mcpu=*"
-	filter-flags "-O" "-O?"
-
-	if [[ -n "${MARCH}" ]]; then
-		myconf="${myconf} --cpu=${MARCH}"
-	fi
-	if [[ -n "${MTUNE}" ]]; then
-		myconf="${myconf} --tune=${MTUNE}"
-	fi
-
-#	myconf="${myconf} --extra-cxxflags=\"${CXXFLAGS}\" --extra-cflags=\"${CFLAGS}\""
-	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	hasq ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	# let MythTV come up with our CFLAGS. Upstream will support this
-	CFLAGS=""
-	CXXFLAGS=""
-	einfo "Running ./configure ${myconf}"
-	./configure ${myconf} || die "configure died"
-}
-
-src_compile() {
-	eqmake4 mythtv.pro -o "Makefile" || die "eqmake4 failed"
-	emake || die "emake failed"
-
-	# firewire support should build the tester
-	if use ieee1394; then
-		cd contrib
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../firewire_tester \
-			development/firewire_tester/firewire_tester.c \
-			${LDFLAGS} -liec61883 -lraw1394 || \
-			die "failed to compile firewire_tester"
-
-		cd channel_changers
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -std=gnu99 -o ../../6200ch \
-			6200ch/6200ch.c \
-			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
-			die "failed to compile 6200ch"
-		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../sa3250ch \
-			sa3250ch/sa3250ch.c \
-			${LDFLAGS} -lrom1394 -lavc1394 -lraw1394 || \
-			die "failed to compile sa3250ch"
-	fi
-
-	cd "${S}"/contrib/channel_changers
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -o ../../red_eye red_eye/red_eye.c \
-		${LDFLAGS} || die "failed to compile red_eye"
-}
-
-src_install() {
-
-	einstall INSTALL_ROOT="${D}" || die "install failed"
-	dodoc AUTHORS FAQ UPGRADING  README
-
-	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
-
-	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
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d mythtv
-
-	insinto /usr/share/mythtv/contrib
-	doins -r contrib/*
-
-	dobin "${FILESDIR}"/runmythfe
-
-	if use autostart; then
-		dodir /etc/env.d/
-		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${D}"/etc/env.d/95mythtv
-
-		insinto /home/mythtv
-		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc .xinitrc
-	fi
-
-	if use ieee1394; then
-		dobin firewire_tester || die "failed to install firewire_tester"
-		newdoc contrib/development/firewire_tester/README README.firewire_tester
-
-		dobin 6200ch || die "failed to install 6200ch"
-		newdoc contrib/channel_changers/6200ch/README README.6200ch
-
-		dobin sa3250ch || die "failed to install sa3250ch"
-		newdoc contrib/channel_changers/sa3250ch/README README.sa3250ch
-	fi
-
-	dobin red_eye || die "failed to install red_eye"
-	newdoc contrib/channel_changers/red_eye/README README.red_eye
-
-	if use directv; then
-		dobin contrib/channel_changers/d10control.pl || die "failed to install d10control"
-		newdoc contrib/channel_changers/d10control/README README.d10control
-	fi
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/MythTV
-
-	elog "Want mythfrontend to start automatically?"
-	elog "Set USE=autostart. Details can be found at:"
-	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-
-	elog
-	elog "To always have MythBackend running and available run the following:"
-	elog "rc-update add mythbackend default"
-	elog
-	ewarn "Your recordings folder must be owned by the user 'mythtv' now"
-	ewarn "chown -R mythtv /path/to/store"
-
-	if use xvmc && [[ ! -s "${ROOT}/etc/X11/XvMCConfig" ]]; then
-		ewarn
-		ewarn "No XvMC implementation has been selected yet"
-		ewarn "Use 'eselect xvmc list' for a list of available choices"
-		ewarn "Then use 'eselect xvmc set <choice>' to choose"
-		ewarn "'eselect xvmc set nvidia' for example"
-	fi
-
-	if use autostart; then
-		elog
-		elog "Please add the following to your /etc/inittab file at the end of"
-		elog "the TERMINALS section"
-		elog "c8:2345:respawn:/sbin/mingetty --autologin mythtv tty8"
-	fi
-
-}
-
-pkg_postrm()
-{
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/MythTV
-}
-
-pkg_info() {
-	"${ROOT}"/usr/bin/mythfrontend --version
-}
-
-pkg_config() {
-	echo "Creating mythtv MySQL user and mythconverg database if it does not"
-	echo "already exist. You will be prompted for your MySQL root password."
-	"${ROOT}"/usr/bin/mysql -u root -p < "${ROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild b/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild
index 8a474ab4e394..6c47c2924cf1 100644
--- a/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild
+++ b/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild,v 1.2 2008/10/03 14:46:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.22_alpha18535.ebuild,v 1.3 2008/10/03 21:13:40 cardoe Exp $
 
 EAPI=2
 inherit flag-o-matic multilib eutils qt4 mythtv toolchain-funcs python
@@ -11,7 +11,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE_VIDEO_CARDS="video_cards_nvidia"
 IUSE="alsa altivec autostart debug directv dvb dvd \
-fftw ieee1394 jack lcd lirc mmx opengl perl python \
+fftw ieee1394 jack lcd lirc mmx perl python \
 tiff xvmc ${IUSE_VIDEO_CARDS}"
 
 RDEPEND=">=media-libs/freetype-2.0
@@ -23,8 +23,7 @@ RDEPEND=">=media-libs/freetype-2.0
 	x11-libs/libXrandr
 	x11-libs/libXxf86vm
 	x11-libs/qt-core:4[qt3support]
-	tiff? ( x11-libs/qt-gui:4[qt3support,tiff] )
-	!tiff? ( x11-libs/qt-gui:4[qt3support] )
+	x11-libs/qt-gui:4[qt3support,tiff?]
 	x11-libs/qt-sql:4[qt3support,mysql]
 	x11-libs/qt-opengl:4[qt3support]
 	x11-libs/qt-webkit:4
@@ -60,8 +59,6 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
 pkg_setup() {
-	die "Don't use me yet"
-
 	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
 
 	if use xvmc && use video_cards_nvidia; then