11 files changed, 104 insertions, 201 deletions
diff --git a/app-misc/geoclue/ChangeLog b/app-misc/geoclue/ChangeLog
index 25c61235914b..b572bb9ffd33 100644
--- a/app-misc/geoclue/ChangeLog
+++ b/app-misc/geoclue/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/geoclue
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/ChangeLog,v 1.26 2013/07/21 10:42:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/ChangeLog,v 1.27 2013/12/24 15:35:15 pacho Exp $
+
+*geoclue-2.0.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +geoclue-2.0.0.ebuild,
+  -geoclue-0.12.0_p20110307.ebuild, metadata.xml:
+  Version bump for Gnome 3.10, drop old
 
   21 Jul 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   connman is a global USE flag now
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 98955ffcabc1..7532ca94fff7 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -4,16 +4,16 @@ Hash: SHA256
 AUX geoclue-0.12.0_p20110307-use-fallback-mac.patch 511 SHA256 21fa236ae8d18e708e19198336d25180902055196987ca15048be707729febe8 SHA512 e2845272cca268c4658c3e836efd7b49bc53e7690125bc48a7d1d9d0b82b46ea88fff427ee73fa2045c74c2dfe21d45497341032363713a6401a735110bcd1e0 WHIRLPOOL 3672f61433b53bfca07496fd679785f4362ab4f57065ec40619c10c1c006a5fd82ac8a114d8d53cc1e903ac59b8a909aadb3598ee716a047d29922fc5f65ee94
 AUX geoclue-0.12.0_p20110307-use-flag.patch 2571 SHA256 30771a233355c31eeae0694e275454875feac47797eb1990714946875323e5b5 SHA512 9558635f1c520f26c30edcd2512934a6f3238c0fabf88e2e5b345aa8521575faad2e734d84e99071b827cc81724fab27299f2b838a48993e3110d2fa6ba82eef WHIRLPOOL bbae6a830b1886d967dbe746e96bec0dce787458500acb2ccc2f1af881fab201c2bdcd53d3a7f7ab96c7ae1a25d363d022804561d9c90f1208101d3d77bf8d21
 AUX geoclue-0.12.99-gpsd.patch 2073 SHA256 0abf0404525bc69da2365562eecb6e828547086de455fb2d9b0ac41a41fbe216 SHA512 9a5280af319cea99567fbbaf8174f11de71f9dbbeb146c4ad42a19df1d84f7573c9cd72560b7185065e5b8507770f77fa3cc06b3e45e0a56fdf3d3e5b717f0bc WHIRLPOOL e8e3072ae9acba711a550cab6d05e73c1d047e039a3707686bfea0a832158a5dc60ebc3f1c8860312afcfdebd9a484dabe45798aa721868b81086bea1fab9ab2
-DIST geoclue-0.12.0_p20110307.tar.bz2 1019929 SHA256 f6980afaaadf47b89b2dee639c322947f8097000f72509d5f8af993de78d7d99 SHA512 0aa4bea17a3bd63fb53515a4791d589efcc7b9cbf6dc7e4d424efc9ab6f920929c324b1bb248563ab9a65f3100f088cb69360c2b2d49847b6172a7acfd630fcb WHIRLPOOL 37522f63ec8633295a32d9e52f8be74a9a2afecc77f3a60685bdca5e42aa75fc39093087a91445171f46a60a376ca184672576fbbb2b3118975e742c42e5c6e4
 DIST geoclue-0.12.99.tar.gz 608074 SHA256 fe396c91cb52de4219281f4d9223156338fc03670d34700281e86d1399b80a72 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2 WHIRLPOOL fc7e96d6646a7fa527807db2a3375a714243fb935f064b9acbb84f8652cc64e19d2655979c053e2f1b433c69a47a393123bc4bb2f8f16395a3ecbba668c9f1bd
-EBUILD geoclue-0.12.0_p20110307.ebuild 1729 SHA256 19ec8bd59ad1daa5b24384c83e330fd846beedcf693ad2a17026ac8e558509ba SHA512 1246e7c8bfbb5634f1d57d766225b166b2814595de5a2dc50ad77495c280e5ff241e9f951812307a68f8f2b1cd0aa141afabb8fa1cee109d92ef4d066b784a9d WHIRLPOOL 4fc6a1e9ecc502ba942c523ee5d7a345d8874ce8be98a57ac068b0d8662c4b037ac2bd7e0c2d1f79f1a93f7c9f34c190bb868c7b20c61a5ba3a051d40f44d10b
+DIST geoclue-2.0.0.tar.xz 284592 SHA256 4a82f184e55a163d86e0ad69bbe1bba9960bb5094220fe1f01350bceda8c67a1 SHA512 35f25e4491dccb94029ebdf15b9b7864ac8fe79287f091b4b94c65767af2dc4b464e075728eb4db76cecffba330772e31e25c442285bf29a8dea0836aca586a6 WHIRLPOOL 3501bf39e38f0cb09ae3bc193b636ec223ca1874e6458414f02945933f3a7a83e0bdee960c7b33ec65e8863f4b88677023a22bf06af8ec41fc6cc2aaa5d35aac
 EBUILD geoclue-0.12.99.ebuild 2095 SHA256 22947682c38c5db184f8a550244894f0f4731a4c35b53e9cb0060328d0b8a6cc SHA512 9c58657cfe7c4c5be6c7e69d6395213e6351d3bf3ce0aa91c95cab2fab9b2c0d06e412f8cd15ad9a9dd04edb65eecbf76510ae5c0c4a3f6bd77a9c1a733cbddf WHIRLPOOL c5d3869784bd7f37386dc4b6db2c382c9323f94e2c2ddc5257e7aa46fb6f38d806e18ee923b78ecbefc2fa52c3c8802768695dd5c8f231e8d03a47dbe82b0b94
-MISC ChangeLog 3573 SHA256 95dd9d13ca9acde2327e427bdec798e4fa563f48dc250c400cb7da11b95a863f SHA512 db150fe36f5acbeaa5c68883be404dd9ce4b9586356be2320be103bf48f8a438824bab516e1f96561dd488b4d4bbb8b0b7834310a606186566e17ac274c6ef0b WHIRLPOOL 8b1d92b46c1486157a42a17661f1aef3cd0f3daf9c53625e95365aa4c0f0ee743a242b04f2bc85b6947af2d9be3b025670a65074ee29e5c82451fe928d5f8006
-MISC metadata.xml 751 SHA256 fc19621da3f10681a0331327dd2d686f7a3bdd97d219dfea54eaad14b637a579 SHA512 8affe34a374a9a27f3f15337af87580bfd41f3b22837644d24224f47a17b25bbbdadbad59fb63fdfa05ed6eb19ef5cae31b28ff86d9affd4678a793d006dcf2a WHIRLPOOL d6dca0285ec07408a6fbe10452706e6f78de026e4e2d6e23398d8572e9464d4b8cdc70ff658121f6685e612f25d9e18854bbb4a27eb082dc3d0e1351c842f07c
+EBUILD geoclue-2.0.0.ebuild 1119 SHA256 85d7c9634a11778c07e32c0bdbf11ca715f4c066754e63630a415c505304b07e SHA512 57564b3bc561d30d6eb0d5572b64ffd82eab4d5e16776f3d7b2dd351c9522dbd88802049d22fa36671776b49a744447176b954f59800a9563008bb1a04362086 WHIRLPOOL 7560393ab18999d7d458d94514b9f43ade10882f916e89e91b1fc43ed51ee819c66b689943dcd411e5a9dcaa08dd674b7e0ec2c67732528b3356dc3862e68d45
+MISC ChangeLog 3763 SHA256 e03141463951459c14f10de3863adea807a63e38a66ad395f93dffb7634217ca SHA512 084dc1ad9264b3cc9bdedbd566fbb8621dfdd8842341bd43d5ad9ca709364c3ed794425c5246697de615e3308e97e763b198c52079e1eb99b09cfd2b12198061 WHIRLPOOL 1de00902f8051a87223af004f7afc424f69d2b784e236134517ad4ca2d1f85b2eb1d22c2a302bcdb2a1ccb774096a0b485479f4f85fbf6ec126c7ebe90ac55a3
+MISC metadata.xml 824 SHA256 5369f83a558aa7186c862da5ea6b656d21adcbb94edecc1919c227faa59b6cfe SHA512 c6cb457099efb4872a9d57e7b9adbee5f6aee1a8d22b9587b6e7db5fb36db53fbae758e6a3417507ad2fd58465d6899068d97b7c917680d197a05ccbfad92662 WHIRLPOOL d28236f8acb3607a5fc6b8a382d8b4d965903beca6219fc89960792ac39abef5f0a23b7c587ac5e5e966a5214fcf06bc52057e6eef8345a8d34153d2c82754a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlHruwAACgkQCaWpQKGI+9SzbACfdY23GF43Ia59bD3XfqzTKTs3
-5AkAn2ApF5vIJDbMdtp35WT7mXVvn/Is
-=ZGpZ
+iEYEAREIAAYFAlK5qbQACgkQCaWpQKGI+9SnFwCeOGqI18K0IOQCHsK6wktdKNvQ
+ryoAn2OuwimN/W+qZsKqshFYMi7kBXzN
+=j21c
 -----END PGP SIGNATURE-----
diff --git a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild b/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
deleted file mode 100644
index dfdc747a6107..000000000000
--- a/app-misc/geoclue/geoclue-0.12.0_p20110307.ebuild
+++ /dev/null
@@ -1,64 +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/geoclue/geoclue-0.12.0_p20110307.ebuild,v 1.13 2012/09/11 14:01:50 armin76 Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
-SRC_URI="http://dev.gentoo.org/~signals/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="geonames gps gsmloc gtk hostip manual networkmanager nominatim plazes
-	skyhook yahoo-geo"
-
-REQUIRED_USE="skyhook? ( networkmanager )"
-
-RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	dev-libs/libxml2
-	gnome-base/gconf
-	skyhook? ( net-libs/libsoup )
-	sys-apps/dbus
-	gtk? ( x11-libs/gtk+:2 )
-	gps? ( <=sci-geosciences/gpsd-2.95-r1 )
-	networkmanager? ( net-misc/networkmanager )"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-use-flag.patch \
-		"${FILESDIR}"/${P}-use-fallback-mac.patch
-	sed -i -e 's/-Werror//' configure.ac || die #363723
-	gtkdocize || die
-	eautoreconf
-}
-
-src_configure() {
-	# Conic is only for Maemo. Don't enable.
-	# Gypsy has multiple vulnerabilities:
-	# https://bugs.freedesktop.org/show_bug.cgi?id=33431
-	econf \
-		--disable-conic \
-		--disable-gypsy \
-		$(use_enable geonames) \
-		$(use_enable gps gpsd) \
-		$(use_enable gsmloc) \
-		$(use_enable gtk) \
-		$(use_enable hostip) \
-		$(use_enable manual) \
-		$(use_enable networkmanager) \
-		$(use_enable nominatim) \
-		$(use_enable plazes) \
-		$(use_enable skyhook) \
-		$(use_enable yahoo-geo yahoo)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use gtk && dobin test/.libs/geoclue-test-gui
-}
diff --git a/app-misc/geoclue/geoclue-2.0.0.ebuild b/app-misc/geoclue/geoclue-2.0.0.ebuild
new file mode 100644
index 000000000000..4bbd63ff141e
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.0.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/geoclue/geoclue-2.0.0.ebuild,v 1.1 2013/12/24 15:35:15 pacho Exp $
+
+EAPI="5"
+
+inherit gnome2 user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="http://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="server"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/json-glib-0.14
+	net-libs/libsoup:2.4
+	sys-apps/dbus
+	server? ( >=dev-libs/geoip-1.5.1 )
+	!<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig
+"
+
+RESTRICT="test"
+
+src_configure() {
+	# debug only affects CFLAGS
+	gnome2_src_configure \
+		--with-dbus-service-user=geoclue \
+		$(use_enable server geoip-server)
+}
+
+pkg_preinst() {
+	enewgroup geoclue
+	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+}
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index 2a470a5d21cd..6d7a565886cd 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>gnome</herd>
   <herd>desktop-misc</herd>
   <use>
     <flag name="geonames">Install geonames.org provider</flag>
@@ -10,6 +11,7 @@
     <flag name="manual">Install manual provider</flag>
     <flag name="nominatim">Install openstreetmap.org provider</flag>
     <flag name="plazes">Install plazes.com provider</flag>
+    <flag name="server">Install geoip server</flag>
     <flag name="skyhook">Install skyhookwireless.com provider</flag>
     <flag name="yahoo-geo">Install Yahoo geolocation provider</flag>
   </use>
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/Manifest b/app-misc/gnote/Manifest
index 1fc512d4ff52..2f0bca702789 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -2,20 +2,16 @@
 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-3.6.2.tar.xz 2654556 SHA256 38f3b069874658f281445e04b8376d946580e4a5e39620f7e30fdd8216d46c1e SHA512 9456cc7242c76cdae0c46e5af7d714d05e5b3c2e8cc2cfaf9694646e0504fa7981040dfc69b12ce3fb957c1131a8098a7f132a283711a5f2c3bf74326c4b9f3b WHIRLPOOL 630bdd2a02b964dcb74e349663d1dcf84e18c431bcf6d6a382387dd938866606084cdd08b3521843b5c1f4103dd291f2f7eb13e5ea3a2d0414c467296a59f8ac
-DIST gnote-3.8.0.tar.xz 2623304 SHA256 603e2cc8782f910a5b4fdfd3588d955d59f0f4ddcd5685d1f2feadb955e0e9e6 SHA512 ddf830b79bfb632519ecae12c6c3d98f9d96492a9e08b846e5ddbe2d1a5733d95ac206d0dcdf26da0edbd42458e520d37297cee1913dc14993ec90f40b92a4d0 WHIRLPOOL d6ac8a421f76ca2556fc3123750aca3930c79eb829634e316a49afc07cd58d69c0bb205b7d4ee21e2ac2f346b43b0ccfb03c53162d63cb2a22820ba433615e84
+DIST gnote-3.10.1.tar.xz 3038896 SHA256 8466343c43cb5fb223a7abfe43e6e963f64403f96a3c823f5a37474e83d5e1a0 SHA512 f9713a2cced90e00d4aadc3d57a4e946f0d16f41ff72823e36c65ad56a8c0e2d112fe3bc82c487974f089daff962d69b40a04fd5ff3600c569a265fa1fbe8203 WHIRLPOOL e7075b00145145285a41da539666c4db4349e1d5f96075aba49506306533623e559ac3fa348cf0cc9f54194749bd6b2949e2ca8641ac80849520a7233c6260b9
 DIST gnote-3.8.1.tar.xz 2632020 SHA256 35bb4c5c0fd94bb3e8e5b91dcfff7e376408dd95fb2468ce9e248f6738d036aa SHA512 e8e320246522aba5311d60c4f9d2b90032f873f2fd0397fa03568dca0c86b9738cf52765f8779206ecd9d9b4a7b732f4bb64daabfda5e35dee49ec08e52dc51e WHIRLPOOL 3af01a5ed06c6bd9769e332769ede49733209a01ed13526af606830bdcc13b5d3d024cb35266f90b2cf777a17ae73ac76744fe450d5588db30bd1e95a7cf6267
-EBUILD gnote-0.8.2.ebuild 1296 SHA256 3b19d58b3b615ade8934c4e212bf36584dd4d927d771617e5fe82bcccc0c8c1b SHA512 4dc5acd0f053d65e5dfa1a9ddb1d39187776a58a0016e3e469087eac280c1df6b1e7f3bb51fb844ced778bc629098d52d2fc37a2da9b2dfbd1f8cc0beb3b56eb WHIRLPOOL 30047af52af9d504225397fad92960d2a9e6efea36f35c5e6d8faf57615f57246edd77fd61d57c91725f9d2bd557c400855c1b4a65446e3aa3e2ca58a8b5b92e
-EBUILD gnote-3.6.2.ebuild 1095 SHA256 7fafff2e038dd3a4723c42ff5bbdc245d5ca9cadbc01cfb1819e35715a55bfce SHA512 b15dea1e6933102b20446fb39513b69d77ab9a4b777ac6e9dc20127b7302827340e4c606e4e8f7403fdbc566b121904587b53fd8b28b267094ad91ed7778d2af WHIRLPOOL af6e47af48058fd630ce65de2b5016100b2c2449e2cfb82a998687043715fac4b12c2bca72f760f5387729a2d0f4e693c16ffc37a0089ff3f802d1a697b87daf
-EBUILD gnote-3.8.0.ebuild 1125 SHA256 2d7899540da1f63a37ecd6f6aa6348a372ceafb39698f2925e6356ee78e99fc5 SHA512 d4d772a8fe9a1170a4554678a1544f14c2d5ff60afb844ebf5e9f1e908b33a9588c4fbcc86a7e1474425f7268be5533c64a7df592302fd7e5a4a459d3baf4943 WHIRLPOOL 6a943befc45404039d2f081f90a1aaae15876f96d55bd62c77ffb6caed30d76312d6bf3fc7d1f0babc459fa779f449e52d14f4205241a14006989d70dd3fdf1a
+EBUILD gnote-3.10.1.ebuild 1685 SHA256 cbc68e100a75fff92054c1942aa9d034e69cf140f9f263abf5e35bbd15e129b2 SHA512 6f1571074c1b913fb1bcd53ae81582b895840ce1d1635c6197048b2b86bd994bb21d674fb0ccc73f29ea0fe21afad34792e6c0e965a8495a52824b66e14a55ad WHIRLPOOL 68e3f49f403b071972a21d10dd5a4aeb670d77ba1cf8a06387fcf1dca0e2fac64ec7d38ac2e82d12e569ed3c214a7a28e67edf6347f9163c81fbf80aaa9086e1
 EBUILD gnote-3.8.1.ebuild 1613 SHA256 ea329b00a189ab0125dccf1e84f6a281284cdbc69ef0ee7e1cdf62ff07f3ff6e SHA512 7f3fd28c8087cd5ad5be413045edb39f94972acb34dc59e36c9a944f5fe36a97120160b34e4b5a4c90b5b4bea026fc551915a17f4e35a67dea76e3115642351a WHIRLPOOL 94e65a2fb26fec4869c68a07f24eb3c8bc7ef2b54c4234e92ec4ece86186c2c1b1a6474d9c05e2aea480997541fdcbb91c66c98f1c25f06eb5b02718ad0490f8
-MISC ChangeLog 5945 SHA256 65567ffe185a111d72e690be07750a491a33bcfb8febc2dee29e11070e654d17 SHA512 bac8123227016cb26ac504ac55de3cdaed5be606ca9386896ff54c8658e59c6df51893096bd22f768a6963b9b8790330e9ca958c5f80f17c29a69b5712947fa1 WHIRLPOOL 77dcad1804aeca958e2821277594e8f9694d9fccfe677a03e99c2359fce20dd48861f750b8102a7c76d28b46bc4b8bdb899662813da7946811fe5d6597af2608
-MISC metadata.xml 359 SHA256 b969ca585b4a440c7e7bd5ff26ebc8f532e3dd40f307b32928fb851e61bc3e10 SHA512 b4a0493ec5db19cb42e78d2328074ec07e361c7729db4982a52ea87a216f98bff82bae50125e45ff74fea6a25ee0d66137753e0442984cc71aee837222b8e3f0 WHIRLPOOL 103b1b0b52f680e5beb0e9b0e81e6999701a15c1c122f4626cab9c379e5986074fb48d9c0834f574be396ec5542cc8da301566878ffa52787529ad17179e6df0
+MISC ChangeLog 6162 SHA256 ee9b05bca758ea5e99f89210252fde595bf4f4a42e9ba3ba90ade20aa60e237a SHA512 7cc4cae58a2286d81b7811ef8a9da7df03dec48a31dd9cb0e7f20238e007c52e5cd9a8213c0eff7d7a18c2f6dca48bf089095de1f0a88d36b8c049b6fd0caeed WHIRLPOOL fa3f897153ccfdc28bcc339d8b66458c74cfd049557008cb2868f5d46ef4e001fa0a221019ee8541d9a8777289aa3e00f503199f9ddda4167aef4222879fbbe2
+MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkr3kACgkQCaWpQKGI+9QDigCfVXZPZRUqdxzIwOgpX+5iDC04
-0SIAn0JBG/LsN/oTEtJH8YaoFmaFVAdQ
-=9bYA
+iEYEAREIAAYFAlK5qfYACgkQCaWpQKGI+9TU9QCfcnA2AyJZ6OifhkgzlreevXp9
+IqYAn323yhAeiU1V9wUjUWCFz4Zt51qs
+=j5a0
 -----END PGP SIGNATURE-----
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>