New release.

Package-Manager: portage-2.1_rc3-r3

6 files changed, 228 insertions, 13 deletions

diff --git a/mail-client/ciphire-mail/ChangeLog b/mail-client/ciphire-mail/ChangeLog
index fc01bbecdc6e..8a750346b715 100644
--- a/mail-client/ciphire-mail/ChangeLog
+++ b/mail-client/ciphire-mail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/ciphire-mail
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/ciphire-mail/ChangeLog,v 1.10 2006/03/03 13:59:35 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/ciphire-mail/ChangeLog,v 1.11 2006/06/02 12:25:57 azarah Exp $
+
+*ciphire-mail-1.2.047 (02 Jun 2006)
+
+  02 Jun 2006; Martin Schlemmer <azarah@gentoo.org>
+  +ciphire-mail-1.2.047.ebuild:
+  New release.
 
   03 Mar 2006; Simon Stelling <blubb@gentoo.org> ciphire-mail-1.0.0.ebuild,
   ciphire-mail-1.1.009.ebuild, ciphire-mail-1.1.015.ebuild:
diff --git a/mail-client/ciphire-mail/Manifest b/mail-client/ciphire-mail/Manifest
index aa70a7dd50f0..47437684725d 100644
--- a/mail-client/ciphire-mail/Manifest
+++ b/mail-client/ciphire-mail/Manifest
@@ -1,24 +1,51 @@
-MD5 3a9334e22c4d8892181912900491ec5e ChangeLog 1833
-RMD160 0e3b1b70357bef8fd933b9793716a5719a83cdc4 ChangeLog 1833
-SHA256 e5c4d9f4463b8c87bf439a5166161fa86cdc4d103cdf3241d6956734813aa356 ChangeLog 1833
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST ciphire-mail-1.0.0-linux-i686.tar.gz 10278857
+DIST ciphire-mail-1.1.009-linux-i686.tar.gz 10583387
+DIST ciphire-mail-1.1.015-linux-i686.tar.gz 10583540 RMD160 6e4e251ca3d4f654016c189880759f3ad279b6cf SHA1 1455aa1ad8c7c36210a20f59b69351c15060dc30 SHA256 d29e055829b72aaa82633cecddc8e0295db969ccd4395c93a79d85742371aa4e
+DIST ciphire-mail-1.2.047-linux-i686.tar.gz 13137298 RMD160 138b36e00be4e74917a208a06b7e1318d89f8cfe SHA1 55b5e39e7327f70e884e4bf07928947c6e1c89f5 SHA256 17a2a87d711b129ed7336940d2f69cae643fdbb935a689c0dac2609bc80d921f
+DIST ciphire-redir64.so 24792 RMD160 4cbb8248f9dacfe8a9c919aca51ec05a880a5d98 SHA1 70342537b434008fb900297cd5fe5f4b310b0bb9 SHA256 abc0ab5737be5e52062ead2f13c78d505c38de4547635cec3e8af7cd6012b4cc
+EBUILD ciphire-mail-1.0.0.ebuild 3471 RMD160 f17b8887270ab307ed5dc7ebf65c0b14792e49a0 SHA1 f962d84f28305488ebafbab46eb428009a6e6a3c SHA256 236ca0352a2ae44508bee047907fb0d9b41811ab35b24251ebba203c35faf1d9
 MD5 2ab56c5f03551f4c86779364571b1fe7 ciphire-mail-1.0.0.ebuild 3471
 RMD160 f17b8887270ab307ed5dc7ebf65c0b14792e49a0 ciphire-mail-1.0.0.ebuild 3471
 SHA256 236ca0352a2ae44508bee047907fb0d9b41811ab35b24251ebba203c35faf1d9 ciphire-mail-1.0.0.ebuild 3471
+EBUILD ciphire-mail-1.1.009.ebuild 4356 RMD160 2ebda8f6c2a055901012d22747b13dd353859e60 SHA1 bd3fb53e0d25afd78eb1d5f06d1f079dfa255d6d SHA256 5ddafbabca39efc90a9db3401a25e2286e624dfc940d47096b77956f3a5a111a
 MD5 75a745531597418eb2a2693967d30842 ciphire-mail-1.1.009.ebuild 4356
 RMD160 2ebda8f6c2a055901012d22747b13dd353859e60 ciphire-mail-1.1.009.ebuild 4356
 SHA256 5ddafbabca39efc90a9db3401a25e2286e624dfc940d47096b77956f3a5a111a ciphire-mail-1.1.009.ebuild 4356
+EBUILD ciphire-mail-1.1.015.ebuild 4524 RMD160 3ed7771aa271c14a2dbddc72767a5fa26f6272a1 SHA1 16fa9365e387da58aa38bf253bfc81a932823f34 SHA256 8f050cb7fa5b9a13503b2903c194f0887d0a8b63c78dee9c6785bfba0dd8992d
 MD5 b1a4508961ba24226ee050ea47699058 ciphire-mail-1.1.015.ebuild 4524
 RMD160 3ed7771aa271c14a2dbddc72767a5fa26f6272a1 ciphire-mail-1.1.015.ebuild 4524
 SHA256 8f050cb7fa5b9a13503b2903c194f0887d0a8b63c78dee9c6785bfba0dd8992d ciphire-mail-1.1.015.ebuild 4524
-MD5 3ba822caed60cb1af266084b7298fe80 files/digest-ciphire-mail-1.0.0 83
-RMD160 48c1da557b72d8e9d2fcd1d6208400359f831783 files/digest-ciphire-mail-1.0.0 83
-SHA256 fc9f49631cf1d1b4565b465f0594db96cc2ec5731f7e6a737628ba37345b9d4e files/digest-ciphire-mail-1.0.0 83
-MD5 bc3695b7104bb878d3e496ad4f7d6e10 files/digest-ciphire-mail-1.1.009 147
-RMD160 f7f6f0aabce1094d924312ea08fc744cf1cf57a7 files/digest-ciphire-mail-1.1.009 147
-SHA256 69f1f93074577906a2e89ea9e963eb6d2acbf7e4fa84a1f4fa33ec7504430ae4 files/digest-ciphire-mail-1.1.009 147
-MD5 fe76f274577e0471d8abeeed5b301ac9 files/digest-ciphire-mail-1.1.015 147
-RMD160 ad699fe807c6e3f0b0be9eaef47367e065aa3ef5 files/digest-ciphire-mail-1.1.015 147
-SHA256 96403b799649fb059d44352b9438321e90da0dc0cb3e8e2a41f94581489be745 files/digest-ciphire-mail-1.1.015 147
+EBUILD ciphire-mail-1.2.047.ebuild 4525 RMD160 cdc84ad065ac26ab829d637ff20b1cba177da72f SHA1 762d6d89d80129c8663a1211f631815f21a8262a SHA256 281da4c0c8aa66d91f337fb90bf7d1cb2014c00c9f9842a50236337788861b24
+MD5 c2c5a5b360772af609788c6b44437b9b ciphire-mail-1.2.047.ebuild 4525
+RMD160 cdc84ad065ac26ab829d637ff20b1cba177da72f ciphire-mail-1.2.047.ebuild 4525
+SHA256 281da4c0c8aa66d91f337fb90bf7d1cb2014c00c9f9842a50236337788861b24 ciphire-mail-1.2.047.ebuild 4525
+MISC ChangeLog 1971 RMD160 fd35c5ee6e50be8e15d0092af859f097d8c18df7 SHA1 6f05959abc2df1fbf1d308c2e0b22d1469841168 SHA256 6720573da63fe37ef13d1f6433d380aeada05d008e58c986e63b90d9b25c91fc
+MD5 5aa141118434af3e9accf9bfd736f047 ChangeLog 1971
+RMD160 fd35c5ee6e50be8e15d0092af859f097d8c18df7 ChangeLog 1971
+SHA256 6720573da63fe37ef13d1f6433d380aeada05d008e58c986e63b90d9b25c91fc ChangeLog 1971
+MISC metadata.xml 223 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a SHA1 dc0e52cb5b43de4cfe293e3ad0c06d2ce1e5a83e SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0
 MD5 b612d343db3c54560665171eb7db245c metadata.xml 223
 RMD160 7af8dd320b92b8c61a58767f5221770cd236c63a metadata.xml 223
 SHA256 4b7a3ec9381367d73e7d7f56f27fcf2a703d7731c345cc88af4587743936e2f0 metadata.xml 223
+MD5 3ba822caed60cb1af266084b7298fe80 files/digest-ciphire-mail-1.0.0 83
+RMD160 48c1da557b72d8e9d2fcd1d6208400359f831783 files/digest-ciphire-mail-1.0.0 83
+SHA256 fc9f49631cf1d1b4565b465f0594db96cc2ec5731f7e6a737628ba37345b9d4e files/digest-ciphire-mail-1.0.0 83
+MD5 81f6e1016a45696cdea5dcd63b3a05fd files/digest-ciphire-mail-1.1.009 317
+RMD160 50cea538772eb8b2b453a498213f6c7e2dd90ec9 files/digest-ciphire-mail-1.1.009 317
+SHA256 2ca8fb6d16d5c44c551e669f470c4af91800bb75122b609493e29a71c2232f5c files/digest-ciphire-mail-1.1.009 317
+MD5 7722fc2f1a390985d4aebb2532ba5556 files/digest-ciphire-mail-1.1.015 533
+RMD160 c1852717b8db67323e423dabde022bff2ccc1f50 files/digest-ciphire-mail-1.1.015 533
+SHA256 f645b3faca49e2a1f8c9d3e16e029815cee8c82f0affcf20c53e0559e162e416 files/digest-ciphire-mail-1.1.015 533
+MD5 be668a7de08ba8b4d673c75fee18b23f files/digest-ciphire-mail-1.2.047 533
+RMD160 24de572f048447478896b0fc1dbb8aa29ebaee1e files/digest-ciphire-mail-1.2.047 533
+SHA256 01942277da7bce300e08f6f87d1e5b7190399fe9e3e68e4785c42245debffd22 files/digest-ciphire-mail-1.2.047 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEgC5D1ZcsMnZjRyIRAk48AKCJb5YHxtbqlivkTkGPRs6loUbg+ACfW3a9
+sRVtGZ5v7WIPzFny2+ecpiU=
+=HL7K
+-----END PGP SIGNATURE-----
diff --git a/mail-client/ciphire-mail/ciphire-mail-1.2.047.ebuild b/mail-client/ciphire-mail/ciphire-mail-1.2.047.ebuild
new file mode 100644
index 000000000000..9a734b7353eb
--- /dev/null
+++ b/mail-client/ciphire-mail/ciphire-mail-1.2.047.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/ciphire-mail/ciphire-mail-1.2.047.ebuild,v 1.1 2006/06/02 12:25:57 azarah Exp $
+
+inherit eutils qt3
+
+LOC="/opt/ciphire-mail"
+DESCRIPTION="Ciphire Mail is an email encryption tool, operating seamlessly in the background."
+HOMEPAGE="http://www.ciphire.com/"
+SRC_URI="${P}-linux-i686.tar.gz
+	amd64? ( ciphire-redir64.so )"
+LICENSE="Ciphire"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="nostrip fetch nomirror"
+IUSE="X gnome kde"
+
+DEPEND=
+RDEPEND="|| ( ( x11-libs/libSM
+				x11-libs/libXext )
+			virtual/x11 )
+	x86? ( $(qt_min_version 3.2) )
+	amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.1.1
+			 >=app-emulation/emul-linux-x86-xlibs-1.2
+			 >=app-emulation/emul-linux-x86-qtlibs-1.1 )"
+# We need X and QT regardless, as the USE=X is more just for the session
+# wrappers, etc.
+
+pkg_nofetch() {
+	einfo "You need to perform the following steps to install this package:"
+	einfo " - Go here:  https://www.ciphire.com/linux_download.html,"
+	einfo " - Download: ${P}-linux-i686.tar.gz"
+	einfo "   and place it in ${DISTDIR}"
+	echo
+	if useq amd64 ; then
+		ewarn " - Go here: https://forum.ciphire.com/viewtopic.php?p=4173:"
+		ewarn " - Download: ciphire-redir64.so"
+		ewarn "   and place it in ${DISTDIR}"
+		echo
+	fi
+	einfo " - emerge this package again"
+	echo
+}
+
+pkg_setup() {
+	if ( [[ -d /usr/local/ciphire ]] || type -p ciphire-ctl &>/dev/null ) && \
+	   ! portageq has_version / ciphire-mail ; then
+		echo
+		einfo "If you have previously had Ciphire Mail manually installed,"
+		einfo "please uninstall it first (from dir you installed it):"
+		echo
+		einfo "  # ./ciphire-uninstall system"
+		echo
+		einfo "and then remerge ciphire-mail."
+		echo
+		die "Old version of ciphire-mail installed"
+	fi
+
+	check_license Ciphire
+}
+
+src_unpack() {
+	unpack "${P}-linux-i686.tar.gz"
+
+	# Do not run 'more' to show the license - we already handle it with
+	# check_license() in pkg_setup() ...
+	sed -i -e 's:more\(.*\$LICENSE_FILE\):echo\1:' \
+		"${S}/files/setupdata/libciphire.sh"
+}
+
+src_install() {
+	local x=
+
+	dodir "${LOC}"
+	keepdir "${LOC}/updates" "${LOC}/user_default/updates"
+
+	# Do not enable the graphical popups
+	env -u DISPLAY \
+	./install-ciphire.sh "${D}${LOC}" <<-EOF
+		en
+		n
+		yes
+		y
+		n
+		n
+	EOF
+	[[ "$?" != 0 ]] && die "install-ciphire.sh failed"
+
+	# Revert the change in src_unpack()
+	dosed -e 's:echo\(.*\$LICENSE_FILE\):more\1:' \
+		"${LOC}"/setupdata/libciphire.sh
+
+	# Fixup $D in setupdata
+	for x in "${D}${LOC}"/setupdata/*; do
+		sed -i -e "s:${D}::g" "${x}"
+	done
+
+	if useq amd64 ; then
+		# Install 64bit ciphire-redir.so
+		exeinto "${LOC}"
+		doexe "${DISTDIR}"/ciphire-redir64.so
+		# Make sure the redirector gets used.
+		dosed -e \
+			'/PRELOAD_VALUE=/ s|\$CITARGET/ciphire-redir.so|\$CITARGET/ciphire-redir64.so:\$CITARGET/ciphire-redir.so|' \
+			"${LOC}"/ciphire-systemsetup
+		[[ -z $(grep 'ciphire-redir64.so' "${D}${LOC}/ciphire-systemsetup") ]] && \
+			die "Could not add 'ciphire-redir64.so'!"
+	fi
+
+	# Enable X support
+	useq X && dosed -e 's:^XSUPPORT=.*:XSUPPORT=1:' \
+		"${LOC}"/setupdata/ciphire.distconfig
+
+	cm_make_wrapper ciphire-setup ciphire-setup "${LOC}"
+	cm_make_wrapper ciphire-ctl ciphire-ctl "${LOC}"
+	cm_make_wrapper ciphire-msg ciphire-msg "${LOC}"
+
+	if useq X && ( useq gnome || useq kde ) ; then
+		make_desktop_entry ciphire-setup \
+			"Ciphire Mail User Setup" \
+			"${LOC}"/data/logo32.png \
+			"Network" \
+			"${LOC}"
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == "/" ]] ; then
+		useq X && env -u DISPLAY "${LOC}"/ciphire-systemsetup xreinstall \
+		      || env -u DISPLAY "${LOC}"/ciphire-systemsetup reinstall
+	fi
+
+	echo
+	einfo "To setup Ciphire Mail for a user, please run as that user:"
+	echo
+	einfo "  ${LOC}/ciphire-setup"
+	echo
+	einfo "If you have previously had Ciphire Mail manually installed,"
+	einfo "please uninstall it first (from dir you installed it):"
+	echo
+	einfo "  # ./ciphire-uninstall system"
+	echo
+	einfo "and then remerge ciphire-mail."
+	echo
+	if useq amd64 ; then
+		ewarn "Please note that the AMD64 support (ciphire-redir64.so) is"
+		ewarn "Beta, and not officially supported!"
+		echo
+		ebeep
+	fi
+}
+
+cm_make_wrapper() {
+	local wrapper=$1 bin=$2 dir=$3
+	local tmpwrapper=$(emktemp)
+
+	cat << EOF > "${tmpwrapper}"
+#!/bin/bash
+
+exec ${dir}/${bin} "\$@"
+EOF
+	chmod go+rx "${tmpwrapper}"
+	if [[ -n $5 ]] ; then
+		exeinto "${5}"
+		newexe "${tmpwrapper}" "${wrapper}"
+	else
+		newbin "${tmpwrapper}" "${wrapper}"
+	fi
+}
+
diff --git a/mail-client/ciphire-mail/files/digest-ciphire-mail-1.1.009 b/mail-client/ciphire-mail/files/digest-ciphire-mail-1.1.009
index af937b92c967..11e7f57334f5 100644
--- a/mail-client/ciphire-mail/files/digest-ciphire-mail-1.1.009
+++ b/mail-client/ciphire-mail/files/digest-ciphire-mail-1.1.009
@@ -1,2 +1,4 @@
 MD5 864e76da3b2d280086f2dbe31bf29069 ciphire-mail-1.1.009-linux-i686.tar.gz 10583387
 MD5 b46b5d2a785d82185230c0ab7bcc1e82 ciphire-redir64.so 24792
+RMD160 4cbb8248f9dacfe8a9c919aca51ec05a880a5d98 ciphire-redir64.so 24792
+SHA256 abc0ab5737be5e52062ead2f13c78d505c38de4547635cec3e8af7cd6012b4cc ciphire-redir64.so 24792
diff --git a/mail-client/ciphire-mail/files/digest-ciphire-mail-1.1.015 b/mail-client/ciphire-mail/files/digest-ciphire-mail-1.1.015
index a4f2e4c2729c..cd75d95c304c 100644
--- a/mail-client/ciphire-mail/files/digest-ciphire-mail-1.1.015
+++ b/mail-client/ciphire-mail/files/digest-ciphire-mail-1.1.015
@@ -1,2 +1,6 @@
 MD5 15c50a4ee96eabb54cc94eab7af47642 ciphire-mail-1.1.015-linux-i686.tar.gz 10583540
+RMD160 6e4e251ca3d4f654016c189880759f3ad279b6cf ciphire-mail-1.1.015-linux-i686.tar.gz 10583540
+SHA256 d29e055829b72aaa82633cecddc8e0295db969ccd4395c93a79d85742371aa4e ciphire-mail-1.1.015-linux-i686.tar.gz 10583540
 MD5 b46b5d2a785d82185230c0ab7bcc1e82 ciphire-redir64.so 24792
+RMD160 4cbb8248f9dacfe8a9c919aca51ec05a880a5d98 ciphire-redir64.so 24792
+SHA256 abc0ab5737be5e52062ead2f13c78d505c38de4547635cec3e8af7cd6012b4cc ciphire-redir64.so 24792
diff --git a/mail-client/ciphire-mail/files/digest-ciphire-mail-1.2.047 b/mail-client/ciphire-mail/files/digest-ciphire-mail-1.2.047
new file mode 100644
index 000000000000..f1919892695d
--- /dev/null
+++ b/mail-client/ciphire-mail/files/digest-ciphire-mail-1.2.047
@@ -0,0 +1,6 @@
+MD5 131ea6d941d5c4c318c264d3549d5697 ciphire-mail-1.2.047-linux-i686.tar.gz 13137298
+RMD160 138b36e00be4e74917a208a06b7e1318d89f8cfe ciphire-mail-1.2.047-linux-i686.tar.gz 13137298
+SHA256 17a2a87d711b129ed7336940d2f69cae643fdbb935a689c0dac2609bc80d921f ciphire-mail-1.2.047-linux-i686.tar.gz 13137298
+MD5 b46b5d2a785d82185230c0ab7bcc1e82 ciphire-redir64.so 24792
+RMD160 4cbb8248f9dacfe8a9c919aca51ec05a880a5d98 ciphire-redir64.so 24792
+SHA256 abc0ab5737be5e52062ead2f13c78d505c38de4547635cec3e8af7cd6012b4cc ciphire-redir64.so 24792