tomjbe 14/06/14 11:03:43 Modified: qsstv-7.1.7.ebuild ChangeLog qsstv-8.1.17.ebuild qsstv-8.1.14.ebuild qsstv-8.2.7.ebuild Log: Add missing '|| die' (bug 507926). thanks nimiux (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x762053D5)
Revision Changes Path 1.7 media-radio/qsstv/qsstv-7.1.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-7.1.7.ebuild?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-7.1.7.ebuild?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-7.1.7.ebuild?r1=1.6&r2=1.7 Index: qsstv-7.1.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-7.1.7.ebuild,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qsstv-7.1.7.ebuild 2 Mar 2013 21:51:45 -0000 1.6 +++ qsstv-7.1.7.ebuild 14 Jun 2014 11:03:42 -0000 1.7 @@ -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 @@ 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 } 1.21 media-radio/qsstv/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/ChangeLog?rev=1.21&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/ChangeLog?rev=1.21&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/ChangeLog?r1=1.20&r2=1.21 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-radio/qsstv/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ChangeLog 14 Jun 2014 09:29:05 -0000 1.20 +++ ChangeLog 14 Jun 2014 11:03:42 -0000 1.21 @@ -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 <tom...@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...@gentoo.org> qsstv-8.1.17.ebuild: x86 stable wrt bug #507926 1.4 media-radio/qsstv/qsstv-8.1.17.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.1.17.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.1.17.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.1.17.ebuild?r1=1.3&r2=1.4 Index: qsstv-8.1.17.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.1.17.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qsstv-8.1.17.ebuild 14 Jun 2014 09:29:05 -0000 1.3 +++ qsstv-8.1.17.ebuild 14 Jun 2014 11:03:42 -0000 1.4 @@ -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 @@ 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 } 1.3 media-radio/qsstv/qsstv-8.1.14.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.1.14.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.1.14.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.1.14.ebuild?r1=1.2&r2=1.3 Index: qsstv-8.1.14.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.1.14.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qsstv-8.1.14.ebuild 10 Mar 2014 14:30:21 -0000 1.2 +++ qsstv-8.1.14.ebuild 14 Jun 2014 11:03:42 -0000 1.3 @@ -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 @@ 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 } 1.2 media-radio/qsstv/qsstv-8.2.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.2.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.2.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-radio/qsstv/qsstv-8.2.7.ebuild?r1=1.1&r2=1.2 Index: qsstv-8.2.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-radio/qsstv/qsstv-8.2.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qsstv-8.2.7.ebuild 17 Apr 2014 16:59:53 -0000 1.1 +++ qsstv-8.2.7.ebuild 14 Jun 2014 11:03:42 -0000 1.2 @@ -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 @@ 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 }