bump

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

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

3 files changed, 340 insertions, 4 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 5d5f1d7..dd994a7 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-2.1.2 (22 Oct 2013)
+
+  22 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.2.ebuild:
+  bump
+
 *vdr-2.1.1 (01 Sep 2013)
 
   01 Sep 2013; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.1.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 0b340dd..44fa643 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -4,15 +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 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
-MISC ChangeLog 24518 SHA256 572d04d25aca0e4e696cba7409bb02ee2c2f87ed630c3dcdd2a35f53bd0cc0df SHA512 820d6fd0f350bc0c5acbaa1da7ba81b9cb8225d385a1e64da80e7783489494afb59cfec4d3c314f7141b4a5bf31bed3fbafe679ea0618976195d9cf544f57511 WHIRLPOOL 8860b7e5065e633be27f6ac3861330dace0d08323bebc8fa7bd799b4215784f837d42e0f5ef0b5da6ad5e35b1b0f9c05bddf6ef9ae9b2f3f52569e5f76f443b4
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: signed/commited by hd_brummy@gentoo.org
 
-iD8DBQFSI5Ordn07HTTCgIoRCIETAJwME89e7lEycQbGJsVFmRlBoqAdQwCdFooF
-Q83sa1NGhnsGyUhoQPI2pCc=
-=yZHQ
+iD8DBQFSZwqFdn07HTTCgIoRCFJ1AJ9glKokWjuxt3dDA6xzYSm5zwQJDwCgknVq
+Ww0CYxOBr5p2/eAXk7rUUSs=
+=zJKt
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-2.1.2.ebuild b/media-video/vdr/vdr-2.1.2.ebuild
new file mode 100644
index 0000000..517ab8a
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.2.ebuild
@@ -0,0 +1,327 @@
+# 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.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
+
+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"
+
+# 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-${P}-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/Developer/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2
+	http://www.saunalahti.fi/~rahrenbe/vdr/patches/${P}-gcc.patch.gz"
+
+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
+
+	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.1.1_gentoo.patch"
+	epatch "${WORKDIR}/${P}-gcc.patch" # tmp gcc fix from Rolf Ahrenberg
+
+	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
+
+		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"
+
+			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() {
+
+#	example syntax...
+#	has_version "<${CATEGORY}/${PN}-1.7.36"
+#	previous_less_than_1_7_36=$?
+#}
+
+pkg_postinst() {
+
+	elog "This is a *developer* version."
+	elog "We strongly recommend that you only use it under controlled"
+	elog "conditions and for testing and debugging."
+
+	# 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
+
+#	example syntax
+#	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
+	#elog "bla foo"
+#	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"
+}