From 66ce3bb5b47e4ca9f60969a37b2c0eb2458f64db Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Mon, 24 Sep 2007 06:44:13 +0000 Subject: Fix bug #185663 Package-Manager: portage-2.1.3.9 --- net-irc/bitchx/ChangeLog | 6 +++++- net-irc/bitchx/Manifest | 20 ++++++++++++-------- net-irc/bitchx/bitchx-1.1-r4.ebuild | 3 ++- net-irc/bitchx/files/1.1/bitchx-1.1-inline.patch | 15 +++++++++++++++ 4 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 net-irc/bitchx/files/1.1/bitchx-1.1-inline.patch (limited to 'net-irc') 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 + +files/1.1/bitchx-1.1-inline.patch, bitchx-1.1-r4.ebuild: + Fix bug #185663, thanks to David Klempner *bitchx-1.1-r4 (17 Jul 2007) diff --git a/net-irc/bitchx/Manifest b/net-irc/bitchx/Manifest index 5c22c8ddbacc..db67b75f5228 100644 --- a/net-irc/bitchx/Manifest +++ b/net-irc/bitchx/Manifest @@ -26,6 +26,10 @@ AUX 1.1/bitchx-1.1-hebrew.patch 477 RMD160 482fdfeffc2549f728fede5882a2360269fe1 MD5 9230369276af6c8a1cdd7a584927cd47 files/1.1/bitchx-1.1-hebrew.patch 477 RMD160 482fdfeffc2549f728fede5882a2360269fe13eb files/1.1/bitchx-1.1-hebrew.patch 477 SHA256 5090acf698cea3a22a2a663af4914c580b3508a5bc5cabdedcb21cd3c6d27a17 files/1.1/bitchx-1.1-hebrew.patch 477 +AUX 1.1/bitchx-1.1-inline.patch 595 RMD160 7daee23c8ac4865b691e09f8edeaac0855ae1f5f SHA1 d3b53e9dcf0e8c1f6149d0e0a24a46a102aefdd8 SHA256 bdc0e93d26952378f422fd74a8403c9d6cf6cc139e731d9148821eac8be80d61 +MD5 fdac084a7c0522024cbe6026a95141ee files/1.1/bitchx-1.1-inline.patch 595 +RMD160 7daee23c8ac4865b691e09f8edeaac0855ae1f5f files/1.1/bitchx-1.1-inline.patch 595 +SHA256 bdc0e93d26952378f422fd74a8403c9d6cf6cc139e731d9148821eac8be80d61 files/1.1/bitchx-1.1-inline.patch 595 AUX 1.1/bitchx-1.1-pbxs.patch 350 RMD160 21dc3bf478099f2c7197f3d9830d99cb68ec5411 SHA1 d63308f41ef5d910969f430520f0f0c0b0dfdde2 SHA256 64a3c7628ba8460924b81243d3052203b841583eb6e0306812a5e825db22ee2c MD5 5f8b251c155a93432294dd944e39aee9 files/1.1/bitchx-1.1-pbxs.patch 350 RMD160 21dc3bf478099f2c7197f3d9830d99cb68ec5411 files/1.1/bitchx-1.1-pbxs.patch 350 @@ -43,14 +47,14 @@ EBUILD bitchx-1.1-r3.ebuild 2220 RMD160 86c45cc5cd419688b05a9ac5980d082989a069c2 MD5 037a214ce9aa81823cd7b683a608f711 bitchx-1.1-r3.ebuild 2220 RMD160 86c45cc5cd419688b05a9ac5980d082989a069c2 bitchx-1.1-r3.ebuild 2220 SHA256 03d99f9bf7126cfccce77ac9fcb432fd3ef8d03ae783ca57cda89193f7c51a2a bitchx-1.1-r3.ebuild 2220 -EBUILD bitchx-1.1-r4.ebuild 2262 RMD160 fc727e2a2fc8397cd4ce413b2799b539df6e611f SHA1 8e287e40585a19fe4895619b0aac2ff62fcb0cac SHA256 48d4d5cbc85d07739732102012d239b78fe20b9f7e0599cd3db0403f13ef120d -MD5 8f30cab38d657c82cbddbcfe78c72189 bitchx-1.1-r4.ebuild 2262 -RMD160 fc727e2a2fc8397cd4ce413b2799b539df6e611f bitchx-1.1-r4.ebuild 2262 -SHA256 48d4d5cbc85d07739732102012d239b78fe20b9f7e0599cd3db0403f13ef120d bitchx-1.1-r4.ebuild 2262 -MISC ChangeLog 10139 RMD160 e0f057b51f6e1fc5165328af05cc84fc975307c0 SHA1 7df01b224e0b73d0f1b941e5731dcda027d478e6 SHA256 11ef25a865e9cea15b3b956e19355ca814cf4195a0858206874fb9307faee2e7 -MD5 564af89c1aa3e9450610188b99b51114 ChangeLog 10139 -RMD160 e0f057b51f6e1fc5165328af05cc84fc975307c0 ChangeLog 10139 -SHA256 11ef25a865e9cea15b3b956e19355ca814cf4195a0858206874fb9307faee2e7 ChangeLog 10139 +EBUILD bitchx-1.1-r4.ebuild 2308 RMD160 99f99dba919e5aa8252c22e9bab28ab8a745323a SHA1 a28edb9f0dfaa52360625e8405597892ef3016d0 SHA256 28d1bdc74978d1c77c8c8c59f21ae9bb149f3f6f6852ee9bdcee00de21f04d54 +MD5 183ca571b1aad6e31790ed80575c0b4f bitchx-1.1-r4.ebuild 2308 +RMD160 99f99dba919e5aa8252c22e9bab28ab8a745323a bitchx-1.1-r4.ebuild 2308 +SHA256 28d1bdc74978d1c77c8c8c59f21ae9bb149f3f6f6852ee9bdcee00de21f04d54 bitchx-1.1-r4.ebuild 2308 +MISC ChangeLog 10316 RMD160 c7e59ca9852cb4acd69b69ccee795faf308ee637 SHA1 a224c659d091f37a374e597423f42b88448eaeee SHA256 123249b9093e9c5f095d302608c895de852b37a8367802deadcf572c7301266e +MD5 d85a2adbd51883089d15ac2cd990d682 ChangeLog 10316 +RMD160 c7e59ca9852cb4acd69b69ccee795faf308ee637 ChangeLog 10316 +SHA256 123249b9093e9c5f095d302608c895de852b37a8367802deadcf572c7301266e ChangeLog 10316 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160 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 -- cgit v1.2.3-65-gdbad