Remove obsolete ~arch versions. Pin 0.10.1 on Qt 4.5 (bug 295808).

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

6 files changed, 12 insertions, 246 deletions

diff --git a/www-client/arora/ChangeLog b/www-client/arora/ChangeLog
index fc562ed4aa13..850ab3aeb866 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.27 2009/11/08 23:14:24 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/ChangeLog,v 1.28 2009/12/05 21:16:37 yngwin Exp $
+
+  05 Dec 2009; Ben de Groot <yngwin@gentoo.org> -arora-0.8.0.ebuild,
+  -arora-0.9.0.ebuild, -arora-0.10.0.ebuild, arora-0.10.1.ebuild:
+  Remove obsolete ~arch versions. Pin 0.10.1 on Qt 4.5 (bug 295808).
 
   08 Nov 2009; Alex Alexander <wired@gentoo.org> arora-0.7.1.ebuild,
   arora-0.8.0.ebuild, arora-0.9.0.ebuild, arora-0.10.0.ebuild,
diff --git a/www-client/arora/Manifest b/www-client/arora/Manifest
index f5b651d47495..b14bc4fb5cd3 100644
--- a/www-client/arora/Manifest
+++ b/www-client/arora/Manifest
@@ -1,12 +1,6 @@
-DIST arora-0.10.0.tar.gz 1049187 RMD160 09a3a20951b34b898d035262ec5e88c3d9c162f5 SHA1 dee7b646a2d19e7bf602a6d7c8cdb1863e3b931f SHA256 6c7abada1571076750fdcbc1ce5fb39908f0884a33d0efeedba2915bc720a09f
 DIST arora-0.10.1.tar.gz 1064017 RMD160 bb47343d4988b86ab4abd7b2be8fe90d72429df7 SHA1 dbfa15251466d3cfc00cf0d31140cd988e1985b0 SHA256 1828cbd348d1418287b29337e1047cfc3d6c092e18691cd9c6dfc2d6535bcebd
 DIST arora-0.7.1.tar.gz 896528 RMD160 31e48afa832101f0873a074cc75c8c36e89d5d66 SHA1 5dc87f5a4995c83de787969c99935b44a37818a4 SHA256 9bb09ea94672953debc87d63de5783a84d7db81ae6de8e08d7de8af9f2decaa7
-DIST arora-0.8.0.tar.gz 953605 RMD160 5a035ee6227a60b36b6e0d8095390dba04b31a49 SHA1 a596ad785f16e290bc44d76a3f7085460008e070 SHA256 5d654bf20eee3170cef19830182bdbe719b7130a0c62f833c57f555bff1f6378
-DIST arora-0.9.0.tar.gz 971987 RMD160 07370add676c7f42d359a8da0595ae261b512962 SHA1 7638571b52923987c62d51f401802ae6f6048592 SHA256 d09a1cdbb4ed2b6a81532fda206e229997deda8e68f017c0d29deb6ef4f11ec2
-EBUILD arora-0.10.0.ebuild 1935 RMD160 c4f96ead3d631ac4248cc4b7ae2d92e6a1eb99ba SHA1 a20ffb357a4d01143fee8392e9eec8bfa7b9b36a SHA256 9f85d38150852843ffcd7b09fafafadfb1e1e0999101645bdb8a1c989cc82e7c
-EBUILD arora-0.10.1.ebuild 1941 RMD160 84ecdcd8a71053635673bf488bd26fe856af8a01 SHA1 a498ddbdfddec862053455c3e5b7cafde733fbcb SHA256 67a9f937ec290133a9cf01c483ff08c9a0ea06226e37b5b363a098a72eccc357
+EBUILD arora-0.10.1.ebuild 1973 RMD160 6f992a3308cb21ed4b1507c599de49b1f37cc772 SHA1 3654aee9146cc25c10218f76f596226bbc17cc4f SHA256 789d5df37b17a444321ab5bedd7aa5d052e8d6afe40f9580da610fcf1e9cb82d
 EBUILD arora-0.7.1.ebuild 1599 RMD160 937e3753a67c4d0187058fce6bf41b7adccc9658 SHA1 9863c946ceec4860076435d19fcccb7297326959 SHA256 646bc34a499e5ea8cc5854463d00b09ae5b1f3444aa2107745d2f9f17d139521
-EBUILD arora-0.8.0.ebuild 1873 RMD160 bfcabf18e40d4fb9bb9d8b21307ce1b857ba74cb SHA1 0a63ba21c36b9d5ec892275ac73b472497702a9a SHA256 d9c54f3ee57e6d3d0fad1876cbcdf74f8e7deeb0819355ddfd7b6094690b26a1
-EBUILD arora-0.9.0.ebuild 1901 RMD160 869a56aedd2f9255d4c90e44436a224cec1781d4 SHA1 1ea9264ad8f73f409d5a8e4190768ded87a6ee9d SHA256 c76e4ef54f9faaa16220901a2204c66987896949f19011284828a849e3fbe23e
-MISC ChangeLog 4207 RMD160 1ba86ca326f08c014013c6b99d4883424b5fce15 SHA1 b4249f3c86c86dfcfc978514f72aa7886d234f63 SHA256 066490ddf671fddfbc1955eedbbaddcef7c5ac91231d255aaf75d3762bc93358
+MISC ChangeLog 4413 RMD160 0709b5bfaaa36492b9c985d796ae9ea710b4674d SHA1 cbcd9a505ff88c1387863dc3365a3912a68f6a25 SHA256 c2970f4789871af7cb74be8a99cf3b4d479d81a33a75bfe71068cc87b10ace6a
 MISC metadata.xml 218 RMD160 8ac5a6b1750a457d848b8b154fcaf7ca2b8decb1 SHA1 961504d4ab445fc56ba6bd0e9fd0c81270cf252e SHA256 f28447fb1cee5de814788da71f81ac68b66b24ac81cac98456698c7ce9bcc011
diff --git a/www-client/arora/arora-0.10.0.ebuild b/www-client/arora/arora-0.10.0.ebuild
deleted file mode 100644
index 4baed6ecd13b..000000000000
--- a/www-client/arora/arora-0.10.0.ebuild
+++ /dev/null
@@ -1,78 +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.10.0.ebuild,v 1.2 2009/11/08 23:14:24 wired 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 doc"
-
-RDEPEND=">=x11-libs/qt-gui-4.5.0
-	>=x11-libs/qt-sql-4.5.0
-	>=x11-libs/qt-webkit-4.5.0
-	>=x11-libs/qt-xmlpatterns-4.5.0"
-DEPEND="${RDEPEND}"
-
-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"
-done
-for L in $ARORA_NOLONGLANGS; do
-	IUSE="$IUSE linguas_${L%_*}"
-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
-		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'
-
-	if ! use doc ; then
-		sed -i 's|QMAKE_EXTRA|#QMAKE_EXTRA|' arora.pro || die 'sed failed'
-	fi
-}
-
-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 INSTALL_ROOT="${D}" install || die 'make install failed'
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/www-client/arora/arora-0.10.1.ebuild b/www-client/arora/arora-0.10.1.ebuild
index 7f18b8ed7fdf..ce23aaf01fe4 100644
--- a/www-client/arora/arora-0.10.1.ebuild
+++ b/www-client/arora/arora-0.10.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.10.1.ebuild,v 1.2 2009/11/08 23:14:24 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/arora/arora-0.10.1.ebuild,v 1.3 2009/12/05 21:16:37 yngwin Exp $
 
 EAPI=2
 inherit eutils qt4
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc"
 
-RDEPEND=">=x11-libs/qt-gui-4.5.0
-	>=x11-libs/qt-sql-4.5.0
-	>=x11-libs/qt-webkit-4.5.0
-	>=x11-libs/qt-xmlpatterns-4.5.0"
+RDEPEND="=x11-libs/qt-gui-4.5*
+	=x11-libs/qt-sql-4.5*
+	=x11-libs/qt-webkit-4.5*
+	=x11-libs/qt-xmlpatterns-4.5*" # incompatible with Qt 4.6, bug 295808
 DEPEND="${RDEPEND}"
 
 ARORA_LANGS="ast ca es es_CR et_EE fr_CA gl ms nb_NO pt_BR pt_PT sr@latin sr_CS uk
diff --git a/www-client/arora/arora-0.8.0.ebuild b/www-client/arora/arora-0.8.0.ebuild
deleted file mode 100644
index 036fd0284adb..000000000000
--- a/www-client/arora/arora-0.8.0.ebuild
+++ /dev/null
@@ -1,77 +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.8.0.ebuild,v 1.2 2009/11/08 23:14:24 wired 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="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"
-done
-for L in $ARORA_NOLONGLANGS; do
-	IUSE="$IUSE linguas_${L%_*}"
-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
-		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'
-
-	if ! use doc ; then
-		sed -i 's|QMAKE_EXTRA|#QMAKE_EXTRA|' arora.pro || die 'sed failed'
-	fi
-}
-
-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 INSTALL_ROOT="${D}" install || die 'make install failed'
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/www-client/arora/arora-0.9.0.ebuild b/www-client/arora/arora-0.9.0.ebuild
deleted file mode 100644
index 4503b2a3f715..000000000000
--- a/www-client/arora/arora-0.9.0.ebuild
+++ /dev/null
@@ -1,77 +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.9.0.ebuild,v 1.3 2009/11/08 23:14:24 wired 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 doc"
-
-RDEPEND=">=x11-libs/qt-gui-4.5.0
-	>=x11-libs/qt-sql-4.5.0
-	>=x11-libs/qt-webkit-4.5.0"
-DEPEND="${RDEPEND}"
-
-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"
-done
-for L in $ARORA_NOLONGLANGS; do
-	IUSE="$IUSE linguas_${L%_*}"
-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
-		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'
-
-	if ! use doc ; then
-		sed -i 's|QMAKE_EXTRA|#QMAKE_EXTRA|' arora.pro || die 'sed failed'
-	fi
-}
-
-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 INSTALL_ROOT="${D}" install || die 'make install failed'
-	dodoc AUTHORS ChangeLog README
-}