changed to new handling portage own epatch_user, VDR_LOCAL_PATCHES_DIR is obsolet

Package-Manager: portage-2.1.10.11/cvs/Linux i686

3 files changed, 434 insertions, 5 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 784321cf2a55..908bca60bfba 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.155 2012/04/18 16:42:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.156 2012/04/25 11:23:33 hd_brummy Exp $
+
+*vdr-1.6.0_p2-r8 (25 Apr 2012)
+
+  25 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-1.6.0_p2-r8.ebuild:
+  changed to new handling portage own epatch_user, VDR_LOCAL_PATCHES_DIR is
+  obsolet
 
   18 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-1.6.0_p2-r6.ebuild,
   -files/vdr-1.6.0-dxr3-subtitlehack.diff,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 354cbd8556cc..857f86aa34cc 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -13,13 +13,14 @@ DIST vdr-1.6.0-1.diff 6750 RMD160 8fcb1557d50b6d70d8791f7a67c96b4c12b1067a SHA1
 DIST vdr-1.6.0-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1 63f3b25d337b7bdd6eaf5257df78a3042d09d936 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
 EBUILD vdr-1.6.0_p2-r7.ebuild 11487 RMD160 c59fd46d2510d1892b68230c03cf24a24586fd7f SHA1 89e467abbce351f642475a234b223e0eb80a883f SHA256 32a60a57b47d1b1c7a545d4c793182edc0ab9a0e3ed6bc2dcacd279da8b30d22
-MISC ChangeLog 28013 RMD160 6f197769a866bf7ddb33c176e6dda71ee4b417f2 SHA1 26bd1c39cc8eda0fafe70e3b45512de5ff130fde SHA256 3c66abfce0f038b16c6607a4d3642613915ff4211a3878f1ca13921ea993163a
+EBUILD vdr-1.6.0_p2-r8.ebuild 11122 RMD160 0a83009636fb64828f7e3e173f0303f12a7059d8 SHA1 2d2e22a5fb8ff1e173043fc74c39f145723adcae SHA256 eee412b3b43fcfd3ffeacc43184bb19fe6782885df5af87b6a8c02135329759c
+MISC ChangeLog 28212 RMD160 d593d61daf72557a6b809f6a73036d1d882d3a58 SHA1 c1a3fda795090e0a848dc4077a506d1e61508b19 SHA256 8195c6dc3876d8bf8b2d5e0357b1a88992b1847fbb864d78efa4e5617ce56199
 MISC metadata.xml 4220 RMD160 81bf8cd288b74bbfc0522b754100045980db7095 SHA1 0d73555d38505f5be3d6e0dcfbe7f706483e35d8 SHA256 d04d296b5a155a2d05e1ec5d6681c6d91fcb430f557e9a2416045090a39c8cc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPjvGDdn07HTTCgIoRAjyHAJ0Vn0wpCApYAKUULTZ3lFoA98/a8QCghJtO
-iO0TQWnI1BYbOCOGkTHMmG4=
-=aKXf
+iD8DBQFPl94pdn07HTTCgIoRArxqAKCZRCsEFcodnwK4bSA9WPKQmsz8eACfd1b0
+qRZkT3kGECD7liVb5wmAiok=
+=KfJS
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.6.0_p2-r8.ebuild b/media-video/vdr/vdr-1.6.0_p2-r8.ebuild
new file mode 100644
index 000000000000..f94720846857
--- /dev/null
+++ b/media-video/vdr/vdr-1.6.0_p2-r8.ebuild
@@ -0,0 +1,422 @@
+# 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_p2-r8.ebuild,v 1.1 2012/04/25 11:23:33 hd_brummy Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic multilib
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
+	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
+	jumpplay lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
+	rotor settime setup sortrecords sourcecaps livebuffer
+	ttxtsubs timercmd timerinfo validinput yaepg
+	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
+	volctrl wareagleicon lircsettings deltimeshiftrec em84xx
+	cmdreccmdi18n softosd parentalrating"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
+
+IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_V="72"
+EXT_P=VDR-Extensions-Patch-${EXT_V}
+EXT_DIR=${WORKDIR}/${EXT_P}/
+EXT_VDR_PV="${PV/_p/-}"
+
+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
+	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
+	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
+	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.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
+	sys-devel/gettext
+	dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
+
+DEPEND="${COMMON_DEPEND}
+	>=virtual/linuxtv-dvb-headers-5
+	dev-util/unifdef
+	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-0.4.5
+	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-r4 )
+		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."
+		einfo "Note: all patches must have extension .patch"
+		die || "found obselet local patch handling"
+	fi
+
+	use debug && append-flags -g
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+}
+
+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:]'
+}
+
+extensions_all_defines_unset() {
+	# extract all possible settings for extensions-patch
+	# and convert them to -U... for unifdef
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
+		Make.config.template \
+		| tr '\n' ' '
+}
+
+do_unifdef() {
+	ebegin "Unifdef sources"
+	local mf="Makefile.get"
+	cat <<'EOT' > $mf
+include Makefile
+show_def:
+	@echo $(DEFINES)
+show_src_files:
+	@echo $(OBJS:%.o=%.c)
+EOT
+
+	local DEFINES=$(extensions_all_defines_unset)
+
+	local RAW_DEFINES=$(make -f "$mf" show_def)
+	local VDR_SRC_FILES=$(make -f "$mf" show_src_files)
+	local KEEP_FILES=""
+	rm "$mf"
+
+	local def
+	for def in $RAW_DEFINES; do
+		case "${def}" in
+			-DUSE*)
+				DEFINES="${DEFINES} ${def}"
+				;;
+		esac
+	done
+
+	local f
+	for f in *.c; do
+
+		# Removing the src files the Makefile does not use for compiling vdr
+		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
+			rm -f ${f} ${f%.c}.h
+			continue
+		fi
+
+		unifdef ${DEFINES} "$f" > "tmp.$f"
+		mv "tmp.$f" "$f"
+	done
+	for f in *.h; do
+		unifdef ${DEFINES} "$f" > "tmp.$f"
+		mv "tmp.$f" "$f"
+		[[ -s $f ]] || rm "$f"
+	done
+	eend 0
+}
+
+src_prepare() {
+	#applying maintainace-patches
+	epatch "${DISTDIR}/${MY_P}-1.diff"
+	epatch "${DISTDIR}/${MY_P}-2.diff"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
+	epatch "${FILESDIR}"/vdr-1.6.0-ldflags.patch
+	epatch "${FILESDIR}"/vdr-1.6.0-use-v4l2.patch
+
+	ebegin "Changing pathes for gentoo"
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
+	  -i vdr.c
+
+	local DVBDIR=/usr/include
+
+	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}"/vdr-1.6.0-makefile-install-header.diff
+
+	sed -i i18n-to-gettext.pl \
+		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
+
+	# Do not install runvdr script and plugins
+	sed -i Makefile \
+		-e 's/runvdr//' \
+		-e 's/ install-plugins//'
+
+	if use vanilla; then
+		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
+	else
+
+		cd "${S}"
+		# Now apply extensions patch
+		local fname="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+
+		epatch "${fname}"
+
+		# Fix typo in Make.config.template
+		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
+
+		# other gentoo patches
+		# epatch "${FILESDIR}/..."
+		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
+		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
+		epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff
+
+		# This allows us to start even if some plugin does not exist
+		# or is not loadable.
+		enable_patch PLUGINMISSING
+
+		# Patch necessary for media-plugins/vdr-reelchannelscan
+		# it does not change anything when plugin is not used
+		enable_patch CHANNELSCAN
+
+		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="channelscan pluginapi pluginmissing streamdevext"
+
+			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 iptv && enable_patch pluginparam
+		use liemikuutio && enable_patch liemiext
+		eend 0
+
+		extensions_add_make_conf
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+
+		[[ -z "$NO_UNIFDEF" ]] && do_unifdef
+
+		use iptv && sed -i sources.conf -e 's/^#P/P/'
+	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}"
+}
+
+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
+	doexe i18n-to-gettext.pl
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
+
+	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
+
+	local f
+	rm *vdr-1.4* 2>/dev/null
+	for f in *; do
+		[[ -f ${f} ]] || continue
+		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
+	done
+
+	cd "${S}"
+
+	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 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.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+
+	has_version "<${CATEGORY}/${PN}-1.6.0"
+	previous_less_than_1_6_0=$?
+}
+
+pkg_postinst() {
+	elog "It is a good idea to run vdrplugin-rebuild now."
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
+		ewarn "Upgrade Info:"
+		ewarn
+		ewarn "If you had used the use-flags lirc, rcu or vfat"
+		ewarn "then, you now have to enable the associated functionality"
+		ewarn "in /etc/conf.d/vdr"
+		ewarn
+		ewarn "vfat is now set with VFAT_FILENAMES."
+		ewarn "lirc/rcu are now set with IR_CTRL."
+		ebeep
+	fi
+
+	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
+
+	if use atsc; then
+		ewarn "ATSC is only supported by a rudimentary patch"
+		einfo "and need at least this patch and a plugin installed"
+		einfo "emerge media-plugins/vdr-atscepg"
+	fi
+
+	if [[ $previous_less_than_1_6_0 = 0 ]]; then
+		elog "By default vdr is now started with utf8 character encoding"
+		elog
+		elog "To rename the old recordings to utf8 conforming names, do this:"
+		elog "\temerge app-text/convmv"
+		elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
+		elog
+		elog "To fix the descriptions of your recordings do this:"
+		elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
+	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"
+}