Version bump, remove old ones, EAPI3

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

7 files changed, 48 insertions, 81 deletions

diff --git a/net-im/choqok/ChangeLog b/net-im/choqok/ChangeLog
index 3d1e5cc7e6a2..aa425222bc50 100644
--- a/net-im/choqok/ChangeLog
+++ b/net-im/choqok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/choqok
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.10 2010/09/07 01:22:48 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/ChangeLog,v 1.11 2010/10/16 10:02:21 tampakrap Exp $
+
+*choqok-0.9.92 (16 Oct 2010)
+
+  16 Oct 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  -choqok-0.9.55.ebuild, -choqok-0.9.85.ebuild, -choqok-0.9.90.ebuild,
+  choqok-0.9.90-r1.ebuild, +choqok-0.9.92.ebuild:
+  Version bump, remove old ones, EAPI3
 
 *choqok-0.9.90-r1 (07 Sep 2010)
 
diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest
index 327710867784..0a9de8e0e31f 100644
--- a/net-im/choqok/Manifest
+++ b/net-im/choqok/Manifest
@@ -1,11 +1,7 @@
 AUX choqok-0.9.55_qt47.patch 758 RMD160 0ddd20f7a6e8979b05c3c7ba5fb28af3b56a2e91 SHA1 3ea427431242f9a251d75de1e525a0a631bd203b SHA256 5f931e4daa57902e5644dbb2a17bb4ce9349689d09c57d15a30f4b3ec8d9ddcf
-DIST choqok-0.9.55.tar.bz2 431604 RMD160 ed801f21c990863f209b5f9834ee156d2bc37cce SHA1 3d3ab1bc992c0c89cb0dbf216be7f236dcb8b9fc SHA256 c1b8498d31eb85cdf4f87d35662d3f6dd591a1cbb5df94c2b111a56012f7ee64
-DIST choqok-0.9.85.tar.bz2 479235 RMD160 1ef4d7beaea95d791f67667fbd9404dc4072a158 SHA1 10dc8bd44a9f8547d4a48ac61d7b7ffaa81bf080 SHA256 c980086219dba18d8a41cf04ddb7a2e0d9974fc53e6ae52c7f2c66f6440b837a
-DIST choqok-0.9.90.tar.bz2 440662 RMD160 f9f6fa365ce0ae02c2d60d41de4052bc92f758a9 SHA1 a462cba4a72e410a4e86ca5da2f4f2e151bc372c SHA256 c199c453f63878b89b8d64603d2b10c92ad294a08cdb00d6dd644f62b17c5c8a
+DIST choqok-0.9.92.tar.bz2 465959 RMD160 47f953e3b809d739d62e51012893dae92da56466 SHA1 49e8f67ea153e74c3ddbc6bc97452c2603177d36 SHA256 75fb60c9395c7e58ef8b9408d5c0e28e9842abd6de87e9e07af1fbab3e0e99af
 DIST choqok.0.9.90.tar.bz2 440689 RMD160 00b00edf37294d05a8ea885779cfbda6b7825741 SHA1 6802a6b29405105c3879a7b05bd2a9173503f1df SHA256 f8bca5729769003533cb0da7438773824fb02b0dd6460ae4c908ca81174244bb
-EBUILD choqok-0.9.55.ebuild 655 RMD160 9bf70cc35a62bfb7f9f8f2b229ffd0fe0c73b159 SHA1 e423becf2ffe96b00379cd81e555029b4eeff4e3 SHA256 54ef4125e4e149d50da01868cfd8c76877f6e878aaa953cc833d58c600b0d9c7
-EBUILD choqok-0.9.85.ebuild 698 RMD160 12a282d7da308e817f5f53de5d357923eef499fb SHA1 aea28f55cfc941e607cd6301820a1c6dc41eb67e SHA256 607f94f92f598046186ac81e6d47b6219c4f109803235afee04b1f0018e1260d
-EBUILD choqok-0.9.90-r1.ebuild 708 RMD160 3aa85cd68e2492cecdd839d56bf4f013fe36c65b SHA1 cb0e5e8d3685162a23ce702f9f76d85cac98518f SHA256 931e3c19ff7e26287ac9a185032dc7c5462c35b32aa062a274bf984ca64251a3
-EBUILD choqok-0.9.90.ebuild 698 RMD160 a2d19bc1d8cfd631ffc954a5f548697d0798c524 SHA1 3752721d0a9df8c753b47348d6c74a08ab840910 SHA256 44d08ef21c77df66df94c6ee305ac549dbecdb41e0f96d068a29320644b0e3de
-MISC ChangeLog 1787 RMD160 c1206896ca2069d5627478d003767c17368d1ac7 SHA1 ba5694aefbf831cfcad1d29dd880182efbc85415 SHA256 37719c913d6dea08268e049301fb5dadcac0718a4c61653ee4d24d99e36023e8
+EBUILD choqok-0.9.90-r1.ebuild 768 RMD160 dedfbfa9d74c93a24952dacc6bead4ceb886674a SHA1 a75e9183d06b87e6e00b532d579aca20af3c2507 SHA256 68459826f9450411eed02c2a2be74c16bcda175343e26c65bbfc4f3281c94949
+EBUILD choqok-0.9.92.ebuild 758 RMD160 311cb1eca3dd601a60b6673bfcb3fd470667e299 SHA1 8085579455b716283a0b9160764262cf69568fec SHA256 e40fb6721f0f952e6aaefbb667656a3ef25c4f7b40b4714c2e760a2b84724dd9
+MISC ChangeLog 2034 RMD160 d4a3c6eeef8c97160416880ef9b6044bf28bed52 SHA1 dbca3a05ed46065c4b70a9492de9166d2bc73e76 SHA256 53c966bcb78da46dff452a5cadcf0163e1a04e0e1c6b1ec9db2103b8b0463337
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/net-im/choqok/choqok-0.9.55.ebuild b/net-im/choqok/choqok-0.9.55.ebuild
deleted file mode 100644
index 30585291c65f..000000000000
--- a/net-im/choqok/choqok-0.9.55.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.55.ebuild,v 1.3 2010/06/27 23:59:41 hwoarang Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="bg cs da de el en_GB eo es et fi fr ga gl hr hu is ja km lt ms nb
-nds nl pa pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-inherit kde4-base
-DESCRIPTION="A Free/Open Source micro-blogging client for KDE"
-HOMEPAGE="http://choqok.gnufolks.org/"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="debug"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_qt47.patch
-)
diff --git a/net-im/choqok/choqok-0.9.85.ebuild b/net-im/choqok/choqok-0.9.85.ebuild
deleted file mode 100644
index 82ca71c3a3b8..000000000000
--- a/net-im/choqok/choqok-0.9.85.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.85.ebuild,v 1.1 2010/08/21 14:38:23 tampakrap Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="bg cs da de el en_GB eo es et fi fr ga gl hr hu is ja km lt ms nb
-			nds nl pa pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-
-inherit kde4-base
-
-DESCRIPTION="A Free/Open Source micro-blogging client for KDE"
-HOMEPAGE="http://choqok.gnufolks.org/"
-SRC_URI="http://d10xg45o6p6dbl.cloudfront.net/projects/c/choqok/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="dev-libs/qjson
-		>=dev-libs/qoauth-1.0.1"
-RDEPEND="${DEPEND}"
diff --git a/net-im/choqok/choqok-0.9.90-r1.ebuild b/net-im/choqok/choqok-0.9.90-r1.ebuild
index e53e9db1e619..4c43e6bc038c 100644
--- a/net-im/choqok/choqok-0.9.90-r1.ebuild
+++ b/net-im/choqok/choqok-0.9.90-r1.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.90-r1.ebuild,v 1.1 2010/09/07 01:22:48 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.90-r1.ebuild,v 1.2 2010/10/16 10:02:21 tampakrap Exp $
 
-EAPI="2"
+EAPI=3
 
-KDE_LINGUAS="bg cs da de el en_GB eo es et fi fr ga gl hr hu is ja km lt ms nb
-			nds nl pa pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
+KMNAME="extragear/network"
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg cs da de el en_GB eo es et fi fr ga gl hr hu is ja km lt ms nb
+	nds nl pa pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
+	SRC_URI="http://d10xg45o6p6dbl.cloudfront.net/projects/c/choqok/${PN}.${PV}.tar.bz2"
+fi
 
 inherit kde4-base
 
 DESCRIPTION="A Free/Open Source micro-blogging client for KDE"
 HOMEPAGE="http://choqok.gnufolks.org/"
-SRC_URI="http://d10xg45o6p6dbl.cloudfront.net/projects/c/choqok/${PN}.${PV}.tar.bz2"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
diff --git a/net-im/choqok/choqok-0.9.90.ebuild b/net-im/choqok/choqok-0.9.90.ebuild
deleted file mode 100644
index 329d27d9a931..000000000000
--- a/net-im/choqok/choqok-0.9.90.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.90.ebuild,v 1.1 2010/09/01 18:34:35 tampakrap Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="bg cs da de el en_GB eo es et fi fr ga gl hr hu is ja km lt ms nb
-			nds nl pa pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
-
-inherit kde4-base
-
-DESCRIPTION="A Free/Open Source micro-blogging client for KDE"
-HOMEPAGE="http://choqok.gnufolks.org/"
-SRC_URI="http://d10xg45o6p6dbl.cloudfront.net/projects/c/choqok/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="debug"
-
-DEPEND="dev-libs/qjson
-		>=dev-libs/qoauth-1.0.1"
-RDEPEND="${DEPEND}"
diff --git a/net-im/choqok/choqok-0.9.92.ebuild b/net-im/choqok/choqok-0.9.92.ebuild
new file mode 100644
index 000000000000..afde38310f08
--- /dev/null
+++ b/net-im/choqok/choqok-0.9.92.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/choqok/choqok-0.9.92.ebuild,v 1.1 2010/10/16 10:02:21 tampakrap Exp $
+
+EAPI=3
+
+KMNAME="extragear/network"
+
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="bg cs da de el en_GB eo es et fi fr ga gl hr hu is ja km lt ms nb
+	nds nl pa pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
+	SRC_URI="http://d10xg45o6p6dbl.cloudfront.net/projects/c/choqok/${P}.tar.bz2"
+fi
+
+inherit kde4-base
+
+DESCRIPTION="A Free/Open Source micro-blogging client for KDE"
+HOMEPAGE="http://choqok.gnufolks.org/"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="dev-libs/qjson
+		>=dev-libs/qoauth-1.0.1"
+RDEPEND="${DEPEND}"