Cleanup.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 5 insertions, 162 deletions

diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index a0c4a8e12cd3..a09d24cf8fcf 100644
--- a/net-im/centerim/ChangeLog
+++ b/net-im/centerim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/centerim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.28 2009/01/22 17:51:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.29 2009/01/22 17:51:55 swegener Exp $
+
+  22 Jan 2009; Sven Wegener <swegener@gentoo.org>
+  -files/centerim-4.22.5-libotr-configure.patch, -centerim-4.22.5.ebuild:
+  Cleanup.
 
 *centerim-4.22.6-r1 (22 Jan 2009)
 
diff --git a/net-im/centerim/centerim-4.22.5.ebuild b/net-im/centerim/centerim-4.22.5.ebuild
deleted file mode 100644
index 67313b395e04..000000000000
--- a/net-im/centerim/centerim-4.22.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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.5.ebuild,v 1.7 2008/11/07 23:20:28 swegener Exp $
-
-WANT_AUTOMAKE="none"
-
-inherit eutils autotools
-
-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="amd64 x86 ~x86-fbsd"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	bidi? ( dev-libs/fribidi )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	jpeg? ( media-libs/jpeg )
-	jabber? (
-		otr? ( net-libs/libotr )
-		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 otr && ! use jabber
-	then
-		eerror
-		eerror "Support for OTR is only supported with Jabber!"
-		eerror
-		die "Support for OTR is only supported with Jabber!"
-	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}"/centerim-4.22.5-libotr-configure.patch
-
-	eautoreconf
-
-	# Don't execute git commands, bug #228151
-	cat >"${S}"/misc/git-version-gen <<-EOF
-		#!/bin/sh
-		echo -n "${PVR}"
-	EOF
-}
-
-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/files/centerim-4.22.5-libotr-configure.patch b/net-im/centerim/files/centerim-4.22.5-libotr-configure.patch
deleted file mode 100644
index 1d5cbff83699..000000000000
--- a/net-im/centerim/files/centerim-4.22.5-libotr-configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 42add0132dad8c32ec356d59d0f7daceb9d42ed8
-Author: Sven Wegener <sven.wegener@stealer.net>
-Date:   Tue Jul 22 02:18:03 2008 +0200
-
-    Fix configure.ac libotr error
-    
-    This fixes the following error:
-    
-    checking for otrl_init in -lotr... yes
-    checking libotr/context.h usability... yes
-    checking libotr/context.h presence... yes
-    checking for libotr/context.h... yes
-    ./configure: line 15006: libotr/userstate.h: No such file or directory
-    
-    Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 04ca231..56cf974 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -261,7 +261,7 @@ if test "x$with_libotr" != "xno"; then
- 
- 	AC_CHECK_LIB(otr, otrl_init,
- 	[
--		AC_CHECK_HEADERS(libotr/context.h, libotr/userstate.h
-+		AC_CHECK_HEADERS(libotr/context.h libotr/userstate.h,
- 		[
- 			AC_DEFINE(HAVE_LIBOTR, 1, [define if you have libotr])
-             OTR_LIBS="-lotr $LIBS"