summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2011-11-07 12:23:58 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2011-11-07 12:23:58 +0000
commite42ac4bab394a98c4d8b6c08e047d1bb1f67312d (patch)
treedf9f24ac05cd80a2ba01b3ebdfcd146bcc80b0aa /net-ftp
parentBug #389799: more parallel make problems. (diff)
downloadhistorical-e42ac4bab394a98c4d8b6c08e047d1bb1f67312d.tar.gz
historical-e42ac4bab394a98c4d8b6c08e047d1bb1f67312d.tar.bz2
historical-e42ac4bab394a98c4d8b6c08e047d1bb1f67312d.zip
Add missing || die on emake install, spotted by ago
Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/proftpd/ChangeLog6
-rw-r--r--net-ftp/proftpd/Manifest24
-rw-r--r--net-ftp/proftpd/proftpd-1.3.3e.ebuild4
-rw-r--r--net-ftp/proftpd/proftpd-1.3.3f.ebuild4
4 files changed, 16 insertions, 22 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index cdc746795421..88eb433625ab 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/proftpd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.278 2011/11/05 10:15:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.279 2011/11/07 12:23:58 voyageur Exp $
+
+ 07 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> proftpd-1.3.3e.ebuild,
+ proftpd-1.3.3f.ebuild:
+ Add missing || die on emake install, spotted by ago
05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> proftpd-1.3.3f.ebuild:
Stable on amd64 wrt bug #389495
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index c0343c7a9270..b0f5aaf81fe6 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0
AUX proftpd.initd 1565 RMD160 efa4d3a98202666ba55e91c711fa03832ad5e320 SHA1 18ff1ec4d34d7442d06ab2201deea40548116d51 SHA256 52ee854ddd402b251b483450a26001a4d8d72706870040d0a866347440e0c395
@@ -14,25 +14,15 @@ DIST proftpd-mod-case-0.7.tar.gz 13184 RMD160 9514b003b21999a97df59b2fe8b24a71d5
DIST proftpd-mod-deflate-0.5.4.tar.gz 55219678 RMD160 0d9ac70d076de3be521492d0c79089291a1b6dfd SHA1 292ba9dd301a010c46906ec09b5d455ff2b8ee4f SHA256 6ae753608ad126067bd48da8d4ea6ac3ef8eaf339ae924ffdbe30d1819a5e5db
DIST proftpd-mod-diskuse-0.9.tar.gz 18596 RMD160 38629d0a176e11bd10b550a8e49fcc3d8c762470 SHA1 9bf6e14acda088e1663be908df9165650ca13b05 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036
DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a3c0ca144d SHA1 13ec52c688bbb91eaae76a8e4814bfd49e0bc597 SHA256 b0ea7af760ab7a54a62ac294656b5a34a5339665c0227ade0d2f206cc54a10bf
-EBUILD proftpd-1.3.3e.ebuild 7157 RMD160 cd71cb20b4ba8cc844ad3df040f80fc3deb79d9a SHA1 38d750c2e6d9f8f9cd9a37915634c79c59d89cb7 SHA256 0cb3876bdd72ce5086ca2e983bcf9a280716572595811b3715b1c023d623dfe7
-EBUILD proftpd-1.3.3f.ebuild 7163 RMD160 50fbed0c7603bd0cb32e6acd63d8a7d91a2902e7 SHA1 64105cb589e523184ef0a6f55c21a3a3ddf2c3b3 SHA256 d137c14a8bc07757c7ead1c3a4dd1b6a4669bd6e04f6d377286bc1852b86aa49
+EBUILD proftpd-1.3.3e.ebuild 7181 RMD160 452f01da3094782974a7cc1c8f2788cdc6127425 SHA1 0a31b7522788638f6a97f57e7e46cd0b91a55ca2 SHA256 1b12ff82ea60f7b18e4b6af606f79d42517ba8ecb7f393f0e6f0400d55ac61f4
+EBUILD proftpd-1.3.3f.ebuild 7187 RMD160 10d00838dc9840d6632674c2cd7ee9db0636a678 SHA1 1c554d29d90275d5fa307e5a6a8282296f98e259 SHA256 f71b0593ff70248b834bf006e062dd7b62090f32b847d53dfadd6d63a9943db3
EBUILD proftpd-1.3.4_rc3.ebuild 6580 RMD160 463d7d9d65e2365dedad0b5797aa9af41f55a947 SHA1 38d4e7fad5dd27abb24004114ac39c97b3c09fca SHA256 889d27a7999ff3c3590175ba5d09be22813aed9909b0efe072669af6951f02e7
-MISC ChangeLog 48192 RMD160 fa87674698f7be86ab9aaffdfc02903e1246156d SHA1 4d62634c5ee4b34a9730419f20e2ae8b08a6cefb SHA256 a47eafadb570b2d23000290312f499035504b3965cded9a3675282bde1bf22c7
+MISC ChangeLog 48350 RMD160 3b9f5754fad921ff8192bfc1c2878b322b3800cc SHA1 06e0e289d48fdc72285e3e43201fb81698a2b11c SHA256 dd122d523ad493329eab6bd013dcd95414d0153b47ece9c443589501ec434ecf
MISC metadata.xml 2286 RMD160 881ef9e88e0426169393f54c68dcf91f895e898e SHA1 37abd54df219347761bd3e1b9f74bded51aa0740 SHA256 f63550b381774d49259b5723c68e5b73f1e8f0b8a72760a1aa0e54747027a26e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQIcBAEBCgAGBQJOtQzZAAoJEPqDWhW0r/LCQEMQAIWfS4OSaixK2pGq29TPXWvJ
-bFjXz3kY/O3ZmfQgI11jUAT4AQBzqznMVk62rlEf590iTS24cAueGPU8Jy6G3cLo
-TrU35Z/SjkYmTLy3kdNKREjXXx5eaWLWl7JUIBZSvDs+mevXTguTrV14cs4Z1H9z
-dA7HjDiz71l7/sIb/pnd0C2PybelRFlkGH8kEoT2ItdN/3BCSwVLORdjbj7j0a34
-E9rpMKQHD3upBjDXJps8dXwvZEd5hFaAdBieRvZ/CmbViKNLXVGZlLlHdFjIIf5+
-xcRZKRil2t6rEenfal6UcLbPv9puPYNfrHNB3QM2ibbOF8+EDjGWZe+DPAaweHbj
-eZaVi8fK3Sc6rKNI+Q3LJ3c7R0BtrjSFWlGBNw1ITvkwZeNw8Uw+Ok8Tru9C1kkR
-AXV/3Pf7mOKEG/2iK+f898fv6Ua24z/XSBm9qgS+EmLo5qo7cWPSZLDifPih+ciZ
-6cEvsvzGU4TJ4p6bXCGiAaMw3Sp7Dr8qPNHL4Z09kYPhz02VkYpGrbzo30GFiWWi
-3varzFEn3pAUNz0yoq3s1LWPhBM/DEncJSpNgIoi5LfWXWzu1bkpZHO0grqkPquG
-G4OKfNHzvPTXr/5XHt3GZF3d6Zh4F7GjEvUlvw07i2LWraYKsv2oqHQgCsMzc7DF
-zdsOKW096bcQNj1qCW4b
-=Twsn
+iF4EAREIAAYFAk63ze0ACgkQFYEBGcdFJfKeBwEAkPggLJSrxZ7ozvlV706m934b
+cW6HcFWTmQHelRjSZTUBAKh5o8rkryQmk6s2wFLkKYr9XAGeMfILRhr/sZc92Ujm
+=CUer
-----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/proftpd-1.3.3e.ebuild b/net-ftp/proftpd/proftpd-1.3.3e.ebuild
index 7c3a24f89997..ef94512d7145 100644
--- a/net-ftp/proftpd/proftpd-1.3.3e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.3e.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3e.ebuild,v 1.8 2011/11/04 14:45:35 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3e.ebuild,v 1.9 2011/11/07 12:23:58 voyageur Exp $
EAPI="2"
inherit eutils autotools
@@ -182,7 +182,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install || die "install failed"
insinto /etc/proftpd
doins "${FILESDIR}"/proftpd.conf.sample
diff --git a/net-ftp/proftpd/proftpd-1.3.3f.ebuild b/net-ftp/proftpd/proftpd-1.3.3f.ebuild
index 776d839e758d..4a5957ded94e 100644
--- a/net-ftp/proftpd/proftpd-1.3.3f.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.3f.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3f.ebuild,v 1.3 2011/11/05 10:15:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3f.ebuild,v 1.4 2011/11/07 12:23:58 voyageur Exp $
EAPI="2"
inherit eutils autotools
@@ -182,7 +182,7 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
+ emake DESTDIR="${D}" install || die "install failed"
insinto /etc/proftpd
doins "${FILESDIR}"/proftpd.conf.sample