gnome-extra/gnome-utils & friends: moved to gx86; sync -9999 with gx86

3 files changed, 11 insertions, 50 deletions

diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index ae7f66c6..670acde7 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,3 +1 @@
-DIST gnome-dictionary-3.4.0.tar.xz 2155012 RMD160 a562d053cb12d08fad89b4eaa5033801ecfa9ff0 SHA1 4ac5035cf3edbd636ac65dc33f831c8276d4f054 SHA256 70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af
-EBUILD gnome-dictionary-3.4.0.ebuild 1071 RMD160 72a3791a4c4dd473dc1a9073f02cb17a8f7804f8 SHA1 2347cee084d5f0bbc320529f6f2fa9b9573ea998 SHA256 951bd264de8718a29b94e85c9a655dc7365548e07a5c8457e44c065d9137249b
-EBUILD gnome-dictionary-9999.ebuild 1071 RMD160 72a3791a4c4dd473dc1a9073f02cb17a8f7804f8 SHA1 2347cee084d5f0bbc320529f6f2fa9b9573ea998 SHA256 951bd264de8718a29b94e85c9a655dc7365548e07a5c8457e44c065d9137249b
+EBUILD gnome-dictionary-9999.ebuild 1044 RMD160 c26ecbfadea77634ea17a4eace7b31e6ff4dfeba SHA1 5ec17e4c06d14699654b7a3c19360720ff9b4fe2 SHA256 d23bfdbaffb9e83fb24898dda4c9ca977e5642912da9b38661d2c346edb2c9d4
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild
deleted file mode 100644
index 221ec256..00000000
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Dictionary utility for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
-SLOT="0"
-IUSE="doc ipv6"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0.0:3"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.15 )"
-
-pkg_setup() {
-	DOCS="AUTHORS NEWS README TODO"
-	G2CONF="--disable-schemas-compile
-		$(use_enable ipv6)"
-}
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
index 221ec256..a8956e21 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-9999.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-9999.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/gnome-extra/gnome-utils/gnome-utils-2.32.0-r1.ebuild,v 1.1 2010/12/04 18:08:10 pacho Exp $
+# $Header: $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Dictionary utility for GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
 LICENSE="GPL-2 LGPL-2.1 FDL-1.1"
 SLOT="0"
@@ -23,19 +23,23 @@ else
 fi
 
 COMMON_DEPEND=">=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0.0:3"
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.0.0:3
+	x11-libs/pango"
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
 	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.22
 	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.15 )"
 
 pkg_setup() {
 	DOCS="AUTHORS NEWS README TODO"
-	G2CONF="--disable-schemas-compile
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
 		$(use_enable ipv6)"
 }