Version bump to latest. Fixes bug#413329.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 44 insertions, 87 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/Manifest b/net-nds/smbldap-tools/Manifest
index b0752d9ad57e..6075e0222a50 100644
--- a/net-nds/smbldap-tools/Manifest
+++ b/net-nds/smbldap-tools/Manifest
@@ -2,17 +2,25 @@
 Hash: SHA1
 
 DIST smbldap-tools-0.9.4.tgz 279433 RMD160 531628979e0746ecde096968b66957207ce04ab3 SHA1 4fb361f47c0cf6c6ec210926c095334b655b76bd SHA256 44f17ae905fcf81819571161d6ebfcc0beb99e1714b47b843db5cbe0c1e2bac6
-DIST smbldap-tools-0.9.5.tgz 303131 RMD160 055d7dc059d19ad153412c449d1448858c1fe42c SHA1 05534385b6f7d031d0721d64f339bf8d166a68f5 SHA256 9c69c8245af90e1c2e3d53283ad2188b1b27e88bf86516c3b8f37ae7ac1e0e33
-DIST smbldap-tools-0.9.6.tar.gz 304912 RMD160 f9a497a29736673226a9c872c50893c31a0db513 SHA1 c5220c63c57c191f9342076784dad1ef595129ba SHA256 e3bd27a5237c0f3f38c178b40cda982e0e4e9740c82949b40653f84d29becfe5
+DIST smbldap-tools-0.9.8.tar.gz 335484 RMD160 26300461a9ec584f57fa8061371210ad3805b970 SHA1 9207ee74e2e34c1904a939acaa3ce6331e1aa0a5 SHA256 9860cc5f01ba96e66d6d51763ba7894a07d280a38e76247a812b153d2a9caa26
 EBUILD smbldap-tools-0.9.4-r1.ebuild 1594 RMD160 08f6e32b68d472d0101eec745b28ee25bca86aff SHA1 c91fc809a6c3632889e6c0b828c2c04cf8ff6951 SHA256 ec7bae286bcc45cf8c145328272456159bb279b1041a426365cd16992766e8b8
-EBUILD smbldap-tools-0.9.5.ebuild 1600 RMD160 30661d3ef72b5372d6882077386310d758b9671d SHA1 616f2a7bd2272351985c3364d4f53cfce36b4bac SHA256 807cf51cb1553fce9ee150085019378f1ccb4720a0aa37d5119f99a435c20adc
-EBUILD smbldap-tools-0.9.6.ebuild 1638 RMD160 d593c5e71b6e7eee56dbdf2bc957d4ba2bafecf0 SHA1 32d34d3adec9c8c0355eb060730bf4cd267ebd9e SHA256 efdee13f64a4ce21480549143041eb9774a0b42d230fbab7d76d7cf56a1133fc
-MISC ChangeLog 5536 RMD160 9473dee32502ae941e389b5da398705c292056d8 SHA1 365a0c1718d7423ce03f4ce7fc1a1dedf7b30701 SHA256 28cc5804845fade691e8c53a2aa0a2e6cd7158a7529663d66a51d05cad724d9b
+EBUILD smbldap-tools-0.9.8.ebuild 1583 RMD160 40060a8a5293818918d00e7838983ccde878490a SHA1 5bed9fab2cdfb7211be00461f1e8d43f229d41de SHA256 ec2f10ca1cd61ca22723be656e3b1f7b30f1c122b3ec4b446e4a5750fa1d0f0c
+MISC ChangeLog 5762 RMD160 d7a0a9ffa0314181664536bc563cb9eb93b2adcd SHA1 d45df3e995507319050dc9591ccea7db432cf4f2 SHA256 dda5fe3701d86098d56f0753c9543ccb4a9311a16858e9986812cffce139481c
 MISC metadata.xml 285 RMD160 ed8246671718094215ce756814437b83e791f1a4 SHA1 5a920eb1dcdef90f3d4da98d92cf0ce70aa830b9 SHA256 4b3ae993ede81b56f064619075267772bd48acce0d7f101057cd59ad8d698643
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3EEdEACgkQKQaZ7OJe4zYEdwCeIb/6Fyps1ZqMDA9NAt7BFFG1
-wKUAoJkMBo0dFoFbzHhQpgu7uFaEtVwU
-=AU13
+iQIcBAEBAgAGBQJPolGEAAoJEOSiRoyO7jvoPi4QAIahb4WhKb/xzxnbnZYMTT0s
+j0IpxQRo7NyUqrL5SP8wqGNPSGqP3eXGMH1v+rEmiEQaGYO0MYaeVSGzobaAc+jD
+5A3LdFUDDIQwJzm9fSiOaI5KCJmoffZ/75bkCM8nrbnf/GIpJRqXYr3y0i7De659
+1PxH9moIqDE/bwEX9NLwLwbntJCTgAKGSeKiSg7myjKGpUaZuBZSqK9YJZvN9RmD
+dUcq4QcyxshBDE5X7oZE/jqW7hOrHhRAC2Q5E/n9QGamUvkApqRQJ/sHOzgNtNvg
+Ekko26ke6GdtpZd23uxCS2q8sCAj8u75IUmxuFj6zMvbGRYQbAsBRekSzDClG9y8
+YYOhCWrleKndCFTbQ2yQIDuBAU82Q+LcXbdllQOekFw7rN4PDZP6Y6LDyA5a9nQ+
+wBNjJBmIpnRZRgTbfFss0Tp6lE2ty+tKlNEQJuPNxPMKoN9iil0QZD7uBPEy2ETc
+gF3KLc47H0l9QcjXiSGXMKLYII5G83NM9LdZ0ZW9400BioHeIa+1FrxmrVef3ajL
+c7tOZcH4c5aC/S3Nh5bMnGtEPVPLp+cChmHstjmHE57wZrD4I8rFexZiX+wS0w+n
+De9N5W6P/EwoxebS8WVUgOinlY9kCgJom/AWV8xJfj6DMlekxtqxU/RMJ/ay6l8Q
+Ut0FlGqIoJzO4pCrjfZs
+=RbQl
 -----END PGP SIGNATURE-----
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."
 }