Version bump. Fix --version output from the various programs. Fix a bug where the mythfrontend wrapper script was not passing arguments to the real process. Found by Wilson Michaels <TheBitPit@earthlink.net>

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

4 files changed, 125 insertions, 61 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 05bbe2792f69..8be9b35e824e 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # 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.365 2012/07/15 22:40:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.366 2012/07/17 00:17:38 cardoe Exp $
+
+*mythtv-0.25.2_p20120716 (16 Jul 2012)
+
+  16 Jul 2012; Doug Goldstein <cardoe@gentoo.org> -mythtv-0.25.1.ebuild,
+  +mythtv-0.25.2_p20120716.ebuild, files/mythfrontend.wrapper:
+  Version bump. Fix --version output from the various programs. Fix a bug where
+  the mythfrontend wrapper script was not passing arguments to the real
+  process. Found by Wilson Michaels <TheBitPit@earthlink.net>
 
 *mythtv-0.25.1_p20120715 (15 Jul 2012)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 6f2a47aba034..b6e5588a6cd6 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -7,7 +7,7 @@ AUX mythbackend-0.18.2.rc 1128 SHA256 be994a8b6690e830820e82316f4ccce5b7f84ce682
 AUX mythbackend.conf 475 SHA256 1790de4ff212dcd4f9b94ff284d9db6ba9d465cd96cb120c444a34655b99239f SHA512 4e4f349791efcfed4d9d775d4b8b2168cf276ae00ee104bf475aff10872541495d9d204c3f5c42ea75ae13daed81f5cbadb7e41ddcf149c37aeae22ebdf24511 WHIRLPOOL 93745b61cd719d0bafcb33f79fcd9830009c8754d6854d5c826e5a1f79a070bce467e41b71f24432040cdfe04f27594fd68d957608d815b6e1f49164a5832bbe
 AUX mythbackend.init 1519 SHA256 3f584044a9b2ef87652feae13dcc4e6fd71d814578381127e1982551e2740a76 SHA512 9d38ecc63ea0e8c1ddae26400ed387bccee6ae8cd46d34a620a653b825e4085653a5bf4f3fb0d198c09040a78ee62aa5c5690b97cc0672522ce31e1426d7515d WHIRLPOOL d44da8b0ca5e75fdc193de5cd99a3f4acfb0c9ff4e2f39b74904a7a30aa837ece797c631292ee7ca9c9e108036b51721d12eea54ec974ee3792d2a56ba6ac577
 AUX mythfrontend.conf 588 SHA256 ecdfa734fb1232d853a2c56259efa61b79c43df5f0330aa1f4c378a2fe172602 SHA512 7caf0f032ef6204611da6d606313c923dcff72ae2cca0d76f62434d8baf65a5603ce70b815da2bcca04f8442f202c3df2081cfdfcdffbf9b8bb5600be162daa6 WHIRLPOOL c2d3df9c46b31b344b58196e6e2b2d5f15a84bfcbbb78c4c8735f7dd5cc6c4bfad6efef69f00174d8827eba23ca19fe5d80f700323f97597128c6feb713c2391
-AUX mythfrontend.wrapper 784 SHA256 f163ca855b90b351003ec112b2e5da8cd1d5882d1422f6f017ba43aaf8d5d261 SHA512 e7ddb56040fdc408d0c60631a5b3f21cb7b55b2fc7f381bebe1b511836dad9c024a8b191eb70963c04a83e08623b226898888fee108c107c2efade123f889630 WHIRLPOOL 2584b8493af40a716cc9e4df31765ff9bff82afab56a8a85559043d1048e35f3676e8b84ecb12c1258b8cdd903583651789f113a55a67bed9e947bde4b600627
+AUX mythfrontend.wrapper 794 SHA256 db90ac5ff3bec3f2a81f376cc94c553d2cce026fd921bc822a6e3428fd8fa2e0 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3 WHIRLPOOL dd47702ed5c130c2c407e1c0b107eac6d9378b0e4635806caed510aba8a38dd65818151eae3bc9ed59055f4f8b1c0c2cb7ddd7f35bdc353bd207ca93979053ae
 AUX mythtv-v4l2-fix.2.patch 21826 SHA256 b14f5fcb1982f22ec89ffe6bde2494e7911901b52315fa0edac58bd072e842d7 SHA512 bb8fb58a2670491f1ae564bb739802231b049a155d281759069343410d138ba514a32525e001594ea7afa6b76144fcbbbab7e5341514af8f3418169e6defcf2c WHIRLPOOL 4ff1fcbaa9c21c94d805160b8b066ed43d33080fcd08f7c29c21f4e51e2fc7aeb1607e4aae3c62e00803f8baff6d237f3a933393a57ca395fc8933c7a98dc1ed
 AUX mythtv.logrotate.d-r1 474 SHA256 e55228b8f79dbea32601f6be4e368a1f44e3b9d6a7d5d311ba9444ace5da052c SHA512 fd7c6ba11df6ac8ddec316031ed0eb37ddc4dc3b7bd74263854df06a410476f62310a68318596fc126d15fb3a14cb3332ffcc23c0a8d9dbd9afc2c7372f901dd WHIRLPOOL d3df6adf0ec58c4ef561e19c5642d9a1988d0c337368a0f70004ca0e4bca002db061435bb5486e9214dcc205b159034ca8776833d85e71b6c793f54ae04d729a
 AUX mythtv.logrotate.d-r2 1127 SHA256 bd7b8bfbd116ba5cbe97ad2651d58ac9bce2afc7bb976eec6f035928361882a5 SHA512 3e4a7777a02c0945729286b02a42ef6bbd5a6507ebd22735a3abfdb2f722b2a94f347f1ef9aed3a8e213e860f980021d94985218d0930617dbb1563b781cc729 WHIRLPOOL 774d4dce5baaadef73eba004a2f808863eaa295a767eda89890969aa4d0ba1b8978353e86ccc5d1915cc4668048f717428aa68dc1d98390f3c0b31f6455bb75f
@@ -19,9 +19,11 @@ DIST mythtv-0.24.1_p20110524.tar.gz 69756131 SHA256 ea3e37258f8596c9186865289ffd
 DIST mythtv-0.25.1-4f6ac2a60b.tar.xz 41012 SHA256 b1916606d1569184d07503b21316a7f00c7f8e9bafca723dfeaf91ec59652046 SHA512 dd67b41c8ecf8d1fb7521dc9827586733b8de912bf693db0f20099b7922223d4053f22e2b028118950c26ebf49eedcdc7d5d34aa4b8d831b6ab8fe64f3aec5bc WHIRLPOOL 7fbd087694e523e07e1ee57f0559e53000911cc9c901af3b07f9acd94ee7965a549acbeeea6fccc3066537f0da9246a191ed6e1b64284da97ccfd38181f40bbf
 DIST mythtv-0.25.1-61e7a0e946.tar.xz 37304 SHA256 8b516be07d3519872f2f74728aebe7020b4162cdfd600cbf6397c3cbc8d9ddda SHA512 9feeb85c3894c6aec4c0ac804eae1e0e7aed8c95eed57b68ef6bf1990c15740402f24a586734546d4d014f4667616b4bff496ad42aae4fdd70d9867d0d45c24f WHIRLPOOL a283005ee808d6c4602146e9913a9cbb74aea200e74dd6ac96837821da0777471962af29b610a2ab634b809249b233c2c66015e18966de6e628fe1bb17c4a943
 DIST mythtv-0.25.1.tar.bz2 31827158 SHA256 7638ffc547b62f2d6dd031c6f164ccb993387a7b4b6d9218cdd37594c1cca508 SHA512 ea3d3746fd14a602638026d8cd7f373cd36ad5175ac33e0718ab61a9dee2f199fa9226253e126c78cbbf253705006fc3b05ab408495a905bad468f0a863f7567 WHIRLPOOL 4c214e5ca794d2ddf3a0c542ad23245064cd986cdc7d3cb7036c57b2c50bed851bbd701965709f5fdbafb05f9eef45133b77958e8ba0aa59908265e6d4db0514
+DIST mythtv-0.25.2-4e446508ec.tar.xz 660 SHA256 96c3bbc78ac03d83416abbd2e442a34448f6043dea1a7102d24b92e3b80e08b4 SHA512 68b76baf0bce0a7a8f9a10b338ee6495ac116414a335b5967982b5ebde40b12ded691b27e7c580f9b50c18dc38387cbf2a4bbecd1832b8d212f89999769514e3 WHIRLPOOL bdd7d35976b5cdc7111ad93ad76e646dd657bac8438d8803491c9c0c072fc462d74549fb4ffce6d9be8215225a34ef94278c69ca49a231955eff98bc4ab06e7a
+DIST mythtv-0.25.2.tar.bz2 31838320 SHA256 d6b7f1692f30b3dde170d2b755453675de1d222aa8556197e62b8d8617beeac6 SHA512 12a88768edeb6b1fd132279352e0d3045bf469af025feb48a1ce7c558f7030baf26b2dd8e3fab42a178bfda8cd25357ce77328aa88d331758ef7005ee1a38e3e WHIRLPOOL c1c1c09b882b9db0918ba8cf5ad2b78dfd8cead2f39b8a4cadb549cc5a89086434d4ecdca0b9c449c9927962399335b1d8a90d4cfea6078fd2c4875eeb50b27f
 EBUILD mythtv-0.24.1_p20110524.ebuild 9230 SHA256 d5c246f523e234fa8e5202930448db67b91a808d5bb8c4a014ee9f182eed8402 SHA512 7cf1c76ba2a6895d38a11555cdca43f61a17f6dac5948271b4261a22dc3497fd954efa5a85ca1a85e770e9395f49c723c9e39678e6537acbcd7502107e4a2235 WHIRLPOOL a5f96507b775ccdf2fbb7285b4aa5e263c0a97964ff904940d4b1fc08ae05934b64ec1bac7fdda596343e36ca1f04ead454bb76eb4feb7ced78ab909c1b35c98
-EBUILD mythtv-0.25.1.ebuild 7289 SHA256 b68a260a5b82f034ce21e5260f2b0b3c0d10133d0ce093036735b7cedf267e3b SHA512 708e61b42f70bceb8702a92ea8ae98b15fee63395b9479ab127764ecb1bd0d6cb32655beda18e8618212eb14083007a97f8e41009035cdf88899e2e970881c82 WHIRLPOOL ceae49c69fc9ce7269cb880fff13aef2f206ccfaaf1bde8a405e42589d66a7997fab42b610b3c07aebfd1ccaac7d3398160a996ee9ac1d90e256f8f68a3d10f0
 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
-MISC ChangeLog 71937 SHA256 bcd68cca18b831edecd17ea248c2140d7518bf10383cd2b26c129409bbf0f630 SHA512 9dd7749e6602928a60e89263d123e56d519efc0fa9f7a0ef36be35dd9601356d5036b826b25a0f0272c1382e182856ba8eada256483f9018ecbe54eb28636031 WHIRLPOOL b53f62f7b81c0c9763dc83df7dba7dc7468f291e02f2b579d109cca9fe70df84081d99237ea16cd85e5e8591397bf7a0b1000b2e38e1b0e230d031762103d22c
+EBUILD mythtv-0.25.2_p20120716.ebuild 8565 SHA256 cc4fb726f4fc7680dd825080bdc4d2fc9eaf4501c25dbf271041a2b4efe04f66 SHA512 e1fa54b1260d76549e32a74e95b8f0a18e7cae7221b25710836b5f7ec5a4bb0f15f81d193890833b8c527c37c7f9693d568534ae8450cca6041347e7f0055ed8 WHIRLPOOL 1373a8f3ee3044f44d67827252984a3daaf6e24e98996292a7cfc43d315adb40618b71e62ec3272f812ee13a8c97788ed2887337ae9db89e24cf93c7b3898eca
+MISC ChangeLog 72328 SHA256 49c91c1d8a1fdb2bd70f2e777382b5bee28c626bb7c8edf644ae0e9de5e77d14 SHA512 26a73acc9c82c13051a98760bf3d2b97b91ad7be808a9bd1510c07e4ee0cc50635084e6c8ca0bc72d9977ec841d78a7336390a6f10fd0378f49a3cb930ee20b8 WHIRLPOOL 5d24d283871688076dc3198a9ee9b198330d9fe0ee3a8945b4f513cd8d674af71007144686afb0ee2bdd1a6356eaefcbbe4dd59db4049a646e1c88ce978141d3
 MISC metadata.xml 3624 SHA256 28df7a0b436180584d0d6c20ea51ab67501b1c449e3a78c7645d8d46d0bdc5e7 SHA512 1cfb76b5bc418dfc79af5ebefa361a6146c328170e40035c9cc6481c92e43418aafe07ffd971abb56aff49f535ab0d3964079c2d0c72f67a47b39cd1c6ced9a5 WHIRLPOOL a61cf9be8a71b2be1801c7882c9c1bf8dd11e73b726021422a3524f94869639fce69b7d1f374e4001093becb5a643b3f8fd3816c2d2cf60ac42d150a6e689cee
diff --git a/media-tv/mythtv/files/mythfrontend.wrapper b/media-tv/mythtv/files/mythfrontend.wrapper
index 85052a45cda2..ce3608ec1f9a 100644
--- a/media-tv/mythtv/files/mythfrontend.wrapper
+++ b/media-tv/mythtv/files/mythfrontend.wrapper
@@ -19,10 +19,10 @@ if [ -e /etc/conf.d/mythfrontend ]; then
 fi
 
 if [ "x${MYTHWELCOME}" = "xtrue" ]; then
-    exec /usr/bin/mythwelcome ${MYTHFRONTEND_OPTS}
+    exec /usr/bin/mythwelcome ${MYTHFRONTEND_OPTS} "$@"
     RET=$?
 else
-    exec /usr/bin/mythfrontend.real ${MYTHFRONTEND_OPTS}
+    exec /usr/bin/mythfrontend.real ${MYTHFRONTEND_OPTS} "$@"
     RET=$?
 fi
 
diff --git a/media-tv/mythtv/mythtv-0.25.1.ebuild b/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild
index 4f726ce7fc4a..130253ad8261 100644
--- a/media-tv/mythtv/mythtv-0.25.1.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild
@@ -1,70 +1,98 @@
 # 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.1.ebuild,v 1.11 2012/07/08 22:29:21 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.2_p20120716.ebuild,v 1.1 2012/07/17 00:17:38 cardoe Exp $
 
 EAPI=4
 
-inherit flag-o-matic multilib eutils python user
+PYTHON_DEPEND="python? 2:2.6"
+BACKPORTS="4e446508ec"
+MY_P=${P%_p*}
 
-PYTHON_DEPEND="python? 2"
+inherit flag-o-matic multilib eutils python user
 
-#MYTHTV_VERSION="v${PV}-15-g${MYTHTV_SREV}"
-#MYTHTV_BRANCH="fixes/0.25"
-#MYTHTV_REV="c29d36f1634cd837276b4fd8cfea5d5d75304da8"
-#MYTHTV_SREV="c29d36f"
+MYTHTV_VERSION="v0.25.2"
+MYTHTV_BRANCH="fixes/0.25"
 
 DESCRIPTION="Homebrew PVR project"
 HOMEPAGE="http://www.mythtv.org"
-SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.25.1.tar.bz2"
+SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
+	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
 IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-ieee1394 jack lcd lirc perl pulseaudio python xvmc vaapi vdpau \
-${IUSE_INPUT_DEVICES}"
+fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop vaapi \
+vdpau xmltv xvid ${IUSE_INPUT_DEVICES}"
 
 SDEPEND="
-	>=media-sound/lame-3.93.1
+	>=media-libs/freetype-2.0
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXinerama
 	x11-libs/libXv
 	x11-libs/libXrandr
 	x11-libs/libXxf86vm
-	x11-libs/qt-core:4
-	x11-libs/qt-dbus
-	x11-libs/qt-gui:4
-	x11-libs/qt-sql:4[mysql]
-	x11-libs/qt-opengl:4
-	x11-libs/qt-webkit:4
+	>=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-sql-4.7.2:4[mysql]
+	>=x11-libs/qt-opengl-4.7.2:4
+	>=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 )
-	dvb? ( media-libs/libdvb virtual/linuxtv-dvb-headers )
-	ieee1394? (	>=sys-libs/libraw1394-1.2.0
-			>=sys-libs/libavc1394-0.5.3
-			>=media-libs/libiec61883-1.0.0 )
+	dvb? (
+		media-libs/libdvb
+		virtual/linuxtv-dvb-headers
+	)
+	dvd? ( dev-libs/libcdio )
+	fftw? ( sci-libs/fftw:3.0 )
+	hls? (
+		media-libs/faac
+		media-libs/libvpx
+		>=media-libs/x264-0.0.20110426
+		>=media-sound/lame-3.93.1
+	)
+	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 )
 	libass? ( >=media-libs/libass-0.9.11 )
 	lirc? ( app-misc/lirc )
-	perl? (	dev-perl/DBD-mysql
+	perl? (
+		dev-perl/DBD-mysql
 		dev-perl/Net-UPnP
 		dev-perl/LWP-Protocol-https
 		dev-perl/HTTP-Message
 		dev-perl/IO-Socket-INET6
-		>=dev-perl/libwww-perl-5 )
+		>=dev-perl/libwww-perl-5
+	)
 	pulseaudio? ( media-sound/pulseaudio )
-	python? (	dev-python/mysql-python
-			dev-python/lxml
-			dev-python/urlgrabber )
+	python? (
+		dev-python/mysql-python
+		dev-python/lxml
+		dev-python/urlgrabber
+	)
+	raop? (
+		dev-libs/openssl
+		net-dns/avahi[mdnsresponder-compat]
+	)
 	vaapi? ( x11-libs/libva )
 	vdpau? ( x11-libs/libvdpau )
-	xvmc? ( x11-libs/libXvMC )
+	xvid? ( >=media-libs/xvid-1.1.0 )
 	!media-tv/mythtv-bindings
 	!x11-themes/mythtv-themes
 	"
@@ -72,14 +100,15 @@ SDEPEND="
 RDEPEND="${SDEPEND}
 	media-fonts/corefonts
 	media-fonts/dejavu
-	>=media-libs/freetype-2.0
+	media-fonts/liberation-fonts
 	x11-apps/xinit
-	|| ( >=net-misc/wget-1.12-r3 >=media-tv/xmltv-0.5.43 )
-	autostart? (	net-dialup/mingetty
-			x11-wm/evilwm
-			x11-apps/xset )
-	bluray? ( media-libs/libbluray )
+	autostart? (
+		net-dialup/mingetty
+		x11-wm/evilwm
+		x11-apps/xset
+	)
 	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
 	"
 
 DEPEND="${SDEPEND}
@@ -88,16 +117,13 @@ DEPEND="${SDEPEND}
 	x11-proto/xf86vidmodeproto
 	"
 
+S="${WORKDIR}/${MY_P}"
+
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
 pkg_setup() {
-	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
-
-	use python && python_set_active_version 2
+	python_set_active_version 2
 	python_pkg_setup
-
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
 }
 
 src_prepare() {
@@ -108,11 +134,17 @@ src_prepare() {
 #		-e "s#\${BRANCH}#${MYTHTV_BRANCH}#g" \
 #		-i "${S}"/version.sh
 
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
 	# 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/Makefile
 
-	epatch "${FILESDIR}/fixLdconfSandbox.${PV}.patch"
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" > "${S}"/VERSION
 
 	epatch_user
 }
@@ -133,10 +165,20 @@ src_configure() {
 	myconf="${myconf} $(use_enable dvb)"
 	myconf="${myconf} $(use_enable ieee1394 firewire)"
 	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
 	myconf="${myconf} --dvb-path=/usr/include"
 	myconf="${myconf} --enable-xrandr"
 	myconf="${myconf} --enable-xv"
 	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	use cec || myconf="${myconf} --disable-libcec"
+
+	if use hls; then
+		myconf="${myconf} --enable-libmp3lame"
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+		myconf="${myconf} --enable-libfaac"
+	fi
 
 	if use perl && use python; then
 		myconf="${myconf} --with-bindings=perl,python"
@@ -168,26 +210,21 @@ src_configure() {
 	# Clean up DSO load times
 	myconf="${myconf} --enable-symbol-visibility"
 
-## CFLAG cleaning so it compiles
+	# CFLAG cleaning so it compiles
 	strip-flags
 
+	# Pass our LDFLAGS along so we don't get QA warnings
+	myconf="${myconf} --extra-ldflags=\"${LDFLAGS}\""
+
 	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
 	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
 
-# let MythTV come up with our CFLAGS. Upstream will support this
-	CFLAGS=""
-	CXXFLAGS=""
-
 	chmod +x ./external/FFmpeg/version.sh
 
 	einfo "Running ./configure ${myconf}"
 	./configure ${myconf} || die "configure died"
 }
 
-src_compile() {
-	emake || die "emake failed"
-}
-
 src_install() {
 	emake INSTALL_ROOT="${D}" install || die "install failed"
 	dodoc AUTHORS UPGRADING README
@@ -204,14 +241,18 @@ src_install() {
 	chown -R mythtv "${ED}"/etc/mythtv
 	keepdir /var/log/mythtv
 	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/mythtv.logrotate.d-r1 mythtv
+	newins "${FILESDIR}"/mythtv.logrotate.d-r2 mythtv
 
 	insinto /usr/share/mythtv/contrib
 	doins -r contrib/*
 
-	newbin "${FILESDIR}"/runmythfe-r1 runmythfe
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+	newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+	newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
 
 	if use autostart; then
 		dodir /etc/env.d/
@@ -219,16 +260,29 @@ src_install() {
 
 		insinto /home/mythtv
 		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc .xinitrc
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
 	fi
 
-	for file in `find "${ED}" -type f -name \*.py`; do chmod a+x "${file}"; done
-	for file in `find "${ED}" -type f -name \*.sh`; do chmod a+x "${file}"; done
-	for file in `find "${ED}" -type f -name \*.pl`; do chmod a+x "${file}"; done
+	# Make Python files executable and ensure they are executed by Python 2
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+			python_convert_shebangs -q 2 "${file}"
+		fi
+	done
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
 }
 
 pkg_preinst() {
 	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
 }
 
 pkg_postinst() {