new extpng patchsetM use-flag/patch setup removed, please use use-flag menuorg and depended plugin vdr-menuorg

(Portage version: 2.2.1/svn/Linux i686, signed Manifest commit with key 34C2808A)

svn path=/vdr-devel/; revision=1233

4 files changed, 46 insertions, 31 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index dd994a7..4450d5c 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.2.ebuild,
+  +vdr-2.1.2-r1.ebuild, metadata.xml:
+  new extpng patchsetM use-flag/patch setup removed, please use use-flag
+  menuorg and depended plugin vdr-menuorg
+
+*vdr-2.1.2-r1 (25 Oct 2013)
+
+  25 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.2.ebuild,
+  +vdr-2.1.2-r1.ebuild, metadata.xml:
+  new extpng patchsetM use-flag/patch setup removed, please use use-flag
+  menuorg and depended plugin vdr-menuorg
+
 *vdr-2.1.2 (22 Oct 2013)
 
   22 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.2.ebuild:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 44fa643..ab4f897 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -4,19 +4,19 @@ Hash: SHA256
 AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
 AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
 DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
-DIST extpng-vdr-2.1.2-gentoo-edition-v1.patch.bz2 55618 SHA256 c0ae59dccd663f03196c9ac4e937f0a6deee9255c1ed53616272c70920f474c1 SHA512 37e8192c3fccc61d2ea6b3b7fd4f3150355d54444dc97df1d5264b3b667660c47ce4d9827a526d894a7fcda52db22a0c2e3373e43077f385baec888bb33861ae WHIRLPOOL 16a70a368aa6ce38bb3b225bf8168ff0127b39107e22a238e675dffed3ffca585fb4a6000f1dbf20b372a47437710639898ad96cf5d7a0f0a388fc516cb8ce3f
+DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
 DIST vdr-2.1.1.tar.bz2 842414 SHA256 96292f4f2a47fea9fdd432bdcca6e2f11747e2b19feac6d6f7af1797c5abfa37 SHA512 f31c774cc5c383b97cdae98892906c66ce27a2277ccde185815299ddd894e18908a6c252c92bddfefb82a8fe933c9c2b5e6f91947db526bb86bab9ff08cb8158 WHIRLPOOL e92705b8fec477a4e10c563f4440ba54ccb499823b15a6227ac2633fc55a56fad023b6f8b5d4450505344dfb5a1871ceb3a787c9e9470c178f947874fc79eef0
 DIST vdr-2.1.2-gcc.patch.gz 542 SHA256 8ac11be7074231604868e5f4a153df44b957543227c4cb0fcadbf693900b25d8 SHA512 4b3595e3ed3ef291bf155500d96d3355656f11442bc9a9a13ddbdfc35ae3156a894c12da1f4a20bdf6a7e35c3cb0904ab1c5c2d14698ffe6595ffc9d5b37a2ad WHIRLPOOL 96cbcea605e52a76974196f5a7ec44b49222f0fb3048428286ab974ec6633e4bdd6523796a0109ba866aaba101b270b099dc4983b439d6ad84c00890cb7078d8
 DIST vdr-2.1.2.tar.bz2 850237 SHA256 1bf9c636145acf2d67716475314efe9703619759f0fdbae02d89fe599730f2a4 SHA512 4e9bf4705a64d4fab790d6cf0b92151537e282a8a3a41eeb13cddf3a966b303b31fc32fd62b27450adc68134ca853aaa6dd5b6d7a9c672c6165aab9f044c19b5 WHIRLPOOL 525ce8c05cbaeb9f3d8108117fb18dc5b64885e311c3a40dd704888b0a5020cb3ef6fcd9d57af200d94ffc0479add8c6a651791885ff67f7f93cf45a0aec1d8b
 EBUILD vdr-2.1.1.ebuild 8510 SHA256 9fddd9a6218bb25ca72549dd149830e223cf6f54602e81b74cd4f54c44c94cad SHA512 ca5f1d29283fd387f09f4b8e995357e51a1631f0e53df8324941467b83d80d79ccf86c38cb01ee27f75628d77a34408a3751552b17d443d143b7c29dd8b29d7d WHIRLPOOL b7ee621ded1e9d277be0e6184a2b9b3dcefba48f4987735ba46a7910165ab5cecedeeb22ed66b5f5c2c1fbad406803f0b0f41b6509f959a51bb33e204989415e
-EBUILD vdr-2.1.2.ebuild 8267 SHA256 09f79b9a66db1f27154248adbff76309f23d311566e231d3ad12bfaac798630e SHA512 b00c285d9a30eab595ff5af499921997ab394a514b02479b39dca32bdd5330ac96f20fc1c8ad831ebaf5a9cd2d420a70c2bf4721be0a231508fbaf0e160f598a WHIRLPOOL 771eb21ac04da56f46db79dc5ce4756b9e4a4eecf2c72874be815558b2f2af47b1ed913ea8e3277d180d135d5410005460121299b65e8db8e2de95bf9e82ef71
-MISC ChangeLog 24626 SHA256 95405d6d9694a7fe9f5c1a89fd5e45d816e3173b35d9a861562f34d029725516 SHA512 d5792a48995c1d2814d2192d140eb504fe4594699a330ff1d94552a18eb482333a4e4c27ab72135ba9cf2d156e97b25e9c2e52d42dc0a0a846f857b5d8c086ea WHIRLPOOL 04564ea2b3e843ada8e084f357f282aee04a77176bc96b053c948da848e3147ff0fc5c315c8d5e858a2762e5d3b1505f583a64aa5b2a07be47386e3c28b6567c
-MISC metadata.xml 1814 SHA256 23b5cbdd7a57c4de4d9c47d88234ab23899a3a1be5a558bf27e220763d744d3c SHA512 f447b29c29131b58a57bdd144492a62f23e11c43589ed4bca768e69106ebe4efa74319d9602ccfde99794e46a9eae85530a81084fa32061106d0415010f316a9 WHIRLPOOL c472e51f5cc8d803ab55fc3053c14578d53fd0ded32e8dc9041215ba55f1afb73cdb84d6daced6970af092b9426c2445dcae8ce914bcc02ff36270029f8f09fb
+EBUILD vdr-2.1.2-r1.ebuild 8322 SHA256 7b77616923a0212967836a0b30810c52681feea8e16000733215f80a2c206a01 SHA512 c9bb2515fbc33b315878e3df98368fb7e958f2d1ce61c87c0a1cbf96a1475829fe2e6f0ff86db7cd01a5088a77e33d1c4ddc2b2d6eea2f557f5c313599f91b09 WHIRLPOOL e8db319fb68bf8ead28c76b024dad83c30280325d19bd0d23f75df263f62682bed1cc60661904cd441c74e46f1c8682c1e41354dabbdcb9ce7d8dc7dc0cc7000
+MISC ChangeLog 25111 SHA256 e19bd843a78934eb5b6b73a43b68eae2a1221ef5a66a56016cf8366fb64ff381 SHA512 7e5bc8546388b878627692fddb45a5b05e74f64f64256690ba08c728f95c3573a6b13d230c30a2de15d231d0ff5a02527952cb918ad9555a8251447679e394a0 WHIRLPOOL 360152d35ecab70f49c95f50d5032cf31cf934d35b7acead906d64dc2c6e0967c9549fab2f3fcf502e4f1c6cbcbce475448c351b39ec47b6cab7413829cf6c01
+MISC metadata.xml 2029 SHA256 efb4f6113bab04065e6e8795a71b77851b054fe1fa419086afc1b8c286e35299 SHA512 466e66fdfd21458fce40bdfbff9282b7dfac8c1e9466a2e9f51c993b209b4c6d6cddff6cf65cb663912276f9d955d1458aa45460bba5048bd02381c71311f076 WHIRLPOOL e13e003577356cff779a0b49144ecfe6f564381e10a9e113b3cb150c47f329bf32a13f98a2d4655047bc2419e393b7f6305fce77b25631f6ea7580ea7137aac8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: signed/commited by hd_brummy@gentoo.org
 
-iD8DBQFSZwqFdn07HTTCgIoRCFJ1AJ9glKokWjuxt3dDA6xzYSm5zwQJDwCgknVq
-Ww0CYxOBr5p2/eAXk7rUUSs=
-=zJKt
+iD8DBQFSava0dn07HTTCgIoRCPLQAJ9yL600iee892YWP8dH+/Bmx5kXQgCfQJsZ
+pWaMsBtt0oBlofnsMlwhR+0=
+=LUrS
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index e270a28..5248405 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -10,6 +10,7 @@
 	<use>
 		<flag name="alternatechannel">Use alternate channel on record</flag>
 		<flag name="bidi">fribid support, for languages, written from right to left</flag>
+		<flag name="binaryskip">add supports for binary skipping in records</flag>
 		<flag name="ddepgentry">remove duplicate EPG entries</flag>
 		<flag name="dvlvidprefer">controls video-dir choice on recording</flag>
 		<flag name="dxr3">Enable tweaks to improve vdr behaviour on dxr3-cards</flag>
@@ -19,9 +20,11 @@
 		<flag name="jumpingseconds">skip seconds in played records</flag>
 		<flag name="mainmenuhooks">Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)</flag>
 		<flag name="menuorg">Enables support for the menuorg-plugin</flag>
+		<flag name="menuselection">adds support for menu hotkeys of double digits</flag>
 		<flag name="naludump">Removes NALU fill data from h.264-Streams of TS files</flag>
 		<flag name="permashift">permanent timeshift by recording live TV on hard disk, need plugin vdr-permashift</flag>
 		<flag name="pinplugin">Support for pin plugin</flag>
+		<flag name="resumereset">rreset resume of EOF</flag>
 		<flag name="setup">Enable support for the plugin vdr-setup</flag>
 		<flag name="ttxtsubs">support for ttxtsubs plugin</flag>
 		<flag name="vasarajanauloja">replacement for the liemikuutio patch, adds some nice must haves features</flag>
diff --git a/media-video/vdr/vdr-2.1.2.ebuild b/media-video/vdr/vdr-2.1.2-r1.ebuild
index 517ab8a..11cc5db 100644
--- a/media-video/vdr/vdr-2.1.2.ebuild
+++ b/media-video/vdr/vdr-2.1.2-r1.ebuild
@@ -7,9 +7,9 @@ EAPI="5"
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 # Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry graphtft
-	jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift
-	pinplugin setup ttxtsubs wareagleicon yaepg"
+EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift 
+		pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
+# ddepgentry setup
 
 # names of the use-flags
 EXT_PATCH_FLAGS_RENAMED=""
@@ -17,13 +17,13 @@ EXT_PATCH_FLAGS_RENAMED=""
 # names ext-patch uses internally, here only used for maintainer checks
 EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
 
-IUSE="bidi debug dxr3 html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+IUSE="bidi debug  html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
 
 MY_PV="${PV%_p*}"
 MY_P="${PN}-${MY_PV}"
 S="${WORKDIR}/${MY_P}"
 
-EXT_P="extpng-${P}-gentoo-edition-v1"
+EXT_P="extpng-${P}-gentoo-edition-v3"
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"
@@ -35,14 +35,14 @@ KEYWORDS="~arm ~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-REQUIRED_USE="setup? ( !menuorg )
-	menuorg? ( !setup )"
+#REQUIRED_USE="setup? ( !menuorg )
+#	menuorg? ( !setup )"
 
 COMMON_DEPEND="virtual/jpeg
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
+	>=media-libs/freetype-2"
+#	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
 
 DEPEND="${COMMON_DEPEND}
 	>=virtual/linuxtv-dvb-headers-5.3
@@ -55,7 +55,7 @@ RDEPEND="${COMMON_DEPEND}
 	bidi? ( dev-libs/fribidi )"
 
 # pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )"
+#PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )"
 
 CONF_DIR=/etc/vdr
 CAP_FILE=${S}/capabilities.sh
@@ -273,10 +273,10 @@ src_install() {
 		doins "${FILESDIR}"/channel_alternative.conf
 	fi
 
-	if use setup; then
-		insinto /usr/share/vdr/setup
-		doins "${S}"/menu.c
-	fi
+#	if use setup; then
+#		insinto /usr/share/vdr/setup
+#		doins "${S}"/menu.c
+#	fi
 
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
@@ -307,16 +307,16 @@ pkg_postinst() {
 
 	elog "It is a good idea to run vdrplugin-rebuild now."
 
-	if use setup; then
-		if ! has_version media-plugins/vdr-setup || \
-			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
-			echo
-			ewarn "You have compiled media-video/vdr with USE=\"setup\""
-			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-		fi
-	fi
+#	if use setup; then
+#		if ! has_version media-plugins/vdr-setup || \
+#			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
+#
+#			echo
+#			ewarn "You have compiled media-video/vdr with USE=\"setup\""
+#			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
+#			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
+#		fi
+#	fi
 
 	elog "To get nice symbols in OSD we recommend to install"
 	elog "\t1. emerge media-fonts/vdrsymbols-ttf"