Version bump, remove old ones, EAPI3

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

6 files changed, 44 insertions, 73 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/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}"