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

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

4 files changed, 13 insertions, 63 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/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