Cleanup.

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

5 files changed, 7 insertions, 335 deletions

diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index b6ba8e93410b..9c0217f5a944 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.35 2009/04/15 19:44:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.36 2009/05/02 21:03:56 swegener Exp $
+
+  02 May 2009; Sven Wegener <swegener@gentoo.org> -centerim-4.22.6.ebuild,
+  -centerim-4.22.6-r1.ebuild, -centerim-4.22.7.ebuild:
+  Cleanup.
 
   15 Apr 2009; Markus Meier <maekke@gentoo.org> centerim-4.22.7-r1.ebuild:
   x86 stable, bug #264607
diff --git a/net-im/centerim/centerim-4.22.6-r1.ebuild b/net-im/centerim/centerim-4.22.6-r1.ebuild
deleted file mode 100644
index 607cfcba7853..000000000000
--- a/net-im/centerim/centerim-4.22.6-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.6-r1.ebuild,v 1.1 2009/01/22 17:51:06 swegener Exp $
-
-EAPI="2"
-
-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[ssl]
-		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 otr && ! use jabber
-	then
-		ewarn
-		ewarn "Support for OTR is only supported with Jabber!"
-		ewarn
-	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() {
-	default
-
-	# Don't execute git commands, bug #228151
-	cat >"${S}"/misc/git-version-gen <<-EOF
-		#!/bin/sh
-		echo -n "${PVR}"
-	EOF
-}
-
-src_configure() {
-	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"
-}
-
-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.6.ebuild b/net-im/centerim/centerim-4.22.6.ebuild
deleted file mode 100644
index 96c0938e7f45..000000000000
--- a/net-im/centerim/centerim-4.22.6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.6.ebuild,v 1.4 2009/03/07 19:40:25 gentoofan23 Exp $
-
-EAPI="2"
-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="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[ssl]
-		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 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}"
-
-	# Don't execute git commands, bug #228151
-	cat >"${S}"/misc/git-version-gen <<-EOF
-		#!/bin/sh
-		echo -n "${PVR}"
-	EOF
-}
-
-src_configure() {
-	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)
-}
-
-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.7-r1.ebuild b/net-im/centerim/centerim-4.22.7-r1.ebuild
index bef60a3b0d0e..729547b2bbeb 100644
--- a/net-im/centerim/centerim-4.22.7-r1.ebuild
+++ b/net-im/centerim/centerim-4.22.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.7-r1.ebuild,v 1.3 2009/04/15 19:44:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.7-r1.ebuild,v 1.4 2009/05/02 21:03:56 swegener Exp $
 
 EAPI="2"
 
@@ -75,7 +75,7 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
+src_prepare() {
 	default
 
 	epatch "${FILESDIR}"/${P}-libgadu-CVE-2008-4776.patch
diff --git a/net-im/centerim/centerim-4.22.7.ebuild b/net-im/centerim/centerim-4.22.7.ebuild
deleted file mode 100644
index 0e99130e220b..000000000000
--- a/net-im/centerim/centerim-4.22.7.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.7.ebuild,v 1.1 2009/02/25 23:31:15 swegener Exp $
-
-EAPI="2"
-
-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.bz2"
-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[ssl]
-		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 otr && ! use jabber
-	then
-		ewarn
-		ewarn "Support for OTR is only supported with Jabber!"
-		ewarn
-	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() {
-	default
-
-	# Don't execute git commands, bug #228151
-	cat >"${S}"/misc/git-version-gen <<-EOF
-		#!/bin/sh
-		echo -n "${PVR}"
-	EOF
-}
-
-src_configure() {
-	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"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog FAQ README THANKS TODO
-}