Depend on qt3support being enabled (bug #390985). Remove obsolete version.

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

5 files changed, 30 insertions, 73 deletions

diff --git a/app-text/goldendict/ChangeLog b/app-text/goldendict/ChangeLog
index 00ae61023fa3..a582f04b78c2 100644
--- a/app-text/goldendict/ChangeLog
+++ b/app-text/goldendict/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/goldendict
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/ChangeLog,v 1.5 2011/05/09 14:46:59 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/ChangeLog,v 1.6 2012/02/14 15:39:28 pesa Exp $
+
+  14 Feb 2012; Davide Pesavento <pesa@gentoo.org>
+  -files/goldendict-0.9.0-gcc4.4.patch, -goldendict-0.9.0_p20100410.ebuild,
+  goldendict-1.0.1.ebuild, metadata.xml:
+  Depend on qt3support being enabled (bug #390985). Remove obsolete version.
 
   09 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> goldendict-1.0.1.ebuild:
   x86 stable wrt bug #365343
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
index de6cf92083a3..2df28805a30e 100644
--- a/app-text/goldendict/Manifest
+++ b/app-text/goldendict/Manifest
@@ -1,17 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX goldendict-0.9.0-gcc4.4.patch 380 RMD160 ad0d42441279dd3b13ecdf5903d5fc991cf8ca31 SHA1 42c735a450640614e84f3b10a906b2fc4a3ecc3a SHA256 e7dd204ab580bbe473d782299d7d24f35bcedaaca4034c6540761b6d10d31c72
-DIST goldendict-0.9.0_p20100410.tar.xz 1427232 RMD160 54f9f2139b44fe694451f22dd997aabb9c85f826 SHA1 a17769218cd102c49e5be11a765a244fe564e8b6 SHA256 b2f417af90d7adeff6213cb8766b983cb9da692deb886793031d592f794e0bce
 DIST goldendict-1.0.1-src.tar.bz2 2705932 RMD160 2a87de3172a117fbb419aa7d1e037ba2c4cb072f SHA1 a1ff36b1cceb5234f4730d1c6f19405a76d40fc4 SHA256 b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6
-EBUILD goldendict-0.9.0_p20100410.ebuild 1119 RMD160 136ae7eed1172d70a39789d1f6a17888ce078ab8 SHA1 4b43c45076f6786702590ec91b8de5092f5c8fe0 SHA256 7d6557627c26eb8b245631bb83167cfb2cca1969faceb7c54158ec33a63b1edb
-EBUILD goldendict-1.0.1.ebuild 1445 RMD160 9573fb269b1e71c35dac971c54772073bdff147f SHA1 04cba15d95e12880b885ecbc5232d16fb91f4305 SHA256 2fa79e3610704e49a7e87e333bf3670088b7afb942ffd142847437bd8ec65772
-MISC ChangeLog 1638 RMD160 7c2763ca7ae12799bc9ceff8c2bc45166791bf91 SHA1 10970df1b3bc6bfaa3c1adccf1673170f6fab2cb SHA256 2e231ddde9c5ef0fe0ec25f8636133bfab62281155cb1240266c4499208e0759
+EBUILD goldendict-1.0.1.ebuild 1460 RMD160 446e881cfc903d4fdb440f3fb396f6d34397bf65 SHA1 8ad498d997e31b99580898dc305e5c86e336147f SHA256 fca8ac22e14e47a6268615f2c10ac4561db06a5cdcf58b7dcca0cb84f43bb61c
+MISC ChangeLog 1877 RMD160 84c73e0d6a08456b2a12dcf387ee0b551c19e608 SHA1 490c50abac37ef80e94ae976d2fe02295e5f75f1 SHA256 d434429f09c9a84a14e3b837299a98c5d26ad7f49b04d67d17ebdb82c31b1ef6
 MISC metadata.xml 333 RMD160 93f6aaf126726f5cbe1202fe5ee4cb6ab9a8509d SHA1 e6f6fddeba7ba1d4284f3e44d7939349baf4d2fb SHA256 51f817463269cbc905626ddf39748b9ad5f1cae136b4f758623389211325bbc4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk3H/mMACgkQuUQtlDBCeQKv8gCfcTDPqhbXT0jpxGIXcmbhWfrF
-zGwAn1ztoDd3BZsMAYi5JAi+WwFw0PbW
-=ck7D
+iQIcBAEBCgAGBQJPOoBCAAoJENXLsxwXqFxyHrIQALfxabfuyVTqekt5X7jrCRi8
+rKHrclWcClzs+oaP2dgvHbLdW3C+8aTndl7fgrVjbicQ97JtV46QQ5MNp0yVrlzo
+YSHBKEiH8JeQqdNLqZoaK/btwdd6rooDg73y5E8T504d+UFa79rnpR4hsNBghFNN
+A947iR/fPdecFKoPC9VTgdfmg394BqyMjpXePPTueQfu8G/DmcZrv1odAD9H1OHU
+RXgMmnGLELBLgPT4MbbXk/03tFgKNxKbMdBCpuXnlylLZU0Rn6OS4uZycMfxXt1h
+cG75SqzKrRP0o10ypu7dAvacMvGR3OFVV/sMjgoC+lUjVZ7zgm+Ye8jUoyQkxDx5
+dvBTtXicy02NS48PSefnfp5X1T59wEAZ7PfzL7lPdDpMrNvlSTtqcPwOq4IbSA++
+1G0FO/Ms5RboyMR3MiOUPfGnHwAXbUqsulmuckkcCY5HhVQbJ9Q6s65aQm/adAF/
+T7Yj1mOktl/myol1j2imiIhus1C9lV/uvOPCaaGNob/7BqaID/2QJZaIkueBHppM
+QRE5QmCAm4EAzjExcGL6Izlqt59Q6S7AjE/WWi+s8i4zEXMOGYHaEQcozrWCiMU2
+WyprD8EdMdQ/I/pF7vQblCg4GP00YTzeqHXEaWFH/9aGVqJ7o93YLTASh9QqJS7J
+7/BBUhNm/ZTDRiGHGj0o
+=hxRw
 -----END PGP SIGNATURE-----
diff --git a/app-text/goldendict/files/goldendict-0.9.0-gcc4.4.patch b/app-text/goldendict/files/goldendict-0.9.0-gcc4.4.patch
deleted file mode 100644
index 80d4551389de..000000000000
--- a/app-text/goldendict/files/goldendict-0.9.0-gcc4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar goldendict-0.9.0-src.orig/chunkedstorage.hh goldendict-0.9.0-src/chunkedstorage.hh
---- goldendict-0.9.0-src.orig/chunkedstorage.hh	2009-09-24 20:20:56.000000000 +0600
-+++ goldendict-0.9.0-src/chunkedstorage.hh	2009-09-24 20:22:22.000000000 +0600
-@@ -8,6 +8,7 @@
- #include "file.hh"
- 
- #include <vector>
-+#include <stdint.h>
- 
- #ifdef _MSC_VER
- #include <stdint_msvc.h>
diff --git a/app-text/goldendict/goldendict-0.9.0_p20100410.ebuild b/app-text/goldendict/goldendict-0.9.0_p20100410.ebuild
deleted file mode 100644
index a7fa427a602d..000000000000
--- a/app-text/goldendict/goldendict-0.9.0_p20100410.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/goldendict-0.9.0_p20100410.ebuild,v 1.2 2011/03/26 16:15:41 dilfridge Exp $
-
-EAPI="3"
-LANGSLONG="ar_SA bg_BG cs_CZ de_DE el_GR lt_LT ru_RU zh_CN"
-
-inherit qt4-r2
-
-DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.berlios.de/"
-SRC_URI="http://omploader.org/vNDQ1cQ/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
-
-RDEPEND=">=app-text/hunspell-1.2
-	media-libs/libogg
-	media-libs/libvorbis
-	sys-libs/zlib
-	x11-libs/libXtst
-	>=x11-libs/qt-core-4.5:4[exceptions]
-	>=x11-libs/qt-gui-4.5:4[exceptions]
-	>=x11-libs/qt-webkit-4.5:4[exceptions]
-	!kde? ( || (
-		>=x11-libs/qt-phonon-4.5:4[exceptions]
-		media-libs/phonon
-	) )
-	kde? ( media-libs/phonon )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	qt4-r2_src_install
-
-	# install translations
-	insinto /usr/share/apps/${PN}/locale
-	for lang in ${LANGSLONG}; do
-		if use linguas_${lang%_*}; then
-			doins locale/${lang}.qm || die
-		fi
-	done
-}
diff --git a/app-text/goldendict/goldendict-1.0.1.ebuild b/app-text/goldendict/goldendict-1.0.1.ebuild
index 6354459378d5..9d6bdf2f44a4 100644
--- a/app-text/goldendict/goldendict-1.0.1.ebuild
+++ b/app-text/goldendict/goldendict-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/goldendict-1.0.1.ebuild,v 1.4 2011/05/09 14:46:59 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/goldendict/goldendict-1.0.1.ebuild,v 1.5 2012/02/14 15:39:28 pesa Exp $
 
 EAPI=3
 LANGSLONG="ar_SA bg_BG cs_CZ de_DE el_GR it_IT lt_LT ru_RU uk_UA vi_VN zh_CN"
@@ -22,8 +22,8 @@ RDEPEND="
 	media-libs/libvorbis
 	sys-libs/zlib
 	x11-libs/libXtst
-	>=x11-libs/qt-core-4.5:4[exceptions]
-	>=x11-libs/qt-gui-4.5:4[exceptions]
+	>=x11-libs/qt-core-4.5:4[exceptions,qt3support]
+	>=x11-libs/qt-gui-4.5:4[exceptions,qt3support]
 	>=x11-libs/qt-webkit-4.5:4[exceptions]
 	!kde? ( || (
 		>=x11-libs/qt-phonon-4.5:4[exceptions]
@@ -34,7 +34,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 "
-S="${WORKDIR}"
+
+S=${WORKDIR}
 
 src_prepare() {
 	qt4-r2_src_prepare