public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-search-tool/
@ 2012-12-24  0:19 Gilles Dartiguelongue
  0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2012-12-24  0:19 UTC (permalink / raw
  To: gentoo-commits

commit:     6bfb4214267be755b5c43f7c025cfe6787715165
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 00:18:30 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 00:18:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6bfb4214

gnome-extra/gnome-search-tool: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add metadata.xml.

---
 .../gnome-search-tool-3.6.0.ebuild                 |   53 --------------------
 .../gnome-search-tool-9999.ebuild                  |    9 ++--
 gnome-extra/gnome-search-tool/metadata.xml         |    5 ++
 3 files changed, 10 insertions(+), 57 deletions(-)

diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
deleted file mode 100644
index 00cff3a..0000000
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Search tool for GNOME 3"
-HOMEPAGE="https://live.gnome.org/GnomeUtils"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-IUSE=""
-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/atk
-	>=dev-libs/glib-2.30:2
-	sys-apps/grep
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3:3
-	x11-libs/libICE
-	x11-libs/libSM
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/findutils
-	|| ( sys-apps/mlocate sys-freebsd/freebsd-ubin )
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-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 00cff3a..66ac14f 100644
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -39,15 +39,16 @@ RDEPEND="${COMMON_DEPEND}
 "
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND} app-text/yelp-tools"
+fi
+
 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/metadata.xml b/gnome-extra/gnome-search-tool/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/gnome-extra/gnome-search-tool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-search-tool/
@ 2012-10-28 18:10 Gilles Dartiguelongue
  0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-28 18:10 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-12-24  0:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-24  0:19 [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-search-tool/ Gilles Dartiguelongue
  -- strict thread matches above, loose matches on Subject: below --
2012-10-28 18:10 Gilles Dartiguelongue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox