USE flag and depend cleanups after digging through Fedora's RPM spec file for MythTV. If only upstream's configure script was correct and accurately showed what MythTV needed or used.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 48 insertions, 31 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 3e4bacb73c44..ba14722f20ab 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.371 2012/07/21 19:46:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.372 2012/07/21 20:41:11 cardoe Exp $
+
+  21 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+  mythtv-0.25.2_p20120716.ebuild:
+  USE flag and depend cleanups after digging through Fedora's RPM spec file for
+  MythTV. If only upstream's configure script was correct and accurately showed
+  what MythTV needed or used.
 
   21 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.25.2_p20120716.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 72ea691c2752..a5ed016238b7 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -12,6 +12,6 @@ DIST mythtv-0.25.2-4e446508ec.tar.xz 660 SHA256 96c3bbc78ac03d83416abbd2e442a344
 DIST mythtv-0.25.2.tar.bz2 31838320 SHA256 d6b7f1692f30b3dde170d2b755453675de1d222aa8556197e62b8d8617beeac6 SHA512 12a88768edeb6b1fd132279352e0d3045bf469af025feb48a1ce7c558f7030baf26b2dd8e3fab42a178bfda8cd25357ce77328aa88d331758ef7005ee1a38e3e WHIRLPOOL c1c1c09b882b9db0918ba8cf5ad2b78dfd8cead2f39b8a4cadb549cc5a89086434d4ecdca0b9c449c9927962399335b1d8a90d4cfea6078fd2c4875eeb50b27f
 EBUILD mythtv-0.25.1_p20120708.ebuild 8528 SHA256 433e042e7cb005d30c57a16cd5825d71ee9b4db12a7d017f96ca91d444ec39ec SHA512 5bf0afa8e88254ef7947b4702f3a9cde42326febb723b50e2d562d29c8689c5bf9b220e7b63345cd2e44e3d86e9c98ec0e21d1227b61981d505629f203ac69c6 WHIRLPOOL 9a6c0f3d2307de8ec41c9c7b760f3e03109ec9daf94e3ab4df7d6664d9c5add84da8123c8ba83b6c2815724f688cafbea419e840e6d761de47d0a63fd740c732
 EBUILD mythtv-0.25.1_p20120715.ebuild 8462 SHA256 4c1d0452b946028903ab8ebd9efc5508d61319260ee3d384bca3e259bc9eb579 SHA512 a819b5de07d00f65662c27696eb18f0fd563ad6452b892e8411061489882ef0d9e642850591592718067512c5c599a463143e9ede13fd97d447d73678cce0b52 WHIRLPOOL e2993ed35ac89231df79c9837918afd46bde3c9ba2d473b1042a8240ab7dbe686d4bdeb3c81bf49af14e919104f75a71cb3936963717862b0c419f214e243ae2
-EBUILD mythtv-0.25.2_p20120716.ebuild 8923 SHA256 be0914b649c36f1a5558d554085e7567e90f2d16b9b8afbbd9407a3bee5a0ba5 SHA512 d905b8e6fb4a63c61e5ef061700c3ac01cf7ea62f83498510cb94f05550feddbfd2b1ae95500b9d31705b22404818377ea405009fd3b27f4ed81644750bd0266 WHIRLPOOL 6c8e2b5470e574a91706ce06719c170e97d55e48ca81cfd00a9aa72fbeb7f7ba931f25990ea416d69011e9a602f4d85a7c36709470d79edc0900f03919ec9c19
-MISC ChangeLog 73317 SHA256 d440b7652ee824a6f251ff9aaaa92114797f0a0e95fd43e3403b1165fa73e354 SHA512 4e264e354bb495c2f86868e8a213a04026ce6aa7fcba2e0acae3e7f163f6223948860e1a775828c1ea133a57dede4bbb17ce650aa6d595ce4034a48ee713a1f7 WHIRLPOOL 595bb870c4cb3fcdb9a530823cef00f98537fb68a98366fe3695c4bc097c74c2c7b65aa96388f36c260560a859009403c81210a63e7bb25eeaf3fdd9710e57ff
-MISC metadata.xml 3286 SHA256 2eec96a1d996fd82c7d7aec791e9b981f52fb1935ff636c8e1ff68f682fee442 SHA512 b9d1f70ee37fc36856bcf100b5a3e5907e2a4db74a1594764a5682517d021f1cb63f9876959e5dc1c0eb403e2b7d8e863fc68272f0836043c80f8d9a489b377e WHIRLPOOL 36ad6902beba213aa59cabcd6573fa82241c302bff8555cd342051eb191379d8b0eb245121f5168e3a106d3eee3ef032447f224a6347cb6e1803bec255c7da03
+EBUILD mythtv-0.25.2_p20120716.ebuild 9110 SHA256 f1fe7a9020ba1ab3057904effa545384e759954e5057aa57a0a3325fb8176a29 SHA512 2cb303959978be1e0419e29eba785be24e47f20022dce7d2f4f24a82454162dd1783aa73f0cc66ad227b33e152f06a2ab76e8a54d7d98006ed233fb64fbca7ed WHIRLPOOL ff2f14d112e1d7f33e20698045f1203420570cb1ab5243abdb3bda360698acdabcba260d9728250c07a1f87fbd5d363c33af5d80c3c5bcac17f30c8c0ffc82e9
+MISC ChangeLog 73592 SHA256 631d09fd83c1e625c9c311dbfc340f6d05dae9db073ab5b60a5653c3decc01dc SHA512 7196d424223f5831b5aea04b1883239b4b08b728e2be9f4f0d7cd0d2709c7e164207da1ce33c2c0eef9cdefea179b2eb23c756a06eda5ae54653318a2a7dc627 WHIRLPOOL dff706376b5e28a6eb398789c3268042ba20d35829bbce72b0439a7a56cc08520b696eadb349f8ab04e30269ca19872b12ef65e004a7405a063978d2ab7ffef2
+MISC metadata.xml 3337 SHA256 76329ce8dcd446b6fd47b87b57d9397c1a18326f908713720d06d0b0fd9d36a4 SHA512 c159813007fe8e8a057a8e17f5782685b736c1e8e41cea9234e428a7b09855f325061459e3c6b9f3c9cd26d8f27a71d8fb0e53383848e5d399cded85e2de225d WHIRLPOOL 87f3899cbe9caea5948b1af12028e3ab202230eb35f9ca15a193fec203643a99f5cde0060b10f30ed7ee5570c2d9696ae7d379d5f63eefb5317bce7ad24b1ccc
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index b20ff905a8f9..f1b05f1ff9f7 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -30,6 +30,7 @@
 	<flag name="dvb">Enables support for Linux DVB cards. These include all
 		cards that work with digital signals such as ATSC, DVB-T, DVB-C, and
 		DVB-S, QAM-64, and QAM-256.</flag>
+	<flag name="egl">Support EGL video output.</flag>
 	<flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag>
 	<flag name="hls">HTTP Live Streaming support</flag>
 	<flag name="ieee1394">Allows MythTV to communicate and use Firewire enabled
diff --git a/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild b/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild
index eaf153c8f7fc..8907c8c5978c 100644
--- a/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild,v 1.4 2012/07/21 19:46:05 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild,v 1.5 2012/07/21 20:41:11 cardoe Exp $
 
 EAPI=4
 
@@ -23,11 +23,16 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
 IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop vaapi \
-vdpau xmltv xvid ${IUSE_INPUT_DEVICES}"
+egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
+vaapi vdpau +vorbis +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
 
-SDEPEND="
+REQUIRED_USE="
+	bluray? ( xml )
+	theora? ( vorbis )"
+
+COMMON="
 	>=media-libs/freetype-2.0
+	sys-libs/zlib
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXinerama
@@ -37,17 +42,16 @@ SDEPEND="
 	>=x11-libs/qt-core-4.7.2:4
 	>=x11-libs/qt-dbus-4.7.2
 	>=x11-libs/qt-gui-4.7.2:4
+	>=x11-libs/qt-script-4.7.2:4
 	>=x11-libs/qt-sql-4.7.2:4[mysql]
-	>=x11-libs/qt-opengl-4.7.2:4
+	>=x11-libs/qt-opengl-4.7.2:4[egl?]
 	>=x11-libs/qt-webkit-4.7.2:4
 	x11-misc/wmctrl
 	virtual/mysql
 	virtual/opengl
-	virtual/glu
 	alsa? ( >=media-libs/alsa-lib-1.0.24 )
 	bluray? (
 		dev-libs/libcdio
-		>=dev-libs/libxml2-2.6.0
 		media-libs/libbluray
 	)
 	cec? ( dev-libs/libcec )
@@ -56,6 +60,7 @@ SDEPEND="
 		virtual/linuxtv-dvb-headers
 	)
 	dvd? ( dev-libs/libcdio )
+	egl? ( media-libs/mesa[egl] )
 	fftw? ( sci-libs/fftw:3.0 )
 	hls? (
 		media-libs/faac
@@ -90,14 +95,17 @@ SDEPEND="
 		dev-libs/openssl
 		net-dns/avahi[mdnsresponder-compat]
 	)
+	theora? ( media-libs/libtheora )
 	vaapi? ( x11-libs/libva )
 	vdpau? ( x11-libs/libvdpau )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	xml? ( >=dev-libs/libxml2-2.6.0 )
 	xvid? ( >=media-libs/xvid-1.1.0 )
 	!media-tv/mythtv-bindings
 	!x11-themes/mythtv-themes
 	"
 
-RDEPEND="${SDEPEND}
+RDEPEND="${COMMON}
 	media-fonts/corefonts
 	media-fonts/dejavu
 	media-fonts/liberation-fonts
@@ -111,7 +119,7 @@ RDEPEND="${SDEPEND}
 	xmltv? ( >=media-tv/xmltv-0.5.43 )
 	"
 
-DEPEND="${SDEPEND}
+DEPEND="${COMMON}
 	dev-lang/yasm
 	x11-proto/xineramaproto
 	x11-proto/xf86vidmodeproto
@@ -127,13 +135,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-# 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#\${SOURCE_VERSION}#${MYTHTV_VERSION}#g" \
-#		-e "s#\${BRANCH}#${MYTHTV_BRANCH}#g" \
-#		-i "${S}"/version.sh
-
 	[[ -n ${BACKPORTS} ]] && \
 		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
 			epatch
@@ -150,17 +151,20 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="--prefix=${EPREFIX}/usr"
-	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-	myconf="${myconf} --libdir-name=$(get_libdir)"
+	local myconf=
 
-	myconf="${myconf} --enable-pic"
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
 
-	use alsa       || myconf="${myconf} --disable-audio-alsa"
-	use altivec    || myconf="${myconf} --disable-altivec"
-	use jack       || myconf="${myconf} --disable-audio-jack"
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
 	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
 
+	use altivec    || myconf="${myconf} --disable-altivec"
 	myconf="${myconf} $(use_enable dvb)"
 	myconf="${myconf} $(use_enable ieee1394 firewire)"
 	myconf="${myconf} $(use_enable lirc)"
@@ -171,7 +175,9 @@ src_configure() {
 	myconf="${myconf} --enable-x11"
 	myconf="${myconf} --enable-nonfree"
 	use cec || myconf="${myconf} --disable-libcec"
-	use roap || myconf="${myconf} --disable-libdns-sd"
+	use raop || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
 
 	if use hls; then
 		myconf="${myconf} --enable-libmp3lame"
@@ -197,18 +203,21 @@ src_configure() {
 	if use debug; then
 		myconf="${myconf} --compile-type=debug"
 	else
-		myconf="${myconf} --compile-type=profile"
-		myconf="${myconf} --enable-proc-opt"
+		myconf="${myconf} --compile-type=release"
+		myconf="${myconf} --enable-debug"
 	fi
 
+	# Video
 	use vdpau && myconf="${myconf} --enable-vdpau"
 	use vaapi && myconf="${myconf} --enable-vaapi"
 	use crystalhd && myconf="${myconf} --enable-crystalhd"
 
+	# Input
 	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
 
-	# Clean up DSO load times
+	# Clean up DSO load times and other compiler bits
 	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
 
 	# CPU settings
 	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
@@ -221,6 +230,7 @@ src_configure() {
 		myconf="${myconf} --cross-prefix=${CHOST}-"
 	fi
 
+	# Build boosters
 	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
 	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"