[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-search-tool/

[Gilles Dartiguelongue]

commit:     d1e2683c28467ef93084c118c0010c97a90c3a87
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 17:52:23 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 18:07:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d1e2683c

gnome-extra/gnome-search-tool: 3.4.0 → 3.6.0

---
 ...-9999.ebuild => gnome-search-tool-3.6.0.ebuild} |   26 ++++++++++---------
 .../gnome-search-tool-9999.ebuild                  |   26 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
similarity index 75%
copy from gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
copy to gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
index b050433..00cff3a 100644
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
@@ -23,29 +23,31 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 fi
 
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/glib-2.30.0:2
-	gnome-base/gconf:2
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.30:2
 	sys-apps/grep
 	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.0.0:3
+	>=x11-libs/gtk+-3:3
 	x11-libs/libICE
-	x11-libs/libSM"
+	x11-libs/libSM
+"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	|| ( sys-apps/mlocate sys-freebsd/freebsd-ubin )
-	!<gnome-extra/gnome-utils-3.4"
+	!<gnome-extra/gnome-utils-3.4
+"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
+	app-text/yelp-tools
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-# xml doesn't validate with LINGUAS=ja
-RESTRICT="test"
-
-pkg_setup() {
+src_configure() {
 	DOCS="AUTHORS NEWS"
 	G2CONF="${G2CONF} --disable-schemas-compile"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	gnome2_src_configure
 }

diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
index b050433..00cff3a 100644
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
@@ -23,29 +23,31 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 fi
 
-COMMON_DEPEND="dev-libs/atk
-	>=dev-libs/glib-2.30.0:2
-	gnome-base/gconf:2
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.30:2
 	sys-apps/grep
 	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.0.0:3
+	>=x11-libs/gtk+-3:3
 	x11-libs/libICE
-	x11-libs/libSM"
+	x11-libs/libSM
+"
 RDEPEND="${COMMON_DEPEND}
 	sys-apps/findutils
 	|| ( sys-apps/mlocate sys-freebsd/freebsd-ubin )
-	!<gnome-extra/gnome-utils-3.4"
+	!<gnome-extra/gnome-utils-3.4
+"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
+	app-text/yelp-tools
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
-# xml doesn't validate with LINGUAS=ja
-RESTRICT="test"
-
-pkg_setup() {
+src_configure() {
 	DOCS="AUTHORS NEWS"
 	G2CONF="${G2CONF} --disable-schemas-compile"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	gnome2_src_configure
 }