summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2007-09-24 06:44:13 +0000
committerLuca Barbato <lu_zero@gentoo.org>2007-09-24 06:44:13 +0000
commitf3d8d4c14efbd9405cf824a45c549b254e245e9b (patch)
tree8c9b929520c0b45ade64aef04e154f66b41828d6 /net-irc/bitchx
parentstable x86, bug 193390 (diff)
downloadgentoo-2-f3d8d4c14efbd9405cf824a45c549b254e245e9b.tar.gz
gentoo-2-f3d8d4c14efbd9405cf824a45c549b254e245e9b.tar.bz2
gentoo-2-f3d8d4c14efbd9405cf824a45c549b254e245e9b.zip
Fix bug #185663
(Portage version: 2.1.3.9)
Diffstat (limited to 'net-irc/bitchx')
-rw-r--r--net-irc/bitchx/ChangeLog6
-rw-r--r--net-irc/bitchx/bitchx-1.1-r4.ebuild3
-rw-r--r--net-irc/bitchx/files/1.1/bitchx-1.1-inline.patch15
3 files changed, 22 insertions, 2 deletions
diff --git a/net-irc/bitchx/ChangeLog b/net-irc/bitchx/ChangeLog
index c259d141e0de..3f96a1e50419 100644
--- a/net-irc/bitchx/ChangeLog
+++ b/net-irc/bitchx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-irc/bitchx
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.64 2007/07/17 10:51:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.65 2007/09/24 06:44:12 lu_zero Exp $
+
+ 24 Sep 2007; Luca Barbato <lu_zero@gentoo.org>
+ +files/1.1/bitchx-1.1-inline.patch, bitchx-1.1-r4.ebuild:
+ Fix bug #185663, thanks to David Klempner <klempner@imsanet.org>
*bitchx-1.1-r4 (17 Jul 2007)
diff --git a/net-irc/bitchx/bitchx-1.1-r4.ebuild b/net-irc/bitchx/bitchx-1.1-r4.ebuild
index a6fdf645ec96..3fb31f9be2df 100644
--- a/net-irc/bitchx/bitchx-1.1-r4.ebuild
+++ b/net-irc/bitchx/bitchx-1.1-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r4.ebuild,v 1.1 2007/07/17 10:51:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.1-r4.ebuild,v 1.2 2007/09/24 06:44:12 lu_zero Exp $
inherit flag-o-matic eutils
@@ -27,6 +27,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PV}/${P}-freenode.patch
epatch "${FILESDIR}"/${PV}/${P}-gcc34.patch
epatch "${FILESDIR}"/${PV}/${P}-gcc41.patch
+ epatch "${FILESDIR}"/${PV}/${P}-inline.patch
epatch "${FILESDIR}"/${PV}/${P}-headers.patch
epatch "${FILESDIR}"/${PV}/${P}-build.patch
epatch "${FILESDIR}"/fPIC.patch
diff --git a/net-irc/bitchx/files/1.1/bitchx-1.1-inline.patch b/net-irc/bitchx/files/1.1/bitchx-1.1-inline.patch
new file mode 100644
index 000000000000..9a40facc63ab
--- /dev/null
+++ b/net-irc/bitchx/files/1.1/bitchx-1.1-inline.patch
@@ -0,0 +1,15 @@
+Only in BitchX-work: .config.h
+diff -ur BitchX/include/irc_std.h BitchX-work/include/irc_std.h
+--- BitchX/include/irc_std.h 2003-04-10 18:09:07.000000000 -0700
++++ BitchX-work/include/irc_std.h 2007-09-23 11:33:40.000000000 -0700
+@@ -98,7 +98,7 @@
+ # define __N
+ # define __inline__
+ #else
+-# if (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 7)
++# if (__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7))
+ # define __A(x) __attribute__ ((format (printf, x, x + 1)))
+ # define __N __attribute__ ((noreturn))
+ # else
+Only in BitchX/include: module.h.orig
+Only in BitchX/include: modval.h.orig