Remove out unused files

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

13 files changed, 11 insertions, 884 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 3e1b747d2a6f..06e26b54a4b4 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.367 2012/07/17 01:15:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.368 2012/07/17 01:20:39 cardoe Exp $
+
+  16 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
+  -files/mythbackend-0.18.2.conf, -files/mythtv-v4l2-fix.2.patch,
+  -files/mythbackend-0.18.2.rc, -files/ffmpeg-sync.patch,
+  -files/fixLdconfSandbox.0.25.1.patch, -files/fixLdconfSandbox.patch,
+  -files/mythtv.logrotate.d-r1, -files/runmythfe, -files/runmythfe-r1,
+  -files/xinitrc, metadata.xml:
+  Remove out unused files
 
   16 Jul 2012; Doug Goldstein <cardoe@gentoo.org>
   -mythtv-0.24.1_p20110524.ebuild:
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 3ab319c22299..a62a44ad71c7 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,19 +1,9 @@
 AUX bash_profile 63 SHA256 9a753f699d07b5f481374d13ea3f2b2439a22f3a9a49b6280cc8d9eebf0b2ca9 SHA512 1338a6871ba04100b3c74f91140be834ee659cb7fcf3aa1bdd251631e47690fae88b8eb80984ff5e35b2a4cf9b3fb1b0be8205fe220c82b19e9d935cc790d5b6 WHIRLPOOL 10220cf7662f150863b47529a90c831407ce93d272d64960cfa727992d0b4dfe2e13de2c62d7a4b27f924526307822fa488d9551f6e8f62a47f63a89dfaee9fe
-AUX ffmpeg-sync.patch 457 SHA256 ee3c283d1619e7609f58485e9858c0b2a77b8d14f2f47deba45c874aec09231b SHA512 263a491337d445a8ee9b8cecd5a99c16ebca69636f9fe1e910a56f8f03c3c67196d3eb0c9c9e18a97b3933bda32181c45b1525068927889dd5ccaaf816e63ef5 WHIRLPOOL 9bc603a6294b30af338a34dc8b61dc74cb7fbf145f897fdb1a34a65205d59ab14f843a27142cb82f3aa650f6d6f18cc1672692fac2a63ee0e591ebdbecf1ca15
-AUX fixLdconfSandbox.0.25.1.patch 361 SHA256 e778d4aa3dfe5d4c5e8cdc8438c5c45deb9d89816eb28c117ecc80ce67215d54 SHA512 da0deb6a9291c35109e2535c437c4e8140c34fa1e178baa111ffe7a9352123fc714a44ce2f08086240cdfa0e2231deb99d290d9bea25c826f7d729a4eeb0f979 WHIRLPOOL 76105c0ecac6b9d62075e30f19b2f2c0375c49d2a1f731588ab8cdc96ead71b69d7109dfe37287b296343ac7a819981da614047175f4cd89cdcf6222f9ec40a0
-AUX fixLdconfSandbox.patch 386 SHA256 466668c48f3b21d64de464cf33971bcb1f12237da705a5a77dfa4fad1f687a93 SHA512 aef2dcfafa196f5b8b9905c061b2ae421797eba4ba05df2302778be8f36aefbf390e986af38389e6dbeb4f268ab9446bf40a366d40e4cc94c4baa0ef4e3b3d23 WHIRLPOOL 22c979dd73f26beb4cf33fad0d91f78bef4b097305079f37e2066b208b2d843e7c2364f60f61d711a9159424ca695f3b37c95b0cfb79fcd3feb6f332f133d8de
-AUX mythbackend-0.18.2.conf 1430 SHA256 0b6d0514d410bdcbeaebded48488926fc2941edaeee518794d9884693a4eb9db SHA512 46ecfc63424fad25d93bee0a283dc718c663fcc9ad562686afa21a322ebf33351cd3f2dd2db817f0ef10808d469f654fbd3720e2d822ba42838140d7cec9a945 WHIRLPOOL 593fe6100633b7cdf6fa3ad703d979b84f3a74064c4f8edd66f62236b6f502d1994634ceab63ec912df447d8c2e7c2d3a4e7d902640defd15e670b7821b422b8
-AUX mythbackend-0.18.2.rc 1128 SHA256 be994a8b6690e830820e82316f4ccce5b7f84ce68213de75e3740818227f6f3c SHA512 9b690e8374edc43332f0d6fac52644981bd51a68358ae9f105c169ca13fbbc4ada0d3469ee3ac808356cda21ecc820a02b08825cbbff18e05a8ddbfab8addf33 WHIRLPOOL 1d21e31d15fc68668acffc66293e63b6c7ef19dea1c931184c8a373e2ead3f9500bf66285f8d569467bf86159b8778e24fb470143c8478b07b555ac991aaca23
 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 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
-AUX runmythfe 186 SHA256 bebc665f37b21193be2f259cb8daf6863dfd4336e4e1424a7a989d6b679964fe SHA512 978cdc40bd98338ac05c29a688d843cc2ffde240fd6020a698d6d3547eea4ea110b3e9ea9074f3f1c75cf97ccb417ee6f26040aead9914f7e6bb79877fdc16b8 WHIRLPOOL 9c9209b0a06fec461b71b3d8c44e5897670dcd094f83f12afb2b3c4965428f8a2f2a6deeb282c46621e9e516fdeb447b5c73ba1dcd9ff4347bd7868d945c6758
-AUX runmythfe-r1 167 SHA256 93e5c0e63a12e68f8fd6d114309620add21e7ba34a5a607a141ffa4fd376a695 SHA512 c63665884457df4b999a2b07276137d614e0ef46bba1da7c33ca7c8820ab7640f473bd61c917c910df41b67826483a33612b9cd66e83707d4aa5f7de497c4bce WHIRLPOOL 0698e3b26d26539606dcd0e2341b4e3ca5192e241b7cd5501d53dd9ebb4e31a8435bff990a4fd304050402e3fc3c9074e886d3e687634b29839d68d1e9735e27
-AUX xinitrc 240 SHA256 770990183ce8df60bf3bcbc3a334558155aedd0a80357556261fb938b4254e94 SHA512 177219aaa83392c4508a8c4b8a6d3b1c45ddd3ef97e308885f9026d46181fedce06421a34588d05a6ea173635e0bbca77b99b262fda4913adec507f11103694b WHIRLPOOL 66bb81c0c8b3e7c90bb05b5d5e106469643ce97f683eb84b3c7feff02f5d1a1e45ebb14a065cb7e88419f96da311dca29b8bd5f2409fb3135c166c2509d40c72
 AUX xinitrc-r1 234 SHA256 0b335cc6d1e22d71f61bacfdcfed6cc450fecf7ff10bdb4bad50fd085bd7b2db SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188 WHIRLPOOL 6796d4d83ff200bd36cc02e3765222efd77dd7baa69ed9d6845b7ecb836fcd0b110f7ce644af1e2c4af3f76c4c924f7e69499b0b4f9f511ace31f3f9cc804240
 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
@@ -23,5 +13,5 @@ DIST mythtv-0.25.2.tar.bz2 31838320 SHA256 d6b7f1692f30b3dde170d2b755453675de1d2
 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 8565 SHA256 cc4fb726f4fc7680dd825080bdc4d2fc9eaf4501c25dbf271041a2b4efe04f66 SHA512 e1fa54b1260d76549e32a74e95b8f0a18e7cae7221b25710836b5f7ec5a4bb0f15f81d193890833b8c527c37c7f9693d568534ae8450cca6041347e7f0055ed8 WHIRLPOOL 1373a8f3ee3044f44d67827252984a3daaf6e24e98996292a7cfc43d315adb40618b71e62ec3272f812ee13a8c97788ed2887337ae9db89e24cf93c7b3898eca
-MISC ChangeLog 72437 SHA256 e8643720ba1bf8f2fa9cec8b7edcbe3fa37213c42996f09c4927edc752a71be8 SHA512 95a7875a5287072dc9fc8656a948fd6e0ce876bbb246c52342ed0c5de7315d48bab8fae13b6071975228d0c6261d41ed33be8fa97d62b75815c2fa533e1ddf0c WHIRLPOOL e4f50046e1427589fab9e916e062379e020158799708ad5546e1d4724449f36914367a15276aacff56abac9d6845fe6c31018108318aa190a7819e254f6f6c2e
-MISC metadata.xml 3624 SHA256 28df7a0b436180584d0d6c20ea51ab67501b1c449e3a78c7645d8d46d0bdc5e7 SHA512 1cfb76b5bc418dfc79af5ebefa361a6146c328170e40035c9cc6481c92e43418aafe07ffd971abb56aff49f535ab0d3964079c2d0c72f67a47b39cd1c6ced9a5 WHIRLPOOL a61cf9be8a71b2be1801c7882c9c1bf8dd11e73b726021422a3524f94869639fce69b7d1f374e4001093becb5a643b3f8fd3816c2d2cf60ac42d150a6e689cee
+MISC ChangeLog 72812 SHA256 a231ffc9e1f8778c47d216759cb6cb3ed507f069b89330fd2278fbd978bb9269 SHA512 96b37d75369b1c0da603d1f50b840da5dccccdb9d20cb524dd338dfd6081056eeb8b43e7c011c1802f6c34692aa8a8c09a01fe604439d86c911ed95f0cd2a014 WHIRLPOOL 025e346320b27be11b689d2139ae52459f424d8f4a07f3e67eb4a3908e494963a483cf7bb31336ee2c186c04eb9707207d4d0afdd5b91f35035072da966469f7
+MISC metadata.xml 3286 SHA256 2eec96a1d996fd82c7d7aec791e9b981f52fb1935ff636c8e1ff68f682fee442 SHA512 b9d1f70ee37fc36856bcf100b5a3e5907e2a4db74a1594764a5682517d021f1cb63f9876959e5dc1c0eb403e2b7d8e863fc68272f0836043c80f8d9a489b377e WHIRLPOOL 36ad6902beba213aa59cabcd6573fa82241c302bff8555cd342051eb191379d8b0eb245121f5168e3a106d3eee3ef032447f224a6347cb6e1803bec255c7da03
diff --git a/media-tv/mythtv/files/ffmpeg-sync.patch b/media-tv/mythtv/files/ffmpeg-sync.patch
deleted file mode 100644
index ca7b3a2a13a0..000000000000
--- a/media-tv/mythtv/files/ffmpeg-sync.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: configure
-===================================================================
---- configure	(revision 25841)
-+++ configure	(working copy)
-@@ -4745,7 +4745,7 @@
- cat >> external/FFmpeg/config.mak <<EOF
- LIBDIR=\$(INSTALL_ROOT)$libdir
- SHLIBDIR=\$(INSTALL_ROOT)$shlibdir
--INCDIR=\$(INSTALL_ROOT)$incdir
-+INCDIR=$incdir
--BINDIR=\$(INSTALL_ROOT)$bindir
-+BINDIR=$bindir
--DATADIR=\$(INSTALL_ROOT)$datadir
-+DATADIR=$datadir
- MANDIR=\$(INSTALL_ROOT)$mandir
-
diff --git a/media-tv/mythtv/files/fixLdconfSandbox.0.25.1.patch b/media-tv/mythtv/files/fixLdconfSandbox.0.25.1.patch
deleted file mode 100644
index 654d12923391..000000000000
--- a/media-tv/mythtv/files/fixLdconfSandbox.0.25.1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: programs/mythfrontend/mythfrontend.pro
-===================================================================
---- programs/mythfrontend/mythfrontend.pro	(revision 26148)
-+++ programs/mythfrontend/mythfrontend.pro	(working copy)
-@@ -110,3 +110,5 @@
-     DEFINES += USING_LIBDNS_SD
-     using_libcrypto: DEFINES += USING_RAOP
- }
-+
-+setting.extra -= -ldconfig
diff --git a/media-tv/mythtv/files/fixLdconfSandbox.patch b/media-tv/mythtv/files/fixLdconfSandbox.patch
deleted file mode 100644
index 075b220570c5..000000000000
--- a/media-tv/mythtv/files/fixLdconfSandbox.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: programs/mythfrontend/mythfrontend.pro
-===================================================================
---- programs/mythfrontend/mythfrontend.pro	(revision 26148)
-+++ programs/mythfrontend/mythfrontend.pro	(working copy)
-@@ -86,3 +86,5 @@
- using_jack:DEFINES += USING_JACK
- using_oss: DEFINES += USING_OSS
- macx:      DEFINES += USING_COREAUDIO
-+
-+setting.extra -= -ldconfig
diff --git a/media-tv/mythtv/files/mythbackend-0.18.2.conf b/media-tv/mythtv/files/mythbackend-0.18.2.conf
deleted file mode 100644
index f7ad68a5d489..000000000000
--- a/media-tv/mythtv/files/mythbackend-0.18.2.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation 
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/mythbackend-0.18.2.conf,v 1.2 2007/03/19 04:24:12 cardoe Exp $
-
-#Accepts any combination (separated by comma) of:
-#
-#  all           - ALL available debug output
-#  important     - Errors or other very important messages
-#  general       - General info
-#  record        - Recording related messages
-#  playback      - Playback related messages
-#  channel       - Channel related messages
-#  osd           - On-Screen Display related messages
-#  file          - File and AutoExpire related messages
-#  schedule      - Scheduling related messages
-#  network       - Network protocol related messages
-#  commflag      - Commercial Flagging related messages
-#  audio         - Audio related messages
-#  libav         - Enables libav debugging
-#  jobqueue      - JobQueue related messages
-#  siparser      - Siparser related messages
-#  eit           - EIT related messages
-#  vbi           - VBI related messages
-#  database      - Display all SQL commands executed
-#  dsmcc         - DSMCC carousel related messages
-#  mheg          - MHEG debugging messages
-#  upnp          - upnp debugging messages
-#  socket        - socket debugging messages
-#  timestamp     - Conditional data driven messages
-#  none          - NO debug output
-#MYTH_VERBOSE="important,general"
diff --git a/media-tv/mythtv/files/mythbackend-0.18.2.rc b/media-tv/mythtv/files/mythbackend-0.18.2.rc
deleted file mode 100644
index afa74d738b3a..000000000000
--- a/media-tv/mythtv/files/mythbackend-0.18.2.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/mythbackend-0.18.2.rc,v 1.8 2007/06/12 15:49:37 cardoe Exp $
-
-depend() {
-	# future note for me, backend doesn't have to run on
-	# same machine as MySQL so should be use
-	need net
-	use mysql lircd LCDd
-}
-
-start() {
-	[ -z "${MYTH_VERBOSE}" ] && MYTH_VERBOSE="important,general"
-
-	export QTDIR=/usr/qt/3
-	export HOME=/etc/mythtv
-		
-	#fixes for bug #101308
-	unset DISPLAY
-	unset SESSION_MANAGER
-
-	# Work around any strange permissions that may be on these files.
-	chown -R mythtv /var/log/mythtv/
-	chown -R mythtv /etc/mythtv/
-	rm -rf /etc/mythtv/.qt
-
-	ebegin "Starting MythTV Backend"
-	start-stop-daemon --start --quiet --chuid mythtv \
-		--exec /usr/bin/mythbackend \
-		--make-pidfile --pidfile /var/run/mythbackend.pid \
-		--background -- --verbose ${MYTH_VERBOSE} \
-		--logfile /var/log/mythtv/mythbackend.log
-	eend $?
-}
-
-stop () {
-	ebegin "Stopping MythTV Backend"
-	start-stop-daemon --stop --quiet --pidfile=/var/run/mythbackend.pid
-	eend $?
-}
diff --git a/media-tv/mythtv/files/mythtv-v4l2-fix.2.patch b/media-tv/mythtv/files/mythtv-v4l2-fix.2.patch
deleted file mode 100644
index e26e16615f00..000000000000
--- a/media-tv/mythtv/files/mythtv-v4l2-fix.2.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff --git a/mythtv/configure b/mythtv/configure
-index 1efe803..7bcdf06 100755
---- a/mythtv/configure
-+++ b/mythtv/configure
-@@ -109,7 +109,8 @@ Advanced options (experts only):
-   --disable-iptv           disable support for recording RTSP/UDP/RTP streams
-   --disable-hdhomerun      disable support for HDHomeRun boxes
-   --disable-v4l            disable Video4Linux support
--  --disable-ivtv           disable ivtv support (PVR-x50) req. v4l support
-+  --disable-v4l2           disable Video4Linux2 support
-+  --disable-ivtv           disable ivtv support (PVR-x50) req. v4l2 support
-   --disable-hdpvr          disable HD-PVR support
-   --disable-dvb            disable DVB support
-   --dvb-path=HDRLOC        location of directory containing
-@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST='
-     qtwebkit
-     quartz_video
-     v4l
-+    v4l2
-     valgrind
-     x11
-     xrandr
-@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h"
- dvb_deps="backend"
- firewire_deps="backend"
- iptv_deps="backend"
--ivtv_deps="backend v4l"
--hdpvr_deps="backend v4l"
-+ivtv_deps="backend v4l2"
-+hdpvr_deps="backend v4l2"
- hdhomerun_deps="backend"
- mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
- mythtranscode_deps="backend frontend"
-@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11"
- opengl_video_deps="opengl"
- opengl_vsync_deps="opengl"
- v4l_deps="backend linux_videodev_h linux_videodev2_h"
-+v4l2_deps="backend linux_videodev2_h"
- vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
- xrandr_deps="x11"
- xv_deps="x11"
-@@ -1933,6 +1936,7 @@ enable opengl_vsync
- enable opengl_video
- enable quartz_video
- enable v4l
-+enable v4l2
- enable x11
- enable xrandr
- enable xv
-@@ -3062,6 +3066,7 @@ EOF
-         fi
-         disable opengl_vsync
-         disable v4l
-+        disable v4l2
-         disable x11
-         # Workaround compile errors from missing gmtime_r/localtime_r/uint def
-         CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-@@ -3106,6 +3111,7 @@ EOF
-         fi
-         disable symver
-         disable v4l
-+        disable v4l2
-         enable  windows
-         disable x11
-         ###### Standard ffmpeg configure stuff follows:
-@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip"
- 
- if enabled backend; then
-   echo "Video4Linux sup.          ${v4l-no}"
-+  echo "Video4Linux2 sup.         ${v4l2-no}"
-   echo "ivtv support              ${ivtv-no}"
-   echo "HD-PVR support            ${hdpvr-no}"
-   echo "FireWire support          ${firewire-no}"
-diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-index 739634d..39e5956 100644
---- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-+++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-@@ -42,9 +42,13 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
- 
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- #include "go7007_myth.h"
- 
-@@ -55,9 +59,9 @@ extern "C" {
- extern "C" {
- #include "vbitext/vbi.h"
- }
--#else  // USING_V4l
-+#else  // USING_V4L || USING_V4L2
- #define VT_WIDTH 0
--#endif // USING_V4l
-+#endif // USING_V4l || USING_V4L2
- 
- #define KEYFRAMEDIST   30
- 
-@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void)
- 
- void NuppelVideoRecorder::ProbeV4L2(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     usingv4l2 = true;
- 
-     struct v4l2_capability vcap;
-@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void)
-     QString driver = (char *)vcap.driver;
-     if (driver == "go7007")
-         go7007 = true;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
- 
- void NuppelVideoRecorder::StartRecording(void)
-@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void)
-         audio_device->Close();
- }
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- struct VBIData
- {
-     NuppelVideoRecorder *nvr;
-@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata)
-         act_text_buffer = 0;
-     textbuffer[act]->freeToEncode = 1;
- }
--#else  // USING_V4L
-+#else  // USING_V4L || USING_V4L2
- void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {}
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- void NuppelVideoRecorder::FormatCC(struct cc *cc)
- {
-@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void)
-     //VERBOSE(VB_RECORD, LOC + "vbi end");
- }
- 
--#else  // USING_V4L
-+#else  // USING_V4L 
- void NuppelVideoRecorder::doVbiThread(void) { }
- #endif // USING_V4L
- 
-diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-index 2a4f4c5..fa5823a 100644
---- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-@@ -6,7 +6,9 @@
- #include <sys/ioctl.h>
- #include <poll.h>
- 
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
- 
- #include "mythverbose.h"
- #include "analogsignalmonitor.h"
-@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void)
-     }
-     else
-     {
-+#ifdef USING_V4L
-         struct video_tuner tuner;
-         bzero(&tuner, sizeof(tuner));
- 
-@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void)
-         {
-             isLocked = tuner.signal;
-         }
-+#endif
-     }
- 
-     {
-diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
-index 8852682..494f48a 100644
---- a/mythtv/libs/libmythtv/cardutil.cpp
-+++ b/mythtv/libs/libmythtv/cardutil.cpp
-@@ -4,7 +4,7 @@
- 
- #include <algorithm>
- 
--#if defined(USING_V4L) || defined(USING_DVB)
-+#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB)
- #include <sys/ioctl.h>
- #endif
- 
-@@ -28,6 +28,8 @@
- 
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
- 
-@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name)
- bool CardUtil::hasV4L2(int videofd)
- {
-     (void) videofd;
--#ifdef USING_V4L
-+#ifdef USING_V4L2
-     struct v4l2_capability vcap;
-     bzero(&vcap, sizeof(vcap));
- 
-     return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) &&
-             (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE));
--#else // if !USING_V4L
-+#else // if !USING_V4L2
-     return false;
--#endif // !USING_V4L
-+#endif // !USING_V4L2
- }
- 
- bool CardUtil::GetV4LInfo(
-@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo(
-     if (videofd < 0)
-         return false;
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     // First try V4L2 query
-     struct v4l2_capability capability;
-     bzero(&capability, sizeof(struct v4l2_capability));
-@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo(
-     }
-     else // Fallback to V4L1 query
-     {
-+#ifdef USING_V4L
-         struct video_capability capability;
-         if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0)
-             card = QString::fromAscii((const char*)capability.name);
-+#endif //USING_V4L
-     }
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
- 
-     if (!driver.isEmpty())
-         driver.remove( QRegExp("\\[[0-9]\\]$") );
-@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-     InputNames list;
-     ok = false;
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     bool usingv4l2 = hasV4L2(videofd);
--
-+#ifdef USING_V4L2
-     // V4L v2 query
-     struct v4l2_input vin;
-     bzero(&vin, sizeof(vin));
-@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-         ok = true;
-         return list;
-     }
-+#endif
- 
-     // V4L v1 query
-+#ifdef USING_V4L
-     struct video_capability vidcap;
-     bzero(&vidcap, sizeof(vidcap));
-     if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0)
-@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- 
-         list[i] = test.name;
-     }
--
-+#endif
-     // Create an input on single input cards that don't advertise input
-     if (!list.size())
-         list[0] = "Television";
- 
-     ok = true;
--#else // if !USING_V4L
-+#else // if !USING_V4L || USING_V4L2
-     list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs");
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
-     return list;
- }
- 
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-index 832d0a8..e35b186 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const
- 
- V4LChannel *ChannelScanSM::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     return dynamic_cast<V4LChannel*>(channel);
- #else
-     return NULL;
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-index 1595d6a..4d2b2cf 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon(
-         channel = new DVBChannel(device);
- #endif
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (("V4L" == card_type) || ("MPEG" == card_type))
-         channel = new V4LChannel(NULL, device);
- #endif
-diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-index 00fd9d3..70e3469 100644
---- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-@@ -27,14 +27,14 @@ static QString card_types(void)
-     cardTypes += "'DVB'";
- #endif // USING_DVB
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (!cardTypes.isEmpty())
-         cardTypes += ",";
-     cardTypes += "'V4L'";
- # ifdef USING_IVTV
-     cardTypes += ",'MPEG'";
- # endif // USING_IVTV
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_IPTV
-     if (!cardTypes.isEmpty())
-diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
-index 3d26e0a..ea06ee7 100644
---- a/mythtv/libs/libmythtv/libmythtv.pro
-+++ b/mythtv/libs/libmythtv/libmythtv.pro
-@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32
- using_valgrind:DEFINES += USING_VALGRIND
- 
- # old libvbitext (Caption decoder)
--using_v4l {
-+using_v4l || using_v4l2 {
-     HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
-     HEADERS += vbitext/vbi.h vbitext/vt.h
-     SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c
-@@ -471,11 +471,17 @@ using_backend {
-     SOURCES += channelchangemonitor.cpp
- 
-     # Support for Video4Linux devices
--    using_v4l {
-+    using_v4l || using_v4l2 {
-         HEADERS += v4lchannel.h                analogsignalmonitor.h
-         SOURCES += v4lchannel.cpp              analogsignalmonitor.cpp
- 
--        DEFINES += USING_V4L
-+        using_v4l {
-+            DEFINES += USING_V4L
-+        }
-+
-+        using_v4l2 {
-+            DEFINES += USING_V4L2
-+        }
-     }
- 
-     # Support for cable boxes that provide Firewire out
-diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp
-index 221efef..c199b3b 100644
---- a/mythtv/libs/libmythtv/signalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/signalmonitor.cpp
-@@ -23,7 +23,7 @@ extern "C" {
- #   include "dvbchannel.h"
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #   include "analogsignalmonitor.h"
- #   include "v4lchannel.h"
- #endif
-@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum,
-     }
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
-     if ((cardtype.toUpper() == "HDPVR"))
-     {
-         V4LChannel *chan = dynamic_cast<V4LChannel*>(channel);
-diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
-index b885eaa..3d9c7ad 100644
---- a/mythtv/libs/libmythtv/tv_rec.cpp
-+++ b/mythtv/libs/libmythtv/tv_rec.cpp
-@@ -57,7 +57,7 @@ using namespace std;
- 
- #include "channelgroup.h"
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #include "v4lchannel.h"
- #endif
- 
-@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel)
-     }
-     else // "V4L" or "MPEG", ie, analog TV
-     {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-         channel = new V4LChannel(this, genOpt.videodev);
-         if (!channel->Open())
-             return false;
-@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile)
-     }
-     else
-     {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-         // V4L/MJPEG/GO7007 from here on
-         recorder = new NuppelVideoRecorder(this, channel);
-         recorder->SetOption("skipbtaudio", genOpt.skip_btaudio);
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-     }
- 
-     if (recorder)
-@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void)
- 
- V4LChannel *TVRec::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     return dynamic_cast<V4LChannel*>(channel);
- #else
-     return NULL;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
- 
- /** \fn TVRec::EventThread(void*)
-@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData)
-                                   channel->GetCurrentName());
-     }
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     if (GetV4LChannel())
-     {
-         channel->InitPictureAttributes();
-diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp
-index bc82b49..7aa47ef 100644
---- a/mythtv/libs/libmythtv/v4lchannel.cpp
-+++ b/mythtv/libs/libmythtv/v4lchannel.cpp
-@@ -16,8 +16,12 @@
- #include <iostream>
- using namespace std;
- 
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- // MythTV headers
- #include "v4lchannel.h"
-@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-     {
-         if (fmt == "NTSC-JP")
-             return 6;
-+#ifdef USING_V4L
-         else if (fmt.left(5) == "SECAM")
-             return VIDEO_MODE_SECAM;
-+#endif
-         else if (fmt == "PAL-NC")
-             return 3;
-         else if (fmt == "PAL-M")
-@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-         else if (fmt == "PAL-N")
-             return 5;
-         // generics...
-+#ifdef USING_V4L
-         else if (fmt.left(3) == "PAL")
-             return VIDEO_MODE_PAL;
-         else if (fmt.left(4) == "NTSC")
-@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
-         else if (fmt.left(4) == "ATSC")
-             return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support...
-         return VIDEO_MODE_NTSC;
-+#endif 
-     }
- 
-     VERBOSE(VB_IMPORTANT,
-@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version)
-     }
-     else if (1 == v4l_version)
-     {
-+#ifdef USING_V4L    
-         if (mode == VIDEO_MODE_NTSC)
-             return "NTSC";
-         else if (mode == VIDEO_MODE_PAL)
-@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version)
-             return "PAL-N";
-         else if (mode == 6)
-             return "NTSC-JP";
-+#endif
-     }
-     else
-     {
-@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
-         return true;
-     }
- 
-+#ifdef USING_V4L
-     // Video4Linux version 1 tuning
-     uint freq = frequency / 62500;
-     ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq);
-@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
-                 .arg(device).arg(ioctlval).arg(strerror(errno)));
-         return false;
-     }
-+#endif
- 
-     SetSIStandard(si_std);
- 
-@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
- 
-     if (usingv4l1)
-     {
-+#ifdef USING_V4L
-         VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)");
- 
-         // read in old settings
-@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
-         {
-             VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
-                     "\n\t\t\twhile setting format (v4l v1)" + ENO);
--        }
--        else if (usingv4l2)
-+        } else
-+#endif
-+        if (usingv4l2)
-         {
-             VERBOSE(VB_IMPORTANT, LOC + msg +
-                     "\n\t\t\tSetting video mode with v4l version 1 worked");
-@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting)
-     return ok;
- }
- 
-+#ifdef USING_V4L
- static unsigned short *get_v4l1_field(
-     int v4l2_attrib, struct video_picture &vid_pic)
- {
-@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field(
-     }
-     return NULL;
- }
-+#endif
- 
- static int get_v4l2_attribute(const QString &db_col_name)
- {
-@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
-     }
- 
-     // V4L1
-+#ifdef USING_V4L
-     unsigned short *setfield;
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
-@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
-         VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO);
-         return false;
-     }
--
-+#endif
-     return true;
- }
- 
-@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib)
- 
- static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- {
-+#ifdef USING_V4L
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
- 
-@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
-     unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic);
-     if (setfield)
-         return *setfield;
-+#endif
- 
-     return -1;
- }
-@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- 
- static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- {
-+#ifdef USING_V4L
-     unsigned short *setfield;
-     struct video_picture vid_pic;
-     bzero(&vid_pic, sizeof(vid_pic));
-@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
-         // ???
-         return -1;
-     }
--
-+#endif
-     return 0;
- }
- 
-diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h
-index b059c64..aa6d934 100644
---- a/mythtv/libs/libmythtv/v4lchannel.h
-+++ b/mythtv/libs/libmythtv/v4lchannel.h
-@@ -4,11 +4,11 @@
- #define CHANNEL_H
- 
- #include "dtvchannel.h"
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h> // needed for v4l2_std_id type
- #else
- typedef uint64_t v4l2_std_id;
--#endif //USING_V4L
-+#endif //USING_V4L2
- 
- using namespace std;
- 
-diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c
-index 15f8d85..4c50e8d 100644
---- a/mythtv/libs/libmythtv/vbitext/vbi.c
-+++ b/mythtv/libs/libmythtv/vbitext/vbi.c
-@@ -14,8 +14,12 @@
- //       compiling with -std=c99.  We could remove this in the .pro file,
- //       but that would disable it for all .c files.
- #undef __STRICT_ANSI__
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
- 
- // vbitext headers
- #include "vt.h"
-@@ -29,8 +33,13 @@ static int rawbuf_size;                // its current size
- 
- 
- /***** bttv api *****/
-+#ifdef USING_V4L
- #define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
--
-+#else // !USING_V4L
-+#ifdef USING_V4L2
-+#define BTTV_VBISIZE           _IOR('v' , BASE_VIDIOC_PRIVATE+8, int)
-+#endif // USING_V4L2
-+#endif // !USING_V4L
- 
- static void
- error(const char *str, ...)
-diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
-index 5d7a508..635faeb 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
-@@ -45,7 +45,7 @@ using namespace std;
- #include "dvbtypes.h"
- #endif
- 
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
- 
-@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
-     setTrigger(cardtype);
-     setSaveAll(false);
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     addTarget("V4L",       new V4LConfigurationGroup(parent));
- # ifdef USING_IVTV
-     addTarget("MPEG",      new MPEGConfigurationGroup(parent));
-@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- # ifdef USING_HDPVR
-     addTarget("HDPVR",     new HDPVRConfigurationGroup(parent));
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_DVB
-     addTarget("DVB",       new DVBConfigurationGroup(parent));
-@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) :
- 
- void CardType::fillSelections(SelectSetting* setting)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     setting->addSelection(
-         QObject::tr("Analog V4L capture card"), "V4L");
-     setting->addSelection(
-@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting)
-     setting->addSelection(
-         QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_DVB
-     setting->addSelection(
-@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting)
-         QObject::tr("FireWire cable box"), "FIREWIRE");
- #endif // USING_FIREWIRE
- 
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
-     setting->addSelection(
-         QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
-         "GO7007");
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- 
- #ifdef USING_HDHOMERUN
-     setting->addSelection(
diff --git a/media-tv/mythtv/files/mythtv.logrotate.d-r1 b/media-tv/mythtv/files/mythtv.logrotate.d-r1
deleted file mode 100644
index f69e9bcec5f9..000000000000
--- a/media-tv/mythtv/files/mythtv.logrotate.d-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/mythtv.logrotate.d-r1,v 1.2 2010/06/13 07:20:47 cardoe Exp $
-
-/var/log/mythtv/mythbackend.log /var/log/mythtv/mythfrontend.log {
-rotate 5
-weekly
-create 660 mythtv video
-notifempty
-sharedscripts
-missingok
-postrotate
-[ -f "/var/run/mythbackend.pid" ] && /bin/kill -HUP `cat /var/run/mythbackend.pid`
-endscript
-}
diff --git a/media-tv/mythtv/files/runmythfe b/media-tv/mythtv/files/runmythfe
deleted file mode 100644
index 073fad9ce3d5..000000000000
--- a/media-tv/mythtv/files/runmythfe
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if ! pgrep mythfrontend >& /dev/null ; then
-	echo >> /var/log/mythtv/mythfrontend.log
-	DISPLAY=":0.0" mythfrontend -l /var/log/mythtv/mythfrontend.log -v important,general
-fi
diff --git a/media-tv/mythtv/files/runmythfe-r1 b/media-tv/mythtv/files/runmythfe-r1
deleted file mode 100644
index 97a172af25fa..000000000000
--- a/media-tv/mythtv/files/runmythfe-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if ! pgrep mythfrontend >& /dev/null ; then
-	echo >> /var/log/mythtv/mythfrontend.log
-	DISPLAY=":0.0" mythfrontend --logpath /var/log/mythtv/ -v general
-fi
diff --git a/media-tv/mythtv/files/xinitrc b/media-tv/mythtv/files/xinitrc
deleted file mode 100644
index 78eb4b2d97fe..000000000000
--- a/media-tv/mythtv/files/xinitrc
+++ /dev/null
@@ -1,7 +0,0 @@
-# .xinitrc
-[ -x /usr/bin/nvidia-settings ] && /usr/bin/nvidia-settings -l
-/usr/bin/xset s noblank
-/usr/bin/xset s off
-/usr/bin/xset -dpms
-/usr/bin/evilwm &
-exec /usr/bin/mythfrontend -l /var/log/mythtv/mythfrontend.log -v important,general
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index 9561d28c25ad..b20ff905a8f9 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -7,8 +7,6 @@
 	<description>Do not CC me on bugs</description>
 </maintainer>
 <use>
-	<flag name="video_cards_nvidia">When combined with the xvmc USE flag,
-		enables NVIDIA specific XvMC extension usage.</flag>
 	<flag name="alsa">Allows MythTV to directly output sound to ALSA devices,
 		this is needed if you are using ALSA dmix or SPDIF. Note, you will have
 		to physically type your device into the MythTV configuration since it
@@ -59,8 +57,5 @@
 		playback</flag>
 	<flag name="xmltv">Pulls in the <pkg>media-tv/xmltv</pkg> TV listing
 		grabbers for users not using Schedules Direct.</flag>
-	<flag name="xvmc">Instructs MythTV to use XvMC for its video output. By
-		default, this will use the generic XvMC wrapper unless a specific video
-		card driver is enabled via their VIDEO_CARDS USE flags.</flag>
 </use>
 </pkgmetadata>