[gentoo-commits] repo/gentoo:master commit in: app-misc/gnote/files/, app-misc/gnote/

[Pacho Ramos]

commit:     019d1e922d7767fad74b44880325eea4ba2afb65
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 09:14:02 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 09:50:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=019d1e92

app-misc/gnote: Drop old

Package-Manager: portage-2.3.1

 app-misc/gnote/Manifest                            |  1 -
 .../files/gnote-3.18.2-x11-support-switch.patch    | 30 --------
 app-misc/gnote/gnote-3.18.1.ebuild                 | 84 ----------------------
 3 files changed, 115 deletions(-)

diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 522cc2f..f67ab78 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,2 +1 @@
-DIST gnote-3.18.1.tar.xz 3310004 SHA256 5da4ec9e7852b09af1067311fc6ee18a2c64384f4f5943b71ac37665144be58d SHA512 bd67f43494c8367a1b435a44408ed8fa7f50e380d09fedcb27874d7b38791ed65fb68e524946188859f58588625f436a58fb85d8429bd1ec1daf47328a74bc57 WHIRLPOOL 5df84e22467903159fa49eb1840b9fbfc0f8cf341ff1ff673c71cce1ebb1a5d3d85e1375d1ed21e7232f328078752153d0aa5929e8756963b65658e45fd671dd
 DIST gnote-3.20.1.tar.xz 3304760 SHA256 75acffdc2c0cc8cd226dc4471e6624d523bbd86c415ef4e05be70cbbfd4014e7 SHA512 1547442fec255579588404c17faa4ec7a8fc3445b68b55bd115b57daeb1924e77ba97b4a7b8c19979b97072912b4b761a6e7155370605a920cdc684dff5da222 WHIRLPOOL f21ea792c271ed72aa5b2f8fc420ac09abafecc421da8e98084cdbca67c2a4fec8a180883fe476d89a44f55278430d472639abd89f3b3abcd1e1aa6c5009c138

diff --git a/app-misc/gnote/files/gnote-3.18.2-x11-support-switch.patch b/app-misc/gnote/files/gnote-3.18.2-x11-support-switch.patch
deleted file mode 100644
index c126469..00000000
--- a/app-misc/gnote/files/gnote-3.18.2-x11-support-switch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f36016ae8352ecc7aba800fe3f2057c016d644df Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Wed, 25 Nov 2015 10:07:15 +0100
-Subject: [PATCH 1/2] Fix X11 support configure switch
-
----
- configure.ac | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 64a5e21..a28eb04 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -147,9 +147,11 @@ fi
- AC_SUBST(DBUS_SERVICE_DIR)
- 
- AC_ARG_WITH(x11_support, [  --with-x11-support      Compile with X11 support.],
--            [with_x11_support=yes;AC_DEFINE(HAVE_X11_SUPPORT, [1], [Define to 1 to include X11 support.])],
-+            [],
-             [with_x11_support=no])
--AM_CONDITIONAL(HAVE_X11_SUPPORT, test "x$with_x11_support" != "x")
-+AS_IF([test "$with_x11_support" = "yes"],
-+      [AC_DEFINE(HAVE_X11_SUPPORT, [1], [Define to 1 to include X11 support.])])
-+AM_CONDITIONAL(HAVE_X11_SUPPORT, test "x$with_x11_support" = "xyes")
- 
- 
- IT_PROG_INTLTOOL([0.35.0])
--- 
-2.6.3
-

diff --git a/app-misc/gnote/gnote-3.18.1.ebuild b/app-misc/gnote/gnote-3.18.1.ebuild
deleted file mode 100644
index e0afcb2..00000000
--- a/app-misc/gnote/gnote-3.18.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 readme.gentoo
-
-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 X"
-
-# 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.10: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.10:3
-	X? ( x11-libs/libX11 )
-"
-RDEPEND="${COMMON_DEPEND}
-	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
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix x11-support switch
-	# https://bugzilla.gnome.org/show_bug.cgi?id=758636
-	epatch "${FILESDIR}"/${PN}-3.18.2-x11-support-switch.patch
-
-	# Do not alter CFLAGS
-	sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
-
-	# Prevent m4_copy error when running aclocal, bug #581308
-	# m4_copy: won't overwrite defined macro: glib_DEFUN
-	rm m4/glib-gettext.m4 || die
-
-	eautoreconf
-	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)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}