Version bump

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

3 files changed, 22 insertions, 75 deletions

diff --git a/www-client/arora/ChangeLog b/www-client/arora/ChangeLog
index 32b948da7540..e244ec914223 100644
--- a/www-client/arora/ChangeLog
+++ b/www-client/arora/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/arora
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.21 2009/07/11 13:42:56 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.22 2009/07/22 22:26:48 yngwin Exp $
+
+*arora-0.8.0 (22 Jul 2009)
+
+  22 Jul 2009; Ben de Groot <yngwin@gentoo.org> -arora-0.6.1.ebuild,
+  -arora-0.7.0.ebuild, +arora-0.8.0.ebuild:
+  Version bump. Remove old.
 
   11 Jul 2009; Jeremy Olexa <darkside@gentoo.org> arora-0.7.1.ebuild:
   amd64 stable, bug 276041
diff --git a/www-client/arora/arora-0.7.0.ebuild b/www-client/arora/arora-0.7.0.ebuild
deleted file mode 100644
index a08760069bb1..000000000000
--- a/www-client/arora/arora-0.7.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.7.0.ebuild,v 1.2 2009/05/25 22:43:03 yngwin Exp $
-
-EAPI=2
-inherit eutils qt4
-
-DESCRIPTION="A cross-platform Qt4 WebKit browser"
-HOMEPAGE="http://arora.googlecode.com/"
-SRC_URI="http://arora.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="x11-libs/qt-gui
-	x11-libs/qt-sql
-	x11-libs/qt-webkit"
-DEPEND="$RDEPEND"
-
-ARORA_LANGS="es es_CR et_EE fr_CA gl ms nb_NO uk zh_CN"
-ARORA_NOLONGLANGS="cs_CZ da_DK de_DE fr_FR he_IL hu_HU it_IT ja_JP nl_NL pl_PL
-	ru_RU sk_SK tr_TR"
-
-for L in $ARORA_LANGS; do
-	IUSE="$IUSE linguas_$L"
-done
-for L in $ARORA_NOLONGLANGS; do
-	IUSE="$IUSE linguas_${L%_*}"
-done
-
-src_prepare() {
-	# process linguas
-	local langs=
-	for lingua in $LINGUAS; do
-		if has $lingua $ARORA_LANGS; then
-			langs="$langs ${lingua}.ts"
-		else
-			for a in $ARORA_NOLONGLANGS; do
-				if [[ $lingua == ${a%_*} ]]; then
-					langs="$langs ${a}.ts"
-				fi
-			done
-		fi
-	done
-
-	# remove all translations, then add only the ones we want
-	sed -i '/ts/d' src/locale/locale.pri || die 'sed failed'
-	sed -i "/^TRANSLATIONS/s:\\\:${langs}:" src/locale/locale.pri \
-		|| die 'sed failed'
-}
-
-src_configure() {
-	eqmake4 arora.pro PREFIX=/usr
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-
-	# don't pre-strip
-	sed -i "/strip/d" src/Makefile || die 'sed failed'
-}
-
-src_install() {
-	emake -j1 INSTALL_ROOT="${D}" install || die 'make install failed'
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/www-client/arora/arora-0.6.1.ebuild b/www-client/arora/arora-0.8.0.ebuild
index 0fc59c37b812..81fda02dae93 100644
--- a/www-client/arora/arora-0.6.1.ebuild
+++ b/www-client/arora/arora-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.6.1.ebuild,v 1.4 2009/06/06 08:44:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.8.0.ebuild,v 1.1 2009/07/22 22:26:48 yngwin Exp $
 
 EAPI=2
 inherit eutils qt4
@@ -11,7 +11,7 @@ SRC_URI="http://arora.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="x11-libs/qt-gui
@@ -19,9 +19,10 @@ RDEPEND="x11-libs/qt-gui
 	x11-libs/qt-webkit"
 DEPEND="$RDEPEND"
 
-ARORA_LANGS="es es_CR et_EE fr_CA gl ms nb_NO uk zh_CN"
-ARORA_NOLONGLANGS="cs_CZ da_DK de_DE fr_FR he_IL hu_HU it_IT ja_JP nl_NL pl_PL
-	ru_RU sk_SK tr_TR"
+ARORA_LANGS="ast ca es es_CR et_EE fr_CA gl ms nb_NO pt_BR sr@latin sr_CS uk
+zh_CN zh_TW"
+ARORA_NOLONGLANGS="cs_CZ da_DK de_DE el_GR fi_FI fr_FR he_IL hu_HU it_IT ja_JP
+nl_NL pl_PL ru_RU sk_SK tr_TR"
 
 for L in $ARORA_LANGS; do
 	IUSE="$IUSE linguas_$L"
@@ -31,6 +32,10 @@ for L in $ARORA_NOLONGLANGS; do
 done
 
 src_prepare() {
+	# use Gentoo lingua designations
+	mv src/locale/sr_RS@latin.ts src/locale/sr@latin.ts
+	mv src/locale/sr_RS.ts src/locale/sr_CS.ts
+
 	# process linguas
 	local langs=
 	for lingua in $LINGUAS; do
@@ -49,6 +54,10 @@ src_prepare() {
 	sed -i '/ts/d' src/locale/locale.pri || die 'sed failed'
 	sed -i "/^TRANSLATIONS/s:\\\:${langs}:" src/locale/locale.pri \
 		|| die 'sed failed'
+
+	if ! use doc ; then
+		sed -i 's|QMAKE_EXTRA|#QMAKE_EXTRA|' arora.pro || die 'sed failed'
+	fi
 }
 
 src_configure() {
@@ -63,6 +72,6 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 INSTALL_ROOT="${D}" install || die 'make install failed'
+	emake INSTALL_ROOT="${D}" install || die 'make install failed'
 	dodoc AUTHORS ChangeLog README
 }