projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c92912a)
dev-lang/mercury: Use ecvs_clean to clean workdir
authorJustin Lecher <jlec@gentoo.org>
Fri, 22 Jan 2016 19:00:56 +0000 (20:00 +0100)
committerJustin Lecher <jlec@gentoo.org>
Fri, 22 Jan 2016 21:03:03 +0000 (22:03 +0100)
* add missing die

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec@gentoo.org>
dev-lang/mercury/mercury-11.01.ebuild patch | blob | history
dev-lang/mercury/mercury-11.07.1.ebuild patch | blob | history
dev-lang/mercury/mercury-11.07.2.ebuild patch | blob | history
dev-lang/mercury/mercury-11.07.ebuild patch | blob | history
dev-lang/mercury/mercury-13.05.1.ebuild patch | blob | history
dev-lang/mercury/mercury-13.05.2.ebuild patch | blob | history
dev-lang/mercury/mercury-13.05.ebuild patch | blob | history
dev-lang/mercury/metadata.xml patch | blob | history

diff --git a/dev-lang/mercury/mercury-11.01.ebuild b/dev-lang/mercury/mercury-11.01.ebuild
index bb7c875926c4c034b738feb2f38ea9552968ddb7..f8f9bc74e90dac9e6ab0860db0e33dc587f163ec 100644 (file)
--- a/dev-lang/mercury/mercury-11.01.ebuild
+++ b/dev-lang/mercury/mercury-11.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-       cd "${WORKDIR}"
+       cd "${WORKDIR}" || die
        EPATCH_FORCE=yes
        EPATCH_SUFFIX=patch
        epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
                epatch "${WORKDIR}"/${PV}-tests
        fi
 
-       cd "${S}"
+       cd "${S}" || die
        eautoconf
 }
 
@@ -132,7 +132,7 @@ src_test() {
                TWS="${S}"
        fi
 
-       cd "${TESTDIR}"
+       cd "${TESTDIR}" || die
        sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
                || die "sed WORKSPACE failed"
 
@@ -202,8 +202,7 @@ src_install() {
                        doins -r samples/java_interface || die
                fi
 
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
+               ecvs_clean "${D}"/usr/share/doc/${PF}/samples
        fi
 }
 
diff --git a/dev-lang/mercury/mercury-11.07.1.ebuild b/dev-lang/mercury/mercury-11.07.1.ebuild
index fbc3732e2913fc2576988da7c8126e69991b999a..f143a22674d5adc93e44364e6a61fa1baeea36b8 100644 (file)
--- a/dev-lang/mercury/mercury-11.07.1.ebuild
+++ b/dev-lang/mercury/mercury-11.07.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-       cd "${WORKDIR}"
+       cd "${WORKDIR}" || die
        EPATCH_FORCE=yes
        EPATCH_SUFFIX=patch
        epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
                epatch "${WORKDIR}"/${PV}-tests
        fi
 
-       cd "${S}"
+       cd "${S}" || die
        eautoconf
 }
 
@@ -132,7 +132,7 @@ src_test() {
                TWS="${S}"
        fi
 
-       cd "${TESTDIR}"
+       cd "${TESTDIR}" || die
        sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
                || die "sed WORKSPACE failed"
 
@@ -202,8 +202,7 @@ src_install() {
                        doins -r samples/java_interface || die
                fi
 
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
+               ecvs_clean "${D}"/usr/share/doc/${PF}/samples
        fi
 }
 
diff --git a/dev-lang/mercury/mercury-11.07.2.ebuild b/dev-lang/mercury/mercury-11.07.2.ebuild
index 9d8b6487a7e2afaafdceb721306d58eb5cb23ff1..74cb440ab3c23ed38961fac0aa332ac0b9b490fc 100644 (file)
--- a/dev-lang/mercury/mercury-11.07.2.ebuild
+++ b/dev-lang/mercury/mercury-11.07.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-       cd "${WORKDIR}"
+       cd "${WORKDIR}" || die
        EPATCH_FORCE=yes
        EPATCH_SUFFIX=patch
        epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
                epatch "${WORKDIR}"/${PV}-tests
        fi
 
-       cd "${S}"
+       cd "${S}" || die
        eautoconf
 }
 
@@ -132,7 +132,7 @@ src_test() {
                TWS="${S}"
        fi
 
-       cd "${TESTDIR}"
+       cd "${TESTDIR}" || die
        sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
                || die "sed WORKSPACE failed"
 
@@ -202,8 +202,7 @@ src_install() {
                        doins -r samples/java_interface || die
                fi
 
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
+               ecvs_clean "${D}"/usr/share/doc/${PF}/samples
        fi
 }
 
diff --git a/dev-lang/mercury/mercury-11.07.ebuild b/dev-lang/mercury/mercury-11.07.ebuild
index 2792e67fc65222e5435b812cc1451c284315f7f3..6883d4424fce8d316ff44b93d6a90d70a6e1a3f6 100644 (file)
--- a/dev-lang/mercury/mercury-11.07.ebuild
+++ b/dev-lang/mercury/mercury-11.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -36,7 +36,7 @@ TESTDIR="${WORKDIR}"/${PN}-tests-${PV}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-       cd "${WORKDIR}"
+       cd "${WORKDIR}" || die
        EPATCH_FORCE=yes
        EPATCH_SUFFIX=patch
        epatch "${WORKDIR}"/${PV}
@@ -49,7 +49,7 @@ src_prepare() {
                epatch "${WORKDIR}"/${PV}-tests
        fi
 
-       cd "${S}"
+       cd "${S}" || die
        eautoconf
 }
 
@@ -132,7 +132,7 @@ src_test() {
                TWS="${S}"
        fi
 
-       cd "${TESTDIR}"
+       cd "${TESTDIR}" || die
        sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws \
                || die "sed WORKSPACE failed"
 
@@ -202,8 +202,7 @@ src_install() {
                        doins -r samples/java_interface || die
                fi
 
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
+               ecvs_clean "${D}"/usr/share/doc/${PF}/samples
        fi
 }
 
diff --git a/dev-lang/mercury/mercury-13.05.1.ebuild b/dev-lang/mercury/mercury-13.05.1.ebuild
index c0fcf9dd7b207189f3a4e14f40d0a005820d16f6..44f38dcacd4865979439e5cedcbd15f562d566ec 100644 (file)
--- a/dev-lang/mercury/mercury-13.05.1.ebuild
+++ b/dev-lang/mercury/mercury-13.05.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,7 +34,7 @@ S="${WORKDIR}"/${MY_P}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-       cd "${WORKDIR}"
+       cd "${WORKDIR}" || die
        EPATCH_FORCE=yes
        EPATCH_SUFFIX=patch
        epatch "${WORKDIR}"/${PV}
@@ -43,7 +43,7 @@ src_prepare() {
                "${S}"/scripts/Mmake.vars.in \
                || die "sed libdir failed"
 
-       cd "${S}"
+       cd "${S}" || die
        eautoconf
 }
 
@@ -117,7 +117,7 @@ src_test() {
                TWS="${S}"
        fi
 
-       cd "${S}"/tests
+       cd "${S}"/tests || die
        sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
                || die "sed WORKSPACE failed"
 
@@ -183,8 +183,7 @@ src_install() {
                        doins -r samples/java_interface || die
                fi
 
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
+               ecvs_clean "${D}"/usr/share/doc/${PF}/samples
        fi
 }
 
diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild
index c82ce14cb01c9a62c88978124d297c74603ca30f..44f38dcacd4865979439e5cedcbd15f562d566ec 100644 (file)
--- a/dev-lang/mercury/mercury-13.05.2.ebuild
+++ b/dev-lang/mercury/mercury-13.05.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,7 +34,7 @@ S="${WORKDIR}"/${MY_P}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-       cd "${WORKDIR}"
+       cd "${WORKDIR}" || die
        EPATCH_FORCE=yes
        EPATCH_SUFFIX=patch
        epatch "${WORKDIR}"/${PV}
@@ -43,7 +43,7 @@ src_prepare() {
                "${S}"/scripts/Mmake.vars.in \
                || die "sed libdir failed"
 
-       cd "${S}"
+       cd "${S}" || die
        eautoconf
 }
 
@@ -117,7 +117,7 @@ src_test() {
                TWS="${S}"
        fi
 
-       cd "${S}"/tests
+       cd "${S}"/tests || die
        sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
                || die "sed WORKSPACE failed"
 
@@ -183,8 +183,7 @@ src_install() {
                        doins -r samples/java_interface || die
                fi
 
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
+               ecvs_clean "${D}"/usr/share/doc/${PF}/samples
        fi
 }
 
diff --git a/dev-lang/mercury/mercury-13.05.ebuild b/dev-lang/mercury/mercury-13.05.ebuild
index 3092ceb62089f1796964cdc523194795a52b6b1d..7cefb73dd54b8a49f8264cab80987666b43c5baa 100644 (file)
--- a/dev-lang/mercury/mercury-13.05.ebuild
+++ b/dev-lang/mercury/mercury-13.05.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -34,7 +34,7 @@ S="${WORKDIR}"/${MY_P}
 SITEFILE=50${PN}-gentoo.el
 
 src_prepare() {
-       cd "${WORKDIR}"
+       cd "${WORKDIR}" || die
        EPATCH_FORCE=yes
        EPATCH_SUFFIX=patch
        epatch "${WORKDIR}"/${PV}
@@ -43,7 +43,7 @@ src_prepare() {
                "${S}"/scripts/Mmake.vars.in \
                || die "sed libdir failed"
 
-       cd "${S}"
+       cd "${S}" || die
        eautoconf
 }
 
@@ -116,7 +116,7 @@ src_test() {
                TWS="${S}"
        fi
 
-       cd "${S}"/tests
+       cd "${S}"/tests || die
        sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \
                || die "sed WORKSPACE failed"
 
@@ -182,8 +182,7 @@ src_install() {
                        doins -r samples/java_interface || die
                fi
 
-               rm -rf $(find "${D}"/usr/share/doc/${PF}/samples \
-                               -name CVS -o -name .cvsignore)
+               ecvs_clean "${D}"/usr/share/doc/${PF}/samples
        fi
 }
 
diff --git a/dev-lang/mercury/metadata.xml b/dev-lang/mercury/metadata.xml
index 1af61abf4524f2486536236d87fcd8f727c3d721..7e9ce0ae4c479d224ff1f9b7e8c6d16557ec2b87 100644 (file)
--- a/dev-lang/mercury/metadata.xml
+++ b/dev-lang/mercury/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>keri@gentoo.org</email>
-  <name>Keri Harris</name>
-</maintainer>
-<use>
-  <flag name='erlang'>Support Mercury Erlang grade</flag>
-</use>
+  <maintainer>
+    <email>keri@gentoo.org</email>
+    <name>Keri Harris</name>
+  </maintainer>
+  <use>
+    <flag name="erlang">Support Mercury Erlang grade</flag>
+  </use>
 </pkgmetadata>
Unnamed repository; edit this file 'description' to name the repository.