Version bump

(Portage version: 2.2.0_alpha109/svn/Linux x86_64, signed Manifest commit with key B427ABC8)

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

3 files changed, 397 insertions, 7 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 22f3955..a63d754 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-1.7.28 (03 Jun 2012)
+
+  03 Jun 2012; Christian Ruppert <idl0r@gentoo.org> +vdr-1.7.28.ebuild:
+  Version bump
+
   20 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.7.27.ebuild,
   files/vdr-1.7.27_linguas.diff:
   linguas install fails on unsupported values, reported by Michael B. on IRC
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index d00b389..d9abac0 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 1.7.24-time_shift.patch 405 RMD160 d59011eac105f4cb8e0d962109f634bb8c2a28f4 SHA1 ad55664870976f21c358bef4dd24370811f1a7ea SHA256 99256af917d877b8e4e5cf23246c4c7fca6ba78aa3b9b30111f36f3915813409
 AUX channel_alternative.conf 332 RMD160 2471e236ed71e93339545447b1651c5ad37491ea SHA1 936278f8d564b17d137f5910b1d43bc2a31ebd0f SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce
@@ -12,21 +12,27 @@ DIST extpng-vdr-1.7.23v1-gentoo-edition.patch 572319 RMD160 14332bf39d9d0cf4fbbe
 DIST extpng-vdr-1.7.24v2-gentoo-edition.patch 445832 RMD160 757bc1b354b2d084312901e5b6981d787b201b15 SHA1 a03888f4b3a080e6a5fbf3661bd4634f14ede65b SHA256 a5646c64530ebc9068a95f51e61803f49b248b97605a09466e027c97d75730a5
 DIST extpng-vdr-1.7.25-gentoo-edition.patch.bz2 73764 RMD160 909d79614bca6a825d06e680a0a1377bef730ca3 SHA1 ea7721a42296dd4972e38e0308ccb3dbddba52c0 SHA256 022e5c793f806164f9f1ae4da253db6a1dbcd997241d7523ce489040bbab8fb7
 DIST extpng-vdr-1.7.27-gentoo-edition-r2.patch.bz2 81045 RMD160 946a70643da02ea754a7b13d02005993ccf8413a SHA1 35e704cf3080de6f2eab788730ee1052e71d7586 SHA256 6dd7abda3d3d058220e4ac67b8785cbbe6f504dfb0fa2527b6615ba520d5bb17
+DIST extpng-vdr-1.7.28-gentoo-edition.patch.bz2 78939 RMD160 179e9e5314de2db6fc4bb9862c36db3af9e2765a SHA1 fbf38d6cc33683f243020f2788bb19199e7c7aeb SHA256 753aee821a95c567c26b99d6c4098fd44547291c2f864425fd062f99e9382f0d
 DIST vdr-1.7.23.tar.bz2 761767 RMD160 59d6efc62aa16108d96262d53781c8eadeb98de9 SHA1 5b7485bf5ca15f6339d3385f84900fb4cbe67c26 SHA256 1d1c25e66f51c5489ed0238601002c7ffa9ad5c666f45b51c311fa13bd018c0e
 DIST vdr-1.7.24.tar.bz2 765472 RMD160 410402bb4a4f7e5350672e94f4fdb2e0326cf80b SHA1 4358b78e0aba63ed8fd8aaba1d7baea95d4175a0 SHA256 a1209612c69bab9bd37078b65c5da26b1173f075aba742acb6dc07303beb97a8
 DIST vdr-1.7.25.tar.bz2 768334 RMD160 324915c7081076031d028b30ed225a380e53f41d SHA1 5a37469b89034f56298faaa77bdca2e3d1eb901b SHA256 3e5438ee46e32cdfcd074bd55246965796d93c33984be3b2a21e51983ac48cf4
 DIST vdr-1.7.27.tar.bz2 767714 RMD160 f1e14b761b3990da5ab7ec33aac8d83a9b62f18c SHA1 a4bd5bff81515cc1d49e5c979020af329fd25248 SHA256 d948841535b917ab6eb31582d6d40bc281ff6a751988e5bfc1b097567e7ca264
+DIST vdr-1.7.28.tar.bz2 782861 RMD160 e42d57346152774c461b04d57cc30be471e3b16f SHA1 b4759d7acca1ece66c1e7fda884d8672ee4e1f3c SHA256 c932df0468e9a256d35c7339247ec212b48d911f88ec8ea3c367e22816d9484f
 EBUILD vdr-1.7.23.ebuild 11086 RMD160 785b76a662cc51ddc3eeaa33c01f488a2386f133 SHA1 b5ec9b9494a27a0c3bc4ae860e9a46b3c181cc77 SHA256 8159dd9cb2115e96eb24bf18a1aa95e3cd17fd11ea1df2bd1b021cf36defe0e5
 EBUILD vdr-1.7.24-r1.ebuild 10006 RMD160 987a8092ea994ce11b4a700a955f503afebbae3a SHA1 adb3c055e6d245edce0d10e62f1e74fe25f69714 SHA256 f45133c1aaed00ec40ac734c9b4e8bb489b697211716875cd7e74e8ace88a91c
 EBUILD vdr-1.7.25.ebuild 9961 RMD160 4cbc34c8ee909ac4453ff4fb65b27bb0d24ba6ef SHA1 a4ef1a618e7a58f7522ca48eb2a4ee8ddf510b51 SHA256 3817f91da7c40a246f48d14cefefcd4c029364da3da835616f16a2faeb4d155b
 EBUILD vdr-1.7.27.ebuild 10452 RMD160 852f0f03fc5b6cdd9ebc054cfddb3c96587b2beb SHA1 1d348c2ee7d541cb1daa6e2489b333d32a96d3db SHA256 99ca724b3081f3d293005ecb2999b2d1b8ab8c85eb987f110f5ab92156f122bf
-MISC ChangeLog 18055 RMD160 a97b58537e66be750e2e3c546f70c53bfa25fc52 SHA1 deef1d30c9b4417f2efa4538225e9cd46ae8c4ed SHA256 d1a9ded4c8c0f25bb1c846911ea6ac5c904b07c4ce03f7c17a9c0d6ef489f22c
+EBUILD vdr-1.7.28.ebuild 10343 RMD160 490ab7b43e99f4f2d1f35c524b626b7add7d1d45 SHA1 c398a821702e7e7cecd8a08a18a287f0e2e466ed SHA256 795db1c03b65d452d7b89688d0f602817dc4a55210c2a6c228710f60046920af
+MISC ChangeLog 18170 RMD160 fb1f6d1393287a9b3eada215f4b579845f08ac93 SHA1 a8ff7cad83c9f3c6beb693f6fe78a13fd9c6dfa8 SHA256 ab12fa2497f0a8708b16186e6b904b7c816f19380b4a58425faede1a6c6b9ea9
 MISC metadata.xml 2257 RMD160 9e0441bd345a526aa9e9fdc432d62231606a6dde SHA1 f58b77f2ad6e862ffd0056d542685f958271761d SHA256 4f053b591a06c81d4ab0611e66de23b7c1de2874028d86c6d3cd246bb8e193d3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFPuJ52dn07HTTCgIoRArdBAJ4l8Tziqy2Y8mCQoLRcri2T+e/JZwCfb5dX
-y62uVTkIaD9Pu93IVvQqcHc=
-=i8YY
+iQEcBAEBCAAGBQJPy9rnAAoJEMOx0zmdw4Z1weUH/0bZMX484posiNflsCD/yh07
+fi4dIYEIWQC2ULYzm22qrMNr7qjxpqe0mnCSlOU32Xh+ZZzf8lq3zhURc8iCNRvv
+BGsHW+Ka0hhjqoDyaLG3k0J9NC9heCVtXPiPjhzQo/IsV8lxK0e3+KKl12YQjdBa
+vG3SblM8dVM141V3TziDYYhUQ9VZ5bl9dqTVV/7dOT/MDyF+kUFU/uCbgd3CuQK8
+kzMYlG0eVrC6C55yf3e7Zqmd9LYSRANZgg3/oTqepHmTKl1B/BOCAB4rZHBlL017
+4+X+jnKSaz78/DHOMOfLL4bzayJvwtGvI6IZxSpsa9Zaoyr2ARe8r1MF4cXyN3U=
+=7vGe
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.7.28.ebuild b/media-video/vdr/vdr-1.7.28.ebuild
new file mode 100644
index 0000000..06f7999
--- /dev/null
+++ b/media-video/vdr/vdr-1.7.28.ebuild
@@ -0,0 +1,379 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel cutterlimit
+	ddepgentry dvlvidprefer graphtft hardlinkcutter jumpplay
+	liemikuutio lircsettings mainmenuhooks menuorg naludump pinplugin
+	rotor setup timerinfo ttxtsubs volctrl 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="jumpingseconds"
+
+IUSE="debug html vanilla dxr3 ${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"
+
+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/~idl0r/vdr/${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.4.10
+	media-fonts/corefonts"
+
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )
+		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
+
+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 deprecated!"
+		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
+	done
+}
+
+extensions_add_make_conf()
+{
+	# copy all ifdef for extensions-patch to Make.config
+	sed -e '1,/need to touch the following:/d' \
+		-e '/ifdef DVBDIR/,/^$/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_linguas() {
+	LING1=$( cat /etc/make.conf | grep LINGUAS | sed -e "s:LINGUAS=::" -e "s:\"::g" )
+}
+
+lang_po() {
+	LING2=$( ls ${S}/po | tr \\\012 ' ' | sed -e "s:_::g" -e "s:[A-Z]::g" -e "s:.po::g" )
+}
+
+src_prepare() {
+	#applying maintainace-patches
+
+	ebegin "Changing pathes for gentoo"
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
+	  -i vdr.c
+
+	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 to old for ${P}"
+		eerror "You cannot compile VDR against old dvb-headers"
+		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
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+	EOT
+	eend 0
+
+	epatch "${FILESDIR}/${PN}-1.7.22-makefile-install-header.diff"
+	epatch "${FILESDIR}/${PN}-1.7.27_linguas.diff"
+
+	# Do not install runvdr script and plugins
+	sed -i Makefile \
+		-e 's/runvdr//' \
+		-e 's/ install-plugins//'
+
+	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
+
+		# was default enabled in old versions of extpatch
+		enable_patch MCLI
+
+		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+			einfo "Doing maintainer checks:"
+
+			# these patches we do not support
+			# (or have them already hard enabled)
+			local IGNORE_PATCHES="pluginmissing mcli 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
+
+		# patches that got renamed
+		use liemikuutio && enable_patch jumpingseconds
+
+		eend 0
+
+		extensions_add_make_conf
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+	fi
+
+	epatch_user
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		cp -r "${S}" "${T}"/source-tree
+	fi
+
+	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}"
+
+	# some new improvments for LINGUAS handling
+	einfo "\n \t VDR supports now the LINGUAS values"
+
+	lang_po
+	lang_linguas
+
+	einfo "\t Please set one of this values in /etc/make.conf"
+	einfo "\t LINGUAS=\"${LING2}\"\n"
+
+	if [[ -z ${LINGUAS} ]]; then
+		eerror "\n \t No values in LINGUAS="
+		eerror "\t you will get only english text on OSD \n"
+	fi
+
+	strip-linguas ${LING2}
+}
+
+src_install() {
+	# trick makefile not to create a videodir by supplying it with an existing
+	# directory
+	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	exeinto /usr/share/vdr/bin
+
+	if use html; then
+		dohtml *.html
+	fi
+
+	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+	insinto /usr/share/vdr
+	doins "${CAP_FILE}"
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
+		einfo "Installing sources"
+		insinto "${SOURCES_DEST}"
+		doins -r "${T}"/source-tree/*
+		keepdir "${SOURCES_DEST}"/PLUGINS/lib
+	fi
+
+	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=$?
+}
+
+pkg_postinst() {
+	elog "!!!! WARNING !!!!"
+	elog "  ${P} contains large changes with respect to"
+	elog "  how it handles video streams, so expect this"
+	elog "  version to not work as good as the versions before!"
+	elog
+	elog "  We strongly advise you NOT to use this version"
+	elog "  on a productive system!"
+
+	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 plugin 'dvbsddevice'. On systems that use such a card as their"
+		elog "  primary device, 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 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
+
+	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
+
+	local keysfound=0
+	local key
+	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
+	local remote_file="${ROOT}"/etc/vdr/remote.conf
+
+	if [[ -e ${remote_file} ]]; then
+		for key in ${warn_keys}; do
+			if grep -q -i "\.${key} " "${remote_file}"; then
+				keysfound=1
+				break
+			fi
+		done
+		if [[ ${keysfound} == 1 ]]; then
+			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
+			ewarn "Please remove these keys or vdr will not start:"
+			ewarn "#  ${warn_keys}"
+		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"
+}