version bump; cleanup

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

19 files changed, 80 insertions, 579 deletions

diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog
index 9e116bc05854..fcf20e44e648 100644
--- a/media-plugins/vdr-text2skin/ChangeLog
+++ b/media-plugins/vdr-text2skin/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-plugins/vdr-text2skin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.8 2010/03/14 14:18:32 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.9 2010/12/30 18:57:40 hd_brummy Exp $
+
+*vdr-text2skin-1.3.1 (30 Dec 2010)
+
+  30 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/20070506/06_vdr-1.5.7.diff, -files/20070906/04_no_direct_blit.diff,
+  -vdr-text2skin-1.0.20070506.ebuild, -files/20070506/01_gcc-4.diff,
+  -files/20070506/02_uint64.diff, -files/20070506/03_gentoo.diff,
+  -files/20070506/04_no_direct_blit.diff,
+  -files/20070506/07_pkgconfig_magick.diff,
+  -files/20070906/07_pkgconfig_magick.diff,
+  -vdr-text2skin-1.0.20070906.ebuild, +vdr-text2skin-1.3.1.ebuild,
+  -files/20070506/05_vdr-1.5.4.diff, -files/20070506/series,
+  -files/20070906/06_vdr-1.5.7.diff, -files/20070906/03_gentoo.diff,
+  -files/20070906/08_cache.diff, metadata.xml:
+  version bump; cleanup
 
   14 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-text2skin-1.3.ebuild:
diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
index 5ae664562256..ff3a6021a075 100644
--- a/media-plugins/vdr-text2skin/Manifest
+++ b/media-plugins/vdr-text2skin/Manifest
@@ -1,34 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 20070506/01_gcc-4.diff 1855 RMD160 0f91d9e4355a0daeb3b2a179816bfcbe0a448c1a SHA1 6a9a7848d5fb424505c16d7a60e91bed7928b95c SHA256 469cd4f775a11da21a23e2799c886f5c6b173a5f9504b4c401559954860f6bc8
-AUX 20070506/02_uint64.diff 794 RMD160 b91687e0ad2e5560d3b0e35bb85bfd0df97bc67c SHA1 e1a6ee8763bb5ff7be0ee08eaabacbbe947e3fa8 SHA256 b3545629d2232fe7daa1c3fa36db344b33942d14ae7583a433c36fbedf04c12c
-AUX 20070506/03_gentoo.diff 434 RMD160 190fb931c9481e6d692a270344b4c995e7aa03b0 SHA1 4fa89190551b6d1435195cccbc31a6ed4dfd415b SHA256 eff41ebe1807f1bbcf8d797d53ae0561d3747b1c0e5f64e8dfa80ac69e8cd63a
-AUX 20070506/04_no_direct_blit.diff 440 RMD160 101738bd5ac6359deb016965d6cf3024e6a2efe2 SHA1 5a5a50ef10b93f3eb43565767f2c0b602fd79f7e SHA256 c4cdabc7e629cf71c8e6cd15dbc548e1997352c75065ad7809b3c0b84fda22b0
-AUX 20070506/05_vdr-1.5.4.diff 1815 RMD160 6caa9d437a25a3ff3131c4af517f142dc4a2a2de SHA1 9c24a0ba573d3a9ef293e7f8d1fa1c226a04b91a SHA256 98c1a1dccf9c6a83b5410a791ed7b6b3a3fb59843359168147f1cf51417341a1
-AUX 20070506/06_vdr-1.5.7.diff 3122 RMD160 9afd5c427501d75aea76edb50280ad447ca1b8b8 SHA1 a904d4f856757df4dc268fe1911bebafc332fdcb SHA256 2033f10e2f5db48b4cca558ac344324930fc15406992383e706f1a13299e0178
-AUX 20070506/07_pkgconfig_magick.diff 433 RMD160 97d8e084e942d15cd881cc0156e99020bd72f61e SHA1 4212c02e5d0c0c809549e2a4295b8088f93c4ae3 SHA256 0b2f758f5a7b2a93c45f5e56e92f9f6e584985f68a2d2087f7875b7032747b87
-AUX 20070506/series 128 RMD160 9b61168fb205fdba9d997592b81999cd14e1a101 SHA1 f83f19e9c19685c84715a3a65c99e3283ef88047 SHA256 bde28f27721e8aa6c1be7e11afb483312554f0a175a33dfde20884af87e31e83
-AUX 20070906/03_gentoo.diff 434 RMD160 190fb931c9481e6d692a270344b4c995e7aa03b0 SHA1 4fa89190551b6d1435195cccbc31a6ed4dfd415b SHA256 eff41ebe1807f1bbcf8d797d53ae0561d3747b1c0e5f64e8dfa80ac69e8cd63a
-AUX 20070906/04_no_direct_blit.diff 440 RMD160 101738bd5ac6359deb016965d6cf3024e6a2efe2 SHA1 5a5a50ef10b93f3eb43565767f2c0b602fd79f7e SHA256 c4cdabc7e629cf71c8e6cd15dbc548e1997352c75065ad7809b3c0b84fda22b0
-AUX 20070906/06_vdr-1.5.7.diff 3122 RMD160 9afd5c427501d75aea76edb50280ad447ca1b8b8 SHA1 a904d4f856757df4dc268fe1911bebafc332fdcb SHA256 2033f10e2f5db48b4cca558ac344324930fc15406992383e706f1a13299e0178
-AUX 20070906/07_pkgconfig_magick.diff 433 RMD160 97d8e084e942d15cd881cc0156e99020bd72f61e SHA1 4212c02e5d0c0c809549e2a4295b8088f93c4ae3 SHA256 0b2f758f5a7b2a93c45f5e56e92f9f6e584985f68a2d2087f7875b7032747b87
-AUX 20070906/08_cache.diff 365 RMD160 724a6a9947d6ef9c50ab556d75f90fcfc5766d2d SHA1 cc997ee634e96488fb98928d95a4159d6c708e36 SHA256 e89d35e6000a73ebfee59cfbb618236c4b4a25e9ff835b83d234f3741455653f
-DIST text2skin-1.1-cvs_ext-0.10-patched-20070506.tar.bz2 81003 RMD160 536b22e3d61ee9978319dd301b5360f220fc3b3d SHA1 a9efacdd26a03ae39234cb3c7772509802ae7e13 SHA256 e1e6314a14568402e75c9b9fb5a81d76877d22e37c81ff102c380fdaed676d0f
-DIST text2skin-1.1-cvs_ext-0.11.tar.bz2 78703 RMD160 32fd05a11ef1a59b9f6211d1d5f406a26ddcf3a9 SHA1 1f428e23de74483b7bcab5e86f97c64536d32295 SHA256 b1611768ff8d9a4a682238d25a09456febeb2eecc9d71c018351e462d5c2b8da
 DIST vdr-text2skin-1.2.tgz 77391 RMD160 0b1ff0a751fadec8ffbf09e401a2f70217645bc2 SHA1 16699f9e34e6b4cc8c2ce59cd99fe8d349bd5453 SHA256 e2fd762d77bcd3592fa604dbbd71ce3c1d1b8998d9e4513c1bfe318ebbf3d030
+DIST vdr-text2skin-1.3.1.tgz 91191 RMD160 c04f3bea7a2487f2a8b6cf9822d9305231d15d9b SHA1 0dc94c9c7c077fac8ca3b95cc566b9b0e2a65ffa SHA256 176669d979d9b6c12de33d718f14e4bc66efe18160971a9d5c212aa0c6a06cc4
 DIST vdr-text2skin-1.3.tgz 88819 RMD160 949f58e7d7c85af355cad92113327fb66de9f203 SHA1 0c36fe1e79067d3b9264a3f367ea9a1b575aa7b4 SHA256 99f5552012477199a1d5624df9a8d0ad9576882f3a8364928a8a1f63fcca63f3
-EBUILD vdr-text2skin-1.0.20070506.ebuild 1663 RMD160 88920e0b960b084c1d86728f21612a1ae1ff7bc8 SHA1 dd27413a4b1f3f9259b4b7ac172fedecee55d67f SHA256 b948bb7a3e4bc320f4f1082841e4af04dc8b468396b1d45971479d033a5a0e28
-EBUILD vdr-text2skin-1.0.20070906.ebuild 1690 RMD160 5cbf9812070cd5fe3d0fe77029570604e26ee189 SHA1 2637fd9124466074d992143f5331f4d4928d905d SHA256 60b4456492119091b8b418d2b1cc9d4e17e10777408c0622460f0dfa583c86ab
 EBUILD vdr-text2skin-1.2.ebuild 1305 RMD160 d955daaa28a1a25ee0337425672b4bd888277a19 SHA1 8b4602bf97c624199ba55addda615866dbdb2441 SHA256 8ce487c4fe602ffb03e89eb244f50174efc759f5212190c322cc24c1f2fd4c66
+EBUILD vdr-text2skin-1.3.1.ebuild 1440 RMD160 11e2ecac52b63966f1eeeb5f670d8c1c67b3687d SHA1 e054da9aa85d4307ead18bf1fec56459ffcf5820 SHA256 efae083e2f360f628942dedab002fcf2506aa925e73972d86e65403122b17060
 EBUILD vdr-text2skin-1.3.ebuild 1328 RMD160 7a602031b53225bd35803ae8b91dfe386982edf6 SHA1 f0967971e793332e697e216674f8ce85cde13c1a SHA256 e1031d377df2e01fd43c76c0b722066d4e08588c6542e1d3f77af5cd57660eee
-MISC ChangeLog 2102 RMD160 61dabcd90df89a596035877798e6e37ece98c4bf SHA1 1b343c6cfa3cb4162258d80cff280953a0c9eafd SHA256 3964e583bac0ac1d6574a3c837b4fd96cdb8e021674d37f853b1de11143dfaee
-MISC metadata.xml 358 RMD160 540955e7bed6b40dcff9e3d52159c973fdb5d901 SHA1 decc90bf0f2950bcfa17628753befc76d604053b SHA256 7973e5c8a20dbfd5e15d6c8b7eef016443eb44eb21c01081464ee0a98d386a64
+MISC ChangeLog 2804 RMD160 85b1e4f69a2db492bacaf0beee926a71cf9a3078 SHA1 d45d4506e16f57839cd74636f04238c1178d26b1 SHA256 d969f8bb65809f355e876b5330cca2930e3fa4d2d165001ea8cb8ac2b31a33dc
+MISC metadata.xml 367 RMD160 84a243bba2bf0d3370616a9875d8589204e110b0 SHA1 53cdc130577e0801947e8463e2b1c4287be6ed10 SHA256 0fddf0a96db7b709320f3f470616bb532abd9a8fdfb657d9b3e682fed2f42fdc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFLnO8rdn07HTTCgIoRArhVAJ0bRXCFQPeqPjLU2wRp05dsW5T03ACcDDFh
-EF1ZSUuuK4fcMTTvodd9w48=
-=Bkkv
+iD8DBQFNHNZadn07HTTCgIoRAkZnAJ9ZMg42hCvuStwvgbD0tYcNTLJ2JgCeK5N4
+drR5O8/oyT/t1K6bZBsAh4s=
+=u+j4
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-text2skin/files/20070506/01_gcc-4.diff b/media-plugins/vdr-text2skin/files/20070506/01_gcc-4.diff
deleted file mode 100644
index 6bade6cc1570..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/01_gcc-4.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/xml/object.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/xml/object.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/xml/object.h
-@@ -55,7 +55,7 @@ public:
- 	uint           Type(void)      const { return mRefreshType; }
- 	bool           Parse(const std::string &Text);
- 	bool           ParseChanged(const std::string &Text);
--	cxRefresh     &cxRefresh::operator=(const cxRefresh &b);
-+	cxRefresh     &operator=(const cxRefresh &b);
- 
- private:
- 	uint           mRefreshType;
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/xml/skin.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/xml/skin.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/xml/skin.h
-@@ -28,21 +28,21 @@ public:
- 	bool Limit( int ma, int min ) const {
- 		return mMajor < ma ? true : (mMajor == ma ? mMinor <= min : false);
- 	}
--	bool cxVersion::operator==( const cxVersion &v ) const {
-+	bool operator==( const cxVersion &v ) const {
- 		return mMajor == v.mMajor && mMinor == v.mMinor;
- 	}
--	bool cxVersion::operator>=( const cxVersion &v ) const { 
-+	bool operator>=( const cxVersion &v ) const { 
- 		return Require(  v.mMajor , v.mMinor);
- 	}
--	bool cxVersion::operator>=( const char *c ) const { 
-+	bool operator>=( const char *c ) const { 
- 		cxVersion v;
- 		if( !v.Parse(c) ) return false;
- 		return Require(  v.mMajor , v.mMinor);
- 	}
--	bool cxVersion::operator<=( const cxVersion &v ) const {
-+	bool operator<=( const cxVersion &v ) const {
- 		return Limit( v.mMajor , v.mMinor );
- 	}
--	bool cxVersion::operator<=( const char *c ) const { 
-+	bool operator<=( const char *c ) const { 
- 		cxVersion v;
- 		if( !v.Parse(c) ) return false;
- 		return Limit(  v.mMajor , v.mMinor);
diff --git a/media-plugins/vdr-text2skin/files/20070506/02_uint64.diff b/media-plugins/vdr-text2skin/files/20070506/02_uint64.diff
deleted file mode 100644
index 4b2da8cf6e40..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/02_uint64.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/common.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/common.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/common.h
-@@ -17,7 +17,7 @@
- #	else
- #		define Dprintf(x...)
- #	endif
--#	define Dbench(x) uint64 bench_##x = time_ms()
-+#	define Dbench(x) uint64_t bench_##x = time_ms()
- #	define Ddiff(t,x) fprintf(stderr, "%s took %llu ms\n", t, time_ms() - bench_##x)
- #else
- #	define Dprintf(x...)
-@@ -25,7 +25,7 @@
- #	define Ddiff(t,x)
- #endif
- 
--#define DStartBench(x) uint64 bench_##x = time_ms()
-+#define DStartBench(x) uint64_t bench_##x = time_ms()
- #define DShowBench(t,x) fprintf(stderr, "%s took %llu ms\n", t, time_ms() - bench_##x)
- 
- #if VDRVERSNUM >= 10318
diff --git a/media-plugins/vdr-text2skin/files/20070506/03_gentoo.diff b/media-plugins/vdr-text2skin/files/20070506/03_gentoo.diff
deleted file mode 100644
index f9cb59dce81b..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/03_gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10/common.c
-===================================================================
---- text2skin-1.1-cvs_ext-0.10.orig/common.c
-+++ text2skin-1.1-cvs_ext-0.10/common.c
-@@ -15,7 +15,7 @@
- const std::string &SkinPath(void) 
- {
- 	// should never change
--	static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
-+	static std::string path = "/usr/share/vdr/" PLUGIN_NAME_I18N;
- 	return path;
- }
- 
diff --git a/media-plugins/vdr-text2skin/files/20070506/04_no_direct_blit.diff b/media-plugins/vdr-text2skin/files/20070506/04_no_direct_blit.diff
deleted file mode 100644
index 6a3ccec1dfe3..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/04_no_direct_blit.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/screen.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/screen.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/screen.h
-@@ -8,8 +8,8 @@
- #include "common.h"
- #include <vdr/osd.h>
- 
--// #undef DIRECTBLIT
--#define DIRECTBLIT
-+#undef DIRECTBLIT
-+// #define DIRECTBLIT
- 
- class cText2SkinScreen {
- 	/* Skin Editor */
diff --git a/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff b/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff
deleted file mode 100644
index 8269ca01701a..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/05_vdr-1.5.4.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10/graphtft/font.c
-===================================================================
---- text2skin-1.1-cvs_ext-0.10.orig/graphtft/font.c
-+++ text2skin-1.1-cvs_ext-0.10/graphtft/font.c
-@@ -38,6 +38,15 @@ cGraphtftFont::~cGraphtftFont()
- 
- bool cGraphtftFont::Load(string Filename, string CacheName, int Size, int Language, int Width, int format)
- {
-+#if VDRVERSNUM >= 10507
-+    if ( _cache.find(CacheName) != _cache.end() )
-+        return true;
-+    cFont* newFont = cFont::CreateFont(Filename.c_str(), Size);
-+    if ( newFont == NULL )
-+        return false;
-+    _cache[CacheName] = newFont;
-+    return true;
-+#else
- 	if ( _cache.find(CacheName) != _cache.end() )
- 		return true;	
- 	
-@@ -187,6 +196,7 @@ bool cGraphtftFont::Load(string Filename
- 	delete(font_data);
- 	// Something went wrong!
- 	return false;
-+#endif
- }
- 
- const cFont* cGraphtftFont::GetFont(string CacheName){
-@@ -209,11 +219,13 @@ void cGraphtftFont::Clear()
- 	for (; it != _cache.end(); ++it)
- 		delete((*it).second);
- 	_cache.clear();
-+#if VDRVERSNUM < 10507
- 
- 	del_map::iterator del_it = _del.begin();
- 	for (; del_it != _del.end(); ++del_it)
- 		delete((*del_it).second);
- 	_del.clear();
-+#endif
- }
- 				
- cGraphtftFont GraphtftFont;
-Index: text2skin-1.1-cvs_ext-0.10/graphtft/font.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10.orig/graphtft/font.h
-+++ text2skin-1.1-cvs_ext-0.10/graphtft/font.h
-@@ -24,7 +24,9 @@ class cGraphtftFont
- {
- private:
- 	typedef map<string,cFont*> cache_map;
-+#if VDRVERSNUM < 10507
- 	typedef map<string,cFont::tPixelData*> del_map;
-+#endif
- 	
- public:
- 	cGraphtftFont();
-@@ -40,7 +42,9 @@ private:
- 	FT_Face			_face;
- 	FT_GlyphSlot		_slot;
- 	cache_map 		_cache;
-+#if VDRVERSNUM < 10507
- 	del_map			_del;
-+#endif
- 
- };
- 
diff --git a/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff b/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff
deleted file mode 100644
index 7728fa337915..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/06_vdr-1.5.7.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- text2skin-1.1-cvs_ext-0.10-20070620.3/font.c.orig	2007-08-13 08:54:41.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/font.c	2007-08-13 09:17:43.000000000 -0700
-@@ -31,8 +31,13 @@
- 	const cFont *res = NULL;
- #ifdef HAVE_FREETYPE
- 	char *cachename;
-+#if VDRVERSNUM >= 10507
-+	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, I18nCurrentLanguage());
-+	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, I18nCurrentLanguage(), Width))
-+#else
- 	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, Setup.OSDLanguage);
- 	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, Setup.OSDLanguage, Width))
-+#endif
- 		res = mFontCache.GetFont(cachename);
- 	else
- 		esyslog("ERROR: Text2Skin: Couldn't load font %s:%d", Filename.c_str(), Size);
---- text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c.orig	2007-08-13 07:34:10.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c	2007-08-13 08:53:31.000000000 -0700
-@@ -491,7 +491,11 @@
- 
- cText2SkinI18n::~cText2SkinI18n() {
- 	for (int i = 0; mPhrases[i][0]; ++i) {
-+#if VDRVERSNUM >= 10507
-+		for (int j = 0; j < I18nLanguages()->Size(); ++j)
-+#else
- 		for (int j = 0; j < I18nNumLanguages; ++j)
-+#endif
- 			free((void*)mPhrases[i][j]);
- 	}
- 	free(mPhrases);
-@@ -507,7 +511,11 @@
- 			memset(&p, 0, sizeof(tI18nPhrase));
- 			Text += 17;
- 
-+#if VDRVERSNUM >= 10507
-+			for (i = 0; i < I18nLanguages()->Size(); ++i) {
-+#else
- 			for (i = 0; i < I18nNumLanguages; ++i) {
-+#endif
- 				char *langs = strdup(I18nLanguageCode(i));
- 				char *ptr = langs, *ep;
- 				std::string text;
-@@ -525,7 +533,11 @@
- 			}
- 
- 			int idx = mNumPhrases++;
-+#if VDRVERSNUM >= 10507
-+			for (i = 0; i < I18nLanguages()->Size(); ++i)
-+#else
- 			for (i = 0; i < I18nNumLanguages; ++i)
-+#endif
- 				if (!p[i]) p[i] = "";
- 			mPhrases = (tI18nPhrase*)realloc(mPhrases, (mNumPhrases + 1) * sizeof(tI18nPhrase));
- 			memcpy(mPhrases[idx], p, sizeof(tI18nPhrase));
-@@ -539,7 +551,9 @@
- 
- bool cText2SkinI18n::Load(const std::string &Filename) {
- 	if (cText2SkinFile::Load(Filename)) {
-+#if VDRVERSNUM <= 10506
- 		I18nRegister(mPhrases, mIdentity.c_str());
-+#endif
- 		return true;
- 	}
- 	return false;
---- text2skin-1.1-cvs_ext-0.10-20070620.3/status.c.orig	2007-08-13 09:54:04.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/status.c	2007-08-13 09:57:10.000000000 -0700
-@@ -130,8 +130,13 @@
- 
- void cText2SkinStatus::OsdClear(void) 
- {
-+#if VDRVERSNUM >= 10507
-+	if (I18nCurrentLanguage() != mLastLanguage) {
-+		mLastLanguage = I18nCurrentLanguage();
-+#else
- 	if (Setup.OSDLanguage != mLastLanguage) {
- 		mLastLanguage = Setup.OSDLanguage;
-+#endif
- 		cxString::Reparse();
- 	}
- 	
---- text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c.orig	2007-08-13 09:46:25.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c	2007-08-13 10:30:11.000000000 -0700
-@@ -49,7 +49,11 @@
- 
- bool cText2SkinPlugin::Start(void) {
- 	RegisterI18n(Phrases);
-+#if VDRVERSNUM >= 10507
-+	Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
-+#else
- 	Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
-+#endif
- 	cText2SkinLoader::Start();
- 	return true;
- }
diff --git a/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff b/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff
deleted file mode 100644
index 0466fe2fc38b..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/07_pkgconfig_magick.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- text2skin-1.1-cvs_ext-0.10/Makefile.orig	2008-05-06 22:27:03.133654132 +0200
-+++ text2skin-1.1-cvs_ext-0.10/Makefile	2008-05-06 22:28:19.793658721 +0200
-@@ -80,7 +80,8 @@
- 
- ifdef HAVE_IMAGEMAGICK
- 	DEFINES += -DHAVE_IMAGEMAGICK
--	LIBS += -lMagick -lMagick++
-+	INCLUDES += $(shell pkg-config --cflags ImageMagick++)
-+	LIBS += $(shell pkg-config --libs ImageMagick++)
- #	LIBS += $(shell Magick++-config --ldflags --libs)
- endif
- 
diff --git a/media-plugins/vdr-text2skin/files/20070506/series b/media-plugins/vdr-text2skin/files/20070506/series
deleted file mode 100644
index 6c4b49da5bda..000000000000
--- a/media-plugins/vdr-text2skin/files/20070506/series
+++ /dev/null
@@ -1,7 +0,0 @@
-01_gcc-4.diff
-02_uint64.diff
-03_gentoo.diff
-04_no_direct_blit.diff
-05_vdr-1.5.4.diff
-06_vdr-1.5.7.diff
-07_pkgconfig_magick.diff
diff --git a/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff b/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff
deleted file mode 100644
index f9cb59dce81b..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/03_gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10/common.c
-===================================================================
---- text2skin-1.1-cvs_ext-0.10.orig/common.c
-+++ text2skin-1.1-cvs_ext-0.10/common.c
-@@ -15,7 +15,7 @@
- const std::string &SkinPath(void) 
- {
- 	// should never change
--	static std::string path = cPlugin::ConfigDirectory(PLUGIN_NAME_I18N);
-+	static std::string path = "/usr/share/vdr/" PLUGIN_NAME_I18N;
- 	return path;
- }
- 
diff --git a/media-plugins/vdr-text2skin/files/20070906/04_no_direct_blit.diff b/media-plugins/vdr-text2skin/files/20070906/04_no_direct_blit.diff
deleted file mode 100644
index 6a3ccec1dfe3..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/04_no_direct_blit.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10-patched-20070506/screen.h
-===================================================================
---- text2skin-1.1-cvs_ext-0.10-patched-20070506.orig/screen.h
-+++ text2skin-1.1-cvs_ext-0.10-patched-20070506/screen.h
-@@ -8,8 +8,8 @@
- #include "common.h"
- #include <vdr/osd.h>
- 
--// #undef DIRECTBLIT
--#define DIRECTBLIT
-+#undef DIRECTBLIT
-+// #define DIRECTBLIT
- 
- class cText2SkinScreen {
- 	/* Skin Editor */
diff --git a/media-plugins/vdr-text2skin/files/20070906/06_vdr-1.5.7.diff b/media-plugins/vdr-text2skin/files/20070906/06_vdr-1.5.7.diff
deleted file mode 100644
index 7728fa337915..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/06_vdr-1.5.7.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- text2skin-1.1-cvs_ext-0.10-20070620.3/font.c.orig	2007-08-13 08:54:41.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/font.c	2007-08-13 09:17:43.000000000 -0700
-@@ -31,8 +31,13 @@
- 	const cFont *res = NULL;
- #ifdef HAVE_FREETYPE
- 	char *cachename;
-+#if VDRVERSNUM >= 10507
-+	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, I18nCurrentLanguage());
-+	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, I18nCurrentLanguage(), Width))
-+#else
- 	asprintf(&cachename, "%s_%d_%d_%d", Filename.c_str(), Size, Width, Setup.OSDLanguage);
- 	if (mFontCache.Load(Path + "/" + Filename, cachename, Size, Setup.OSDLanguage, Width))
-+#endif
- 		res = mFontCache.GetFont(cachename);
- 	else
- 		esyslog("ERROR: Text2Skin: Couldn't load font %s:%d", Filename.c_str(), Size);
---- text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c.orig	2007-08-13 07:34:10.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/i18n.c	2007-08-13 08:53:31.000000000 -0700
-@@ -491,7 +491,11 @@
- 
- cText2SkinI18n::~cText2SkinI18n() {
- 	for (int i = 0; mPhrases[i][0]; ++i) {
-+#if VDRVERSNUM >= 10507
-+		for (int j = 0; j < I18nLanguages()->Size(); ++j)
-+#else
- 		for (int j = 0; j < I18nNumLanguages; ++j)
-+#endif
- 			free((void*)mPhrases[i][j]);
- 	}
- 	free(mPhrases);
-@@ -507,7 +511,11 @@
- 			memset(&p, 0, sizeof(tI18nPhrase));
- 			Text += 17;
- 
-+#if VDRVERSNUM >= 10507
-+			for (i = 0; i < I18nLanguages()->Size(); ++i) {
-+#else
- 			for (i = 0; i < I18nNumLanguages; ++i) {
-+#endif
- 				char *langs = strdup(I18nLanguageCode(i));
- 				char *ptr = langs, *ep;
- 				std::string text;
-@@ -525,7 +533,11 @@
- 			}
- 
- 			int idx = mNumPhrases++;
-+#if VDRVERSNUM >= 10507
-+			for (i = 0; i < I18nLanguages()->Size(); ++i)
-+#else
- 			for (i = 0; i < I18nNumLanguages; ++i)
-+#endif
- 				if (!p[i]) p[i] = "";
- 			mPhrases = (tI18nPhrase*)realloc(mPhrases, (mNumPhrases + 1) * sizeof(tI18nPhrase));
- 			memcpy(mPhrases[idx], p, sizeof(tI18nPhrase));
-@@ -539,7 +551,9 @@
- 
- bool cText2SkinI18n::Load(const std::string &Filename) {
- 	if (cText2SkinFile::Load(Filename)) {
-+#if VDRVERSNUM <= 10506
- 		I18nRegister(mPhrases, mIdentity.c_str());
-+#endif
- 		return true;
- 	}
- 	return false;
---- text2skin-1.1-cvs_ext-0.10-20070620.3/status.c.orig	2007-08-13 09:54:04.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/status.c	2007-08-13 09:57:10.000000000 -0700
-@@ -130,8 +130,13 @@
- 
- void cText2SkinStatus::OsdClear(void) 
- {
-+#if VDRVERSNUM >= 10507
-+	if (I18nCurrentLanguage() != mLastLanguage) {
-+		mLastLanguage = I18nCurrentLanguage();
-+#else
- 	if (Setup.OSDLanguage != mLastLanguage) {
- 		mLastLanguage = Setup.OSDLanguage;
-+#endif
- 		cxString::Reparse();
- 	}
- 	
---- text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c.orig	2007-08-13 09:46:25.000000000 -0700
-+++ text2skin-1.1-cvs_ext-0.10-20070620.3/text2skin.c	2007-08-13 10:30:11.000000000 -0700
-@@ -49,7 +49,11 @@
- 
- bool cText2SkinPlugin::Start(void) {
- 	RegisterI18n(Phrases);
-+#if VDRVERSNUM >= 10507
-+	Text2SkinStatus.SetLanguage(I18nCurrentLanguage());
-+#else
- 	Text2SkinStatus.SetLanguage(Setup.OSDLanguage);
-+#endif
- 	cText2SkinLoader::Start();
- 	return true;
- }
diff --git a/media-plugins/vdr-text2skin/files/20070906/07_pkgconfig_magick.diff b/media-plugins/vdr-text2skin/files/20070906/07_pkgconfig_magick.diff
deleted file mode 100644
index 0466fe2fc38b..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/07_pkgconfig_magick.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- text2skin-1.1-cvs_ext-0.10/Makefile.orig	2008-05-06 22:27:03.133654132 +0200
-+++ text2skin-1.1-cvs_ext-0.10/Makefile	2008-05-06 22:28:19.793658721 +0200
-@@ -80,7 +80,8 @@
- 
- ifdef HAVE_IMAGEMAGICK
- 	DEFINES += -DHAVE_IMAGEMAGICK
--	LIBS += -lMagick -lMagick++
-+	INCLUDES += $(shell pkg-config --cflags ImageMagick++)
-+	LIBS += $(shell pkg-config --libs ImageMagick++)
- #	LIBS += $(shell Magick++-config --ldflags --libs)
- endif
- 
diff --git a/media-plugins/vdr-text2skin/files/20070906/08_cache.diff b/media-plugins/vdr-text2skin/files/20070906/08_cache.diff
deleted file mode 100644
index 3137c91d10f1..000000000000
--- a/media-plugins/vdr-text2skin/files/20070906/08_cache.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: text2skin-1.1-cvs_ext-0.10/common.c
-===================================================================
---- cache.h.orig	2008-08-03 21:38:24.000000000 +0200
-+++ cache.h	2008-08-03 21:38:56.000000000 +0200
-@@ -8,6 +8,7 @@
- #include <map>
- #include <vector>
- #include <string>
-+#include "common.h"
- 
- template<class key_type, class data_type>
- class cxCache {
diff --git a/media-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
index 00fd356c467c..2083a4329d62 100644
--- a/media-plugins/vdr-text2skin/metadata.xml
+++ b/media-plugins/vdr-text2skin/metadata.xml
@@ -6,8 +6,8 @@
   <email>vdr@gentoo.org</email>
   <name>Gentoo VDR Project</name>
 </maintainer>
-<use>
+<!-- <use>
 	<flag name='direct_blit'>not buffer picture, faster, but only for modified
 		skins</flag>
-</use>
+</use> -->
 </pkgmetadata>
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
deleted file mode 100644
index 1c2eb4853121..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070506.ebuild
+++ /dev/null
@@ -1,66 +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-text2skin/vdr-text2skin-1.0.20070506.ebuild,v 1.5 2008/05/06 20:35:14 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV=$(get_version_component_range 3)
-MY_BASE="text2skin-1.1-cvs_ext-0.10"
-MY_P="${MY_BASE}-patched-${MY_PV}"
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://www.magoa.net/linux/"
-SRC_URI="ftp://merkur.2y.net/pub/vdr/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="truetype direct_blit"
-
-COMMON_DEPEND=">=media-video/vdr-1.3.18
-	media-gfx/imagemagick
-	truetype? ( media-libs/freetype )
-	!media-plugins/vdr-text2skin-cvs"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=("${FILESDIR}/${MY_PV}/01_gcc-4.diff"
-	"${FILESDIR}/${MY_PV}/02_uint64.diff"
-	"${FILESDIR}/${MY_PV}/03_gentoo.diff"
-	"${FILESDIR}/${MY_PV}/05_vdr-1.5.4.diff"
-	"${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff"
-	"${FILESDIR}/${MY_PV}/07_pkgconfig_magick.diff")
-
-S="${WORKDIR}/${MY_BASE}"
-
-SKINDIR=/usr/share/vdr/${VDRPLUGIN}
-ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
-
-src_unpack() {
-	vdr-plugin_src_unpack unpack
-
-	cd "${S}"
-	use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
-	sed -i Makefile -e 's:-I\$(DVBDIR)/linux/include::'
-
-	if ! use direct_blit; then
-		epatch "${FILESDIR}/${MY_PV}/04_no_direct_blit.diff"
-	fi
-
-	vdr-plugin_src_unpack all_but_unpack
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	keepdir "${SKINDIR}"
-
-	exeinto "${SKINDIR}/contrib"
-	doexe "${S}"/contrib/skin_to_*.pl
-	doexe "${S}"/contrib/transform.pl
-
-	dodoc "${S}"/Docs/*.txt
-}
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild
deleted file mode 100644
index 6e79c34fbb79..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.0.20070906.ebuild
+++ /dev/null
@@ -1,69 +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-text2skin/vdr-text2skin-1.0.20070906.ebuild,v 1.1 2008/08/07 15:54:26 zzam Exp $
-
-inherit vdr-plugin versionator
-
-MY_PV=$(get_version_component_range 3)
-MY_BASE="text2skin-1.1-cvs_ext-0.11"
-MY_P="${MY_BASE}"
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://www.magoa.net/linux/"
-SRC_URI="http://vdr.gekrumbel.de/mirror/text2skin-chr13/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-#IUSE="truetype direct_blit"
-IUSE="direct_blit"
-
-COMMON_DEPEND=">=media-video/vdr-1.3.18
-	media-gfx/imagemagick
-	!media-plugins/vdr-text2skin-cvs"
-#	truetype? ( media-libs/freetype )
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=("${FILESDIR}/${MY_PV}/03_gentoo.diff"
-	"${FILESDIR}/${MY_PV}/06_vdr-1.5.7.diff"
-	"${FILESDIR}/${MY_PV}/07_pkgconfig_magick.diff"
-	"${FILESDIR}/${MY_PV}/08_cache.diff")
-
-S="${WORKDIR}/${MY_BASE}"
-
-SKINDIR=/usr/share/vdr/${VDRPLUGIN}
-ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
-
-src_unpack() {
-	vdr-plugin_src_unpack unpack
-
-	cd "${S}"
-
-	#truetype support broken!
-	#use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
-	sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
-
-	sed -i Makefile -e 's:-I\$(DVBDIR)/linux/include::'
-
-	if ! use direct_blit; then
-		epatch "${FILESDIR}/${MY_PV}/04_no_direct_blit.diff"
-	fi
-
-	vdr-plugin_src_unpack all_but_unpack
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	keepdir "${SKINDIR}"
-
-	exeinto "${SKINDIR}/contrib"
-	doexe "${S}"/contrib/skin_to_*.pl
-	doexe "${S}"/contrib/transform.pl
-
-	dodoc "${S}"/Docs/*.txt
-}
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild
new file mode 100644
index 000000000000..7b579622086e
--- /dev/null
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild,v 1.1 2010/12/30 18:57:40 hd_brummy Exp $
+
+EAPI="2"
+
+inherit vdr-plugin versionator
+
+UPLOAD_NR=344 # changes with every version / new file :-(
+
+DESCRIPTION="VDR text2skin PlugIn"
+HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
+SRC_URI="http://projects.vdr-developer.org/attachments/download/${UPLOAD_NR}/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+#IUSE="truetype direct_blit"
+IUSE="+truetype"
+
+COMMON_DEPEND=">=media-video/vdr-1.6.0
+	media-gfx/imagemagick
+	truetype? ( media-libs/freetype )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${COMMON_DEPEND}"
+
+SKINDIR=/usr/share/vdr/${VDRPLUGIN}
+ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
+
+src_prepare() {
+	sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
+
+	use truetype || sed -i Makefile -e 's/^HAVE_FREETYPE/#HAVE_FREETYPE/'
+
+	if ! has_version ">=media-video/vdr-1.7.13"; then
+		sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
+	fi
+
+	vdr-plugin_src_prepare
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	keepdir "${SKINDIR}"
+
+	exeinto "${SKINDIR}/contrib"
+	doexe "${S}"/contrib/skin_to_*.pl
+	doexe "${S}"/contrib/transform.pl
+
+	dodoc "${S}"/Docs/*.txt
+}