Version bump for Gnome 3.10, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

5 files changed, 35 insertions, 117 deletions

diff --git a/app-misc/gnote/ChangeLog b/app-misc/gnote/ChangeLog
index 83a9a1990b34..488a1ca51444 100644
--- a/app-misc/gnote/ChangeLog
+++ b/app-misc/gnote/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gnote
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.37 2013/12/08 17:42:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.38 2013/12/24 15:36:21 pacho Exp $
+
+*gnote-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnote-3.10.1.ebuild,
+  -gnote-0.8.2.ebuild, -gnote-3.6.2.ebuild, -gnote-3.8.0.ebuild, metadata.xml:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnote-3.8.1.ebuild:
   x86 stable, bug #478252
diff --git a/app-misc/gnote/gnote-0.8.2.ebuild b/app-misc/gnote/gnote-0.8.2.ebuild
deleted file mode 100644
index a8516fd0ce24..000000000000
--- a/app-misc/gnote/gnote-0.8.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.8.2.ebuild,v 1.7 2012/09/18 11:07:37 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://live.gnome.org/Gnote"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="applet debug"
-
-COMMON_DEPEND=">=x11-libs/gtk+-3.0:3
-	>=dev-cpp/glibmm-2.28:2
-	>=dev-cpp/gtkmm-3.0:3.0
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=dev-libs/libpcre-7.8:3[cxx]
-	>=dev-libs/boost-1.34
-	>=sys-apps/util-linux-2.16
-	applet? ( >=gnome-base/gnome-panel-3 )"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.0
-	app-text/gnome-doc-utils
-	app-text/docbook-xml-dtd:4.1.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		$(use_enable applet)
-		$(use_enable debug)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-signal_idle-header.patch" #424317
-
-	gnome2_src_prepare
-
-	# Do not set idiotic defines in a released tarball, bug #311979
-	sed 's/-DG.*_DISABLE_DEPRECATED//g' -i libtomboy/Makefile.* ||
-		die "sed failed"
-}
diff --git a/app-misc/gnote/gnote-3.8.0.ebuild b/app-misc/gnote/gnote-3.10.1.ebuild
index 5f5ebbe4e05d..b129a811eefa 100644
--- a/app-misc/gnote/gnote-3.8.0.ebuild
+++ b/app-misc/gnote/gnote-3.10.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.8.0.ebuild,v 1.2 2013/04/07 21:40:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.10.1.ebuild,v 1.1 2013/12/24 15:36:21 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit gnome2 readme.gentoo
 
 DESCRIPTION="Desktop note-taking application"
 HOMEPAGE="http://live.gnome.org/Gnote"
@@ -13,13 +13,13 @@ HOMEPAGE="http://live.gnome.org/Gnote"
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+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.28:2
+	>=dev-cpp/glibmm-2.32:2
 	>=dev-cpp/gtkmm-3.6:3.0
 	>=dev-libs/boost-1.34
 	>=dev-libs/glib-2.32:2
@@ -27,12 +27,14 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=sys-apps/util-linux-2.16:=
 	>=x11-libs/gtk+-3.6:3
-	x11-libs/libX11
+	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
 "
@@ -40,13 +42,32 @@ DEPEND="${DEPEND}
 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() {
 	gnome2_src_configure \
 		--disable-static \
 		$(use_enable debug) \
+		$(use_with X x11-support) \
 		ITSTOOL=$(type -P true)
 }
+
+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-3.6.2.ebuild b/app-misc/gnote/gnote-3.6.2.ebuild
deleted file mode 100644
index 49aae7b0e42e..000000000000
--- a/app-misc/gnote/gnote-3.6.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.6.2.ebuild,v 1.1 2013/01/21 20:54:29 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://live.gnome.org/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# 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
-	>=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:3
-	x11-libs/libX11
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable debug)
-		ITSTOOL=$(type -P true)"
-
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	gnome2_src_prepare
-}
diff --git a/app-misc/gnote/metadata.xml b/app-misc/gnote/metadata.xml
index 0ac01ad216bd..dad9001338dc 100644
--- a/app-misc/gnote/metadata.xml
+++ b/app-misc/gnote/metadata.xml
@@ -2,11 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
-	<maintainer>
-		<email>eva@gentoo.org</email>
-		<name>Gilles Dartiguelongue</name>
-	</maintainer>
-	<use>
-		<flag name="applet">Enable gnote applet for <pkg>gnome-base/gnome-panel</pkg></flag>
-	</use>
 </pkgmetadata>