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

[Gilles Dartiguelongue]

commit:     47acbc8cf1c708867b5123dfb85572f1af198f42
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  6 17:46:24 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr  6 17:51:54 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=47acbc8c

app-misc/gnote: 3.10.3 → 3.12.0

---
 .../{gnote-9999.ebuild => gnote-3.12.0.ebuild}     | 25 ++++++----------------
 app-misc/gnote/gnote-9999.ebuild                   |  6 +++---
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/app-misc/gnote/gnote-9999.ebuild 
b/app-misc/gnote/gnote-3.12.0.ebuild
similarity index 77%
copy from app-misc/gnote/gnote-9999.ebuild
copy to app-misc/gnote/gnote-3.12.0.ebuild
index 23511a3..255aab6 100644
--- a/app-misc/gnote/gnote-9999.ebuild
+++ b/app-misc/gnote/gnote-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,20 +6,13 @@ 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";
+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
+KEYWORDS="~amd64 ~x86"
 IUSE="debug +X"
 
 # Automagic glib-2.32 dep
@@ -27,13 +20,13 @@ COMMON_DEPEND="
        >=app-crypt/libsecret-0.8
        >=app-text/gtkspell-3.0:3
        >=dev-cpp/glibmm-2.32:2
-       >=dev-cpp/gtkmm-3.6:3.0
+       >=dev-cpp/gtkmm-3.10:3.0
        >=dev-libs/boost-1.34
        >=dev-libs/glib-2.32:2
        >=dev-libs/libxml2-2:2
        dev-libs/libxslt
        >=sys-apps/util-linux-2.16:=
-       >=x11-libs/gtk+-3.6:3
+       >=x11-libs/gtk+-3.10:3
        X? ( x11-libs/libX11 )
 "
 RDEPEND="${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 23511a3..a30ffcf 100644
--- a/app-misc/gnote/gnote-9999.ebuild
+++ b/app-misc/gnote/gnote-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://live.gnome.org/Gnote";
+HOMEPAGE="https://wiki.gnome.org/Apps/Gnote";
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
@@ -27,13 +27,13 @@ COMMON_DEPEND="
        >=app-crypt/libsecret-0.8
        >=app-text/gtkspell-3.0:3
        >=dev-cpp/glibmm-2.32:2
-       >=dev-cpp/gtkmm-3.6:3.0
+       >=dev-cpp/gtkmm-3.10:3.0
        >=dev-libs/boost-1.34
        >=dev-libs/glib-2.32:2
        >=dev-libs/libxml2-2:2
        dev-libs/libxslt
        >=sys-apps/util-linux-2.16:=
-       >=x11-libs/gtk+-3.6:3
+       >=x11-libs/gtk+-3.10:3
        X? ( x11-libs/libX11 )
 "
 RDEPEND="${COMMON_DEPEND}