Dropped old versions. Cleanup (bug #192031, thanks to Jakub Moc). Some more cleanup.

Package-Manager: portage-2.1.3.8

13 files changed, 36 insertions, 322 deletions

diff --git a/sys-auth/pam_smb/ChangeLog b/sys-auth/pam_smb/ChangeLog
index f0ae71003376..47b8d5cb71f5 100644
--- a/sys-auth/pam_smb/ChangeLog
+++ b/sys-auth/pam_smb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/pam_smb
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/ChangeLog,v 1.6 2007/04/28 13:21:16 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/ChangeLog,v 1.7 2007/09/12 21:22:53 dev-zero Exp $
+
+  12 Sep 2007; Tiziano Müller <dev-zero@gentoo.org>
+  -pam_smb-1.9.9-r1.ebuild, -pam_smb-1.9.9-r2.ebuild,
+  -pam_smb-2.0.0_rc5.ebuild, -pam_smb-2.0.0_rc5-r1.ebuild,
+  -pam_smb-2.0.0_rc6.ebuild, pam_smb-2.0.0_rc6-r1.ebuild:
+  Dropped old versions. Cleanup (bug #192031, thanks to Jakub Moc). Some more
+  cleanup.
 
   28 Apr 2007; Torsten Veller <tove@gentoo.org> pam_smb-2.0.0_rc6-r1.ebuild:
   Use newinitd
diff --git a/sys-auth/pam_smb/Manifest b/sys-auth/pam_smb/Manifest
index 57241becc73a..cd159a5ab4d3 100644
--- a/sys-auth/pam_smb/Manifest
+++ b/sys-auth/pam_smb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10-pam_smb-bash-3.1.patch 559 RMD160 dbc05ac8ba57f63d0aaf06616c244e429fed8e52 SHA1 d7850865f33c7ac70b6127a2697937e581853f5a SHA256 ebc731df2e247e38f8084b81596cb13a957696bf60c1cc5f05a8259f14de9e8c
 MD5 40ef5a91968ea8d55f072db26fba0b0c files/10-pam_smb-bash-3.1.patch 559
 RMD160 dbc05ac8ba57f63d0aaf06616c244e429fed8e52 files/10-pam_smb-bash-3.1.patch 559
@@ -9,63 +6,19 @@ AUX pamsmbd-init 468 RMD160 e3db72480ab94beb47040307fc8d9da84eda6b2b SHA1 ba112b
 MD5 1e43479dbe172fe3e449c6c137be0f24 files/pamsmbd-init 468
 RMD160 e3db72480ab94beb47040307fc8d9da84eda6b2b files/pamsmbd-init 468
 SHA256 d7da1dba2d1b898431cf63f92c14a2bb77edce839e3b7c264b73da6e916aafdc files/pamsmbd-init 468
-DIST pam_smb-1.9.9.tar.gz 106341 RMD160 93cd9bebea2d001117ca34bafc91278a919a9065 SHA1 04f9423a46be150af93f03b6884311cfa486246e SHA256 63c5271c41e6648235b8c76c4fba4aabc3bc76e229ca4a18abdd50ebdaea028a
-DIST pam_smb-2.0.0-rc5.tar.gz 114456 RMD160 cc3a834cc8266dd544aeb038bd2836bd8c386903 SHA1 7c989abef65f14b41eb5ccb8c3b12fe80b46b98d SHA256 b7868772af29604847dcef2ca8e015b315e75a52ad3f193d0d68d1498097473a
 DIST pam_smb-2.0.0-rc6.tar.gz 115069 RMD160 7fa3c34d6d67fcf5d109cdf4a9508a7a16b6a737 SHA1 aa0c54d143ea9a794ae5a74784a4412b080c45d9 SHA256 b787b11dade66b1078553fc0662843f3aa9f69629542ff5fd6802d62555295c5
-EBUILD pam_smb-1.9.9-r1.ebuild 1027 RMD160 8104592806f0dedd22d18ba5a255cb8654831d07 SHA1 cf16c4c50d8186e75fc5c43b54e45ddeec914bf8 SHA256 c9aff6e0fdd9eee2e4d2fef92200c137c560fd844d39e212b7c8b7395509cc61
-MD5 4e3683c1bbbbdf8f1c29bc09f08e2b67 pam_smb-1.9.9-r1.ebuild 1027
-RMD160 8104592806f0dedd22d18ba5a255cb8654831d07 pam_smb-1.9.9-r1.ebuild 1027
-SHA256 c9aff6e0fdd9eee2e4d2fef92200c137c560fd844d39e212b7c8b7395509cc61 pam_smb-1.9.9-r1.ebuild 1027
-EBUILD pam_smb-1.9.9-r2.ebuild 1129 RMD160 2f30e616e86a3322bfe8ca6d7f39601939048723 SHA1 ef90b312fbe387d8354b5a6aae7eb35ca5403a0b SHA256 991a57f49009d0b7b80821b44b71a66917c53ee3d42f4fcc9c396e0340f50e1b
-MD5 3491a2d4b6f3e10f20b712cf0f591c3e pam_smb-1.9.9-r2.ebuild 1129
-RMD160 2f30e616e86a3322bfe8ca6d7f39601939048723 pam_smb-1.9.9-r2.ebuild 1129
-SHA256 991a57f49009d0b7b80821b44b71a66917c53ee3d42f4fcc9c396e0340f50e1b pam_smb-1.9.9-r2.ebuild 1129
-EBUILD pam_smb-2.0.0_rc5-r1.ebuild 1222 RMD160 4cb8a66888472ca5ad25a2e1994199fe5e6808e3 SHA1 09b118e8377eccc3c43ad4dd11c369753bae4eb4 SHA256 02d39236531fbd634884b836b726754ddc8d399afed6378492c2797e0852f3db
-MD5 6fbf0fca1501b67cdbf909c13aa40c1e pam_smb-2.0.0_rc5-r1.ebuild 1222
-RMD160 4cb8a66888472ca5ad25a2e1994199fe5e6808e3 pam_smb-2.0.0_rc5-r1.ebuild 1222
-SHA256 02d39236531fbd634884b836b726754ddc8d399afed6378492c2797e0852f3db pam_smb-2.0.0_rc5-r1.ebuild 1222
-EBUILD pam_smb-2.0.0_rc5.ebuild 1116 RMD160 8b5cb36f55bce515af265e67a2f8dac50d59a4a1 SHA1 0f2286dc4d371edfb4056b9ea82dc39108f63f50 SHA256 dd0b6efc19a36b317bbeb4974cd3493af88638866883607975c216ff55b3df58
-MD5 cdca3a90424ffabccc9f9f9932ff8442 pam_smb-2.0.0_rc5.ebuild 1116
-RMD160 8b5cb36f55bce515af265e67a2f8dac50d59a4a1 pam_smb-2.0.0_rc5.ebuild 1116
-SHA256 dd0b6efc19a36b317bbeb4974cd3493af88638866883607975c216ff55b3df58 pam_smb-2.0.0_rc5.ebuild 1116
-EBUILD pam_smb-2.0.0_rc6-r1.ebuild 1247 RMD160 33b26acdb2cd43e2d2752cff9abd00363dd49bd4 SHA1 15a03a6b78febeb3031378a8bf80f4a94d8a2f49 SHA256 ebcd20233e065cb7b0e9801b127e85d9e2aadfde142fa66f7a59e4853a66662e
-MD5 ef9aa517d8b227a82790c12c1a35b4fe pam_smb-2.0.0_rc6-r1.ebuild 1247
-RMD160 33b26acdb2cd43e2d2752cff9abd00363dd49bd4 pam_smb-2.0.0_rc6-r1.ebuild 1247
-SHA256 ebcd20233e065cb7b0e9801b127e85d9e2aadfde142fa66f7a59e4853a66662e pam_smb-2.0.0_rc6-r1.ebuild 1247
-EBUILD pam_smb-2.0.0_rc6.ebuild 1141 RMD160 56a58fe08531d1786bdf4158e8f94606516c76a6 SHA1 c0c9157bd6e5d48796433966ab6b33c1e0811866 SHA256 daa655cf0447d5a8327872ccbcaeebd19c88bfe7a1d47268b0c0b6bcfa02f968
-MD5 13ab1dda3afeb3422551551246ac51d2 pam_smb-2.0.0_rc6.ebuild 1141
-RMD160 56a58fe08531d1786bdf4158e8f94606516c76a6 pam_smb-2.0.0_rc6.ebuild 1141
-SHA256 daa655cf0447d5a8327872ccbcaeebd19c88bfe7a1d47268b0c0b6bcfa02f968 pam_smb-2.0.0_rc6.ebuild 1141
-MISC ChangeLog 1876 RMD160 b9f5c1ae191f8d3612edf05b7b4191f953d272df SHA1 2116168180989d8efa9764497cf6b3b7a62629cd SHA256 6626762d2a2fa65c654f0781d4aec103c84a5b6288adf1e324cf1ae190adbc7d
-MD5 3c8a1284cd7a4bb4cc4b45d6212b09c2 ChangeLog 1876
-RMD160 b9f5c1ae191f8d3612edf05b7b4191f953d272df ChangeLog 1876
-SHA256 6626762d2a2fa65c654f0781d4aec103c84a5b6288adf1e324cf1ae190adbc7d ChangeLog 1876
+EBUILD pam_smb-2.0.0_rc6-r1.ebuild 1255 RMD160 7e786229b54c148e30a701ab1ccfc1898e358a4a SHA1 02bbe52ed94619c69e576575eab5f4bdb90032ca SHA256 91f0e06118ed96f0ac69010859b00efaf72dab13c1c5bd021df703a208b3a766
+MD5 6f35adb9087a26e4fc11e4fa03537a3c pam_smb-2.0.0_rc6-r1.ebuild 1255
+RMD160 7e786229b54c148e30a701ab1ccfc1898e358a4a pam_smb-2.0.0_rc6-r1.ebuild 1255
+SHA256 91f0e06118ed96f0ac69010859b00efaf72dab13c1c5bd021df703a208b3a766 pam_smb-2.0.0_rc6-r1.ebuild 1255
+MISC ChangeLog 2194 RMD160 dae458809905aab3d8fd72247f4e703277e0fffd SHA1 363c0fb1b74b2bd9fb4bd198d61a0ccbe800f698 SHA256 c3bb700b4426c1999bcffc1527d9f9912e3b1b9d1e45f463f6e58152ba55fa83
+MD5 05a54a1d0a8b9aa9b0e86fc4f21d404e ChangeLog 2194
+RMD160 dae458809905aab3d8fd72247f4e703277e0fffd ChangeLog 2194
+SHA256 c3bb700b4426c1999bcffc1527d9f9912e3b1b9d1e45f463f6e58152ba55fa83 ChangeLog 2194
 MISC metadata.xml 528 RMD160 f2c2b9792dece1096d2b5574370f6bc965d03124 SHA1 ee807576f84d171f9ec45fbbbdca3576e8e0651b SHA256 51eece44121620b6c8a3326624d9062926101386df2a527d54fdfe07adcf11f3
 MD5 134f2e11c3ff0b7e85a9bfe7f51a49a5 metadata.xml 528
 RMD160 f2c2b9792dece1096d2b5574370f6bc965d03124 metadata.xml 528
 SHA256 51eece44121620b6c8a3326624d9062926101386df2a527d54fdfe07adcf11f3 metadata.xml 528
-MD5 1b2744bbe4146e25e061efe4756aeb99 files/digest-pam_smb-1.9.9-r1 241
-RMD160 2e36ea1023f0a02bb643805827eaf7abf6004094 files/digest-pam_smb-1.9.9-r1 241
-SHA256 50365044fb4045f3f2b497c469f0a41971d570c3254eabd978ac7edd78ce0ce1 files/digest-pam_smb-1.9.9-r1 241
-MD5 1b2744bbe4146e25e061efe4756aeb99 files/digest-pam_smb-1.9.9-r2 241
-RMD160 2e36ea1023f0a02bb643805827eaf7abf6004094 files/digest-pam_smb-1.9.9-r2 241
-SHA256 50365044fb4045f3f2b497c469f0a41971d570c3254eabd978ac7edd78ce0ce1 files/digest-pam_smb-1.9.9-r2 241
-MD5 9795721c9a6273a6e983953ef53f40a8 files/digest-pam_smb-2.0.0_rc5 253
-RMD160 a91cc32cbe428104e9fe8f0eaa49f45399e9c543 files/digest-pam_smb-2.0.0_rc5 253
-SHA256 2d513ecaef77b79c84fcce45257c2c2219d27d6800766daf1c0477f03cd23c82 files/digest-pam_smb-2.0.0_rc5 253
-MD5 9795721c9a6273a6e983953ef53f40a8 files/digest-pam_smb-2.0.0_rc5-r1 253
-RMD160 a91cc32cbe428104e9fe8f0eaa49f45399e9c543 files/digest-pam_smb-2.0.0_rc5-r1 253
-SHA256 2d513ecaef77b79c84fcce45257c2c2219d27d6800766daf1c0477f03cd23c82 files/digest-pam_smb-2.0.0_rc5-r1 253
-MD5 3d0690f0ea8c1d25554a4d1bcdc44bda files/digest-pam_smb-2.0.0_rc6 253
-RMD160 e49540036989f1de49b05f68e8ee0bc40c9068ef files/digest-pam_smb-2.0.0_rc6 253
-SHA256 85932ede42862076378e1f23cb1a205f05ebb3c79faabf313c4e300374d8184e files/digest-pam_smb-2.0.0_rc6 253
 MD5 3d0690f0ea8c1d25554a4d1bcdc44bda files/digest-pam_smb-2.0.0_rc6-r1 253
 RMD160 e49540036989f1de49b05f68e8ee0bc40c9068ef files/digest-pam_smb-2.0.0_rc6-r1 253
 SHA256 85932ede42862076378e1f23cb1a205f05ebb3c79faabf313c4e300374d8184e files/digest-pam_smb-2.0.0_rc6-r1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM4ogI1lqEGTUzyQRAiSvAKDDhjaNJ9YjzflDz6FjChVAbYTkNwCeJeKu
-FiYcKtn8JROUeyxywe5CMbE=
-=moY9
------END PGP SIGNATURE-----
diff --git a/sys-auth/pam_smb/files/digest-pam_smb-1.9.9-r1 b/sys-auth/pam_smb/files/digest-pam_smb-1.9.9-r1
deleted file mode 100644
index d059b7633f58..000000000000
--- a/sys-auth/pam_smb/files/digest-pam_smb-1.9.9-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 571ea74593c80a723331e207cbd09cb4 pam_smb-1.9.9.tar.gz 106341
-RMD160 93cd9bebea2d001117ca34bafc91278a919a9065 pam_smb-1.9.9.tar.gz 106341
-SHA256 63c5271c41e6648235b8c76c4fba4aabc3bc76e229ca4a18abdd50ebdaea028a pam_smb-1.9.9.tar.gz 106341
diff --git a/sys-auth/pam_smb/files/digest-pam_smb-1.9.9-r2 b/sys-auth/pam_smb/files/digest-pam_smb-1.9.9-r2
deleted file mode 100644
index d059b7633f58..000000000000
--- a/sys-auth/pam_smb/files/digest-pam_smb-1.9.9-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 571ea74593c80a723331e207cbd09cb4 pam_smb-1.9.9.tar.gz 106341
-RMD160 93cd9bebea2d001117ca34bafc91278a919a9065 pam_smb-1.9.9.tar.gz 106341
-SHA256 63c5271c41e6648235b8c76c4fba4aabc3bc76e229ca4a18abdd50ebdaea028a pam_smb-1.9.9.tar.gz 106341
diff --git a/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc5 b/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc5
deleted file mode 100644
index d357aed1b964..000000000000
--- a/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 48cd4986cdf2cc36f668fe177d932d9f pam_smb-2.0.0-rc5.tar.gz 114456
-RMD160 cc3a834cc8266dd544aeb038bd2836bd8c386903 pam_smb-2.0.0-rc5.tar.gz 114456
-SHA256 b7868772af29604847dcef2ca8e015b315e75a52ad3f193d0d68d1498097473a pam_smb-2.0.0-rc5.tar.gz 114456
diff --git a/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc5-r1 b/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc5-r1
deleted file mode 100644
index d357aed1b964..000000000000
--- a/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 48cd4986cdf2cc36f668fe177d932d9f pam_smb-2.0.0-rc5.tar.gz 114456
-RMD160 cc3a834cc8266dd544aeb038bd2836bd8c386903 pam_smb-2.0.0-rc5.tar.gz 114456
-SHA256 b7868772af29604847dcef2ca8e015b315e75a52ad3f193d0d68d1498097473a pam_smb-2.0.0-rc5.tar.gz 114456
diff --git a/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc6 b/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc6
deleted file mode 100644
index 7896d5862a1a..000000000000
--- a/sys-auth/pam_smb/files/digest-pam_smb-2.0.0_rc6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 69e5473d01169296412dca4238c49566 pam_smb-2.0.0-rc6.tar.gz 115069
-RMD160 7fa3c34d6d67fcf5d109cdf4a9508a7a16b6a737 pam_smb-2.0.0-rc6.tar.gz 115069
-SHA256 b787b11dade66b1078553fc0662843f3aa9f69629542ff5fd6802d62555295c5 pam_smb-2.0.0-rc6.tar.gz 115069
diff --git a/sys-auth/pam_smb/pam_smb-1.9.9-r1.ebuild b/sys-auth/pam_smb/pam_smb-1.9.9-r1.ebuild
deleted file mode 100644
index 03f4d4734a75..000000000000
--- a/sys-auth/pam_smb/pam_smb-1.9.9-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/pam_smb-1.9.9-r1.ebuild,v 1.2 2007/04/28 17:53:16 swegener Exp $
-
-DESCRIPTION="The PAM SMB module, which allows authentication against an NT server."
-HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
-
-S=${WORKDIR}/${PN}
-SRC_URI="mirror://samba/pam_smb/devel/${P}.tar.gz"
-
-DEPEND=">=sys-libs/pam-0.75"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-SLOT="0"
-
-src_compile() {
-	econf --disable-root-only || die
-	emake || die
-}
-
-src_install() {
-	exeinto /lib/security
-	doexe pamsmbm/pam_smb_auth.so
-	exeinto /usr/sbin
-	doexe pamsmbd/pamsmbd
-
-	dodoc BUGS CHANGES COPYING README TODO INSTALL \
-		faq/{pam_smb_faq.sgml,additions.txt}
-	docinto pam.d
-	dodoc pam_smb.conf*
-
-	newinitd ${FILESDIR}/pamsmbd-init pamsmbd
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You must create /etc/pam_smb.conf yourself, containing"
-	einfo "your domainname, PDC and BDC.  See example files in docdir."
-	einfo
-}
diff --git a/sys-auth/pam_smb/pam_smb-1.9.9-r2.ebuild b/sys-auth/pam_smb/pam_smb-1.9.9-r2.ebuild
deleted file mode 100644
index 4e16bdaaa620..000000000000
--- a/sys-auth/pam_smb/pam_smb-1.9.9-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/pam_smb-1.9.9-r2.ebuild,v 1.3 2007/04/28 17:53:16 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="The PAM SMB module, which allows authentication against an NT server."
-HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
-
-S=${WORKDIR}/${PN}
-SRC_URI="mirror://samba/pam_smb/devel/${P}.tar.gz"
-
-DEPEND=">=sys-libs/pam-0.75"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/10-pam_smb-bash-3.1.patch
-}
-
-src_compile() {
-	econf --disable-root-only || die
-	emake || die
-}
-
-src_install() {
-	exeinto /lib/security
-	doexe pamsmbm/pam_smb_auth.so
-	exeinto /usr/sbin
-	doexe pamsmbd/pamsmbd
-
-	dodoc BUGS CHANGES COPYING README TODO INSTALL \
-		faq/{pam_smb_faq.sgml,additions.txt}
-	docinto pam.d
-	dodoc pam_smb.conf*
-
-	newinitd ${FILESDIR}/pamsmbd-init pamsmbd
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You must create /etc/pam_smb.conf yourself, containing"
-	einfo "your domainname, PDC and BDC.  See example files in docdir."
-	einfo
-}
diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc5-r1.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc5-r1.ebuild
deleted file mode 100644
index e41ecc7caa9f..000000000000
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc5-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/pam_smb-2.0.0_rc5-r1.ebuild,v 1.2 2007/04/28 17:53:16 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="The PAM SMB module, which allows authentication against an NT server."
-HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
-
-MY_P=${P/_rc/-rc}
-
-S=${WORKDIR}/${MY_P}
-SRC_URI="mirror://samba/pam_smb/v2/${MY_P}.tar.gz
-	http://www.csn.ul.ie/~airlied/pam_smb/v2/pam_smb-2.0.0-rc5.tar.gz"
-
-DEPEND=">=sys-libs/pam-0.75"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE=""
-SLOT="0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/10-pam_smb-bash-3.1.patch
-}
-
-src_compile() {
-	econf --disable-root-only || die
-	emake || die
-}
-
-src_install() {
-	exeinto /lib/security
-	doexe pamsmbm/pam_smb_auth.so
-	exeinto /usr/sbin
-	doexe pamsmbd/pamsmbd
-
-	dodoc BUGS CHANGES COPYING README TODO INSTALL \
-		faq/{pam_smb_faq.sgml,additions.txt}
-	docinto pam.d
-	dodoc pam_smb.conf*
-
-	newinitd ${FILESDIR}/pamsmbd-init pamsmbd
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You must create /etc/pam_smb.conf yourself, containing"
-	einfo "your domainname, PDC and BDC.  See example files in docdir."
-	einfo
-}
diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc5.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc5.ebuild
deleted file mode 100644
index 34d08defb0af..000000000000
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/pam_smb-2.0.0_rc5.ebuild,v 1.2 2007/04/28 17:53:16 swegener Exp $
-
-DESCRIPTION="The PAM SMB module, which allows authentication against an NT server."
-HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
-
-MY_P=${P/_rc/-rc}
-
-S=${WORKDIR}/${MY_P}
-SRC_URI="mirror://samba/pam_smb/v2/${MY_P}.tar.gz
-	http://www.csn.ul.ie/~airlied/pam_smb/v2/pam_smb-2.0.0-rc5.tar.gz"
-
-DEPEND=">=sys-libs/pam-0.75"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE=""
-SLOT="0"
-
-src_compile() {
-	econf --disable-root-only || die
-	emake || die
-}
-
-src_install() {
-	exeinto /lib/security
-	doexe pamsmbm/pam_smb_auth.so
-	exeinto /usr/sbin
-	doexe pamsmbd/pamsmbd
-
-	dodoc BUGS CHANGES COPYING README TODO INSTALL \
-		faq/{pam_smb_faq.sgml,additions.txt}
-	docinto pam.d
-	dodoc pam_smb.conf*
-
-	newinitd ${FILESDIR}/pamsmbd-init pamsmbd
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You must create /etc/pam_smb.conf yourself, containing"
-	einfo "your domainname, PDC and BDC.  See example files in docdir."
-	einfo
-}
diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild
index c4984a8fe9b2..ba63db472e31 100644
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild
+++ b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild
@@ -1,52 +1,51 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild,v 1.3 2007/04/28 13:21:16 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r1.ebuild,v 1.4 2007/09/12 21:22:53 dev-zero Exp $
 
-inherit eutils
-
-DESCRIPTION="The PAM SMB module, which allows authentication against a SMB (such as the Win_x families) server."
-HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
+inherit eutils pam
 
 MY_P=${P/_rc/-rc}
 
-S=${WORKDIR}/${MY_P}
+DESCRIPTION="The PAM SMB module, allows authentication against a SMB (such as the Win_x families) server."
+HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
 SRC_URI="mirror://samba/pam_smb/v2/${MY_P}.tar.gz
 	http://www.csn.ul.ie/~airlied/pam_smb/v2/${MY_P}.tar.gz"
-
-DEPEND=">=sys-libs/pam-0.75"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
-SLOT="0"
+
+DEPEND=">=sys-libs/pam-0.75"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/10-pam_smb-bash-3.1.patch
+	epatch "${FILESDIR}/10-pam_smb-bash-3.1.patch"
 }
 
 src_compile() {
-	econf --disable-root-only || die
-	emake || die
+	econf --disable-root-only || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	exeinto /lib/security
-	doexe pamsmbm/pam_smb_auth.so
+	dopammod pamsmbm/pam_smb_auth.so
 	exeinto /usr/sbin
 	doexe pamsmbd/pamsmbd
 
-	dodoc BUGS CHANGES COPYING README TODO INSTALL \
-		faq/{pam_smb_faq.sgml,additions.txt}
+	dodoc BUGS CHANGES README TODO faq/{pam_smb_faq.sgml,additions.txt}
 	docinto pam.d
 	dodoc pam_smb.conf*
 
-	newinitd "${FILESDIR}"/pamsmbd-init pamsmbd
+	newinitd "${FILESDIR}/pamsmbd-init pamsmbd"
 }
 
 pkg_postinst() {
-	einfo
-	einfo "You must create /etc/pam_smb.conf yourself, containing"
-	einfo "your domainname, PDC and BDC.  See example files in docdir."
-	einfo
+	elog
+	elog "You must create /etc/pam_smb.conf yourself, containing"
+	elog "your domainname, PDC and BDC.  See example files in docdir."
+	elog
 }
diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc6.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc6.ebuild
deleted file mode 100644
index 452e5c1ccbb8..000000000000
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_smb/pam_smb-2.0.0_rc6.ebuild,v 1.2 2007/04/28 17:53:16 swegener Exp $
-
-DESCRIPTION="The PAM SMB module, which allows authentication against a SMB (such as the Win_x families) server."
-HOMEPAGE="http://www.csn.ul.ie/~airlied/pam_smb/"
-
-MY_P=${P/_rc/-rc}
-
-S=${WORKDIR}/${MY_P}
-SRC_URI="mirror://samba/pam_smb/v2/${MY_P}.tar.gz
-	http://www.csn.ul.ie/~airlied/pam_smb/v2/${MY_P}.tar.gz"
-
-DEPEND=">=sys-libs/pam-0.75"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-SLOT="0"
-
-src_compile() {
-	econf --disable-root-only || die
-	emake || die
-}
-
-src_install() {
-	exeinto /lib/security
-	doexe pamsmbm/pam_smb_auth.so
-	exeinto /usr/sbin
-	doexe pamsmbd/pamsmbd
-
-	dodoc BUGS CHANGES COPYING README TODO INSTALL \
-		faq/{pam_smb_faq.sgml,additions.txt}
-	docinto pam.d
-	dodoc pam_smb.conf*
-
-	newinitd ${FILESDIR}/pamsmbd-init pamsmbd
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You must create /etc/pam_smb.conf yourself, containing"
-	einfo "your domainname, PDC and BDC.  See example files in docdir."
-	einfo
-}