wrt bug 514244, missing patch fixed

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x34C2808A

5 files changed, 24 insertions, 48 deletions

diff --git a/media-plugins/vdr-prefermenu/ChangeLog b/media-plugins/vdr-prefermenu/ChangeLog
index 43e6cf2cc10e..18350d9eae7f 100644
--- a/media-plugins/vdr-prefermenu/ChangeLog
+++ b/media-plugins/vdr-prefermenu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-prefermenu
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/ChangeLog,v 1.10 2014/02/23 20:39:10 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/ChangeLog,v 1.11 2014/06/22 11:31:09 hd_brummy Exp $
+
+  22 Jun 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-prefermenu-0.6.6-r2.ebuild, -files/vdr-prefermenu-0.6.4-includes.diff,
+  files/prefermenu.mk:
+  wrt bug 514244, missing patch fixed
 
   23 Feb 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-prefermenu-0.6.6-r1.ebuild:
diff --git a/media-plugins/vdr-prefermenu/Manifest b/media-plugins/vdr-prefermenu/Manifest
index 3d048ceadd2a..1e898477025e 100644
--- a/media-plugins/vdr-prefermenu/Manifest
+++ b/media-plugins/vdr-prefermenu/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX prefermenu.mk 3248 SHA256 06d116cae273e15ccd1024256b2078e60c02a94803a17b021d13aabeea326ad6 SHA512 e441753b29b7f244d7f4c0894143e4ba2b00a32e5a24283f439be2298471154d3ea3701e186975ba138771a166d6f439180ebbdec861d520e8e13df10a7d8408 WHIRLPOOL 2bfc35d6e5edb261543619542976618e4b41db9a5dd1fececf69171564959d0a41c6dac033286d420e973ae5dba8d20d34801b6b537a2bbbd84b0497b6491da2
-AUX vdr-prefermenu-0.6.4-includes.diff 1178 SHA256 5f5d0d9a7a6b13fe51f7eb05b1f7dc0a856627ebc51ea95b8650434dc83c8a77 SHA512 4b084fd2f7a09c387aa3be71eed65e88e4475510dd7f32ff167c50a2cdcd7c1bc09ccd0694ebe876a9485428727f29194d1d9b050a41ea603f9751ac0ff4b8c8 WHIRLPOOL cdb41d07eb40a3bde7a60304b0279df42165420a2349b18bb256214c46d482fad1234b42022096132797b98afa3bb791a672890b81d57f3926d7bb23c8452b6f
+AUX prefermenu.mk 3253 SHA256 b6879a489139baa3fae47e4d1bccab28fd54d605d57bc330747f7267eecb72d7 SHA512 4885b2eb478363bf73eb036004366a250e05c7e905e66ac75ef8a0e8bb8f4ab206f7bf0311628930bb93f285c492469ce4678834f6a44abf2b5e104bfcabf59b WHIRLPOOL 3af153d192f40e82c3b6114112d6c9f0f0afb9b0dd326c3d59e31ed9b24607180b67bc425abc30e40dd41b32df7f11b2f66dba69b300c7da2ab72974c8428e7b
 AUX vdr-prefermenu-0.6.6-no-static-getfont.diff 2201 SHA256 80b931797c7f967beb713661d958748d376b7271b306756a06c066abfe2bd8b2 SHA512 e67d5cfe06d30f2c7f38b7be9daca4f9d00e5265b85aaa20a7a5c3dc7184a085c44b1d1210f560bac560176c6f347a93bbc70c93c2773e7a4d79e7bbed953a91 WHIRLPOOL 06e02d4895cc5ab9bfb555387abaa257f5f27c7549c5eb0634b5c597ed1143c6fa16ce93803d365818ae97cb48bf03e0db60dd27775c237ea523c26579abc135
 DIST vdr-prefermenu-0.6.6.tgz 19617 SHA256 0b9338d1fff19e5ccf1f4e9f352e7bdf5b4f5e129007aa147d7ee4ab1034a6e8 SHA512 bc5e11757979a60f408c59d4d0f1d713899013d4a3485ff85e7bf139fb8f436ddd80799673c3d7a718a3d9cc0e75c216f73f1eccc3c2350826c5f8d6145157f6 WHIRLPOOL 5af73e6a2a7ceebdc733abdd16000521007f6fd046cfcfd4fac0909d572982342b780ba754e97e1e4f6a674f04446db2cdbf6ed220d40a82a4f8ad8eca23bc95
-EBUILD vdr-prefermenu-0.6.6-r2.ebuild 904 SHA256 860af425da9d4653f49c1ef6b202dff0d816cbbb43406536fb063d0d5eca5c5c SHA512 42930568924c4294ed9f2fbac76abb4ae741c8ddff0d6a96a1763c87bd6682f9b7b9b0ebb9d115ae2788253f0d10becc1b00545373da50c62241237bf034e59b WHIRLPOOL 359b1de47102cc62498dd8754b9ac12ffdcb67d6e632a39959f274ddd3dcfd5b20e8965154a8b2dcd5e17bdf3d428e9ee6ddc893cffac4c7a2b1a8a3bf5a2c98
-MISC ChangeLog 1796 SHA256 9681699d2cd74a0d4c52a4ed97e9077d70d79d1e71429d1107d60cfbaba6e522 SHA512 6df896cd1526a35787af9a697b297cb87a1976673112b3169d9e3fc6263eb46d0d9473a02c5c3a3ee45e238d2926c3c4a3940e0a0639d482809c8fb57f406154 WHIRLPOOL 5f49bf507b62a64d601afcc3ad01b2da3c0d61b0d64d0309fa8737f0afa6ea4c5d3cb28f41a6e585416a5df40f628b024807b1c8024e3d25e892b87abe1955a6
+EBUILD vdr-prefermenu-0.6.6-r2.ebuild 925 SHA256 bdbb087bea8dd871a1a847858711943515dc04ac770a9cd7ec8c2a43723ab1a3 SHA512 f8a841067e9f58c2a5bc98fac0d63e267a7edf9ff85757916e4594e36e207610050c9be79d462e4dcc7c2f676f3237ec526efa991a1dcbe86268fe8109830599 WHIRLPOOL 4b0885ca5f935a8f28cda48aff2ea2f4b1756ad1a2088a3571895e290155e9adc02befc51ba830c69d2719032d42c650720e8d0921f957a84edc791d8f1d118b
+MISC ChangeLog 1990 SHA256 802a581eaf29b0b8d604feebcc613ecd90bcf11f36f92a67a56a4d4d2c1e94c9 SHA512 60c3cb3345b637a4226cd4570741b49ed5322540f2c70cfba1736239d6cf67099efa0fab9eefd0d8d4842683164644aec1dddd265604a4c26f3538a27a781a64 WHIRLPOOL cdbf59d7a530a87a4ffe776ea9369ce2c132a1ea943bdc2a771d7e9a20bbae7165d0239d92cb9cfa7c10270c60844968c8b68a0f5ae3dd86e3dca90fbc368799
 MISC metadata.xml 298 SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 SHA512 73724667e75fe7d8ca3b0d440e79d70f1a9fa900cf9ea9c3c03036cef44d5fe3e24ce745630e04e9a0a3776f4a73bc47d29f92a4bbe93af0ad544936f5e33b3c WHIRLPOOL e77dccdbffec743aaa54f4dd9529b70e22df631d1d93375274ef70022b8fd0e7d9c3f2f60d4fdbf6f6d72fac24c709357d6ca949068a3eca3558f8a377360913
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFTClxvdn07HTTCgIoRCEARAKCSukY1mpl0sD4rY+QsdDlyrcetywCgj85T
-tRm1I0SyCs//Z7zQ/3iSWSg=
-=KQ2n
+iD8DBQFTpr6Cdn07HTTCgIoRCEXKAJ4jrcgenU2Nc8jftSmz6x9kYRS+zwCghc2D
+mMYsZ/1YbGvkLqKII8r4GsE=
+=9pEG
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-prefermenu/files/prefermenu.mk b/media-plugins/vdr-prefermenu/files/prefermenu.mk
index 79865a3087f0..7088e062461d 100644
--- a/media-plugins/vdr-prefermenu/files/prefermenu.mk
+++ b/media-plugins/vdr-prefermenu/files/prefermenu.mk
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: prefermenu.mk,v 1.1 2013/11/26 20:56:23 hd_brummy Exp $
+# $Id: prefermenu.mk,v 1.2 2014/06/22 11:31:09 hd_brummy Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -57,7 +57,8 @@ OBJS = $(PLUGIN).o preferosd.o prefersetup.o preferchannel.o
 
 ### The main target:
 
-all: $(SOFILE) i18n
+all: $(SOFILE) 
+#i18n
 
 ### Implicit rules:
 
@@ -107,7 +108,8 @@ $(SOFILE): $(OBJS)
 install-lib: $(SOFILE)
 	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
-install: install-lib install-i18n
+install: install-lib 
+#install-i18n
 
 dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
@@ -118,5 +120,5 @@ dist: $(I18Npo) clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+#	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.4-includes.diff b/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.4-includes.diff
deleted file mode 100644
index 4ace870821df..000000000000
--- a/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.4-includes.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Nur in prefermenu-0.6.4: i18n.o.
-Nur in prefermenu-0.6.4: libvdr-prefermenu.so.
-Nur in prefermenu-0.6.4: libvdr-prefermenu.so.1.3.34.
-diff -ru prefermenu-0.6.4-orig/preferchannel.h prefermenu-0.6.4/preferchannel.h
---- prefermenu-0.6.4-orig/preferchannel.h	2005-10-19 22:32:31.000000000 +0200
-+++ prefermenu-0.6.4/preferchannel.h	2005-10-19 22:33:14.000000000 +0200
-@@ -2,6 +2,7 @@
- #define __PREFERCHANNEL_H
- 
- #include <vdr/plugin.h>
-+#include <vdr/device.h>
- #include <vdr/channels.h>
- 
- #define CHANNELSMAX 255
-Nur in prefermenu-0.6.4: preferchannel.h~.
-Nur in prefermenu-0.6.4: preferchannel.o.
-Dateien prefermenu-0.6.4-orig/prefermenu.o und prefermenu-0.6.4/prefermenu.o sind verschieden.
-diff -ru prefermenu-0.6.4-orig/preferosd.h prefermenu-0.6.4/preferosd.h
---- prefermenu-0.6.4-orig/preferosd.h	2005-10-19 22:32:31.000000000 +0200
-+++ prefermenu-0.6.4/preferosd.h	2005-10-19 22:32:51.000000000 +0200
-@@ -2,6 +2,7 @@
- #define __PREFEROSD_H
- 
- #include <vdr/plugin.h>
-+#include <vdr/device.h>
- 
- static const int BORDERSIZE = 2;
- #if VDRVERSNUM >= 10307
-Nur in prefermenu-0.6.4: preferosd.h~.
-Nur in prefermenu-0.6.4: preferosd.o.
-Nur in prefermenu-0.6.4: prefersetup.o.
diff --git a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild
index f00d27791f32..54bc49886506 100644
--- a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild
+++ b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild,v 1.1 2013/11/26 20:56:23 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild,v 1.2 2014/06/22 11:31:09 hd_brummy Exp $
 
 EAPI="5"
 
@@ -17,13 +17,14 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-2.0"
 
-PATCHES=("${FILESDIR}/${P}-no-static-getfont.diff"
-		"${FILESDIR}/${P}_vdr_1.7.27.diff")
+PATCHES=("${FILESDIR}/${P}-no-static-getfont.diff")
 
 src_prepare() {
 	cp "${FILESDIR}/${VDRPLUGIN}.mk" Makefile
 
 	vdr-plugin-2_src_prepare
+
+	sed -e "s:RegisterI18n://RegisterI18n:" -i prefermenu.c
 }
 
 src_install() {