version bump

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key ADC916E5)

6 files changed, 271 insertions, 10 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/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
+}