Drop dodir from dodir/*into combination.

Package-Manager: portage-2.1.2.5

4 files changed, 30 insertions, 18 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 3ba97be536cc..d7272f0f4280 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.68 2007/01/19 18:23:21 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.69 2007/04/28 16:45:06 swegener Exp $
+
+  28 Apr 2007; Sven Wegener <swegener@gentoo.org>
+  pure-ftpd-1.0.20-r1.ebuild, pure-ftpd-1.0.21-r1.ebuild:
+  Drop dodir from dodir/*into combination.
 
   19 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org>
   pure-ftpd-1.0.21-r1.ebuild:
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 5741946aad64..2022e4862e43 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ftpusers 177 RMD160 dea29606ea28414d714453bd9469b375c077badd SHA1 cb60c318c5a21e6dc79ca34470336bb5a390df03 SHA256 fb5ae1383661d9cfef2ace904e65255d725a4b7df07f2d399228758dd5601d26
 MD5 458b5d7567f55f4257ea1a6bfe3ff150 files/ftpusers 177
 RMD160 dea29606ea28414d714453bd9469b375c077badd files/ftpusers 177
@@ -20,18 +23,18 @@ RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 files/pure-ftpd.xinetd 247
 SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c files/pure-ftpd.xinetd 247
 DIST pure-ftpd-1.0.20.tar.bz2 470915 RMD160 194ea5c7cc4a1944da1e0bfe2b1f84cc2ba04c39 SHA1 fbda2b666ee0ebcbe93d0bf477af0bc74c3448c9 SHA256 6b3fd0b7eca88a9ac7f9aba57d75ca6b20d363309be68f600a5a154db7bc24e9
 DIST pure-ftpd-1.0.21.tar.bz2 476117 RMD160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 SHA1 1405ff2b9b9c3616c4e390eb99779884173a3347 SHA256 f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c
-EBUILD pure-ftpd-1.0.20-r1.ebuild 2802 RMD160 aa954debb058b8736110be80beb41548f05ef9bb SHA1 654d4eba4532002eb3825f049f137fd53f1c6ed2 SHA256 caabd5d2551ccdfecfeae8d4d004bfcd80bfed5bd3f0841e2b0ebba7e844d477
-MD5 2162c8517e4d46a18802ba88c985ac2a pure-ftpd-1.0.20-r1.ebuild 2802
-RMD160 aa954debb058b8736110be80beb41548f05ef9bb pure-ftpd-1.0.20-r1.ebuild 2802
-SHA256 caabd5d2551ccdfecfeae8d4d004bfcd80bfed5bd3f0841e2b0ebba7e844d477 pure-ftpd-1.0.20-r1.ebuild 2802
-EBUILD pure-ftpd-1.0.21-r1.ebuild 3468 RMD160 cbbb9c2e92bb9b9d05be48cc529e890aaf86e64f SHA1 ccae367fb7b68de31cac9a9d1c066120f267c944 SHA256 ca01b10b59b86020e8d7e980a730db52ecfd29dfaf4c21092024bca7e0a2aab3
-MD5 7aec4924f3d8e62a3c6c35ca372c12ff pure-ftpd-1.0.21-r1.ebuild 3468
-RMD160 cbbb9c2e92bb9b9d05be48cc529e890aaf86e64f pure-ftpd-1.0.21-r1.ebuild 3468
-SHA256 ca01b10b59b86020e8d7e980a730db52ecfd29dfaf4c21092024bca7e0a2aab3 pure-ftpd-1.0.21-r1.ebuild 3468
-MISC ChangeLog 10187 RMD160 4036c36b086997e6bca9bd61edd2b1ce61a04425 SHA1 62cb418c8c99ef3f88eb7a89f113a52e7e95e261 SHA256 03df5350ab4d98766d7436f5c9543e7d4da6ebb114d04be50fa4eca233dcc687
-MD5 c4953959ec4acc1ae35464c68e4e18b9 ChangeLog 10187
-RMD160 4036c36b086997e6bca9bd61edd2b1ce61a04425 ChangeLog 10187
-SHA256 03df5350ab4d98766d7436f5c9543e7d4da6ebb114d04be50fa4eca233dcc687 ChangeLog 10187
+EBUILD pure-ftpd-1.0.20-r1.ebuild 2777 RMD160 4574de6cd6b8059cd97384d1379dd300a44652fb SHA1 70be8ad316ca6d41d91b4a18c0d4ed6328fe2aff SHA256 9b6bc289418d407de235b814570665a6f9730a703c078237b00510b30c04bd3e
+MD5 a4427aef0cd2f4d6fe3e3604a8daa653 pure-ftpd-1.0.20-r1.ebuild 2777
+RMD160 4574de6cd6b8059cd97384d1379dd300a44652fb pure-ftpd-1.0.20-r1.ebuild 2777
+SHA256 9b6bc289418d407de235b814570665a6f9730a703c078237b00510b30c04bd3e pure-ftpd-1.0.20-r1.ebuild 2777
+EBUILD pure-ftpd-1.0.21-r1.ebuild 3442 RMD160 bd86549b2041d78efa89cc6c74a4bcb62d33a540 SHA1 a11bac5f897460f82bc733150e11e8cf0ab6b728 SHA256 6b09188c1db2af77301e936b44fe8d8108b4690c9dc6c1d7326f7abb3d76fe1b
+MD5 efb0eb7b1e4c812a20c85c8d63a098b8 pure-ftpd-1.0.21-r1.ebuild 3442
+RMD160 bd86549b2041d78efa89cc6c74a4bcb62d33a540 pure-ftpd-1.0.21-r1.ebuild 3442
+SHA256 6b09188c1db2af77301e936b44fe8d8108b4690c9dc6c1d7326f7abb3d76fe1b pure-ftpd-1.0.21-r1.ebuild 3442
+MISC ChangeLog 10342 RMD160 9153fb3206807552684665152d9585cb641d277c SHA1 8bf107d180c9b9bdadbaddbce2832c42301e8523 SHA256 408f7a8ae1ae8b5d9c1dc358d0e2c4046b50b829cb0ee1f636692ce2cf038e46
+MD5 f288c80cdcde519778babc29b0174ed8 ChangeLog 10342
+RMD160 9153fb3206807552684665152d9585cb641d277c ChangeLog 10342
+SHA256 408f7a8ae1ae8b5d9c1dc358d0e2c4046b50b829cb0ee1f636692ce2cf038e46 ChangeLog 10342
 MISC metadata.xml 422 RMD160 bcc9ffbfe03026d80b45a08dfdbaeae39a6b9d7c SHA1 26b0cc19adb6391be501abe732c76132bee7e760 SHA256 97c202a439f9bfeb61a0bdea5acc519762b3246693eb26ddbc41133658e17f6a
 MD5 a5206ebade34b233054beb386042f1d4 metadata.xml 422
 RMD160 bcc9ffbfe03026d80b45a08dfdbaeae39a6b9d7c metadata.xml 422
@@ -42,3 +45,10 @@ SHA256 304f4214d26feb43794d8b0502055721142073cec7b81da2f7a2e0eabbb22568 files/di
 MD5 ae89b1b322a519efee148d4b74e0aa6f files/digest-pure-ftpd-1.0.21-r1 253
 RMD160 e310c21d2ff6e5cdf04497507034ad13496d2e22 files/digest-pure-ftpd-1.0.21-r1 253
 SHA256 8c51d3765557768898da80ab1d4497bb95430c700a76640fe21ce0e89d2cfd1f files/digest-pure-ftpd-1.0.21-r1 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGM3omI1lqEGTUzyQRAouPAKDPhHJCKe/PV56UdsRPVjWlIr+ekwCgt+fU
+zMWRZHKXaZJU6SROlw5G3NE=
+=dxHE
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
index 50ef84bf5e95..8067bf1600c6 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild,v 1.13 2006/11/23 16:46:22 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild,v 1.14 2007/04/28 16:45:06 swegener Exp $
 
 inherit eutils confutils
 
@@ -80,7 +80,6 @@ src_install() {
 	newinitd "${FILESDIR}/pure-ftpd.rc6" pure-ftpd
 
 	if use ldap ; then
-		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		doins pureftpd.schema
 		insinto /etc/openldap
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild
index 76b0b25358ea..c1044227abfd 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild,v 1.10 2007/01/19 18:23:21 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.21-r1.ebuild,v 1.11 2007/04/28 16:45:06 swegener Exp $
 
 inherit eutils confutils
 
@@ -95,7 +95,6 @@ src_install() {
 	fi
 
 	if use ldap ; then
-		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		doins pureftpd.schema
 		insinto /etc/openldap