Version bump. Drop old.

(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 58 insertions, 54 deletions

diff --git a/app-misc/gnote/ChangeLog b/app-misc/gnote/ChangeLog
index d90b40ee25f0..7358b4374047 100644
--- a/app-misc/gnote/ChangeLog
+++ b/app-misc/gnote/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/gnote
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.27 2012/12/16 19:38:00 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.28 2013/01/21 20:54:29 tetromino Exp $
+
+*gnote-3.6.2 (21 Jan 2013)
+
+  21 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> -gnote-0.8.4.ebuild,
+  +gnote-3.6.2.ebuild:
+  Version bump. Drop old.
 
   16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gnote-3.6.1.ebuild:
   Update license, EAPI5-ize and de-9999-ize ebuild.
diff --git a/app-misc/gnote/gnote-0.8.4.ebuild b/app-misc/gnote/gnote-0.8.4.ebuild
deleted file mode 100644
index a4950fbec293..000000000000
--- a/app-misc/gnote/gnote-0.8.4.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.4.ebuild,v 1.1 2012/09/18 11:07:37 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://live.gnome.org/Gnote"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="applet debug"
-
-# Automagic glib-2.32 dep
-COMMON_DEPEND=">=dev-libs/glib-2.32
-	>=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() {
-	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.6.2.ebuild b/app-misc/gnote/gnote-3.6.2.ebuild
new file mode 100644
index 000000000000..49aae7b0e42e
--- /dev/null
+++ b/app-misc/gnote/gnote-3.6.2.ebuild
@@ -0,0 +1,50 @@
+# 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
+}