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 DA8831381F3 for ; Sat, 24 Aug 2013 14:10:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB28BE0957; Sat, 24 Aug 2013 14:10:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E272E0957 for ; Sat, 24 Aug 2013 14:10:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E76D33EB7E for ; Sat, 24 Aug 2013 14:10:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A46A5E468F for ; Sat, 24 Aug 2013 14:10:17 +0000 (UTC) From: "Priit Laes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Priit Laes" Message-ID: <1377353482.20b9dde6892ef99346c6bd19ff0184f3b961a83a.plaes@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.9.2.ebuild app-misc/gnote/gnote-9999.ebuild X-VCS-Directories: app-misc/gnote/ X-VCS-Committer: plaes X-VCS-Committer-Name: Priit Laes X-VCS-Revision: 20b9dde6892ef99346c6bd19ff0184f3b961a83a X-VCS-Branch: master Date: Sat, 24 Aug 2013 14:10:17 +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: c354f652-9566-465a-b452-46d9dea036e4 X-Archives-Hash: ef9aa03f2d1940c9564181f2e1f57e61 commit: 20b9dde6892ef99346c6bd19ff0184f3b961a83a Author: Priit Laes plaes org> AuthorDate: Sat Aug 24 14:11:22 2013 +0000 Commit: Priit Laes plaes org> CommitDate: Sat Aug 24 14:11:22 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=20b9dde6 app-misc/gnote: Add 3.9.2 to overlay --- app-misc/gnote/gnote-3.9.2.ebuild | 85 +++++++++++++++++++++++++++++++++++++++ app-misc/gnote/gnote-9999.ebuild | 63 ++++++++++++++++++++--------- 2 files changed, 128 insertions(+), 20 deletions(-) diff --git a/app-misc/gnote/gnote-3.9.2.ebuild b/app-misc/gnote/gnote-3.9.2.ebuild new file mode 100644 index 0000000..a2abc5a --- /dev/null +++ b/app-misc/gnote/gnote-3.9.2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +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" + +# Automagic glib-2.32 dep +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-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 + X? ( x11-libs/libX11 ) +" +RDEPEND="${COMMON_DEPEND} + gnome-base/gsettings-desktop-schemas +" +DEPEND="${DEPEND} + app-text/docbook-xml-dtd:4.1.2 + dev-util/desktop-file-utils + >=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 + sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die + gnome2_src_prepare + + if has_version net-fs/wdfs; then + DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to + synchronize notes." + else + DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes. + If you want to use that functionality just emerge net-fs/wdfs. + Gnote will automatically detect that you did and let you use it." + fi +} + +src_configure() { + [[ ${PV} != 9999 ]] && G2CONF="ITSTOOL=$(type -P true)" + gnome2_src_configure \ + --disable-static \ + $(use_enable debug) \ + $(use_with X x11-support) \ + $G2CONF +} + +src_install() { + gnome2_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + readme.gentoo_print_elog +} diff --git a/app-misc/gnote/gnote-9999.ebuild b/app-misc/gnote/gnote-9999.ebuild index c6a2a46..a2abc5a 100644 --- a/app-misc/gnote/gnote-9999.ebuild +++ b/app-misc/gnote/gnote-9999.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -inherit gnome2 +inherit gnome2 readme.gentoo if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -14,32 +13,35 @@ fi DESCRIPTION="Desktop note-taking application" HOMEPAGE="http://live.gnome.org/Gnote" -LICENSE="GPL-3+" +LICENSE="GPL-3+ FDL-1.1" SLOT="0" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else KEYWORDS="~amd64 ~x86" fi -IUSE="debug" +IUSE="debug X" # Automagic glib-2.32 dep COMMON_DEPEND=" >=app-crypt/libsecret-0.8 - >=dev-cpp/glibmm-2.28:2 - >=dev-cpp/gtkmm-3.4:3.0 + >=app-text/gtkspell-3.0:3 + >=dev-cpp/glibmm-2.32:2 + >=dev-cpp/gtkmm-3.6:3.0 >=dev-libs/boost-1.34 - >=dev-libs/glib-2.32 + >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2:2 dev-libs/libxslt - >=sys-apps/util-linux-2.16 - >=x11-libs/gtk+-3:3 - x11-libs/libX11 + >=sys-apps/util-linux-2.16:= + >=x11-libs/gtk+-3.6:3 + X? ( x11-libs/libX11 ) " RDEPEND="${COMMON_DEPEND} - gnome-base/gsettings-desktop-schemas" + gnome-base/gsettings-desktop-schemas +" DEPEND="${DEPEND} app-text/docbook-xml-dtd:4.1.2 + dev-util/desktop-file-utils >=dev-util/intltool-0.35.0 virtual/pkgconfig " @@ -49,14 +51,35 @@ if [[ ${PV} = 9999 ]]; then fi src_prepare() { - DOCS="AUTHORS ChangeLog NEWS README TODO" - G2CONF="${G2CONF} - --disable-static - $(use_enable debug)" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - # Do not alter CFLAGS sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die - gnome2_src_prepare + + if has_version net-fs/wdfs; then + DOC_CONTENTS="You have net-fs/wdfs installed. app-misc/gnote will use it to + synchronize notes." + else + DOC_CONTENTS="Gnote can use net-fs/wdfs to synchronize notes. + If you want to use that functionality just emerge net-fs/wdfs. + Gnote will automatically detect that you did and let you use it." + fi +} + +src_configure() { + [[ ${PV} != 9999 ]] && G2CONF="ITSTOOL=$(type -P true)" + gnome2_src_configure \ + --disable-static \ + $(use_enable debug) \ + $(use_with X x11-support) \ + $G2CONF +} + +src_install() { + gnome2_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + readme.gentoo_print_elog }