gentoo Easter resync : 12.04.2020

3 files changed, 74 insertions, 4 deletions

diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest
index f3130a448846..eccf7b958e49 100644
--- a/app-office/planner/Manifest
+++ b/app-office/planner/Manifest
@@ -1,3 +1,4 @@
 DIST planner-0.14.6_p20130520.tar.xz 4200624 BLAKE2B 4dd3965a3091fe69d9ac125745f7d3ac54cbe1d81f794c0dded02c0983867d2469848af7f74f1eb745a2e2c42c79be7955d6790f0b263faa5ee821bc28c6a339 SHA512 d658b68c96742340a06a9e96d7910f70fb296cb7a19cc335afdcbec01b36326b1574522155cf19fec012363e1e4d4120c35e1319c699613833be2eb0fa999024
-EBUILD planner-0.14.6_p20130520-r1.ebuild 1922 BLAKE2B 7232a692c7f388113fdcc37ac824517aa8aef41b701f12251c9f7e87b0caf4cbcda0b79a09c5224ba9c793e76082df6e793218c9548bcfd5bc3d3104ff09722f SHA512 b325c51aa06c2b50b8ea976537ac7317f297bf7b34788f9ca9a3b7f512885dcebcf9d9524439e9e3749ebf498562693edb51971c29f6f27f54563ff22c1f5484
+EBUILD planner-0.14.6_p20130520-r1.ebuild 1952 BLAKE2B 071bde53c203be3e43a2fe394959b9765993ef18728b35601a59e760838c5aa36276b7fdbd3dfae9630daa96463d744a909799dd1e4a2cd63ba6fd49b4a60dea SHA512 eaf68a48d6eff6d1d95fb9e533fad6063272759de0fa8a9b30dbaadd7787046d77e8703927db58b85e3a22434c57a785b6c6e5847c4d818e56ed57e2d6138e1d
+EBUILD planner-0.14.6_p20130520-r2.ebuild 1665 BLAKE2B f0396223077bd67283208ca51dc317e40fc1e4a2d0496946e17f0ed45feca0611d609deb4dd7ec625acbc599453cf6e54eecf0b57d1621bf5f38a676fd335c44 SHA512 55b889c3baa4a06203b34b66d154f1eadae1875b390e22434e991b6812905db11f9a1b9cb0942dcc79fefe31cf7a1f2284f670f8cb3017de3436aa19f5b85e60
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-office/planner/planner-0.14.6_p20130520-r1.ebuild b/app-office/planner/planner-0.14.6_p20130520-r1.ebuild
index e9b4ff1e4fbd..e85a7b08867f 100644
--- a/app-office/planner/planner-0.14.6_p20130520-r1.ebuild
+++ b/app-office/planner/planner-0.14.6_p20130520-r1.ebuild
@@ -20,11 +20,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.14:2
+	>=x11-libs/gtk+-2.24:2
 	>=gnome-base/libgnomecanvas-2.10
-	>=gnome-base/libgnomeui-2.10
 	>=gnome-base/libglade-2.4:2.0
-	>=gnome-base/gconf-2.6:2
+	>=gnome-base/gconf-2.10:2
 	>=dev-libs/libxml2-2.6.27:2
 	>=dev-libs/libxslt-1.1.23
 	python? (
@@ -46,6 +45,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}-0.14.6"
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_configure() {
 	# FIXME: disable eds backend for now, it fails, upstream bug #654005
 	# We need to set compile-warnings to a different value as it doesn't use
diff --git a/app-office/planner/planner-0.14.6_p20130520-r2.ebuild b/app-office/planner/planner-0.14.6_p20130520-r2.ebuild
new file mode 100644
index 000000000000..b0fe576b0d14
--- /dev/null
+++ b/app-office/planner/planner-0.14.6_p20130520-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Project manager for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Planner"
+SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="eds examples"
+
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	>=x11-libs/gtk+-2.24:2
+	>=gnome-base/libgnomecanvas-2.10
+	>=gnome-base/libglade-2.4:2.0
+	>=gnome-base/gconf-2.10:2
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.23
+	eds? (
+		>=gnome-extra/evolution-data-server-3.6:=
+		>=mail-client/evolution-3.6 )
+"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.5
+	gnome-base/gnome-common
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-0.14.6"
+
+src_configure() {
+	# FIXME: disable eds backend for now, it fails, upstream bug #654005
+	# We need to set compile-warnings to a different value as it doesn't use
+	# standard macro: https://bugzilla.gnome.org/703067
+	gnome2_src_configure \
+		--disable-python \
+		--disable-python-plugin \
+		$(use_enable eds) \
+		--disable-eds-backend \
+		--with-database=no \
+		--disable-update-mimedb \
+		--enable-compile-warnings=yes
+		#$(use_enable eds eds-backend)
+}
+
+src_install() {
+	# error: relink `libstorage-mrproject-1.la' with the above command before installing it
+	# Try to drop workaround on next snapshot or bump
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install \
+		sqldocdir="\$(datadir)/doc/${PF}" \
+		sampledir="\$(datadir)/doc/${PF}/examples"
+
+	if ! use examples; then
+		rm -rf "${D}/usr/share/doc/${PF}/examples"
+	fi
+}