compile fix for obsoleted i18n issues, wrt bug 513414; new Makefile

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

4 files changed, 171 insertions, 8 deletions

diff --git a/media-plugins/vdr-wapd/ChangeLog b/media-plugins/vdr-wapd/ChangeLog
index cd706af6e79d..3155c85b3e89 100644
--- a/media-plugins/vdr-wapd/ChangeLog
+++ b/media-plugins/vdr-wapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-wapd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-wapd/ChangeLog,v 1.5 2014/02/23 21:03:35 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-wapd/ChangeLog,v 1.6 2014/06/21 22:08:34 hd_brummy Exp $
+
+*vdr-wapd-0.9_p1-r1 (21 Jun 2014)
+
+  21 Jun 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-wapd-0.9_p1-r1.ebuild, +files/wapd.mk:
+  compile fix for obsoleted i18n issues, wrt bug 513414; new Makefile
 
   23 Feb 2014; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-wapd-0.9.ebuild,
   vdr-wapd-0.9_p1.ebuild:
diff --git a/media-plugins/vdr-wapd/Manifest b/media-plugins/vdr-wapd/Manifest
index ca962b342662..44a526b42c87 100644
--- a/media-plugins/vdr-wapd/Manifest
+++ b/media-plugins/vdr-wapd/Manifest
@@ -7,18 +7,20 @@ AUX vdr-wapd-0.9-as-needed.patch 539 SHA256 77fbdb3b8864f0e47bbcdca6dbaf186c9daf
 AUX vdr-wapd-0.9-gentoo.diff 636 SHA256 64c8aca191bf60a694cf7fc53f0e953f440ac15addd5ab2ea68a5099f84b1e4a SHA512 eaa697b5cacc95c837233eba3d4baeb98f0670587306d045cc747b0ad665cf7bca6048671bc124c55bafcbd6c93f3d39e805dfc71b2d49553409ca6e837c9305 WHIRLPOOL d4d34f06d257e69f3c5a8b3c1ebfa4784c4396c993ff52b643be416b10b66e57855a34807b4410c51ed182906f89af3daaee006149be5d6429fb5320e20e01f6
 AUX vdr-wapd-0.9_gcc-4.1.x.diff 484 SHA256 6fbb7127fb35bd7e4e4b76699f155f377fe4fb32228a64b9b3d73685c5bec444 SHA512 7112d05e2e379ecec2bdaefc9620dbaf63f9bb9ca8b883befd14717f33dfeb5c28e05ff0bff68569986c0916031dc77b8a03a101e3a89c6f1c879158513b3fd7 WHIRLPOOL a4194d8691e606aeae1974f4d954756f843ca4eae44728ef964c914a7cd432e3e1b556ccae27945e75d859e4c59dadbfd9345b717688b76bcbbce61298d5fbc7
 AUX wapaccess 258 SHA256 192ce221d26cb303da3a4439a067c082949a88442e2fddebf91626add5bd3b10 SHA512 11644a95c9336892a530af70a63dddb3e47921e990e5d0ae58513ab24b555089665c82266a240008326d215b51e03bf89511921c8fe6fee05533d214020e01ff WHIRLPOOL 41aa80ee2749e63577cc63254fab926aa6b59eb224e41a8e51efba95da1fdd452f93705474e18780de092bba2a70017d70defaf33a365d20615c32afa4602fe6
+AUX wapd.mk 2630 SHA256 ea61a4c8b23501e187c1e47a26770c8b873a959282dd056fe6b078e23b0f0848 SHA512 07e365ee2072b86feb9c8e7ccd466a9c5055c4112906acf838ea2fe32da0b93ca9c8fb285bb885e0d77402dc12f66bc06162a6e474ef15c8e7453f7872af08e0 WHIRLPOOL fd2191312fda5364827ddef2c081f72c09de011ab714d1189bea40c887afcf4c6c13517f400673b116d724cf91466667e189cce15eac1f8f545aa94a4fa7a453
 AUX waphosts 234 SHA256 dccaaaca0f3837b4dd07508735fc34a802e2eb24f1e7a2b818405289ec5fc9a9 SHA512 f71b863e68a81f7e89c8fbf1b7cb96486f7a9d46d35b18a7b25cb59c931905a26cc279b23df7fbc869e6a335886e64ddcf58e45fdd41c6336727414af7aa2533 WHIRLPOOL 9fa73b9ce3f9516eef0d17dee7e858142063c4e63f0d26958914e159ca8b11578a63bb4b1520e7d9f12ee3470d58576aa9edf4327061386e24ad76c8fa7a1e76
-DIST vdr-wapd-0.9.tgz 31975 SHA256 6d901dd352f2eb142dd070e11726cd74b05bb66f70b169e612b181dde738145e
-DIST wapd-0.9-patch1.diff.gz 3091 SHA256 e54d67c5090a40fcf1acc6ee4b4999950ecee8714c8db9823af1be59fcbd1931
+DIST vdr-wapd-0.9.tgz 31975 SHA256 6d901dd352f2eb142dd070e11726cd74b05bb66f70b169e612b181dde738145e SHA512 787bc433896e01efb482507251f4a6cb878ce40b869625ff5b7177f64f4dba4b4dcffa648c39d1d8c1930da5fb98db9155ebc40ed349bf2093a5e10f7314f1dd WHIRLPOOL 71cbc3269ceddd582ac62207ff3a48d8df6a824da4fb3300aec4894278f75d41bcea9103be1f27a1f352ce06478b4b1a4f481524775ee0734e05b5b41f097fbe
+DIST wapd-0.9-patch1.diff.gz 3091 SHA256 e54d67c5090a40fcf1acc6ee4b4999950ecee8714c8db9823af1be59fcbd1931 SHA512 16dd9225bd0f40f668317ee8a957c0b113a261fe779931b546634fa8e09de3431359d7b8d3846b4781021438bcc660fc714bf17699dacc94af1fd16885a00450 WHIRLPOOL 613a0cabd994c1d38b3f0dde848543cdddeb65b895e856a93daf647ad9a7737498f6fe89ed3af9fe699acf8b6f39ace3be5aac6d82de6c03e44a831cbfbd1289
 EBUILD vdr-wapd-0.9.ebuild 800 SHA256 d5650db08fa6898b7dd8e5a1458a41c152ddf8463b8907b8ee47f24082fb6e4f SHA512 a7a2ea12d725f62f55f8078aff7e5c4a41adf51551bf60638d3b70bf79cbff20471015a803a47474a3e31ba19af64595eda400a6a5319c5560e657ec63ff853a WHIRLPOOL f7057674cb7aca4cee7451475e78add449d047fbd9884dd8426dd5b581c3b76c9e8e4a1cf18458ace51cbeb460ee1871833969fb5b7d5fe0151c43934c2158a9
+EBUILD vdr-wapd-0.9_p1-r1.ebuild 1153 SHA256 e74844a3f97435d4f9f11bf5747f1d91a219e0693a15b182c56544af5b53e2ea SHA512 a45c3cbaea2182e72c57e6a11c7b586fc46f3d71348dc0fb3b72b75790ea84d1cca78d325a13d6e7878f1b77812d5371556361fceb29bdc524badaa4c06673ed WHIRLPOOL 1fcd02bd4b6e252b7cd53e7992740f09b538143e00cb71c652ee793b0f76234f9c40a72721666ba15bc6768785002e581caffbd6fb31374f5242993911e72eae
 EBUILD vdr-wapd-0.9_p1.ebuild 1012 SHA256 ab70db818339a9d2fe988519f21c649b92ac48450b5893d1c5654dec7456155f SHA512 13369c1ed1b0d773710db8af4ba09584188bca00e468b8d211cc90b01802734b8ff0550beaf207078ace7107e551e1c7d8bc09fdd90127d2d864f26028e80c9f WHIRLPOOL 5c405f00154d692a9751b6a8316ed950bc12bfdbe7c9a1617bc826bf4df30aceef36cc1349d4d3dabb64cbbae86116c6d83fb15a08892fde0daa22f144fef01d
-MISC ChangeLog 1169 SHA256 b5cf3c9aa0da40298ff5dcdb797ffeaafc6a32ad493ca7528cbc13dee610bcf1 SHA512 df9d58aeeee36bbe2491e4b82c4d3d4c794cb5c7c7dcfa821ceef62cbb97eb389a178cb510c8a226bd0239ea37bf9876e37406eceb014805a7d798a41d05345f WHIRLPOOL 337bbdd0fdb590e75380a3e5b4660dca84c05bfb76e271fc4fd08a2ba9e6cf1e96339853663c22691fd5905a6a725f10198fc35e4a67b38661de4d39e8c38710
+MISC ChangeLog 1376 SHA256 450c990329375f970966e7a1e10b1f2244b18646f4f4e4c6165655a811e641c5 SHA512 414e74fead07af1743cb1ee8e8ba68f5353da97398c370670a97e4b1bb10d3192b4f2974145d374f5cd4aa074939ddb91089fcf12b9d3d2e3500604e02329113 WHIRLPOOL ab724470145c2bd19363af8923529495531207522eca85982261b3b259ae60a12748aeb7ddc0685cd96d44d08fb25c447bb1fc93338b5eba8f30c4b0c4666857
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFTCmIpdn07HTTCgIoRCCqWAJ9QscwjKFIHtMjqiHGRv+L4T00CEgCePhH6
-lpRvIZViL6RWme5+C7qcNh4=
-=bPyt
+iD8DBQFTpgJndn07HTTCgIoRCLeFAKCjDo4p192+tGTEJAzUUTl5noNCRwCfXKiy
+5y11SNZliHrXj39fXwWMeto=
+=9LhP
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-wapd/files/wapd.mk b/media-plugins/vdr-wapd/files/wapd.mk
new file mode 100644
index 000000000000..45fde03975f5
--- /dev/null
+++ b/media-plugins/vdr-wapd/files/wapd.mk
@@ -0,0 +1,110 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: wapd.mk,v 1.1 2014/06/21 22:08:34 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 = wapd
+
+### 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)"'
+
+### Enable this for debugging
+
+# DEFINES += -DWAPD_DEBUG
+
+### Enable this to replace WML output with HTML
+
+# DEFINES += -DWAPD_HTML
+
+### The object files (add further files here):
+
+OBJS = $(PLUGIN).o server.o tools.o access.o
+
+LIBS += -lcrypt
+
+### The main target:
+
+all: $(SOFILE) wappasswd
+
+### 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)
+
+### Targets:
+
+$(SOFILE): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+
+wappasswd: wappasswd.c
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o wappasswd wappasswd.c $(LIBS)
+
+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* *~ wappasswd
diff --git a/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild
new file mode 100644
index 000000000000..6066acd12642
--- /dev/null
+++ b/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-wapd/vdr-wapd-0.9_p1-r1.ebuild,v 1.1 2014/06/21 22:08:34 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+MY_P="${PN}-${PV%_p*}"
+
+DESCRIPTION="VDR plugin: lets VDR listen to WAP requests to allow remote control by WML enabled browsers"
+HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/wapd.html"
+SRC_URI="http://www.heiligenmann.de/vdr/download/${MY_P}.tgz
+	http://www.heiligenmann.de/vdr/download/${MY_P#vdr-}-patch1.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.3.44"
+
+PATCHES=("${FILESDIR}/${MY_P}_gcc-4.1.x.diff"
+	"${FILESDIR}/${MY_P}-gentoo.diff"
+	"${WORKDIR}/${MY_P#vdr-}-patch1.diff")
+
+S="${WORKDIR}/${MY_P#vdr-}"
+
+src_prepare() {
+	cp "${FILESDIR}/wapd.mk" "${S}/Makefile"
+
+	vdr-plugin-2_src_prepare
+
+	sed -e "s:RegisterI18n://RegisterI18n:" -i wapd.c
+	remove_i18n_include server.c wapd.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	dobin "${S}/wappasswd"
+
+	insinto /etc/vdr/plugins/wapd
+	doins "${FILESDIR}"/{waphosts,wapaccess}
+}