Fixed compile problems when gg USE flag is disabled, bug #100186. Stable on x86

Package-Manager: portage-2.0.51.22-r2

4 files changed, 54 insertions, 13 deletions

diff --git a/net-im/centericq/ChangeLog b/net-im/centericq/ChangeLog
index 2479b9483c4f..1079a2e1c78a 100644
--- a/net-im/centericq/ChangeLog
+++ b/net-im/centericq/ChangeLog
@@ -1,6 +1,10 @@
 # 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.65 2005/07/24 17:09:06 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/ChangeLog,v 1.66 2005/07/25 12:20:54 sekretarz Exp $
+
+  25 Jul 2005; <sekretarz@gentoo.org> files/centericq-4.20.0-libgadu.patch,
+  centericq-4.20.0-r3.ebuild:
+  Fixed compile problems when gg USE flag is disabled, bug #100186. Stable on x86
 
   24 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   centericq-4.20.0-r3.ebuild:
diff --git a/net-im/centericq/Manifest b/net-im/centericq/Manifest
index db7f4eb68bf0..be5791614acf 100644
--- a/net-im/centericq/Manifest
+++ b/net-im/centericq/Manifest
@@ -1,9 +1,19 @@
-MD5 46ce3ffc8f7cfe7c234b7ac74d2d0747 ChangeLog 9693
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f87bde9c0093587ef76f595a99652913 centericq-4.20.0-r2.ebuild 2492
-MD5 5c62810cadb99037971dc6eea08c19d8 centericq-4.20.0-r3.ebuild 2565
 MD5 7f795e49e944fe6f3aa15fe53e8da366 metadata.xml 693
+MD5 a5cec2cbad7462df4a8c0ac4e0ba35a3 centericq-4.20.0-r3.ebuild 2638
+MD5 da001e8c9d689d3e2da08924b4267f6c ChangeLog 9881
+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 27714944a72058a8f8c3e46444311651 files/centericq-4.20.0-libgadu.patch 4145
 MD5 cb21aa5d990cbba3ea7fde0c48731fe2 files/digest-centericq-4.20.0-r3 70
-MD5 487cf21de72d6434e5c0fff2a8bcc73b files/centericq-4.20.0-libgadu.patch 3413
-MD5 73abf7a5deb27baf431c12003caeb02d files/centericq-4.20.0.CAN-2005-1914.patch.bz2 576
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC5PWnZ/iYVBmujdURApzaAJ9Z/iqcjVBvArqaLL6ZXsLDgyf3owCaAs07
+cm+452hy0TblWsAiF6fAV0k=
+=Pfkp
+-----END PGP SIGNATURE-----
diff --git a/net-im/centericq/centericq-4.20.0-r3.ebuild b/net-im/centericq/centericq-4.20.0-r3.ebuild
index e024bddde026..60bdfaa41cfb 100644
--- a/net-im/centericq/centericq-4.20.0-r3.ebuild
+++ b/net-im/centericq/centericq-4.20.0-r3.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2005/07/24 17:09:06 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.20.0-r3.ebuild,v 1.4 2005/07/25 12:20:54 sekretarz Exp $
 
-inherit eutils
+inherit eutils libtool
 
 IUSE="bidi nls ssl crypt icq jabber aim msn yahoo gg irc rss lj"
 
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="x86 ~sparc ~amd64 ppc ~hppa"
 
 DEPEND="virtual/libc
 	gg? ( >=net-libs/libgadu-20050719 )
@@ -27,11 +27,13 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
+	export WANT_AUTOCONF=2.5
 	# security fix, see CAN-2005-1914 -- from CenterICQ CVS, 20050718
 	epatch ${FILESDIR}/${P}.CAN-2005-1914.patch.bz2
 
 	epatch ${FILESDIR}/${P}-libgadu.patch
+	autoreconf --force
+	autoreconf --install
 	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
 }
 
diff --git a/net-im/centericq/files/centericq-4.20.0-libgadu.patch b/net-im/centericq/files/centericq-4.20.0-libgadu.patch
index ab015f077df1..a13e8159c349 100644
--- a/net-im/centericq/files/centericq-4.20.0-libgadu.patch
+++ b/net-im/centericq/files/centericq-4.20.0-libgadu.patch
@@ -1,6 +1,31 @@
+diff -Naur centericq-4.20.0.orig/configure.in centericq-4.20.0/configure.in
+--- centericq-4.20.0.orig/configure.in	2005-02-03 02:06:36.000000000 +0100
++++ centericq-4.20.0/configure.in	2005-07-25 15:09:54.488581400 +0200
+@@ -220,9 +220,12 @@
+ AC_ARG_WITH(libjpeg,
+     [  --without-libjpeg        Compile without JPEG token support (for Gadu-Gadu registration)])
+ 
++libgadu_ldd=
++
+ if test "$build_gg" = "yes"; then
+     AC_DEFINE(BUILD_GADU, 1, [build with gadu-gadu support])
+-
++    
++    libgadu_ldd=-lgadu
+     if test "x$with_libjpeg" != "xno"; then
+ 	AC_CHECK_LIB(jpeg, jpeg_start_decompress,
+ 	[ 
+@@ -235,6 +238,7 @@
+ 	])
+     fi
+ fi
++AC_SUBST(libgadu_ldd)
+ 
+ if test "$build_msn" = "yes"; then
+     if test -z "$CURL_CONFIG"; then
 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
++++ centericq-4.20.0/Makefile.am	2005-07-25 15:11:46.969481704 +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
@@ -9,15 +34,15 @@ diff -Naur centericq-4.20.0.orig/Makefile.am centericq-4.20.0/Makefile.am
  	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
++++ centericq-4.20.0/src/Makefile.am	2005-07-25 15:10:24.154071560 +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
++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
  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@
++centericq_LDADD = $(top_srcdir)/src/hooks/libhooks.a  -lfiretalk -lkkconsui -lkkstrtext -llibicq2000 -llibjabber -llibyahoo2 -lkksystr -lconnwrap $(libgadu_ldd) -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