modify vboxmail script to search for a quoted-printable encoder

Package-Manager: portage-2.0.51.19

4 files changed, 48 insertions, 19 deletions

diff --git a/net-dialup/raccess4vbox3/ChangeLog b/net-dialup/raccess4vbox3/ChangeLog
index 33d35c0eac1a..79b8eb8bddd3 100644
--- a/net-dialup/raccess4vbox3/ChangeLog
+++ b/net-dialup/raccess4vbox3/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for net-dialup/raccess4vbox3
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/raccess4vbox3/ChangeLog,v 1.3 2005/05/15 11:18:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/raccess4vbox3/ChangeLog,v 1.4 2005/05/15 11:52:23 mrness Exp $
 
 *raccess4vbox3-0.2.8-r1 (15 May 2005)
 
   15 May 2005; Alin Nastac <mrness@gentoo.org>
-  +raccess4vbox3-0.2.8-r1.ebuild:
+  +files/raccess4vbox3-0.2.8-qp-encode.patch, raccess4vbox3-0.2.8-r1.ebuild:
   Fix dependencies by adding Quoted-Printable encoders to DEPEND (#92530).
 
   12 Feb 2005; Alin Nastac <mrness@gentoo.org> raccess4vbox3-0.2.8.ebuild:
diff --git a/net-dialup/raccess4vbox3/Manifest b/net-dialup/raccess4vbox3/Manifest
index 28f553e21a90..f2ff7681e805 100644
--- a/net-dialup/raccess4vbox3/Manifest
+++ b/net-dialup/raccess4vbox3/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7c333ea62e4ecbaf5f4e5b7cc9892de9 raccess4vbox3-0.2.8-r1.ebuild 1020
+MD5 e5f787d65ec37633118f41a05f52b350 raccess4vbox3-0.2.8-r1.ebuild 836
 MD5 be64169f58d86affe9f15381cc1db62a raccess4vbox3-0.2.8.ebuild 680
-MD5 8d61b7415372610a7a6ed733f74ba185 ChangeLog 722
+MD5 30287e34d0d7091083c98cbe03052f98 ChangeLog 765
 MD5 1ba7533de5c4878b503abb6fb0c93715 metadata.xml 246
 MD5 6aba85ee20deedd07b3142b6d1dae328 files/digest-raccess4vbox3-0.2.8-r1 71
 MD5 6aba85ee20deedd07b3142b6d1dae328 files/digest-raccess4vbox3-0.2.8 71
+MD5 8c363ffdcfba0361f72d46c05b732ec2 files/raccess4vbox3-0.2.8-qp-encode.patch 854
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFChzAujiC39V7gKu0RAqWNAKCEMDt+ef1hcoF4tdY0WQEFc9InHACgp7Cm
-CLccixQ6kH6gwuFitFaS/tU=
-=8g1F
+iD8DBQFChzgNjiC39V7gKu0RApM6AJoC9r0KwnQoV5FsyFbtjjrx9i+JxACgmAyH
+J1o+wotaVNCfSbTAhoCBbzU=
+=xdaZ
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/raccess4vbox3/files/raccess4vbox3-0.2.8-qp-encode.patch b/net-dialup/raccess4vbox3/files/raccess4vbox3-0.2.8-qp-encode.patch
new file mode 100644
index 000000000000..e2682c234656
--- /dev/null
+++ b/net-dialup/raccess4vbox3/files/raccess4vbox3-0.2.8-qp-encode.patch
@@ -0,0 +1,31 @@
+diff -Nru raccess4vbox3-0.2.8.orig/bin/vboxmail raccess4vbox3-0.2.8/bin/vboxmail
+--- raccess4vbox3-0.2.8.orig/bin/vboxmail	2005-05-15 14:13:19.000000000 +0300
++++ raccess4vbox3-0.2.8/bin/vboxmail	2005-05-15 14:42:53.088410880 +0300
+@@ -6,6 +6,18 @@
+ USER=$4
+ 
+ BOUND="$$-`date +%s`-vboxmail"
++if which qp-encode &>/dev/null ; then
++	QP_ENCODE="qp-encode"
++elif which mimencode &>/dev/null ; then
++	QP_ENCODE="mimencode -q"
++elif which recode &>/dev/null ; then
++	QP_ENCODE="recode ../qp"
++elif which qprint &>/dev/null ; then
++	QP_ENCODE="qprint -e"
++else
++	echo cannot find a quoted-printable encoder
++	return 1
++fi
+ 
+ /usr/sbin/sendmail -oi -t <<EOT
+ To: $USER
+@@ -33,7 +45,7 @@
+ Content-Disposition: attachment; filename="`basename $FILE`"
+ Content-Transfer-Encoding: quoted-printable
+ 
+-`qp-encode < $FILE`
++`$QP_ENCODE < $FILE`
+ --${BOUND}--
+ 
+ EOT
diff --git a/net-dialup/raccess4vbox3/raccess4vbox3-0.2.8-r1.ebuild b/net-dialup/raccess4vbox3/raccess4vbox3-0.2.8-r1.ebuild
index cdf8f53dd41b..e99d4226fe27 100644
--- a/net-dialup/raccess4vbox3/raccess4vbox3-0.2.8-r1.ebuild
+++ b/net-dialup/raccess4vbox3/raccess4vbox3-0.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/raccess4vbox3/raccess4vbox3-0.2.8-r1.ebuild,v 1.1 2005/05/15 11:18:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/raccess4vbox3/raccess4vbox3-0.2.8-r1.ebuild,v 1.2 2005/05/15 11:52:23 mrness Exp $
 
 inherit eutils
 
@@ -13,20 +13,17 @@ LICENSE="GPL-2"
 IUSE=""
 SLOT="0"
 
-DEPEND="|| ( net-mail/qprint net-mail/metamail app-text/recode )
+DEPEND="|| ( net-mail/qprint net-mail/metamail app-text/recode app-emacs/vm )
 	net-dialup/vbox3"
 
-src_compile() {
-	#set the Quoted-Printable transformation (#92530)
-	if has_version net-mail/qprint ; then
-		QP_ENCODE="qprint -e"
-	elif has_version net-mail/metamail ; then
-		QP_ENCODE="mimencode -q"
-	else
-		QP_ENCODE="recode ../qp"
-	fi
-	sed -i -e "s:qp-encode:${QP_ENCODE}:" ${S}/bin/vboxmail
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-qp-encode.patch
+}
 
+src_compile() {
 	emake || die "emake failed"
 }