version bump

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xADC916E5

7 files changed, 288 insertions, 14 deletions

diff --git a/dev-libs/mozldap/ChangeLog b/dev-libs/mozldap/ChangeLog
index 08144b5773d6..85caff063756 100644
--- a/dev-libs/mozldap/ChangeLog
+++ b/dev-libs/mozldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/mozldap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/ChangeLog,v 1.6 2012/07/11 18:16:29 lxnay Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/ChangeLog,v 1.7 2013/03/14 17:08:10 lxnay Exp $
+
+*mozldap-6.0.7 (14 Mar 2013)
+
+  14 Mar 2013; Fabio Erculiani <lxnay@gentoo.org>
+  files/mozldap-6.0.4-pkgconfig.patch, +mozldap-6.0.7.ebuild,
+  +files/mozldap-6.0.7-configure.in.patch, files/configure.in.patch:
+  version bump
 
   11 Jul 2012; Fabio Erculiani <lxnay@gentoo.org> mozldap-6.0.6-r2.ebuild:
   amd64 and x86 stable, as per bug #420131
diff --git a/dev-libs/mozldap/Manifest b/dev-libs/mozldap/Manifest
index 5693408ec46b..97fd1418fc49 100644
--- a/dev-libs/mozldap/Manifest
+++ b/dev-libs/mozldap/Manifest
@@ -1,9 +1,22 @@
-AUX configure.in.patch 6055 SHA256 cdc8b6505e621705311e7bb0d4c5b5fc9bfa382f26beeab2a48f3a541c4e9f69 SHA512 a3a6ebe8b661723c42a5438e1c5097f55724b0eafb302b604916016e64a74c4ee35a19b734128dc0066d3850d3987417c44b736d58db0f202d60fdd8fb72417f WHIRLPOOL d25475d86fe1cd9a1be267c1861e7c962e6541d37b2695f83c01d895bb1fb09eeeea2db1430b33d4cd37bd3a8fdddc311a5901639c23164fa16a36265e33bf03
-AUX mozldap-6.0.4-pkgconfig.patch 552 SHA256 187156a9aea2eae256c88e9c589b938e21db8c7e5168d1eb3e9ff4d82926b7f5 SHA512 5da4564c24b12459d54e5c2d5021e63594724310671d81ac51d3fec985baf5d39035fe8e3b6c3d8008077db0ebe892326cdbc85a3e9a017d72cf3dc145cf32f2 WHIRLPOOL 53261cf7c9c1c66440a782fa018928eaf5ea50ae61bc63cb89640ffe48755831fd87a7fad42a75a66cf2c3bb1b07b841b57e32d748a7f9fe8dd6907441e46725
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX configure.in.patch 5982 SHA256 7b12df988a8df3cd0fd2f2f8cd147482049e5982224f66cd8dda97a827bd108f SHA512 6482cd0f49988a429be16a0cb7c13f40b800eca7c30fe854275f6014f5c47d7f0fa1abc62b65bba3bd850a99256a3e04a37a49a9380a78faa31c8f4a2ba69699 WHIRLPOOL 22e13ed88acfa733cedcd0051b069f21826a7f622cd44116cd4e6baa85b9452e9f54a410b6b84cf34bd2d69b38f97a91f96c6eedd13eed0c986f06c8bf878a01
+AUX mozldap-6.0.4-pkgconfig.patch 446 SHA256 910aa1b24317633b8a5013750776c11a6b9c861f0ba8b1323ff01d6f0a35f431 SHA512 b0c9d4b6068f9042185593c5e4c367e2ceb265529f78b7f3cc8fa449b5eb61ca75d0547d96e4173ba5192a44a87fd0058674e7839a366da3ed25d4481def0360 WHIRLPOOL 712d945474c95f54d126da87588dca0d4aab8bb485c8cf3121a690034c09c9c01df7d172bfdb34425674d12ac9adb462aa7e1de4e707a3406d2c12eada20de47
 AUX mozldap-6.0.6-ldflags.patch 302 SHA256 bdf39a438cb37f65d69328d1e5b6d4436ff44d8ebf7ea9d1354af031c80b2d07 SHA512 9742564662fd34ad9badd4af23237321e66fc7025930791b8c6904e32cc8bbffc9260640671b25b894c9fca3a7c707100def012d5977f350db3db64c231b14e4 WHIRLPOOL c1b140706974ba8008006860b86c9a3655af379649ee0ea8929322fa203cc8f0b950ed649f4a2af3e2792a3286d461c426fd098e4e215fe7b1b480a46ad7e3e6
+AUX mozldap-6.0.7-configure.in.patch 4884 SHA256 4f70a56775bd518c8050047f45304c2012e0e660b014b5dd53425db3375c73bc SHA512 b5d173bf5b3764ed7e92562ab7f715f913920455ece73a37ec20a3e84deedf43641bb7f6fcb0fdc8409ec575936d76d417b91d814c860c1648bf3d929f266fce WHIRLPOOL 05b4b20ec7cca2a9c2da4ef91048263c57107227bb98f287377d9aebb5b95c945cff6746fbb1aa8395cd8677d1188acbff9be5d6588b3c4194f1ceeda6c2786f
 AUX nspr-m4.patch 1447 SHA256 6fcb31a73e34a8187444e9469e118277d338c52c5c46b80d86f1f84439199915 SHA512 a5d6ec7b331b6e22182c30693c4b65993049c6a1318d0ec0b4c13da557af32f4e0e799b97510e2f68a91291ecd04fb78532f98be0a5ef422b1ee8a4d70e33419 WHIRLPOOL 0ab6c5771983f66799baecc1e04afd9f48f7db4767f3b0c4cd9fcc1e354e3ba1740d48231ab741c45ec07e72549923596cc73e3f406827db2797255d2127ec92
 AUX nss-m4.patch 1446 SHA256 2322409a792cea0b235ee0ae2f8700111bd878008eac3c16db3f0654fd5398c5 SHA512 74c0ccf191b41dc14f7b2cf9c7e637889cba516407aea79ede5935374d2311158baa4a81d8f8dd6002e0fb2ac51f0294a8bbb8eae8ba3adf2c0161be1b8b9542 WHIRLPOOL 3754bceb2c30a6a9e215a0308cbddf434ae4a94067a3b2875994dd17375b51f3ab7d369249da48a0c210ddffcd10494cc3f2034641dd0410fc2d70d5e184bb8b
 DIST mozldap-6.0.6.tar.gz 708821 SHA256 3a7b94c6698e2acb91a577decee5eb6103f183d6b9833abb169124818ba80d06 SHA512 a3f63b248201c521d962fb48a5374732de23c04920009bf108aabbc71efb83995da04401f095dff58196b5749f8e4cafb2e2b915f1927f7695cb9446e45033df WHIRLPOOL 57991fe8c406a0f5c4d6dc1856ef8f485f8831f5ac3a81c2366a8e03fb9e62a7697f4aed95e62e7fcf308707f2363400dfcc961cff640ef530dbb53f8edd982c
-EBUILD mozldap-6.0.6-r2.ebuild 3914 SHA256 960d927fa89503605a04355e4b9b9f2e93a3ca087b5603f1aa82c69521c0371b SHA512 f833edd2559a19285c62ec755609ab88cab808c0f26d38bc112a52e18995b4fef087b35fe84c6f93aff07617ddf926c7699fac437e17d72a7cc2283a9b10787f WHIRLPOOL baac045543a688cc0072ca9a298577ec0970c54f1e94eb2d26482d83b32f66587accfd7f03f505fce9204c09d4fe24b85ed14ad53868aa80ced0c7e84a664cb4
-MISC ChangeLog 1284 SHA256 e513bd5045d13683676afe20af4b40c63a7593ed6d1c3d9338479b7b8405e36a SHA512 7ec94eb51b18f22becfc98a7ab1f166906c8e514f769dacf719d49204a09791778bbc0f61295af1498109172bd57bfcb3253d8ea6ed21695af98a0fdec8e4bba WHIRLPOOL 0cbdb33771aa646708e4cb56c2052d5473b8e6a90d36d08a4fb0d667cb6ac37d2f4c6dbbb91742538c4a78144828073f9c1d508c5392a71028fa9fd8fe4289d5
+DIST mozldap-6.0.7.tar.gz 674789 SHA256 ec9884b56b31961d287190323764af7f3b00ad2658d5f3005fa8dc71c637e54c SHA512 bad8005941acaf98f53a60c6c8b697a680e8efe736817b063853ff1f07f052d3257ba7c28f502e37e0c2544fe00d24d31787ccbf892deb43c5481d49ed434b71 WHIRLPOOL 30dc35de03fb99d5f2ae65b10922ee3ec05246ee77f35a37cb80811ae29552d7a347fa13c5ce0a8cb3613fd30584f3fdd6a2cadcfc7cc974a56986bf633767be
+EBUILD mozldap-6.0.6-r2.ebuild 3903 SHA256 26551392921eb3abd40533c3d64653d356a5936addf679dbba05826d2410e344 SHA512 d6230dbb26c11b5f582af486d24db9625e265d518e27e38d7ee6ec092bf4c2d1cd5dfef2c1037d222f7926a7715e2d8c739854c579d1ca2c56dfa1fbe542e5fb WHIRLPOOL 7849793e352c6d9d619e2ff97f7a4e68b33b40d0ca9bc8d76c2cceec567a1bb32ec2b9e23b0a100910470f5cff7c2fba83e475931a306bef4a55d503ab927181
+EBUILD mozldap-6.0.7.ebuild 3908 SHA256 e297dea184701aad704da48bb3630939dd6289b35c04fa571e3fd0468aa9896c SHA512 05bd66d8b6433e66b7d27a64975789b9aa097222133dcf200c8adf5115fa38306e302940f20a6d8088e794b9e067b7a0a59ceaf21068869c3294ee2df6358561 WHIRLPOOL 83d8bc7294444decbb524a67bd0525b481c8f615e7342fb3754b9607629ee1d883da3902ecd521a1b37e9566fb71f2dff74375191e3592794f775b30883bb09c
+MISC ChangeLog 1511 SHA256 2ca8f8cfdcd6d8e8a2b68a652ead4e135da5c41d32b421449c0a5c92a14f3562 SHA512 057aa7da181a4391288b595668474048a17a3397c1ebb384fe8eab39c99805bc3a879f9be9615e566a6d38cacfa41133bf248d711d77afe55dc4dfe7faf85dab WHIRLPOOL e39e1e0abcb7a58b8e4ae13757e875bc4e5281b9828eb54fbb7f9f18384851aa07b4ed8b70947730499f00bd1b86c6eaf0f145650f1205136bfe6fad1ad8b76b
 MISC metadata.xml 199 SHA256 0fae090f46858005762d6866c5e50dd3185ee981f07bab124210e2ab5bf2d90c SHA512 87272ba4836ea13d6025c6c390c2bfe06ad7fb789d67bd99fa3518ece7ddd4c9adc79575483a6ce07d76cb010e5e25fc5eb342ce1da2886221ad5e6cd1413bdc WHIRLPOOL c71f923e6f9915dc264f64ecfbc8b600592f2f6c0a0523343d9bb8e655e2c0219c7bb93376dd84ed32cee75ed746d4e5cfb7a863e73bb22011bfdd7a00b90a05
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlFCEfIACgkQfaj9zK3JFuXzhgCeJrF02f4RiQjQvg/YBKK2z9r3
+poYAn0M+8WnY828bIp8MsKt13BWjQSj0
+=hPXR
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/mozldap/files/configure.in.patch b/dev-libs/mozldap/files/configure.in.patch
index 232b1ecb64af..6254ef04eb45 100644
--- a/dev-libs/mozldap/files/configure.in.patch
+++ b/dev-libs/mozldap/files/configure.in.patch
@@ -1,5 +1,5 @@
---- configure.in.orig	2009-10-06 11:46:10.378924265 +0300
-+++ configure.in	2009-10-06 11:47:36.154924127 +0300
+--- a/configure.in
++++ b/configure.in
 @@ -42,7 +42,7 @@
  AC_PREREQ(2.12)
  AC_INIT(ldap/include/ldap.h)
diff --git a/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch b/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
index 2a916cedc842..51bc34048b87 100644
--- a/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
+++ b/dev-libs/mozldap/files/mozldap-6.0.4-pkgconfig.patch
@@ -1,6 +1,5 @@
-diff -uNr mozldap.pc.in mozldap.pc.in
---- mozldap.pc.in	2006-10-06 01:01:43.000000000 +0200
-+++ mozldap.pc.in	2007-08-06 21:27:09.000000000 +0200
+--- a/mozldap.pc.in
++++ b/mozldap.pc.in
 @@ -11,6 +11,6 @@
  Name: mozldap
  Description: Mozilla LDAP C SDK
diff --git a/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch b/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch
new file mode 100644
index 000000000000..525d7259af54
--- /dev/null
+++ b/dev-libs/mozldap/files/mozldap-6.0.7-configure.in.patch
@@ -0,0 +1,137 @@
+diff -Nurp c-sdk.orig/configure.in c-sdk/configure.in
+--- c-sdk.orig/configure.in	2011-01-06 12:05:39.000000000 +0000
++++ c-sdk/configure.in	2013-03-14 18:01:19.647224070 +0000
+@@ -42,7 +42,7 @@ dnl ***** END LICENSE BLOCK *****
+ AC_PREREQ(2.12)
+ AC_INIT(ldap/include/ldap.h)
+ 
+-AC_CONFIG_AUX_DIR(${srcdir}/config/autoconf)
++AC_CONFIG_AUX_DIR(./config/autoconf)
+ AC_CANONICAL_SYSTEM
+ 
+ dnl ========================================================
+@@ -86,24 +86,6 @@ DLLFLAGS="${DLLFLAGS=}"
+ HOST_CFLAGS="${HOST_CFLAGS=}"
+ HOST_LDFLAGS="${HOST_LDFLAGS=}"
+ 
+-case "$target" in
+-*-cygwin*|*-mingw*|*-msvc*|*-mks*)
+-    # Check to see if we are really running in a msvc environemnt
+-    _WIN32_MSVC=
+-    AC_CHECK_PROGS(CC, cl)
+-    if test "$CC" = "cl"; then
+-        echo 'main() { return 0; }' > dummy.c
+-        ${CC} -o dummy dummy.c >/dev/null 2>&1
+-        if test $? = 0; then
+-            _WIN32_MSVC=1
+-            CXX=$CC
+-        else
+-            AC_MSG_WARN([$(CC) test failed.  Using normal feature tests])
+-        fi
+-        rm -f dummy dummy.o dummy.obj dummy.exe dummy.c
+-    fi
+-    ;;
+-esac
+ 
+ if test -n "$_WIN32_MSVC"; then
+     SKIP_PATH_CHECKS=1
+@@ -152,18 +134,6 @@ AC_ARG_WITH(mozilla,
+ 	        AC_DEFINE(MOZILLA_CLIENT)
+ 	    fi])
+ 
+-AC_ARG_ENABLE(optimize,
+-    [  --enable-optimize(=val) Enable code optimizations (val, ie. -O2) ],
+-    [ if test "$enableval" != "no"; then
+-        MOZ_OPTIMIZE=1
+-        if test -n "$enableval" && test "$enableval" != "yes"; then
+-    	    _OPTIMIZE_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
+-            _SAVE_OPTIMIZE_FLAGS=$_OPTIMIZE_FLAGS
+-        fi
+-      else
+-        MOZ_OPTIMIZE=
+-    fi ])
+-
+ AC_ARG_ENABLE(debug,
+     [  --enable-debug(=val)    Enable debugging (debug flags val)],
+     [ if test "$enableval" != "no"; then
+@@ -176,26 +146,6 @@ AC_ARG_ENABLE(debug,
+             MOZ_DEBUG=
+     fi])
+ 
+-AC_ARG_ENABLE(win32-target,
+-    [  --enable-win32-target=\$t
+-                          Specify win32 flavor. (WIN95 or WINNT)],
+-    OS_TARGET=`echo $enableval | tr a-z A-Z`,
+-    OS_TARGET=)
+-
+-AC_ARG_ENABLE(debug-rtl,
+-    [  --enable-debug-rtl      Use the MSVC debug runtime library],
+-    [ if test "$enableval" = "yes"; then
+-	    USE_DEBUG_RTL=1
+-      fi ])
+-
+-AC_ARG_ENABLE(n32,
+-    [  --enable-n32            Enable n32 ABI support (IRIX only)],
+-    [ if test "$enableval" = "yes"; then
+-	USE_N32=1
+-      else if test "$enableval" = "no"; then
+-	USE_N32=
+-      fi
+-    fi ])
+ 
+ AC_ARG_ENABLE(64bit,
+     [  --enable-64bit          Enable 64-bit support (on certain platforms)],
+@@ -261,10 +211,6 @@ dnl svrcore implies both nspr and nss
+        if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS" ; then
+            if test -n "$_SYSTEM_SVRCORE"; then
+                AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
+-           else
+-       	       dnl see if we are being built in the same build tree as svrcore
+-               AM_PATH_INTREE_SVRCORE(../../dist)
+-               dnl failing that, see if we can find svrcore-config or pkg-config svrcore
+                if test -z "$SVRCORE_CFLAGS" -o -z "$SVRCORE_LIBS"; then
+                    AM_PATH_SVRCORE(4.0.1, [MOZ_NATIVE_SVRCORE=1], [MOZ_NATIVE_SVRCORE=])
+                fi
+@@ -294,9 +240,6 @@ dnl nss requires nspr
+             _SYSTEM_NSS=no
+ 	    fi], _SYSTEM_NSS= )
+ 
+-if test "$_WIN32_MSVC"; then
+-    _SYSTEM_NSS=
+-fi
+ 
+ dnl first, see if user has specified explicit NSPR include and lib paths,
+ dnl of if the user has explicitly disabled the use of nss
+@@ -308,10 +251,6 @@ dnl next, see if user explicitly said to
+ if test -n "$USE_NSS" -a -z "$NSS_CFLAGS" -a -z "$NSS_LIBS" ; then
+ dnl nss requires nspr
+    no_nspr=no
+-   if test -z "$_SYSTEM_NSS" -o "$_SYSTEM_NSS" = "no" ; then
+-dnl see if we are being built in the same build tree as nss
+-      AM_PATH_INTREE_NSS(../../dist)
+-   fi
+ dnl failing that, see if we can find nss-config or pkg-config nss
+    if test -z "$NSS_CFLAGS" -a "$_SYSTEM_NSS" != "no" ; then
+       AM_PATH_NSS(3.9.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+@@ -348,10 +287,6 @@ fi
+ 
+ dnl next, look for in-tree nspr if user did not specify explicit system nspr
+ if test "$no_nspr" = "no" -a -z "$NSPR_CFLAGS" -a -z "$NSPR_LIBS" ; then
+-   if test -z "$_SYSTEM_NSPR" -o "$_SYSTEM_NSPR" = "no" ; then
+-dnl see if we are being built in the same build tree as nspr
+-      AM_PATH_INTREE_NSPR(../../dist)
+-   fi
+ dnl failing that, see if we can find nspr-config or pkg-config nspr
+    if test -z "$NSPR_CFLAGS" -a "$_SYSTEM_NSPR" != "no" ; then
+       AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=])
+@@ -1520,9 +1455,7 @@ tools are selected during the Xcode/Deve
+     ;;
+ 
+ *-linux*)
+-    if test -z "$USE_NSPR_THREADS"; then
+-        USE_PTHREADS=1
+-    fi
++    USE_PTHREADS=1
+     AC_DEFINE(XP_UNIX)
+     AC_DEFINE(_POSIX_SOURCE)
+     AC_DEFINE(_BSD_SOURCE)
diff --git a/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild b/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild
index dc6c9803f6c6..bb3bbba816d3 100644
--- a/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild
+++ b/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild,v 1.3 2012/07/11 18:16:29 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/mozldap-6.0.6-r2.ebuild,v 1.4 2013/03/14 17:08:10 lxnay Exp $
 
 EAPI="2"
 
@@ -51,7 +51,6 @@ src_configure() {
 
 src_install () {
 	# Their build system is royally fucked, as usual
-	cd "${S}"
 	sed -e "s,%libdir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
 	    -e "s,%prefix%,/usr,g" \
 	    -e "s,%major%,$(get_major_version ${PV}),g" \
diff --git a/dev-libs/mozldap/mozldap-6.0.7.ebuild b/dev-libs/mozldap/mozldap-6.0.7.ebuild
new file mode 100644
index 000000000000..56e9372c5649
--- /dev/null
+++ b/dev-libs/mozldap/mozldap-6.0.7.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mozldap/mozldap-6.0.7.ebuild,v 1.1 2013/03/14 17:08:10 lxnay Exp $
+
+EAPI="5"
+
+WANT_AUTOCONF="2.1"
+
+inherit eutils multilib versionator autotools
+
+DESCRIPTION="Mozilla LDAP C SDK"
+HOMEPAGE="http://wiki.mozilla.org/LDAP_C_SDK"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 debug +sasl"
+
+COMMON_DEPEND=">=dev-libs/nss-3.11.4
+	>=dev-libs/nspr-4.0.1
+	>=dev-libs/svrcore-4.0.0
+	sasl? ( dev-libs/cyrus-sasl )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${P}/c-sdk"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.0.4-pkgconfig.patch
+	epatch "${FILESDIR}"/${P}-configure.in.patch
+	epatch "${FILESDIR}"/nss-m4.patch
+	epatch "${FILESDIR}"/nspr-m4.patch
+	epatch "${FILESDIR}"/${PN}-6.0.6-ldflags.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--libdir=/usr/$(get_libdir)/mozldap"
+	econf $(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable amd64 64bit) \
+		$(use_with sasl) \
+		--with-svrcore-inc=/usr/include/svrcore \
+		--with-svrcore-lib=/usr/$(get_libdir)/svrcore \
+		--enable-clu \
+		--enable-optimize \
+		${myconf} || die "econf failed"
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	sed -e "s,%libdir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
+	    -e "s,%prefix%,/usr,g" \
+	    -e "s,%major%,$(get_major_version ${PV}),g" \
+	    -e "s,%minor%,$(get_version_component_range 2 ${PV}),g" \
+	    -e "s,%submin%,$(get_version_component_range 3 ${PV}),g" \
+	    -e "s,%libsuffix%,$(get_major_version ${PV})$(get_version_component_range 2 ${PV}),g" \
+	    -e "s,%bindir%,\$\{exec_prefix\}/$(get_libdir)/${PN},g" \
+	    -e "s,%exec_prefix%,\$\{prefix\},g" \
+	    -e "s,%includedir%,\$\{exec_prefix\}/include/${PN},g" \
+	    -e "s,%NSPR_VERSION%,$(pkg-config --modversion nspr),g" \
+	    -e "s,%NSS_VERSION%,$(pkg-config --modversion nss),g" \
+	    -e "s,%SVRCORE_VERSION%,$(pkg-config --modversion svrcore),g" \
+	    -e "s,%MOZLDAP_VERSION%,${PV},g" \
+	   "${S}"/"${PN}".pc.in > "${S}"/"${PN}".pc || die "sed in install failed"
+
+	emake  install || die "make failed"
+	local MY_S="${WORKDIR}"/"${P}"/mozilla/dist/
+
+	rm -rf "${MY_S}/bin/"lib*.so
+	rm -rf "${MY_S}/public/ldap-private"
+
+	exeinto /usr/$(get_libdir)/mozldap
+	doexe "${MY_S}"/lib/*so*
+	doexe "${MY_S}"/lib/*.a
+	doexe "${MY_S}"/bin/*
+
+	#create compatibility PATH link
+
+	 for i in ldapcmp ldapcompare ldapdelete ldapmodify \
+		 	ldappasswd ldapsearch;do
+	 	dosym /usr/$(get_libdir)/mozldap/$i /usr/bin/moz"${i}" || die
+	 # compat for 389-project
+		dosym /usr/$(get_libdir)/mozldap/$i /usr/bin/389-"${i}" || die
+	done
+
+	# move the headers around
+	insinto /usr/include/mozldap
+	doins "${MY_S}/public/ldap/"*.h
+
+	# add sample config
+	insinto /usr/share/mozldap
+	doins "${MY_S}"/etc/*.conf
+
+	#and while at it move them to files with versions-ending
+	#and link them back :)
+	cd "${D}"/usr/$(get_libdir)/mozldap
+
+	#create compatibility Link
+	ln -sf libldap$(get_major_version ${PV})$(get_version_component_range 2 ${PV}).so \
+		liblber$(get_major_version ${PV})$(get_version_component_range 2 ${PV}).so || die
+	#so lets move
+	for file in *.so; do
+		mv ${file} ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) || die
+		ln -sf ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) ${file} || die
+		ln -sf ${file}.$(get_major_version ${PV}).$(get_version_component_range 2 ${PV}) \
+			${file}.$(get_major_version ${PV}) || die
+	done
+
+	# cope with libraries being in /usr/lib/mozldap
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/mozldap" > "${D}"/etc/env.d/08mozldap
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}"/mozldap.pc
+}