summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Smith <c1pher@gentoo.org>2011-05-11 11:51:29 +0000
committerDane Smith <c1pher@gentoo.org>2011-05-11 11:51:29 +0000
commit70244377d28807a8434490d1914787d93b4927be (patch)
tree7e15d9ee038fd313354fa91fc983ed35a750cd21 /net-irc/inspircd
parentCreate a menu entry. Require version >=2.26 for glib-2 for GUnixSocketAddress... (diff)
downloadhistorical-70244377d28807a8434490d1914787d93b4927be.tar.gz
historical-70244377d28807a8434490d1914787d93b4927be.tar.bz2
historical-70244377d28807a8434490d1914787d93b4927be.zip
net-irc/inspircd: Remove use of die in a subshell.
Package-Manager: portage-2.2.0_alpha32/cvs/Linux x86_64
Diffstat (limited to 'net-irc/inspircd')
-rw-r--r--net-irc/inspircd/ChangeLog5
-rw-r--r--net-irc/inspircd/Manifest20
-rw-r--r--net-irc/inspircd/inspircd-2.0.3.ebuild9
3 files changed, 24 insertions, 10 deletions
diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index da3845a66580..e3c40031c505 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-irc/inspircd
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.36 2011/05/11 08:35:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.37 2011/05/11 11:51:29 c1pher Exp $
+
+ 11 May 2011; Dane Smith <c1pher@gentoo.org> inspircd-2.0.3.ebuild:
+ Fix use of || die in subshell in ebuild. No revbump.
11 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> inspircd-2.0.3.ebuild:
x86 stable wrt bug #364905
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 47664a4719b9..860bdf04f878 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -12,13 +12,23 @@ DIST InspIRCd-2.0.3.tar.bz2 579960 RMD160 1ebe6b060b7db6be0697a71bbba59a48772aa9
EBUILD inspircd-1.1.19.ebuild 3232 RMD160 b7f9689d3670271d32e504340f86ee8154caf51f SHA1 f81e1f049fb8aee3a9f747067fc5a2f8f428fcc9 SHA256 47a885e4cd73f20130c9967b10555f8948f42b349bfb79e69e6c5cd385303fb2
EBUILD inspircd-1.1.23.ebuild 3188 RMD160 57d419510071cf030254a2e1bb840570976fd51f SHA1 6491ce730d1fea46f5c27198aa94d7f322811de5 SHA256 2e7717a9fc2c82bb84195ad8a5b4366219c265625faaf693019b5e5eea78844f
EBUILD inspircd-1.2.8.ebuild 3372 RMD160 c11629cadbd2454297cbb24de8a24f6933f9692c SHA1 abbda33b957474fe66a17bd799e3cfea840d5ad0 SHA256 221f5ec40bf3b23bfffd85059509aa8819ad6c332dd18b4148035caeebc0063b
-EBUILD inspircd-2.0.3.ebuild 3550 RMD160 44c8ee1130e1cabdabfcb15c3af425cc2bdd1fdc SHA1 e9b3aadafaaad11695c97c0faf7a992ed0f4aa33 SHA256 290784fe47546c6cb610ad84ef5cbdb830f4437880f5a33bc32c1265d236a63f
-MISC ChangeLog 6667 RMD160 48993f9c87566860881ed5140c52c6ca45304be6 SHA1 05dbcedc22c0c32b8220ccb4134ec3eda22db219 SHA256 1a4be13ab6a36d9c4602704ac52393ecdb1af545d005ea51de5be7ff3282077b
+EBUILD inspircd-2.0.3.ebuild 3515 RMD160 0ce61acbf6700d7c59b2e92fb1bdaf36b0190674 SHA1 64a8c099f9c27a9eecb11779bd6b1e332db968ef SHA256 8ebd6e7c6be4c5f1bd51b5d05a4c8cccce75f44f1d75eac56f1a6d7d7dd756cc
+MISC ChangeLog 6788 RMD160 dad33f655b2d13c64d14bd822ef7c8ac7930eaf0 SHA1 b6b0d6298b82a244ce1f46ae946907d6a835f7f6 SHA256 b17858b3541add2c10e9ebb0194011fef825323e901360f5421aa43037f89252
MISC metadata.xml 779 RMD160 bd8095badcbde765b4cc27e98c5b62e892d9e5cb SHA1 5b59ddf682dcc6d7595b60a117e0449a2c98ee61 SHA256 8814b6795c8a15010ed66e4cd3129c903ac3bf2c15e4ec61fe7acb613b547588
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk3KSmAACgkQuUQtlDBCeQK1RgCfRCisiiRWXwsx/RBlIXNndnJo
-v+cAn1HhrZM9xUGSt3Of4VecOC7RCity
-=qAyi
+iQIcBAEBAgAGBQJNyndNAAoJEEsurZwMLhUxuoQP/Aug9bzOrD668yxZupUCfA8u
+/h04U9fXN2wva0JPqF2CsGOC7NVgc3EZlOPVMo32/SploKWlld1iR9iv+0r9+V63
+X9bOLcEOZ2qylxiA+Xi1X0MCBguGsyM4g8e3uCGp2igHOpRrMWzpKHlT4M30W2Ml
+2DEn2MxpHBXL6/anPKj52gmsodaF2ECVz01pICcUSBm1ATX6QadNm2cUTk8ufHK5
+FtQH9o1rFMFiudmXp4DRUcvw6/a9nm8FnpgKOmP3PPGqFzvKOxewdLrVNfzw3s/p
+R/85VSSU4UiD7YNQmFzWbMWhDEoumOrw1q42WMrgODkph/dY7O1ZBWfsUVLiR6RY
+QE/eluHLUIsnqhvgPoSZm2Xyw+t75IBJaEAffJIPsbTCy+jgVtDxa21pf+q98tFc
+WkYLp9AwgBpLNAs0lu3U/wHUXhxyqvSuvSS6H/ESU1WEzDLarKKPMzdK2DQj7Iqh
+rx0Wh0GeeO0dtQLoY1EfzPr5iWGGBg8COkQ00eXdow/v5URnLQSd6ncCxtHYSOZ/
+xe8AHOtAHMW3atwmhwxgEmfRXv8uc/lZrZFcwhi1hhpLRFjCUBOPB/46vYXL6N32
+xaiyqTbJ8G7+eCNGRLBvp13U7VAMRRjdZ7hBjSeNq/+N0H7XkyGPnMJUU3va2dlm
+/QzzxgyxIek0nQoUPRNw
+=lB3O
-----END PGP SIGNATURE-----
diff --git a/net-irc/inspircd/inspircd-2.0.3.ebuild b/net-irc/inspircd/inspircd-2.0.3.ebuild
index edaede690eb7..a6b19de943e5 100644
--- a/net-irc/inspircd/inspircd-2.0.3.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.3.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-irc/inspircd/inspircd-2.0.3.ebuild,v 1.5 2011/05/11 08:35:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.3.ebuild,v 1.6 2011/05/11 11:51:29 c1pher Exp $
EAPI=2
inherit eutils multilib flag-o-matic
@@ -61,9 +61,10 @@ src_configure() {
# allow inspircd to be built by root
touch .force-root-ok || die
- [ ${extras} ] && ( ./configure --disable-interactive \
- --enable-extras=${extras} \
- || die "configure failed" )
+ if [ -n "${extras}" ]; then
+ ./configure --disable-interactive \
+ --enable-extras=${extras} || die "configure failed"
+ fi
./configure \
$(use_enable openssl) \