Version bumped. New patchset can use bigpatch+subtitles, Bug #168189. Only print msg about setup-plugin if it is not yet installed&activated.

Package-Manager: portage-2.1.2.2

4 files changed, 253 insertions, 10 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 2a92676726e6..1a19152b8d0a 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.81 2007/03/14 19:33:20 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.82 2007/03/19 18:05:23 zzam Exp $
+
+*vdr-1.4.6 (19 Mar 2007)
+
+  19 Mar 2007; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.6.ebuild:
+  Version bumped. New patchset can use bigpatch+subtitles, Bug #168189. Only
+  print msg about setup-plugin if it is not yet installed&activated.
 
   14 Mar 2007; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.4.1-r2.ebuild,
   vdr-1.4.3.ebuild, vdr-1.4.4.ebuild, vdr-1.4.4_p3.ebuild, vdr-1.4.5.ebuild:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 8f0fa81fb50e..b306cba8423c 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -18,6 +18,7 @@ DIST gentoo-vdr-patchset-1.4.3-1.tar.bz2 175914 RMD160 4325ddb158834dd8208c5222d
 DIST gentoo-vdr-patchset-1.4.4-1.tar.bz2 188290 RMD160 27b7210395ddf9697b70e3f1e6065bb495093edb SHA1 97f79463374429c622f9b6ee21b6c901d9f753d0 SHA256 479153c6fc5b2b0eb7ddca17e12568c7469ad296929b874e75b4b58e59deb1cb
 DIST gentoo-vdr-patchset-1.4.4_p3-1.tar.bz2 174196 RMD160 2c456191a0b32b75c7cb20d3697b8034257da657 SHA1 1e77c2d5432c5336f6509a19bca3e3b91c00e603 SHA256 8839c54f155e6a5483808794b46345c89f50d55e6d044dae36c2b61e919d6bbc
 DIST gentoo-vdr-patchset-1.4.5-1.tar.bz2 153726 RMD160 c69eefeec451dc253e49001aec9ec6fc3011ac30 SHA1 39a88c9cb2b22c76c721c744e24aed923aa041b3 SHA256 e2966e1edfdad08ede3db2ba05113c55a187c9cbb72775eb7414c3a7623ecfd7
+DIST gentoo-vdr-patchset-1.4.6-1.tar.bz2 183896 RMD160 c122a082605841410fb5497cd5671f965bdfe3fe SHA1 c13bc1769f36ece50fe4c1a183f3d2bd9e871ca3 SHA256 68be18b4409211e3303eff3f67e75a4ac844f48a89d8fee453e19c143ae79f9a
 DIST vdr-1.2.6.tar.bz2 367069 RMD160 6780bedb49676cecfcea1275d9166e88fb93b97f SHA1 31896db8b3d98c54acdbee34338fd48c067a15bf SHA256 9d969043018d9578970c5d79e048e21870207042f6041a49996aad0c679b24d5
 DIST vdr-1.3.36-gentoo-patchset-0.2.tar.bz2 174683 RMD160 022c8afcd9ccea73cc8b7de2fb14f10a6ef9514a SHA1 585e62c9f57ebc8d598d8bc70b659f5d5a761238 SHA256 6a5e4d21808cc188a950f7c4bbd2edf23e65cdb5cc68871ba8c2f355550da857
 DIST vdr-1.3.36.tar.bz2 513639 RMD160 3bbf1a98f81f35af1768b83b0749b4e12b47bf57 SHA1 69b62aa6f83b9ed2d417ad60ccba37ed74175a43 SHA256 bc79c9212f59127a379c7e4de5a9ff7741eaa2478a6eab0f58c93efadc11b901
@@ -25,6 +26,7 @@ DIST vdr-1.4.1.tar.bz2 553580 RMD160 d23eef3bce7e0604051633f8f93c39e7b046bd9b SH
 DIST vdr-1.4.3.tar.bz2 557370 RMD160 15d8d8bc4d235de30b0b5fc8abd03a7b29627e75 SHA1 7a3f17c242e557fc95921e6884adc194fc4620bb SHA256 ce39b57945321757f4ae743345b4abb37867bcf9a7dba5d8de3581bd49fad247
 DIST vdr-1.4.4.tar.bz2 559362 RMD160 436cbbfb09f4e31f34db4038771fa7bac11230a1 SHA1 7699291f28e63d126842c7ff79170856b2e0abb6 SHA256 d05ae4529d55ad577394239223b83d13a3d11c2c3aa0599896ccba8f67a01b36
 DIST vdr-1.4.5.tar.bz2 560509 RMD160 0c002a3a7270af20524708c5f5dba91c41b8440b SHA1 4693f6f5c9240c067de3b5f50a05dba5d2b25a41 SHA256 ca69b84ae30d7d63b2e54182c389639680ee0c88ab50b8458a994331072f89b2
+DIST vdr-1.4.6.tar.bz2 561236 RMD160 e8d5498b6935e67941bc10be46a0f3fa9ea7aa9d SHA1 084c6c937aa64fd3339f87d3f56b53fa701b0d28 SHA256 06dea8e028480fa59f04976db83beacd75592835d89058dd5206f4191d315c9c
 EBUILD vdr-1.2.6-r1.ebuild 1226 RMD160 074ae28a3e18c317a2887738830641436ee49ee5 SHA1 27a58c4a7c34a39584e1c2c52a87f295eb96a89b SHA256 dfd58ca0e5fec3a188572eb15754459b90242ce4dd983928f7f007b718571412
 MD5 454443921854ebacbe677c5c81e31022 vdr-1.2.6-r1.ebuild 1226
 RMD160 074ae28a3e18c317a2887738830641436ee49ee5 vdr-1.2.6-r1.ebuild 1226
@@ -53,10 +55,14 @@ EBUILD vdr-1.4.5.ebuild 5205 RMD160 68fca3b64530a268182f65514364b1e60f198f41 SHA
 MD5 4e7d8e9f6746bd948870300a447beba6 vdr-1.4.5.ebuild 5205
 RMD160 68fca3b64530a268182f65514364b1e60f198f41 vdr-1.4.5.ebuild 5205
 SHA256 18f17ee20fa01f4da33a40a13da06fda7a829521e2f34e6bb863d585ce57a990 vdr-1.4.5.ebuild 5205
-MISC ChangeLog 13268 RMD160 c92e35ff45fe5458273bdccfbbeb91de655a400a SHA1 75736390bdfb93bccecf39926ea44e8b9a411be9 SHA256 c7cc2d66a34b8e89644585ecb89c9de24c3a433e1ea7376cc74e153da25fcc51
-MD5 9986e52a04df3bda809e8e3ff834d7ce ChangeLog 13268
-RMD160 c92e35ff45fe5458273bdccfbbeb91de655a400a ChangeLog 13268
-SHA256 c7cc2d66a34b8e89644585ecb89c9de24c3a433e1ea7376cc74e153da25fcc51 ChangeLog 13268
+EBUILD vdr-1.4.6.ebuild 5395 RMD160 9ddffbb9eedf59824d069ea73341a4edce7a7f04 SHA1 e2df4c726cfea2ef4729af33bbcea0b7cbb2b47d SHA256 7ffd5c80ed356e8ae5604542700949504cf1ef96504258aa63a109f0b41dd262
+MD5 e27805aa1beac9dd4b05fb2dab46cc66 vdr-1.4.6.ebuild 5395
+RMD160 9ddffbb9eedf59824d069ea73341a4edce7a7f04 vdr-1.4.6.ebuild 5395
+SHA256 7ffd5c80ed356e8ae5604542700949504cf1ef96504258aa63a109f0b41dd262 vdr-1.4.6.ebuild 5395
+MISC ChangeLog 13508 RMD160 418b1f9af13ddbed35a6a06c8e6d41cab912919e SHA1 2ce6142861c46f90ca081b6901204bc1e74f20d1 SHA256 aae3f12befc96f46f06637b42faa2cbf8087fff044bb52790df01be61ac52530
+MD5 c3b2ddb2a445a8dcccfb9d3b08ef10ac ChangeLog 13508
+RMD160 418b1f9af13ddbed35a6a06c8e6d41cab912919e ChangeLog 13508
+SHA256 aae3f12befc96f46f06637b42faa2cbf8087fff044bb52790df01be61ac52530 ChangeLog 13508
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -82,11 +88,13 @@ SHA256 81631181cb03e251471ac95afefbcd008e2fe4bd8034fd39c7b7da0495eac082 files/di
 MD5 cb18981ab1094003062527a1839f1005 files/digest-vdr-1.4.5 518
 RMD160 cd8e0063ccd02574b93b4e417b93b15b805a3408 files/digest-vdr-1.4.5 518
 SHA256 e0e1190a670bf9da4ddf6c871696ece9740e1880b89a9e8a05b9da9bebe7134d files/digest-vdr-1.4.5 518
+MD5 4985099f6a1f78c1141ab17132448f1a files/digest-vdr-1.4.6 518
+RMD160 a34790741895e2c9adbc868c02da8d8ec3295e10 files/digest-vdr-1.4.6 518
+SHA256 d1d7fcbddfa936238c4122254896089d7625a87aebb558897107dfcd1be0e400 files/digest-vdr-1.4.6 518
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+E4Pdn07HTTCgIoRAn2PAKCyj5ZCr6tXTxJGnFGn+1aOkUC7tACdHDGb
-g2NTB+w5/t0EW6vDQmRsrcc=
-=Fihm
+iD8DBQFF/tDpt2vP6XvVdOcRAjHVAJ9sF7V/lR/KLWFc87lJz/8DY2W+5ACgxnaP
+rAO28Lo+fcvjiVyGbaPoc9k=
+=sso+
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.4.6 b/media-video/vdr/files/digest-vdr-1.4.6
new file mode 100644
index 000000000000..3ef596e87adb
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.4.6
@@ -0,0 +1,6 @@
+MD5 890450570409dbb40907db13edd8cad5 gentoo-vdr-patchset-1.4.6-1.tar.bz2 183896
+RMD160 c122a082605841410fb5497cd5671f965bdfe3fe gentoo-vdr-patchset-1.4.6-1.tar.bz2 183896
+SHA256 68be18b4409211e3303eff3f67e75a4ac844f48a89d8fee453e19c143ae79f9a gentoo-vdr-patchset-1.4.6-1.tar.bz2 183896
+MD5 0769b05929ccc012dfd696ed13a3d161 vdr-1.4.6.tar.bz2 561236
+RMD160 e8d5498b6935e67941bc10be46a0f3fa9ea7aa9d vdr-1.4.6.tar.bz2 561236
+SHA256 06dea8e028480fa59f04976db83beacd75592835d89058dd5206f4191d315c9c vdr-1.4.6.tar.bz2 561236
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
new file mode 100644
index 000000000000..53259e929d95
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.6.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.1 2007/03/19 18:05:23 zzam Exp $
+
+inherit eutils flag-o-matic multilib
+
+IUSE="debug vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer
+	lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise
+	child-protection yaepg setup-plugin submenu subtitles rotor noepg"
+
+PATCHSET_V=1
+PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
+
+MY_P="${P%_p*}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.cadsoft.de/vdr/"
+SRC_URI="ftp://ftp.cadsoft.de/vdr/${MY_P}.tar.bz2
+	mirror://gentoo/${PATCHSET_NAME}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+
+DEPEND="media-libs/jpeg
+	sys-apps/gawk
+	media-tv/linuxtv-dvb-headers
+	sys-libs/libcap"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	media-tv/vdrplugin-rebuild
+	>=media-tv/gentoo-vdr-scripts-0.3.5"
+
+# Relevant Pathes for vdr on gentoo
+DVB_DIR=/usr/include
+VDR_INCLUDE_DIR=/usr/include/vdr
+PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
+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
+}
+
+add_cap() {
+	while [ "$1" ]; do
+		CAPS="${CAPS}\n$1=1"
+		shift
+	done
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${VDR_LOCAL_PATCHSET}" ]]; then
+		ewarn "Using local developer patchset."
+		PATCHSET_DIR="${VDR_LOCAL_PATCHSET}"
+	else
+		unpack ${PATCHSET_NAME}.tar.bz2
+		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+	fi
+
+	cd ${S}
+
+	ebegin "Changing pathes for gentoo"
+	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
+	  -i vdr.c
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		DVBDIR		 = ${DVB_DIR}
+		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
+		CONFIGDIR	 = ${CONF_DIR}
+
+		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
+	EOT
+	eend 0
+
+	source ${PATCHSET_DIR}/apply_patchset.sh
+	apply_vdr_patchset "${PATCHSET_DIR}"
+
+	if use !vanilla; then
+		if use setup-plugin && use submenu; then
+			ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
+		fi
+	fi
+
+	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
+	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
+		local dir_tmp_var
+		local LOCALPATCHES_SUBDIR=${PV}
+		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
+			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
+				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
+			fi
+		done
+
+		elog
+		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
+			elog "Applying local patches"
+		else
+			elog "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
+		fi
+
+		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{diff,patch}; do
+			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
+		done
+	fi
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		cp -r ${S} ${T}/source-tree
+	fi
+
+
+	if ! use vanilla; then
+		add_cap CAP_IRCTRL_RUNTIME_PARAM \
+			CAP_VFAT_RUNTIME_PARAM \
+			CAP_SHUTDOWN_SVDRP \
+			CAP_CHUID
+
+		echo -e ${CAPS} > ${CAP_FILE}
+	fi
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe vdr
+	doexe svdrpsend.pl
+
+	insinto ${VDR_INCLUDE_DIR}
+	doins *.h
+	doins Make.config
+
+	insinto ${VDR_INCLUDE_DIR}/libsi
+	doins libsi/*.h
+
+	keepdir ${CONF_DIR}/plugins
+	keepdir ${CONF_DIR}/themes
+
+	insinto ${CONF_DIR}
+	doins *.conf channels.conf.*
+
+	keepdir "${PLUGIN_LIB_DIR}"
+
+	doman vdr.1 vdr.5
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY*
+	dodoc TODO-enAIO-rm CONTRIBUTORS
+
+	insinto /usr/share/vdr
+	doins ${CAP_FILE}
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		elog "Installing sources"
+		insinto ${VDRSOURCE_DIR}/${P}
+		doins -r ${T}/source-tree/*
+		keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib
+	fi
+
+	if use setup-plugin; then
+		insinto /usr/share/vdr/setup
+		doins ${S}/menu.c
+
+		insinto /etc/vdr/plugins/setup
+		newins ${FILESDIR}/vdr-setup-menu-0.2.3.xml vdr-menu.xml
+	fi
+	chown -R vdr:vdr ${D}/${CONF_DIR}
+}
+
+pkg_postinst() {
+	elog "It is a good idea to run vdrplugin-rebuild now"
+	if has_version "<media-video/vdr-1.3.36-r3"; 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-plugin; 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-plugin\""
+			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
+}