Remove release candidate.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.24-gentoo-r2-JeR i686

3 files changed, 5 insertions, 102 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 6d4cb310a3af..6667292134d4 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/psi
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.140 2008/08/05 17:53:40 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.141 2008/08/07 02:04:37 jer Exp $
+
+  07 Aug 2008; Jeroen Roovers <jer@gentoo.org> -psi-0.12_rc4.ebuild:
+  Remove release candidate.
 
   05 Aug 2008; Thomas Anderson <gentoofan23@gentoo.org> metadata.xml:
   Add USE flag description to metadata as per GLEP 56.
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index c4b15022860f..464c02f61e4d 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX psi-0.10-gpg2.patch 505 RMD160 bfccc6ee984fac7b93ef0343a16c84bd6653d60d SHA1 b9d79a567cbbca837fb69a05ea8e59e07fdadf36 SHA256 cedeef3a18d0f7c4d50d1d86d9de88cceddf352977b2ae7df72451f3ba188348
 AUX psi-desktop2.patch 508 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 SHA1 71ddba6d8cafa8b7de218620dd7373758cc064d9 SHA256 b4045dafc0bc00b0167449693fc3e9b2f53041a070a93954f8939ee0866efa8e
 AUX psi-echoplugin.patch 785 RMD160 eba6e881b251062d5f102d0a9450239eb778cf75 SHA1 1ba5d83ce9cf517e13eb6510ea16b62641c276f1 SHA256 9476e8de292427a7c3e209a72cd2ee5663bfe76e88b89618414adde84991c8ff
@@ -13,7 +10,6 @@ DIST gentoo-psi-0.10-r2.tar.bz2 36370 RMD160 157b2f6fd4d1be8886572f10752a94b732c
 DIST gentoo-psi-0.10.tar.bz2 211538 RMD160 35b7c7c45420ee18917f3b073e063ef3b046ef3a SHA1 96723e8172c581c5e21f5e245658382ded49e6f1 SHA256 1d499ecb693401a69600d48c62bc3cbd3f4eed7605729655959d13af981d72bd
 DIST psi-0.10.tar.bz2 1430929 RMD160 b8be1490cd02f61cf86f09f2dc9f29716ea4c186 SHA1 f1687f8b93338f47cb1c8fa363e4b4f58628f167 SHA256 e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1
 DIST psi-0.11.tar.bz2 2000216 RMD160 0e4ce707d7659e02d29b16d6d95a4c4c8ba9850a SHA1 834fac4b51d92e2502cb08d01d40f05ffcdce4a2 SHA256 be37b7b8d86e965362512f47bf68af2b21d35e5c886a9e0eccf1c9bc519706b3
-DIST psi-0.12-RC4.tar.bz2 2142463 RMD160 b2214bac6873e1b9ab192c77fff6296e8c2609b1 SHA1 ce6b38de30a65fb2bd83c13678a7e36424a26017 SHA256 670c961ab5c51a6fe1e33ea0044f9abda45f422f10065434746a6e87ec3ed07e
 DIST psi-0.12.tar.bz2 2122406 RMD160 be5922ef84040113b257aaf99ac9bd350b69349c SHA1 2927497a53d1eb00720718ec41cf61a911914922 SHA256 0309d48891ab18cb8afc15416db2e9db979bc66f5cd879b382de226043e91e6c
 DIST psi-extras-insecure.tar.bz2 15914 RMD160 a61d51cbc9280677f62d3121eada4981573842fa SHA1 22c8da902f00ae401df756b0d4195dc70083a9ff SHA256 44ac11a3f1a3280a2dc613dc3719a4750f30aadd4516bee61942409d648c4740
 DIST psi_ar-0.9.3.tar.bz2 31466 RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 SHA1 8aedb3f8cfdda29ccf5a59c9b0f84462fcd3b649 SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9
@@ -48,13 +44,5 @@ EBUILD psi-0.10-r3.ebuild 11114 RMD160 976ca5966451c160c5b9d1a3b807e448e3806cba
 EBUILD psi-0.10-r4.ebuild 11389 RMD160 d393d04a7fb5e10e6c46abac2e4f28b803e32942 SHA1 9d90108f34b0ca189f9c798726b4b15b47cf5e48 SHA256 582ee499893d4e8a5f7fe9b3eeb7881349e8bfd43dc2abd2b0b6cb5dfe00f09e
 EBUILD psi-0.11.ebuild 1844 RMD160 28016985fe6c57db9580c6ba84ab6666a9128905 SHA1 8e588b64ff92d1a2946e269720725244e69be204 SHA256 9f5f71494f61796fa4c998615c6838905c733bdb7ed18f3ab85fe77682fc4853
 EBUILD psi-0.12.ebuild 2438 RMD160 33dc4565c384595e31e7aa0432c719648167a8fb SHA1 77ded4cde4e3b9b163186087a5411c22f68d5b48 SHA256 c0910d983ccc41bbc9554f71aa640c12f217026b9b7d8987582d098441fa598c
-EBUILD psi-0.12_rc4.ebuild 2488 RMD160 5113b1b702b5b8d0e0f47df1f944d8543b073e61 SHA1 bab4acd4206ab00b7326ea10cb2bbd7476096d42 SHA256 759e5bb7a63a1d228e74552818821e486cd163c10ba7ec844bdb173d22bc6410
-MISC ChangeLog 19832 RMD160 3834da48c9ab0ac26cca7c65985c0ad0ae1e5758 SHA1 ce4b0f2fda653aacac70d82be40596d70e8f9c90 SHA256 190a75a5c792086dde5665aff19f9d563c254442904996c5f4406de1319116b3
+MISC ChangeLog 19922 RMD160 7c386729ab31eb261017eb210e713493b4e5f6e7 SHA1 46e35e9da5d0529d36e0c1d7288b5339393d8934 SHA256 af427580034eab67c6032f229d16a64854d7d5dbf7e82c5fb5f4e19bf89d7e67
 MISC metadata.xml 598 RMD160 0745e608729d8d57e0655eba52d6122a019fbe8a SHA1 805e02b2b5da37fa30a07cad8d7d196ea4ac5051 SHA256 58abf1bd951a67c7c3cf7de9c712798664171f739f1372e7b27ca1b63d5e33ca
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiYl0MACgkQF6yMcaBxwHnlhgCgkFwXYzoeSIRPgEMdVlXCEl9Y
-ZDMAnRdKO0E+bD+EklfqYg+SIguMWm3J
-=YNiP
------END PGP SIGNATURE-----
diff --git a/net-im/psi/psi-0.12_rc4.ebuild b/net-im/psi/psi-0.12_rc4.ebuild
deleted file mode 100644
index 38bd22d42b37..000000000000
--- a/net-im/psi/psi-0.12_rc4.ebuild
+++ /dev/null
@@ -1,88 +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/psi/psi-0.12_rc4.ebuild,v 1.4 2008/07/30 16:50:43 jer Exp $
-
-EAPI="1"
-
-inherit eutils qt4 multilib
-
-MY_P=${P/_rc/-RC}
-
-DESCRIPTION="Qt4 Jabber client, with Licq-like interface"
-HOMEPAGE="http://psi-im.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-IUSE="crypt dbus debug doc kernel_linux spell ssl xscreensaver"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-RESTRICT="test"
-
-COMMON_DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
-	=app-crypt/qca-2*
-	spell? ( app-text/aspell )
-	xscreensaver? ( x11-libs/libXScrnSaver )"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )"
-
-RDEPEND="${COMMON_DEPEND}
-	crypt? ( >=app-crypt/qca-gnupg-2.0.0_beta2 )
-	ssl? ( >=app-crypt/qca-ossl-2.0.0_beta2 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if has_version "=x11-libs/qt-4.3*"; then
-		QT4_BUILT_WITH_USE_CHECK="qt3support png"
-		QT4_OPTIONAL_BUILT_WITH_USE_CHECK="dbus"
-	else
-		if ! built_with_use "x11-libs/qt-gui:4" qt3support; then
-			eerror "You have to build x11-libs/qt-gui:4 with qt3support."
-			die "qt3support in qt-gui disabled"
-		fi
-		if ( use dbus && ! built_with_use "x11-libs/qt-gui:4" dbus ); then
-			eerror "You have to build x11-libs/qt-gui:4 with dbus"
-			die "dbus in qt-gui disabled"
-		fi
-	fi
-	qt4_pkg_setup
-}
-
-src_compile() {
-	# disable growl as it is a MacOS X extension only
-	local myconf="--prefix=/usr --qtdir=/usr"
-	myconf="${myconf} --disable-growl --disable-bundled-qca"
-	use debug && myconf="${myconf} --enable-debug"
-	use dbus || myconf="${myconf} --disable-qdbus"
-	use kernel_linux || myconf="${myconf} --disable-dnotify"
-	use spell || myconf="${myconf} --disable-aspell"
-	use xscreensaver || myconf="${myconf} --disable-xss"
-
-	# cannot use econf because of non-standard configure script
-	./configure ${myconf} || die "configure failed"
-
-	eqmake4 ${PN}.pro
-
-	SUBLIBS="-L/usr/${get_libdir}/qca2" emake || die "emake failed"
-
-	if use doc; then
-		cd doc
-		make api_public || die "make api_public failed"
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-
-	# this way the docs will be installed in the standard gentoo dir
-	newdoc iconsets/roster/README README.roster
-	newdoc iconsets/system/README README.system
-	newdoc certs/README README.certs
-	dodoc README
-
-	if use doc; then
-		cd doc
-		dohtml -r api || die "dohtml failed"
-	fi
-}