net-mail/notmuch: die if Makefile.config could not be removed

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/net-mail/notmuch/notmuch-0.19-r1.ebuild b/net-mail/notmuch/notmuch-0.19-r1.ebuild
index 34efaeec7fd0b7d85e146ebb0adbfb7faeb85c42..c31a9fa2cf5bd4e13b5832c701e4536b23217614 100644 (file)
--- a/net-mail/notmuch/notmuch-0.19-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -102,7 +102,8 @@ src_prepare() {
        bindings python mv README README-python || die
        mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-       rm -f Makefile.config # assure that new Makefile.config will be generated
+       # assure that new Makefile.config will be generated
+       rm -f Makefile.config || die
 
        if use debug; then
                append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.20.2.ebuild b/net-mail/notmuch/notmuch-0.20.2.ebuild
index 71b668089ded2ace296242f101b049eb17b8d8a7..66ecf2e81c6972b765106cff2b39fbfbb53717b6 100644 (file)
--- a/net-mail/notmuch/notmuch-0.20.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -98,7 +98,8 @@ src_prepare() {
        bindings python mv README README-python || die
        mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-       rm -f Makefile.config # assure that new Makefile.config will be generated
+       # assure that new Makefile.config will be generated
+       rm -f Makefile.config || die
 
        if use debug; then
                append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
index 1facfdfbe616fa390851c9ad0b9583eb15d2405b..6cbb13aeba3bf5ba640a8fb6aa8ad8e79598b8d5 100644 (file)
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -98,7 +98,8 @@ src_prepare() {
        bindings python mv README README-python || die
        mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-       rm -f Makefile.config # assure that new Makefile.config will be generated
+       # assure that new Makefile.config will be generated
+       rm -f Makefile.config || die
 
        if use debug; then
                append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
index e699bdb1886506ff3f8fd83a4315d54f0b66a1de..7f0ade722abec4e4895099efd50583838ccc125f 100644 (file)
--- a/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.22.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -105,7 +105,8 @@ src_prepare() {
        bindings python mv README README-python || die
        mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-       rm -f Makefile.config # assure that new Makefile.config will be generated
+       # assure that new Makefile.config will be generated
+       rm -f Makefile.config || die
 
        if use test; then
                append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.23.3.ebuild b/net-mail/notmuch/notmuch-0.23.3.ebuild
index d2276a44ba3b81717736cf926e9a42f6dd9ca4c8..8a372a99c338cd2ad554302834cb9aa89877523a 100644 (file)
--- a/net-mail/notmuch/notmuch-0.23.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -105,7 +105,8 @@ src_prepare() {
        bindings python mv README README-python || die
        mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-       rm -f Makefile.config # assure that new Makefile.config will be generated
+       # assure that new Makefile.config will be generated
+       rm -f Makefile.config || die
 
        if use test; then
                append-cflags -g

diff --git a/net-mail/notmuch/notmuch-0.23.4.ebuild b/net-mail/notmuch/notmuch-0.23.4.ebuild
index 49aefbf3285f108d91a3e676523d26af5b6eb287..b448318b12559b3232e27fb5e6b4e1a220de2dc7 100644 (file)
--- a/net-mail/notmuch/notmuch-0.23.4.ebuild
+++ b/net-mail/notmuch/notmuch-0.23.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -105,7 +105,8 @@ src_prepare() {
        bindings python mv README README-python || die
        mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die
 
-       rm -f Makefile.config # assure that new Makefile.config will be generated
+       # assure that new Makefile.config will be generated
+       rm -f Makefile.config || die
 
        if use test; then
                append-cflags -g