fribidi support added, for languages written from right to left; minor ebuild fixes

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

4 files changed, 388 insertions, 7 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index d2a4ee100914..30d008b2c253 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.171 2013/04/13 17:53:45 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.172 2013/04/27 15:05:58 hd_brummy Exp $
+
+*vdr-2.0.1-r1 (27 Apr 2013)
+
+  27 Apr 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.0.1-r1.ebuild,
+  metadata.xml:
+  fribidi support added, for languages written from right to left; minor ebuild
+  fixes
 
 *vdr-2.0.1 (13 Apr 2013)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 9b4304c07a32..01c6c3b10881 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -22,14 +22,15 @@ DIST vdr-1.6.0.tar.bz2 593172 SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09b
 DIST vdr-2.0.1.tar.bz2 837098 SHA256 45097a09ff66912a780c5fae49f3d29ed464d3359b1135045800811f899134d6 SHA512 6ef39f13d9609a56a4536802468062396815f5304b046317c461c7c25766fe1b6ec20ab41f864c3ea2d608a84699554f46181db2be9d00731072892773f9e15c WHIRLPOOL b9909de582746066342d4ed9380f22bc10bc1e565a58a83920f346a969ef970338c25522c86426794698e80dd953f02a1d65d110dea18d77e90d6ac23dcf8509
 EBUILD vdr-1.6.0_p2-r11.ebuild 11647 SHA256 003eb70d6eca71df54f5982b414ee4b9e70bd4e3202a2dea37d90f2b7dd186d5 SHA512 025f179417216922bab0827ffa87d8975c6204c53ba42e6a4f6a981462ce0afcf245185910522a1d65a99d5eab882227bbcd4e4aca8232a39edabd2ce549d4d7 WHIRLPOOL 21c43f436f8774fec97dede5c4ddf5d4e09a75c145fd45b8e5a5abefc0ef147e13965f9ecf25f28407ef49fc35132630b41847970aa9aac927a1af4709ae93f3
 EBUILD vdr-1.6.0_p2-r7.ebuild 11487 SHA256 32a60a57b47d1b1c7a545d4c793182edc0ab9a0e3ed6bc2dcacd279da8b30d22 SHA512 ac7343bab36562d766279e0943829cf4e991bdebecb627f23e55c49a6ce6b1380ea886ab0162e09eac5f0b69b645e91df27dcbfb3220f2e4b539b73466004548 WHIRLPOOL 063cb5d53bf065560ace5e05cdff6bf7197c462b1822ca6499d9be4599443ae1ed7c2e8261dd8343ac1908edfd8619bcd8e5f2319cae159cb518d8c03d5bcd8f
+EBUILD vdr-2.0.1-r1.ebuild 10447 SHA256 503b75a8348a32b4622ae6f53de17e8709546dd894bc5e93b3757491f7d48684 SHA512 53b5e7e128d8c40a30efa5d96917fc22730a199837ba2180146810c72967009b1746064c450e03ee45cd2fc848b475366dd3a57c3859b7d7a36d9dc19434d7c5 WHIRLPOOL b89147bce42aab21edc2f85636f2af6a57151fc6c82016094eaeeac795f36ad042384291be3be3397b7b5cbd26d6b852a44eca63a4f9eb2470915264d742707a
 EBUILD vdr-2.0.1.ebuild 10321 SHA256 6279e6c2e0f725a66ab39b4b886cdeab7618f4ab1215a825da4938de65f4f3c7 SHA512 a83db0127666229e6108375a0527310756d99006ac312180c22294aaa4e8e9bd8ff333234810b58ad754d17e1622ee0d3559168138206a9f3776aee55f311d7a WHIRLPOOL 2318833e21616b0a43e96803222c2f14d7ea51ddfc40622d2f401aec4f7ce75821e56d8e73897367f86e907ecb14e17d367594b3e6b80e5c0814856d4f30cbe9
-MISC ChangeLog 31100 SHA256 4c0cf8293b1807477652befb7439c22cc0c5fd45a7d0d4cf5f3932622ba74cb0 SHA512 cee725cdb1c7a7a1750e1d327af33b38c1c920e5ce3f31b3acd26782de851725ab7b25381f7d2803c22c0714cd624f7218a074b62e0223379b8999601ad5890f WHIRLPOOL dac2432fa425f432e1d3243cc9210d8a43b2c3e094e19f1fb2e9756180d9a3bd00a9ebf07ddef7741e52bfc9193de3ceb71bdbe044cb3a7de0e7b43a22e1c025
-MISC metadata.xml 4757 SHA256 f3c4d43b73f1018c87ee4a7e4eed494644f2c184f98d6983b1f8231e6da71ada SHA512 cc1308ff5a6be6cbb1c9010eee44dafa523bc9ad124a405b713fc74fa7484bd40bdf1e1c02f48c522bec740c88f09c9121cf83336e3820b9f962ff7edbf9adbd WHIRLPOOL b596642297cb1f17dbc26b331854a4593240ee219ac80e59878650c22a31f0628cf169dee50d86bbf3343267320332e1d56b91f68418e96b4d05cb72d41ad478
+MISC ChangeLog 31311 SHA256 bb8c1a79fe23cc5646712c31a0004c0902bbeffd54673aa496e1c54b78de247e SHA512 4a6b42b3f708f589563d1b8f3bece0a6159a808dec688baca569a1c15863e8d89eb2f1da1bebb033cd4269c503f847575b1c0fec10ec29b5183e2b3d02023aa1 WHIRLPOOL 24ccc2bb5a5ecf85798c7ab7e1e2dc8956302f751f033f720c5b9b7a065b4740d50d49985147c0ee867d3f227d60a47938d769eb25ab232bd29fda760700bdf2
+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
+Comment: signed/commited by hd_brummy@gentoo.org
 
-iD8DBQFRaZuwdn07HTTCgIoRCAZhAJ0fib3OYF984sJZFk+6zGZ4EI7e9wCdFPhZ
-TaIkh3kHi6WUfK/Jrl4ZhgI=
-=mgSc
+iD8DBQFRe+lddn07HTTCgIoRCAhEAJ9jKZZ5oNhGr9sTnnfbONWjdMAh7QCgohgc
+mtD48SpJNLuDYOxzfhmB+oY=
+=gIxx
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index b79c201f8707..8cbc4869807d 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -11,6 +11,7 @@
 		<flag name="analogtv">Add support for the analogtv plugin</flag>
 		<flag name="alternatechannel">Use alternate channel on record</flag>
 		<flag name="atsc">Support for NorthAmerican Broadcast ( rudimentary )</flag>
+		<flag name="bidi">fribid support, for languages, written from right to left</flag>
 		<flag name="cmdreccmdi18n">loads translated commands and reccommands files if existing</flag>
 		<flag name="cmdsubmenu">Allows the creation of submenus in the commands menu</flag>
 		<flag name="cutterlimit">Limit IO bandwith used for cutting</flag>
diff --git a/media-video/vdr/vdr-2.0.1-r1.ebuild b/media-video/vdr/vdr-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..032544663b18
--- /dev/null
+++ b/media-video/vdr/vdr-2.0.1-r1.ebuild
@@ -0,0 +1,372 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.1-r1.ebuild,v 1.1 2013/04/27 15:05:58 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 dxr3 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.0-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() {
+	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
+		eerror "Using VDR_LOCAL_PATCHES_DIR is obsolete!"
+		eerror "Please move all your patches into"
+		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
+		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
+		die
+	fi
+
+	use debug && append-flags -g
+
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+	tc-export CC CXX
+}
+
+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
+
+	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"
+}