cleanup

(Portage version: 2.1.10.11/cvs/Linux i686)

4 files changed, 6 insertions, 516 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 0c4d0acae770..784321cf2a55 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.154 2012/02/16 17:32:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.155 2012/04/18 16:42:26 hd_brummy Exp $
+
+  18 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-1.6.0_p2-r6.ebuild,
+  -files/vdr-1.6.0-dxr3-subtitlehack.diff,
+  -files/vdr-1.6.0-extensions-gcc-4.4.diff:
+  cleanup
 
   16 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r7.ebuild:
   stable x86 amd64
diff --git a/media-video/vdr/files/vdr-1.6.0-dxr3-subtitlehack.diff b/media-video/vdr/files/vdr-1.6.0-dxr3-subtitlehack.diff
deleted file mode 100644
index ab15eeaf5970..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-dxr3-subtitlehack.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- dvbsubtitle.c.orig	2008-03-06 21:38:45.698657000 +0100
-+++ dvbsubtitle.c	2008-03-06 21:41:58.308657000 +0100
-@@ -983,8 +983,15 @@
-      return;
-   tArea *Areas = Page->GetAreas();
-   int NumAreas = Page->regions.Count();
--  int Bpp = 8;
-+  //int Bpp = 8;
-   bool Reduced = false;
-+  for (int i = 0; i < NumAreas; i++) {
-+    if (Areas[i].bpp > 2) {
-+      Areas[i].bpp = 2;
-+      Reduced = true;
-+    }
-+  }
-+  /*
-   while (osd->CanHandleAreas(Areas, NumAreas) != oeOk) {
-         int HalfBpp = Bpp / 2;
-         if (HalfBpp >= 2) {
-@@ -999,6 +1006,7 @@
-         else
-            return; // unable to draw bitmaps
-         }
-+  */      
-   if (Reduced) {
-      for (int i = 0; i < NumAreas; i++) {
-          cSubtitleRegion *sr = Page->regions.Get(i);
-
diff --git a/media-video/vdr/files/vdr-1.6.0-extensions-gcc-4.4.diff b/media-video/vdr/files/vdr-1.6.0-extensions-gcc-4.4.diff
deleted file mode 100644
index c4c9651707cd..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-extensions-gcc-4.4.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru vdr-1.6.0-orig/menu.c vdr-1.6.0/menu.c
---- vdr-1.6.0-orig/menu.c	2009-06-04 10:01:37.538006043 +0200
-+++ vdr-1.6.0/menu.c	2009-06-04 10:04:02.967985781 +0200
-@@ -2495,14 +2495,14 @@
-   priority = recording->priority;
-   lifetime = recording->lifetime;
- 
--  char* p = strrchr(recording->Name(), '~');
-+  const char* p = strrchr(recording->Name(), '~');
-   if (p) {
-      p++;
-      Utf8Strn0Cpy(name, p, sizeof(name));
-      Utf8Strn0Cpy(path, recording->Name(), sizeof(path));
--     p = strrchr(path, '~');
--     if (p)
--        p[0] = 0;
-+     char* p2 = strrchr(path, '~');
-+     if (p2)
-+        p2[0] = 0;
-      }
-   else {
-      Utf8Strn0Cpy(name, recording->Name(), sizeof(name));
-diff -ru vdr-1.6.0-orig/videodir.c vdr-1.6.0/videodir.c
---- vdr-1.6.0-orig/videodir.c	2009-06-04 10:01:37.531340365 +0200
-+++ vdr-1.6.0/videodir.c	2009-06-04 10:22:20.074546524 +0200
-@@ -196,9 +196,10 @@
- #ifdef USE_HARDLINKCUTTER
- static bool StatNearestDir(const char *FileName, struct stat *Stat)
- {
--  cString Name(FileName);
-+  char *Name = strdup(FileName);
-+  cString Name_str(Name, true); /* manage free for us */
-   char *p;
--  while ((p = strrchr((const char*)Name + 1, '/')) != NULL) {
-+  while ((p = strrchr(Name + 1, '/')) != NULL) {
-         *p = 0; // truncate at last '/'
-         if (stat(Name, Stat) == 0) {
-            isyslog("StatNearestDir: Stating %s", (const char*)Name);
-
diff --git a/media-video/vdr/vdr-1.6.0_p2-r6.ebuild b/media-video/vdr/vdr-1.6.0_p2-r6.ebuild
deleted file mode 100644
index 421c5fd8fcfa..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2-r6.ebuild
+++ /dev/null
@@ -1,448 +0,0 @@
-# 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-r6.ebuild,v 1.6 2012/02/15 17:57:39 hd_brummy Exp $
-
-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="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"
-
-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
-	dev-util/unifdef"
-
-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-r1 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	check_menu_flags
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-}
-
-check_menu_flags() {
-	if use menuorg && use setup; then
-		echo
-		eerror "Please use only one of this USE-Flags"
-		eerror "\tmenuorg setup"
-		die "multiple menu manipulation"
-	fi
-}
-
-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_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	#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/vdr/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
-
-	if use dxr3; then
-		einfo "Applying dxr3 subtitle hack"
-		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff
-	fi
-
-	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
-
-		# 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
-
-	# 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
-
-		echo
-		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
-			einfo "Applying local patches"
-		else
-			einfo "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
-
-	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"
-}