cleanup, stable x86

(Portage version: 2.1.9.24/cvs/Linux i686)

6 files changed, 11 insertions, 151 deletions

diff --git a/media-plugins/vdr-skinenigmang/ChangeLog b/media-plugins/vdr-skinenigmang/ChangeLog
index a241c4ef2dcb..3d27421e9d7d 100644
--- a/media-plugins/vdr-skinenigmang/ChangeLog
+++ b/media-plugins/vdr-skinenigmang/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-skinenigmang
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/ChangeLog,v 1.9 2010/04/08 14:57:50 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/ChangeLog,v 1.10 2011/01/17 18:05:13 hd_brummy Exp $
+
+  17 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-skinenigmang-0.0.6.ebuild, -vdr-skinenigmang-0.1.0.ebuild,
+  -vdr-skinenigmang-0.1.0-r1.ebuild, vdr-skinenigmang-0.1.1.ebuild,
+  -files/imagemagick-6.4.x.diff:
+  cleanup, stable x86
 
 *vdr-skinenigmang-0.1.1 (08 Apr 2010)
 *vdr-skinenigmang-0.1.0-r1 (08 Apr 2010)
diff --git a/media-plugins/vdr-skinenigmang/files/imagemagick-6.4.x.diff b/media-plugins/vdr-skinenigmang/files/imagemagick-6.4.x.diff
deleted file mode 100644
index 7eb6a3b77a41..000000000000
--- a/media-plugins/vdr-skinenigmang/files/imagemagick-6.4.x.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-fix for new imagemagick include dir structur
-Joerg Bornkessel hd_brummy@gentoo.org 2008 Aug 04
-diff -Naur skinenigmang-0.0.6.orig/Makefile skinenigmang-0.0.6/Makefile
---- skinenigmang-0.0.6.orig/Makefile	2008-08-04 22:39:06.000000000 +0200
-+++ skinenigmang-0.0.6/Makefile	2008-08-04 22:39:51.000000000 +0200
-@@ -139,6 +139,7 @@
- ifdef HAVE_IMAGEMAGICK
- OBJS += bitmap.o
- LIBS += -lMagick++
-+INCLUDES += -I/usr/include/ImageMagick
- endif
- 
- ifdef HAVE_FREETYPE
diff --git a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.0.6.ebuild b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.0.6.ebuild
deleted file mode 100644
index e0d66fd981f9..000000000000
--- a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.0.6.ebuild
+++ /dev/null
@@ -1,43 +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-skinenigmang/vdr-skinenigmang-0.0.6.ebuild,v 1.3 2009/04/28 00:00:28 hd_brummy Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR - Skin Plugin: enigma-ng"
-HOMEPAGE="http://andreas.vdr-developer.org/enigmang/"
-SRC_URI="http://andreas.vdr-developer.org/enigmang/download/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE="imagemagick"
-
-DEPEND=">=media-video/vdr-1.3.44"
-
-RDEPEND="${DEPEND}
-		x11-themes/skinenigmang-logos
-		imagemagick? ( media-gfx/imagemagick )"
-
-S=${WORKDIR}/skinenigmang-${PV}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	use imagemagick && sed -i "s:#HAVE_IMAGEMAGICK:HAVE_IMAGEMAGICK:" Makefile
-
-	# TODO: implement a clean query / extra tool vdr-config
-	sed -i -e '/^VDRLOCALE/d' Makefile
-	if has_version ">=media-video/vdr-1.5.9"; then
-		sed -i -e 's/.*$(VDRLOCALE).*/ifeq (1,1)/' Makefile
-	fi
-
-	has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/themes
-	doins "${S}"/themes/*
-}
diff --git a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.0-r1.ebuild b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.0-r1.ebuild
deleted file mode 100644
index b11bbf756fd6..000000000000
--- a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.0-r1.ebuild,v 1.1 2010/04/08 14:57:50 hd_brummy Exp $
-
-EAPI="2"
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR - Skin Plugin: enigma-ng"
-HOMEPAGE="http://andreas.vdr-developer.org/enigmang/"
-SRC_URI="http://andreas.vdr-developer.org/enigmang/download/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="imagemagick"
-
-DEPEND=">=media-video/vdr-1.5.7"
-
-RDEPEND="${DEPEND}
-		x11-themes/skinenigmang-logos
-		imagemagick? ( media-gfx/imagemagick[cxx] )"
-
-S=${WORKDIR}/skinenigmang-${PV}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	use imagemagick && sed -i "s:#HAVE_IMAGEMAGICK:HAVE_IMAGEMAGICK:" Makefile
-
-	# TODO: implement a clean query / extra tool vdr-config
-	sed -i -e '/^VDRLOCALE/d' Makefile
-	if has_version ">=media-video/vdr-1.5.9"; then
-		sed -i -e 's/.*$(VDRLOCALE).*/ifeq (1,1)/' Makefile
-	fi
-
-	sed -i -e "s:-I/usr/local/include/ImageMagick::" Makefile
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/themes
-	doins "${S}"/themes/*
-}
diff --git a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.0.ebuild b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.0.ebuild
deleted file mode 100644
index f23a23f0d5f6..000000000000
--- a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.0.ebuild,v 1.3 2010/04/08 14:57:50 hd_brummy Exp $
-
-EAPI="2"
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR - Skin Plugin: enigma-ng"
-HOMEPAGE="http://andreas.vdr-developer.org/enigmang/"
-SRC_URI="http://andreas.vdr-developer.org/enigmang/download/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE="imagemagick"
-
-DEPEND=">=media-video/vdr-1.5.7"
-
-RDEPEND="${DEPEND}
-		x11-themes/skinenigmang-logos
-		imagemagick? ( media-gfx/imagemagick )"
-
-S=${WORKDIR}/skinenigmang-${PV}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	use imagemagick && sed -i "s:#HAVE_IMAGEMAGICK:HAVE_IMAGEMAGICK:" Makefile
-
-	# TODO: implement a clean query / extra tool vdr-config
-	sed -i -e '/^VDRLOCALE/d' Makefile
-	if has_version ">=media-video/vdr-1.5.9"; then
-		sed -i -e 's/.*$(VDRLOCALE).*/ifeq (1,1)/' Makefile
-	fi
-
-	sed -i -e "s:-I/usr/local/include/ImageMagick::" Makefile
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto /etc/vdr/themes
-	doins "${S}"/themes/*
-}
diff --git a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild
index dbf8ac122e31..9c04d1400cfc 100644
--- a/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild
+++ b/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild,v 1.1 2010/04/08 14:57:50 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-skinenigmang/vdr-skinenigmang-0.1.1.ebuild,v 1.2 2011/01/17 18:05:13 hd_brummy Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="http://andreas.vdr-developer.org/enigmang/download/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="imagemagick"
 
 DEPEND=">=media-video/vdr-1.5.7"