[gentoo-commits] repo/gentoo:master commit in: dev-libs/mozldap/files/, dev-libs/mozldap/

[Austin English]

commit:     16c6579daa190223ff44787904e5346180787ce9
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 17:54:21 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 17:57:42 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c6579d

dev-libs/mozldap: bump to EAPI 6, add maintainer-needed

Package-Manager: portage-2.2.28

 dev-libs/mozldap/files/mozldap-6.0.6-ldflags.patch |   4 +-
 dev-libs/mozldap/files/nspr-m4.patch               |   4 +-
 dev-libs/mozldap/files/nss-m4.patch                |   6 +-
 dev-libs/mozldap/metadata.xml                      |   1 +
 dev-libs/mozldap/mozldap-6.0.7-r1.ebuild           | 121 +++++++++++++++++++++
 5 files changed, 129 insertions(+), 7 deletions(-)

diff --git a/dev-libs/mozldap/files/mozldap-6.0.6-ldflags.patch b/dev-libs/mozldap/files/mozldap-6.0.6-ldflags.patch
index 60593c6..904b0f7 100644
--- a/dev-libs/mozldap/files/mozldap-6.0.6-ldflags.patch
+++ b/dev-libs/mozldap/files/mozldap-6.0.6-ldflags.patch
@@ -2,8 +2,8 @@ Respect LDFLAGS
 
 http://bugs.gentoo.org/show_bug.cgi?id=327335
 
---- config/autoconf.mk.in
-+++ config/autoconf.mk.in
+--- a/config/autoconf.mk.in
++++ b/config/autoconf.mk.in
 @@ -117,7 +117,7 @@
  
  MKSHLIB		= @MKSHLIB@

diff --git a/dev-libs/mozldap/files/nspr-m4.patch b/dev-libs/mozldap/files/nspr-m4.patch
index 7a9b969..531f566 100644
--- a/dev-libs/mozldap/files/nspr-m4.patch
+++ b/dev-libs/mozldap/files/nspr-m4.patch
@@ -1,5 +1,5 @@
---- config.orig/autoconf/nspr.m4	2009-10-06 11:21:10.898930843 +0300
-+++ config/autoconf/nspr.m4	2009-10-06 11:27:43.638925618 +0300
+--- a/config/autoconf/nspr.m4	2009-10-06 11:21:10.898930843 +0300
++++ b/config/autoconf/nspr.m4	2009-10-06 11:27:43.638925618 +0300
 @@ -86,39 +86,6 @@
  
  ])

diff --git a/dev-libs/mozldap/files/nss-m4.patch b/dev-libs/mozldap/files/nss-m4.patch
index 6a855e2..a3fa41d 100644
--- a/dev-libs/mozldap/files/nss-m4.patch
+++ b/dev-libs/mozldap/files/nss-m4.patch
@@ -1,6 +1,6 @@
-diff -uNr config.orig/autoconf/nss.m4 config/autoconf/nss.m4
---- config.orig/autoconf/nss.m4	2009-10-06 11:21:10.898930843 +0300
-+++ config/autoconf/nss.m4	2009-10-06 11:23:37.754923372 +0300
+diff -uNr a/config/autoconf/nss.m4 b/config/autoconf/nss.m4
+--- a/config/autoconf/nss.m4	2009-10-06 11:21:10.898930843 +0300
++++ b/config/autoconf/nss.m4	2009-10-06 11:23:37.754923372 +0300
 @@ -86,41 +86,6 @@
  
  ])

diff --git a/dev-libs/mozldap/metadata.xml b/dev-libs/mozldap/metadata.xml
index 097975e..6f49eba 100644
--- a/dev-libs/mozldap/metadata.xml
+++ b/dev-libs/mozldap/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-libs/mozldap/mozldap-6.0.7-r1.ebuild b/dev-libs/mozldap/mozldap-6.0.7-r1.ebuild
new file mode 100644
index 0000000..74afefa
--- /dev/null
+++ b/dev-libs/mozldap/mozldap-6.0.7-r1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+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"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.0.4-pkgconfig.patch
+	"${FILESDIR}"/${P}-configure.in.patch
+	"${FILESDIR}"/nss-m4.patch
+	"${FILESDIR}"/nspr-m4.patch
+	"${FILESDIR}"/${PN}-6.0.6-ldflags.patch
+)
+
+src_prepare() {
+	default
+	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
+	local MY_S="${WORKDIR}"/dist/
+
+	rm -rf "${MY_S}/bin/"lib*.so || die
+	rm -rf "${MY_S}/public/ldap-private" || die
+
+	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 || die
+
+	# 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 let's 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 || die
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins "${S}"/mozldap.pc
+}