Version bump to 1.3.2, also fixes bug 314317.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 179 insertions, 19 deletions

diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog
index 9e416b506472..6fd1283ed8b1 100644
--- a/media-plugins/vdr-text2skin/ChangeLog
+++ b/media-plugins/vdr-text2skin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-text2skin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.10 2011/01/01 16:10:58 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.11 2012/01/15 18:59:04 idl0r Exp $
+
+*vdr-text2skin-1.3.2 (15 Jan 2012)
+
+  15 Jan 2012; Christian Ruppert <idl0r@gentoo.org>
+  +vdr-text2skin-1.3.2.ebuild, +files/vdr-text2skin-1.3.2-Makefile.patch,
+  metadata.xml:
+  Version bump to 1.3.2, also fixes bug 314317.
 
   01 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-text2skin-1.3.1.ebuild:
diff --git a/media-plugins/vdr-text2skin/Manifest b/media-plugins/vdr-text2skin/Manifest
index cfa6f0c1cdef..915ba1944ec2 100644
--- a/media-plugins/vdr-text2skin/Manifest
+++ b/media-plugins/vdr-text2skin/Manifest
@@ -1,19 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX vdr-text2skin-1.3.2-Makefile.patch 1836 RMD160 6cb2f4541334179be0edb2bdb44a46effd0d7e57 SHA1 5cbdee622aad43a119effa4a8b98edf851a47d0c SHA256 8446a7e344b855dae3dde6a8dc0e2997a204b0721eb6b232634654d1c6ce2ec3
 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.2.tgz 94476 RMD160 78228e2ae0c511f970101d07f2a1771291fa1214 SHA1 6c32469ee4db13473aeed893d88f2dbdbc1dc16c SHA256 32d3e17cdf3a3b796b4ed7eae1ca8d2c6d56dcc901f4ed71daaf95dd6d2d6331
 DIST vdr-text2skin-1.3.tgz 88819 RMD160 949f58e7d7c85af355cad92113327fb66de9f203 SHA1 0c36fe1e79067d3b9264a3f367ea9a1b575aa7b4 SHA256 99f5552012477199a1d5624df9a8d0ad9576882f3a8364928a8a1f63fcca63f3
 EBUILD vdr-text2skin-1.2.ebuild 1305 RMD160 d955daaa28a1a25ee0337425672b4bd888277a19 SHA1 8b4602bf97c624199ba55addda615866dbdb2441 SHA256 8ce487c4fe602ffb03e89eb244f50174efc759f5212190c322cc24c1f2fd4c66
 EBUILD vdr-text2skin-1.3.1.ebuild 1480 RMD160 0038d67399e42dfbd8ac6d983bf2324146d86575 SHA1 89079bbcbe170d4644f1e751de6743543f9618c2 SHA256 413b72f61b9f59fa506be459ee4fe9a571bcb4ca5a6641fa227137a53d4f0409
+EBUILD vdr-text2skin-1.3.2.ebuild 2002 RMD160 784cd9cbc7f55c226a8e0f3ae1323c69cd07784b SHA1 9cbd37ac6f376a64fba1c6c41392443cea11b604 SHA256 7471e835b600dc72e87ca5ed7335b5469d49000ecae136bc44466f9693591747
 EBUILD vdr-text2skin-1.3.ebuild 1328 RMD160 7a602031b53225bd35803ae8b91dfe386982edf6 SHA1 f0967971e793332e697e216674f8ce85cde13c1a SHA256 e1031d377df2e01fd43c76c0b722066d4e08588c6542e1d3f77af5cd57660eee
-MISC ChangeLog 2924 RMD160 8eab14ad0e46ca8657429fae16f4d9c649844f95 SHA1 7d7735a4334fc6d68bbcac4355078c5b8d8d35ef SHA256 384e4e0f8c3a0736f17969186c030161536f1cc19a0df3fe20a8820b1df78969
-MISC metadata.xml 367 RMD160 84a243bba2bf0d3370616a9875d8589204e110b0 SHA1 53cdc130577e0801947e8463e2b1c4287be6ed10 SHA256 0fddf0a96db7b709320f3f470616bb532abd9a8fdfb657d9b3e682fed2f42fdc
+MISC ChangeLog 3147 RMD160 3283587124f4c0d77b8e0ccc61c5745b403ad1f6 SHA1 1754ca2f2faeb8801656ef588e38964f08a31e2b SHA256 3b4feea5b3aeb024a6f659e4669d99bdb4cba5e4601703eb3f12aef1a7f3e494
+MISC metadata.xml 335 RMD160 68a8af8c35192d967d3c74d419f4aec0367540d3 SHA1 b45f49fd286f7deb49206d4bd899b579861e094e SHA256 48d9d572a708c22408081c1b8b2d021558710b9cd17c3d3ea5dc4e7a1d455170
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFNH1JSdn07HTTCgIoRAk2uAJ97AxH2J7bK8h6s2k0MYUEIbGfS2gCglZ0K
-LNeaZTrbZ7KBIZ04cY001p4=
-=gdCl
+iQEcBAEBCAAGBQJPEyIFAAoJEMOx0zmdw4Z1qR4IAIrAtNpTcbbyYCHAvQxi9qkz
+Mt8scoYm9yW81m/BASyKJAJK0TjITq9cD7ae5HsC+xu81tCK4RnboDdtmIdeLT3t
+iunlR/muQEC2FPRfS28sH6VncTBDeWYysY6FGWp5PRA0Pk6SI2OhxdIDFoRHOFXf
+WNx0xfWBljo+A+/qA9EUeksrbrRKz/w27VOAxivtp/YEuVBgWFNuLmkHY4SZ7nXv
+o0xlYnY/P43nMk2e8XlW6GeStLLUgNRtqEUkA96+izBHJGgbi2acL+L50WA3+LNQ
+brI2yvM4/rpc2Pl7GdhOKtXdQQ7Ax6h5LfPdJyotRnU10YFAYREY2Ev9zmecN+I=
+=401K
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
new file mode 100644
index 000000000000..e01c2c788331
--- /dev/null
+++ b/media-plugins/vdr-text2skin/files/vdr-text2skin-1.3.2-Makefile.patch
@@ -0,0 +1,71 @@
+diff --git a/Makefile b/Makefile
+index daa54d7..1163a8d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,6 +9,7 @@ STRIP=strip
+ # External image lib to use: imagemagick, graphicsmagick, imlib2 or none
+ IMAGELIB = imagemagick
+ 
++WANT_I18N=1
+ 
+ # DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU'RE DOING
+ # -------------------------------------------------------------
+@@ -29,13 +30,18 @@ VERSION = $(shell grep 'const char \*cText2SkinPlugin::VERSION *=' $(PLUGIN).c |
+ ### The C++ compiler and options:
+ 
+ CXX      ?= g++
+-CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
++ifdef DEBUG
++CXXFLAGS ?= -Wall -Woverloaded-virtual
++else
++CXXFLAGS ?= -Wall -Woverloaded-virtual -O3
++endif
++CXXFLAGS += -fPIC
+ 
+ ### The directory environment:
+ 
+-VDRDIR = ../../..
+-LIBDIR = ../../lib
+-TMPDIR = /tmp
++VDRDIR ?= ../../..
++LIBDIR ?= ../../lib
++TMPDIR ?= /tmp
+ 
+ ### Make sure that necessary options are included (VDR >= 1.7.13):
+ 
+@@ -88,8 +94,7 @@ endif
+ ifdef DEBUG
+ 	CXXFLAGS += -g -fno-inline
+ 	DEFINES += -DDEBUG
+-else
+-	CXXFLAGS += -O3
++	STRIP=
+ ifdef BENCH
+ 	DEFINES += -DBENCH
+ endif
+@@ -118,7 +123,7 @@ $(DEPFILE): Makefile
+ -include $(DEPFILE)
+ 
+ ### Internationalization (I18N):
+-
++ifdef WANT_I18N
+ PODIR     = po
+ LOCALEDIR = $(VDRDIR)/locale
+ I18Npo    = $(notdir $(wildcard $(PODIR)/*.po))
+@@ -134,6 +139,7 @@ $(I18Npot): $(wildcard *.c)
+ $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.po
+ 	@mkdir -p $(dir $@)
+ 	msgfmt -c -o $@ $<
++endif
+ 
+ .PHONY: i18n
+ i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
+@@ -143,7 +149,7 @@ i18n: $(I18Npo:%.po=$(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo)
+ libvdr-$(PLUGIN).so: $(OBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
+ 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+-ifndef DEBUG
++ifdef STRIP
+ 	$(STRIP) $(LIBDIR)/$@.$(APIVERSION)
+ endif
+ 
diff --git a/media-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
index 2083a4329d62..bbdf85da384b 100644
--- a/media-plugins/vdr-text2skin/metadata.xml
+++ b/media-plugins/vdr-text2skin/metadata.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<maintainer>
-  <email>vdr@gentoo.org</email>
-  <name>Gentoo VDR Project</name>
-</maintainer>
-<!-- <use>
-	<flag name='direct_blit'>not buffer picture, faster, but only for modified
-		skins</flag>
-</use> -->
+	<herd>media-tv</herd>
+	<maintainer>
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<use>
+		<flag name="contrib">Install user contributed scripts</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
new file mode 100644
index 000000000000..e29aa44a2ab9
--- /dev/null
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 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.2.ebuild,v 1.1 2012/01/15 18:59:04 idl0r Exp $
+
+EAPI="4"
+
+inherit vdr-plugin eutils
+
+UPLOAD_NR=783 # 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="contrib doc +imagemagick imlib nls"
+
+REQUIRED_USE="imagemagick? ( !imlib )
+	imlib? ( !imagemagick )"
+
+RDEPEND=">=media-video/vdr-1.6.0
+	imagemagick? ( || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) )
+	imlib? ( media-libs/imlib2 >=media-video/vdr-1.6.0[-graphtft] )"
+DEPEND="${RDEPEND}
+	imagemagick? ( dev-util/pkgconfig )
+	imlib? ( dev-util/pkgconfig )
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	local imagelib=
+
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+
+	sed -i common.c -e 's#cPlugin::ConfigDirectory(PLUGIN_NAME_I18N)#"/usr/share/vdr/"PLUGIN_NAME_I18N#'
+
+	if ! has_version ">=media-video/vdr-1.7.13"; then
+		sed -i "s:-include \$(VDRDIR)/Make.global:#-include \$(VDRDIR)/Make.global:" Makefile
+	fi
+
+	if use imagemagick; then
+		# Prefer imagemagick over graphicsmagick
+		if has_version "media-gfx/imagemagick"; then
+			imagelib="imagemagick"
+		elif has_version "media-gfx/graphicsmagick"; then
+			imagelib="graphicsmagick"
+		fi
+	elif use imlib; then
+		imagelib="imlib2"
+	else
+		imagelib="none"
+	fi
+	sed -i -e "s:\(IMAGELIB[[:space:]]*=\) .*:\1 ${imagelib}:" Makefile || die
+
+	if ! use nls; then
+		sed -i -e 's:^WANT_I18N=.*:WANT_I18N=:' Makefile || die
+	fi
+
+	vdr-plugin_src_prepare
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	keepdir "/usr/share/vdr/${VDRPLUGIN}"
+
+	dodoc CONTRIBUTORS
+
+	if use doc; then
+		dodoc Docs/{Reference,Tutorial}.txt
+	fi
+
+	if use contrib; then
+		dodoc -r contrib/
+	fi
+}