Version bump to latest. Fixes bug#413329.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 28 insertions, 79 deletions

diff --git a/net-nds/smbldap-tools/ChangeLog b/net-nds/smbldap-tools/ChangeLog
index 0f23923353cc..ce8d9a8edd12 100644
--- a/net-nds/smbldap-tools/ChangeLog
+++ b/net-nds/smbldap-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/smbldap-tools
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/ChangeLog,v 1.34 2011/05/06 15:20:19 vostorga Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/ChangeLog,v 1.35 2012/05/03 09:35:36 scarabeus Exp $
+
+*smbldap-tools-0.9.8 (03 May 2012)
+
+  03 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +smbldap-tools-0.9.8.ebuild,
+  -smbldap-tools-0.9.5.ebuild, -smbldap-tools-0.9.6.ebuild:
+  Version bump to latest. Fixes bug#413329.
 
 *smbldap-tools-0.9.6 (06 May 2011)
 
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.5.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.5.ebuild
deleted file mode 100644
index 8501de36e1a6..000000000000
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/smbldap-tools-0.9.5.ebuild,v 1.2 2009/09/11 11:32:37 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="Samba LDAP management tools"
-HOMEPAGE="https://gna.org/projects/smbldap-tools/
-	http://www.iallanis.info/"
-SRC_URI="http://download.gna.org/smbldap-tools/packages/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="net-nds/openldap
-	>=net-fs/samba-3.0.1
-	dev-perl/perl-ldap
-	dev-perl/Crypt-SmbHash
-	dev-perl/Digest-SHA1
-	dev-perl/Unicode-MapUTF8
-	dev-perl/IO-Socket-SSL"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	mkdir man
-	for i in smbldap-[gpu]*; do
-		pod2man --section=8 $i > man/$i.8 || die "generation manpage for ${i} failed"
-	done
-}
-
-src_install() {
-	emake install prefix="${D}/usr" sysconfdir="${D}/etc" || die "emake install failed"
-
-	into /usr
-	newsbin configure.pl smbldap-configure.pl
-
-	rm -f "${D}/usr/sbin"/*.spec
-
-	dodoc CONTRIBUTORS ChangeLog FILES INFRA README TODO doc/*.conf
-
-	doman man/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r doc/migration_scripts
-	doins doc/*.pdf
-}
-
-pkg_postinst() {
-	elog "- A good howto is found on http://www.iallanis.info/smbldap-tools/docs/samba-ldap-howto/"
-	elog "- The configure script is installed as smbldap-configure.pl. Please run it to configure the tools."
-	elog "- Examples configuration files for Samba and slapd have been copied to /usr/share/doc/${PF},"
-	elog "  together with the migration-scripts."
-}
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.6.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
index 3dfb1af47c3e..92ed682a9ad2 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.6.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
@@ -1,54 +1,51 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/smbldap-tools-0.9.6.ebuild,v 1.1 2011/05/06 15:20:19 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild,v 1.1 2012/05/03 09:35:36 scarabeus Exp $
+
+EAPI=4
 
 inherit eutils
 
 DESCRIPTION="Samba LDAP management tools"
 HOMEPAGE="https://gna.org/projects/smbldap-tools/"
-SRC_URI="http://download.gna.org/smbldap-tools/packages/${P}.tar.gz"
+SRC_URI="http://download.gna.org/smbldap-tools/sources/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
-RDEPEND="net-nds/openldap
-	net-fs/samba
+RDEPEND="
 	dev-perl/perl-ldap
 	dev-perl/Crypt-SmbHash
 	dev-perl/Digest-SHA1
 	dev-perl/Unicode-MapUTF8
-	dev-perl/IO-Socket-SSL"
+	dev-perl/IO-Socket-SSL
+	net-nds/openldap
+	net-fs/samba
+"
 DEPEND="${RDEPEND}"
 
-src_compile() {
-	mkdir man
-	for i in smbldap-[gpu]*; do
-		pod2man --section=8 $i > man/$i.8 || die "generation manpage for ${i} failed"
-	done
-}
-
 src_install() {
-	emake install prefix="${D}/usr" sysconfdir="${D}/etc" || die "emake install failed"
+	default
 
-	into /usr
-	newsbin configure.pl smbldap-configure.pl
+	newsbin smbldap-config.cmd smbldap-config
 
-	rm -f "${D}/usr/sbin"/*.spec
+	dodoc CONTRIBUTORS ChangeLog FILES INFRA INSTALL README TODO doc/*conf* doc/smbldap-tools*
+	dodoc -r doc/migration_scripts
 
-	dodoc CONTRIBUTORS ChangeLog FILES INFRA README TODO doc/*.conf
+	sed -i 's/.CMD//g' smbldap-[gpu]*.8 || die
 
-	doman man/*
+	insinto /etc/smbldap-tools
+	doins smbldap.conf smbldap_bind.conf
 
-	insinto /usr/share/doc/${PF}
-	doins -r doc/migration_scripts
-	doins doc/*.pdf
+	elog "Remember to read INSTALL when updating."
 }
 
 pkg_postinst() {
 	elog "- A good howto is found on http://download.gna.org/smbldap-tools/docs/samba-ldap-howto/"
 	elog "  and http://download.gna.org/smbldap-tools/docs/smbldap-tools/"
 	elog "- The configure script is installed as smbldap-configure.pl. Please run it to configure the tools."
-	elog "- Examples configuration files for Samba and slapd have been copied to /usr/share/doc/${PF},"
+	elog "- Examples configuration files for Samba and slapd have been copied to ${EPREFIX}/usr/share/doc/${PF},"
 	elog "  together with the migration-scripts."
+	elog "- Also remember to read INSTALL when updating."
 }