From ced070b338c8d019a588ee31eb0ae3e1123f7b0c Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 7 Feb 2020 18:27:16 +0100
Subject: net-mail/libpst: 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>
---
 net-mail/libpst/libpst-0.6.66-r2.ebuild | 70 --------------------------------
 net-mail/libpst/libpst-0.6.66-r3.ebuild | 72 +++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 70 deletions(-)
 delete mode 100644 net-mail/libpst/libpst-0.6.66-r2.ebuild
 create mode 100644 net-mail/libpst/libpst-0.6.66-r3.ebuild

(limited to 'net-mail')

diff --git a/net-mail/libpst/libpst-0.6.66-r2.ebuild b/net-mail/libpst/libpst-0.6.66-r2.ebuild
deleted file mode 100644
index e868dd0afe3f..000000000000
--- a/net-mail/libpst/libpst-0.6.66-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
-HOMEPAGE="https://www.five-ten-sg.com/libpst/"
-SRC_URI="https://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug dii doc python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	gnome-extra/libgsf:=
-	dii? ( media-gfx/imagemagick:=[png] )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-libs/boost-1.70:=[python,${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	virtual/pkgconfig
-	dii? ( media-libs/gd[png] )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# don't build the static python library
-	eapply "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
-
-	# fix pkgconfig file for static linking
-	eapply "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
-
-	# conditionally install the extra documentation
-	if ! use doc; then
-		sed -i -e "/SUBDIRS/s: html::" Makefile.am || die
-	fi
-
-	# don't install duplicate docs
-	sed -i -e "/^html_DATA =/d" Makefile.am || die
-
-	eapply_user
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-libpst-shared \
-		$(use_enable debug pst-debug) \
-		$(use_enable dii) \
-		$(use_enable python) \
-		$(use_enable static-libs static) \
-		$(use_with python boost-python "boost_${EPYTHON/./}")
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-mail/libpst/libpst-0.6.66-r3.ebuild b/net-mail/libpst/libpst-0.6.66-r3.ebuild
new file mode 100644
index 000000000000..4a038ca366b6
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.66-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="https://www.five-ten-sg.com/libpst/"
+SRC_URI="https://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="debug dii doc python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	gnome-extra/libgsf:=
+	dii? ( media-gfx/imagemagick:=[png] )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.70:=[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# don't build the static python library
+	eapply "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	eapply "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	if ! use doc; then
+		sed -i -e "/SUBDIRS/s: html::" Makefile.am || die
+	fi
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eapply_user
+
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use_with python boost-python "boost_${EPYTHON/./}")
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
-- 
cgit v1.2.3-65-gdbad