clean up; new dev version

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 0x767D3B1D34C2808A

4 files changed, 53 insertions, 31 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index c2a2f9c..a4608fd 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Sep 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.10.ebuild,
+  +vdr-2.3.1.ebuild, -files/vdr-2.1.10_gentoo.patch,
+  +files/vdr-2.3.1_gentoo.patch:
+  clean up; new dev version
+
+*vdr-2.3.1 (22 Sep 2015)
+
+  22 Sep 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.10.ebuild,
+  +vdr-2.3.1.ebuild, -files/vdr-2.1.10_gentoo.patch,
+  +files/vdr-2.3.1_gentoo.patch:
+  clean up; new dev version
+
   20 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.1.ebuild,
   -vdr-2.1.2-r1.ebuild, -vdr-2.1.3.ebuild, -vdr-2.1.4.ebuild,
   -vdr-2.1.5.ebuild, -vdr-2.1.6.ebuild, -vdr-2.1.6-r1.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 9a937d9..9a98a5d 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
-AUX vdr-2.1.10_gentoo.patch 2321 SHA256 57e718074a07f11207d52db465afb05cc61100a7522c6413025e9d0ac49045c2 SHA512 2f6e2076779d4ce6cf22f5fb02d26bd991d12917d0769558ace8dbac528785a70bc10e5f2511ef506419e2b595eab30495f06a3ae769a0242a47397815150bf1 WHIRLPOOL d5fe4cce932a9ff784d10dcd237a849ce6dfb4399d54d2e601917b3f570a94c844529451339e43d6559b2461109b4080a6b8e4c48dbc1c570589c0e139c5bd21
-DIST extpng-vdr-2.1.10-gentoo-edition-v1.patch.bz2 26220 SHA256 a707bcceb53a1a33457cd550762d4829bff70863b118e39c65dc4fc6cbc77a9b SHA512 de2e00ee1eaa9641ffdc6c33b8d3cc5286f852e9e865687d696b627b2b46e843c10c5e875d97878669dc4a2b8b5f65221f6818fb11a08378d6c54f19684e5b16 WHIRLPOOL 30eb7704a9d1aa1040192e96c7ffddc287818a8b4cd78c5d46f2d2b11bb01b780cafcea82c74079f83bcd431042180cd8dec32cf03bcb38404c1d38e3d7a8390
-DIST vdr-2.1.10.tar.bz2 918164 SHA256 3a2f8f96586566dc40b7e11c252643957d1e2456914deddea1080240f58d5ad8 SHA512 1c7faef55bcbd7f5cfca4863fa222ba0af5feec0d8c26f2dd6c1b1c78b66495d6e7670ea2d3fef624fb6b6517099596cd40cf87401176513e870d016e5bc50ce WHIRLPOOL a0731c22d4a0576bc6a366e3a3d87631ae1a1b44e26b91c64817a2d8c6603633b873ab027f6809e4e7003010b9b5b92cbf20f76e351d4ab9bd711c8fd1fe2f8c
-EBUILD vdr-2.1.10.ebuild 7559 SHA256 5b4bec2e02bc2d25ad1ebc59be17d83943777e5fe836c456e6ae13b07014e1ef SHA512 a2b5da1b81d51db59b1e4261de1083385e2b64704929ba8e744f2341049cde300955893869a0383ae240d5650ae29a310ca2bc5984d632044f3d109f7fc4b696 WHIRLPOOL 00b226e23e8a1cbfe71d6505c99ab601f8294a3d5b8e966e8bba9ad450e27a809ed4787782c2d9c1ef7f071bba6291982182adc6d09b04a086dfdd01412abc51
-MISC ChangeLog 28437 SHA256 361bf8962db011602fdf6ebf1988556416d146dd1cf599e6b3180ce992cd0806 SHA512 86cd60bb3a0e9c095f7a808e21157161b3c1d261c5fa932e1cb38d5e89931176cfb35ebdc558a0f437c746452964ff5c207182900546e640e3a60a3d0969198d WHIRLPOOL c0aa067fb6b8c87ba6aa95b996f4dacba400bf6070abc3d55057c9762ef9f346164971c68f2292d853fe3d6996ae730aca178085bc9924623fd7afcb840f1510
+AUX vdr-2.3.1_gentoo.patch 2321 SHA256 57e718074a07f11207d52db465afb05cc61100a7522c6413025e9d0ac49045c2 SHA512 2f6e2076779d4ce6cf22f5fb02d26bd991d12917d0769558ace8dbac528785a70bc10e5f2511ef506419e2b595eab30495f06a3ae769a0242a47397815150bf1 WHIRLPOOL d5fe4cce932a9ff784d10dcd237a849ce6dfb4399d54d2e601917b3f570a94c844529451339e43d6559b2461109b4080a6b8e4c48dbc1c570589c0e139c5bd21
+DIST extpng-vdr-2.3.1-gentoo-edition-v3.patch.bz2 26475 SHA256 5f4ee97963a2b156f6356773d0c1b4d1def5bc9e098471d44b6e250dd674849b SHA512 83d4fa26390bfb5af3c409563bcdfa25d5aa181acb6847d95044ed951674c95a803a462dbe290df463084187e6c9f496bc01cf06cd4a108497323be0404fe9e8 WHIRLPOOL d3a2e93fa843c3c6f72fad3f80d30b794767bdfdd9c99b499c1c65f3e7d4c84349c17863521577c23783a3f81ba83f48e838df32950d832a1dc625cac5de3dd2
+DIST vdr-2.3.1.tar.bz2 891255 SHA256 456d3f0ceb699b92ebeaf9ff4c0c68979724d10b01a89d5250133e6f4c262fa7 SHA512 525078247da68da8b3530d61c6c48cf4920c39b9603bc8a6d8c51f69d2b507a40951412606e3f85648ac8d64e28f1553c8f2fe8be80325e4ec880b2a4e564248 WHIRLPOOL 976ef0f291f9d0c55c9d381252e4e8a7872bc7ede719f8d24bd0b0529ce79838a5ca93b4a037a844ba0df206bf58a66f32b90c915eb67f11619578babb72bf3b
+EBUILD vdr-2.3.1.ebuild 8449 SHA256 ecd452cd77e48860b3543b094ced7cd96088a30eea7200aded36c5137c483aa2 SHA512 146a95645c624070794f5107ef5faedd556afd48f11eb9e1f3d5137cf3f85dffb3cc1228ead46f28a88686ca21c6c0bc806af1883b3efd0d8f233f2ee5178d73 WHIRLPOOL 3711a48bceffabb9af2ecfdbb023ffe205bdf88433b6c1803396413f9d9c066dfc82e78c40b51732ad15bb562787fc8da2405fb97b5c025b633221d554e80484
+MISC ChangeLog 28843 SHA256 4638b70ef7636a9f003a07a9b391d2e6469445999389530c580b9f47a029e94c SHA512 4ce8b22b8310567a0b2bc071e2d901ceb8f4194ebff2e523b49708827608087872ec5323bf83e71785d8654dc9015d26a0db6f6f217caef4a1d435865504cdf0 WHIRLPOOL 94b82948a0a404c46102417e0822d4a7296dcb507bc5fa97f2a64bc9218e22456a7109806c85cdaf01edcf34a835f7eb3a05c87340fd5046e5ccce0243bbc94a
 MISC metadata.xml 2138 SHA256 f570942c815bde637718a12a161b73dd50d7a418e169843ce8636c28dee11980 SHA512 d6545bbad63f5a7b64142248b733bb4ee74887063d3710ea1636e4da9ff89b01097ca2e95fc4603ed08167169235711ff83223554ad0f3cfc86640ee9b146bcb WHIRLPOOL cff75527edb8443764873500456a37bc08e9d901078b1352f67f23b73ad880a17d48f83e7004024cadd51e6002961b3eaab6312e79428706c6793d5bc043a714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFU5tjZdn07HTTCgIoRCF0hAJ9Jmw0AZVkCtKeLAXzJUIB8zDkbTgCbBueH
-G4/GJ0UVNmRNaEh7kHON0MA=
-=O+nm
+iD8DBQFWAaTQdn07HTTCgIoRCHYdAKCTr2qRb9and8RawKEeoiXwzudhwQCgq+Vp
+s03ZX5dIlhvJaUHvalHifGU=
+=VReI
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-2.1.10_gentoo.patch b/media-video/vdr/files/vdr-2.3.1_gentoo.patch
index 810bfaa..810bfaa 100644
--- a/media-video/vdr/files/vdr-2.1.10_gentoo.patch
+++ b/media-video/vdr/files/vdr-2.3.1_gentoo.patch
diff --git a/media-video/vdr/vdr-2.1.10.ebuild b/media-video/vdr/vdr-2.3.1.ebuild
index 0280ab1..e67f9b4 100644
--- a/media-video/vdr/vdr-2.1.10.ebuild
+++ b/media-video/vdr/vdr-2.3.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.2.0.ebuild,v 1.5 2015/03/30 13:25:58 hd_brummy Exp $
 
 EAPI=5
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
 # Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
-				mainmenuhooks menuorg menuselection resumereset ttxtsubs"
+EXT_PATCH_FLAGS="pinplugin graphtft naludump mainmenuhooks menuorg menuselection resumereset"
+#tmp disabled: alternatechannel permashift_v1 pinplugin ttxtsubs (-> channels)
 
 # names of the use-flags
 EXT_PATCH_FLAGS_RENAMED=""
@@ -16,13 +16,13 @@ EXT_PATCH_FLAGS_RENAMED=""
 # names ext-patch uses internally, here only used for maintainer checks
 EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
 
-IUSE="bidi debug kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+IUSE="bidi debug +kbd html systemd 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/"
@@ -33,7 +33,7 @@ KEYWORDS="~arm ~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="virtual/jpeg
+COMMON_DEPEND="virtual/jpeg:*
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2"
@@ -44,7 +44,7 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-2.5_rc1
+	>=media-tv/gentoo-vdr-scripts-2.7
 	media-fonts/corefonts
 	bidi? ( dev-libs/fribidi )
 	systemd? ( sys-apps/systemd )"
@@ -145,6 +145,7 @@ src_prepare() {
 		DVBDIR			= ${DVBDIR}
 		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
 		CONFDIR			= ${CONF_DIR}
+#		ARGSDIR			= \$(CONFDIR)/conf.d
 		VIDEODIR		= /var/vdr/video
 		LOCDIR			= \$(PREFIX)/share/locale
 		INCDIR			= \$(PREFIX)/include
@@ -254,6 +255,7 @@ src_install() {
 	DESTDIR="${D}" install || die "emake install failed"
 
 	keepdir "${PLUGIN_LIBDIR}"
+#	keepdir "${ARGSDIR}"
 
 	# backup for plugins they don't be able to create this dir
 	keepdir "${CONF_DIR}"/plugins
@@ -262,32 +264,40 @@ src_install() {
 		dohtml *.html
 	fi
 
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+	nonfatal dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
 
 	insinto /usr/share/vdr
 	doins "${CAP_FILE}"
 
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
+#	if use alternatechannel; then
+#		insinto /etc/vdr
+#		doins "${FILESDIR}"/channel_alternative.conf
+#	fi
 
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
-pkg_preinstall() {
-
-	has_version "<${CATEGORY}/${PN}-2.2"
-	previous_less_than_2_2=$
-}
-
 pkg_postinst() {
 
-	if [[ $previous_less_than_2_2 = 0 ]] ; then
-		elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
-		elog "\tA lot of thanks to Klaus Schmiedinger"
-		elog "\tfor this nice piece of Software...\n"
-	fi
+	eerror "WARNING:"
+	eerror "========\n"
+
+	eerror "This is a *developer* version. Even though *I* use it in my productive"
+	eerror "environment, I strongly recommend that you only use it under controlled"
+	eerror "conditions and for testing and debugging.\n"
+
+	eerror "*** PLEASE BE VERY CAREFUL WHEN USING THIS DEVELOPER VERSION, ESPECIALLY"
+	eerror "*** IF YOU ENABLE THE NEW SVDRP PEERING! KEEP BACKUPS OF ALL YOUR TIMERS"
+	eerror "*** AND OBSERVE VERY CLOSELY WHETHER EVERYTHING WORKS AS EXPECTED. THIS"
+	eerror "*** VERSION INTRODUCES SOME MAJOR CHANGES IN HANDLING GLOBAL LISTS AND"
+	eerror "*** LOCKING, SO ANYTHING CAN HAPPEN! YOU HAVE BEEN WARNED!\n"
+
+	eerror "The main focus of this developer version is on the new locking mechanism"
+	eerror "for global lists, and the ability to handle remote timers."
+	eerror "Any plugins that access the global lists of timers, channels, schedules"
+	eerror "or recordings, will need to be adjusted (see below for details). Please"
+	eerror "do initial tests with plain vanilla VDR and just the output plugin you"
+	eerror "need.\n"
 
 	elog "It is a good idea to run vdrplugin-rebuild now."