Minor ebuild cleanup. Remove obsolete version.

Package-Manager: portage-2.2.0_alpha76/cvs/Linux x86_64

diff --git a/www-client/arora/ChangeLog b/www-client/arora/ChangeLog
index 70a3d3bfc3442f0dc465ffcbceea8dea0f340cd3..6f5bae7339ef57a2837804a4aa05d27fd6867f14 100644 (file)
--- a/www-client/arora/ChangeLog
+++ b/www-client/arora/ChangeLog
@@ -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@gentoo.org> -arora-0.7.1.ebuild,
+  arora-0.11.0.ebuild:
+  Minor ebuild cleanup. Remove obsolete version.
 
   26 Jan 2011; Jeremy Olexa <darkside@gentoo.org> arora-0.11.0.ebuild:
   Port changes from Gentoo Prefix, use EPREFIX, add KEYWORDS, convert to

diff --git a/www-client/arora/Manifest b/www-client/arora/Manifest
index f39b689ec2144e601dafec51e1f82ed7d836431a..ad38aefbb4d43ffee0138df81a0c9f324a0eb254 100644 (file)
--- a/www-client/arora/Manifest
+++ b/www-client/arora/Manifest
@@ -1,9 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX arora-0.10.2_qt_4.7_build_fix.patch 867 RMD160 dcbbe312a43190ec672e2be9de2b828309b9712a SHA1 5dde2008782f315e37d9365b67031fa731919f44 SHA256 5530ab7248d2a8724d9b5f8a166e7cd2874309b78f75ac1636c0cc36aedaf806
 DIST arora-0.10.2.tar.gz 1064208 RMD160 ef61ca56087288fdafed4f7bfbe1e7178f92deb2 SHA1 843d6d3e073588b5f6164985170a3525450f6615 SHA256 7b5bdbb01dccc27776c65f7aa7e4557c5ac23b07494d935523ffce7d7cece9da
 DIST arora-0.11.0.tar.gz 1072898 RMD160 c8b010d5e540c8ee3a0604c4d24c19c8b8653798 SHA1 480cfd7482cccbb7ece866fa10afe9acace29b31 SHA256 6f5fef191935ed740aaa61d5f081abb823997abc20a993cbcb74a4d8adcad3b9
-DIST arora-0.7.1.tar.gz 896528 RMD160 31e48afa832101f0873a074cc75c8c36e89d5d66 SHA1 5dc87f5a4995c83de787969c99935b44a37818a4 SHA256 9bb09ea94672953debc87d63de5783a84d7db81ae6de8e08d7de8af9f2decaa7
 EBUILD arora-0.10.2-r1.ebuild 2132 RMD160 df31ff3575fb01fcd255bf46db3b8f1c0c3e9e2b SHA1 fd74b3f1126e2bed133a8b3cb434539cd0046836 SHA256 6c407c3c791f21bcf3266e030e020f56f7667ae127d4245ffdd87d0ce36309b5
-EBUILD arora-0.11.0.ebuild 2030 RMD160 b5efe6ac5ce98fb4e72dd975983d24767f11defe SHA1 e89a6a58957129142d026ff4c16be169fc2608bb SHA256 8d6252b65861fce9f9e1f412ca38558245ad63853bf667aac3516070acb6c537
-EBUILD arora-0.7.1.ebuild 1599 RMD160 937e3753a67c4d0187058fce6bf41b7adccc9658 SHA1 9863c946ceec4860076435d19fcccb7297326959 SHA256 646bc34a499e5ea8cc5854463d00b09ae5b1f3444aa2107745d2f9f17d139521
-MISC ChangeLog 6249 RMD160 a9344c4bda561f28231104b5e5070251b23c80cb SHA1 1288e2f377d37cc3d7f7b3b0b1e0be268ab62f36 SHA256 b38725b02eb1f76dbfaf685cc0231fe48c2b8d56fc02ab9cb3aa53c9b43278bb
+EBUILD arora-0.11.0.ebuild 1879 RMD160 b72ccb50474b1cec0d69833ce9809365a69e95b2 SHA1 2a0c395a5e2adb5704a60d0c2f15f9764ffeda47 SHA256 cf190cecad5fc4e8cfa4714868b876e27e7b6754f3ae803cc2b0fa19991dd82d
+MISC ChangeLog 6389 RMD160 5c85cd08bd51cfabc3f7536fd5c2687aca1d590c SHA1 6cc87880a1ffaadcee7689ecb9498cd936687ebb SHA256 03e0c5c56944b5f3c16f7ee8b412379590e44d918200030f4586b57befb72935
 MISC metadata.xml 218 RMD160 8ac5a6b1750a457d848b8b154fcaf7ca2b8decb1 SHA1 961504d4ab445fc56ba6bd0e9fd0c81270cf252e SHA256 f28447fb1cee5de814788da71f81ac68b66b24ac81cac98456698c7ce9bcc011
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOyPDyAAoJENXLsxwXqFxySywQAKEj7AvLumfTi40C8NpAvPC4
+NFYcVG6FDDzuyAP+qoQ/fmyuEsW/qABpt0Z/VR4n+ln0Od4nulMHnDHXhyxLyJ4Q
+MIu7N2oS8aipRAH5bUW8ZGUNPIjl/SYThkuKHL9FFZ2ckxU0yyYBfPZv/K1ysum+
+dEy0ZToDJfRSdm+WsrqHs3N8L6mJ8tz1jFcQJ8ytlezh7mCREF9PAV6KqEOMcQcT
+UNaWXwjg4SRnzcMgYp3vZUphUgK251KcZs9/PoqS99J+STZbnb44qf901+h8xWzR
+dL/n8HwYbzFYXvbO4nlFPnv4Igl7QJX20HtGoauJQMK+SEvqJWArW5OMH9YYJoxp
+c/N4/TC3rPAjU63nOt08QSuhrfe6D565xqsNiRNBZyUHHHJ7L8OMfPxZyFPL60hT
+4wQWYBBzKf87FTQABd1j4/fJ5SC/t1zhKIFKsq2E0xx4SBwQubOZNBLNdVpSLeLa
+BDhjQMY33f7aOhLTGeOVxRhZ5iMLjBsF4JTwyFd3HEO2dE5NQjVEAnkmQwSkFKTc
+xu4GY5bRF6wjO39wd1VUTWnyc0LQ+Jk6uLGmF5BywnjeEbiRjXCtgvdpDDPH1e0O
+0HpisopOW5eVYavwdSSNWG/pqUFQNSpqqi+H7t7oN5L1PymBo/sySz370rgjXOl8
+rMI5EOJFl89H0HbwzlLK
+=qlul
+-----END PGP SIGNATURE-----

diff --git a/www-client/arora/arora-0.11.0.ebuild b/www-client/arora/arora-0.11.0.ebuild
index 5f914079e8c931e87e6f5e4b62f3f574816411b2..e86d25c29ec9e0155d86856f11e0e6cb61a4fb10 100644 (file)
--- a/www-client/arora/arora-0.11.0.ebuild
+++ b/www-client/arora/arora-0.11.0.ebuild
@@ -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 @@ 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
 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@latin.ts src/locale/sr@latin.ts
@@ -40,25 +43,24 @@ src_prepare() {
 
        # 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_configure() {
 }
 
 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
 }

diff --git a/www-client/arora/arora-0.7.1.ebuild b/www-client/arora/arora-0.7.1.ebuild
deleted file mode 100644 (file)
index e46818e..0000000
--- a/www-client/arora/arora-0.7.1.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.1.ebuild,v 1.4 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="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 INSTALL_ROOT="${D}" install || die 'make install failed'
-       dodoc AUTHORS ChangeLog README
-}