Version bump to newest snap. And some more ebuild changes / cleanups (see changelog)

Package-Manager: portage-2.1.2_rc4-r2

3 files changed, 22 insertions, 94 deletions

diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 5678f22381c5..1cd79f6eecd9 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX psi-desktop2.patch 508 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 SHA1 71ddba6d8cafa8b7de218620dd7373758cc064d9 SHA256 b4045dafc0bc00b0167449693fc3e9b2f53041a070a93954f8939ee0866efa8e
 MD5 73fdd72109e3a7469c80d96ed5f5d410 files/psi-desktop2.patch 508
 RMD160 50037b740407ec36e5d01386f145f5f055e4eae0 files/psi-desktop2.patch 508
@@ -21,7 +24,7 @@ SHA256 2a690a7cda661884ce3424530ac6569a7fcb1e6c97342c120767a0d5058c403c files/ps
 DIST gentoo-psi-0.10-r2.tar.bz2 36370 RMD160 157b2f6fd4d1be8886572f10752a94b732cead8f SHA1 67004e3e70ab30129d174567b0332f0577a19dd9 SHA256 e450004e358e949113db1c298990a0d0514012f605ad1d7710b204eb82209a75
 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-beta4.tar.bz2 2332694 RMD160 67fad43ffe807ae0ca1496c7e7ae27a817995788 SHA1 0b7a2037ed1f6ad0ab46e5672af98861cbd60064 SHA256 37dddbfb3e47a55b4b98f10013055a9a1cacbc307837d521823a43b118465cff
+DIST psi-dev-snapshot-2006-12-31.tar.bz2 2366142 RMD160 10e3d652aa008a8459b8e02f3ee97313f7dd0547 SHA1 8476f7238fcc8122420aebe455bd65c15f66483f SHA256 114e36a0167d056e16749ec0d64b0c8fbe400a68e11de6563594ce7306af975a
 DIST psi_ar-0.9.3.tar.bz2 31466 RMD160 c592e630fda60f097dc8df0079b0fb72380fd996 SHA1 8aedb3f8cfdda29ccf5a59c9b0f84462fcd3b649 SHA256 5108803f55a6c71b15b90d76ca20040970349ee89edc2613d96379d6c61f04a9
 DIST psi_bg-0.10-a.tar.bz2 33464 RMD160 7d01bdf8776a86a23443309755ae51648387f289 SHA1 74d5b455706fb6079773e17e47143043af30eb74 SHA256 b1b090af4286aabb9343373add9c33799452bd36435f4c5f97b2960d723a04cf
 DIST psi_bg-0.10-b-1.tar.bz2 34477 RMD160 0a9b61207a8bf9d0b97ac9bed94aa5b47a1915a5 SHA1 f114dbb802b0f640e52dae1a2dcc0796fd7ea58f SHA256 3418401beefdf694fa24178563558340e69e7a6f8ebde925d0aee5bd09316cf6
@@ -72,14 +75,14 @@ EBUILD psi-0.10.ebuild 10906 RMD160 5a452dd092a015412e34f5b0771fae4e9d9b3a3a SHA
 MD5 283f39cfa965adea24408861427e5139 psi-0.10.ebuild 10906
 RMD160 5a452dd092a015412e34f5b0771fae4e9d9b3a3a psi-0.10.ebuild 10906
 SHA256 253e978bd2c47d6de7f983c2c468b5081e56afe712eb7e21b77486b2280963fb psi-0.10.ebuild 10906
-EBUILD psi-0.11_beta4.ebuild 2104 RMD160 f399a386c135a31e6ff8e0f0ce33c96ffbf1ee25 SHA1 eff62f502c9995c9673070486f826c92c7511e46 SHA256 d9d429c149b12533a0fc1618797c4f86340e41820bc9c2b5b1bb6dce6ea2c419
-MD5 056213b58e446768a79d7448a259c470 psi-0.11_beta4.ebuild 2104
-RMD160 f399a386c135a31e6ff8e0f0ce33c96ffbf1ee25 psi-0.11_beta4.ebuild 2104
-SHA256 d9d429c149b12533a0fc1618797c4f86340e41820bc9c2b5b1bb6dce6ea2c419 psi-0.11_beta4.ebuild 2104
-MISC ChangeLog 14655 RMD160 3ebc5c19657f634f3b60a127b723714abae20d3f SHA1 6f030f9a7140ba5b4eb52dcefac12dabe5a0c90e SHA256 3a01961cee28347f333f08b7affd68de9aee9bc86f784df52c2ea8516bad2e62
-MD5 36b4e8b7915c6f5019d0b2f856a07108 ChangeLog 14655
-RMD160 3ebc5c19657f634f3b60a127b723714abae20d3f ChangeLog 14655
-SHA256 3a01961cee28347f333f08b7affd68de9aee9bc86f784df52c2ea8516bad2e62 ChangeLog 14655
+EBUILD psi-0.11_pre20061231.ebuild 3227 RMD160 835ccc52d7d5c4745dfbacaf3a6d21487e47efb0 SHA1 abb86494a0ad5a23c130264bea53c27d23051027 SHA256 8bfe0bbe1e5367fd45b099fdf2d8874472adcc6444d0c8ee4e68705ac0bf4a04
+MD5 5f45d4ccfb63b5a9d95fba809e7d5b18 psi-0.11_pre20061231.ebuild 3227
+RMD160 835ccc52d7d5c4745dfbacaf3a6d21487e47efb0 psi-0.11_pre20061231.ebuild 3227
+SHA256 8bfe0bbe1e5367fd45b099fdf2d8874472adcc6444d0c8ee4e68705ac0bf4a04 psi-0.11_pre20061231.ebuild 3227
+MISC ChangeLog 15256 RMD160 c9d987dc92a9acaac1f90072ef29099c442d39fc SHA1 4e355265e41a067d6314931e866aba8c5d052429 SHA256 293c89f83cfa1d2d6e8e7915a7aac1175cfc55d47f080aaec9765d39a4d5a951
+MD5 a316a404e5470c920269c3e55ee5ad41 ChangeLog 15256
+RMD160 c9d987dc92a9acaac1f90072ef29099c442d39fc ChangeLog 15256
+SHA256 293c89f83cfa1d2d6e8e7915a7aac1175cfc55d47f080aaec9765d39a4d5a951 ChangeLog 15256
 MISC metadata.xml 303 RMD160 deecd227e21d24af6eae6f787e0efd65765741e6 SHA1 a379c487e73d24f68f1036f913c745775a6e9846 SHA256 ea6a7b120f076cc2fa66725d5361639a74895eeb3adc404a887da3be921dfb92
 MD5 5436d288bb839d51d856765357e80098 metadata.xml 303
 RMD160 deecd227e21d24af6eae6f787e0efd65765741e6 metadata.xml 303
@@ -90,6 +93,13 @@ SHA256 83e7a43300883f75bb7c3d264d1729fe9c04f754a7b04583730b0a2b3f5d95db files/di
 MD5 9d6624c3f74285a62f7d8e922a9264e6 files/digest-psi-0.10-r2 7579
 RMD160 b8f3564fe6f258125f36a8a81b54deb761082441 files/digest-psi-0.10-r2 7579
 SHA256 21127ed7d5379fa4c8fc3beb3f5a2886d4601c89f93cd6ea7c5f9ea69b2baa18 files/digest-psi-0.10-r2 7579
-MD5 7a6a4725644b9d487d4e3604ee0a44ff files/digest-psi-0.11_beta4 250
-RMD160 72a223bf9e19c5e61c11793968f07e4f9371c2f2 files/digest-psi-0.11_beta4 250
-SHA256 5203ec59ce1327febd3d1456193a6978fcf1917bb4d4fbdf93436424b6f2461e files/digest-psi-0.11_beta4 250
+MD5 806842ee97e11d8fcc524cfa9e03ae2e files/digest-psi-0.11_pre20061231 289
+RMD160 316d3b33ae6902db25d0fdec9ead6ee6cd865404 files/digest-psi-0.11_pre20061231 289
+SHA256 4cffca4243378a52768ab2615f18b6e1887349b65c4bd0e03c0f4d5a0a731276 files/digest-psi-0.11_pre20061231 289
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFl6jCexDpKttj3ykRAltpAJ9fESTjckHq5M3ASG2WiRbAKeSr3wCdFs0Z
+ztVtqLciLaNS8eyDXZgnzEc=
+=LvJW
+-----END PGP SIGNATURE-----
diff --git a/net-im/psi/files/digest-psi-0.11_beta4 b/net-im/psi/files/digest-psi-0.11_beta4
deleted file mode 100644
index 48aa19f13ece..000000000000
--- a/net-im/psi/files/digest-psi-0.11_beta4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 61aec8eb6d6ff600331fad8c5123b4c0 psi-0.11-beta4.tar.bz2 2332694
-RMD160 67fad43ffe807ae0ca1496c7e7ae27a817995788 psi-0.11-beta4.tar.bz2 2332694
-SHA256 37dddbfb3e47a55b4b98f10013055a9a1cacbc307837d521823a43b118465cff psi-0.11-beta4.tar.bz2 2332694
diff --git a/net-im/psi/psi-0.11_beta4.ebuild b/net-im/psi/psi-0.11_beta4.ebuild
deleted file mode 100644
index b7b91685dfe4..000000000000
--- a/net-im/psi/psi-0.11_beta4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-0.11_beta4.ebuild,v 1.1 2006/12/04 13:05:38 hanno Exp $
-
-inherit eutils qt4
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-HTTPMIRR="http://vivid.dat.pl/psi"
-IUSE="sasl spell ssl xscreensaver"
-
-DESCRIPTION="QT 4.x Jabber Client, with Licq-like interface"
-HOMEPAGE="http:/psi-im.org/"
-# translations from http://tanoshi.net/language.html
-# polish translation contains special texts for patches from extras-version
-SRC_URI="http://psi-im.org/files/beta/0.11/beta4/${MY_P}.tar.bz2"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="$(qt4_min_version 4.2)
-	spell? ( app-text/aspell )
-	sasl? ( dev-libs/cyrus-sasl )
-	dev-libs/expat
-	dev-libs/glib
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	~net-libs/ortp-0.7.1
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	ssl? ( dev-libs/openssl )
-	media-libs/libpng
-	sys-libs/zlib
-	xscreensaver? ( x11-misc/xscreensaver )"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	epatch ${FILESDIR}/psi-jingle-gcc4.patch
-	# growl is mac osx extension only - maybe someday we will want this
-	local myconf="--disable-growl"
-
-	use xscreensaver || myconf="${myconf} --disable-xss"
-	use sasl || myconf="${myconf} --disable-cyrussasl"
-	use spell || myconf="${myconf} --disable-aspell"
-	use ssl || myconf="${myconf} --disable-openssl"
-
-	chmod a+x configure-jingle
-	QTDIR=/usr/lib ./configure-jingle \
-		--prefix=/usr \
-		--enable-jingle \
-		--enable-plugins \
-		${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-
-	#this way the docs will also be installed in the standard gentoo dir
-	for i in roster system emoticons; do
-		newdoc ${S}/iconsets/${i}/README README.${i}
-	done;
-	newdoc certs/README README.certs
-	dodoc ChangeLog README TODO
-}