Fix bug 389949 (by scribeofthenile) where compilation failed in unrealircd-3.2.9 and unrealircd-3.2.9_rc2 when USE=-extban-stacking.

Package-Manager: portage-2.2.0_alpha71-r1/cvs/Linux x86_64

5 files changed, 40 insertions, 27 deletions

diff --git a/net-irc/unrealircd/ChangeLog b/net-irc/unrealircd/ChangeLog
index 874a8c4d24b7..752b86941998 100644
--- a/net-irc/unrealircd/ChangeLog
+++ b/net-irc/unrealircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/unrealircd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.88 2011/11/06 02:58:47 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.89 2011/11/09 18:13:51 binki Exp $
+
+  09 Nov 2011; Nathan Phillip Brink <binki@gentoo.org>
+  unrealircd-3.2.9_rc2.ebuild, unrealircd-3.2.9.ebuild,
+  +files/unrealircd-3.2.9-disabled-stacked-extbans.patch:
+  Fix bug 389949 (by scribeofthenile) where compilation failed in
+  unrealircd-3.2.9 and unrealircd-3.2.9_rc2 when USE=-extban-stacking.
 
 *unrealircd-3.2.9 (06 Nov 2011)
 
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 914bb8a1cf96..3226137b8041 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX unrealircd-3.2.9-disabled-stacked-extbans.patch 800 RMD160 d0b90b53988b8315764ed7253f5afe6b71e1781e SHA1 057ae0104cfb78b0841b8dc7afb55ac6bffe673c SHA256 b4005233ead9a7af056a4c33281ffcda3027cfd3af617e39b1de5438162863bc
 AUX unrealircd-system-cares.patch 4850 RMD160 6bd9456bda2b1dc233cf7ad97c60c0ee11c1f99b SHA1 e9086146a7031b874e514eb2a22c06b5decb8adf SHA256 e3be39af381c12349355ed44c1bfac1a205a84728d006fd3de3cff0a564ee0d9
 AUX unrealircd-system-tre.patch 2265 RMD160 16324b6639585d3c62b763f9f0f36c233ed0bbf0 SHA1 df61297ad7dd136884ff78644bd2c98b2c794578 SHA256 2a5e958a19e6b85df1a2f30cc56443f8080a0b7f2c01e6765cfe6b758c16615d
 AUX unrealircd.confd 499 RMD160 666439c6e992d3314f8694ba58e8f3e018421f1c SHA1 5cb49d7e9a79c7f8e0b2182dff47811a2f3fb885 SHA256 ae6ce779fae68c1380a7d37950c5ef3b695e434bb435dcdc0f6d3d2282f72582
@@ -12,24 +10,7 @@ DIST Unreal3.2.9-rc2.tar.gz 3063842 RMD160 594771f9ad9ee53108ecaf42e2368292b32d8
 DIST Unreal3.2.9.tar.gz 3064571 RMD160 fb910f2a87ee4fdfd5a2d293303b0085b7657352 SHA1 0bb9d84ce6e4a395fda86e7d6250b7016cfeb913 SHA256 3f581a331825d9179f5367ea6367dd0dc71c7ba615ac3c0134332086bee0e1d8
 EBUILD unrealircd-3.2.8.1-r1.ebuild 4803 RMD160 6d57d84c9115f478fbc394358d853d5062e2e213 SHA1 4ca9d055ee72ff9d6c0547ca104b97caf6d97484 SHA256 89e2a1ff11f5dfd9b6138d049ee314919a5c6531a285b5a680410c025ca467e3
 EBUILD unrealircd-3.2.8.1-r2.ebuild 4803 RMD160 ad6871ec34b9518d4b0725f4c9a762e0e6e9b94b SHA1 9682d4d5190822256dc7a25ec87407a3591a90df SHA256 8d599cfd2e8c302227cf51eb0a22130000a4a4cb6bb2ac28ca68dce042afd916
-EBUILD unrealircd-3.2.9.ebuild 4630 RMD160 657324445246bf2123e55f12241761363bda887e SHA1 0be154d7c7dfa742e8601f5da3c34fe063af553e SHA256 33a5402e9593d7a11ea5961f7a5734f8f404c9e5a97ea46fde5c9f936db7c9b3
-EBUILD unrealircd-3.2.9_rc2.ebuild 4734 RMD160 20d8de930f732eb74e371de7c0b3c993c54ae1c2 SHA1 85844932b6852c9e995d571a62d51aec36b559b0 SHA256 0da18d2ff1ca063ab3db332c0219002e0ff2e635502e5ee7b5493dead4d15627
-MISC ChangeLog 13055 RMD160 6e1227e6ddcabc735b3b596a09209ddeeaf3130b SHA1 21aac3217cf6e73589904142615fa0e5f0aa0be5 SHA256 6cebc96e8cd7153fe58bf0af441a280a5e7c70794e2d6c242e2bc4d8dc293f02
+EBUILD unrealircd-3.2.9.ebuild 4689 RMD160 af04eae00509cfd610620339a4083cc681584295 SHA1 18fc4b4e9377476070aec0ac17301237c95cb20a SHA256 3b3506837ec59c7fb07f936876fa4562841f00afef21b81eb9dd82fe40e30403
+EBUILD unrealircd-3.2.9_rc2.ebuild 4790 RMD160 489d217d0d6062432eae1ad1e2fd5e02ddf874f6 SHA1 6144bad35f3929dc3d4ce53626dc6f6dd8bc5ec7 SHA256 b974e6a9df024c71f87d78bcf722a62f16bc0f70fc98fcd02d955d8dc12c68a4
+MISC ChangeLog 13362 RMD160 2e226511b50d48454229d84ea9d0b7f46dffee56 SHA1 18640651703806522b17fc5ca69e30094044f0ac SHA256 e42767f3cad1c9088666d70c49aeb8fbc28b37955360200ceee9c67ae9b67828
 MISC metadata.xml 1151 RMD160 92c45764e66a24ee236204e4b69885fe0d66de96 SHA1 27bea15f83c37d715c23d13559d5c04af28eb52b SHA256 766c92c8b54936b0c5fbb3a99356eee32ff52dbfd56b82f548a070199cf9ac85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQIcBAEBCAAGBQJOtffoAAoJEHQ6UuhrqBBQ5M0QAKPE8V4bmC8jfpimZq6y3QWr
-XIPnym8hFKGP8kgKsu1JQfXxbu+ZFg0AX5oD+IkTVg7QDhzGDwhIFZwkdq3ryE0f
-L2OMyo5qzAV5VT8KTa51Qyr6Bi/FuOpYQWmezGYC6M0qaJ9Fg/iW1h7HqUAvGf1e
-m9P5lUTA+CHGs6So3npKZjl8NQcvsbnuYoFN53qxyBLa53K3VoACB4/Rbg+WE8BP
-ySsTyzEVpEqrVuvFAJUkd/MyMW6SaG3yO411FzkEbUchnluRLthX7hmctKx8INGW
-1ip5BmsCFQb213TTi9Z7rOH1a3ZrV3eNWx/6bLIGlk9hSm77ZS50pJaNU7qScVtR
-7tc0i09lxKpN9qUEDmQOIWu9rYLNvpUL0XR4zH2+OS7BbY2rnRiCmeRViu+ORfhS
-lR+CXfk9zCOlfL82EHNCYLAycbkDWu7AVE4sdJEPTo0F8a/GUkzyBq9goCOQetBZ
-GjdzZD0e0wJ1HT4m6MNpZSbJhpS9GA37QQCqTJ3Lbyen78qd/GVobWFyb6eaDNB5
-Vt+scdccmirEK0LwOHAtNGJ7d19x1suH/X0EetmjrrtKlQPhOSjpPT7T2pkbersj
-cP53DbNIfGM7/PtZSr0LmHYZDI5O891LzSVF7QSqjby5rqG1rTAAC8TIVBwIjaFY
-1L5DMufFzQlZDTCDhCk0
-=4eJL
------END PGP SIGNATURE-----
diff --git a/net-irc/unrealircd/files/unrealircd-3.2.9-disabled-stacked-extbans.patch b/net-irc/unrealircd/files/unrealircd-3.2.9-disabled-stacked-extbans.patch
new file mode 100644
index 000000000000..447f674e00ac
--- /dev/null
+++ b/net-irc/unrealircd/files/unrealircd-3.2.9-disabled-stacked-extbans.patch
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+# Date 1320859299 0
+# Node ID 110ba58ecd56ad5debb00726e5e3ca8d5df135bf
+# Parent  a673dd0f7b377ec35ce26fffc4affc9c7563c7b1
+- Fix compilation issue when disabling stacked extbans. https://bugs.gentoo.org/389949
+
+diff -r a673dd0f7b37 -r 110ba58ecd56 Changes
+diff -r a673dd0f7b37 -r 110ba58ecd56 src/extbans.c
+--- a/src/extbans.c	Wed Nov 09 17:16:55 2011 +0000
++++ b/src/extbans.c	Wed Nov 09 17:21:39 2011 +0000
+@@ -533,9 +533,9 @@
+ 	req.conv_param = extban_conv_param_nuh;
+ #else
+ 	req.conv_param = extban_conv_param_nuh_or_extban;
++	req.is_ok = extban_is_ok_nuh_extban;
+ #endif
+ 	req.is_banned = extban_modej_is_banned;
+-	req.is_ok = extban_is_ok_nuh_extban;
+ 	req.options = EXTBOPT_ACTMODIFIER;
+ 	ExtbanAdd(NULL, req);
+ 
diff --git a/net-irc/unrealircd/unrealircd-3.2.9.ebuild b/net-irc/unrealircd/unrealircd-3.2.9.ebuild
index 2f062326eac9..958bb944674e 100644
--- a/net-irc/unrealircd/unrealircd-3.2.9.ebuild
+++ b/net-irc/unrealircd/unrealircd-3.2.9.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/unrealircd/unrealircd-3.2.9.ebuild,v 1.1 2011/11/06 02:58:47 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.9.ebuild,v 1.2 2011/11/09 18:13:51 binki Exp $
 
 EAPI=4
 
@@ -34,6 +34,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-disabled-stacked-extbans.patch
+
 	# QA check against bundled pkgs
 	rm extras/*.gz || die
 
diff --git a/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild b/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild
index ed80ed6b5e20..461dcb5a43c8 100644
--- a/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild
+++ b/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild,v 1.1 2011/07/27 12:41:19 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/unrealircd-3.2.9_rc2.ebuild,v 1.2 2011/11/09 18:13:51 binki Exp $
 
 EAPI=4
 
-inherit eutils autotools ssl-cert versionator multilib
+inherit eutils ssl-cert versionator multilib
 
 MY_P=Unreal${PV/_/-}
 
@@ -34,6 +34,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.9-disabled-stacked-extbans.patch
+
 	# QA check against bundled pkgs
 	rm extras/*.gz || die