Forced centericq to use external gg lib, bug #99890

(Portage version: 2.0.51.22-r2)

5 files changed, 111 insertions, 4 deletions

diff --git a/net-im/centericq/ChangeLog b/net-im/centericq/ChangeLog
index 742170e44a89..6595943dd575 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.62 2005/07/18 16:34:37 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.63 2005/07/22 13:16:10 sekretarz Exp $
+
+*centericq-4.20.0-r3 (22 Jul 2005)
+
+  22 Jul 2005; <sekretarz@gentoo.org> +files/centericq-4.20.0-libgadu.patch,
+  +centericq-4.20.0-r3.ebuild:
+  Forced centericq to use external gg lib, bug #99890
 
 *centericq-4.20.0-r2 (18 Jul 2005)
 
diff --git a/net-im/centericq/Manifest b/net-im/centericq/Manifest
index d73b321fa078..059259228d9b 100644
--- a/net-im/centericq/Manifest
+++ b/net-im/centericq/Manifest
@@ -1,6 +1,9 @@
-MD5 21a2b0c94395626588254c59c855fd7f ChangeLog 9270
-MD5 7f795e49e944fe6f3aa15fe53e8da366 metadata.xml 693
+MD5 ccc474b1b6778d3f37389c80d691f535 ChangeLog 9469
 MD5 f87bde9c0093587ef76f595a99652913 centericq-4.20.0-r2.ebuild 2492
-MD5 0f60514eff0a237cf8fbdd13fd88293e files/centericq-amd64.patch 6291
+MD5 7f795e49e944fe6f3aa15fe53e8da366 metadata.xml 693
+MD5 7f5783105dfab2d6c25d22e77c29a5a8 centericq-4.20.0-r3.ebuild 2556
 MD5 73abf7a5deb27baf431c12003caeb02d files/centericq-4.20.0.CAN-2005-1914.patch.bz2 576
+MD5 0f60514eff0a237cf8fbdd13fd88293e files/centericq-amd64.patch 6291
 MD5 cb21aa5d990cbba3ea7fde0c48731fe2 files/digest-centericq-4.20.0-r2 70
+MD5 487cf21de72d6434e5c0fff2a8bcc73b files/centericq-4.20.0-libgadu.patch 3413
+MD5 cb21aa5d990cbba3ea7fde0c48731fe2 files/digest-centericq-4.20.0-r3 70
diff --git a/net-im/centericq/centericq-4.20.0-r3.ebuild b/net-im/centericq/centericq-4.20.0-r3.ebuild
new file mode 100644
index 000000000000..e4192060d0cf
--- /dev/null
+++ b/net-im/centericq/centericq-4.20.0-r3.ebuild
@@ -0,0 +1,74 @@
+# 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.20.0-r3.ebuild,v 1.1 2005/07/22 13:16:10 sekretarz Exp $
+
+inherit eutils
+
+IUSE="bidi nls ssl crypt icq jabber aim msn yahoo gg 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="~x86 ~sparc ~amd64 ~ppc ~hppa"
+
+DEPEND="virtual/libc
+	>=net-libs/libgadu-20050719
+	>=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}
+
+	# security fix, see CAN-2005-1914 -- from CenterICQ CVS, 20050718
+	epatch ${FILESDIR}/${P}.CAN-2005-1914.patch.bz2
+
+	epatch ${FILESDIR}/${P}-libgadu.patch
+	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
+}
+
+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 gg >&/dev/null || myopts="${myopts} --disable-gg"
+	use irc >&/dev/null || myopts="${myopts} --disable-irc"
+	use rss >&/dev/null || myopts="${myopts} --disable-rss"
+	use lj >&/dev/null || myopts="${myopts} --disable-lj"
+
+	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.20.0-libgadu.patch b/net-im/centericq/files/centericq-4.20.0-libgadu.patch
new file mode 100644
index 000000000000..ab015f077df1
--- /dev/null
+++ b/net-im/centericq/files/centericq-4.20.0-libgadu.patch
@@ -0,0 +1,23 @@
+diff -Naur centericq-4.20.0.orig/Makefile.am centericq-4.20.0/Makefile.am
+--- centericq-4.20.0.orig/Makefile.am	2005-02-03 02:06:50.000000000 +0100
++++ centericq-4.20.0/Makefile.am	2005-07-22 12:57:19.529645080 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 libgadu-0.1 libmsn-0.1 intl po misc share src
++SUBDIRS = firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 libmsn-0.1 intl po misc share src
+ dist-hook:
+ 	cd $(top_distdir); subs=`egrep "^[:space:]*SUBDIRS" Makefile.am | sed 's/SUBDIRS[ =]\+//g'`; \
+ 	echo "SUBDIRS = firetalk-0.1 kkconsui-0.1 kkstrtext-0.1 libicq2000-0.1 libjabber-0.1 libyahoo2-0.1 kksystr-0.1 connwrap-0.1 libgadu-0.1 libmsn-0.1 $$subs" >>.makefile.am; \
+diff -Naur centericq-4.20.0.orig/src/Makefile.am centericq-4.20.0/src/Makefile.am
+--- centericq-4.20.0.orig/src/Makefile.am	2005-02-03 02:06:36.000000000 +0100
++++ centericq-4.20.0/src/Makefile.am	2005-07-22 12:57:54.829278720 +0200
+@@ -1,8 +1,8 @@
+-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/firetalk-0.1 -I$(top_srcdir)/kkconsui-0.1/include -I$(top_srcdir)/kkstrtext-0.1 -I$(top_srcdir)/libicq2000-0.1 -I$(top_srcdir)/libjabber-0.1 -I$(top_srcdir)/libyahoo2-0.1 -I$(top_srcdir)/kksystr-0.1/include -I$(top_srcdir)/connwrap-0.1 -I$(top_srcdir)/libgadu-0.1 -I$(top_srcdir)/libicq2000-0.1/libicq2000 -I$(top_srcdir)/libmsn-0.1 -I$(top_srcdir)/intl
++INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/hooks -I$(top_srcdir)/firetalk-0.1 -I$(top_srcdir)/kkconsui-0.1/include -I$(top_srcdir)/kkstrtext-0.1 -I$(top_srcdir)/libicq2000-0.1 -I$(top_srcdir)/libjabber-0.1 -I$(top_srcdir)/libyahoo2-0.1 -I$(top_srcdir)/kksystr-0.1/include -I$(top_srcdir)/connwrap-0.1 -I$(top_srcdir)/libicq2000-0.1/libicq2000 -I$(top_srcdir)/libmsn-0.1 -I$(top_srcdir)/intl -I/usr/include
+ bin_PROGRAMS = centericq
+ centericq_SOURCES = icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc icqface.cc centermain.cc icqgroup.cc centericq.cc impgp.cc
+ centericq_LDFLAGS = -L$(top_srcdir)/firetalk-0.1 -L$(top_srcdir)/kkconsui-0.1 -L$(top_srcdir)/kkstrtext-0.1 -L$(top_srcdir)/libicq2000-0.1 -L$(top_srcdir)/libjabber-0.1 -L$(top_srcdir)/libyahoo2-0.1 -L$(top_srcdir)/kksystr-0.1 -L$(top_srcdir)/connwrap-0.1 -L$(top_srcdir)/libgadu-0.1 -L$(top_srcdir)/libmsn-0.1
+-centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lfiretalk -lkkconsui -lkkstrtext -llibicq2000 -llibjabber -llibyahoo2 -lkksystr -lconnwrap -llibgadu -llibmsn @INTLLIBS@
++centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lfiretalk -lkkconsui -lkkstrtext -llibicq2000 -llibjabber -llibyahoo2 -lkksystr -lconnwrap -lgadu -llibmsn @INTLLIBS@
+ SUBDIRS = hooks
+ EXTRA_DIST = icqcontact.cc icqgroups.cc eventmanager.cc icqdialogs.cc icqhist.cc imexternal.cc imcontact.cc imlogger.cc accountmanager.cc icqcontacts.cc icqmlist.cc imcontroller.cc icqconf.cc imevents.cc icqface.cc centermain.cc icqgroup.cc centericq.cc impgp.cc icqmlist.h imcontroller.h icqcommon.h icqcontacts.h centericq.h icqgroup.h imcontact.h accountmanager.h eventmanager.h imevents.h icqcontact.h imlogger.h icqconf.h icqface.h icqgroups.h icqhist.h imexternal.h impgp.h
+ AUTOMAKE_OPTIONS = foreign
diff --git a/net-im/centericq/files/digest-centericq-4.20.0-r3 b/net-im/centericq/files/digest-centericq-4.20.0-r3
new file mode 100644
index 000000000000..035c446f9a1f
--- /dev/null
+++ b/net-im/centericq/files/digest-centericq-4.20.0-r3
@@ -0,0 +1 @@
+MD5 bbb81f87b4ecb703dec31a8092303914 centericq-4.20.0.tar.bz2 1287040