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

Package-Manager: portage-2.1.3.19

12 files changed, 49 insertions, 422 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/Manifest b/net-im/centerim/Manifest
index 464b542bd827..df72f1540e14 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,58 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX centerim-ack-sbl.patch 741 RMD160 400c2d6f429e9108824b2f3e9fd60333c83d3d79 SHA1 4358b64babef802b27389fbe77c2abe46da88186 SHA256 d43f1f18aa896e47bb012b05311b850780c8de9c5f1a9bf1858ee69aca0560a3
-MD5 7d0b94522875ebd9bd8c6e0957377f55 files/centerim-ack-sbl.patch 741
-RMD160 400c2d6f429e9108824b2f3e9fd60333c83d3d79 files/centerim-ack-sbl.patch 741
-SHA256 d43f1f18aa896e47bb012b05311b850780c8de9c5f1a9bf1858ee69aca0560a3 files/centerim-ack-sbl.patch 741
-AUX centerim-imotr-config.patch 115 RMD160 7970ea1fe24b88aafb7ace0bc7e910ff996817c7 SHA1 86e001ad5c83dd2a1dbb87151f83418bb6ac6baa SHA256 30cb3b3cce143b52c508f1d48bb201f743321e2ec5dc778e90b78283e4985728
-MD5 43f4ddfb26c3e70502caeb513994e085 files/centerim-imotr-config.patch 115
-RMD160 7970ea1fe24b88aafb7ace0bc7e910ff996817c7 files/centerim-imotr-config.patch 115
-SHA256 30cb3b3cce143b52c508f1d48bb201f743321e2ec5dc778e90b78283e4985728 files/centerim-imotr-config.patch 115
-DIST centerim-20071003.tar.gz 2676733 RMD160 32c06d8aa6d68b1f4bbd0ee4b7ba179612f2be95 SHA1 551fae0da5eb40c27e4c8dbd01395bad2f57a4ef SHA256 c0b4d0e3275490392771c8637802c8cf78e0cc103289568af3ded554c054e678
-DIST centerim-20071022.tar.gz 2678287 RMD160 81f6daa3b5e0de418884bb3e466953e53aa79cd4 SHA1 f92cd34de4d74b44e1c07f60c571f4a2531bca4e SHA256 1e0fa12c3e4d4361b0d4d471928f34b8b9d28453c99d919bab201b8f2c230219
-DIST centerim-20071103.tar.gz 2612329 RMD160 db403c5747d5cd1a34295044ec048030e82fc6cb SHA1 368147ab46e8b92748c516afec2fd11067bbd37a SHA256 c8417b5ecd46c66cfcd16df117c402bd72c55aa117f025866e3d41743972b014
+AUX centerim-4.22.2-fribidi.patch 337 RMD160 00da52ef262cbf22af323b84e2c8483dda102120 SHA1 ad7450afe65b5ee17c1bb470f28c2ab9ebc0eba1 SHA256 5944886dd66bd1f9580ccf40c9f6b2bc80b13e6f5c9bef1dfdf7aed57db63d3a
+MD5 8f82092f10951a2cbb446b10fcca4953 files/centerim-4.22.2-fribidi.patch 337
+RMD160 00da52ef262cbf22af323b84e2c8483dda102120 files/centerim-4.22.2-fribidi.patch 337
+SHA256 5944886dd66bd1f9580ccf40c9f6b2bc80b13e6f5c9bef1dfdf7aed57db63d3a files/centerim-4.22.2-fribidi.patch 337
 DIST centerim-4.22.2.tar.gz 2625597 RMD160 28a732903d5d43de1c9d36373a1476c1435b4656 SHA1 c8568f1ccc516042a6e794eea8c63b6881de9153 SHA256 479549ad1efdb09b57a6ccb9ee0ae4b4e2328fff24be47ccc48fd95657138e19
-EBUILD centerim-4.22.1_p20071003.ebuild 2562 RMD160 aa1c73da1d69d6b7c2b82b3060536a2f7cfbe581 SHA1 8b75975c4cfa6203b18a3067caf8e7539efd48d7 SHA256 ac95cfabad5f6b4c52c8e5b594822308badb4ea3f0a5eebc64aff3d7835f6672
-MD5 7a9458dd8be75616b9951078c0002baf centerim-4.22.1_p20071003.ebuild 2562
-RMD160 aa1c73da1d69d6b7c2b82b3060536a2f7cfbe581 centerim-4.22.1_p20071003.ebuild 2562
-SHA256 ac95cfabad5f6b4c52c8e5b594822308badb4ea3f0a5eebc64aff3d7835f6672 centerim-4.22.1_p20071003.ebuild 2562
-EBUILD centerim-4.22.1_p20071022.ebuild 2562 RMD160 ce7a64b0c33eea9e1b4c28b21d11184412a11ed4 SHA1 0682af3f11b6574acf75690057428303f7e50bc8 SHA256 266a48b4bc0f40b13558439d41e370ced41ce12dcc97a191ba3d4b971c0271cf
-MD5 9ad50652a3d51aebf30cb920d8736618 centerim-4.22.1_p20071022.ebuild 2562
-RMD160 ce7a64b0c33eea9e1b4c28b21d11184412a11ed4 centerim-4.22.1_p20071022.ebuild 2562
-SHA256 266a48b4bc0f40b13558439d41e370ced41ce12dcc97a191ba3d4b971c0271cf centerim-4.22.1_p20071022.ebuild 2562
-EBUILD centerim-4.22.1_p20071103.ebuild 2515 RMD160 eca16005009985223f0ea0d7ba17c5ab86586d35 SHA1 64514f1ce867c7aff69e04951af057164759932f SHA256 6435f4f80ca865fbf26e528a21c0db89fc93fbda1bc3ce024ffa33aec0be0232
-MD5 d6f3aa1b45c696eff57da5484a5bb3a7 centerim-4.22.1_p20071103.ebuild 2515
-RMD160 eca16005009985223f0ea0d7ba17c5ab86586d35 centerim-4.22.1_p20071103.ebuild 2515
-SHA256 6435f4f80ca865fbf26e528a21c0db89fc93fbda1bc3ce024ffa33aec0be0232 centerim-4.22.1_p20071103.ebuild 2515
-EBUILD centerim-4.22.2.ebuild 2420 RMD160 c89ee4b17c8701fc2bf328f365ea414a5c2b3342 SHA1 e4c2485a729532ad4fd074d09dddd4076bef524e SHA256 459664d89fbbc5dd6ec9312d9484c3141d32adcc17986163f83c273e49d42dea
-MD5 f5377c23b2630637448ccb17eff62389 centerim-4.22.2.ebuild 2420
-RMD160 c89ee4b17c8701fc2bf328f365ea414a5c2b3342 centerim-4.22.2.ebuild 2420
-SHA256 459664d89fbbc5dd6ec9312d9484c3141d32adcc17986163f83c273e49d42dea centerim-4.22.2.ebuild 2420
-MISC ChangeLog 1921 RMD160 4e0cacdc304250bd1ee17a5a5be795f75f84f072 SHA1 da1efb2a4e48c7c4e8ae11d4e1fa8aec9b68f54e SHA256 b7f1932ebe7caf13fded8b122d7d0bbaa104c8641ee2f00184f0c5f5836388e6
-MD5 fcf48a97ed41e5ef2f78f8cc27a77ff8 ChangeLog 1921
-RMD160 4e0cacdc304250bd1ee17a5a5be795f75f84f072 ChangeLog 1921
-SHA256 b7f1932ebe7caf13fded8b122d7d0bbaa104c8641ee2f00184f0c5f5836388e6 ChangeLog 1921
+EBUILD centerim-4.22.2.ebuild 2569 RMD160 8794b06f9841313c300d995c5f70b9b5c5e978c0 SHA1 d8703c3c0298fb1114bd7b68c4948247c5c54497 SHA256 7543e7ac8581af27c10634dd19b3674a2b0fcb9ab99587194d213529f55eccd9
+MD5 ab21d6c37d433a592c52589c3c186a72 centerim-4.22.2.ebuild 2569
+RMD160 8794b06f9841313c300d995c5f70b9b5c5e978c0 centerim-4.22.2.ebuild 2569
+SHA256 7543e7ac8581af27c10634dd19b3674a2b0fcb9ab99587194d213529f55eccd9 centerim-4.22.2.ebuild 2569
+MISC ChangeLog 2278 RMD160 87f308ac02f69dfec00f0c47dc2f300d228ffdba SHA1 c44f90837b1ccaf10c1d879afdc4d105fe238e60 SHA256 200f372a1b7c2a0b41ee1be45900243aa9e8241c3153b598d0eb67622c41c3eb
+MD5 3e6c1aa8c72ab09cbc51224a861280ae ChangeLog 2278
+RMD160 87f308ac02f69dfec00f0c47dc2f300d228ffdba ChangeLog 2278
+SHA256 200f372a1b7c2a0b41ee1be45900243aa9e8241c3153b598d0eb67622c41c3eb ChangeLog 2278
 MISC metadata.xml 270 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 SHA1 6762f98354ff738ecbe57163b0bbfe9c95dabf15 SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602
 MD5 59ddc43b17320bfa384ade93c548f569 metadata.xml 270
 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 metadata.xml 270
 SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602 metadata.xml 270
-MD5 1b4bdde01b96ad76146c754fabf833c9 files/digest-centerim-4.22.1_p20071003 256
-RMD160 d7a46350a0d371f33d3db8e5044bcc09e9c396be files/digest-centerim-4.22.1_p20071003 256
-SHA256 e852c9ef9c9df340104cbb49bc714b3b0db47615c782548a3e35d035e28fc409 files/digest-centerim-4.22.1_p20071003 256
-MD5 92506ccd4bc7e12d6f6add2c0d2c34bf files/digest-centerim-4.22.1_p20071022 256
-RMD160 b9982983d60e64420c616f146db22d826bb98c2e files/digest-centerim-4.22.1_p20071022 256
-SHA256 4e263d92d233464e9fabb3ae2dfabd820de815fecbbdc328ae9c55cdf3875c56 files/digest-centerim-4.22.1_p20071022 256
-MD5 9475f101e63b15229e413e5a585bbde6 files/digest-centerim-4.22.1_p20071103 256
-RMD160 f4f62b24fa3d76e08c57cffeadf3dafd1d27cbb8 files/digest-centerim-4.22.1_p20071103 256
-SHA256 3d35b4aac013345830e427f9e7239a8eeae1636427dfa2f22faff41b99c297c2 files/digest-centerim-4.22.1_p20071103 256
 MD5 cdcaa61216ce5994bc4ae51c8b3f6823 files/digest-centerim-4.22.2 250
 RMD160 16e14a346de91e3464c26b7708a9a48134674d34 files/digest-centerim-4.22.2 250
 SHA256 27857b8e4636e56133c061a4e375436aea4391d6476a4ec541ec7225d59787be files/digest-centerim-4.22.2 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHWwPHI1lqEGTUzyQRAp6gAKDXzK8AxwIxLTasKm/OcMHXKYQrkACgmyhG
-sW8CHEIBvtk+4ZaGQ47PppA=
-=NFB9
------END PGP SIGNATURE-----
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