[gentoo-commits] gentoo-x86 commit in www-client/arora: ChangeLog arora-0.11.0.ebuild arora-0.7.1.ebuild

[Davide Pesavento (pesa)]

pesa        11/11/20 12:21:48

  Modified:             ChangeLog arora-0.11.0.ebuild
  Removed:              arora-0.7.1.ebuild
  Log:
  Minor ebuild cleanup. Remove obsolete version.
  
  (Portage version: 2.2.0_alpha76/cvs/Linux x86_64)

Revision  Changes    Path
1.42                 www-client/arora/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	26 Jan 2011 16:20:15 -0000	1.41
+++ ChangeLog	20 Nov 2011 12:21:48 -0000	1.42
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/arora
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.41 2011/01/26 16:20:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.42 2011/11/20 12:21:48 pesa Exp $
+
+  20 Nov 2011; Davide Pesavento <pesa@g.o> -arora-0.7.1.ebuild,
+  arora-0.11.0.ebuild:
+  Minor ebuild cleanup. Remove obsolete version.
 
   26 Jan 2011; Jeremy Olexa <darkside@g.o> arora-0.11.0.ebuild:
   Port changes from Gentoo Prefix, use EPREFIX, add KEYWORDS, convert to



1.3                  www-client/arora/arora-0.11.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/arora-0.11.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/arora-0.11.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/arora/arora-0.11.0.ebuild?r1=1.2&r2=1.3

Index: arora-0.11.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.11.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- arora-0.11.0.ebuild	26 Jan 2011 16:20:15 -0000	1.2
+++ arora-0.11.0.ebuild	20 Nov 2011 12:21:48 -0000	1.3
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.11.0.ebuild,v 1.2 2011/01/26 16:20:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.11.0.ebuild,v 1.3 2011/11/20 12:21:48 pesa Exp $
 
 EAPI=3
+
 inherit eutils qt4-r2
 
 DESCRIPTION="A cross-platform Qt4 WebKit browser"
@@ -26,13 +27,15 @@
 ARORA_NOLONGLANGS="cs_CZ da_DK de_DE el_GR fi_FI fr_FR he_IL hu_HU it_IT ja_JP
 pl_PL ru_RU sk_SK tr_TR"
 
-for L in $ARORA_LANGS; do
-	IUSE="$IUSE linguas_$L"
+for L in ${ARORA_LANGS}; do
+	IUSE+=" linguas_${L}"
 done
-for L in $ARORA_NOLONGLANGS; do
-	IUSE="$IUSE linguas_${L%_*}"
+for L in ${ARORA_NOLONGLANGS}; do
+	IUSE+=" linguas_${L%_*}"
 done
 
+DOCS="AUTHORS ChangeLog README"
+
 src_prepare() {
 	# use Gentoo lingua designations
 	mv src/locale/sr_RS@×××××.ts src/locale/sr@×××××.ts
@@ -40,25 +43,24 @@
 
 	# process linguas
 	local langs=
-	for lingua in $LINGUAS; do
-		if has $lingua $ARORA_LANGS; then
-			langs="$langs ${lingua}.ts"
+	for lingua in ${LINGUAS}; do
+		if has ${lingua} ${ARORA_LANGS}; then
+			langs+=" ${lingua}.ts"
 		else
-			for a in $ARORA_NOLONGLANGS; do
-				if [[ $lingua == ${a%_*} ]]; then
-					langs="$langs ${a}.ts"
+			for a in ${ARORA_NOLONGLANGS}; do
+				if [[ ${lingua} == ${a%_*} ]]; then
+					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'
+	sed -i '/ts/d' src/locale/locale.pri || die
+	sed -i "/^TRANSLATIONS/s:\\\:${langs}:" src/locale/locale.pri || die
 
 	if ! use doc ; then
-		sed -i 's|QMAKE_EXTRA|#QMAKE_EXTRA|' arora.pro || die 'sed failed'
+		sed -i 's|QMAKE_EXTRA|#QMAKE_EXTRA|' arora.pro || die
 	fi
 }
 
@@ -67,13 +69,8 @@
 }
 
 src_compile() {
-	emake || die "make failed"
+	qt4-r2_src_compile
 
 	# don't pre-strip
-	sed -i "/strip/d" src/Makefile || die 'sed failed'
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die 'make install failed'
-	dodoc AUTHORS ChangeLog README
+	sed -i "/strip/d" src/Makefile || die
 }