using KEEP_I18NOBJECT variable from vdr-plugin-2.eclass now

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

4 files changed, 16 insertions, 10 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 121c79e7bd40..e1c6e8e7b8c4 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.35 2012/06/04 19:42:23 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.36 2012/06/10 14:24:54 hd_brummy Exp $
+
+  10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-live-0.2.0_p20120325.ebuild:
+  using KEEP_I18NOBJECT variable from vdr-plugin-2.eclass now
 
   04 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-live-0.2.0_p20120325.ebuild, files/rc-addon-0.2.sh:
diff --git a/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild b/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild
index 9d09d9ef5be6..6d8aaddd93ad 100644
--- a/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild
+++ b/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild,v 1.4 2012/06/04 19:42:23 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.2.0_p20120325.ebuild,v 1.5 2012/06/10 14:24:54 hd_brummy Exp $
 
 EAPI="4"
 
@@ -26,6 +26,8 @@ VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
 
 S="${WORKDIR}/${P}"
 
+KEEP_I18NOBJECT="yes"
+
 make_live_cert() {
 	# TODO: still true?
 	# ssl-cert eclass creates a "invalid" cert, create our own one
@@ -68,9 +70,6 @@ src_prepare() {
 
 	epatch "${FILESDIR}/vdr-1.7.28-compatibility.patch"
 	epatch "${FILESDIR}/vdr-live_pcre.patch"
-
-	# fix for vdr-plugin-2.eclass
-	sed -i -e "s:setup.o:setup.o i18n.o:" Makefile
 }
 
 src_install() {
diff --git a/media-plugins/vdr-text2skin/ChangeLog b/media-plugins/vdr-text2skin/ChangeLog
index 2b3f6a793873..b8363eda2905 100644
--- a/media-plugins/vdr-text2skin/ChangeLog
+++ b/media-plugins/vdr-text2skin/ChangeLog
@@ -1,6 +1,10 @@
 # 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.16 2012/05/12 18:21:39 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/ChangeLog,v 1.17 2012/06/10 14:28:19 hd_brummy Exp $
+
+  10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-text2skin-1.3.2.ebuild:
+  using KEEP_I18NOBJECT variable from vdr-plugin-2.eclass now
 
   12 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-text2skin-1.3.2.ebuild:
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 98c4e6d3d95b..91887de9ecf3 100644
--- a/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
+++ b/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2012/05/12 18:21:39 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-text2skin/vdr-text2skin-1.3.2.ebuild,v 1.7 2012/06/10 14:28:19 hd_brummy Exp $
 
 EAPI="4"
 
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	imlib? ( virtual/pkgconfig )
 	sys-devel/gettext"
 
+KEEP_I18NOBJECT="yes"
+
 src_prepare() {
 	local imagelib=
 
@@ -58,9 +60,6 @@ src_prepare() {
 	if has_version ">=media-video/vdr-1.7.27"; then
 		epatch "${FILESDIR}/vdr-1.7.27.diff"
 	fi
-
-	# fix for vdr-plugin-2.eclass
-	sed -i -e "s:file.o:file.o i18n.o:" Makefile
 }
 
 src_install() {