better systemd support, reported by L.Muresan on wrt bug 524428

Package-Manager: portage-2.2.14_rc1
Manifest-Sign-Key: 34C2808A

3 files changed, 315 insertions, 4 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index d166af6..4cdf98d 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-2.1.6-r2 (05 Oct 2014)
+
+  05 Oct 2014; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.6-r2.ebuild:
+  better systemd support, reported by L.Muresan on wrt bug 524428
+
   27 Sep 2014; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-2.1.6-r1.ebuild:
   fixed typo in patchset
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index b94f1bc..2cc3bd4 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -22,14 +22,15 @@ EBUILD vdr-2.1.3.ebuild 7580 SHA256 4f1d2cd7315feff70ad7998cf48e17000e2c11d9f315
 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
 EBUILD vdr-2.1.6-r1.ebuild 7598 SHA256 44bc0efd086a955b64ed1f055da2f9f2972f32e683392fda6bcb4c736c960e79 SHA512 b3617b1fd314aa67010e30bba6c6e9e93e48b134d0c28963a9dafdc7c9d3809b8918f8f9bc3476abf83034ff53574f36e4111d230e19777f7dc3bc84cdebc11b WHIRLPOOL 8f7edc16c8e2e504dd83b4e9ace9668768d8b66d1117f9d0031841390403121d83907404396e801778110857ff8c3f4b95537552e1a8c8faabe6e74d9f6908f4
+EBUILD vdr-2.1.6-r2.ebuild 7658 SHA256 6a95c6a236f793c03dfc9349b11da79e10bb5e8a1b74aac2726e9306ea0ba0ce SHA512 92c2760eea28ac1d1f61ac0375bfeff7071f00d5bac5cfe8c10bcca7842c77459a3b140397bdbe087c7a0645217350c091aea5ca276c31f0cc3caf4a084bacb7 WHIRLPOOL f5175b14d279d56f3809d248c256acde773398d7d5049e7c68a7c3ddf12b794e92daa99f57f9305e0c6c08f787956d3ae9b80289dc882760af99c81eeb5865a4
 EBUILD vdr-2.1.6.ebuild 7626 SHA256 8d128e1328ab8f459b9f8d572fae519fdf9164a5f2016d477a98224c9f11c73d SHA512 04d51894b136a1623ca092058c35a0d5032a5078119f54c7b31509ebc97ce0f82288f19850228608f4ba761b05fc414427a93c6a2603e4d9a2a14017c46785f2 WHIRLPOOL cf190de629d45b7e32c09d9d9a18d19bc3abb136bf49b651124972b4844e61caab5640c7057548ada98c49d53026546469c908a139e524b9fca21bd697a1f92e
-MISC ChangeLog 25803 SHA256 8edb4e0240d25022259d4d962c157e173793a6d7deb4cfbee669095f5b87a499 SHA512 e38898f9a9cda79aeb2ee100927a3fcbeb20cf77cf7b4c0bd58d2d320f9be1e46d57de4a1172c74f1581ae340ccd027af93a2adfcd29557c234adb653395ec88 WHIRLPOOL 3ce5a90eaa7f5573ba8bb4289ede7fa830328b21830dbb09dfbc3cd7da2739cf0d032cccea0e2555c44b90a0ee8b547885c8df5552bf6aebb4f0898115de0d8b
+MISC ChangeLog 25976 SHA256 d1533517ca4e7fd54a6c015dbe95ff2983c32b9d44bd0e1278c1fbc9b6a0bc72 SHA512 26443c5eb3999a7e03b4f7d5ec31b7256403bccc29fcee409cd24d05a50c44c186c25f0b0143513395ec22cfe288cad32b0f7b278f27148b70dd206db3b1c817 WHIRLPOOL c4957b0d3d528ca0e7a452855f874ef39830b8e31808e8dff4b6942c67236d4e235ec7e85bc55bf1f570f0ca5aceaf64ec3fd19352845333c7814593db39e851
 MISC metadata.xml 2071 SHA256 d308d181e741e458ef838af1e003e85323eb23f17b9de610317fe45a7ef92d8f SHA512 cb7c405c0d07ec536d5db70db514121e96f73b4ade0eca80d5e5c12f3cc4f209ce5d1c1c3b3129aaa8f974b843a54fda73684d05c684e403d955079d0f119e56 WHIRLPOOL e606dcf24f8bbcd427ff9e3c26ae022c50332cec79cdb1f39febe7fd25f076a9ab2439232b4b7870ea3e000026b5163f6ceb8727b77f5609060f710f40b3a498
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFUJgIVdn07HTTCgIoRCNWhAKC76v2QI0HFWvEx2e+LzHl0wupFrACgsm65
-XOPFNJJRIulQk8jP1vAlI1Y=
-=hRNH
+iD8DBQFUMU0Kdn07HTTCgIoRCIwXAJ9VcuqdxSFf4QVFFc2dHPKAh1/aAQCfUS/S
+6erHKlapPXk5oLxvjZ3bsRU=
+=xTGT
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-2.1.6-r2.ebuild b/media-video/vdr/vdr-2.1.6-r2.ebuild
new file mode 100644
index 0000000..ec52726
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.6-r2.ebuild
@@ -0,0 +1,305 @@
+# 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
+		permashift_v1 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 systemd 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-v2"
+
+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"
+
+REQUIRED_USE="
+	permashift? ( !permashift_v1 )
+	permashift_v1? ( !permashift )"
+
+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-2.5_rc1
+	media-fonts/corefonts
+	bidi? ( dev-libs/fribidi )
+	systemd? ( sys-apps/systemd )"
+
+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)"
+
+	# systemd support
+	BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
+
+	epatch "${FILESDIR}/${P}_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
+
+		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
+	emake \
+	VIDEODIR="/" \
+	DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	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"
+}