fix install_cert

Package-Manager: portage-2.1.4_rc9

4 files changed, 26 insertions, 32 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 81ec4b26be99..9b67b13c894d 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.110 2007/12/09 19:21:45 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.111 2007/12/09 19:35:19 dertobi123 Exp $
+
+  09 Dec 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  cyrus-imapd-2.3.9-r1.ebuild:
+  fix install_cert
 
 *cyrus-imapd-2.3.9-r1 (09 Dec 2007)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 775f846a23ae..acb47d19b2bf 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -73,14 +73,14 @@ EBUILD cyrus-imapd-2.2.13-r1.ebuild 9642 RMD160 28201df2ebc0f1aa29c48b9d41bfa0e7
 MD5 393661d3e80e76fc348edd2e0e22bb42 cyrus-imapd-2.2.13-r1.ebuild 9642
 RMD160 28201df2ebc0f1aa29c48b9d41bfa0e7382b48a4 cyrus-imapd-2.2.13-r1.ebuild 9642
 SHA256 52edc4b04f9088de111bab7eca070602ecb9d707bc9f01f5b04e4af0a18f3a03 cyrus-imapd-2.2.13-r1.ebuild 9642
-EBUILD cyrus-imapd-2.3.9-r1.ebuild 7992 RMD160 5597008c46ae7f176d65bae1d96597cbc54fd375 SHA1 b54ae446bd01b8d6e8de21b3c3a18f7a12ff3c01 SHA256 25ef76f86bd8b94ed073a90b98ae37f0d6ce5aa8834adb03f459288b5d1139c9
-MD5 ffd626616a38860f0d0a737c4d5b8295 cyrus-imapd-2.3.9-r1.ebuild 7992
-RMD160 5597008c46ae7f176d65bae1d96597cbc54fd375 cyrus-imapd-2.3.9-r1.ebuild 7992
-SHA256 25ef76f86bd8b94ed073a90b98ae37f0d6ce5aa8834adb03f459288b5d1139c9 cyrus-imapd-2.3.9-r1.ebuild 7992
-MISC ChangeLog 21820 RMD160 1808a2a9b1b556e7f4679b7e084d20d35ed9cc3f SHA1 d8b5bbe63d2d07b264e488a1358da9eb2cf64f98 SHA256 aed61dc701aa17b14193141b1975f216b8a3aa978440836eb3f7daecf88ddeb4
-MD5 8b9ccea27519ed07c59a21115d0c2f57 ChangeLog 21820
-RMD160 1808a2a9b1b556e7f4679b7e084d20d35ed9cc3f ChangeLog 21820
-SHA256 aed61dc701aa17b14193141b1975f216b8a3aa978440836eb3f7daecf88ddeb4 ChangeLog 21820
+EBUILD cyrus-imapd-2.3.9-r1.ebuild 8010 RMD160 6a4124b99bacb07aae78fce5418e59e21244cd4d SHA1 56f562f87bd0826d60417cb98ef53a65712542dc SHA256 367ef41451595fe47f5a7c2aaf755c27e661d72b0496af9189b4cda9f0496910
+MD5 a05e23357036ad8c5f28f33feebae7e3 cyrus-imapd-2.3.9-r1.ebuild 8010
+RMD160 6a4124b99bacb07aae78fce5418e59e21244cd4d cyrus-imapd-2.3.9-r1.ebuild 8010
+SHA256 367ef41451595fe47f5a7c2aaf755c27e661d72b0496af9189b4cda9f0496910 cyrus-imapd-2.3.9-r1.ebuild 8010
+MISC ChangeLog 21927 RMD160 7444b3fc6bc897472e78b62034ea1d1da547c579 SHA1 1e2a1d980c85844769f415a7d727ee4c7c36aaee SHA256 fe8398e9cdd5202dcc0c3f3fc37266d66d3faccd340fd3c0cf4544857befd638
+MD5 73d9ef07f4be2ab7dbc1da5f72758ba6 ChangeLog 21927
+RMD160 7444b3fc6bc897472e78b62034ea1d1da547c579 ChangeLog 21927
+SHA256 fe8398e9cdd5202dcc0c3f3fc37266d66d3faccd340fd3c0cf4544857befd638 ChangeLog 21927
 MISC metadata.xml 227 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 SHA1 82018ee8f0b71c0e29e01aa374a89275a46dde26 SHA256 d3c03c4962fef1e25acac4875ada3102e5122e3eb7292d83d9833df8ef581d5c
 MD5 a562a93428a4efa4b0b4c0943075e3ff metadata.xml 227
 RMD160 dea45630aba3c22da6ccfe5867e88797658a9e41 metadata.xml 227
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild
index 452c25edcb06..a416c74488d6 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-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-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild,v 1.1 2007/12/09 19:21:45 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.3.9-r1.ebuild,v 1.2 2007/12/09 19:35:19 dertobi123 Exp $
 
 inherit autotools eutils ssl-cert fixheadtails pam
 
@@ -220,10 +220,10 @@ src_install() {
 pkg_postinst() {
 	# do not install server.{key,pem) if they are exist.
 	use ssl && {
-		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
-			dodir "${ROOT}"/etc/ssl/cyrus
-			insinto "${ROOT}"etc/ssl/cyrus/
-			install_cert /etc/ssl/cyrus/server
+		if [ ! -f "${ROOT:-/}"etc/ssl/cyrus/server.key ]; then
+			dodir "${ROOT:-/}"etc/ssl/cyrus
+			insinto "${ROOT:-/}"etc/ssl/cyrus/
+			install_cert "${ROOT:-/}"etc/ssl/cyrus/server
 			chown cyrus:mail "${ROOT:-/}"etc/ssl/cyrus/server.{key,pem}
 	fi
 	}
diff --git a/net-mail/cyrus-imspd/Manifest b/net-mail/cyrus-imspd/Manifest
index 41d0f4e94da0..289b11697405 100644
--- a/net-mail/cyrus-imspd/Manifest
+++ b/net-mail/cyrus-imspd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX cyrus-imspd-1.8-gentoo.patch 4220 RMD160 7fc112653a96cbcaf0fdeb47923186ef01468388 SHA1 f26a013c7cb14d15ba7b533562f1b434cac40d43 SHA256 c5ad4e69c91da01ee17adf374bd11abe8ed7d4f34bb78c6c2270572e2e439f8f
 MD5 e98cef6cedfbfa85f5b7a199a1366a7b files/cyrus-imspd-1.8-gentoo.patch 4220
 RMD160 7fc112653a96cbcaf0fdeb47923186ef01468388 files/cyrus-imspd-1.8-gentoo.patch 4220
@@ -18,14 +15,14 @@ MD5 9cc4403d49faa5913f7cafe219e0ce41 files/stunnel.conf 220
 RMD160 3964a9ee3d8ed070814a7eeaff217155ab7f182b files/stunnel.conf 220
 SHA256 1051f85d65e78debd298c7db8109a5834538365222615fff7da4b5ef9618db04 files/stunnel.conf 220
 DIST cyrus-imspd-v1.8.tar.gz 650596 RMD160 c145cc0a0d8e1fe2950887f6ab0ac84ae9d9a4a4 SHA1 dc8d9de6dc5c9e2ae528c550e624606850b82a95 SHA256 ba1026dca5440b6a24a298cb9aa350321f9c6f921ba6404a74b9d546c02b70cd
-EBUILD cyrus-imspd-1.8.ebuild 1792 RMD160 34bf5f3382e579458c4685c1a5813c2db5ac4c56 SHA1 ff0c4fa3df6082b6b7739d5e3ea75fd93a28a959 SHA256 2b33fe7a2d0138981eb5433bdf5df9c5e46863e2569a2c16ac3121222997b418
-MD5 b24ab1d678f423c0f3a9724546ac89a7 cyrus-imspd-1.8.ebuild 1792
-RMD160 34bf5f3382e579458c4685c1a5813c2db5ac4c56 cyrus-imspd-1.8.ebuild 1792
-SHA256 2b33fe7a2d0138981eb5433bdf5df9c5e46863e2569a2c16ac3121222997b418 cyrus-imspd-1.8.ebuild 1792
-MISC ChangeLog 4154 RMD160 955a0fed0da4a9c8054659ce0ba44fe53bec78d6 SHA1 a9de14bee7f23144c63c6ffa14594e81a9b5ab19 SHA256 1ff64d52b9d83dcefd30aac506e69e61cc404722a58e3311c5904e3f120eb68d
-MD5 32957c28180f6d7f3283f51bfa5c5bb3 ChangeLog 4154
-RMD160 955a0fed0da4a9c8054659ce0ba44fe53bec78d6 ChangeLog 4154
-SHA256 1ff64d52b9d83dcefd30aac506e69e61cc404722a58e3311c5904e3f120eb68d ChangeLog 4154
+EBUILD cyrus-imspd-1.8.ebuild 1884 RMD160 2e32d770ced71ec844d1fbaf7c3ce0e8b2637ea5 SHA1 e1a48d0ed18d99e8180bcaf29d028374bd988fcb SHA256 c03e459232be7464654a127034ebf4fece9b1075e2ac7d33f378260a88a68013
+MD5 009791b1b545ee23ee5521fd50e139c5 cyrus-imspd-1.8.ebuild 1884
+RMD160 2e32d770ced71ec844d1fbaf7c3ce0e8b2637ea5 cyrus-imspd-1.8.ebuild 1884
+SHA256 c03e459232be7464654a127034ebf4fece9b1075e2ac7d33f378260a88a68013 cyrus-imspd-1.8.ebuild 1884
+MISC ChangeLog 4283 RMD160 ed1dde220133623c986807d9cb49db3f9aff5969 SHA1 5668ae1169fc21d36c85751849937da82747aaff SHA256 48e89a6da8adb77150a5d9fec6626891d2e0d468c434e38fdab2064ce81f1d0b
+MD5 311a831e07a4ef54f9e9391b52a127e3 ChangeLog 4283
+RMD160 ed1dde220133623c986807d9cb49db3f9aff5969 ChangeLog 4283
+SHA256 48e89a6da8adb77150a5d9fec6626891d2e0d468c434e38fdab2064ce81f1d0b ChangeLog 4283
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
@@ -33,10 +30,3 @@ SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata
 MD5 eda50d49ddfab2a8cbce76d9d57d86a9 files/digest-cyrus-imspd-1.8 250
 RMD160 014ac4c965a9901b0cfbcc7f96365c80b76c6d6b files/digest-cyrus-imspd-1.8 250
 SHA256 192b0bc6df4030f191543819f89d5b1c367934572f5a34d694696ff5f08600d4 files/digest-cyrus-imspd-1.8 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHBjgtNQqtfCuFneMRAnAeAKCco8S3Jhb4V2mz1Q3uLj6C6Wb82QCeIwtD
-1Emrs/oC4q33qqkKll+uNcY=
-=YI90
------END PGP SIGNATURE-----