[gentoo-commits] proj/gnome:master commit in: app-misc/gnote/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     a10aefcad5bdfa77aab2c49048e21c04791b24b4
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 23:16:57 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 23:39:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a10aefca

app-misc/gnote: 3.9.2 → 3.10.0

Enable X use flag by default, disabling it only makes sens for wayland
setups but X11 is the most common setup.

---
 .../gnote/{gnote-3.9.2.ebuild => gnote-3.10.0.ebuild}  | 18 +++---------------
 app-misc/gnote/gnote-9999.ebuild                       |  7 ++++---
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/app-misc/gnote/gnote-3.9.2.ebuild b/app-misc/gnote/gnote-3.10.0.ebuild
similarity index 84%
rename from app-misc/gnote/gnote-3.9.2.ebuild
rename to app-misc/gnote/gnote-3.10.0.ebuild
index a2abc5a..28a5e5c 100644
--- a/app-misc/gnote/gnote-3.9.2.ebuild
+++ b/app-misc/gnote/gnote-3.10.0.ebuild
@@ -6,21 +6,14 @@ EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2 readme.gentoo
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Desktop note-taking application"
 HOMEPAGE="http://live.gnome.org/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="debug X"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +X"
 
 # Automagic glib-2.32 dep
 COMMON_DEPEND="
@@ -45,10 +38,6 @@ DEPEND="${DEPEND}
 	>=dev-util/intltool-0.35.0
 	virtual/pkgconfig
 "
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools"
-fi
 
 src_prepare() {
 	# Do not alter CFLAGS
@@ -66,12 +55,11 @@ src_prepare() {
 }
 
 src_configure() {
-	[[ ${PV} != 9999 ]] && G2CONF="ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--disable-static \
 		$(use_enable debug) \
 		$(use_with X x11-support) \
-		$G2CONF
+		ITSTOOL=$(type -P true)
 }
 
 src_install() {

diff --git a/app-misc/gnote/gnote-9999.ebuild b/app-misc/gnote/gnote-9999.ebuild
index a2abc5a..23511a3 100644
--- a/app-misc/gnote/gnote-9999.ebuild
+++ b/app-misc/gnote/gnote-9999.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="debug X"
+IUSE="debug +X"
 
 # Automagic glib-2.32 dep
 COMMON_DEPEND="
@@ -66,12 +66,13 @@ src_prepare() {
 }
 
 src_configure() {
-	[[ ${PV} != 9999 ]] && G2CONF="ITSTOOL=$(type -P true)"
+	local myconf=""
+	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--disable-static \
 		$(use_enable debug) \
 		$(use_with X x11-support) \
-		$G2CONF
+		${myconf}
 }
 
 src_install() {