Include a linking fix for bidi support, bug #200900. Cleanup.

(Portage version: 2.1.3.19)

11 files changed, 37 insertions, 372 deletions

diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index b91299c76122..3dda8563aab3 100644
--- a/net-im/centerim/ChangeLog
+++ b/net-im/centerim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/centerim
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.8 2007/12/08 20:51:13 swegener Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.9 2008/01/01 14:10:22 swegener Exp $
+
+  01 Jan 2008; Sven Wegener <swegener@gentoo.org>
+  +files/centerim-4.22.2-fribidi.patch, -files/centerim-ack-sbl.patch,
+  -files/centerim-imotr-config.patch, -centerim-4.22.1_p20071003.ebuild,
+  -centerim-4.22.1_p20071022.ebuild, -centerim-4.22.1_p20071103.ebuild,
+  centerim-4.22.2.ebuild:
+  Include a linking fix for bidi support, bug #200900. Cleanup.
 
 *centerim-4.22.2 (08 Dec 2007)
 
diff --git a/net-im/centerim/centerim-4.22.1_p20071003.ebuild b/net-im/centerim/centerim-4.22.1_p20071003.ebuild
deleted file mode 100644
index e476d4e59bb5..000000000000
--- a/net-im/centerim/centerim-4.22.1_p20071003.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20071003.ebuild,v 1.5 2007/11/28 20:08:06 swegener Exp $
-
-inherit eutils
-
-PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
-IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
-
-DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
-then
-	SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz"
-else
-	SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz"
-fi
-HOMEPAGE="http://www.centerim.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	bidi? ( dev-libs/fribidi )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	jpeg? ( media-libs/jpeg )
-	otr? ( net-libs/libotr )
-	jabber? ( crypt? ( >=app-crypt/gpgme-1.0.2 ) )
-	msn? (
-		net-misc/curl
-		dev-libs/openssl
-	)"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"/${P/_p*}
-
-check_protocol_iuse() {
-	local flag
-
-	for flag in ${PROTOCOL_IUSE}
-	do
-		use ${flag} && return 0
-	done
-
-	return 1
-}
-
-pkg_setup() {
-	if ! check_protocol_iuse
-	then
-		eerror
-		eerror "Please activate at least one of the following protocol USE flags:"
-		eerror "${PROTOCOL_IUSE}"
-		eerror
-		die "Please activate at least one protocol USE flag!"
-	fi
-
-	if use msn && ! built_with_use net-misc/curl ssl
-	then
-		eerror
-		eerror "As of right now, the msn use flags requires curl to be built"
-		eerror "with SSL support. Make sure ssl is in your USE flags and"
-		eerror "re-emerge net-misc/curl."
-		eerror
-		die "net-misc/curl dependencie issue"
-	fi
-
-	if use gadu && ! use jpeg
-	then
-		ewarn
-		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
-		ewarn
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-imotr-config.patch
-	epatch "${FILESDIR}"/${PN}-ack-sbl.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with ssl) \
-		$(use_enable aim) \
-		$(use_with bidi fribidi) \
-		$(use_with jpeg libjpeg) \
-		$(use_with otr libotr) \
-		$(use_enable gadu gg) \
-		$(use_enable icq) \
-		$(use_enable irc) \
-		$(use_enable jabber) \
-		$(use_enable lj) \
-		$(use_enable msn) \
-		$(use_enable nls locales-fix) \
-		$(use_enable nls) \
-		$(use_enable rss) \
-		$(use_enable yahoo) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
-}
diff --git a/net-im/centerim/centerim-4.22.1_p20071022.ebuild b/net-im/centerim/centerim-4.22.1_p20071022.ebuild
deleted file mode 100644
index 24f7f6f20ff2..000000000000
--- a/net-im/centerim/centerim-4.22.1_p20071022.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20071022.ebuild,v 1.4 2007/11/28 20:08:06 swegener Exp $
-
-inherit eutils
-
-PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
-IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
-
-DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
-then
-	SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz"
-else
-	SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz"
-fi
-HOMEPAGE="http://www.centerim.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	bidi? ( dev-libs/fribidi )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	jpeg? ( media-libs/jpeg )
-	otr? ( net-libs/libotr )
-	jabber? ( crypt? ( >=app-crypt/gpgme-1.0.2 ) )
-	msn? (
-		net-misc/curl
-		dev-libs/openssl
-	)"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"/${P/_p*}
-
-check_protocol_iuse() {
-	local flag
-
-	for flag in ${PROTOCOL_IUSE}
-	do
-		use ${flag} && return 0
-	done
-
-	return 1
-}
-
-pkg_setup() {
-	if ! check_protocol_iuse
-	then
-		eerror
-		eerror "Please activate at least one of the following protocol USE flags:"
-		eerror "${PROTOCOL_IUSE}"
-		eerror
-		die "Please activate at least one protocol USE flag!"
-	fi
-
-	if use msn && ! built_with_use net-misc/curl ssl
-	then
-		eerror
-		eerror "As of right now, the msn use flags requires curl to be built"
-		eerror "with SSL support. Make sure ssl is in your USE flags and"
-		eerror "re-emerge net-misc/curl."
-		eerror
-		die "net-misc/curl dependencie issue"
-	fi
-
-	if use gadu && ! use jpeg
-	then
-		ewarn
-		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
-		ewarn
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-imotr-config.patch
-	epatch "${FILESDIR}"/${PN}-ack-sbl.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with ssl) \
-		$(use_enable aim) \
-		$(use_with bidi fribidi) \
-		$(use_with jpeg libjpeg) \
-		$(use_with otr libotr) \
-		$(use_enable gadu gg) \
-		$(use_enable icq) \
-		$(use_enable irc) \
-		$(use_enable jabber) \
-		$(use_enable lj) \
-		$(use_enable msn) \
-		$(use_enable nls locales-fix) \
-		$(use_enable nls) \
-		$(use_enable rss) \
-		$(use_enable yahoo) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
-}
diff --git a/net-im/centerim/centerim-4.22.1_p20071103.ebuild b/net-im/centerim/centerim-4.22.1_p20071103.ebuild
deleted file mode 100644
index 8f54e042dac8..000000000000
--- a/net-im/centerim/centerim-4.22.1_p20071103.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.1_p20071103.ebuild,v 1.2 2007/12/08 20:51:13 swegener Exp $
-
-inherit eutils
-
-PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
-IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
-
-DESCRIPTION="CenterIM is a fork of CenterICQ - a ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"
-if [[ ${PV} = *_p* ]] # is this a snaphot?
-then
-	SRC_URI="http://www.centerim.org/download/snapshots/${PN}-${PV/*_p/}.tar.gz"
-else
-	SRC_URI="http://www.centerim.org/download/releases/${P}.tar.gz"
-fi
-HOMEPAGE="http://www.centerim.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	bidi? ( dev-libs/fribidi )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	jpeg? ( media-libs/jpeg )
-	otr? ( net-libs/libotr )
-	jabber? ( crypt? ( >=app-crypt/gpgme-1.0.2 ) )
-	msn? (
-		net-misc/curl
-		dev-libs/openssl
-	)"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"/${P/_p*}
-
-check_protocol_iuse() {
-	local flag
-
-	for flag in ${PROTOCOL_IUSE}
-	do
-		use ${flag} && return 0
-	done
-
-	return 1
-}
-
-pkg_setup() {
-	if ! check_protocol_iuse
-	then
-		eerror
-		eerror "Please activate at least one of the following protocol USE flags:"
-		eerror "${PROTOCOL_IUSE}"
-		eerror
-		die "Please activate at least one protocol USE flag!"
-	fi
-
-	if use msn && ! built_with_use net-misc/curl ssl
-	then
-		eerror
-		eerror "As of right now, the msn use flags requires curl to be built"
-		eerror "with SSL support. Make sure ssl is in your USE flags and"
-		eerror "re-emerge net-misc/curl."
-		eerror
-		die "net-misc/curl dependencie issue"
-	fi
-
-	if use gadu && ! use jpeg
-	then
-		ewarn
-		ewarn "You need jpeg support to be able to register Gadu-Gadu accounts!"
-		ewarn
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-ack-sbl.patch
-}
-
-src_compile() {
-	econf \
-		$(use_with ssl) \
-		$(use_enable aim) \
-		$(use_with bidi fribidi) \
-		$(use_with jpeg libjpeg) \
-		$(use_with otr libotr) \
-		$(use_enable gadu gg) \
-		$(use_enable icq) \
-		$(use_enable irc) \
-		$(use_enable jabber) \
-		$(use_enable lj) \
-		$(use_enable msn) \
-		$(use_enable nls locales-fix) \
-		$(use_enable nls) \
-		$(use_enable rss) \
-		$(use_enable yahoo) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
-}
diff --git a/net-im/centerim/centerim-4.22.2.ebuild b/net-im/centerim/centerim-4.22.2.ebuild
index 1fcb0d7e2321..ae6afd4f25dd 100644
--- a/net-im/centerim/centerim-4.22.2.ebuild
+++ b/net-im/centerim/centerim-4.22.2.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.2.ebuild,v 1.1 2007/12/08 20:51:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.2.ebuild,v 1.2 2008/01/01 14:10:22 swegener Exp $
 
-inherit eutils
+WANT_AUTOMAKE="1.10"
+WANT_AUTOCONF="none"
+
+inherit eutils autotools
 
 PROTOCOL_IUSE="aim gadu icq irc jabber lj msn rss yahoo"
 IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
@@ -74,6 +77,15 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-fribidi.patch
+
+	eautomake
+}
+
 src_compile() {
 	econf \
 		$(use_with ssl) \
diff --git a/net-im/centerim/files/centerim-4.22.2-fribidi.patch b/net-im/centerim/files/centerim-4.22.2-fribidi.patch
new file mode 100644
index 000000000000..e6f53d8114de
--- /dev/null
+++ b/net-im/centerim/files/centerim-4.22.2-fribidi.patch
@@ -0,0 +1,13 @@
+--- centerim-4.22.2/src/Makefile.am
++++ centerim-4.22.2/src/Makefile.am
+@@ -6,6 +6,10 @@
+ if HAVE_LIBOTR
+ centerim_SOURCES += imotr.cc
+ endif
++if HAVE_FRIBIDI
++centerim_LDADD += $(FRIBIDI_LIBS)
++#centerim_CFLAGS += $(FRIBIDI_CFLAGS)
++endif
+ if BUILD_FIRETALK
+ centerim_LDFLAGS += -L$(top_builddir)/firetalk
+ centerim_LDADD += -lfiretalk
diff --git a/net-im/centerim/files/centerim-ack-sbl.patch b/net-im/centerim/files/centerim-ack-sbl.patch
deleted file mode 100644
index 55669e153587..000000000000
--- a/net-im/centerim/files/centerim-ack-sbl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Roger <roger@jikos.cz>
-Date: Sun, 25 Nov 2007 18:18:07 +0000 (+0100)
-Subject: Bug #39: Ack SBL to get status notifications
-X-Git-Url: http://repo.or.cz/w/centerim.git?a=commitdiff_plain;h=152235ac92c0c1c9a26ccb05e43c423b4ed64783
-
-Bug #39: Ack SBL to get status notifications
----
-
-diff --git a/libicq2000/src/Client.cpp b/libicq2000/src/Client.cpp
-index 3bb4d36..8e453c8 100644
---- a/libicq2000/src/Client.cpp
-+++ b/libicq2000/src/Client.cpp
-@@ -1524,7 +1524,7 @@ namespace ICQ2000
- 	SignalLog(LogEvent::INFO, "Received server-based list from server\n");
- 	SBLListSNAC *sbs = static_cast<SBLListSNAC*>(snac);
- 	mergeSBL( sbs->getContactTree() );
--//        SendSBLReceivedACK();
-+        SendSBLReceivedACK();
- 	break;
-       }
-       
diff --git a/net-im/centerim/files/centerim-imotr-config.patch b/net-im/centerim/files/centerim-imotr-config.patch
deleted file mode 100644
index b90fbc9630fc..000000000000
--- a/net-im/centerim/files/centerim-imotr-config.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- centerim/src/imotr.cc
-+++ centerim/src/imotr.cc
-@@ -1,3 +1,5 @@
-+#include "config.h"
-+
- #include "imotr.h"
- 
- 
diff --git a/net-im/centerim/files/digest-centerim-4.22.1_p20071003 b/net-im/centerim/files/digest-centerim-4.22.1_p20071003
deleted file mode 100644
index 2deac155195c..000000000000
--- a/net-im/centerim/files/digest-centerim-4.22.1_p20071003
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ca0b169aee9f730d63fff0fb4f7af03e centerim-20071003.tar.gz 2676733
-RMD160 32c06d8aa6d68b1f4bbd0ee4b7ba179612f2be95 centerim-20071003.tar.gz 2676733
-SHA256 c0b4d0e3275490392771c8637802c8cf78e0cc103289568af3ded554c054e678 centerim-20071003.tar.gz 2676733
diff --git a/net-im/centerim/files/digest-centerim-4.22.1_p20071022 b/net-im/centerim/files/digest-centerim-4.22.1_p20071022
deleted file mode 100644
index 7051ddb20c83..000000000000
--- a/net-im/centerim/files/digest-centerim-4.22.1_p20071022
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fae3d8598e5cb35de28d8e778263ca15 centerim-20071022.tar.gz 2678287
-RMD160 81f6daa3b5e0de418884bb3e466953e53aa79cd4 centerim-20071022.tar.gz 2678287
-SHA256 1e0fa12c3e4d4361b0d4d471928f34b8b9d28453c99d919bab201b8f2c230219 centerim-20071022.tar.gz 2678287
diff --git a/net-im/centerim/files/digest-centerim-4.22.1_p20071103 b/net-im/centerim/files/digest-centerim-4.22.1_p20071103
deleted file mode 100644
index 2f8d1a409709..000000000000
--- a/net-im/centerim/files/digest-centerim-4.22.1_p20071103
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5679cce67ac21f2fa2411f258e608054 centerim-20071103.tar.gz 2612329
-RMD160 db403c5747d5cd1a34295044ec048030e82fc6cb centerim-20071103.tar.gz 2612329
-SHA256 c8417b5ecd46c66cfcd16df117c402bd72c55aa117f025866e3d41743972b014 centerim-20071103.tar.gz 2612329