cleanup, minor fixes, stable amd64, x86 on bug #397091

(Portage version: 2.1.10.11/cvs/Linux i686)

4 files changed, 14 insertions, 83 deletions

diff --git a/media-plugins/vdr-ttxtsubs/ChangeLog b/media-plugins/vdr-ttxtsubs/ChangeLog
index 49123dbea0aa..353d114c1882 100644
--- a/media-plugins/vdr-ttxtsubs/ChangeLog
+++ b/media-plugins/vdr-ttxtsubs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-ttxtsubs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ttxtsubs/ChangeLog,v 1.16 2009/06/03 13:05:12 zzam Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ttxtsubs/ChangeLog,v 1.17 2012/01/02 18:38:57 hd_brummy Exp $
+
+  02 Jan 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-ttxtsubs-0.0.5_p2-r1.ebuild, -vdr-ttxtsubs-0.0.8.ebuild,
+  vdr-ttxtsubs-0.1.0.ebuild:
+  cleanup, minor fixes, stable amd64, x86 on bug #397091
 
 *vdr-ttxtsubs-0.1.0 (03 Jun 2009)
 
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.0.5_p2-r1.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.0.5_p2-r1.ebuild
deleted file mode 100644
index 7f01ddf82964..000000000000
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.0.5_p2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2004-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.0.5_p2-r1.ebuild,v 1.5 2009/01/06 18:14:17 hd_brummy Exp $
-
-inherit vdr-plugin eutils versionator
-
-IUSE=""
-
-MY_P=${PN}-$(get_version_component_range 1-3)
-PATCHNAME_1_4="${MY_P}-lusikkahaarukka-edition"
-PATCHNAME_1_5="${MY_P}-raastinrauta-edition"
-
-DESCRIPTION="Video Disk Recorder Teletext-Subtitles PlugIn"
-HOMEPAGE="ftp://ftp.nada.kth.se/pub/home/ragge/vdr"
-SRC_URI="ftp://ftp.nada.kth.se/pub/home/ragge/vdr/${MY_P}.tgz
-		 http://www.saunalahti.fi/~rahrenbe/vdr/patches/${PATCHNAME_1_4}.diff.gz
-		 http://www.saunalahti.fi/~rahrenbe/vdr/patches/${PATCHNAME_1_5}.diff.gz"
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-video/vdr-1.3.19"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-pkg_setup() {
-	if [[ ! -f /usr/include/vdr/vdrttxtsubshooks.h ]]; then
-		local flag=ttxtsubs
-		if has_version "<media-video/vdr-1.6.0"; then
-			flag="subtitles"
-		fi
-		eerror "please compile vdr with USE=\"${flag}\""
-		die "can not compile packet without subtitles-support from vdr"
-	fi
-	vdr-plugin_pkg_setup
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack unpack
-
-	if has_version ">=media-video/vdr-1.5.8"; then
-		epatch "${WORKDIR}/${PATCHNAME_1_5}.diff"
-	else
-		epatch "${WORKDIR}/${PATCHNAME_1_4}.diff"
-	fi
-
-	cd "${S}"
-	sed -i "${S}"/Makefile -e '/Checkpatch.sh/d'
-
-	vdr-plugin_src_unpack all_but_unpack
-}
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.0.8.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.0.8.ebuild
deleted file mode 100644
index 70e6eb49238b..000000000000
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2004-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.0.8.ebuild,v 1.1 2009/01/06 18:14:17 hd_brummy Exp $
-
-inherit vdr-plugin eutils
-
-DESCRIPTION="VDR Plugin: displaying, recording and replaying teletext
-based subtitles"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-ttxtsubs"
-SRC_URI="http://projects.vdr-developer.org/attachments/download/39/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.5.8"
-
-pkg_setup() {
-	if [[ ! -f /usr/include/vdr/vdrttxtsubshooks.h ]]; then
-		eerror "please compile vdr with USE=\"ttxtsubs\""
-		die "can not compile packet without subtitles-support from vdr"
-	fi
-	vdr-plugin_pkg_setup
-}
diff --git a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.1.0.ebuild b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.1.0.ebuild
index b1f751ef9387..8d4be98f5d2b 100644
--- a/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.1.0.ebuild
+++ b/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.1.0.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.1.0.ebuild,v 1.2 2009/06/03 15:35:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-ttxtsubs/vdr-ttxtsubs-0.1.0.ebuild,v 1.3 2012/01/02 18:38:57 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit vdr-plugin eutils
 
+VERSION="96" # every bump, new Version
+
 DESCRIPTION="VDR Plugin: displaying, recording and replaying teletext
 based subtitles"
 HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-ttxtsubs"
-SRC_URI="http://projects.vdr-developer.org/attachments/download/96/${P}.tar.gz"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""