Cleanup.

Package-Manager: portage-2.2_rc32/cvs/Linux x86_64

6 files changed, 13 insertions, 345 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/Manifest b/net-im/centerim/Manifest
index 25ba4699041c..a78271be467f 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -2,18 +2,14 @@
 Hash: SHA1
 
 AUX centerim-4.22.7-libgadu-CVE-2008-4776.patch 555 RMD160 7e9c908827544aef065f0091b0eb94d44d89f4a6 SHA1 28ab98f6561f8f8773f90c664d15a3a55b02dc6e SHA256 d13bd5f672e24036cd9ce1884da96fe11f27a439cfd9ca27ec2d6ce7ba3d41fc
-DIST centerim-4.22.6.tar.gz 2284721 RMD160 8e4185aefc3788efb2086758e845fb3b603c7323 SHA1 587ed5efd11c32ffbcf93698ca16accc182dd4ec SHA256 66785b044fb3ab9aa046343c9dded8357f1a980f1b4e76ee0669bb7fd52855e0
 DIST centerim-4.22.7.tar.bz2 1794779 RMD160 83c579db34fe6e7c5d539cf78102a2de6b89f47a SHA1 c0b3433ed260fca23f8e10999c1cf91895489b35 SHA256 59356d55d7fb293809d8d26fdef6bcb07bf3dd1452e11e3798ac3550cba5efcd
-EBUILD centerim-4.22.6-r1.ebuild 2385 RMD160 41f056af875fa78949105b6c2b7e6e3935ab0504 SHA1 658ca65c78e69aea3dc996582a573365e5b4d074 SHA256 7f71ea3043e9668017c845bc198bff0d9571840229b35b5513243ce3757c1783
-EBUILD centerim-4.22.6.ebuild 2434 RMD160 cce9711f2a3fc69682e1586680ca0c04346d297e SHA1 ae1c58c315f254a89ed9e2721f942e866926e38b SHA256 35ece7ecd1324de648984374f743453ca9880977015e8148c4884d8b0251aa08
-EBUILD centerim-4.22.7-r1.ebuild 2454 RMD160 bf32225837011c4a6dffe3875c0c512f841349d0 SHA1 f498cd9bdc7f0508dde703b92acbb459d11b62ed SHA256 cd08d50723b93683c8f593c3751d8e6a6efd6181f7870feb87e2c72c3e658a01
-EBUILD centerim-4.22.7.ebuild 2383 RMD160 6f910dd084a75813069bb0cd7e9f87b68fcf70d7 SHA1 656bb9c669f11701997aa784d27a99fd293cfc2b SHA256 033acaf035cfe23ed4df30f2835ef58c93ce8652a40bb162e44e1bb0e8df59e1
-MISC ChangeLog 5875 RMD160 8062513ed7c2688967d4602a87d37fd6759222cc SHA1 2389255c374743819417f6c269679c035bd90256 SHA256 18b16a70e59c5022227263154fa0a8ffe500c9689b9dad4c68ea1ac73544d690
+EBUILD centerim-4.22.7-r1.ebuild 2457 RMD160 6e2725798a273dedaa20a9e8b9132a55038719d5 SHA1 355f55dd45741a8015381adc0d9ee336d6ee1f1f SHA256 48226948f41610d60189dc7283ad8bb9d2036b5c09d4abc1c81f7954de53a979
+MISC ChangeLog 6019 RMD160 95c4d0897ea439f38bf68ca93f8f76bce27a5e11 SHA1 2d3a0edd3c44df245fa1e26a69781eb498ecec0f SHA256 de63324d31cdf7dbe9b203e29bb7084e080390bab273fb24f72b1fc83e9b7443
 MISC metadata.xml 541 RMD160 27854f0c9356b45252baec904025bb06782f084e SHA1 591145cbbb6c177e36e498af16342dee1841157b SHA256 e7c1b47a4545dcb4d9502e3fd77da7f6d83d559e43da84e3428c5d298ee773f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknmOSMACgkQkKaRLQcq0GIn0gCZAUE2oKHlq0af7zVINd/5lSc/
-OWUAnRAXuMuAiJCSV3Qu3U3crQjdqWBz
-=i5h4
+iEYEARECAAYFAkn8tUIACgkQI1lqEGTUzyQTdwCcDkb/vuaGIIHGfJO18ThuFlYy
++o4An2llHiqMxlHhn7Oj5RP93KcUlbaL
+=+EzA
 -----END PGP SIGNATURE-----
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
-}