cleanup on depends on vdr-plugin.eclass

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)

7 files changed, 9 insertions, 468 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 29fb682a0e91..fc0a7066ace3 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-softdevice
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.70 2012/11/04 19:17:59 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.71 2014/01/08 18:59:49 hd_brummy Exp $
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/patches-0.4.0/new-ffmpeg-extern-c.diff, -files/patches-0.4.0/series,
+  -vdr-softdevice-0.5.0.20080922.ebuild,
+  -files/vdr-softdevice-0.5.0.20080922-offsett.patch,
+  -vdr-softdevice-0.5.0.20090218.ebuild, -vdr-softdevice-0.5.0.20090630.ebuild:
+  cleanup on depends on vdr-plugin.eclass
 
 *vdr-softdevice-0.5.0.20110417 (04 Nov 2012)
 
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff b/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
deleted file mode 100644
index e5148463b03b..000000000000
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/new-ffmpeg-extern-c.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: softdevice-cvs/configure
-===================================================================
---- softdevice-cvs.orig/configure
-+++ softdevice-cvs/configure
-@@ -173,9 +173,11 @@ test_ffmpeg()
-   ffmpeg="yes";
- cat > ${TMPC} << EOF
- #define __STDC_CONSTANT_MACROS
-+extern "C" {
- #include <stdlib.h>
- #include <avcodec.h>
- #include <avformat.h>
-+}
- int main(void) {
- /*  if ( avcodec_build() != LIBAVCODEC_BUILD ) {
-      fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD);
-@@ -249,9 +251,11 @@ test_swscale()
- cat > ${TMPC} << EOF
- #define __STDC_CONSTANT_MACROS
- #include <stdlib.h>
-+extern "C" {
- #include <avcodec.h>
- #include <avformat.h>
- #include <swscale.h>
-+}
- int main(void) {
- /*  if ( avcodec_build() != LIBAVCODEC_BUILD ) {
-      fprintf(stderr,"Fatal Error! Libavcodec library build(%d) doesn't match avcodec.h build(%d)!!!\n",avcodec_build(),LIBAVCODEC_BUILD);
-Index: softdevice-cvs/VideoFilter.h
-===================================================================
---- softdevice-cvs.orig/VideoFilter.h
-+++ softdevice-cvs/VideoFilter.h
-@@ -14,8 +14,10 @@
- 
- #ifdef PP_LIBAVCODEC
- #include <stdint.h> //needed by postproc.h
-+extern "C" {
-   #include <postprocess.h>
-   //#include <postproc/postprocess.h>
-+}
- #endif //PP_LIBAVCODEC
- 
- #include "video.h"
-@@ -60,7 +62,9 @@ public:
- };
- 
- #ifdef USE_SWSCALE
-+extern "C" {
- #include <swscale.h>
-+}
- #endif
- class cImageConvert : public cVideoFilter {
-         sPicBuffer *outBuf;
diff --git a/media-plugins/vdr-softdevice/files/patches-0.4.0/series b/media-plugins/vdr-softdevice/files/patches-0.4.0/series
deleted file mode 100644
index 3e52f157fc9e..000000000000
--- a/media-plugins/vdr-softdevice/files/patches-0.4.0/series
+++ /dev/null
@@ -1,2 +0,0 @@
-new-ffmpeg-extern-c.diff
-shm-fullscreen-parameter.diff
diff --git a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch b/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch
deleted file mode 100644
index 2c1824bf96e8..000000000000
--- a/media-plugins/vdr-softdevice/files/vdr-softdevice-0.5.0.20080922-offsett.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: softdevice-cvs-20080922/mpeg2decoder.c
-===================================================================
---- softdevice-cvs-20080922.orig/mpeg2decoder.c
-+++ softdevice-cvs-20080922/mpeg2decoder.c
-@@ -1016,7 +1016,7 @@ static int read_packet_RingBuffer(void *
- };
- 
- #if LIBAVFORMAT_BUILD >4625
--static offset_t seek_RingBuffer(void *opaque, offset_t offset, int whence)
-+static int64_t seek_RingBuffer(void *opaque, int64_t offset, int whence)
- #else
- static int seek_RingBuffer(void *opaque, offset_t offset, int whence)
- #endif
-@@ -1135,7 +1135,7 @@ start:
-     return 0;
- };
- 
--int cMpeg2Decoder::seek(offset_t offset, int whence) {
-+int cMpeg2Decoder::seek(int64_t offset, int whence) {
-    printf("unimplemented: seek offset %lld whence %d\n", (long long int)offset, whence);
-    return -EINVAL;
- };
-Index: softdevice-cvs-20080922/mpeg2decoder.h
-===================================================================
---- softdevice-cvs-20080922.orig/mpeg2decoder.h
-+++ softdevice-cvs-20080922/mpeg2decoder.h
-@@ -312,7 +312,7 @@ private:
-     bool          packetMode;
- public:
-     int read_packet(uint8_t *buf, int buf_size);
--    int seek(offset_t offset, int whence);
-+    int seek(int64_t offset, int whence);
- 
- public:
-     cMpeg2Decoder(cAudioOut *AudioOut, cVideoOut *VideoOut);
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
deleted file mode 100644
index 0be4aca24359..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.7 2012/05/05 08:27:15 jdhore Exp $
-
-EAPI=3
-
-inherit eutils vdr-plugin versionator
-
-DESCRIPTION="VDR Plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-
-# Detect snapshots
-SNAP_V="$(get_version_component_range 4)"
-if [[ "$SNAP_V" ]]; then
-	MY_P="${PN}-cvs-${SNAP_V}"
-	S="${WORKDIR}/${MY_P#vdr-}"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-else
-	SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+xv fbcon directfb mmx mmxext xinerama"
-
-RDEPEND=">=media-video/vdr-1.3.36
-	>=virtual/ffmpeg-0.4.9_pre1
-	directfb? (
-		dev-libs/DirectFB
-		dev-libs/DFB++
-	)
-	media-libs/alsa-lib
-	xv? ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXv
-				xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${RDEPEND}
-	xv? ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-	fbcon? ( sys-kernel/linux-headers )
-	virtual/pkgconfig"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff"
-	"${FILESDIR}/${P}-offsett.patch" )
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use xv && ! use fbcon && ! use directfb; then
-		ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
-		die "no output-method enabled"
-	fi
-
-	COMPILE_SHM=0
-	if has_version ">=media-video/vdr-1.3.0"; then
-		if use xv; then
-			COMPILE_SHM=1
-		else
-			elog "SHM does only support xv at the moment"
-		fi
-	else
-		elog "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	elog "SHM support will not be compiled." ;;
-		1)	elog "SHM support will be compiled." ;;
-	esac
-
-	# Check for ffmpeg relying on libtheora without pkg-config-file
-	# Bug #142250
-	if has_version virtual/ffmpeg[theora] && \
-		has_version "<media-libs/libtheora-1.0_alpha4"; then
-
-			eerror "This package will not work when using ffmpeg with"
-			eerror "USE=\"theora\" combined with media-libs/libtheora"
-			eerror "older than version 1.0_alpha4."
-			eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
-			die "Please update to at least media-libs/libtheora-1.0_alpha4."
-	fi
-}
-
-src_configure() {
-	local MYOPTS=""
-	MYOPTS="${MYOPTS} --disable-vidix"
-	use xv || MYOPTS="${MYOPTS} --disable-xv"
-	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
-	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
-
-	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
-
-	if use !mmx && use !mmxext; then
-		ewarn "${PN}"' does not compile with USE="-mmx -mmxext".'
-		ewarn 'Please enable at least one of these two use-flags.'
-		die "${PN}"' does not compile with USE="-mmx -mmxext".'
-	fi
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libsoftdevice-*.so.*
-
-	if [[ "${COMPILE_SHM}" = "1" ]]; then
-		exeinto "/usr/bin"
-		doexe ShmClient
-		make_desktop_entry ShmClient "VDR softdevice Client" "" "AudioVideo;TV"
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
deleted file mode 100644
index db9c1cf9888d..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild,v 1.6 2012/05/05 08:27:15 jdhore Exp $
-
-EAPI=3
-
-inherit eutils vdr-plugin versionator
-
-DESCRIPTION="VDR Plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-
-# Detect snapshots
-SNAP_V="$(get_version_component_range 4)"
-if [[ "$SNAP_V" ]]; then
-	MY_P="${PN}-cvs-${SNAP_V}"
-	S="${WORKDIR}/${MY_P#vdr-}"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-else
-	SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+xv fbcon directfb mmx mmxext xinerama"
-
-RDEPEND=">=media-video/vdr-1.3.36
-	>=virtual/ffmpeg-0.4.9_pre1
-	directfb? (
-		dev-libs/DirectFB
-		dev-libs/DFB++
-	)
-	media-libs/alsa-lib
-	xv? ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXv
-				xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${RDEPEND}
-	xv? ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-	fbcon? ( sys-kernel/linux-headers )
-	virtual/pkgconfig"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff")
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use xv && ! use fbcon && ! use directfb; then
-		ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
-		die "no output-method enabled"
-	fi
-
-	COMPILE_SHM=0
-	if has_version ">=media-video/vdr-1.3.0"; then
-		if use xv; then
-			COMPILE_SHM=1
-		else
-			elog "SHM does only support xv at the moment"
-		fi
-	else
-		elog "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	elog "SHM support will not be compiled." ;;
-		1)	elog "SHM support will be compiled." ;;
-	esac
-
-	# Check for ffmpeg relying on libtheora without pkg-config-file
-	# Bug #142250
-	if has_version virtual/ffmpeg[theora] && \
-		has_version "<media-libs/libtheora-1.0_alpha4"; then
-
-			eerror "This package will not work when using ffmpeg with"
-			eerror "USE=\"theora\" combined with media-libs/libtheora"
-			eerror "older than version 1.0_alpha4."
-			eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
-			die "Please update to at least media-libs/libtheora-1.0_alpha4."
-	fi
-}
-
-src_configure() {
-	local MYOPTS=""
-	MYOPTS="${MYOPTS} --disable-vidix"
-	use xv || MYOPTS="${MYOPTS} --disable-xv"
-	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
-	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
-
-	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libsoftdevice-*.so.*
-
-	if [[ "${COMPILE_SHM}" = "1" ]]; then
-		exeinto "/usr/bin"
-		doexe ShmClient
-		make_desktop_entry ShmClient "VDR softdevice Client" "" "AudioVideo;TV"
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
deleted file mode 100644
index eefc09188ae4..000000000000
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild,v 1.5 2012/05/05 08:27:15 jdhore Exp $
-
-EAPI="2"
-
-inherit eutils vdr-plugin versionator
-
-DESCRIPTION="VDR Plugin: Software output-Device"
-HOMEPAGE="http://softdevice.berlios.de/"
-
-# Detect snapshots
-SNAP_V="$(get_version_component_range 4)"
-if [[ "$SNAP_V" ]]; then
-	MY_P="${PN}-cvs-${SNAP_V}"
-	S="${WORKDIR}/${MY_P#vdr-}"
-	SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-else
-	SRC_URI="mirror://berlios/${PN#vdr-}/${P}.tgz"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+xv fbcon directfb mmx mmxext xinerama"
-
-# converted from built_with_use that had this comment:
-# Check for ffmpeg relying on libtheora without pkg-config-file
-# Bug #142250
-RDEPEND=">=media-video/vdr-1.3.36
-	|| (
-		>=virtual/ffmpeg-0.4.9_pre1[-theora]
-		(
-			>=virtual/ffmpeg-0.4.9_pre1[theora]
-			>=media-libs/libtheora-1.0_alpha4
-		)
-	)
-	directfb? (
-		dev-libs/DirectFB
-		dev-libs/DFB++
-	)
-	media-libs/alsa-lib
-	xv? ( x11-libs/libX11
-				x11-libs/libXext
-				x11-libs/libXi
-				x11-libs/libXv
-				xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${RDEPEND}
-	xv? ( x11-proto/xproto
-				x11-proto/xextproto
-				x11-libs/libXv
-				xinerama? ( x11-proto/xineramaproto )
-			)
-	fbcon? ( sys-kernel/linux-headers )
-	virtual/pkgconfig"
-# Make sure the assembler USE flags are unmasked on amd64
-# Remove this once default-linux/amd64/2006.1 is deprecated
-DEPEND="${DEPEND} amd64? ( >=sys-apps/portage-2.1.2 )"
-
-PATCHES=("${FILESDIR}/patches-0.4.0/shm-fullscreen-parameter.diff")
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use xv && ! use fbcon && ! use directfb; then
-		ewarn "You need to set at least one of these use-flags: xv fbcon directfb"
-		die "no output-method enabled"
-	fi
-
-	COMPILE_SHM=0
-	if has_version ">=media-video/vdr-1.3.0"; then
-		if use xv; then
-			COMPILE_SHM=1
-		else
-			elog "SHM does only support xv at the moment"
-		fi
-	else
-		elog "SHM not supported on vdr-1.2"
-	fi
-	case ${COMPILE_SHM} in
-		0)	elog "SHM support will not be compiled." ;;
-		1)	elog "SHM support will be compiled." ;;
-	esac
-}
-
-src_configure() {
-	local MYOPTS=""
-	MYOPTS="${MYOPTS} --disable-vidix"
-	use xv || MYOPTS="${MYOPTS} --disable-xv"
-	use fbcon || MYOPTS="${MYOPTS} --disable-fb"
-	use directfb || MYOPTS="${MYOPTS} --disable-dfb"
-
-	use mmx || MYOPTS="${MYOPTS} --disable-mmx"
-	use mmxext || MYOPTS="${MYOPTS} --disable-mmx2"
-
-	use xinerama || MYOPTS="${MYOPTS} --disable-xinerama"
-
-	[[ ${COMPILE_SHM} == 1 ]] || MYOPTS="${MYOPTS} --disable-shm"
-
-	cd "${S}"
-	elog configure ${MYOPTS}
-	./configure ${MYOPTS} || die "configure failed"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${S}"
-
-	insinto "${VDR_PLUGIN_DIR}"
-	doins libsoftdevice-*.so.*
-
-	if [[ "${COMPILE_SHM}" = "1" ]]; then
-		exeinto "/usr/bin"
-		doexe ShmClient
-		make_desktop_entry ShmClient "VDR softdevice Client" "" "AudioVideo;TV"
-	fi
-
-	insinto /usr/include/vdr-softdevice
-	doins *.h
-}