Drop old versions, add qt-sql dep, fixes bug 269157

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

5 files changed, 11 insertions, 141 deletions

diff --git a/www-client/arora/ChangeLog b/www-client/arora/ChangeLog
index 58ab821ecec0..c72fe3fe23de 100644
--- a/www-client/arora/ChangeLog
+++ b/www-client/arora/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2009/05/08 13:35:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.14 2009/05/10 14:40:09 yngwin Exp $
+
+  10 May 2009; Ben de Groot <yngwin@gentoo.org> -arora-0.5.ebuild,
+  -arora-0.6-r1.ebuild, arora-0.6.1.ebuild:
+  Drop old versions, add qt-sql dep, fixes bug 269157
 
 *arora-0.6.1 (08 May 2009)
 
diff --git a/www-client/arora/Manifest b/www-client/arora/Manifest
index 3cb6fee9fe83..ca2a43b48d2b 100644
--- a/www-client/arora/Manifest
+++ b/www-client/arora/Manifest
@@ -1,8 +1,4 @@
-DIST arora-0.5.tar.gz 764853 RMD160 8cb129602ee74835380acf7d71cbc751df4396f5 SHA1 9809e608edcbd9eae1e2a758a6135bf0534245ae SHA256 4f13cf1aed95a0b38379d3c55c118005c5d03edf56f333bcb3ac2a762516b2ea
 DIST arora-0.6.1.tar.gz 819491 RMD160 9cbaf45d6197c9baf0cbd553be300e94d2bc0af9 SHA1 14fb934d909b71eaeca593d636cff5906eb2db61 SHA256 3de5ae3eadacc1b125943b44aeb69ab3f3d5063b43885ffba1132310a91da0be
-DIST arora-0.6.tar.gz 819356 RMD160 573c7f0630df1ff5c7f051b9450711fda2dc0f44 SHA1 8fa7821092dcb090b2ff84437dcf6774277b44d2 SHA256 8ece9bcef89179618ab230492d09ee81a24a60d0f8ac5221e5463b435a3c3d74
-EBUILD arora-0.5.ebuild 1577 RMD160 82bd5e9aca6fd3183ab07f6f725b71d8c569278c SHA1 71e6963bcb3cbcfb3d403252193b4adebd679dd6 SHA256 7eaf57b473bb05e24237f128894344558f0f1b6ddfd855ac641de6e98c9fcd66
-EBUILD arora-0.6-r1.ebuild 1573 RMD160 7cd26d3312d8a7ee92d29e143034070fc9da09fb SHA1 637bd5e984e23530be5288c23bdd6b7aa2860c4a SHA256 6ebd690008109224dda8e66773615787d9d0ca790d030035c03f13c865850288
-EBUILD arora-0.6.1.ebuild 1572 RMD160 9e51783b1f2bfb5bf4a4d31063e928de5c53777a SHA1 6d073eeab47d0b4c6d4b27d1d869ea883b83b66e SHA256 01e8c49850ada55fef2d22be2f6787e0c93934539055d382262060e85410f95b
-MISC ChangeLog 2403 RMD160 5a6c97c6b25f3db37756cb72dc8094600aef50dd SHA1 7c331a8b6f8307ef004bbfdd610eaf6daf67cdc0 SHA256 eb11b5d496cc100e6c6ebf1eecdddaf97cc4f0a560fe7ec7fcd740cd8cadf1cd
+EBUILD arora-0.6.1.ebuild 1604 RMD160 70345514c1fe7d8bdc6f9a7fb85b425735c20435 SHA1 b002db074eb3f1774fe38a57b8a5f27c3f4522f0 SHA256 4f0a82dc55c174554d3114436f74d21bbd83793806c6b7374ac7fa88c283723a
+MISC ChangeLog 2569 RMD160 455e1a0c62f1b5cf2af704ca73b54f40c8398bb5 SHA1 7448b5e2d1f8d3dbf57292fd269869548fa3db30 SHA256 648f86cc8e16418aa44701e72425ef91a584a12b686c2d9c002ec219ef30e6e2
 MISC metadata.xml 218 RMD160 8ac5a6b1750a457d848b8b154fcaf7ca2b8decb1 SHA1 961504d4ab445fc56ba6bd0e9fd0c81270cf252e SHA256 f28447fb1cee5de814788da71f81ac68b66b24ac81cac98456698c7ce9bcc011
diff --git a/www-client/arora/arora-0.5.ebuild b/www-client/arora/arora-0.5.ebuild
deleted file mode 100644
index 315fb3ec80d3..000000000000
--- a/www-client/arora/arora-0.5.ebuild
+++ /dev/null
@@ -1,66 +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.5.ebuild,v 1.1 2009/02/21 10:35:32 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-webkit:4"
-DEPEND="$RDEPEND"
-
-ARORA_LANGS="en_US 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="${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-r1.ebuild b/www-client/arora/arora-0.6-r1.ebuild
deleted file mode 100644
index ea9ceac803d7..000000000000
--- a/www-client/arora/arora-0.6-r1.ebuild
+++ /dev/null
@@ -1,66 +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.6-r1.ebuild,v 1.1 2009/04/05 20:25:17 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-webkit:4"
-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 || 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.6.1.ebuild
index ffaddc1fed3a..52d7cf9483cc 100644
--- a/www-client/arora/arora-0.6.1.ebuild
+++ b/www-client/arora/arora-0.6.1.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.1 2009/05/08 13:35:34 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.6.1.ebuild,v 1.2 2009/05/10 14:40:09 yngwin Exp $
 
 EAPI=2
 inherit eutils qt4
@@ -14,7 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND="x11-libs/qt-webkit:4"
+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"