Stabilise 0.9.8 on relevant arches, remove older. Add latest version.

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

4 files changed, 62 insertions, 58 deletions

diff --git a/net-nds/smbldap-tools/ChangeLog b/net-nds/smbldap-tools/ChangeLog
index b4d8ee6e4161..913c80fe34a1 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/ChangeLog,v 1.36 2012/06/12 20:05:05 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/ChangeLog,v 1.37 2012/09/13 19:15:03 scarabeus Exp $
+
+*smbldap-tools-0.9.9 (13 Sep 2012)
+
+  13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> +smbldap-tools-0.9.9.ebuild,
+  -smbldap-tools-0.9.4-r1.ebuild, smbldap-tools-0.9.8.ebuild:
+  Stabilise 0.9.8 on relevant arches, remove older. Add latest version.
 
   12 Jun 2012; Víctor Ostorga <vostorga@gentoo.org>
   smbldap-tools-0.9.8.ebuild:
@@ -173,4 +179,3 @@
   17 Mar 2005; Christian Andreetta <satya@gentoo.org> :
   new ebuild: split from samba-3.0.11 ebuild. Addresses bugs #77482, #83196,
   #85048
-
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.4-r1.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.4-r1.ebuild
deleted file mode 100644
index bb1362712a14..000000000000
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.4-r1.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.4-r1.ebuild,v 1.9 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.8.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
index 1e44134c8a22..159154e0b86f 100644
--- a/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.2 2012/06/12 20:05:05 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/smbldap-tools/smbldap-tools-0.9.8.ebuild,v 1.3 2012/09/13 19:15:03 scarabeus Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://gna.org/projects/smbldap-tools/"
 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"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-nds/smbldap-tools/smbldap-tools-0.9.9.ebuild b/net-nds/smbldap-tools/smbldap-tools-0.9.9.ebuild
new file mode 100644
index 000000000000..9b394315bb26
--- /dev/null
+++ b/net-nds/smbldap-tools/smbldap-tools-0.9.9.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-nds/smbldap-tools/smbldap-tools-0.9.9.ebuild,v 1.1 2012/09/13 19:15:03 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/sources/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/perl-ldap
+	dev-perl/Crypt-SmbHash
+	dev-perl/Digest-SHA1
+	dev-perl/Unicode-MapUTF8
+	dev-perl/IO-Socket-SSL
+	net-nds/openldap
+	net-fs/samba
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	default
+
+	newsbin smbldap-config.cmd smbldap-config
+	dosym smbldap-passwd /usr/sbin/smbldap-passwd.cmd
+
+	dodoc CONTRIBUTORS ChangeLog FILES INFRA INSTALL README TODO doc/*conf* doc/smbldap-tools*
+	dodoc -r doc/migration_scripts
+
+	sed -i 's/.CMD//g' smbldap-[gpu]*.8 || die
+	doman smbldap-[gpu]*.8
+
+	insinto /etc/smbldap-tools
+	doins smbldap.conf smbldap_bind.conf
+
+	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 ${EPREFIX}/usr/share/doc/${PF},"
+	elog "  together with the migration-scripts."
+	elog "- Also remember to read INSTALL when updating."
+}