Version bump per bug #351396. Proxy commit for Jan Kundrát (jkt).

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

4 files changed, 61 insertions, 39 deletions

diff --git a/mail-client/trojita/ChangeLog b/mail-client/trojita/ChangeLog
index 1faf1c2d6e1d..a30a0e91b50b 100644
--- a/mail-client/trojita/ChangeLog
+++ b/mail-client/trojita/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/trojita
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.7 2010/11/12 15:33:02 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/ChangeLog,v 1.8 2011/01/11 22:11:33 scarabeus Exp $
+
+*trojita-0.2.9 (11 Jan 2011)
+
+  11 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> -trojita-0.2.ebuild,
+  +trojita-0.2.9.ebuild, trojita-9999.ebuild:
+  Version bump per bug #351396. Proxy commit for Jan Kundrát (jkt).
 
   12 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> trojita-9999.ebuild:
   Drop now not required virtualx eclass.
diff --git a/mail-client/trojita/trojita-0.2.9.ebuild b/mail-client/trojita/trojita-0.2.9.ebuild
new file mode 100644
index 000000000000..cfab570b23b6
--- /dev/null
+++ b/mail-client/trojita/trojita-0.2.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-0.2.9.ebuild,v 1.1 2011/01/11 22:11:33 scarabeus Exp $
+
+EAPI=3
+
+QT_REQUIRED="4.6.0"
+inherit qt4-r2
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
+	inherit git
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug test"
+
+RDEPEND="
+	>=x11-libs/qt-gui-${QT_REQUIRED}:4
+	>=x11-libs/qt-sql-${QT_REQUIRED}:4[sqlite]
+	>=x11-libs/qt-webkit-${QT_REQUIRED}:4
+"
+DEPEND="${RDEPEND}
+	test? ( >=x11-libs/qt-test-${QT_REQUIRED}:4 )
+"
+
+src_configure() {
+	eqmake4 PREFIX=/usr
+}
diff --git a/mail-client/trojita/trojita-0.2.ebuild b/mail-client/trojita/trojita-0.2.ebuild
deleted file mode 100644
index 52861bdf7b0e..000000000000
--- a/mail-client/trojita/trojita-0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-0.2.ebuild,v 1.1 2010/08/04 18:00:45 scarabeus Exp $
-
-EAPI=2
-
-inherit qt4-r2
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug test"
-
-RDEPEND="
-	>=x11-libs/qt-gui-4.6.0:4
-	>=x11-libs/qt-sql-4.6.0:4[sqlite]
-	>=x11-libs/qt-webkit-4.6.0:4
-"
-DEPEND="${RDEPEND}
-	test? ( x11-libs/qt-test:4 )
-"
-
-RESTRICT="test"
-
-src_configure() {
-	eqmake4 PREFIX=/usr
-}
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
index 236eb5471578..8583c881a68c 100644
--- a/mail-client/trojita/trojita-9999.ebuild
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -1,20 +1,28 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.6 2010/11/12 15:33:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/trojita/trojita-9999.ebuild,v 1.7 2011/01/11 22:11:33 scarabeus Exp $
 
 EAPI=3
 
-EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
 QT_REQUIRED="4.6.0"
-inherit qt4-r2 git
+inherit qt4-r2
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
+	inherit git
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/"
-SRC_URI=""
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS=""
 IUSE="debug test"
 
 RDEPEND="