From 49226624914539cfc68377dd98a61b7f65bf88d5 Mon Sep 17 00:00:00 2001
From: Martin Väth <martin@mvath.de>
Date: Tue, 17 Dec 2013 22:36:50 +0100
Subject: Fix paths of binaries and of sourced scripts

---
 media-video/video-mv/ChangeLog               |  6 +++
 media-video/video-mv/video-mv-7.13-r1.ebuild | 64 ++++++++++++++++++++++++++++
 media-video/video-mv/video-mv-7.13.ebuild    | 60 --------------------------
 3 files changed, 70 insertions(+), 60 deletions(-)
 create mode 100644 media-video/video-mv/video-mv-7.13-r1.ebuild
 delete mode 100644 media-video/video-mv/video-mv-7.13.ebuild

(limited to 'media-video')

diff --git a/media-video/video-mv/ChangeLog b/media-video/video-mv/ChangeLog
index 92165b8a..5b7b9f24 100644
--- a/media-video/video-mv/ChangeLog
+++ b/media-video/video-mv/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*video-mv-7.13-r1 (17 Dec 2013)
+
+  17 Dec 2013; Martin Väth <martin@mvath.de>:
+  _videoscript.sh -> /usr/share/video-mv: not meant to be called by the user.
+  Fix sh path
+
 *video-mv-7.13 (09 Dec 2013)
 
   09 Dec 2013; Martin Väth <martin@mvath.de>:
diff --git a/media-video/video-mv/video-mv-7.13-r1.ebuild b/media-video/video-mv/video-mv-7.13-r1.ebuild
new file mode 100644
index 00000000..1ca10991
--- /dev/null
+++ b/media-video/video-mv/video-mv-7.13-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+RESTRICT="mirror"
+inherit eutils readme.gentoo vcs-snapshot
+
+DESCRIPTION="Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder"
+HOMEPAGE="https://github.com/vaeth/video-mv/"
+SRC_URI="http://github.com/vaeth/${PN}/tarball/${PV} -> ${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
+	epatch_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_src_install
+}
+
+pkg_postinst() {
+	has_version app-shells/runtitle || elog \
+		"Install app-shells/runtitle to let ${PN} update the status bar"
+	readme.gentoo_pkg_postinst
+}
diff --git a/media-video/video-mv/video-mv-7.13.ebuild b/media-video/video-mv/video-mv-7.13.ebuild
deleted file mode 100644
index 662424fa..00000000
--- a/media-video/video-mv/video-mv-7.13.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-RESTRICT="mirror"
-inherit eutils readme.gentoo vcs-snapshot
-
-DESCRIPTION="Frontends for using mplayer/mencoder, ffmpeg/libav, or tzap as video recorder"
-HOMEPAGE="https://github.com/vaeth/video-mv/"
-SRC_URI="http://github.com/vaeth/${PN}/tarball/${PV} -> ${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$"#!'"$(command -v sh)"'"' -- "${i}" \
-			|| die
-	done
-	epatch_user
-}
-
-src_install() {
-	local i
-	insinto /usr/bin
-	for i in bin/*
-	do	if test -h "${i}" || ! test -x "${i}"
-		then	doins "${i}"
-		else	dobin "${i}"
-		fi
-	done
-	insinto /etc
-	doins etc/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/*
-	dodoc README
-	readme.gentoo_src_install
-}
-
-pkg_postinst() {
-	has_version app-shells/runtitle || elog \
-		"Install app-shells/runtitle to let ${PN} update the status bar"
-	readme.gentoo_pkg_postinst
-}
-- 
cgit v1.2.3-65-gdbad