add ktools patch, fix bug #114038

(Portage version: 2.0.51.22-r3)

5 files changed, 100 insertions, 17 deletions

diff --git a/net-im/centericq/ChangeLog b/net-im/centericq/ChangeLog
index ced45b8b5c46..708ec4894511 100644
--- a/net-im/centericq/ChangeLog
+++ b/net-im/centericq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/centericq
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.79 2005/11/27 19:59:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.80 2005/12/16 08:55:43 wschlich Exp $
+
+*centericq-4.21.0-r2 (16 Dec 2005)
+
+  16 Dec 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +files/centericq-4.21.0-ktools.diff.bz2, +centericq-4.21.0-r2.ebuild:
+  add ktools patch, fix bug #114038
 
   27 Nov 2005; Joseph Jezak <josejx@gentoo.org> centericq-4.21.0-r1.ebuild:
   Marked ppc stable for bug #100519.
diff --git a/net-im/centericq/Manifest b/net-im/centericq/Manifest
index 7c931dcf45a3..4ad1a1f70bb6 100644
--- a/net-im/centericq/Manifest
+++ b/net-im/centericq/Manifest
@@ -1,25 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c4e4ad5d5056803b59ff5f8c09bd1874 ChangeLog 11522
+MD5 ed5fca82fc87d9f02f58383edd0c8772 ChangeLog 11720
 MD5 f87bde9c0093587ef76f595a99652913 centericq-4.20.0-r2.ebuild 2492
+MD5 7f795e49e944fe6f3aa15fe53e8da366 metadata.xml 693
 MD5 665a58f3929149c9064cd31a3c554601 centericq-4.20.0-r3.ebuild 2433
-MD5 a04fbc1b1bb9c97db86c35826da4c92b centericq-4.21.0-r1.ebuild 2750
 MD5 eb76c53cadcfd847315cba2c1e880442 centericq-4.21.0.ebuild 2627
-MD5 27714944a72058a8f8c3e46444311651 files/centericq-4.20.0-libgadu.patch 4145
+MD5 a04fbc1b1bb9c97db86c35826da4c92b centericq-4.21.0-r1.ebuild 2750
+MD5 b49231629a2247a8689aa27caab3aae0 centericq-4.21.0-r2.ebuild 2815
 MD5 73abf7a5deb27baf431c12003caeb02d files/centericq-4.20.0.CAN-2005-1914.patch.bz2 576
-MD5 6c7b9cadd9a8db003e584e04cedbffb2 files/centericq-4.21.0-icq-short-read.diff.bz2 333
-MD5 0047b1881feff16b6c86bf59782e8826 files/centericq-4.21.0-memory-handling.diff.bz2 399
 MD5 0f60514eff0a237cf8fbdd13fd88293e files/centericq-amd64.patch 6291
 MD5 cb21aa5d990cbba3ea7fde0c48731fe2 files/digest-centericq-4.20.0-r2 70
+MD5 27714944a72058a8f8c3e46444311651 files/centericq-4.20.0-libgadu.patch 4145
 MD5 cb21aa5d990cbba3ea7fde0c48731fe2 files/digest-centericq-4.20.0-r3 70
 MD5 da3f03f51a55055f887cd8f39f4a3126 files/digest-centericq-4.21.0 70
+MD5 6c7b9cadd9a8db003e584e04cedbffb2 files/centericq-4.21.0-icq-short-read.diff.bz2 333
+MD5 0047b1881feff16b6c86bf59782e8826 files/centericq-4.21.0-memory-handling.diff.bz2 399
 MD5 da3f03f51a55055f887cd8f39f4a3126 files/digest-centericq-4.21.0-r1 70
-MD5 7f795e49e944fe6f3aa15fe53e8da366 metadata.xml 693
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDihA/csIHjyDViGQRAvKhAJ91dQxElnladNAfKUd7xZCX8NrKAwCfYViW
-/r16Kiij2sM3MOfcHEmBs+0=
-=ipKy
------END PGP SIGNATURE-----
+MD5 af2c808b485a0d11dc1ec39479d03f9b files/centericq-4.21.0-ktools.diff.bz2 300
+MD5 da3f03f51a55055f887cd8f39f4a3126 files/digest-centericq-4.21.0-r2 70
diff --git a/net-im/centericq/centericq-4.21.0-r2.ebuild b/net-im/centericq/centericq-4.21.0-r2.ebuild
new file mode 100644
index 000000000000..15899cd1569c
--- /dev/null
+++ b/net-im/centericq/centericq-4.21.0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.21.0-r2.ebuild,v 1.1 2005/12/16 08:55:43 wschlich Exp $
+
+inherit eutils
+
+IUSE="bidi nls ssl crypt icq jabber aim msn yahoo irc rss lj"
+
+DESCRIPTION="A ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
+SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
+HOMEPAGE="http://thekonst.net/en/centericq"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="virtual/libc
+	>=sys-libs/ncurses-5.2
+	bidi? ( dev-libs/fribidi )
+	jabber? ( crypt? ( >=app-crypt/gpgme-1.0.2 ) )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	msn? ( net-misc/curl )"
+
+RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
+
+	# fix bug #100519
+	epatch ${FILESDIR}/${P}-icq-short-read.diff.bz2
+	epatch ${FILESDIR}/${P}-memory-handling.diff.bz2
+
+	# fix bug #114038
+	epatch ${FILESDIR}/${P}-ktools.diff.bz2
+}
+
+src_compile() {
+	local myopts="--with-gnu-ld --disable-konst"
+	use nls >&/dev/null && myopts="${myopts} --enable-locales-fix" || myopts="${myopts} --disable-nls"
+	use bidi >&/dev/null && myopts="${myopts} --with-fribidi"
+	use ssl >&/dev/null && myopts="${myopts} --with-ssl"
+	use ssl >&/dev/null && myopts="${myopts} --with-ssl"
+
+	use icq >&/dev/null || myopts="${myopts} --disable-icq"
+	use jabber >&/dev/null && {
+		use crypt >&/dev/null || myopts="${myopts} --without-gpgme"
+	} || myopts="${myopts} --disable-jabber"
+	use aim >&/dev/null || myopts="${myopts} --disable-aim"
+	use msn >&/dev/null || myopts="${myopts} --disable-msn"
+	if use msn >&/dev/null && ! use ssl >&/dev/null; then
+		eerror ""
+		eerror "USE flag problem"
+		eerror "================"
+		eerror "'msn' USE flag detected, but 'ssl' USE flag missing:"
+		eerror "MSN support needs libcurl with SSL support."
+		eerror ""
+		die "Please either activate the 'ssl' USE flag or deactivate the 'msn' USE flag for net-im/centericq"
+	fi
+	use yahoo >&/dev/null || myopts="${myopts} --disable-yahoo"
+	use irc >&/dev/null || myopts="${myopts} --disable-irc"
+	use rss >&/dev/null || myopts="${myopts} --disable-rss"
+	use lj >&/dev/null || myopts="${myopts} --disable-lj"
+
+	# Re-run autconf and automake to keep from barfing. This is a hack.
+	einfo "Running autoconf to fix configure scripts"
+	for i in $(ls -1 {.,*-*}/configure.in); do
+		IFS='/'; set -- ${i}; unset IFS; dir="${1}"
+		einfo "-> dir: ${dir}"
+		pushd ${dir} >/dev/null && WANT_AUTOCONF=2.5 autoconf && popd >/dev/null
+	done
+
+	econf ${myopts} || die "Configure failed"
+	emake || die "Compilation failed"
+}
+
+src_install () {
+	einstall || die "Installation failed"
+
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO
+}
diff --git a/net-im/centericq/files/centericq-4.21.0-ktools.diff.bz2 b/net-im/centericq/files/centericq-4.21.0-ktools.diff.bz2
new file mode 100644
index 000000000000..14249140e059
--- /dev/null
+++ b/net-im/centericq/files/centericq-4.21.0-ktools.diff.bz2
diff --git a/net-im/centericq/files/digest-centericq-4.21.0-r2 b/net-im/centericq/files/digest-centericq-4.21.0-r2
new file mode 100644
index 000000000000..f29f52a9b0ef
--- /dev/null
+++ b/net-im/centericq/files/digest-centericq-4.21.0-r2
@@ -0,0 +1 @@
+MD5 82e426f2b4f6f2ab799c28807f36ade6 centericq-4.21.0.tar.bz2 1422126