Rename pluginprams back to iptv and liemiext back to liemikuutio.

(Portage version: 2.1.6.10/cvs/Linux i686)

3 files changed, 24 insertions, 11 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 3efa025ce431..8e7187b4b7a7 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.126 2009/03/24 19:45:57 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.127 2009/03/25 20:42:56 zzam Exp $
+
+*vdr-1.6.0_p2-r2 (25 Mar 2009)
+
+  25 Mar 2009; Matthias Schwarzott <zzam@gentoo.org> metadata.xml,
+  -vdr-1.6.0_p2-r1.ebuild, +vdr-1.6.0_p2-r2.ebuild:
+  Rename pluginprams back to iptv and liemiext back to liemikuutio.
 
   24 Mar 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-1.6.0_p2.ebuild:
   Marked stable on x86.
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index b98659a5a760..97e2a01f4d16 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -34,10 +34,9 @@
 		<flag name="em84xx">Add support for em84xx plugin</flag>
 		<flag name="graphtft">support for grapftft plugin up from vdr-graphtft-0.1.7</flag>
 		<flag name="hardlinkcutter">Speed up cutting by hardlinking unchanged files</flag>
-		<flag name="iptv">Enables support for vdr-iptv</flag>
+		<flag name="iptv">Enables channel parameters for vdr-iptv and other input plugins</flag>
 		<flag name="jumpplay">Enables automatic jumping over cut marks while watching a recording</flag>
-		<flag name="liemiext">Formerly known as AIO (all-in-one) patch, with additional changes from extensions patch</flag>
-		<flag name="liemikuutio">Formerly known as AIO (all-in-one) patch, adds some nice must haves</flag>
+		<flag name="liemikuutio">Formerly known as AIO (all-in-one) patch, adds some nice must haves, plus changes from extensions patch</flag>
 		<flag name="lircsettings">Allows to change lirc settings delay, freq and timeout values in OSD</flag>
 		<flag name="livebuffer">does timeshifting/background recording all the time, allows to rewind live TV</flag>
 		<flag name="lnbshare">Enables support for two or more dvb cards sharing the same cable to the lnb</flag>
@@ -47,7 +46,6 @@
 		<flag name="noepg">Adds code to selectively disable epg-reception for specific channels</flag>
 		<flag name="osdmaxitems">Support for text2skin</flag>
 		<flag name="pinplugin">Support for pin plugin</flag>
-		<flag name="pluginparam">Enables parameter support for vdr-iptv and maybe also other plugins</flag>
 		<flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag>
 		<flag name="settime">set system time per script instead of via syscal</flag>
 		<flag name="setup">Enable support for the plugin vdr-setup</flag>
diff --git a/media-video/vdr/vdr-1.6.0_p2-r1.ebuild b/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
index a6d8c05618ab..f1c1f6de63c9 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r2.ebuild
@@ -1,21 +1,26 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r1.ebuild,v 1.2 2009/03/24 19:28:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r2.ebuild,v 1.1 2009/03/25 20:42:56 zzam Exp $
 
 inherit eutils flag-o-matic multilib
 
 # Switches supported by extensions-patch
 EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
 	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
-	pluginparam
-	jumpplay liemiext lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
+	jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
 	rotor settime setup sortrecords sourcecaps livebuffer
 	ttxtsubs timercmd timerinfo validinput yaepg
 	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
 	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
 	cmdreccmdi18n softosd"
 
-IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS}"
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
+
+IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
 
 MY_PV="${PV%_p*}"
 MY_P="${PN}-${MY_PV}"
@@ -241,7 +246,9 @@ src_unpack() {
 			local IGNORE_PATCHES="channelscan pluginapi pluginmissing"
 
 			extensions_all_defines > "${T}"/new.IUSE
-			echo $EXT_PATCH_FLAGS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
+			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+					$IGNORE_PATCHES | \
+				tr ' ' '\n' |sort > "${T}"/old.IUSE
 			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
 			if [[ -z ${DIFFS} ]]; then
 				einfo "EXT_PATCH_FLAGS is up to date."
@@ -259,6 +266,8 @@ src_unpack() {
 		for flag in $EXT_PATCH_FLAGS; do
 			use $flag && enable_patch ${flag}
 		done
+		use iptv && enable_patch pluginparam
+		use liemikuutio && enable_patch liemiext
 		eend 0
 
 		extensions_add_make_conf
@@ -269,7 +278,7 @@ src_unpack() {
 
 		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
 
-		use pluginparam && sed -i sources.conf -e 's/^#P/P/'
+		use iptv && sed -i sources.conf -e 's/^#P/P/'
 	fi
 
 	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR