summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-plugins/vdr-skinelchi/files/rc-addon-0.1.1_pre2-r1.sh18
-rw-r--r--media-plugins/vdr-skinelchi/metadata.xml10
-rw-r--r--media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0-r1.ebuild (renamed from media-plugins/vdr-skinelchi/vdr-skinelchi-0.3.0.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..00000000000
--- 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 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<maintainer type="person">
+ <email>hd_brummy@gentoo.org</email>
+ <name>Joerg Bornkessel</name>
+</maintainer>
<maintainer type="project">
- <email>vdr@gentoo.org</email>
- <name>Gentoo VDR Project</name>
+ <email>vdr@gentoo.org</email>
+ <name>Gentoo VDR Project</name>
</maintainer>
- <longdescription>Video Disk Recorder (VDR) skin plugin</longdescription>
+ <longdescription>Video Disk Recorder (VDR) skin plugin</longdescription>
</pkgmetadata>
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
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::" \