eapi=3; cleanup

(Portage version: 2.1.9.25/cvs/Linux i686)

4 files changed, 8 insertions, 142 deletions

diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog
index 7c04614f3569..fb8c74809612 100644
--- a/media-plugins/vdr-image/ChangeLog
+++ b/media-plugins/vdr-image/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-image
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.32 2011/01/03 21:58:14 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.33 2011/01/29 01:08:11 hd_brummy Exp $
+
+  29 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-image-0.2.7-r1.ebuild, -vdr-image-0.2.7.26.ebuild,
+  vdr-image-0.3.0.ebuild:
+  eapi=3; cleanup
 
   03 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/vdr-image-0.2.7.26-gentoo.diff, -files/vdr-image-0.2.7-gentoo.diff,
diff --git a/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild b/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild
deleted file mode 100644
index 8d1beb30c450..000000000000
--- a/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.7-r1.ebuild,v 1.7 2008/07/03 11:08:35 zzam Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp"
-HOMEPAGE="http://vdr-image.berlios.de/"
-SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="exif"
-
-COMMON_DEPEND=">=media-video/vdr-1.3.38
-	>=media-video/ffmpeg-0.4.8
-	>=media-libs/netpbm-10.0
-	exif? ( media-libs/libexif )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-tv/gentoo-vdr-scripts-0.2.2"
-
-PATCHES=("${FILESDIR}/${P}-new-ffmpeg.diff")
-
-BUILD_PARAMS="-j1"
-
-src_unpack() {
-
-	vdr-plugin_src_unpack
-
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-
-	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
-	if has_version "<=media-video/ffmpeg-0.4.9_p20061016"; then
-		BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1"
-	fi
-
-	if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
-		epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
-	fi
-}
-
-src_install() {
-
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/imagecmds
-	newins examples/imagecmds.conf imagecmds.example.conf
-	newins examples/imagecmds.conf.DE imagecmds.example.conf.de
-
-	insinto /etc/vdr/plugins/image
-	doins examples/imagesources.conf
-
-	into /usr/share/vdr/image
-	dobin scripts/imageplugin.sh
-	newbin scripts/mount.sh mount-image.sh
-}
-
-pkg_postinst() {
-
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Also check /etc/vdr/plugins/image/imagesources.conf"
-	echo
-	elog "Multilanguage will automaticly supported, just take a look in"
-	elog "/etc/vdr/imagecmds/* how it works"
-	elog "By the moment only EN + DE"
-	echo
-}
diff --git a/media-plugins/vdr-image/vdr-image-0.2.7.26.ebuild b/media-plugins/vdr-image/vdr-image-0.2.7.26.ebuild
deleted file mode 100644
index bda64ecff6dd..000000000000
--- a/media-plugins/vdr-image/vdr-image-0.2.7.26.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.2.7.26.ebuild,v 1.1 2008/10/25 22:19:26 hd_brummy Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp"
-HOMEPAGE="http://vdr-image.berlios.de/"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="exif"
-
-COMMON_DEPEND=">=media-video/vdr-1.3.38
-	>=media-video/ffmpeg-0.4.8_p20080326
-	>=media-libs/netpbm-10.0
-	exif? ( media-libs/libexif )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	>=media-tv/gentoo-vdr-scripts-0.2.2"
-
-BUILD_PARAMS="-j1"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-
-	use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
-	if has_version "<=media-video/ffmpeg-0.4.9_p20061016"; then
-		BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1"
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/imagecmds
-	newins examples/imagecmds.conf imagecmds.example.conf
-	newins examples/imagecmds.conf.DE imagecmds.example.conf.de
-
-	insinto /etc/vdr/plugins/image
-	doins examples/imagesources.conf
-
-	into /usr/share/vdr/image
-	dobin scripts/imageplugin.sh
-	newbin scripts/mount.sh mount-image.sh
-}
-
-pkg_postinst() {
-	vdr-plugin_pkg_postinst
-
-	echo
-	elog "Also check /etc/vdr/plugins/image/imagesources.conf"
-	echo
-	elog "Multilanguage will automaticly supported, just take a look in"
-	elog "/etc/vdr/imagecmds/* how it works"
-	elog "By the moment only EN + DE"
-	echo
-}
diff --git a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild
index 202bd69fa0e1..9297d37fc8a2 100644
--- a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.6 2011/01/03 21:58:14 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.7 2011/01/29 01:08:11 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit vdr-plugin eutils flag-o-matic