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

Package-Manager: portage-2.1.10.11/cvs/Linux i686

5 files changed, 27 insertions, 91 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/Manifest b/media-plugins/vdr-ttxtsubs/Manifest
index 22eae35a30c9..f0c6b42c7038 100644
--- a/media-plugins/vdr-ttxtsubs/Manifest
+++ b/media-plugins/vdr-ttxtsubs/Manifest
@@ -1,10 +1,15 @@
-DIST vdr-ttxtsubs-0.0.5-lusikkahaarukka-edition.diff.gz 16894 RMD160 35d73ade6ab8dfe9eb862f0c0533a2fb81ae9a8b SHA1 39670b945818c36c155b0b0fa7f12d901cbd3192 SHA256 42ee962c8ed511322365df9cbbc9c7569f5db05570afcba286f9ad225cfa7885
-DIST vdr-ttxtsubs-0.0.5-raastinrauta-edition.diff.gz 29226 RMD160 018f453daa30b42b7f5232fa6bf62d4bd1677699 SHA1 6295fddf57361675d5e90852b03f160376abe74f SHA256 06d890775885def2d3501f83a39cb5b193c75e0263368555dbc33501a16d9813
-DIST vdr-ttxtsubs-0.0.5.tgz 60629 RMD160 ef64f22b2b4a0ba3959bf1c98c9f7111acc08362 SHA1 032957e4a91ce302cf93a2a32d28d2198a80837e SHA256 0b8546235e012f3aef09bf3e2ae1243696ca4c5a3c0c99776c824b177b04e351
-DIST vdr-ttxtsubs-0.0.8.tar.gz 65730 RMD160 858822f9b639315ce078adf36cd120e19415a055 SHA1 111c99d802fbea005f970ba54a2cb2aa513b8b3b SHA256 a908bebf49bc00c4e94d5e62b73188d68f83888dbc23f1f9cfe0b09d369ed0f5
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST vdr-ttxtsubs-0.1.0.tar.gz 64594 RMD160 8ea7a15dba6fed64c5af3ffba5f6c425b00a3f90 SHA1 12471dbefc1fed85043c9edc219da6083a00445a SHA256 12970717c6d6982fc7eaf535fb9330f1764dc153b51394db312e8cd71f6fc056
-EBUILD vdr-ttxtsubs-0.0.5_p2-r1.ebuild 1470 RMD160 0e1305112fb996f61a5e45a8fbf35998de97e431 SHA1 0f3b57a18f69162bd9c69ee626a28721b981c5f7 SHA256 072ff06aab19166d78f7a3936b277b406ff29e1dd9b9f48e3f8a63b40efb37c0
-EBUILD vdr-ttxtsubs-0.0.8.ebuild 813 RMD160 f707e958c2cfa459053cbbd83880252574eb96bf SHA1 d0caa6608b2bfa0db9414d62293969d379d7c424 SHA256 db93f5c0946231f2ebe71eb2c947f2a19137995f4c0d9d85ca8fdfa4d6e5a455
-EBUILD vdr-ttxtsubs-0.1.0.ebuild 635 RMD160 fa301199a4fd5320b9c13735a1f47f7077ae2488 SHA1 b3051f858ea4ff77cb13315e99ce7a14d64bac7a SHA256 08d9f70f77eb5edd031a7a2380ec4e01038e910843be5a2716abf0bef1dace3f
-MISC ChangeLog 2675 RMD160 c78a2143354d66171626419ac493ca463ae186ff SHA1 f98b26c95e007ae53b3abba300f2a697e5075288 SHA256 0da32d7cbc93e51a46e0da30fe9843ab590909479213c94c6a6c34d9fddfa5ee
+EBUILD vdr-ttxtsubs-0.1.0.ebuild 652 RMD160 70b00064e10972d020a13baaa44eb8c165ac622e SHA1 b90b12261e3be1f2aafea41c986ea4d6afe31ced SHA256 ff849c286f707c06c01eb7a566619f45f7037c01c9c9905c4bae45201e8cd654
+MISC ChangeLog 2886 RMD160 cf5c6a9ca3ae6873e81fb2482bca263c95edba09 SHA1 4d05fed78b5e68d6d84df40aef199a829f325438 SHA256 03f4b9cb36402a5a95030b1d46e8b8e599e787465182a27970d9d1fb10bd0c1a
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFPAfnRdn07HTTCgIoRAnuSAJ45JewNsEYrDB4sRcyD4h//1mCZkgCfdb3M
+2QagBnfJMgVT/z4qxInWcqc=
+=r2sl
+-----END PGP SIGNATURE-----
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=""