compilefix gcc-4.7, wrt bug 514128; eapi=5; fixed QA Notice on install

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

5 files changed, 50 insertions, 26 deletions

diff --git a/media-plugins/vdr-vodcatcher/ChangeLog b/media-plugins/vdr-vodcatcher/ChangeLog
index f31907cb05bc..fda874a3ee20 100644
--- a/media-plugins/vdr-vodcatcher/ChangeLog
+++ b/media-plugins/vdr-vodcatcher/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-vodcatcher
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/ChangeLog,v 1.6 2012/05/01 12:30:14 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/ChangeLog,v 1.7 2014/06/22 11:05:31 hd_brummy Exp $
+
+  22 Jun 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-vodcatcher-0.2.2.ebuild, +files/vdr-vodcatcher-0.2.2_gcc-4.7.patch,
+  +files/rc-addon.sh:
+  compilefix gcc-4.7, wrt bug 514128; eapi=5; fixed QA Notice on install
 
   01 May 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-vodcatcher-0.1.1.ebuild, -vdr-vodcatcher-0.2.1.ebuild,
diff --git a/media-plugins/vdr-vodcatcher/Manifest b/media-plugins/vdr-vodcatcher/Manifest
index bae23e74c966..893e692b405b 100644
--- a/media-plugins/vdr-vodcatcher/Manifest
+++ b/media-plugins/vdr-vodcatcher/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff 1638 RMD160 4ddf9fbe5a0d83299fa6df26cf81e16370d44126 SHA1 a95419301805984e88c5f158197ce840cd6d0170 SHA256 63ab88c70acc0fdd86e13c5d086cab5fdab6403722deb708a4e039950ba64015
-DIST vdr-vodcatcher-0.2.2.tar.gz 126612 RMD160 848a6bd31df6b67073cc5ad1f3fc22b43fa428ba SHA1 ce3f16f25ab499da9f234b932e6746e68dfa42f0 SHA256 85f728a5eecc5845d3bb18c97ff96c65ec2cb5653dcf24fb8be604d8c02adf32
-EBUILD vdr-vodcatcher-0.2.2.ebuild 1372 RMD160 dbb46543f8496d64024742a7c177c6b6b94fc4c4 SHA1 49b9ee671995c86f983f0a8b849913cce9695c01 SHA256 4f7380d8a780c56dc6d6ad95c773a57789e45d8da6e49e5b490b645041010980
-MISC ChangeLog 1431 RMD160 eadffc196a329e1dac0d3304663f5a995d52b13b SHA1 9d1cf917086394bd0a2988d991c9bac6d945abb6 SHA256 1ce573551468808464bbc530a2df719b4370e4b2dfef1a860b6e9898ba2b01df
-MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
-
-iD8DBQFPn9dgdn07HTTCgIoRAvTgAJ9DsBA+TnG41CzsLBE8ZK5xxZAAYACfWf1A
-zWoWnoXigrT/PevLxFdy9ig=
-=HUaA
------END PGP SIGNATURE-----
+AUX rc-addon.sh 504 SHA256 a91c127104e0f2877c32610ce8b27f142f33e1c2cafa8a0eedaac2734eb01819 SHA512 6a578b18fc690d7b7466a97390f69161cfefef25e0c743bf1b5a466b0a1836775ad5b6ac9d8b825cfc5dc3687e24250980c585699dc82a0697343277b8aa9527 WHIRLPOOL 1387a8b0d22ee9fb47b7e007e0e11ca471d1c6df76b5e68e10837a40e122f062b91c300c3a1b0ca38d95e94df0977a16da3ba7059dd69ed8b094cb4388e218a3
+AUX vdr-vodcatcher-0.2.2_gcc-4.7.patch 542 SHA256 82a53d31d7f09556c3d1e186ad92f9e009fae7027d3aa83e85c78d12a1e577ea SHA512 f04095f4277cdd66eff457215373cd1ecd2bdfb20367c3c73aaa7871bd5545da66e1e72a5f4abbf866368514b75ad4d54391192a40f1e5410a0e77c77e076472 WHIRLPOOL 93bc4b9b1bad0ede46d8f65856e434387d45a2878760d8ba842917f2d22c40f8ba4353462dad06599dfa68cc8d760331b1f5fd3953317cee4424d2d8afd1f188
+AUX vdr-vodcatcher-0.2.2_unbundle-tinyxml2.diff 1638 SHA256 63ab88c70acc0fdd86e13c5d086cab5fdab6403722deb708a4e039950ba64015 SHA512 eddc283a0a98aa6ab54ad4430dbb998ec75b937a87018f60c2d16fb09791c4174de2f97ec5e3fab2d9fcf9553e936f31defe27335b87d1c675cce6553128f6cf WHIRLPOOL 8f4d284491c98c495bfdf17545cecb05e8be21acdf763de79844108ed49c2957156a0db3c514ef1dd0f687e3b45d769f510c68d3f5a9f326ff34fa40bfb4bda0
+DIST vdr-vodcatcher-0.2.2.tar.gz 126612 SHA256 85f728a5eecc5845d3bb18c97ff96c65ec2cb5653dcf24fb8be604d8c02adf32 SHA512 05a8188888caed5bd656d0ff65b718debdc889e82373b6e00aed4b2ffb942f822f8b6cbff4811d5f4c9b271e1ff8d8ec5874d34081b5ef3c8fc95ac215ce2a22 WHIRLPOOL 27e81685a588892e8f9b36573240ed4f3954c4617aceec6d8d2305f68669ff075da759d1b950802744b188dec41ee43e49841f3b137d8274f4ca4dc8d24d4cb8
+EBUILD vdr-vodcatcher-0.2.2.ebuild 1349 SHA256 fe5262098c6bd263bb4e97ac77189f941835ef8a856c53c9497035a5ec39460e SHA512 643ec2bbf646868acdc3d367ed471b87ceb3d03bce85bef087c22dbc06ee8958918ae954524b7e17621d700e74a3e40074d26e59fe39a180192e8ac4c023183f WHIRLPOOL dfae2e65a8509179ae3225105ebed27bab92122b78d4987ab449bea9726ebacfdb4a7710575fb88c65a4a1bb0e5d8f5126757f77fa6f1539c1648ef45dfe984b
+MISC ChangeLog 1656 SHA256 ff12693ba23ede13116d6000d0618f42f4e9057e7107655a58f3ed4550480deb SHA512 929eb94d23502485d6868731b75e6fabbad34f424d1482f1ce8ad5a0f5cd7cdceec173f2b4a9c6e8c53490d6728c4e40b5a0d9e05a3a212aa33817c7ffd19c2f WHIRLPOOL a72f798814b49d1fc38af0e2bb01d7327a6ece787c8319bbf25c6d28675ec036a80cea42dda68cd03caf5240f31e021724ddfee3d757c9e0f4d39667436a984b
+MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
diff --git a/media-plugins/vdr-vodcatcher/files/rc-addon.sh b/media-plugins/vdr-vodcatcher/files/rc-addon.sh
new file mode 100644
index 000000000000..45af3184029f
--- /dev/null
+++ b/media-plugins/vdr-vodcatcher/files/rc-addon.sh
@@ -0,0 +1,15 @@
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/files/rc-addon.sh,v 1.1 2014/06/22 11:05:30 hd_brummy Exp $
+#
+# rc-addon-script for plugin vodcatcher
+#
+# Joerg Bornkessel <hd_brummy@gentoo.org>
+
+VODCATCHER_CACHE_DIR=var/cache/vdr-plugin-vodcatcher
+
+# depends on QA, create paths in /var/cache on the fly at runtime as needed
+init_cache_dir() {
+    if [ ! -d "${VODCATCHER_CACHE_DIR}" ]; then
+        mkdir -p ${VODCATCHER_CACHE_DIR}
+        chown vdr:vdr ${VODCATCHER_CACHE_DIR}
+    fi
+}
diff --git a/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch
new file mode 100644
index 000000000000..8472764a8631
--- /dev/null
+++ b/media-plugins/vdr-vodcatcher/files/vdr-vodcatcher-0.2.2_gcc-4.7.patch
@@ -0,0 +1,15 @@
+compilefix for gcc-4.7
+https://bugs.gentoo.org/show_bug.cgi?id=514128
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 22/Jun/2014
+
+diff -Naur vodcatcher-0.2.2.orig/src/LocalFileCache.cc vodcatcher-0.2.2/src/LocalFileCache.cc
+--- vodcatcher-0.2.2.orig/src/LocalFileCache.cc	2014-06-22 00:34:55.448489644 +0200
++++ vodcatcher-0.2.2/src/LocalFileCache.cc	2014-06-22 00:36:11.090546002 +0200
+@@ -24,6 +24,7 @@
+ #include "LocalFileCache.h"
+ #include "SdbmHashCalculator.h"
+ #include <values.h>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
diff --git a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
index 5095910c0e63..5db0f26a9b8b 100644
--- a/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
+++ b/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 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-vodcatcher/vdr-vodcatcher-0.2.2.ebuild,v 1.3 2012/05/01 12:30:14 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-vodcatcher/vdr-vodcatcher-0.2.2.ebuild,v 1.4 2014/06/22 11:05:31 hd_brummy Exp $
 
-EAPI="4"
+EAPI="5"
 
 inherit vdr-plugin-2
 
@@ -16,12 +16,13 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="net-misc/curl
-		>=dev-libs/tinyxml-2.6.1
+		>=dev-libs/tinyxml-2.6.1[stl]
 		media-video/vdr"
 RDEPEND="${DEPEND}
 		|| ( media-plugins/vdr-mplayer media-plugins/vdr-xineliboutput )"
 
-PATCHES=( "${FILESDIR}/${P}_unbundle-tinyxml2.diff" )
+PATCHES=( "${FILESDIR}/${P}_unbundle-tinyxml2.diff"
+		 "${FILESDIR}/${P}_gcc-4.7.patch" )
 
 src_prepare() {
 	vdr-plugin-2_src_prepare
@@ -34,9 +35,6 @@ src_install() {
 
 	insinto /etc/vdr/plugins/vodcatcher/
 	doins   examples/vodcatchersources.conf
-
-	diropts -gvdr -ovdr
-	keepdir /var/cache/vdr-plugin-vodcatcher
 }
 
 pkg_postinst() {