Update libmapi to 1.0 release

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

5 files changed, 106 insertions, 18 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/Manifest b/net-libs/libmapi/Manifest
index 036afb2a5cb4..15f4c95f3d63 100644
--- a/net-libs/libmapi/Manifest
+++ b/net-libs/libmapi/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST openchange-0.9-COCHRANE.tar.gz 1601358 RMD160 2ea3d586d9f7838614307685fb292276b4611c7d SHA1 246901001cfc4ae1a7f88f5ec0ca826e853cd93c SHA256 b8467d1fa9fd025323a2ddc2d4b4a29a78fee1b6cb1f4373725e45f7769b5402
-EBUILD libmapi-0.9.ebuild 1118 RMD160 62435519fee9a1405fe4f6378b74b186f829e19a SHA1 e8ff5ed2d5ff6d99708ed0debbbea8b44db0d67b SHA256 b2fcced9b0b0779bf4ca769194dc96d9f98a4725ac9a7b5f980c191bf0e054c4
-MISC ChangeLog 351 RMD160 e4995e351384a313ba3672f723f32247b2505ea6 SHA1 ff4b7454ea86eb9d272b743152f5fec075e0ca52 SHA256 856c3b1f335d4b3d15e2dcfa8a3119127418dafb0444750d06e947eede33ebec
-MISC metadata.xml 232 RMD160 350416b579724c832ce57da5a6bb871624a84488 SHA1 e9e56918509300934d0f85c0c64cdcedcd1b312c SHA256 1baa90d96462dd6402314a9820208377ea7ac7d21fb6dc14170a0e96c19df4fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rUsACgkQfXuS5UK5QB0RXgP6A+IDSgWCQaXVU07DrRJcEh40
-48PYKNZ1WttnCu9tb5qubbelb1K+xFIz7jwhmdsCO376T05lk2HKszTRYpUhs0aU
-FjuYRbEz4uoyLfXHNDwFBjdx0di9sY5l915LZbkJp/px7QNHsVjP7DjIvsn8AkSg
-OW5DbMFFghNq9qq8RE0=
-=JAr0
------END PGP SIGNATURE-----
+AUX openchange-1.0-BORG-fix-soname-QA.patch 1099 SHA256 28afd414d1d8c30afed6f35dd2a36837f6de53b6ce2d41520c04810a66a0e17f SHA512 d0723bdbdb5b27dfd1780df8de668549a6c52b4c1351f9713940400cd7e309c1e15e67f6d0ffbca72c5d762204c501e5832501d20b67c8fd45faa551e443402d WHIRLPOOL ff1d4dfcf528f64754976e656c12de38214160ec1b5d9520919eb77f0d72b452b9769e5820a85eb8a9f44172822a6686b4d6e77eccc5b1053a87b7eccdb63655
+AUX openchange-1.0-BORG-python-location-fix.patch 847 SHA256 034590d43723012592f163313dec43f307fe0558f1c18d1794c15e1f63228db1 SHA512 183142b3b9ee6a74cbd3fb8fe5b8ec17ac1436f61f45ef61dcee171581b433242fa9adda8bc023c07366fccd4bbc83cce2b5037f2e40f132a5a66fedf03ee619 WHIRLPOOL 4e227dd51e0a625a98eaae68ec321b75921d46789512cfad707654d226fe6f20e31191a025e434a94176086c177d46176898d98f2c2f12cb4fa6d84e8e1dd51c
+DIST openchange-0.9-COCHRANE.tar.gz 1601358 SHA256 b8467d1fa9fd025323a2ddc2d4b4a29a78fee1b6cb1f4373725e45f7769b5402 SHA512 400adf60247a6766020d554ec20a159d79cc4a50991e018078fea1cc2b9910a5bf43f65872af111b6b6d4ee7c7525399623dc7e55c226e4baf421eb3eb0cd1fe WHIRLPOOL 4975c2418a1499d85115da5ce1473f4c51d2b97a420e787a0d4cc353df4ebc5d5566fda12793effa6276c76c53799d3c22cc36ebdf69e17c1c43a09516ff7c2c
+DIST openchange-1.0-BORG.tar.gz 1979219 SHA256 f18c1fdb0dec10ea6a469cb7be5fc24010a44d8c5de42a23da5b0c864f343bb4 SHA512 20c3923bcbbbb09aeebe686727f0fd1d6d5e0d23e815e4c1c945077dd34b646bc80a64f103c830f95e2b26111685400c050717c5bed21ab79167fc913f88a54e WHIRLPOOL 92ffe9e36a0c8c60768d6a5a79b2ac6295f3cacedb245188103254105bcb93526d920739196b2d8738d38e81afe52acfa7096d2abf716b14ab785326a045436d
+EBUILD libmapi-0.9.ebuild 1118 SHA256 b2fcced9b0b0779bf4ca769194dc96d9f98a4725ac9a7b5f980c191bf0e054c4 SHA512 d6af8ac5c974ccbf3bf8cc6d985dccfbda6c163481dc78b31424df6d91fb1ef8801ded6cfd799adf87ef2602d40330a827d13c3bca6e56c35921ca37465d4aaa WHIRLPOOL dff64e6aae92780f19672b3f7df99bad4029ee342f60c83f1a718e8b989495991dd187c663904a60c1000d6289280006616c739d00b10362a57e4efefba3b4dd
+EBUILD libmapi-1.0.ebuild 1232 SHA256 4332111036520f347bc3c6c2a137b6605bcae6fe01d5e23ae5ff9c6465410e25 SHA512 19a0baec17b95507ff4f4c370a352c679147949d6f294a5fe6963f889d398be9e779745c264024a788cfc28084686e6a7d162ee9ebbbdf311ecb308925ab79dd WHIRLPOOL 525aca3c83c536bc23abf0ecc3082bc0a2674feec8f8c156731e335e58e430effef5951b0394bd9cec5c1321837b92e82b9b3d06bdd4348c692fef8ea2f90b3e
+MISC ChangeLog 497 SHA256 683a8cc53eeba51f6992fd128d756efe6f7f5db07493a388fca58c0173beb15a SHA512 b58101ab3f706b122f6e93e4dc386b9cc6e11bac59963deabec99c1cd658f52eb242ae7d205de95a9816139f497f23876cd092257e3d82cabe347cf3b7081db7 WHIRLPOOL 4c9473d6ba6eb067e974ae59eb9596a11bb5ddac84732be5b600dfcfb50af829b4b8566b4071ce50d10172b271a941346f40a44f10f805a15fe697637925742d
+MISC metadata.xml 232 SHA256 1baa90d96462dd6402314a9820208377ea7ac7d21fb6dc14170a0e96c19df4fb SHA512 4c12bd5c628cdc151c0509caf784dafb45155264499bb9e43393a3cdbf01da9c3141762fa5502a396b0a16bbf96dbc056379046e7badc9a7131b32cbb3cbc3d6 WHIRLPOOL 34a65901e549b98fa2c45cf66130c25d05e218d46cddeb5d29968526a2734ba72004454dca43a41929d0570bb7f9709f82403f90fb81f331449e00daa201b6e8
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
+}