From 4e5e07da99dd4c3e20168057126e3694314a670c Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Sat, 9 Jul 2016 08:15:01 +0200 Subject: Bourne-compliant parameter substitution --- app-portage/portage-bashrc-mv/Manifest | 2 +- .../portage-bashrc-mv-13.10.ebuild | 41 +++++ .../portage-bashrc-mv-13.9.ebuild | 41 ----- app-portage/trickyfetch/Manifest | 2 +- app-portage/trickyfetch/trickyfetch-8.8.ebuild | 45 ----- app-portage/trickyfetch/trickyfetch-8.9.ebuild | 45 +++++ app-shells/runtitle/Manifest | 2 +- app-shells/runtitle/runtitle-2.7.ebuild | 29 ---- app-shells/runtitle/runtitle-2.8.ebuild | 29 ++++ app-shells/schily-tools/files/setuarg.patch | 27 +++ .../schily-tools/schily-tools-2016.07.06.ebuild | 4 +- .../zsh-completions/zsh-completions-0.18.0.ebuild | 13 +- .../zsh-completions-99999999.ebuild | 4 +- eclass/mv_mozextension-r1.eclass | 19 +- games-rpg/magus/magus-1.3.1.ebuild | 4 +- games-rpg/magus/magus-1.3.3.ebuild | 4 +- games-rpg/magus/magus-99999999.ebuild | 4 +- media-tv/sundtek-tv/files/sundtek.initd | 6 +- .../sundtek-tv/sundtek-tv-160623.182622-r1.ebuild | 192 +++++++++++++++++++++ .../sundtek-tv/sundtek-tv-160623.182622.ebuild | 192 --------------------- media-video/video-mv/Manifest | 2 +- media-video/video-mv/video-mv-9.2.ebuild | 63 ------- media-video/video-mv/video-mv-9.3.ebuild | 63 +++++++ net-firewall/firewall-mv/Manifest | 2 +- net-firewall/firewall-mv/firewall-mv-9.1.ebuild | 47 ----- net-firewall/firewall-mv/firewall-mv-9.2.ebuild | 47 +++++ sys-apps/cpi/Manifest | 2 +- sys-apps/cpi/cpi-2.10.ebuild | 30 ---- sys-apps/cpi/cpi-2.11.ebuild | 30 ++++ sys-apps/starter/Manifest | 2 +- sys-apps/starter/starter-2.15.ebuild | 39 ----- sys-apps/starter/starter-2.16.ebuild | 39 +++++ sys-kernel/kernel/Manifest | 2 +- sys-kernel/kernel/kernel-1.46.ebuild | 40 ----- sys-kernel/kernel/kernel-1.47.ebuild | 40 +++++ 35 files changed, 591 insertions(+), 562 deletions(-) create mode 100644 app-portage/portage-bashrc-mv/portage-bashrc-mv-13.10.ebuild delete mode 100644 app-portage/portage-bashrc-mv/portage-bashrc-mv-13.9.ebuild delete mode 100644 app-portage/trickyfetch/trickyfetch-8.8.ebuild create mode 100644 app-portage/trickyfetch/trickyfetch-8.9.ebuild delete mode 100644 app-shells/runtitle/runtitle-2.7.ebuild create mode 100644 app-shells/runtitle/runtitle-2.8.ebuild create mode 100644 app-shells/schily-tools/files/setuarg.patch create mode 100644 media-tv/sundtek-tv/sundtek-tv-160623.182622-r1.ebuild delete mode 100644 media-tv/sundtek-tv/sundtek-tv-160623.182622.ebuild delete mode 100644 media-video/video-mv/video-mv-9.2.ebuild create mode 100644 media-video/video-mv/video-mv-9.3.ebuild delete mode 100644 net-firewall/firewall-mv/firewall-mv-9.1.ebuild create mode 100644 net-firewall/firewall-mv/firewall-mv-9.2.ebuild delete mode 100644 sys-apps/cpi/cpi-2.10.ebuild create mode 100644 sys-apps/cpi/cpi-2.11.ebuild delete mode 100644 sys-apps/starter/starter-2.15.ebuild create mode 100644 sys-apps/starter/starter-2.16.ebuild delete mode 100644 sys-kernel/kernel/kernel-1.46.ebuild create mode 100644 sys-kernel/kernel/kernel-1.47.ebuild diff --git a/app-portage/portage-bashrc-mv/Manifest b/app-portage/portage-bashrc-mv/Manifest index cd59d86d..cba22358 100644 --- a/app-portage/portage-bashrc-mv/Manifest +++ b/app-portage/portage-bashrc-mv/Manifest @@ -1 +1 @@ -DIST portage-bashrc-mv-13.9.tar.gz 13585 SHA256 4442351de6ed7ee123f50fd228ced9e90adee1068623a0557967007abc6e2d29 +DIST portage-bashrc-mv-13.10.tar.gz 13585 SHA256 e599d67b203538fc9dc6406b8aac54a3d5aa61e60773bf2ad4f0d376a286c6e0 diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.10.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.10.ebuild new file mode 100644 index 00000000..81dee804 --- /dev/null +++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.10.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +RESTRICT="mirror" +inherit eutils + +DESCRIPTION="Provide support for /etc/portage/bashrc.d and /etc/portage/package.cflags" +HOMEPAGE="https://github.com/vaeth/portage-bashrc-mv/" +SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RDEPEND="!=portage-2.2.15" + ewarn "See NEWS for details";; + esac + optfeature "improved mask handling" app-portage/eix + optfeature "output of expected emerge time" app-portage/portage-utils + optfeature "detailed information output in title bar" app-shells/runtitle + ! test -d /var/cache/gpo || \ + ewarn "Obsolete /var/cache/gpo found. Please remove" +} diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.9.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.9.ebuild deleted file mode 100644 index 81dee804..00000000 --- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-13.9.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -RESTRICT="mirror" -inherit eutils - -DESCRIPTION="Provide support for /etc/portage/bashrc.d and /etc/portage/package.cflags" -HOMEPAGE="https://github.com/vaeth/portage-bashrc-mv/" -SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="!=portage-2.2.15" - ewarn "See NEWS for details";; - esac - optfeature "improved mask handling" app-portage/eix - optfeature "output of expected emerge time" app-portage/portage-utils - optfeature "detailed information output in title bar" app-shells/runtitle - ! test -d /var/cache/gpo || \ - ewarn "Obsolete /var/cache/gpo found. Please remove" -} diff --git a/app-portage/trickyfetch/Manifest b/app-portage/trickyfetch/Manifest index 525cb278..464fb572 100644 --- a/app-portage/trickyfetch/Manifest +++ b/app-portage/trickyfetch/Manifest @@ -1 +1 @@ -DIST trickyfetch-8.8.tar.gz 10950 SHA256 fd26815f42f8b6b166f850fb893d6aac9bd62f4bc170790d645ad6320df8a85f +DIST trickyfetch-8.9.tar.gz 10976 SHA256 f75efe3a5b5f1622cad352ba1e9525bd7e9dac7c20a5da1aa4c7b46a6f2fb798 diff --git a/app-portage/trickyfetch/trickyfetch-8.8.ebuild b/app-portage/trickyfetch/trickyfetch-8.8.ebuild deleted file mode 100644 index ec5f6700..00000000 --- a/app-portage/trickyfetch/trickyfetch-8.8.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -RESTRICT="mirror" -inherit eutils - -DESCRIPTION="Plugin for FETCHCOMMAND to help organize and cleanup your DISTDIR" -HOMEPAGE="https://github.com/vaeth/trickyfetch/" -SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -src_prepare() { - if use prefix - then sed -i \ - -e "s'\\(PATH=.\\)/etc'\\1${EPREFIX}/etc'" \ - -- "${S}/bin/trickyfetch" || die - else sed -i \ - -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ - -- "${S}"/bin/* || die - fi - eapply_user -} - -src_install() { - dobin bin/* - insinto /etc - doins etc/* - insinto /usr/share/zsh/site-functions - doins zsh/_* - dodoc README -} - -pkg_postinst() { - case " ${REPLACING_VERSIONS:-0.}" in - ' '[0-7].*) - elog "Please adapt /etc/trickyfetch.conf to your needs";; - esac - optfeature "faster execution" 'app-portage/eix' -} diff --git a/app-portage/trickyfetch/trickyfetch-8.9.ebuild b/app-portage/trickyfetch/trickyfetch-8.9.ebuild new file mode 100644 index 00000000..ec5f6700 --- /dev/null +++ b/app-portage/trickyfetch/trickyfetch-8.9.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +RESTRICT="mirror" +inherit eutils + +DESCRIPTION="Plugin for FETCHCOMMAND to help organize and cleanup your DISTDIR" +HOMEPAGE="https://github.com/vaeth/trickyfetch/" +SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +src_prepare() { + if use prefix + then sed -i \ + -e "s'\\(PATH=.\\)/etc'\\1${EPREFIX}/etc'" \ + -- "${S}/bin/trickyfetch" || die + else sed -i \ + -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ + -- "${S}"/bin/* || die + fi + eapply_user +} + +src_install() { + dobin bin/* + insinto /etc + doins etc/* + insinto /usr/share/zsh/site-functions + doins zsh/_* + dodoc README +} + +pkg_postinst() { + case " ${REPLACING_VERSIONS:-0.}" in + ' '[0-7].*) + elog "Please adapt /etc/trickyfetch.conf to your needs";; + esac + optfeature "faster execution" 'app-portage/eix' +} diff --git a/app-shells/runtitle/Manifest b/app-shells/runtitle/Manifest index 5bb42a08..ee8f1e94 100644 --- a/app-shells/runtitle/Manifest +++ b/app-shells/runtitle/Manifest @@ -1 +1 @@ -DIST runtitle-2.7.tar.gz 3372 SHA256 6ea63935ad18ad3544e42db4ca93a218e1c9b7e3b70033af07cdc3c74e278022 +DIST runtitle-2.8.tar.gz 3368 SHA256 faeac3525169d6031ebf067b64e81a2af6536f4232b9363c034d2ba91f04c19c diff --git a/app-shells/runtitle/runtitle-2.7.ebuild b/app-shells/runtitle/runtitle-2.7.ebuild deleted file mode 100644 index 42e6458f..00000000 --- a/app-shells/runtitle/runtitle-2.7.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -RESTRICT="mirror" - -DESCRIPTION="Scripts to run commands and set the hard status line (windows title)" -HOMEPAGE="https://github.com/vaeth/runtitle/" -SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -src_prepare() { - use prefix || sed -i \ - -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ - -- bin/* || die - eapply_user -} - -src_install() { - dobin bin/* - insinto /usr/share/zsh/site-functions - doins zsh/* - dodoc README -} diff --git a/app-shells/runtitle/runtitle-2.8.ebuild b/app-shells/runtitle/runtitle-2.8.ebuild new file mode 100644 index 00000000..42e6458f --- /dev/null +++ b/app-shells/runtitle/runtitle-2.8.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +RESTRICT="mirror" + +DESCRIPTION="Scripts to run commands and set the hard status line (windows title)" +HOMEPAGE="https://github.com/vaeth/runtitle/" +SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +src_prepare() { + use prefix || sed -i \ + -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ + -- bin/* || die + eapply_user +} + +src_install() { + dobin bin/* + insinto /usr/share/zsh/site-functions + doins zsh/* + dodoc README +} diff --git a/app-shells/schily-tools/files/setuarg.patch b/app-shells/schily-tools/files/setuarg.patch new file mode 100644 index 00000000..46ce6ec2 --- /dev/null +++ b/app-shells/schily-tools/files/setuarg.patch @@ -0,0 +1,27 @@ +--- 1/sh/macro.c ++++ 1/sh/macro.c +@@ -322,6 +322,7 @@ + if ((c = readwc(), dolchar(c))) { + struct namnod *n = (struct namnod *)NIL; + int dolg = 0; ++ int isg = 1; + int vsize = -1; + BOOL bra; + BOOL nulflg; +@@ -362,6 +363,7 @@ + atflag = 1; + } + dolg = 1; ++ isg++; + c = 1; + } else if (digit(c)) { + c -= '0'; +@@ -622,7 +624,7 @@ + error(badsub); + } + } +- } else if (flags & setflg) { ++ } else if ((flags & setflg) && isg == 0) { + failed(id, unset); + } + goto retry; diff --git a/app-shells/schily-tools/schily-tools-2016.07.06.ebuild b/app-shells/schily-tools/schily-tools-2016.07.06.ebuild index 38477a61..77879a00 100644 --- a/app-shells/schily-tools/schily-tools-2016.07.06.ebuild +++ b/app-shells/schily-tools/schily-tools-2016.07.06.ebuild @@ -17,6 +17,8 @@ HOMEPAGE="https://sourceforge.net/projects/schilytools/" KEYWORDS="~amd64 ~x86" IUSE="acl caps static-libs system-libschily system-star xattr" +PATCHES=("$FILESDIR"/setuarg.patch) + add_iuse_expand() { local i j j=${1} @@ -151,7 +153,7 @@ targets() { continue;; esac mv -v UNUSED_TARGETS/??"${i}" TARGETS || die - targets=${targets}${targets:+ }${i} + targets=${targets}${targets:+\ }${i} done } diff --git a/app-shells/zsh-completions/zsh-completions-0.18.0.ebuild b/app-shells/zsh-completions/zsh-completions-0.18.0.ebuild index d56ebf5e..00da49ba 100644 --- a/app-shells/zsh-completions/zsh-completions-0.18.0.ebuild +++ b/app-shells/zsh-completions/zsh-completions-0.18.0.ebuild @@ -10,8 +10,8 @@ case ${PV} in EGIT_REPO_URI="git://github.com/zsh-users/${PN}.git" inherit git-r3 PROPERTIES="live" - KEYWORDS="" - SRC_URI="";; + KEYWORDS= + SRC_URI=;; *) LIVE=false #RESTRICT="mirror" @@ -25,10 +25,7 @@ DESCRIPTION="Additional completion definitions for Zsh" HOMEPAGE="https://gentoo.org/zsh-users/zsh-completions/" LICENSE="ZSH" SLOT="0" -if ${LIVE} -then DEPEND="" -else DEPEND="" -fi +DEPEND= IUSE="" declare -a FILES @@ -54,10 +51,10 @@ calculate_data() { case ${curr} in '+'*) curr="completion_${curr#?}" - IUSE="${IUSE}${IUSE:+ }+${curr}";; + IUSE=${IUSE}${IUSE:+\ }+${curr};; *) curr="completion_${curr}" - IUSE="${IUSE}${IUSE:+ }${curr}";; + IUSE=${IUSE}${IUSE:+\ }${curr};; esac for currfile in ${comp#* } do used_value currfile diff --git a/app-shells/zsh-completions/zsh-completions-99999999.ebuild b/app-shells/zsh-completions/zsh-completions-99999999.ebuild index d56ebf5e..429b307d 100644 --- a/app-shells/zsh-completions/zsh-completions-99999999.ebuild +++ b/app-shells/zsh-completions/zsh-completions-99999999.ebuild @@ -54,10 +54,10 @@ calculate_data() { case ${curr} in '+'*) curr="completion_${curr#?}" - IUSE="${IUSE}${IUSE:+ }+${curr}";; + IUSE=${IUSE}${IUSE:+\ }'+'${curr};; *) curr="completion_${curr}" - IUSE="${IUSE}${IUSE:+ }${curr}";; + IUSE=${IUSE}${IUSE:+\ }${curr};; esac for currfile in ${comp#* } do used_value currfile diff --git a/eclass/mv_mozextension-r1.eclass b/eclass/mv_mozextension-r1.eclass index 45178329..b50973d1 100644 --- a/eclass/mv_mozextension-r1.eclass +++ b/eclass/mv_mozextension-r1.eclass @@ -78,9 +78,12 @@ moz_phases() { OPTIND=1 while getopts 'cCn' opt do case ${opt} in - c) o=" -c";; - n) o=" -n";; - C) o=;; + c) + o=" -c";; + n) + o=" -n";; + C) + o=;; esac done shift $(( ${OPTIND} - 1 )) @@ -119,12 +122,12 @@ moz_rdepend() { esac case ${mode} in *s*) - rdep="${rdep}${rdep:+ }browser_${i}? ( www-client/${i} )" + rdep=${rdep}${rdep:+\ }"browser_${i}? ( www-client/${i} )" c=${c}a;; esac case ${mode} in *b*) - rdep="${rdep}${rdep:+ }browser_${i}-bin? ( www-client/${i}-bin )" + rdep=${rdep}${rdep:+\ }"browser_${i}-bin? ( www-client/${i}-bin )" c=${c}a;; esac done @@ -154,11 +157,11 @@ moz_iuse() { for i in firefox palemoon seamonkey do case "${*}" in *"${i}"?source*) - iuse="${iuse}${iuse:+ }browser_${i}";; + iuse=${iuse}${iuse:+\ }"browser_${i}";; *"${i}"?bin*) - iuse="${iuse}${iuse:+ }browser_${i}-bin";; + iuse=${iuse}${iuse:+\ }"browser_${i}-bin";; *"${i}"*) - iuse="${iuse}${iuse:+ }browser_${i} browser_${i}-bin";; + iuse=${iuse}${iuse:+\ }"browser_${i} browser_${i}-bin";; esac done [ -n "${iuse}" ] || die "args must be [firefox|palemoon|seamonkey][-source|-bin]" diff --git a/games-rpg/magus/magus-1.3.1.ebuild b/games-rpg/magus/magus-1.3.1.ebuild index bc8dcbfc..9db7ad09 100644 --- a/games-rpg/magus/magus-1.3.1.ebuild +++ b/games-rpg/magus/magus-1.3.1.ebuild @@ -42,9 +42,9 @@ add_type_to_iuse() { local t i t=${1} shift - REQUIRED_USE+=${REQUIRED_USE:+ }'^^ (' + REQUIRED_USE+=${REQUIRED_USE:+\ }'^^ (' for i - do IUSE+="${IUSE:+ }${t}_${i}" + do IUSE+=${IUSE:+\ }${t}_${i} REQUIRED_USE+=" ${t}_${i}" done REQUIRED_USE+=' )' diff --git a/games-rpg/magus/magus-1.3.3.ebuild b/games-rpg/magus/magus-1.3.3.ebuild index bc8dcbfc..9db7ad09 100644 --- a/games-rpg/magus/magus-1.3.3.ebuild +++ b/games-rpg/magus/magus-1.3.3.ebuild @@ -42,9 +42,9 @@ add_type_to_iuse() { local t i t=${1} shift - REQUIRED_USE+=${REQUIRED_USE:+ }'^^ (' + REQUIRED_USE+=${REQUIRED_USE:+\ }'^^ (' for i - do IUSE+="${IUSE:+ }${t}_${i}" + do IUSE+=${IUSE:+\ }${t}_${i} REQUIRED_USE+=" ${t}_${i}" done REQUIRED_USE+=' )' diff --git a/games-rpg/magus/magus-99999999.ebuild b/games-rpg/magus/magus-99999999.ebuild index bc8dcbfc..9db7ad09 100644 --- a/games-rpg/magus/magus-99999999.ebuild +++ b/games-rpg/magus/magus-99999999.ebuild @@ -42,9 +42,9 @@ add_type_to_iuse() { local t i t=${1} shift - REQUIRED_USE+=${REQUIRED_USE:+ }'^^ (' + REQUIRED_USE+=${REQUIRED_USE:+\ }'^^ (' for i - do IUSE+="${IUSE:+ }${t}_${i}" + do IUSE+=${IUSE:+\ }${t}_${i} REQUIRED_USE+=" ${t}_${i}" done REQUIRED_USE+=' )' diff --git a/media-tv/sundtek-tv/files/sundtek.initd b/media-tv/sundtek-tv/files/sundtek.initd index fb374f43..9faf7db2 100644 --- a/media-tv/sundtek-tv/files/sundtek.initd +++ b/media-tv/sundtek-tv/files/sundtek.initd @@ -6,12 +6,12 @@ description="sundtek TV mediaclient" set_preload() { yesno ${preload:-NO} || return 0 - LD_PRELOAD=${preload_lib:-/usr/lib}/libmediaclient.so${LD_PRELOAD:+ }${LD_PRELOAD-} + LD_PRELOAD=${preload_lib:-/usr/lib}/libmediaclient.so${LD_PRELOAD:+\ }${LD_PRELOAD-} export LD_PRELOAD } start() { - ebegin "Starting ${SVCNAME}" + ebegin "Starting $SVCNAME" ( set_preload /opt/bin/mediaclient --start=4 @@ -20,7 +20,7 @@ start() { } stop() { - ebegin "Stopping ${SVCNAME}" + ebegin "Stopping $SVCNAME" ( set_preload timeout -k "${killtime:-15}" "${termtime:-15}" /opt/bin/mediaclient --shutdown diff --git a/media-tv/sundtek-tv/sundtek-tv-160623.182622-r1.ebuild b/media-tv/sundtek-tv/sundtek-tv-160623.182622-r1.ebuild new file mode 100644 index 00000000..b1a0d784 --- /dev/null +++ b/media-tv/sundtek-tv/sundtek-tv-160623.182622-r1.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit linux-info pax-utils readme.gentoo-r1 systemd unpacker + +# The following variable is only for testing purposes. Leave it to "false" +keep_original=false + +DESCRIPTION="Sundtek MediaTV Pro III Drivers" +HOMEPAGE="http://support.sundtek.com/index.php/topic,2.0.html" +# Current version number can be found in http://sundtek.de/media/latest.phtml +SRC_URI="http://www.sundtek.de/media/sundtek_installer_${PV}.sh" + +RESTRICT="binchecks mirror strip" +LICENSE="sundtek" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="ld-preload-env +ld-preload-file pax_kernel" +RDEPEND="!"${mypkgconfig}/libmedia.pc" || die + sed -i -e "s#/opt#${EPREFIX}/${mybinprefix}#" \ + etc/udev/rules.d/*.rules 1/doc/*.service sundtek.initd || die + ! test -r etc/udev/rules.d/80-mediasrv-eeti.rules || + sed -i -e "s/^\([^#]\)/#\1/" etc/udev/rules.d/80-mediasrv-eeti.rules \ + || die + mv etc/udev/rules.d/80-mediasrv.rules etc/hal . || die + mv etc/udev "${myudev}" || die + mv 1/doc/hardware.conf 1/doc/sundtek.conf "${mylirc}" || die + rm 1/doc/lirc_install.sh 1/doc/libmedia.pc || die + mv 1/doc/*.service "${S}" || die + mkdir "${S}/doc" && mkdir "${S}/doc/bin" || die + mv 1/doc/README 1/doc/*.conf "${S}/doc" || die + mv 1/doc/*.cgi "${S}/doc/bin" || die + rm etc/ld.so.conf.d/optlib.conf && rmdir etc/ld.so.conf.d || die + rmdir 1/doc || die "${S}/1/doc contains files not known to the ebuild" + rmdir 1 || die "${S}/1 contains files not known to the ebuild" + my_movlibdir "${mylibdir}" + mkdir etc/revdep-rebuild || die + echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${mybinprefix}/bin/audio/libpulse.so\"" \ + >etc/revdep-rebuild/50-sundtek-tv + if use ld-preload-file + then echo "/${mylibdir}/libmediaclient.so" >etc/ld.so.preload + else sed -i -e 's/preload:-NO/preload:-YES/' sundtek.initd + fi + sed -i -e "s'preload_lib:-/usr/lib'preload_lib:-/${mylibdir}'" sundtek.initd + if use ld-preload-env + then mkdir etc/env.d + echo "LD_PRELOAD=\"/${mylibdir}/libmediaclient.so\"" >etc/env.d/50sundtek-tv + fi + DOC_CONTENTS="${DOC_CONTENTS} +You have to put /${mylibdir}/libmediaclient.so into /etc/ld.so.preload +or to export LD_PRELOAD=\"/${mylibdir}/libmediaclient.so\" +before you start a multimedia applications like mplayer or mpv which should +be able to access the sundtek device. + +This happens with USE=ld-preload-file or with ld-preload-env (in the global +environment), respectively. + +However, such a global setting in some cases this gives warnings when +32-bit applications are used. + +Thus, it might be a good idea to do it only locally by writing +corresponding wrapper scripts for those multimedia applications you +want to use with sundtek-tv. +" + ln -sfn mediaclient.video mediaclient.audio + ln -sfn mediaclient.video mediaclient.dvb + eapply_user +} + +src_install() { + insinto / + local i + for i in etc lib64 lib32 lib usr opt + do test -d "${i}" && mv -- "${i}" "${ED}" + done + for i in "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) "${ED}"/opt + do test -d "${i}" && chmod -R 755 "${i}" + done + if ! ${keep_original} + then newinitd sundtek.initd sundtek + systemd_dounit *.service + dodoc doc/README doc/*.conf + mv -- doc/bin "${ED}/usr/share/doc/${PF}" || die + docompress -x "/usr/share/doc/${PF}/bin" + fi + dobin mediaclient.video + insinto /usr/bin + doins mediaclient.dvb mediaclient.audio + insinto /usr/share/zsh/site-functions + doins _mediaclient + readme.gentoo_create_doc +} + +pkg_pretend() { + local CONFIG_CHECK="~INPUT_UINPUT" + check_extra_config +} + +pkg_postinst() { + einfo "Adding root to the audio group" + usermod -aG audio root || { + ewarn "Could not add root to the audio group." + ewarn "You should do this manually if you have problems with sound" + } + false chmod 6111 "${EPREFIX}/opt/bin/mediasrv" || \ + elog "You might need to chmod 6111 ${EPREFIX}/opt/bin/mediasrv" + if ! use ld-preload-file + then if use ld-preload-env + then elog "You might have to call env-update and source /etc/profile" + else elog "You need to set LD_PRELOAD locally, see" + elog "${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" + fi + fi + readme.gentoo_print_elog +} diff --git a/media-tv/sundtek-tv/sundtek-tv-160623.182622.ebuild b/media-tv/sundtek-tv/sundtek-tv-160623.182622.ebuild deleted file mode 100644 index b1a0d784..00000000 --- a/media-tv/sundtek-tv/sundtek-tv-160623.182622.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -inherit linux-info pax-utils readme.gentoo-r1 systemd unpacker - -# The following variable is only for testing purposes. Leave it to "false" -keep_original=false - -DESCRIPTION="Sundtek MediaTV Pro III Drivers" -HOMEPAGE="http://support.sundtek.com/index.php/topic,2.0.html" -# Current version number can be found in http://sundtek.de/media/latest.phtml -SRC_URI="http://www.sundtek.de/media/sundtek_installer_${PV}.sh" - -RESTRICT="binchecks mirror strip" -LICENSE="sundtek" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="ld-preload-env +ld-preload-file pax_kernel" -RDEPEND="!"${mypkgconfig}/libmedia.pc" || die - sed -i -e "s#/opt#${EPREFIX}/${mybinprefix}#" \ - etc/udev/rules.d/*.rules 1/doc/*.service sundtek.initd || die - ! test -r etc/udev/rules.d/80-mediasrv-eeti.rules || - sed -i -e "s/^\([^#]\)/#\1/" etc/udev/rules.d/80-mediasrv-eeti.rules \ - || die - mv etc/udev/rules.d/80-mediasrv.rules etc/hal . || die - mv etc/udev "${myudev}" || die - mv 1/doc/hardware.conf 1/doc/sundtek.conf "${mylirc}" || die - rm 1/doc/lirc_install.sh 1/doc/libmedia.pc || die - mv 1/doc/*.service "${S}" || die - mkdir "${S}/doc" && mkdir "${S}/doc/bin" || die - mv 1/doc/README 1/doc/*.conf "${S}/doc" || die - mv 1/doc/*.cgi "${S}/doc/bin" || die - rm etc/ld.so.conf.d/optlib.conf && rmdir etc/ld.so.conf.d || die - rmdir 1/doc || die "${S}/1/doc contains files not known to the ebuild" - rmdir 1 || die "${S}/1 contains files not known to the ebuild" - my_movlibdir "${mylibdir}" - mkdir etc/revdep-rebuild || die - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${mybinprefix}/bin/audio/libpulse.so\"" \ - >etc/revdep-rebuild/50-sundtek-tv - if use ld-preload-file - then echo "/${mylibdir}/libmediaclient.so" >etc/ld.so.preload - else sed -i -e 's/preload:-NO/preload:-YES/' sundtek.initd - fi - sed -i -e "s'preload_lib:-/usr/lib'preload_lib:-/${mylibdir}'" sundtek.initd - if use ld-preload-env - then mkdir etc/env.d - echo "LD_PRELOAD=\"/${mylibdir}/libmediaclient.so\"" >etc/env.d/50sundtek-tv - fi - DOC_CONTENTS="${DOC_CONTENTS} -You have to put /${mylibdir}/libmediaclient.so into /etc/ld.so.preload -or to export LD_PRELOAD=\"/${mylibdir}/libmediaclient.so\" -before you start a multimedia applications like mplayer or mpv which should -be able to access the sundtek device. - -This happens with USE=ld-preload-file or with ld-preload-env (in the global -environment), respectively. - -However, such a global setting in some cases this gives warnings when -32-bit applications are used. - -Thus, it might be a good idea to do it only locally by writing -corresponding wrapper scripts for those multimedia applications you -want to use with sundtek-tv. -" - ln -sfn mediaclient.video mediaclient.audio - ln -sfn mediaclient.video mediaclient.dvb - eapply_user -} - -src_install() { - insinto / - local i - for i in etc lib64 lib32 lib usr opt - do test -d "${i}" && mv -- "${i}" "${ED}" - done - for i in "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) "${ED}"/opt - do test -d "${i}" && chmod -R 755 "${i}" - done - if ! ${keep_original} - then newinitd sundtek.initd sundtek - systemd_dounit *.service - dodoc doc/README doc/*.conf - mv -- doc/bin "${ED}/usr/share/doc/${PF}" || die - docompress -x "/usr/share/doc/${PF}/bin" - fi - dobin mediaclient.video - insinto /usr/bin - doins mediaclient.dvb mediaclient.audio - insinto /usr/share/zsh/site-functions - doins _mediaclient - readme.gentoo_create_doc -} - -pkg_pretend() { - local CONFIG_CHECK="~INPUT_UINPUT" - check_extra_config -} - -pkg_postinst() { - einfo "Adding root to the audio group" - usermod -aG audio root || { - ewarn "Could not add root to the audio group." - ewarn "You should do this manually if you have problems with sound" - } - false chmod 6111 "${EPREFIX}/opt/bin/mediasrv" || \ - elog "You might need to chmod 6111 ${EPREFIX}/opt/bin/mediasrv" - if ! use ld-preload-file - then if use ld-preload-env - then elog "You might have to call env-update and source /etc/profile" - else elog "You need to set LD_PRELOAD locally, see" - elog "${EPREFIX}/usr/share/doc/${PF}/README.gentoo*" - fi - fi - readme.gentoo_print_elog -} diff --git a/media-video/video-mv/Manifest b/media-video/video-mv/Manifest index 94708fd7..a4b02dac 100644 --- a/media-video/video-mv/Manifest +++ b/media-video/video-mv/Manifest @@ -1 +1 @@ -DIST video-mv-9.2.tar.gz 18384 SHA256 e01f8e24ecb391781e7f9ae4db28129fca6e6253861356cf2bbfdf8772b1bfa7 +DIST video-mv-9.3.tar.gz 18396 SHA256 c8091625389ce4fc1c6e23af3cccad1076221a464dc8a835c85141139685a5e6 diff --git a/media-video/video-mv/video-mv-9.2.ebuild b/media-video/video-mv/video-mv-9.2.ebuild deleted file mode 100644 index dddaad74..00000000 --- a/media-video/video-mv/video-mv-9.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -RESTRICT="mirror" -inherit eutils readme.gentoo-r1 - -DESCRIPTION="Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder" -HOMEPAGE="https://github.com/vaeth/video-mv/" -SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="app-shells/push - >=app-shells/runtitle-2.3 - || ( ( media-sound/alsa-utils - || ( media-video/mplayer[encode] virtual/ffmpeg ) ) - media-tv/linuxtv-dvb-apps )" -DEPEND="" - -DISABLE_AUTOFORMATTING="true" -DOC_CONTENTS="If you use dvb-t with zsh completion, you might want to put -zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' -into your ~/.zshrc or /etc/zshrc for case-insensitive matching." - -src_prepare() { - local i - use prefix || for i in bin/* - do test -h "${i}" || sed -i \ - -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ - -e 's"^\. _videoscript\.sh$". '"${EPREFIX}/usr/share/video-mv/_videoscript.sh"'"' \ - -- "${i}" || die - done - eapply_user -} - -src_install() { - local i - insinto /usr/bin - for i in bin/* - do if test -h "${i}" - then doins "${i}" - elif [ "${i#*/}" != '_videoscript.sh' ] - then dobin "${i}" - fi - done - insinto /usr/share/video-mv - doins bin/_videoscript.sh - insinto /etc - doins etc/* - insinto /usr/share/zsh/site-functions - doins zsh/* - dodoc README - readme.gentoo_create_doc -} - -pkg_postinst() { - optfeature "status bar support" app-shells/runtitle - readme.gentoo_print_elog -} diff --git a/media-video/video-mv/video-mv-9.3.ebuild b/media-video/video-mv/video-mv-9.3.ebuild new file mode 100644 index 00000000..dddaad74 --- /dev/null +++ b/media-video/video-mv/video-mv-9.3.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +RESTRICT="mirror" +inherit eutils readme.gentoo-r1 + +DESCRIPTION="Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder" +HOMEPAGE="https://github.com/vaeth/video-mv/" +SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RDEPEND="app-shells/push + >=app-shells/runtitle-2.3 + || ( ( media-sound/alsa-utils + || ( media-video/mplayer[encode] virtual/ffmpeg ) ) + media-tv/linuxtv-dvb-apps )" +DEPEND="" + +DISABLE_AUTOFORMATTING="true" +DOC_CONTENTS="If you use dvb-t with zsh completion, you might want to put +zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' +into your ~/.zshrc or /etc/zshrc for case-insensitive matching." + +src_prepare() { + local i + use prefix || for i in bin/* + do test -h "${i}" || sed -i \ + -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ + -e 's"^\. _videoscript\.sh$". '"${EPREFIX}/usr/share/video-mv/_videoscript.sh"'"' \ + -- "${i}" || die + done + eapply_user +} + +src_install() { + local i + insinto /usr/bin + for i in bin/* + do if test -h "${i}" + then doins "${i}" + elif [ "${i#*/}" != '_videoscript.sh' ] + then dobin "${i}" + fi + done + insinto /usr/share/video-mv + doins bin/_videoscript.sh + insinto /etc + doins etc/* + insinto /usr/share/zsh/site-functions + doins zsh/* + dodoc README + readme.gentoo_create_doc +} + +pkg_postinst() { + optfeature "status bar support" app-shells/runtitle + readme.gentoo_print_elog +} diff --git a/net-firewall/firewall-mv/Manifest b/net-firewall/firewall-mv/Manifest index a92bd193..030a5fe9 100644 --- a/net-firewall/firewall-mv/Manifest +++ b/net-firewall/firewall-mv/Manifest @@ -1 +1 @@ -DIST firewall-mv-9.1.tar.gz 16109 SHA256 f71dc8972b90aee155dcc3f1ae6563e20390ca9f8fff7eda72ed0559afe15a3c +DIST firewall-mv-9.2.tar.gz 16115 SHA256 3cc07be944f411dd9143de8c4665537bf02c4f3da79cc1f265bb96959adcde25 diff --git a/net-firewall/firewall-mv/firewall-mv-9.1.ebuild b/net-firewall/firewall-mv/firewall-mv-9.1.ebuild deleted file mode 100644 index e86df95e..00000000 --- a/net-firewall/firewall-mv/firewall-mv-9.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -RESTRICT="mirror" -inherit systemd - -DESCRIPTION="Initialize iptables and net-related sysctl variables" -HOMEPAGE="https://github.com/vaeth/firewall-mv/" -SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RDEPEND="!