Fix compilation with =mariadb-5.2*, bug #381119 reported by Flameeyes with patch from Adam from upstream.

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

4 files changed, 137 insertions, 11 deletions

diff --git a/net-irc/anope/ChangeLog b/net-irc/anope/ChangeLog
index 7ece6391ca9c..2c5c6e558f94 100644
--- a/net-irc/anope/ChangeLog
+++ b/net-irc/anope/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/anope
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/ChangeLog,v 1.19 2011/12/28 20:25:48 gurligebis Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/ChangeLog,v 1.20 2012/01/12 00:35:32 binki Exp $
+
+  12 Jan 2012; Nathan Phillip Brink <binki@gentoo.org> anope-1.8.7.ebuild,
+  +files/anope-1.8.7-mariadb.patch:
+  Fix compilation with =mariadb-5.2*, bug #381119 reported by Flameeyes with
+  patch from Adam from upstream.
 
 *anope-1.8.7 (28 Dec 2011)
 
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index ff960c0b65ab..87f8e96be309 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX anope-1.8.7-ldflags-fix.patch 1715 RMD160 a580eef6bf96f25b5d80bde4ecd3a5364c86a9d5 SHA1 671dcb1242a884cf0e51fe7991a035ff22383fc5 SHA256 49c20cf2dc85d1a9b86b0876f27f5da37a26b2fbb2bd3666155d529d7129db6c
 AUX anope-1.8.7-libdir-gentoo.patch 2584 RMD160 4ce79cb7e08f254da11f25609adc2b39cbf2302c SHA1 0bf5709b1da0caeb1f9d000372d1e0ba99aa04e6 SHA256 e639064792827b2797f1ca21865146c880720d844f1aa3d4725484c5e2c7772c
+AUX anope-1.8.7-mariadb.patch 3452 RMD160 d9b46cd6732ca6d781382ffd5faf3aa33b0a756c SHA1 25a84fb33867107711741b0dfe8afb0a2029f8d2 SHA256 770a15ae09e1a56aa8f3775646e945822761136dda208b1772ebf0d6a2d5e246
 AUX anope-conf.d 320 RMD160 6f0bac89fbf801eef2125418394b10221554ef31 SHA1 56050f88a8155dc98400f8c626f57f5487958377 SHA256 e78db9ffa9a79141de513c2b0b0bb08e8e80c63fc957e9cd9377577a389ca63e
 AUX anope-init.d 814 RMD160 4353d76ede4250a6aada052b7b6c30f9dce3578d SHA1 6b3aec185f47692d7f9773c5e3a422de40ec9cd0 SHA256 4dca225c99e6237a00fe0a36163e7d456f43f0c32174cee09a076194a793b953
 AUX pid-patch.diff 450 RMD160 d18ab894895db105c91d0d1e24af2aff79f1bd13 SHA1 87be4165d15dbc6bfc972972d588e127ab492135 SHA256 cd3f266cd236e6a5bb7d15b502631e8992289455f7e308d94ac14e3b13314dc5
 DIST anope-1.8.7.tar.gz 1586164 RMD160 38592effb02f10c4ded01cc1f05e6a0828934924 SHA1 95c162e96440fb1813e48c7b27ac2b82e3b9bffb SHA256 804516153936b1147a79960a283229191d29e1d9162c3ec70d86d099ee04447b
-EBUILD anope-1.8.7.ebuild 3445 RMD160 df94e1d48813076fa0a2ff5a33778b668f11a4c4 SHA1 7704b1e2f1a6aad8a7785ab24fa9d3c5cf748e7e SHA256 2c2d593e2040bd7d37636009127b2ae2542f549b590b81a8da99580371807e94
-MISC ChangeLog 3176 RMD160 577c021a3eb7457044941d7f9fcad51180d11a3f SHA1 5dd8a5144c96c5cea6f1fad833f2d82e55000eef SHA256 50db5d6249f2c26a11e7db394840efd85b8277ba07cd13036f8c785b1b8415f0
+EBUILD anope-1.8.7.ebuild 3494 RMD160 19b265b995cd03714edd32ff5c717db43b6c17bd SHA1 079ada37d73a60f468af8a90a1766c03732107f5 SHA256 1c8f6317390e111d4a337eeb2d48b79c54721b452d1e32f4aa70ad0278c97340
+MISC ChangeLog 3393 RMD160 7a9a4c510aefb6c545f31a096ca3ccd895fd42d9 SHA1 5e3ae701a3e6f7c0aa4a6d1020df2fb6a50fe4a9 SHA256 706e6b27cefc06847e5066f5dd449b13d00fa8d9e17ee50f039e7c12a0cf9d5b
 MISC metadata.xml 322 RMD160 4ac585786fcb58a92771bd8ee9f71f4738e64798 SHA1 133d8c37c5ab6d5366948f3de3e18c5a7a230ed4 SHA256 4240b9effe8d7796234c47e4f4af9ef4250bcfcafa9ec09e4b6a4a503de10b71
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAk77ezoACgkQsR7PQhRXYEndAACbB92qo/ylXBstmu96EsRXAAa2
-hpMAoIIURkWJgRVX13ZIMNec62JC9hyJ
-=Dk5U
+iQIcBAEBCgAGBQJPDinqAAoJEHQ6UuhrqBBQL4QP/1h8yqtj0URJFwA91FM+wSs2
+jaC6zBZNcbrbQYgp76sVOLQg9Y/7jaqw3uqK0pV/HpccqFEReTqhk/JS7fpcVmZ7
+sce9wU+P+PMo3mtwVwSn9xtfTuBUdBAOQPVLBFhQBP77Z3NnOHuN3mUrW8RCu0ve
+S5StrRDhhbviPErYjagZ9Igcvn1+/Hch/r/6CEHlzEdDtMwu8zlyulJZPilxBAvr
+74Ay0XIUxTQd9i9g79UdNiAyzkRXhKtVcuH92TeAi5ileWTchK+awnbWIRxc4U1a
+r9gHXi+1BjJA+fRda5EQzgqYpLVoGzX4TLccKtRBbfSKNn7KdJFS17U4KFt7FHvs
+OFhYTW+zRfJwcrSRdgOZl2XmiYyU84G78EWJgs4c9mNPP/d+EHw/wLCCYn1CtURb
+OGlsl8uskoxZAHqASQxOPUwXWY5vvX2vANHR3Xf23KS62Z0fFMgz7Ii3dAwg9NNS
+x7JkDNCnc6FNEhfIAc+cbpB58X3TWgtp3fVGsmZ1fF9Jk2QUvZ+CjqLj3uAPX2aY
+TjzPlKOCaYOjeExj1YO08y68lfkKRFjXtQ+6cWumdG71qo63slKP98X1W/g6bOz9
+0jNlRCXWYpvHYUuWlcmNfjRSwg3SBzPOBTVSMiCNzH9BaKG4trBKmIscz3BQ2ETw
+XZ8A3KeFVNkdOEGsvsur
+=6jzJ
 -----END PGP SIGNATURE-----
diff --git a/net-irc/anope/anope-1.8.7.ebuild b/net-irc/anope/anope-1.8.7.ebuild
index fe37b080c677..d3c8d8584590 100644
--- a/net-irc/anope/anope-1.8.7.ebuild
+++ b/net-irc/anope/anope-1.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/anope-1.8.7.ebuild,v 1.1 2011/12/28 20:25:48 gurligebis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/anope/anope-1.8.7.ebuild,v 1.2 2012/01/12 00:35:32 binki Exp $
 
 EAPI=4
 
@@ -44,6 +44,7 @@ src_prepare() {
 	epatch "${FILESDIR}/pid-patch.diff"
 	epatch "${FILESDIR}/${P}-ldflags-fix.patch"
 	epatch "${FILESDIR}/${P}-libdir-gentoo.patch"
+	epatch "${FILESDIR}"/${P}-mariadb.patch # bug 381119
 	eautoconf
 }
 
diff --git a/net-irc/anope/files/anope-1.8.7-mariadb.patch b/net-irc/anope/files/anope-1.8.7-mariadb.patch
new file mode 100644
index 000000000000..98a1b3634b6a
--- /dev/null
+++ b/net-irc/anope/files/anope-1.8.7-mariadb.patch
@@ -0,0 +1,109 @@
+Author: Adam
+Date: 2012-01-11
+Subject: Fix https://bugs.gentoo.org/381119 , where -I ordering causes
+	mariadb's services.h to be #include-ed improperly.
+
+diff --git a/src/Makefile b/src/Makefile
+index 739c918..a9a2ee2 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -25,7 +25,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
+ 	   'RDB=${RDB}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) -I../include/ -c $<
++	$(CC) -I../include/ $(CFLAGS) -c $<
+ 
+ all: services
+ 
+diff --git a/src/core/Makefile b/src/core/Makefile
+index 4ec2754..32c049f 100644
+--- a/src/core/Makefile
++++ b/src/core/Makefile
+@@ -21,7 +21,7 @@ install:
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
++	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ .o.s:
+ 	$(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
+diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub
+index 9fbadf3..d93e6d5 100644
+--- a/src/core/Makefile.sub
++++ b/src/core/Makefile.sub
+@@ -16,7 +16,7 @@ module: $(OBJECTS) so
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
++	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ so:
+ 	$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
+diff --git a/src/modules/Makefile b/src/modules/Makefile
+index cafbe45..bde65b3 100644
+--- a/src/modules/Makefile
++++ b/src/modules/Makefile
+@@ -24,7 +24,7 @@ install:
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
++	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ .o.s:
+ 	$(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
+diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
+index 7697249..b7c244f 100644
+--- a/src/modules/Makefile.sub
++++ b/src/modules/Makefile.sub
+@@ -16,7 +16,7 @@ module: $(OBJECTS) so
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
++	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ so:
+ 	$(CC) ${SHARED} ../../mod_version.o  $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
+diff --git a/src/protocol/Makefile b/src/protocol/Makefile
+index ab837e4..d962d8b 100644
+--- a/src/protocol/Makefile
++++ b/src/protocol/Makefile
+@@ -21,7 +21,7 @@ install:
+ distclean: clean spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
++	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ .o.s:
+ 	$(CC) ${SHARED} ../mod_version.o  $< -o $*.so ${PROFILE}
+diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
+index a2d6a41..d93e6d5 100644
+--- a/src/protocol/Makefile.sub
++++ b/src/protocol/Makefile.sub
+@@ -16,7 +16,7 @@ module: $(OBJECTS) so
+ distclean: spotless
+ 
+ .c.o:
+-	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
++	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
+ 
+ so:
+ 	$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
+diff --git a/src/tools/Makefile b/src/tools/Makefile
+index 4dffbf0..87bd0ae 100644
+--- a/src/tools/Makefile
++++ b/src/tools/Makefile
+@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
+    	   'RUNGROUP=${RUNGROUP}' 
+ 
+ .c.o:
+-	$(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $*
++	$(CC) -I../include/ $(LDFLAGS) $(CFLAGS) $< -o $*
+ 
+ all: ${OBJS}
+