Fix translation location in 0.6, thanks to Davide Pesavento in bug 264995. Remove old.

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

3 files changed, 11 insertions, 69 deletions

diff --git a/www-client/arora/ChangeLog b/www-client/arora/ChangeLog
index 0ed2a73c5487..784267e96ce6 100644
--- a/www-client/arora/ChangeLog
+++ b/www-client/arora/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2009/03/31 05:46:05 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.12 2009/04/05 20:25:17 yngwin Exp $
+
+*arora-0.6-r1 (05 Apr 2009)
+
+  05 Apr 2009; Ben de Groot <yngwin@gentoo.org> -arora-0.4.ebuild,
+  -arora-0.6.ebuild, +arora-0.6-r1.ebuild:
+  Fix translation location in 0.6, thanks to Davide Pesavento in bug 264995.
+  Remove old.
 
 *arora-0.6 (31 Mar 2009)
 
diff --git a/www-client/arora/arora-0.4.ebuild b/www-client/arora/arora-0.4.ebuild
deleted file mode 100644
index a097fe8a23a4..000000000000
--- a/www-client/arora/arora-0.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.4.ebuild,v 1.3 2008/11/06 00:58:12 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=""
-
-RDEPEND="x11-libs/qt-webkit:4"
-DEPEND="$RDEPEND"
-
-ARORA_LANGS="da de en es es_CR et fr_CA gl he hu it nl pl pt_BR ru tr"
-ARORA_NOLONGLANGS="cs_CZ fr_FR"
-
-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="${D}/usr"
-}
-
-src_compile() {
-	emake || die "make failed"
-
-	# don't pre-strip
-	sed -i "/strip/d" src/Makefile || die 'sed failed'
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die 'make install failed'
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/www-client/arora/arora-0.6.ebuild b/www-client/arora/arora-0.6-r1.ebuild
index 2eff31e55a31..ea9ceac803d7 100644
--- a/www-client/arora/arora-0.6.ebuild
+++ b/www-client/arora/arora-0.6-r1.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.ebuild,v 1.1 2009/03/31 05:46:05 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.6-r1.ebuild,v 1.1 2009/04/05 20:25:17 yngwin Exp $
 
 EAPI=2
 inherit eutils qt4
@@ -50,7 +50,7 @@ src_prepare() {
 }
 
 src_configure() {
-	eqmake4 arora.pro PREFIX="${D}/usr"
+	eqmake4 arora.pro PREFIX=/usr
 }
 
 src_compile() {
@@ -61,6 +61,6 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die 'make install failed'
+	emake -j1 INSTALL_ROOT="${D}" install || die 'make install failed'
 	dodoc AUTHORS ChangeLog README
 }