bump; use-flag setup and depended plugin vdr-setup will be removed in the future, use as equivalent plugin vdr-menuorg

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

3 files changed, 385 insertions, 5 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 4fe32e269cd3..aa1adcf46261 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.178 2014/01/02 17:46:48 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.179 2014/01/20 18:40:31 hd_brummy Exp $
+
+*vdr-2.0.5 (20 Jan 2014)
+
+  20 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.0.5.ebuild:
+  bump; use-flag setup and depended plugin vdr-setup will be removed in the
+  future, use as equivalent plugin vdr-menuorg
 
   02 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.0.2-r1.ebuild,
   -vdr-2.0.3.ebuild, vdr-2.0.4.ebuild:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 40d356832869..bc3dc396ad2a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -20,16 +20,18 @@ DIST vdr-1.6.0-1.diff 6750 SHA256 82fc1f30f8b13568478e51c57d117d8c1c8c644aee9416
 DIST vdr-1.6.0-2.diff 17906 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef SHA512 b41ff619ecb173b8e17ede2f153c76464529bdcb3d53dff0b7edc4786486d7df57cd51becbe1693b0e5f669e96c08829b8ddccac7a33151d1218604087fbb1fd WHIRLPOOL 2d5475ee44cb44e3b4b39ae4439d1457b986632420769ad9f4c7de474d38234e8dda6534ef8bcace537b491cf14105d26fcaddc8f087729797cfcba85ba0abe2
 DIST vdr-1.6.0.tar.bz2 593172 SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6 SHA512 1b3d4280038399f622e6aaa1a2edcc288caaa19a886c0b26bdb5764a93700be5647d4231cc13797594d52769010e61158ceedbff5d9520a66c74cabdba1e4154 WHIRLPOOL 2725662dacacddcde5800fa79b057f03b3bf7538cdd189eeda04a78b4a17a130de4c322c0efb007684205f9305b93c68882a87c409884de907609a0826182b8f
 DIST vdr-2.0.4.tar.bz2 836834 SHA256 4c1ab2e7fa01c95ff83feec7601ad7241a256f05f7d15ef1d79b5b84b84f9ea3 SHA512 b64bbb61eb049b5f34c351b1ca0d77a93830dd8ca6fdec81becbc3be01f833512852c59e7e5290708d9f7b9bfb46d573d269300ffd025cc791263ff7323a632b WHIRLPOOL 113542272970fa1413b8ec296445eb198e319bba5dfa0c24a0e193afffff3cdcca563ae98c2b2bc4d49d779f401ba93c1e3aa0268f2a10d2b495e3e5d4be9c00
+DIST vdr-2.0.5.tar.bz2 837135 SHA256 04490e31241c3ba1e26cdc1bf7ab119fa08b2a0ebe07a9082b4a48e30a3b25ea SHA512 4a6d6f86648891c474a1af948ecc14c8f2c7b7e44356f4237fc96f962a3a778fdba4b30c26966e97dbaa17c1c809898de4e50583c8c950dd9cb27409a4b401df WHIRLPOOL b79a26c522feb062021080b8888158e8ca0ccc43759841a8b59e6ca94c7b6004e3445edab2e34c760338518510e169ea1214371ceb8736470defab0662d2cb7c
 EBUILD vdr-1.6.0_p2-r11.ebuild 11650 SHA256 368aae809fecd97b76f201943a8f53acf0949d170cbf937187d120f5b88cbef3 SHA512 28cfb43e2689105461f0767d2a7f6cda6b09adfc4c4122ea05f3464ef3bc64a9fe2046ae63b096e85ed2531689a74fab26a061731cbca3f816e9ccea8ad2784e WHIRLPOOL e6c95202c585a02fb66af92bcb04ff0f26a03f849dc40a021cde5d7122afc7cceb02a12150afda6ab4891352907abf08e7afa5416cfe9c9df1e6d72312167193
 EBUILD vdr-1.6.0_p2-r7.ebuild 11509 SHA256 8d84d6f4b5ed519db0cc1882f67b9e8e5611ec2e403dc4ce6b70f329119ae0c8 SHA512 9f6f6ab7116fba92527ad1a890b8e4b7bcc1421b49806c925f3f816e7cdb5e4a5c89ee2033168d239dec6bc25b8db42900feef5bb779648b24131bd8544a151c WHIRLPOOL 8f693c8e834a7837dd3cbdcbd072ab4d5f014a8d8d03f7bf449c84d5d8830f3119913f86c59820de10ab0eaaaec689dc51c4308d0f466e60d2300c30117b0a8b
 EBUILD vdr-2.0.4.ebuild 10155 SHA256 0f42b7af9fb0f1c7f0a4fe1d368108e0590f714d552d0af2aa17c0387a7e66e0 SHA512 056078c372f8070d90d2133f159a8663ea05bedcd0db4d024d483c98979cec5e784fbece6fa78ac19c3e56021812fbdd8c91c6e0ed1fe92df738f8595f955554 WHIRLPOOL fc6132e5fdec6e572a7a5bece5d9505ca06d38fe569fa4814e3e9d5dca53323b3d21f0246baaa8348d554135721ea7c0805070d33230138f305605a9231d9fda
-MISC ChangeLog 32338 SHA256 32cd68a3e0e81fed432f38e11c078fa8a6bc0f2ed51f9a350c4ed6b2c405df18 SHA512 c1e809af618648e13b765d3cf9b362e5b50a166a51d02250600f67c27c9ebb994c420163036451c821fa514ccc745fc08e60334e347e1d4d7435ac80ad5f9bc0 WHIRLPOOL 30001dd71fb3ca1af631a954558cdd2858d9c218bb1070ce8bff9f7ccbb7c69ca3cc49269b5fc30b5707cd407c0116639cdb03db3d005effc2c76d87ecc46cd2
+EBUILD vdr-2.0.5.ebuild 10427 SHA256 7d5a2e57aad2313fb98b05969a6db2d9dc3ec50f0a1b2ce1c24a3ae670eff962 SHA512 d0c15555dee7aef96bc67a2690dd8cbc9efc0770388551c027bc97d9426874beb711c088d9f9185545bf91d3ae39825ce6ada32f0d4b6bcfdb9b34a1a5ce9ba6 WHIRLPOOL 42df21f8f8c1466b6e404ac3423e8223c25df848d5c9b7e8b9e772bc9720dbd28d76ab7da07f352206ca020de6a5903bf3aae9edbfdd4adca7b0e251fcf4edea
+MISC ChangeLog 32562 SHA256 4f6ed3b753b548bde5f358ca8ae615d5a418fb7870d0dcc3635edb2ade727766 SHA512 861b2b84807bfeb0e410d1155ac2757382614503c15cbbc2272a4c51173a53f0ad328396960914e429b6c130e2a47487a0553d63ca60b18264e4339bd15b2752 WHIRLPOOL 0de4b8777b59376ac5007772be045ab6cbebf8d5e113aae3444f573172c18078b15d23620506327f2b2a1e3e88a625d46a57fb8fbbbb47782f07ed9ba245bd01
 MISC metadata.xml 4842 SHA256 61084e6d2fcf848f378cfa5dfd74ff71ce7fb4f60d5da533b55d00f0d931ed3b SHA512 eb1df58cf1ee44d32e94ea4ecaa2d4f2f4931208ac5ef4f4c982c8712cdaa626905e24e2e5fa55a833ef67da5060e73bc0741ac3e943d3100ce97f669aa2b474 WHIRLPOOL 98f532466971cf6ffbdf56446cc45986227abc5b01b85be42c278e3b350afcf01a3e7a6a21fdf781425d822a424b1131e697392101d249aaad4aa59b92ba0393
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFSxaYPdn07HTTCgIoRCEN+AJ0f54irgRavFId4NO6cHkcvxq0IpgCgoIes
-PQIKf70LpFvVN8lg5X6FSAU=
-=+SYf
+iD8DBQFS3W2mdn07HTTCgIoRCASGAKCUY0vGcPSiNF42YV5PdepcfmYSsQCdEnim
+gdzO5uYvalFmUf1Wx6fNlPk=
+=PTvY
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-2.0.5.ebuild b/media-video/vdr/vdr-2.0.5.ebuild
new file mode 100644
index 000000000000..ec0b53cc12ec
--- /dev/null
+++ b/media-video/vdr/vdr-2.0.5.ebuild
@@ -0,0 +1,372 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.5.ebuild,v 1.1 2014/01/20 18:40:31 hd_brummy Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
+	jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift
+	pinplugin rotor setup ttxtsubs vasarajanauloja wareagleicon yaepg"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
+
+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-${PN}-2.0.4-gentoo-edition-v1"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+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] )
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5.3
+	sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-0.2.0
+	media-fonts/corefonts
+	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 )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+	use debug && append-flags -g
+
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+	tc-export CC CXX AR
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+enable_patch() {
+	local arg ARG_UPPER
+	for arg; do
+		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+		echo "${ARG_UPPER} = 1" >> Make.config
+
+		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
+		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+	done
+}
+
+extensions_add_make_conf()
+{
+	# copy all ifdef for extensions-patch to Make.config
+	sed -e '1,/need to touch the following:/d' \
+		-e '/need to touch the following/,/^$/d' \
+		Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+	# extract all possible settings for extensions-patch
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+		Make.config.template \
+		| sort \
+		| tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+	# apply maintainace-patches
+
+	if use setup; then
+		eerror "media-plugins/vdr-setup"
+		eerror "is not supported by Upstream anymore"
+		eerror "we will remove this plugin in the future from gentoo portage"
+		eerror "please use as equivalent media-plugins/vdr-menuorg"
+		die
+	fi
+
+	ebegin "Changing paths for gentoo"
+
+	local DVBDIR=/usr/include
+	local i
+	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+		[[ -d ${i} ]] || continue
+		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+			einfo "Found DVB header files in ${i}"
+			DVBDIR=${i}
+			break
+		fi
+	done
+
+	# checking for s2api headers
+	local api_version
+	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+	if [[ ${api_version:-0} -lt 5*3 ]]; then
+		eerror "DVB header files do not contain s2api support or too old for ${P}"
+		eerror "You cannot compile VDR against old dvb-header"
+		die "DVB headers too old"
+	fi
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/locale
+		INCDIR			= \$(PREFIX)/include
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+		LIBDIR			= ${PLUGIN_LIBDIR}
+		PCDIR			= /usr/$(get_libdir)/pkgconfig
+	EOT
+	eend 0
+
+	# support languages, written from right to left
+	BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+	epatch "${FILESDIR}/${PN}-2.0.0_gentoo.patch"
+
+	if ! use vanilla; then
+
+		# Now apply extensions patch
+		epatch "${WORKDIR}/${EXT_P}.patch"
+
+		# This allows us to start even if some plugin does not exist
+		# or is not loadable.
+		enable_patch PLUGINMISSING
+		enable_patch CHANNELBIND
+
+		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+			einfo "Doing maintainer checks:"
+
+			# we do not support these patches
+			# (or have them already hard enabled)
+			local IGNORE_PATCHES="pluginmissing  channelbind"
+
+			extensions_all_defines > "${T}"/new.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."
+			else
+				ewarn "IUSE differences!"
+				local diff
+				for diff in $DIFFS; do
+					ewarn "$diff"
+				done
+			fi
+		fi
+
+		ebegin "Enabling selected patches"
+		local flag
+		for flag in $EXT_PATCH_FLAGS; do
+			use $flag && enable_patch ${flag}
+		done
+
+		eend 0
+
+		extensions_add_make_conf
+
+		# add defined use-flags compile options to vdr.pc
+		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+			-i Makefile
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+	fi
+
+	epatch_user
+
+	add_cap CAP_UTF8
+
+	add_cap CAP_IRCTRL_RUNTIME_PARAM \
+			CAP_VFAT_RUNTIME_PARAM \
+			CAP_CHUID \
+			CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}"
+
+	# LINGUAS support
+	einfo "\n \t VDR supports the LINGUAS values"
+
+	lang_po
+
+	einfo "\t Please set one of this values in your sytem make.conf"
+	einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		einfo "\n \t No values in LINGUAS="
+		einfo "\t You will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING_PO} en
+}
+
+src_install() {
+	# trick makefile not to create a videodir by supplying it with an existing
+	# directory
+	einstall \
+	VIDEODIR="/" \
+	DESTDIR="${D}" \
+	|| die "einstall failed"
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	diropts -m0755 -ovdr -gvdr
+	keepdir /var/cache/vdr
+
+	if use html; then
+		dohtml *.html
+	fi
+
+	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 setup; then
+#		insinto /usr/share/vdr/setup
+#		doins "${S}"/menu.c
+#	fi
+
+	chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.6.0_p2-r8"
+	previous_less_than_1_6_0_p2_r8=$?
+
+	has_version "<${CATEGORY}/${PN}-1.7.27"
+	previous_less_than_1_7_27=$?
+
+	has_version "<${CATEGORY}/${PN}-1.7.36"
+	previous_less_than_1_7_36=$?
+}
+
+pkg_postinst() {
+
+	# correct wrong permission from earlier install
+	CACHEOWNER="$(stat -c %U /var/cache/vdr)"
+	if [ ! ${CACHEOWNER} == vdr ]; then
+		chown -R vdr:vdr "${ROOT}/var/cache/vdr"
+	fi
+
+	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
+		elog "  Upgrade Info:"
+
+		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
+		elog "  can still be replayed and edited, but new recordings are done in TS."
+
+		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
+		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
+		elog "  primary device, one of this plugin now needs to be loaded when running VDR in order"
+		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
+		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
+		elog "  capability."
+
+		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
+		elog "  recording is replayed that has no index. This can also be used to"
+		elog "  re-create a broken index file by manually deleting the index file and then"
+		elog "  replaying the recording."
+
+		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
+		elog "  commands. See man vdr.5 for information about the new file format."
+
+		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
+		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
+
+		elog "  The default SVDRP port is now 6419"
+	fi
+
+	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
+		elog "  In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed."
+		elog "  This results now in a lot of plugins which do on compile any more."
+		elog "  Please visit for more infos:"
+		elog "  https://bugs.gentoo.org/show_bug.cgi?id=414177"
+		elog "  and depended bugs"
+	fi
+
+	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
+		elog "  By default VDR is now build according to the FHS."
+		elog "  Gentoo VDR still uses the standard from"
+		elog "  Filesystem Hierarchy Standard"
+		elog "  It is supported since beginning of VDR support"
+		elog "  on Gentoo"
+		elog "  Finally, there are minimal changes for the user."
+	fi
+
+	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
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup"
+	elog ""
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
+}