cleanup; vdr-plugin-2.eclass; removed use-flag nls

(Portage version: 2.1.10.11/cvs/Linux i686)

6 files changed, 18 insertions, 179 deletions

diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog
index d88d28ef5907..973fde6dac89 100644
--- a/media-plugins/vdr-text2skin/ChangeLog
+++ b/media-plugins/vdr-text2skin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-text2skin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.13 2012/04/07 19:08:48 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.14 2012/05/01 15:54:07 hd_brummy Exp $
+
+  01 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-text2skin-1.2.ebuild, -vdr-text2skin-1.3.ebuild,
+  -vdr-text2skin-1.3.1.ebuild, vdr-text2skin-1.3.2.ebuild,
+  files/vdr-text2skin-1.3.2-Makefile.patch:
+  cleanup; vdr-plugin-2.eclass; removed use-flag nls
 
   07 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-text2skin-1.3.2.ebuild, +files/vdr-1.7.27.diff:
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
index e01c2c788331..cce51d79febc 100644
--- 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
@@ -6,7 +6,7 @@ index daa54d7..1163a8d 100644
  # 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
  # -------------------------------------------------------------
@@ -48,7 +48,7 @@ index daa54d7..1163a8d 100644
  
  ### Internationalization (I18N):
 -
-+ifdef WANT_I18N
++#
  PODIR     = po
  LOCALEDIR = $(VDRDIR)/locale
  I18Npo    = $(notdir $(wildcard $(PODIR)/*.po))
@@ -56,7 +56,7 @@ index daa54d7..1163a8d 100644
  $(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)
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild
deleted file mode 100644
index 855518bac839..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.2.ebuild,v 1.2 2012/01/15 19:31:24 idl0r Exp $
-
-EAPI="1"
-
-inherit vdr-plugin versionator
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/112/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-#IUSE="truetype direct_blit"
-IUSE="+truetype"
-
-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}"
-
-SKINDIR=/usr/share/vdr/${VDRPLUGIN}
-ETC_SKIN_DIR=/etc/vdr/plugins/${VDRPLUGIN}
-
-src_unpack() {
-	vdr-plugin_src_unpack unpack
-
-	cd "${S}"
-
-	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/'
-
-	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
deleted file mode 100644
index e8bd8878b14b..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.1.ebuild,v 1.3 2012/01/15 19:31:24 idl0r 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="mirror://vdr-developerorg/${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#'
-
-	sed -i bitmap.c -e "s:8U:(size_t)8U:"
-
-	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
-}
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
index aad7efaa3d8e..fa634c81024c 100644
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
@@ -1,21 +1,21 @@
 # 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.3 2012/04/07 19:08:48 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild,v 1.4 2012/05/01 15:54:07 hd_brummy Exp $
 
 EAPI="4"
 
-inherit vdr-plugin eutils
+inherit vdr-plugin-2
 
-UPLOAD_NR=783 # changes with every version / new file :-(
+VERSION="783" # changes with every version / new file :-(
 
 DESCRIPTION="VDR text2skin PlugIn"
 HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/${UPLOAD_NR}/${P}.tgz"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~amd64"
-IUSE="contrib doc +imagemagick imlib nls"
+IUSE="contrib doc +imagemagick imlib"
 
 REQUIRED_USE="imagemagick? ( !imlib )
 	imlib? ( !imagemagick )"
@@ -26,7 +26,7 @@ RDEPEND=">=media-video/vdr-1.6.0
 DEPEND="${RDEPEND}
 	imagemagick? ( dev-util/pkgconfig )
 	imlib? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext"
 
 src_prepare() {
 	local imagelib=
@@ -53,11 +53,7 @@ src_prepare() {
 	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
+	vdr-plugin-2_src_prepare
 
 	if has_version ">=media-video/vdr-1.7.27"; then
 		epatch "${FILESDIR}/vdr-1.7.27.diff"
@@ -65,7 +61,7 @@ src_prepare() {
 }
 
 src_install() {
-	vdr-plugin_src_install
+	vdr-plugin-2_src_install
 
 	keepdir "/usr/share/vdr/${VDRPLUGIN}"
 
diff --git a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild
deleted file mode 100644
index e87be2ec2861..000000000000
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.ebuild,v 1.3 2012/01/15 19:31:24 idl0r Exp $
-
-EAPI="2"
-
-inherit vdr-plugin versionator
-
-UPLOAD_NR=127 # changes with every version / new file :-(
-
-DESCRIPTION="VDR text2skin PlugIn"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-text2skin"
-SRC_URI="mirror://vdr-developerorg/${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
-	!media-plugins/vdr-text2skin-cvs
-	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/'
-
-	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
-}