fixed wrt bug #420883 #414177

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

6 files changed, 182 insertions, 70 deletions

diff --git a/media-plugins/vdr-prefermenu/ChangeLog b/media-plugins/vdr-prefermenu/ChangeLog
index d6ca3dc9f467..8dbf5332ad41 100644
--- a/media-plugins/vdr-prefermenu/ChangeLog
+++ b/media-plugins/vdr-prefermenu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-prefermenu
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/ChangeLog,v 1.8 2009/03/12 20:49:50 zzam Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-prefermenu/ChangeLog,v 1.9 2013/11/26 20:56:23 hd_brummy Exp $
+
+*vdr-prefermenu-0.6.6-r2 (26 Nov 2013)
+
+  26 Nov 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-prefermenu-0.6.4.ebuild, -vdr-prefermenu-0.6.6.ebuild,
+  +vdr-prefermenu-0.6.6-r2.ebuild, +files/prefermenu.mk:
+  fixed wrt bug #420883 #414177
 
   12 Mar 2009; Matthias Schwarzott <zzam@gentoo.org>
   vdr-prefermenu-0.6.6-r1.ebuild:
diff --git a/media-plugins/vdr-prefermenu/Manifest b/media-plugins/vdr-prefermenu/Manifest
index 1915536a0949..1943c85e5546 100644
--- a/media-plugins/vdr-prefermenu/Manifest
+++ b/media-plugins/vdr-prefermenu/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX vdr-prefermenu-0.6.4-includes.diff 1178 RMD160 8cf84f8c59beb6690877264a36c833fbccc60814 SHA1 c9987166fa2c06d46c1511cda69d5182d09c2a95 SHA256 5f5d0d9a7a6b13fe51f7eb05b1f7dc0a856627ebc51ea95b8650434dc83c8a77
-AUX vdr-prefermenu-0.6.6-no-static-getfont.diff 2201 RMD160 8629f146f049229355828c2ae97a74d2aa64b94a SHA1 5da28fc1cc82592cb0ae6b914dcc163ab56f3c09 SHA256 80b931797c7f967beb713661d958748d376b7271b306756a06c066abfe2bd8b2
-DIST vdr-prefermenu-0.6.4.tgz 19642 RMD160 7eef5b4e4e5d6f49f5551e0dfdb462e7e0026aeb SHA1 189f9b39c00c2edde81bcb144a78d222d629fae2 SHA256 83b212684c24e3be5f5555baad2ec081a42e02f801c842d56d99e736de6324ae
-DIST vdr-prefermenu-0.6.6.tgz 19617 RMD160 48d3153e8898cdebf21d74f936e833cc233dcc94 SHA1 5cb46329a57503f6ccb20cc6258842dbd71bb9c2 SHA256 0b9338d1fff19e5ccf1f4e9f352e7bdf5b4f5e129007aa147d7ee4ab1034a6e8
-EBUILD vdr-prefermenu-0.6.4.ebuild 784 RMD160 abe6300d386ba47d3e099cbf373bf82b2d719f22 SHA1 63abdd4bdf5beb2e28c447af4a628a61de6f1d93 SHA256 a0b8e177309ba492c7ad60bd879775452a88da7fc703afc51aa9b87dbb7f5072
-EBUILD vdr-prefermenu-0.6.6-r1.ebuild 797 RMD160 d4a530b83764e146782da6ee1f9c99359275a3dd SHA1 5b8e69037cd2b643e67e0c659f72cbd651df31b7 SHA256 7c640019057f206f6f3fcb029c25011934413938283327210461a4b70b82a6fe
-EBUILD vdr-prefermenu-0.6.6.ebuild 741 RMD160 adb54d6a97468523ee9040fb52a4192bf5614322 SHA1 9eb7453453698d559957d0e8c19d10003dc18084 SHA256 78c4f7383323db471407fb3ce6496b5a1dfd45175ebaa109693fbb791b2d914a
-MISC ChangeLog 1407 RMD160 91983c24078fdff69100a84bb595240da0594915 SHA1 d3564ea537a8f1295b9077a4cacb4959458ca839 SHA256 f5779dd5379affd09d8cc2d155c546c3aa25ce78e443f0b73377e073e80f9ac0
-MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+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 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-r1.ebuild 797 SHA256 7c640019057f206f6f3fcb029c25011934413938283327210461a4b70b82a6fe SHA512 2b107a08564bf77059893ac9a83916c19a0609fe78f654430979c0be5966fb396acca299d669f617714b29a0eca00b0866c3ef4383e27b75c5e2adf15544434e WHIRLPOOL 89f2976e2c9e32f982a5d3635c6c995ff49543df5045a4887999702e802086266c970026a9298a22e33f053aa2d4f51cc9df29e8a229fa2d8aefe881d5230c0f
+EBUILD vdr-prefermenu-0.6.6-r2.ebuild 904 SHA256 860af425da9d4653f49c1ef6b202dff0d816cbbb43406536fb063d0d5eca5c5c SHA512 42930568924c4294ed9f2fbac76abb4ae741c8ddff0d6a96a1763c87bd6682f9b7b9b0ebb9d115ae2788253f0d10becc1b00545373da50c62241237bf034e59b WHIRLPOOL 359b1de47102cc62498dd8754b9ac12ffdcb67d6e632a39959f274ddd3dcfd5b20e8965154a8b2dcd5e17bdf3d428e9ee6ddc893cffac4c7a2b1a8a3bf5a2c98
+MISC ChangeLog 1659 SHA256 408fcdd9f6ff23a708bca0eb61992a06da6db3eaa7cba23c787ff2b5568ab7a5 SHA512 87fe4a7de59d7e5e8b259b2783f5467d540a3e8f46ac6c3137caf996e2acd02583476e9dd2cfca0417f9196bdc4f1cd1ed962007cade2e31376620710cc4f546 WHIRLPOOL f044853ebd8f70bb1b2b12c51744c0ff6dc25bd9e16c301c8a128bdae75541c1e1cf712e3ce34459367e2a4e3a7f56662b2148017010dda21ae3d1fc8ca91007
+MISC metadata.xml 298 SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581 SHA512 73724667e75fe7d8ca3b0d440e79d70f1a9fa900cf9ea9c3c03036cef44d5fe3e24ce745630e04e9a0a3776f4a73bc47d29f92a4bbe93af0ad544936f5e33b3c WHIRLPOOL e77dccdbffec743aaa54f4dd9529b70e22df631d1d93375274ef70022b8fd0e7d9c3f2f60d4fdbf6f6d72fac24c709357d6ca949068a3eca3558f8a377360913
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: signed/commited by hd_brummy@gentoo.org
 
-iEYEARECAAYFAkm5dXMACgkQt2vP6XvVdOfV8wCgy9cqHMeJ9mzqfGRvZhofRbGU
-/W4AnRBb7rnpJ4Vt+8l7SMQO6r8cdqMy
-=rV4L
+iD8DBQFSlQsNdn07HTTCgIoRCEoCAJ9C+x97CNXIDhPn4XDKmVUmbrQmDACgvP4W
+CQCs8H5+71hXncFt3NGGygg=
+=+3AR
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-prefermenu/files/prefermenu.mk b/media-plugins/vdr-prefermenu/files/prefermenu.mk
new file mode 100644
index 000000000000..79865a3087f0
--- /dev/null
+++ b/media-plugins/vdr-prefermenu/files/prefermenu.mk
@@ -0,0 +1,122 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: prefermenu.mk,v 1.1 2013/11/26 20:56:23 hd_brummy Exp $
+
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+
+PLUGIN = prefermenu
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
+
+### The directory environment:
+
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
+#
+TMPDIR ?= /tmp
+
+### The compiler options:
+
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
+
+### The version number of VDR's plugin API:
+
+APIVERSION = $(call PKGCFG,apiversion)
+
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
+### Includes and Defines (add further entries here):
+
+#INCLUDES +=
+
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o preferosd.o prefersetup.o preferchannel.o
+
+### The main target:
+
+all: $(SOFILE) i18n
+
+### Implicit rules:
+
+%.o: %.c
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+
+### Dependencies:
+
+MAKEDEP = $(CXX) -MM -MG
+DEPFILE = .dependencies
+$(DEPFILE): Makefile
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+
+-include $(DEPFILE)
+
+### Internationalization (I18N):
+
+PODIR     = po
+I18Npo    = $(wildcard $(PODIR)/*.po)
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Npot   = $(PODIR)/$(PLUGIN).pot
+
+%.mo: %.po
+	msgfmt -c -o $@ $<
+
+$(I18Npot): $(wildcard *.c)
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^`
+
+%.po: $(I18Npot)
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
+	@touch $@
+
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
+
+### Targets:
+
+$(SOFILE): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+
+install-lib: $(SOFILE)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
+
+dist: $(I18Npo) clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
diff --git a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.4.ebuild b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.4.ebuild
deleted file mode 100644
index b14de0c46bcf..000000000000
--- a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2003-2008 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.4.ebuild,v 1.4 2008/04/28 09:12:55 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder Prefermenu Plugin"
-HOMEPAGE="http://www.olivierjacques.com/vdr/prefermenu/"
-SRC_URI="http://famillejacques.free.fr/vdr/prefermenu/vdr-${VDRPLUGIN}-${PV}.tgz
-		mirror://vdrfiles/${PN}/vdr-${VDRPLUGIN}-${PV}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.9"
-
-PATCHES=("${FILESDIR}/${P}-includes.diff")
-
-src_install() {
-	vdr-plugin_src_install
-
-	touch prefermenu.conf
-	insinto /etc/vdr/plugins
-	doins prefermenu.conf
-	chown vdr:vdr -R "${D}"/etc/vdr
-}
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
new file mode 100644
index 000000000000..f00d27791f32
--- /dev/null
+++ b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 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 $
+
+EAPI="5"
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: presents a favourites channels menu"
+HOMEPAGE="http://www.olivierjacques.com/vdr/prefermenu/"
+SRC_URI="http://famillejacques.free.fr/vdr/prefermenu/vdr-${VDRPLUGIN}-${PV}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2.0"
+
+PATCHES=("${FILESDIR}/${P}-no-static-getfont.diff"
+		"${FILESDIR}/${P}_vdr_1.7.27.diff")
+
+src_prepare() {
+	cp "${FILESDIR}/${VDRPLUGIN}.mk" Makefile
+
+	vdr-plugin-2_src_prepare
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	touch prefermenu.conf
+
+	insopts -m0644 -gvdr -ovdr
+	insinto /etc/vdr/plugins/prefermenu
+	doins prefermenu.conf
+}
diff --git a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6.ebuild b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6.ebuild
deleted file mode 100644
index 559153d8cd1d..000000000000
--- a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2003-2008 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.ebuild,v 1.4 2008/04/28 09:12:55 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder Prefermenu Plugin"
-HOMEPAGE="http://www.olivierjacques.com/vdr/prefermenu/"
-SRC_URI="http://famillejacques.free.fr/vdr/prefermenu/vdr-${VDRPLUGIN}-${PV}.tgz
-		mirror://vdrfiles/${PN}/vdr-${VDRPLUGIN}-${PV}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.45"
-
-src_install() {
-	vdr-plugin_src_install
-
-	touch prefermenu.conf
-	insinto /etc/vdr/plugins
-	doins prefermenu.conf
-	chown vdr:vdr -R "${D}"/etc/vdr
-}