Version bump to 1.3.2, also fixes bug 314317.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 165 insertions, 11 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/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
+}