gentoo resync : 27.01.2018

4 files changed, 2 insertions, 147 deletions

diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index d40925dc11b5..e7efdbb20dc9 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,7 +1,3 @@
-DIST gnote-3.22.1.tar.xz 3309984 BLAKE2B 0d8efac1e58a931682da5d2b10e2ed58df43a581aac428cb93f6f208be1e888c41f5f6a9595305a3f16ec95a1b2f33a11a0800a1ba3ac641d6ac31129ec9a3f8 SHA512 0bbf89b39699294fe5a373decf10bcd7f3a86a20c49b9d82699fb758c7cd27b6939764236a1a7ffe21964a2ae196780d0861123776b1568344935e0b649e2f5f
-DIST gnote-3.24.0.tar.xz 3307940 BLAKE2B 2f0ef3649b9fd998a03e18959612ef87be0e36e9f2e65c2562b891c1f8baf529f1b7186ef1bb077bfc85b5cbb8a0686110ec09a189dc06d4fb78327696fa4d09 SHA512 640f24d1829a546e53eb2d269f965daafa651e141566fd2f7a4572245b309c06259f548fa38c86c55954f2d0f8f98c48b7da2ed982864ae6ffbcac4b5d64aecb
 DIST gnote-3.24.1.tar.xz 3310012 BLAKE2B b6167dbb2461e574e4f21b2f227eb9a3c89708ddd15a561146faa044130e5c9ccc6d64b4923c30726160ee35d4ab5a0ae04b1593e74af2fa6566582af9bc1f18 SHA512 759fb2984312a3e3d5aed9b79f2309021b69df57b820d34814a5d3d9b5c9201abc6e50d83bf64f30974991d779b0b85e599435a24ee1326b867a2a4be8e0f37e
-EBUILD gnote-3.22.1.ebuild 1501 BLAKE2B bb2686d46b78aaf97d6e31da957f61b31708b2521df8661a7a2b242d957107cdd8dd402c35fde4bba12e2bfe3c99274a87698d06b6cf300c8ecf542ff948b6d9 SHA512 7e69f8606e62d3383d24c9ae5ed5026eadddd0f579bfff8c0fcea512116cb549ebab11505097214fb77db203889eef3c5da16452d9a46b5f7fb9efa3411c804e
-EBUILD gnote-3.24.0.ebuild 1549 BLAKE2B 1130bcb2ac9fa49c110672fb95ddd2b96bf074a693bf5ca0f91fd528f5c847fa83511e34713f2638278cf2506cc402fe65079e1a4bfc005c9c1853434169fedb SHA512 255c4a96c1728b559531727acc1b70be827bf985ca0522729bb03944ee24b090574db64baff4a16788edcaed435c6a39aa08fdbf5f70acddbdc63a3fcfe5b7ea
-EBUILD gnote-3.24.1.ebuild 1548 BLAKE2B e8c43e30230e3e8f7ff211f8aa02abb663f2f4146ee07518aa916de429b0009c4db9a366c577039ae28fc1afc443422f340a3d3b3e68054119a878a41d922400 SHA512 7283941fa353f66dbcb321d776d6b8c01c40165ac1ab982ec7489aa818973915525280a57400731e1590b00d3c01493c475408334cd8b9d2f3a767c711b4ab2f
+EBUILD gnote-3.24.1.ebuild 1547 BLAKE2B 8a0e15ea352c054b0d777386d798334f921e5778c462822e932a5f21f0442b7bd71738f4ebc91ada4f6eb58c60af5d4876bc0265d0d283fcbe925cc4c8ce2bd7 SHA512 6144bccd5cd942f967729912371ff82622874cde18bfda99f905322a9fa16d3e52d0d973d17d4b2da5c92d93ada3eadd19f9f90db57bdddfa2b03cbeb12aff7d
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.22.1.ebuild b/app-misc/gnote/gnote-3.22.1.ebuild
deleted file mode 100644
index 26e294954bc2..000000000000
--- a/app-misc/gnote/gnote-3.22.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/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
-	>=app-text/gtkspell-3.0:3
-	>=dev-cpp/glibmm-2.32:2
-	>=dev-cpp/gtkmm-3.18:3.0
-	>=dev-libs/boost-1.34:=
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.20:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-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)
-}
-
-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.24.0.ebuild b/app-misc/gnote/gnote-3.24.0.ebuild
deleted file mode 100644
index b0b68f6acf71..000000000000
--- a/app-misc/gnote/gnote-3.24.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
-
-LICENSE="GPL-3+ FDL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# Automagic:
-# glib-2.32 dep
-# >=dev-libs/unittest++-1.5.1 (but not detected due to missing .pc)
-COMMON_DEPEND="
-	>=app-crypt/libsecret-0.8
-	>=app-text/gtkspell-3.0:3
-	>=dev-cpp/glibmm-2.32:2
-	>=dev-cpp/gtkmm-3.18:3.0
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/libxml2-2:2
-	dev-libs/libxslt
-	>=sys-apps/util-linux-2.16:=
-	>=x11-libs/gtk+-3.20:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-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)
-}
-
-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.24.1.ebuild b/app-misc/gnote/gnote-3.24.1.ebuild
index f9c8ea235ec6..efeb2abea8e1 100644
--- a/app-misc/gnote/gnote-3.24.1.ebuild
+++ b/app-misc/gnote/gnote-3.24.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic: