Version bump. Drop old.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 68 insertions, 64 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/Manifest b/app-misc/gnote/Manifest
index 94925163dee7..d02e4296007b 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -3,21 +3,21 @@ Hash: SHA256
 
 AUX gnote-0.8.2-signal_idle-header.patch 592 SHA256 a11009cc34e60e517ff102de7f336eee5bea6294454d0ce92a381d27f9647fea SHA512 22433446f06bab04f0fabc4db4f901b3a876efe25bd33a461a22f23a5554e4cbe0b0594ac8dcb71b86f0dcbd2bc8d6f39cf0baaabf4fec5820e945d3ffa8fe28 WHIRLPOOL b67ffa31a56bd60dbfda7e3c59441449333868f577fa780eb187c0ca01d8c9f809b4889d83d5f53310ec42e8248520402dc39b1c8ba94006a28e2693ead69ee5
 DIST gnote-0.8.2.tar.xz 2322160 SHA256 7d42b16d6d6751c88f029aff78db7ed1560f2cb727e6cb3f3ef09711e2381992 SHA512 14454337b76da2685fc66ff9a75bd9ebee0cb694a6d6a4c251d0bbc2b06080e022af5585bf70467e0cfc864691df5dcaea7fd5de708ed7bd927da02425bae680 WHIRLPOOL 2d06f618a61f366f754b57e776180fecfdacfa2808a1f85ec5d0557e2cd9606ea856db37eab3fa3eaeebaa580e00a05c7ebff53be0abee235b24f15f3ebedaf1
-DIST gnote-0.8.4.tar.xz 2368472 SHA256 986e1277f148181aec3eba07b52f6546b0b002d40865eb2bad92fc43d8815d2f SHA512 36a6ecfd5f9ce38d59cc998b714c62e24a1f51697bf381ff3258ce3a7d7ab22cef726566f5716c6dc447ff4d81227398baab5de6d981e92f60d839b4f00ee8c1 WHIRLPOOL a7eecc741ed95f3c00962974c9df31ab18b62d0c385b434d334402eabb93b826839ab366f8cfbab2e17a72d117ee0509941e791c315a06f00cdfca5e3f9b89ce
 DIST gnote-3.6.1.tar.xz 2634976 SHA256 f1f62ccf9cce1eef2ee2b41039360f946f3b4223983ca52223ccb6687a59f2f9 SHA512 209e77dcaedfd986f24d73af4b554fdf10a54c21c661a820759531fbd3c27a51f186f51de9e696dad4781707063d6a3c70406dac35b3a4bd5ebf8aa9ee23df55 WHIRLPOOL 8d3b263d729c622b4111e03d9252f04391be5dd0b546d978ea4001dc28c4446294a0661dd80fda0a2d690dfd48b3189f7ce1cae94f2b6c1c2b962fdf030e4618
+DIST gnote-3.6.2.tar.xz 2654556 SHA256 38f3b069874658f281445e04b8376d946580e4a5e39620f7e30fdd8216d46c1e SHA512 9456cc7242c76cdae0c46e5af7d714d05e5b3c2e8cc2cfaf9694646e0504fa7981040dfc69b12ce3fb957c1131a8098a7f132a283711a5f2c3bf74326c4b9f3b WHIRLPOOL 630bdd2a02b964dcb74e349663d1dcf84e18c431bcf6d6a382387dd938866606084cdd08b3521843b5c1f4103dd291f2f7eb13e5ea3a2d0414c467296a59f8ac
 EBUILD gnote-0.8.2.ebuild 1296 SHA256 3b19d58b3b615ade8934c4e212bf36584dd4d927d771617e5fe82bcccc0c8c1b SHA512 4dc5acd0f053d65e5dfa1a9ddb1d39187776a58a0016e3e469087eac280c1df6b1e7f3bb51fb844ced778bc629098d52d2fc37a2da9b2dfbd1f8cc0beb3b56eb WHIRLPOOL 30047af52af9d504225397fad92960d2a9e6efea36f35c5e6d8faf57615f57246edd77fd61d57c91725f9d2bd557c400855c1b4a65446e3aa3e2ca58a8b5b92e
-EBUILD gnote-0.8.4.ebuild 1278 SHA256 ae17813046507b71dea2e6ad7abcbb088b43cc23731cde9839112f475fc5940d SHA512 7df2b203ef37b52a18184e29537955d66d974bdcdc2ba9746befcf2441f2d5d801de27208c3dda59d1f3e9c9d5b2d42c3498674210d51338b5da3690a1ad1031 WHIRLPOOL f85d31c7199a394bff89339961fbbe0cb0b547eb8bef944c31a231133dd202be9a5d7977e092a5edd31494c48e9f0a21adda3033ec39f83da7c98802dbf71866
 EBUILD gnote-3.6.1.ebuild 1095 SHA256 78e4e2015e3686d0c5508464c89d3e4177db0a70e2887fe014d8663749c14c6f SHA512 72ba5fbdd388052e882a2753ad5217a2741c3df181a7db5d3067e850b405356aafd2ef741b29e225e33e99bc20cdd646751f7a6bcd3017d6b1463a6607fc32a1 WHIRLPOOL 9054ff637a1860852a587eefe66b7a5188c4a97ed4aa7556670cc3ace8bb71f6a9f0b3e7a44b795e1be53489b3d18039f6ae6cdec889d490d4db169979c10cbe
-MISC ChangeLog 4817 SHA256 ab6bcc5b49a357356ddf450979b178e6174fadef7202a24ca89f6dca1fbe60fd SHA512 3dd799fcafad320a21744af7947c2823e7de7f7c127a771f298d66454a1813e14246976361516d6e2d4588ff2f04f7657fa44763bcfac65a57faa88e6ad1ebd5 WHIRLPOOL a0afa4cef3eeb6fd89d4e91bf47b2693978a8a774aabf24112e64dbd72e0efdc0af7d29904799ee5392a356a16cdbe0d418ddf9bebc91b3db25b37ef3cfd6fc3
+EBUILD gnote-3.6.2.ebuild 1095 SHA256 7fafff2e038dd3a4723c42ff5bbdc245d5ca9cadbc01cfb1819e35715a55bfce SHA512 b15dea1e6933102b20446fb39513b69d77ab9a4b777ac6e9dc20127b7302827340e4c606e4e8f7403fdbc566b121904587b53fd8b28b267094ad91ed7778d2af WHIRLPOOL af6e47af48058fd630ce65de2b5016100b2c2449e2cfb82a998687043715fac4b12c2bca72f760f5387729a2d0f4e693c16ffc37a0089ff3f802d1a697b87daf
+MISC ChangeLog 4975 SHA256 3b7e344a201e84c57fcee157990d871fcbbf22eb13c92607f72b09306b6ba2d2 SHA512 cce4de402e88b71bbebcf76d0e538657ef34f24f9d9e42eee15d6563c97495c8497c09cea5103ea941cd7b938971d0056978372eaea5931cc813850c924fe65d WHIRLPOOL 107ebe453dfc89681305caf582b1d9c3c96ae4180a6617eb951429bb5b2f4afec77316a943540c4147116887620c35a1e99ffdd627005dfc9836c6da7fa60847
 MISC metadata.xml 360 SHA256 bb3a0273a2bc0105a61ddbbe4dddb9189553625ff0c4ff946dd201a454b4a9b7 SHA512 e27e8eda62bc5541a5ae35583863fa361135628ba2340bf73a81aa1927b27465658946f9d16869acb681920af69d4303c2e36c1c5e2352ccc674a341256763b2 WHIRLPOOL 2b9148054f3d2465a47d94020ba69f2101fae5de3629cea20a3305900e582054e6d807a95ceb15cf4861b80b8d25766d4edfedab35b5a044b104709a5b458dfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQziMZAAoJEJ0WA1zPCt1hvmwIAIHVYvUJDd458qFR6uzmn5BW
-sQbZLRCI0bBGpw4uEr6y/r/5D4Luiwi9Uw9oH0xd1xtms4TY/OQllpAJdnPvs6Gt
-GiYvt7Q7bN2XlGpVYYj7TGEE0y/Bxq3MrIiEu2EWRsDP7ywZGPE3226m1JSoGY9D
-mhOedrw2GOb78kt8dr/VdgdSu5J+SlIOWELXCAcoBc2pb6bHqXFTjwx5dORp2lTj
-fZpotcqZ9qRrxMqeFmNtoe8/I4RXoBwoLd8c9zES0srXyCV03n2YdWvxc6u3CGHV
-3+Ls3Mrhec8sc4Cr6X8hjba4ciZ7T4yvqVahZAkXJFzt3RWBzt8/3PMTY3ud7uk=
-=6MKi
+iQEcBAEBCAAGBQJQ/asGAAoJEJ0WA1zPCt1hPxQH/3hesLD9NhkeJRfEdYMYrgSO
+0Najb18Mz7evYYOlUklO7LXaQ6dHeIRe21H443L7fzTiLuXKro4PFgioI3+zb1MO
+A9dZAWTUEVhnhQOulNObP8ff1hCmw1yZtz0VV0Q1jTjtJxZNxHq6mjxbEfXI+7+I
+8xsuAfJhweJMCLSAAm8o2ailDCLtK/bQaTfjES97/VRXuPLHKuKSL5VWG+ePcFYq
+qtYsP3Vw1rBCY2J7whN5OGa1njqTYeJfn6GXDhLXc8cVAGDEHA414Yi/xD1ur5E9
+RlUFbMIPYQTkbjXYJvwgy1z9P81boKpJ8CQZgpKodWPYJVCaSs3ixWAXZt/GtwQ=
+=kxE7
 -----END PGP SIGNATURE-----
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
+}