4 files changed, 98 insertions, 2 deletions
diff --git a/net-libs/libmapi/ChangeLog b/net-libs/libmapi/ChangeLog
index 3d5f285098a7..8094e0a2a827 100644
--- a/net-libs/libmapi/ChangeLog
+++ b/net-libs/libmapi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libmapi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libmapi/ChangeLog,v 1.1 2010/02/23 12:31:58 dagger Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmapi/ChangeLog,v 1.2 2012/10/10 14:24:38 dagger Exp $
+
+  10 Oct 2012; nobody +files/openchange-1.0-BORG-fix-soname-QA.patch,
+  +files/openchange-1.0-BORG-python-location-fix.patch:
+  Add libmapi 1.0
+
 
 *libmapi-0.9 (23 Feb 2010)
 
diff --git a/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch b/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch
new file mode 100644
index 000000000000..0579ddd0663c
--- /dev/null
+++ b/net-libs/libmapi/files/openchange-1.0-BORG-fix-soname-QA.patch
@@ -0,0 +1,18 @@
+--- Makefile~	2012-03-15 13:50:43.000000000 +0000
++++ Makefile	2012-10-10 12:12:29.318900417 +0000
+@@ -212,6 +212,7 @@
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	$(INSTALL) -m 0755 libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
+ 	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT)
++	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
+ 	ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ endif
+@@ -400,6 +401,7 @@
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	$(INSTALL) -m 0755 libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
+ 	ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT)
++	ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
+ 	ln -sf libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION)
+ endif
diff --git a/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch b/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch
new file mode 100644
index 000000000000..8e8d243960c0
--- /dev/null
+++ b/net-libs/libmapi/files/openchange-1.0-BORG-python-location-fix.patch
@@ -0,0 +1,20 @@
+--- configure.ac~	2012-03-15 13:50:43.000000000 +0000
++++ configure.ac	2012-10-10 12:00:15.225031516 +0000
+@@ -328,7 +328,7 @@
+ AC_SUBST(PYTHON_LIBS)
+ 
+ AC_MSG_CHECKING(python library directory)
+-pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1, 0, '\\${prefix}')"`
++pythondir=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
+ AC_MSG_RESULT($pythondir)
+ AC_SUBST(pythondir)
+ 
+@@ -661,7 +661,7 @@
+ 			   [build Python bindings for libmapi]),
+ 			   enable_pymapi="$enableval",
+ 			   enable_pymapi=no)
+-PYCDIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='\\$(prefix)')"`
++PYCDIR=`$PYTHON -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`
+ AC_SUBST(PYCDIR)
+ 
+ dnl Enable pyopenchange by default
diff --git a/net-libs/libmapi/libmapi-1.0.ebuild b/net-libs/libmapi/libmapi-1.0.ebuild
new file mode 100644
index 000000000000..21ee1d2b023c
--- /dev/null
+++ b/net-libs/libmapi/libmapi-1.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libmapi/libmapi-1.0.ebuild,v 1.1 2012/10/10 14:24:38 dagger Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? *"
+
+inherit autotools eutils python
+
+MY_PN=openchange
+MY_P=${MY_PN}-${PV}-BORG
+
+DESCRIPTION="Portable open-source implementations of Exchange protocols."
+HOMEPAGE="http://www.openchange.org/"
+SRC_URI="http://tracker.openchange.org/attachments/download/180/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="python"
+
+RDEPEND=">=net-fs/samba-4.0.0_rc2
+	dev-libs/boost
+	python? ( dev-lang/python )"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${MY_P}"-python-location-fix.patch
+	epatch "${FILESDIR}"/"${MY_P}"-fix-soname-QA.patch
+	eaclocal
+	eautoconf
+}
+src_configure() {
+	ECONF="--disable-coverage
+		$(use_enable python pymapi)"
+
+	econf ${ECONF}
+}
+
+src_compile() {
+	emake libmapi libmapixx || die "libmapi compilation failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" libmapi-install libmapixx-install || die "libmapi install failed"
+
+	if use python ; then
+		emake DESTDIR="${D}" python-install || die "pymapi install failed"
+	fi
+}