bump

(Portage version: 2.2.8-r1/svn/Linux x86_64, signed Manifest commit with key 34C2808A)

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

3 files changed, 311 insertions, 6 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index fdfd3a5..9d7b2fc 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -665,4 +665,3 @@
   +files/vdr-1.7.0-multiproto-update.diff, +metadata.xml, +vdr-1.7.0.ebuild:
   Added ebuild with added multiproto support based on vdr-1.6.0_p1-r1 from
   portage tree.
-
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 3e640da..045f5e9 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -13,18 +13,20 @@ DIST vdr-2.1.2.tar.bz2 850237 SHA256 1bf9c636145acf2d67716475314efe9703619759f0f
 DIST vdr-2.1.3.tar.bz2 862445 SHA256 959c3243672ffd8b67da7072e7201f2b483b684fb18c2c4c5eb47e54dbd4d141 SHA512 4468c516095c7c64f02c42af40a4c321aecfbea0e070417559879a1e86869f7eb1308b53442302a7c7a56c070c825b6c2f32bea79c7c9e09e9e39e4b265369f4 WHIRLPOOL 92a289b023391b5e9b9af7430d1eb18e8a8c6d97e67f3d0c40c51a6943eff6552af94d8a93d349504a8fe2c9dde4573f98240022f823d828757a963676a1c357
 DIST vdr-2.1.4.tar.bz2 862733 SHA256 a3208d6229622b089d19c238c5b78b80e7d82e0220710e8044ea8729c6931202 SHA512 269c145d8547b66ba5782aadfa9b479d2237cae674af080701d50b42c4a29872f187dea4b8c47f7326dec4958c8671fb5286131f5169b9ffa6e8ca56366a1b14 WHIRLPOOL d97ff9e91719492306ab115a484113793f34324bd5626ebdd105f2d94287465fd921eb8d92f4c35594c5145ed9bd3346164efa2fd247cbe7c83cae55de053457
 DIST vdr-2.1.5.tar.bz2 869767 SHA256 e642dcaaa1a5edc3683e33c5b154c6439a1427c24dc8685f36a0bb919774a890 SHA512 3bb6192ac7d7db024838c0d4f07797f70ee4da02b14ae0effa24f3b079fea8f42be089754cbffad013dbf9d87829d20b3dee66eed390b061088487f2784c8c75 WHIRLPOOL b2a6e5742fa6212f453713dad574dc51102ccfa2b9aaa036ea53249d220404157ced8e9c20d9550184741edb5211de9286a9c3e6249c07949fab54a0b727acff
+DIST vdr-2.1.6.tar.bz2 872380 SHA256 232a326f9a4a609746da42a9c7ee632f394496b7e8215d71dfdcff3fcde4e145 SHA512 ce98ff6167e340ec7cd8d23012e2632f5a41fe20979359c2684771ba86458bb6b48736b34b9474f6ccb7492951c69a3849c086848c2870e8c7476941f64022df WHIRLPOOL df9159648464682841b5ed9c14a584c53e154f74084c432e6e5e94bf2b0e095c72b23e25329f582fd1e18b34c93717f1d91f7ff6c3a29887ad870021eaecc2a3
 EBUILD vdr-2.1.1.ebuild 8510 SHA256 9fddd9a6218bb25ca72549dd149830e223cf6f54602e81b74cd4f54c44c94cad SHA512 ca5f1d29283fd387f09f4b8e995357e51a1631f0e53df8324941467b83d80d79ccf86c38cb01ee27f75628d77a34408a3751552b17d443d143b7c29dd8b29d7d WHIRLPOOL b7ee621ded1e9d277be0e6184a2b9b3dcefba48f4987735ba46a7910165ab5cecedeeb22ed66b5f5c2c1fbad406803f0b0f41b6509f959a51bb33e204989415e
 EBUILD vdr-2.1.2-r1.ebuild 8321 SHA256 ff2085c3ecf9516785c3a2276bf33ed72c1bfb7b530a3b701726458e107edb26 SHA512 ec1255dd1322c95a0393e16f84eed30ac89a6ceb31de44c92a2d9b285b596bc8abf78445858628e5a2ff0e7d0517dfb783a41fd1f023d731fec02ce7dceef00d WHIRLPOOL 46557ddaa86178c3f9c5e5c031a84efdabf1d7b1232c6f61f65c1c20fc6a3db671d170effefb9bcbf7d059800f833735694104c415c4378e6b0296a8c002120d
 EBUILD vdr-2.1.3.ebuild 7580 SHA256 4f1d2cd7315feff70ad7998cf48e17000e2c11d9f31585e102116e2efb363cbc SHA512 c16bf7fb00356724d5444622f8eb44d4d82934074326da23e9cd389843d8b11384fc7aaa5d0582d90d09efc4fd4235feb8ebb08b20a52866b2bc5d86df5b2779 WHIRLPOOL a3713eeb62a91d2ab50d8bb618b5022816a54c33c5816809c4fd17b5d78351a0f0101a92da496027f555f7fd76a6abbb9dafa0021d6791b6d18057ba6b469db3
 EBUILD vdr-2.1.4.ebuild 7626 SHA256 52e401c14b42ca78269b92891ecebd56e75c91d3e4057e883bd75fdc3733252c SHA512 7ac51ac0f48091330cfd35bbaaeb38bf9d1ce7939d3af4a136e751793e9e5adfc93e51c7d87309f65168f5ea487bbc0d281081c7a5f0f230d2f2495f2fab36fa WHIRLPOOL f3a10af9acd971408f0169bfee2c8ee71e136b00d55752dd6584e853b3d8c8279913d3b92e3a90c4e77448c6a94ef2de16ac994a83e15bd06581074ae7233264
 EBUILD vdr-2.1.5.ebuild 7626 SHA256 4474642d859a7db733edea6d03f2cb74b140c047cc2f16633be7d9fd4f67acc4 SHA512 3847e37a87a54604566f1dd2e4f782ba0b7fb62c3cd2517fc3875e8b01b8a61058ea20a051675f9864c68354f5f4b734902bf6b31783801305a78f00d5527011 WHIRLPOOL 15d51e9631736241db7cb9365254994701496f317c1a16a8e68606a7642b63598bad540f7c8cc6920199314fe3dd08c1e3781c85dced88acf80998775bd17dca
-MISC ChangeLog 25472 SHA256 4ee5ef0f831efe0cbbaa6232bfd4dd4e230805ab8fd1aa133d2e6867002f9529 SHA512 499ca2f599e488e06b08cb222ea27354e4fa283f74873a1b4f9292af7e4c0fa09b4454b84887a05cda24e3d6b422b041e019cf39e7701aa607ef5f5658a52e9d WHIRLPOOL d9ecaf87c59afc0211b758271c398bbc67a23256612bc1885a6be41f5a0db68be19bd0715835f6d90c9e19b64d088be28f098d5650564b4222424036baf8dab9
+EBUILD vdr-2.1.6.ebuild 7626 SHA256 8d128e1328ab8f459b9f8d572fae519fdf9164a5f2016d477a98224c9f11c73d SHA512 04d51894b136a1623ca092058c35a0d5032a5078119f54c7b31509ebc97ce0f82288f19850228608f4ba761b05fc414427a93c6a2603e4d9a2a14017c46785f2 WHIRLPOOL cf190de629d45b7e32c09d9d9a18d19bc3abb136bf49b651124972b4844e61caab5640c7057548ada98c49d53026546469c908a139e524b9fca21bd697a1f92e
+MISC ChangeLog 25471 SHA256 dce16700d2048d9dc260736651b2c1457539ae542cb6f09c7c465a0ba539a48d SHA512 7a369b5238cf1c04653eb361a1b3d4664dc5507745196fbe51bf1c6030ff22d4a24c6b6531f627b7fe09a3cb9df038ff7512810ffb0a4508818e68bc0d0ba446 WHIRLPOOL deee48eb278bb029977f04795729794e81dd8f40e958e1eaf8381640a364699faee5132c65ea93be11e86d323f72d4dad0e3b1e926e1f854e20809535f5fccf9
 MISC metadata.xml 1955 SHA256 bd67b709aec3d06a0d3911bb8105626e435b072572bfea89b2314a4879a2ab72 SHA512 22f93d7f4ffbc5458ec35b49cf716427f8d29021ae35b01514b3dd58776f4b2a537fb7c814dc7c104616315f0aa7b8fac51fc1ce4402dcafa57db779206649d5 WHIRLPOOL d4a204d2dfffeaa1901c4e917f1942cf8fd72e50262a082a13c07171d6572ed96c4d4c0aeeee8cb873288b69d5be714bf14b12b1bba5801d9cd7af5114706629
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFTC247dn07HTTCgIoRCDrwAKCAVC64dRIYb3dLdXmDnDu0tEZ2RQCdG0M3
-hV9j2tgjR8+2FeJlcAz3k5I=
-=O8EA
+iD8DBQFTJfF4dn07HTTCgIoRCHQiAJ96pI3pHRrZNgo0s/YpP0Ss9u/DZwCgtHqM
+QN5CUr/48uZcVZ43jxWab5c=
+=O2bY
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-2.1.6.ebuild b/media-video/vdr/vdr-2.1.6.ebuild
new file mode 100644
index 0000000..e7875e0
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.6.ebuild
@@ -0,0 +1,304 @@
+# 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.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 binaryskip graphtft jumpingseconds jumpplay naludump permashift
+		pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
+# ddepgentry
+
+# 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-${P}-gentoo-edition-v1"
+EXT_P="extpng-${PN}-2.1.5-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"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="virtual/jpeg
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2"
+
+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 )"
+
+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
+
+	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."
+
+	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"
+}