summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2014-06-14 11:03:42 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2014-06-14 11:03:42 +0000
commit19c7399c288710f52f65498e84c1dff9022bd1ea (patch)
treee71a868c7f0d23481ba6cf16744ec4b18d2cc6b9 /media-radio
parentOld. (diff)
downloadgentoo-2-19c7399c288710f52f65498e84c1dff9022bd1ea.tar.gz
gentoo-2-19c7399c288710f52f65498e84c1dff9022bd1ea.tar.bz2
gentoo-2-19c7399c288710f52f65498e84c1dff9022bd1ea.zip
Add missing '|| die' (bug 507926). thanks nimiux
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)
Diffstat (limited to 'media-radio')
-rw-r--r--media-radio/qsstv/ChangeLog6
-rw-r--r--media-radio/qsstv/qsstv-7.1.7.ebuild9
-rw-r--r--media-radio/qsstv/qsstv-8.1.14.ebuild5
-rw-r--r--media-radio/qsstv/qsstv-8.1.17.ebuild5
-rw-r--r--media-radio/qsstv/qsstv-8.2.7.ebuild5
5 files changed, 19 insertions, 11 deletions
diff --git a/media-radio/qsstv/ChangeLog b/media-radio/qsstv/ChangeLog
index 45a85b2bcca4..af80025bdc35 100644
--- a/media-radio/qsstv/ChangeLog
+++ b/media-radio/qsstv/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-radio/qsstv
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/ChangeLog,v 1.20 2014/06/14 09:29:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/ChangeLog,v 1.21 2014/06/14 11:03:42 tomjbe Exp $
+
+ 14 Jun 2014; Thomas Beierlein <tomjbe@gentoo.org> qsstv-7.1.7.ebuild,
+ qsstv-8.1.14.ebuild, qsstv-8.1.17.ebuild, qsstv-8.2.7.ebuild:
+ Add missing '|| die' (bug 507926). thanks nimiux
14 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> qsstv-8.1.17.ebuild:
x86 stable wrt bug #507926
diff --git a/media-radio/qsstv/qsstv-7.1.7.ebuild b/media-radio/qsstv/qsstv-7.1.7.ebuild
index d930677baacf..3813a15b3825 100644
--- a/media-radio/qsstv/qsstv-7.1.7.ebuild
+++ b/media-radio/qsstv/qsstv-7.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-7.1.7.ebuild,v 1.6 2013/03/02 21:51:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-7.1.7.ebuild,v 1.7 2014/06/14 11:03:42 tomjbe Exp $
EAPI=4
@@ -31,8 +31,9 @@ src_prepare() {
sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
-e "s:local/bin:/bin:" \
-e "s:target.extra:#target.extra:" \
- -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" src/src.pro
- sed -i -e "s:doc/qsstv:doc/${PF}:" src/configdialog.cpp
+ -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
+ src/src.pro || die
+ sed -i -e "s:doc/qsstv:doc/${PF}:" src/configdialog.cpp || die
# add missing #includes for gcc-4.7 (bug # 427486)
epatch "${FILESDIR}"/${P}-gcc-47.patch
}
diff --git a/media-radio/qsstv/qsstv-8.1.14.ebuild b/media-radio/qsstv/qsstv-8.1.14.ebuild
index 476a6681b0e8..770096d754f1 100644
--- a/media-radio/qsstv/qsstv-8.1.14.ebuild
+++ b/media-radio/qsstv/qsstv-8.1.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.1.14.ebuild,v 1.2 2014/03/10 14:30:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.1.14.ebuild,v 1.3 2014/06/14 11:03:42 tomjbe Exp $
EAPI=5
@@ -31,5 +31,6 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
# fix docdirectory, install path and hamlib search path
sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
- -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" qsstv_8.pro
+ -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
+ qsstv_8.pro || die
}
diff --git a/media-radio/qsstv/qsstv-8.1.17.ebuild b/media-radio/qsstv/qsstv-8.1.17.ebuild
index 1f0d2219ec8f..d801c5936a61 100644
--- a/media-radio/qsstv/qsstv-8.1.17.ebuild
+++ b/media-radio/qsstv/qsstv-8.1.17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.1.17.ebuild,v 1.3 2014/06/14 09:29:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.1.17.ebuild,v 1.4 2014/06/14 11:03:42 tomjbe Exp $
EAPI=5
@@ -31,5 +31,6 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
# fix docdirectory, install path and hamlib search path
sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
- -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" qsstv_8.pro
+ -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
+ qsstv_8.pro || die
}
diff --git a/media-radio/qsstv/qsstv-8.2.7.ebuild b/media-radio/qsstv/qsstv-8.2.7.ebuild
index c7fac868b0b2..5a1297e70175 100644
--- a/media-radio/qsstv/qsstv-8.2.7.ebuild
+++ b/media-radio/qsstv/qsstv-8.2.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.2.7.ebuild,v 1.1 2014/04/17 16:59:53 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.2.7.ebuild,v 1.2 2014/06/14 11:03:42 tomjbe Exp $
EAPI=5
@@ -31,5 +31,6 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
# fix docdirectory, install path and hamlib search path
sed -i -e "s:/doc/\$\$TARGET:/doc/${PF}:" \
- -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" qsstv_8.pro
+ -e "s:-lhamlib:-L/usr/$(get_libdir)/hamlib -lhamlib:g" \
+ qsstv_8.pro || die
}