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

[Gilles Dartiguelongue]

commit:     0af69b8879bfdd70377e569ee5820d43b536af26
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri May  8 23:07:09 2015 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May  9 23:10:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0af69b88

app-misc/gnote: 3.14.2 → 3.16.0

 .../{gnote-9999.ebuild => gnote-3.16.0.ebuild}      | 21 ++++-----------------
 app-misc/gnote/gnote-9999.ebuild                    |  2 +-
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/app-misc/gnote/gnote-9999.ebuild 
b/app-misc/gnote/gnote-3.16.0.ebuild
similarity index 81%
copy from app-misc/gnote/gnote-9999.ebuild
copy to app-misc/gnote/gnote-3.16.0.ebuild
index dcce87e..3646dea 100644
--- a/app-misc/gnote/gnote-9999.ebuild
+++ b/app-misc/gnote/gnote-3.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -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="https://wiki.gnome.org/Apps/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,13 +55,11 @@ src_prepare() {
 }
 
 src_configure() {
-       local myconf=""
-       [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
        gnome2_src_configure \
                --disable-static \
                $(use_enable debug) \
                $(use_with X x11-support) \
-               ${myconf}
+               ITSTOOL=$(type -P true)
 }
 
 src_install() {

diff --git a/app-misc/gnote/gnote-9999.ebuild b/app-misc/gnote/gnote-9999.ebuild
index dcce87e..05640a1 100644
--- a/app-misc/gnote/gnote-9999.ebuild
+++ b/app-misc/gnote/gnote-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $