[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/

2020-06-27 Thread Aaron Bauman 
commit: 495e3fdb8bf550e50aa9e640e85c8d6ea09e2365
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jun 17 17:41:33 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat Jun 27 20:51:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=495e3fdb

media-plugins/vdr-skinelchi: add missing flag-o-matic eclass

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Aaron Bauman  gentoo.org>

 media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild 
b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
index 2dbe08a9b7b..923fb323d1d 100644
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit vdr-plugin-2
+inherit flag-o-matic vdr-plugin-2
 
 DESCRIPTION="VDR Skin Plugin: skinelchi"
 HOMEPAGE="http://firefly.vdr-developer.org/skinelchi;

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/

2020-02-14 Thread Jörg Bornkessel 
commit: dbdb96fba4dfe84530e621cb4c92309766e382c3
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Fri Feb 14 21:37:33 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Fri Feb 14 21:50:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdb96fb

media-plugins/vdr-skinelchi: removed longdescription

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-plugins/vdr-skinelchi/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-plugins/vdr-skinelchi/metadata.xml 
b/media-plugins/vdr-skinelchi/metadata.xml
index 2aa794fd515..f055a6a361d 100644
--- a/media-plugins/vdr-skinelchi/metadata.xml
+++ b/media-plugins/vdr-skinelchi/metadata.xml
@@ -9,5 +9,4 @@
v...@gentoo.org
Gentoo VDR Project
 
-   Video Disk Recorder (VDR) skin plugin

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/

2020-01-12 Thread Jörg Bornkessel 
commit: dccd86f374944867109921c7e327e9c3ca198b72
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Jan 12 18:26:29 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Sun Jan 12 18:38:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dccd86f3

media-plugins/vdr-skinelchi: missing die's added

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild | 10 +-
 media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild |  8 
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild 
b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
index bdaa4315a20..81062648c1c 100644
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,16 +24,16 @@ src_prepare() {
 
# disable imagemagick support, broken ...
sed -i "${S}"/Makefile -e \
-   "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 
0:"
+   "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 
0:" || die
 
sed -i "${S}"/DisplayChannel.c \
-e "s:/hqlogos::" \
-   -e "s:/logos::"
+   -e "s:/logos::" || die
 
# wrong sed in vdr-plugin-2.eclass?
sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += 
-I\$(VDRINCDIR)/include:" \
-   -i Makefile
+   -i Makefile || die
 
# gcc-6 warnings
-   sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h
+   sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die
 }

diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild 
b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
index 0f5afd25994..2dbe08a9b7b 100644
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
@@ -23,18 +23,18 @@ src_prepare() {
 
# disable imagemagick support, broken ...
sed -i "${S}"/Makefile -e \
-   "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 
0:"
+   "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 
0:" || die
 
sed -i "${S}"/DisplayChannel.c \
-e "s:/hqlogos::" \
-   -e "s:/logos::"
+   -e "s:/logos::" || die
 
# wrong sed in vdr-plugin-2.eclass?
sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += 
-I\$(VDRINCDIR)/include:" \
-   -i Makefile
+   -i Makefile || die
 
# gcc-6 warnings
-   sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h
+   sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h || die
 
# wrt bug 703994
eapply "${FILESDIR}/${P}_min_max_from_stl.patch"

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/, media-plugins/vdr-skinelchi/files/

2020-01-05 Thread Jörg Bornkessel 
commit: 84014afdc8783146d314c74c7039978548e9908e
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Jan  5 15:41:17 2020 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Sun Jan  5 15:41:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84014afd

media-plugins/vdr-skinelchi: compile fix for not declared min/max

Closes: https://bugs.gentoo.org/703994
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Joerg Bornkessel  gentoo.org>

 .../vdr-skinelchi-0.3.0_min_max_from_stl.patch | 18 ++
 .../vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild| 41 ++
 2 files changed, 59 insertions(+)

diff --git 
a/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch 
b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch
new file mode 100644
index 000..123d0e4d557
--- /dev/null
+++ 
b/media-plugins/vdr-skinelchi/files/vdr-skinelchi-0.3.0_min_max_from_stl.patch
@@ -0,0 +1,18 @@
+taken from debian vdr repo
+this will fix
+https://bugs.gentoo.org/703994
+
+Reviewed-by: Joerg Bornkessel  ( 2020 Jan 05 )
+Index: b/DisplayChannel.c
+===
+--- a/DisplayChannel.c
 b/DisplayChannel.c
+@@ -724,7 +724,7 @@
+   }
+   else {
+  time_t t = time(NULL);
+- int seen = max(0, min(y9 - y6a - 1, int((y9 - y6a) * double(t - 
Present->StartTime()) / Present->Duration(;
++ int seen = std::max(0, std::min(y9 - y6a - 1, int((y9 - y6a) * 
double(t - Present->StartTime()) / Present->Duration(;
+  osd->DrawRectangle(x4 + Gap, y6a + seen, x4 + Gap + ScrollWidth - 1, 
y9 - 1, Theme.Color(clrChannelTimebarRest));
+  osd->DrawRectangle(x4 + Gap, y6a, x4 + Gap + ScrollWidth - 1, y6a + 
seen - 1, Theme.Color(clrChannelTimebarSeen));
+  changed = true;

diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild 
b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
new file mode 100644
index 000..0f5afd25994
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Skin Plugin: skinelchi"
+HOMEPAGE="http://firefly.vdr-developer.org/skinelchi;
+SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-video/vdr"
+
+src_prepare() {
+   vdr-plugin-2_src_prepare
+
+   #bug #599148
+   append-cxxflags -std=gnu++11
+
+   # disable imagemagick support, broken ...
+   sed -i "${S}"/Makefile -e \
+   "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 
0:"
+
+   sed -i "${S}"/DisplayChannel.c \
+   -e "s:/hqlogos::" \
+   -e "s:/logos::"
+
+   # wrong sed in vdr-plugin-2.eclass?
+   sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += 
-I\$(VDRINCDIR)/include:" \
+   -i Makefile
+
+   # gcc-6 warnings
+   sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h
+
+   # wrt bug 703994
+   eapply "${FILESDIR}/${P}_min_max_from_stl.patch"
+}

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/files/, media-plugins/vdr-skinelchi/

2019-12-22 Thread Jörg Bornkessel 
commit: 932ae52192a5bca13d70bee1e007cea2d8a8e3c9
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Dec 22 17:52:06 2019 +
Commit: Jörg Bornkessel  gentoo  org>
CommitDate: Sun Dec 22 17:53:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932ae521

media-plugins/vdr-skinelchi: fixed c++-11 issues, removed imagemagick support

removed imagemagick support, as it is
broken on all imagemackig version in the tree
this needs to be fixed by upstream,
in this case we could readd the package again with imagemagick support
reduced to -std=gnu++11, as it fails on compile with newer gnu version
need also fixing by upstream

Bug: https://bugs.gentoo.org/599148
Bug: https://bugs.gentoo.org/314313
Closes: https://bugs.gentoo.org/599148
Closes: https://bugs.gentoo.org/314313
Package-Manager: Portage-2.3.82, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel  gentoo.org>

 .../vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh  | 18 -
 media-plugins/vdr-skinelchi/metadata.xml   | 10 +---
 ...-0.3.0.ebuild => vdr-skinelchi-0.3.0-r1.ebuild} | 30 --
 3 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh 
b/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh
deleted file mode 100644
index 1798eade453..000
--- a/media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# rc-addon plugin-startup-skript for vdr-skinelchi
-#
-# This sript is called by gentoo-vdr-scripts on start of VDR
-
-# Check on dxr-3 and set default logo DIR
-plugin_pre_vdr_start() {
-
-# Next lines commented, not supported yet, remove this if dxr3 logo support is 
available
-#  if [ "${PLUGINS#*dxr3}" != "${PLUGINS}" ] ; then
-#  : 
${SKINELCHI_LOGOS_DIR:=/usr/share/vdr/channel-logos/logos-dxr3}
-#  else
-   : ${SKINELCHI_LOGOS_DIR:=/usr/share/vdr/channel-logos}
-#  fi
-  
-   add_plugin_param "-l ${SKINELCHI_LOGOS_DIR}"
-
-}

diff --git a/media-plugins/vdr-skinelchi/metadata.xml 
b/media-plugins/vdr-skinelchi/metadata.xml
index a4ac816157a..2aa794fd515 100644
--- a/media-plugins/vdr-skinelchi/metadata.xml
+++ b/media-plugins/vdr-skinelchi/metadata.xml
@@ -1,9 +1,13 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
+
+   hd_bru...@gentoo.org
+   Joerg Bornkessel
+
 
-v...@gentoo.org
-Gentoo VDR Project
+   v...@gentoo.org
+   Gentoo VDR Project
 
-Video Disk Recorder (VDR) skin plugin
+   Video Disk Recorder (VDR) skin plugin
 

diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild 
b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
similarity index 57%
rename from media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild
rename to media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
index 23c1f70613a..bdaa4315a20 100644
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit vdr-plugin-2
-
-MY_P=${P/_pre/pre}
+inherit flag-o-matic vdr-plugin-2
 
 DESCRIPTION="VDR Skin Plugin: skinelchi"
 HOMEPAGE="http://firefly.vdr-developer.org/skinelchi;
@@ -14,25 +12,19 @@ 
SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2;
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="imagemagick"
-
-DEPEND=">=media-video/vdr-1.6
-   imagemagick? ( media-gfx/imagemagick )"
-
-RDEPEND="x11-themes/vdr-channel-logos"
+IUSE=""
 
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.1.1_pre2-r1.sh"
+DEPEND="media-video/vdr"
 
 src_prepare() {
vdr-plugin-2_src_prepare
 
-   if ! use imagemagick; then
-   einfo "Disabling imagemagick-support."
-   sed -i "${S}"/Makefile \
-   -e '/^[[:space:]]*SKINELCHI_HAVE_IMAGEMAGICK = 1/s/^/#/'
-   fi
+   #bug #599148
+   append-cxxflags -std=gnu++11
+
+   # disable imagemagick support, broken ...
+   sed -i "${S}"/Makefile -e \
+   "s:SKINELCHI_HAVE_IMAGEMAGICK = 1:SKINELCHI_HAVE_IMAGEMAGICK = 
0:"
 
sed -i "${S}"/DisplayChannel.c \
-e "s:/hqlogos::" \

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/

2018-08-26 Thread Joerg Bornkessel 
commit: fe3e0cd1387a396aedd500e0c805a99bd9f12804
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Sun Aug 26 12:42:55 2018 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Sun Aug 26 12:42:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3e0cd1

media-plugins/vdr-skinelchi: cleanup old

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-plugins/vdr-skinelchi/Manifest   |  1 -
 .../vdr-skinelchi/vdr-skinelchi-0.2.7-r1.ebuild| 45 --
 .../vdr-skinelchi/vdr-skinelchi-0.2.7.ebuild   | 40 ---
 3 files changed, 86 deletions(-)

diff --git a/media-plugins/vdr-skinelchi/Manifest 
b/media-plugins/vdr-skinelchi/Manifest
index 5833511989a..814c9ccd8c4 100644
--- a/media-plugins/vdr-skinelchi/Manifest
+++ b/media-plugins/vdr-skinelchi/Manifest
@@ -1,2 +1 @@
-DIST vdr-skinelchi-0.2.7.tar.bz2 77029 BLAKE2B 
710424ccb3cd17f70bce222930cd3b60e2f535cbe6c48279f61dbeb9443857c7e7812372979a73639394ead64b43d0d7e02233dff53431db5cef0cff5cc19643
 SHA512 
6dd0f702d487127cbda4b7b6bf504772fccb1d5b097307b44599401cc13b821076c07c56f6d122a04fe969153128e71255305585aba0a8d74262acee834a25de
 DIST vdr-skinelchi-0.3.0.tar.bz2 78806 BLAKE2B 
b2f9e94484e6e8e9829fbc4a53485c8fa094563aab9a090b1dc0b1f55b769d416d21bba8fac81297740eb72cfed4110cbf545a2faf9e0542cf8b3e75f31e533d
 SHA512 
28ffaf956435b8f5caf84b1562b1450214cfc96906dfce3455093627e1f1807a6c3bc37aaf1055148a719debd8b0a6a8c860a869a42850a61f0c6a1551294c8f

diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7-r1.ebuild 
b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7-r1.ebuild
deleted file mode 100644
index bb69ba83d5e..000
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2
-
-MY_P=${P/_pre/pre}
-
-DESCRIPTION="VDR Skin Plugin: skinelchi"
-HOMEPAGE="http://firefly.vdr-developer.org/skinelchi;
-SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="imagemagick"
-
-DEPEND=">=media-video/vdr-1.6
-   imagemagick? ( media-gfx/imagemagick )"
-
-RDEPEND="x11-themes/vdr-channel-logos"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.1.1_pre2-r1.sh"
-
-src_prepare() {
-   vdr-plugin-2_src_prepare
-
-   if ! use imagemagick; then
-   einfo "Disabling imagemagick-support."
-   sed -i "${S}"/Makefile \
-   -e '/^[[:space:]]*SKINELCHI_HAVE_IMAGEMAGICK = 1/s/^/#/'
-   fi
-
-   sed -i "${S}"/DisplayChannel.c \
-   -e "s:/hqlogos::" \
-   -e "s:/logos::"
-
-   if has_version ">=media-video/vdr-1.7.33"; then
-   sed -e "s:int TimerMatch:eTimerMatch TimerMatch:" \
-   -i DisplayChannel.c
-   fi
-}

diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7.ebuild 
b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7.ebuild
deleted file mode 100644
index cba69df29ab..000
--- a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.2.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-MY_P=${P/_pre/pre}
-
-DESCRIPTION="VDR Skin Plugin: skinelchi"
-HOMEPAGE="http://firefly.vdr-developer.org/skinelchi;
-SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE="imagemagick"
-
-DEPEND=">=media-video/vdr-1.6
-   imagemagick? ( media-gfx/imagemagick )"
-
-RDEPEND="x11-themes/vdr-channel-logos"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.1.1_pre2-r1.sh"
-
-src_prepare() {
-   vdr-plugin-2_src_prepare
-
-   if ! use imagemagick; then
-   einfo "Disabling imagemagick-support."
-   sed -i "${S}"/Makefile \
-   -e '/^[[:space:]]*SKINELCHI_HAVE_IMAGEMAGICK = 1/s/^/#/'
-   fi
-
-   sed -i "${S}"/DisplayChannel.c \
-   -e "s:/hqlogos::" \
-   -e "s:/logos::"
-}

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-skinelchi/

2016-10-03 Thread Joerg Bornkessel 
commit: 0cdc2420785f7465f7c804a3a4baf0335de7da47
Author: Joerg Bornkessel  gentoo  org>
AuthorDate: Mon Oct  3 14:23:20 2016 +
Commit: Joerg Bornkessel  gentoo  org>
CommitDate: Mon Oct  3 14:23:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cdc2420

media-plugins/vdr-skinelchi: bump; eapi=6; some compile warnings gcc-6 fixed

Package-Manager: portage-2.3.0

 media-plugins/vdr-skinelchi/Manifest   |  1 +
 .../vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild   | 48 ++
 2 files changed, 49 insertions(+)

diff --git a/media-plugins/vdr-skinelchi/Manifest 
b/media-plugins/vdr-skinelchi/Manifest
index bcc84b8..23da75e 100644
--- a/media-plugins/vdr-skinelchi/Manifest
+++ b/media-plugins/vdr-skinelchi/Manifest
@@ -1 +1,2 @@
 DIST vdr-skinelchi-0.2.7.tar.bz2 77029 SHA256 
e6db362b814ee8f5c07fed00f766c3270fadf7448d7f57c10d54539cf79633ac SHA512 
6dd0f702d487127cbda4b7b6bf504772fccb1d5b097307b44599401cc13b821076c07c56f6d122a04fe969153128e71255305585aba0a8d74262acee834a25de
 WHIRLPOOL 
08aa7c686e25e8866849724368f31295d0950485a17e8e37f92f9bd3f1ac09c5c032edff36c247f430faf832b2ebcc1c17fd158f041361dfc0087d0e762bf969
+DIST vdr-skinelchi-0.3.0.tar.bz2 78806 SHA256 
e67ab08ca7ba3b8d591f93ea809dd55806c150cb7d7fd48d3239c6a85feeea97 SHA512 
28ffaf956435b8f5caf84b1562b1450214cfc96906dfce3455093627e1f1807a6c3bc37aaf1055148a719debd8b0a6a8c860a869a42850a61f0c6a1551294c8f
 WHIRLPOOL 
b0be291aa3775fcf89faec30e9f07e2ca0cb59e88ced6cfc881813509f044d18cc8b7e5b88f80ba45f380cea9a3998f184c8e687ee6ac2421ed9e38bd1bee31b

diff --git a/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild 
b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild
new file mode 100644
index ..e1017e4
--- /dev/null
+++ b/media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vdr-plugin-2
+
+MY_P=${P/_pre/pre}
+
+DESCRIPTION="VDR Skin Plugin: skinelchi"
+HOMEPAGE="http://firefly.vdr-developer.org/skinelchi;
+SRC_URI="http://firefly.vdr-developer.org/skinelchi/${P}.tar.bz2;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="imagemagick"
+
+DEPEND=">=media-video/vdr-1.6
+   imagemagick? ( media-gfx/imagemagick )"
+
+RDEPEND="x11-themes/vdr-channel-logos"
+
+S=${WORKDIR}/${MY_P#vdr-}
+
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.1.1_pre2-r1.sh"
+
+src_prepare() {
+   vdr-plugin-2_src_prepare
+
+   if ! use imagemagick; then
+   einfo "Disabling imagemagick-support."
+   sed -i "${S}"/Makefile \
+   -e '/^[[:space:]]*SKINELCHI_HAVE_IMAGEMAGICK = 1/s/^/#/'
+   fi
+
+   sed -i "${S}"/DisplayChannel.c \
+   -e "s:/hqlogos::" \
+   -e "s:/logos::"
+
+   # wrong sed in vdr-plugin-2.eclass?
+   sed -e "s:INCLUDES += -I\$(VDRINCDIR):INCLUDES += 
-I\$(VDRINCDIR)/include:" \
+   -i Makefile
+
+   # gcc-6 warnings
+   sed -e "s:auto_ptr:unique_ptr:" -i services/epgsearch_services.h
+}