From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ECC7B1393EA for ; Sun, 6 Apr 2014 18:22:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBD8FE0ADE; Sun, 6 Apr 2014 18:22:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22236E0ADF for ; Sun, 6 Apr 2014 18:22:55 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2632533FEC2 for ; Sun, 6 Apr 2014 18:22:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id A2F9E188F2 for ; Sun, 6 Apr 2014 18:22:52 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1396806714.47acbc8cf1c708867b5123dfb85572f1af198f42.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: app-misc/gnote/ X-VCS-Repository: proj/gnome X-VCS-Files: app-misc/gnote/gnote-3.12.0.ebuild app-misc/gnote/gnote-9999.ebuild X-VCS-Directories: app-misc/gnote/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 47acbc8cf1c708867b5123dfb85572f1af198f42 X-VCS-Branch: master Date: Sun, 6 Apr 2014 18:22:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 79f5c6e2-2fe5-4c70-b069-f6e9cdd53214 X-Archives-Hash: f0d4b95b8514b3ec9e37f526d477716c commit: 47acbc8cf1c708867b5123dfb85572f1af198f42 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Apr 6 17:46:24 2014 +0000 Commit: Gilles Dartiguelongue gentoo 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}