gentoo auto-resync : 18:01:2023 - 23:57:58

5 files changed, 72 insertions, 85 deletions

diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest
index dbe9a5c79261..3e15b7ce0060 100644
--- a/app-office/planner/Manifest
+++ b/app-office/planner/Manifest
@@ -1,4 +1,4 @@
-DIST planner-0.14.6_p20130520.tar.xz 4200624 BLAKE2B 4dd3965a3091fe69d9ac125745f7d3ac54cbe1d81f794c0dded02c0983867d2469848af7f74f1eb745a2e2c42c79be7955d6790f0b263faa5ee821bc28c6a339 SHA512 d658b68c96742340a06a9e96d7910f70fb296cb7a19cc335afdcbec01b36326b1574522155cf19fec012363e1e4d4120c35e1319c699613833be2eb0fa999024
-EBUILD planner-0.14.6_p20130520-r3.ebuild 1580 BLAKE2B b7ca3ac654cd83e5c01e65419cf5db87dfdf018c21a198900045e3e76bd8f5bb65c6561fc49632113bb5339cc261f68acb5b0b47fc89ac857a9357899697f2d0 SHA512 930619cf94fbabab7ffcafb90d924f6e1fb5aace3f0c901672df3887dc141e68b1c13806322a2c74ebb158260c8e03645e72f2c17d95983d3a6dc01f891b0131
-EBUILD planner-9999.ebuild 1397 BLAKE2B cb83952f335c47802def6673644fb44ce7cd26622174d16fb5946be7c9f4ae0f21bafad91e49efe80c4ec6183982f019ed776da7b94057fd72a1ce415feef3d4 SHA512 6cde9f378dd9f71581e0a9f4930f024de6f7e4e306f3d62d8ccc72ea5c0127df00f67ed23be31ada3ff8498ee0d6b8708c1234155cd503f426688427f0abb436
-MISC metadata.xml 417 BLAKE2B 539a490f9b6e00cbff3fc951a25b938c2ed52bfe181ebf578b39559074852729c7ed628dbba0bdd1afea3cc9d590f19ec17bece72ca46f92452c6e1a1b690768 SHA512 2aa152beb3aee59531eda5a62097dad7ff624da1de3eb5b7917e208ae2fb770e86d0ad4a039d4f03a16b355912eaa6a6c5f258a69a5f88d0356655a4dfb808f4
+DIST planner-0.14.91.tar.xz 3887084 BLAKE2B 7719ead3f9794aa29ec67f8bfd9e3d7b7541d79542befe767c2f41381a9c62493790df314e940731cf5deefb6ac4dcece67623fc5ae8d8b792b0c95793682b39 SHA512 579ad60d3282124f9cf954163c27feaa1d505ce3135b3d668e1fe0ca036d7e7290bbd3a6d9c30f32a77594c5d60988feee670266c34c0a8b9240510609ab46e2
+EBUILD planner-0.14.91.ebuild 1212 BLAKE2B 539c34adfc546d5f3ac7fdd1e84a4325bb3101b8863f0e4e4ed9614f9ec8bc3bda58d2134fcfe4f01342e4358399a3aad1ad7e8cca83d446fe9015ec0a6f9f8e SHA512 a9753e3dd672d93b2b71b4146915a30ba712aef14794f6ad6c2d2068b58229228cd7c566d5ad70070ccc693d4d0c72212e0bf3765823ae3bbeb5e56eea431612
+EBUILD planner-9999.ebuild 1212 BLAKE2B 539c34adfc546d5f3ac7fdd1e84a4325bb3101b8863f0e4e4ed9614f9ec8bc3bda58d2134fcfe4f01342e4358399a3aad1ad7e8cca83d446fe9015ec0a6f9f8e SHA512 a9753e3dd672d93b2b71b4146915a30ba712aef14794f6ad6c2d2068b58229228cd7c566d5ad70070ccc693d4d0c72212e0bf3765823ae3bbeb5e56eea431612
+MISC metadata.xml 449 BLAKE2B 71304ae2ce0171449f829cbb863e8ca4cabb415e7140853c535a22c54aaa12d8b68dc8abb3ffd8036f6c7191e1eacae5ba50573145b756e772fed6bb5518f140 SHA512 963faf941393d29ccdb35b9812cc329d0d1b97115e28e1db5ef8c856723d7759429426e636082bfbcfa2b20aebf459f758ebc056e868bb54915820eead0c8bc1
diff --git a/app-office/planner/metadata.xml b/app-office/planner/metadata.xml
index 2f8642fe363a..b22cc2c2f2e8 100644
--- a/app-office/planner/metadata.xml
+++ b/app-office/planner/metadata.xml
@@ -6,7 +6,7 @@
     <name>Gentoo GNOME Desktop</name>
   </maintainer>
   <use>
-    <flag name="libgda">Database/GDA support</flag>
+    <flag name="libgda">PostgreSQL support via <pkg>gnome-extra/libgda</pkg></flag>
   </use>
   <upstream>
     <remote-id type="gnome-gitlab">World/planner</remote-id>
diff --git a/app-office/planner/planner-0.14.6_p20130520-r3.ebuild b/app-office/planner/planner-0.14.6_p20130520-r3.ebuild
deleted file mode 100644
index 2604b71025a6..000000000000
--- a/app-office/planner/planner-0.14.6_p20130520-r3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2
-
-DESCRIPTION="Project manager for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Planner"
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_REPO_URI="https://gitlab.gnome.org/World/planner.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="examples"
-
-RDEPEND="
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.24:2
-	>=gnome-base/gconf-2.10:2
-	>=gnome-base/libgnomecanvas-2.10
-	>=gnome-base/libglade-2.4:2.0
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.23
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-util/gtk-doc-am
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35.5
-	gnome-base/gnome-common
-	virtual/pkgconfig
-	app-text/rarian
-"
-
-S="${WORKDIR}/${PN}-0.14.6"
-src_configure() {
-	# FIXME: disable eds backend for now, it fails, upstream bug #654005
-	# FIXME: disable eds for now, bug #784086
-	# 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 \
-		--disable-eds \
-		--disable-eds-backend \
-		--with-database=no \
-		--disable-update-mimedb \
-		--enable-compile-warnings=yes
-}
-
-src_install() {
-	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-	mv "${ED}"/usr/share/doc/planner "${ED}"/usr/share/doc/${PF} || die
-	if ! use examples; then
-		rm -rf "${D}/usr/share/doc/${PF}/examples"
-	fi
-}
diff --git a/app-office/planner/planner-0.14.91.ebuild b/app-office/planner/planner-0.14.91.ebuild
new file mode 100644
index 000000000000..291f2d01973f
--- /dev/null
+++ b/app-office/planner/planner-0.14.91.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Project manager for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Planner"
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_REPO_URI="https://gitlab.gnome.org/World/planner.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	KEYWORDS="~amd64"
+fi
+
+SLOT="0"
+LICENSE="GPL-2+"
+IUSE="examples libgda"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-3.22:3
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.23
+	libgda? ( >=gnome-extra/libgda-1.0:5 )
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature libgda database-gda)
+		-Deds=disabled # Doesn't provide much value, not very tested
+		$(meson_use examples)
+		-Dgtk_doc=false # Only for a private library
+		-Dsimple-priority-scheduling=false # experimental
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use examples; then
+		mv "${ED}"/usr/share/doc/planner "${ED}"/usr/share/doc/${PF} || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-office/planner/planner-9999.ebuild b/app-office/planner/planner-9999.ebuild
index 6643bdc69e13..291f2d01973f 100644
--- a/app-office/planner/planner-9999.ebuild
+++ b/app-office/planner/planner-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ fi
 
 SLOT="0"
 LICENSE="GPL-2+"
-IUSE="examples gtk-doc libgda" # eds
+IUSE="examples libgda"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
@@ -26,17 +26,9 @@ RDEPEND="
 	>=dev-libs/libxslt-1.1.23
 	libgda? ( >=gnome-extra/libgda-1.0:5 )
 "
-	# eds support is broken for now
-	# eds? (
-	# 	>=gnome-extra/evolution-data-server-3.6:=
-	# )
 DEPEND="${RDEPEND}"
 
 BDEPEND="
-	gtk-doc? (
-		dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2
-	)
 	virtual/pkgconfig
 	sys-devel/gettext
 "
@@ -44,11 +36,10 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		$(meson_feature libgda database-gda)
-		# $(meson_feature eds)
-		-Deds=disabled # upstream says it's broken
+		-Deds=disabled # Doesn't provide much value, not very tested
 		$(meson_use examples)
-		$(meson_use gtk-doc gtk_doc)
-		-Dsimple-priority-scheduling=false # upstream says it's experimental
+		-Dgtk_doc=false # Only for a private library
+		-Dsimple-priority-scheduling=false # experimental
 	)
 	meson_src_configure
 }