Prepare for PYTHON_ABI-versioned Boost Python libraries in Boost 1.48. Patch by Arfrever.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

5 files changed, 85 insertions, 10 deletions

diff --git a/net-mail/libpst/ChangeLog b/net-mail/libpst/ChangeLog
index 78a74e8357ce..e5518a4e3b0d 100644
--- a/net-mail/libpst/ChangeLog
+++ b/net-mail/libpst/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/libpst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.25 2012/01/01 01:51:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.26 2012/01/29 02:40:13 floppym Exp $
+
+*libpst-0.6.54-r1 (29 Jan 2012)
+
+  29 Jan 2012; Mike Gilbert <floppym@gentoo.org> +libpst-0.6.54-r1.ebuild,
+  libpst-0.6.52.ebuild, libpst-0.6.53.ebuild, libpst-0.6.54.ebuild:
+  Prepare for PYTHON_ABI-versioned Boost Python libraries in Boost 1.48. Patch
+  by Arfrever.
 
 *libpst-0.6.54 (01 Jan 2012)
 
diff --git a/net-mail/libpst/libpst-0.6.52.ebuild b/net-mail/libpst/libpst-0.6.52.ebuild
index 9a97ba4e41a0..d9edbf614999 100644
--- a/net-mail/libpst/libpst-0.6.52.ebuild
+++ b/net-mail/libpst/libpst-0.6.52.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.52.ebuild,v 1.1 2011/05/28 23:43:26 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.52.ebuild,v 1.2 2012/01/29 02:40:13 floppym Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ RDEPEND="dii? ( media-gfx/imagemagick[png] )"
 DEPEND="${RDEPEND}
 	virtual/libiconv
 	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.35.0-r5[python] )"
+	python? ( <dev-libs/boost-1.48[python] )"
 
 src_prepare() {
 	# Don't build the static python library
diff --git a/net-mail/libpst/libpst-0.6.53.ebuild b/net-mail/libpst/libpst-0.6.53.ebuild
index f89aa8bfb413..3b0163400868 100644
--- a/net-mail/libpst/libpst-0.6.53.ebuild
+++ b/net-mail/libpst/libpst-0.6.53.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.53.ebuild,v 1.1 2011/08/05 05:07:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.53.ebuild,v 1.2 2012/01/29 02:40:13 floppym Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ RDEPEND="dii? ( media-gfx/imagemagick[png] )"
 DEPEND="${RDEPEND}
 	virtual/libiconv
 	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.35.0-r5[python] )"
+	python? ( <dev-libs/boost-1.48[python] )"
 
 src_prepare() {
 	# Don't build the static python library
diff --git a/net-mail/libpst/libpst-0.6.54-r1.ebuild b/net-mail/libpst/libpst-0.6.54-r1.ebuild
new file mode 100644
index 000000000000..6ad6729e441b
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.54-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.54-r1.ebuild,v 1.1 2012/01/29 02:40:13 floppym Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://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"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# Don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# Fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# Conditionally install the extra documentation
+	use doc || sed -i -e "/SUBDIRS/s: html::" Makefile.am
+
+	eautomake
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+
+	# Remove useless .la files
+	find "${ED}" -name '*.la' -exec rm {} +
+}
diff --git a/net-mail/libpst/libpst-0.6.54.ebuild b/net-mail/libpst/libpst-0.6.54.ebuild
index db7d94810076..54ce9ba0bcd3 100644
--- a/net-mail/libpst/libpst-0.6.54.ebuild
+++ b/net-mail/libpst/libpst-0.6.54.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.54.ebuild,v 1.1 2012/01/01 01:51:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.54.ebuild,v 1.2 2012/01/29 02:40:13 floppym Exp $
 
 EAPI=4
+PYTHON_DEPEND="python? 2"
 
-inherit autotools eutils
+inherit autotools eutils python
 
 DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
 HOMEPAGE="http://www.five-ten-sg.com/libpst/"
@@ -19,7 +20,14 @@ RDEPEND="dii? ( media-gfx/imagemagick[png] )"
 DEPEND="${RDEPEND}
 	virtual/libiconv
 	dii? ( media-libs/gd[png] )
-	python? ( >=dev-libs/boost-1.35.0-r5[python] )"
+	python? ( <dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
 
 src_prepare() {
 	# Don't build the static python library