commit:     d97082b6cd0b18fa766ad5cda62a20db4258799d
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Mon Jul 15 19:15:37 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 07:44:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d97082b6

media-plugins/vdr-mplayer: update EAPI 7 -> 8

fix pkgcheck issues

Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild       | 33 ++++++++--------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild 
b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild
index d3d0a34dbf4b..04368697eeea 100644
--- a/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild
+++ b/media-plugins/vdr-mplayer/vdr-mplayer-0.10.2-r2.ebuild
@@ -1,31 +1,28 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit vdr-plugin-2
+inherit optfeature vdr-plugin-2
 
 DESCRIPTION="VDR Plugin: Play video files not supported by VDR with mplayer 
(divx and more)"
 HOMEPAGE="https://www.muempf.de/";
 SRC_URI="https://www.muempf.de/down/vdr-mp3-${PV}.tar.gz";
+S=${WORKDIR}/mp3-${PV}
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.2"
 
+DEPEND="media-video/vdr"
 RDEPEND="${DEPEND}
        media-video/mplay-sh
        sys-apps/util-linux"
 
-S=${WORKDIR}/mp3-${PV}
-
 PATCHES=( "${FILESDIR}/${PV}/01_gentoo.diff" )
 
-VDR_RCADDON_FILE=${FILESDIR}/rc-addon-0.9.15.sh
-VDR_CONFD_FILE=${FILESDIR}/confd-0.9.15.sh
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.9.15.sh"
+VDR_CONFD_FILE="${FILESDIR}/confd-0.9.15.sh"
 
 src_prepare() {
        vdr-plugin-2_src_prepare
@@ -33,7 +30,7 @@ src_prepare() {
        if has_version ">=media-video/vdr-2.1.2"; then
                sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" \
                -i decoder.c \
-               -i player-mplayer.c
+               -i player-mplayer.c || die
        fi
 
        # bug 787557
@@ -56,15 +53,7 @@ pkg_postinst() {
        vdr-plugin-2_pkg_postinst
 
        echo
-       elog "Edit all config's /etc/vdr/plugins/mplayer"
+       elog "Edit all config files in /etc/vdr/plugins/mplayer"
        echo
-
-       if ! has_version "media-plugins/vdr-mp3ng" ; then
-               elog "Splitted ebuild!, no support for Audio files"
-               elog "To play mp3, ogg and wav files,"
-               elog "emerge media-plugins/vdr-mp3ng -pv"
-               elog "or"
-               elog "emerge media-plugins/vdr-mp3 -pv"
-               echo
-       fi
+       optfeature "playing mp3, ogg and wav files" media-plugins/vdr-mp3ng
 }

Reply via email to