From 3cb487c027f9d32b6979124ad9bd981e6f013447 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 12:29:18 +0100
Subject: app-office/planner: Switch to PYTHON_MULTI_USEDEP API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 .../planner/planner-0.14.6_p20130520-r1.ebuild     | 74 ++++++++++++++++++++++
 app-office/planner/planner-0.14.6_p20130520.ebuild | 72 ---------------------
 2 files changed, 74 insertions(+), 72 deletions(-)
 create mode 100644 app-office/planner/planner-0.14.6_p20130520-r1.ebuild
 delete mode 100644 app-office/planner/planner-0.14.6_p20130520.ebuild

(limited to 'app-office')

diff --git a/app-office/planner/planner-0.14.6_p20130520-r1.ebuild b/app-office/planner/planner-0.14.6_p20130520-r1.ebuild
new file mode 100644
index 000000000000..e9b4ff1e4fbd
--- /dev/null
+++ b/app-office/planner/planner-0.14.6_p20130520-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+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 python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	>=x11-libs/gtk+-2.14:2
+	>=gnome-base/libgnomecanvas-2.10
+	>=gnome-base/libgnomeui-2.10
+	>=gnome-base/libglade-2.4:2.0
+	>=gnome-base/gconf-2.6:2
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.23
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-python/pygtk-2.6:2[${PYTHON_MULTI_USEDEP}] )
+		')
+	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 \
+		$(use_enable python) \
+		$(use_enable python 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
+}
diff --git a/app-office/planner/planner-0.14.6_p20130520.ebuild b/app-office/planner/planner-0.14.6_p20130520.ebuild
deleted file mode 100644
index e2a022f1b4f0..000000000000
--- a/app-office/planner/planner-0.14.6_p20130520.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-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 python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=dev-libs/glib-2.6:2
-	>=x11-libs/gtk+-2.14:2
-	>=gnome-base/libgnomecanvas-2.10
-	>=gnome-base/libgnomeui-2.10
-	>=gnome-base/libglade-2.4:2.0
-	>=gnome-base/gconf-2.6:2
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.23
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygtk-2.6:2[${PYTHON_USEDEP}] )
-	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 \
-		$(use_enable python) \
-		$(use_enable python 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
-}
-- 
cgit v1.2.3-65-gdbad