Fix slot-dep on gtk+

(Portage version: 2.1.9.44/cvs/Linux x86_64)

5 files changed, 15 insertions, 179 deletions

diff --git a/app-text/stardict/ChangeLog b/app-text/stardict/ChangeLog
index f1ee17d6c31a..086e5c81f86a 100644
--- a/app-text/stardict/ChangeLog
+++ b/app-text/stardict/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/stardict
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.8 2010/09/18 16:10:49 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/ChangeLog,v 1.9 2011/03/27 12:23:55 nirbheek Exp $
+
+  27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -stardict-2.4.8-r1.ebuild, -stardict-3.0.1-r1.ebuild,
+  stardict-3.0.1-r2.ebuild, stardict-3.0.1-r3.ebuild:
+  Fix slot-dep on gtk+
 
   18 Sep 2010; Raúl Porcel <armin76@gentoo.org> stardict-3.0.1-r3.ebuild:
   sparc stable wrt #288555
diff --git a/app-text/stardict/stardict-2.4.8-r1.ebuild b/app-text/stardict/stardict-2.4.8-r1.ebuild
deleted file mode 100644
index 93a5e1cdc712..000000000000
--- a/app-text/stardict/stardict-2.4.8-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-2.4.8-r1.ebuild,v 1.1 2010/02/03 07:54:24 pva Exp $
-
-inherit gnome2 eutils
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-#       their indexes seem to be in a different format. So we'll keep them
-#       seperate for now.
-
-IUSE="gnome"
-DESCRIPTION="A GNOME2 international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict.sourceforge.net/ http://cosoft.org.cn/projects/stardict/"
-SRC_URI="mirror://sourceforge/stardict/${P}.tar.bz2"
-
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-# when adding keywords, remember to add to stardict.eclass
-KEYWORDS="~amd64 ppc ~ppc64 ~sparc x86"
-
-RDEPEND="gnome? ( >=gnome-base/libbonobo-2.2.0
-		>=gnome-base/libgnome-2.2.0
-		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
-		>=gnome-base/orbit-2.6
-		app-text/scrollkeeper )
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/popt-1.7
-	>=x11-libs/gtk+-2.6"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.22
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"/src
-	epatch "${FILESDIR}"/${P}-ClipboardReceivedCallback.patch
-	epatch "${FILESDIR}"/${P}-floatwin-disappear.patch
-	gnome2_omf_fix
-}
-
-src_compile() {
-	export PKG_CONFIG=$(type -P pkg-config)
-	G2CONF="$(use_enable gnome gnome-support)"
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-	# dictionary index generation files
-	exeinto /usr/share/stardict/tools
-	doexe "${S}"/src/tools/{dictd2dic,directory2dic,olddic2newdic,oxford2dic,pydict2dic,wquick2dic,stardict_dict_update}
-}
-
-pkg_postinst() {
-	elog "You will now need to install stardict dictionary files. If"
-	elog "you have not, execute the below to get a list of dictionaries:"
-	elog
-	elog "  emerge -s stardict-"
-	elog
-	ewarn "If you upgraded from 2.4.1 or lower and use your own dictionary"
-	ewarn "files, you'll need to run: /usr/share/stardict/tools/stardict_dict_update"
-}
diff --git a/app-text/stardict/stardict-3.0.1-r1.ebuild b/app-text/stardict/stardict-3.0.1-r1.ebuild
deleted file mode 100644
index cc6e374a0822..000000000000
--- a/app-text/stardict/stardict-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r1.ebuild,v 1.2 2010/05/03 23:47:26 ssuominen Exp $
-
-inherit gnome2 eutils autotools
-
-# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
-#       their indexes seem to be in a different format. So we'll keep them
-#       seperate for now.
-
-IUSE="festival espeak gnome gucharmap qqwry pronounce spell"
-DESCRIPTION="A GNOME2 international dictionary supporting fuzzy and glob style matching"
-HOMEPAGE="http://stardict.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stardict/${P}.tar.bz2
-		qqwry? ( mirror://sourceforge/stardict/QQWry.Dat.bz2 )
-		pronounce? ( mirror://sourceforge/stardict/WyabdcRealPeopleTTS.tar.bz2 )"
-
-RESTRICT="test"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
-		>=gnome-base/libgnome-2.2.0
-		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
-		>=gnome-base/orbit-2.6
-		app-text/scrollkeeper )
-	spell? ( app-text/enchant )
-	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
-	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.12"
-
-RDEPEND="${DEP}
-	espeak? ( >=app-accessibility/espeak-1.29 )
-	festival? ( =app-accessibility/festival-1.96_beta )"
-
-DEPEND="${DEP}
-	>=dev-util/intltool-0.22
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if (use gnome && use pronounce && ! built_with_use gnome-base/libgnome esd); then
-		ewarn 'Note, being built with USE="gnome" stardict uses gnome_sound_play()'
-		ewarn 'to play RealPeopleTTS sounds, which plays sounds only in case'
-		ewarn 'gnome-base/libgnome was built with USE="esd".'
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-configure.in-EST.diff
-	epatch "${FILESDIR}"/${P}-gconf-m4.diff
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-transparent_trayicon.patch
-	epatch "${FILESDIR}"/${P}-changelog-minor-typo-fixes.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	AT_M4DIR="m4" eautoreconf
-	gnome2_omf_fix
-}
-
-src_compile() {
-	export PKG_CONFIG=$(type -P pkg-config)
-	# Festival plugin crashes, bug 188684. Disable for now.
-	G2CONF="$(use_enable gnome gnome-support)
-		$(use_enable spell)
-		$(use_enable gucharmap)
-		$(use_enable espeak)
-		$(use_enable qqwry)
-		--disable-festival
-		--disable-advertisement
-		--disable-updateinfo"
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-	if use qqwry; then
-		insinto /usr/share/stardict/data
-		doins ../QQWry.Dat
-	fi
-	if use pronounce; then
-		dodir /usr/share/
-		mv ../WyabdcRealPeopleTTS "${D}"/usr/share/
-	fi
-	dodoc doc/{FAQ,HowToCreateDictionary,StarDictFileFormat,Translation,HACKING}
-}
-
-pkg_postinst() {
-	if use festival; then
-		elog "Note: festival text to speach (TTS) plugin is not built. To use festival"
-		elog 'TTS plugin, please, enable "Use TTS program." at:'
-		elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
-		elog '"echo %s | festival --tts"'
-		elog
-	fi
-	elog "You will now need to install stardict dictionary files. If"
-	elog "you have not, execute the below to get a list of dictionaries:"
-	elog
-	elog "  emerge -s stardict-"
-}
diff --git a/app-text/stardict/stardict-3.0.1-r2.ebuild b/app-text/stardict/stardict-3.0.1-r2.ebuild
index 3e0f5aef65ee..fbf8c41f1703 100644
--- a/app-text/stardict/stardict-3.0.1-r2.ebuild
+++ b/app-text/stardict/stardict-3.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r2.ebuild,v 1.4 2010/02/09 21:13:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r2.ebuild,v 1.5 2011/03/27 12:23:55 nirbheek Exp $
 
 EAPI="2"
 
@@ -26,14 +26,14 @@ DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
 		>=gnome-base/libgnome-2.2.0
 		pronounce? ( >=gnome-base/libgnome-2.2.0[esd] )
 		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
+		>=gnome-base/gconf-2:2
 		>=gnome-base/orbit-2.6
 		app-text/scrollkeeper )
 	spell? ( app-text/enchant )
 	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
 	dev-libs/libsigc++
 	>=sys-libs/zlib-1.1.4
-	>=x11-libs/gtk+-2.12"
+	>=x11-libs/gtk+-2.12:2"
 
 RDEPEND="${DEP}
 	espeak? ( >=app-accessibility/espeak-1.29 )
diff --git a/app-text/stardict/stardict-3.0.1-r3.ebuild b/app-text/stardict/stardict-3.0.1-r3.ebuild
index 88db19a61156..537a05b81585 100644
--- a/app-text/stardict/stardict-3.0.1-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r3.ebuild,v 1.2 2010/09/18 16:10:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.1-r3.ebuild,v 1.3 2011/03/27 12:23:55 nirbheek Exp $
 
 EAPI="2"
 
@@ -26,14 +26,14 @@ DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
 		>=gnome-base/libgnome-2.2.0
 		pronounce? ( >=gnome-base/libgnome-2.2.0[esd] )
 		>=gnome-base/libgnomeui-2.2.0
-		>=gnome-base/gconf-2
+		>=gnome-base/gconf-2:2
 		>=gnome-base/orbit-2.6
 		app-text/scrollkeeper )
 	spell? ( app-text/enchant )
 	gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
 	dev-libs/libsigc++
 	sys-libs/zlib
-	>=x11-libs/gtk+-2.12"
+	>=x11-libs/gtk+-2.12:2"
 
 RDEPEND="${DEP}
 	espeak? ( >=app-accessibility/espeak-1.29 )