fix dependencies (#96937); use openssl as an alternative base64 encoder

Package-Manager: portage-2.0.51.19

6 files changed, 113 insertions, 5 deletions

diff --git a/net-dialup/ivam2/ChangeLog b/net-dialup/ivam2/ChangeLog
index 2b3d201b37e9..b4de66a8cd78 100644
--- a/net-dialup/ivam2/ChangeLog
+++ b/net-dialup/ivam2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ivam2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ivam2/ChangeLog,v 1.3 2005/06/26 08:45:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ivam2/ChangeLog,v 1.4 2005/07/03 09:41:20 mrness Exp $
+
+*ivam2-0.3-r1 (03 Jul 2005)
+
+  03 Jul 2005; Alin Nastac <mrness@gentoo.org>
+  +files/ivam2-0.3-base64-enc.patch, ivam2-0.3.ebuild, +ivam2-0.3-r1.ebuild:
+  Fix dependencies (#96937) and create a new revision in which
+  dev-libs/openssl is used as an alternative to net-mail/metamail.
 
   26 Jun 2005; Simon Stelling <blubb@gentoo.org> ivam2-0.3.ebuild:
   added ~amd64 keyword
diff --git a/net-dialup/ivam2/Manifest b/net-dialup/ivam2/Manifest
index f4a30ab6b412..97e91b53ae1a 100644
--- a/net-dialup/ivam2/Manifest
+++ b/net-dialup/ivam2/Manifest
@@ -1,5 +1,18 @@
-MD5 dc754f9db7d3787cb476b38756aa7029 ChangeLog 589
-MD5 08e7296ce53e39a3bc4bbd10fbddbc36 ivam2-0.3.ebuild 1167
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dfb7d49775a5f3fa6f6eea4b8fb2d776 ivam2-0.3.ebuild 1250
+MD5 f2aa4d808b2aa491b53e4411e63752d8 ivam2-0.3-r1.ebuild 1389
+MD5 a12eaf24ef2b294232613d9bc577ebf1 ChangeLog 874
 MD5 0f85f905010789f7ee35acae0307a6d6 metadata.xml 250
-MD5 13c574283b5f131701b415600ab68bcf files/digest-ivam2-0.3 61
+MD5 b46f8543d57f7bf5a12dec82418addf1 files/ivam2-0.3-base64-enc.patch 1032
 MD5 0b0524fa159ddb2bc40a3f8c6b795e41 files/ivam2.init 1021
+MD5 13c574283b5f131701b415600ab68bcf files/digest-ivam2-0.3-r1 61
+MD5 13c574283b5f131701b415600ab68bcf files/digest-ivam2-0.3 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCx7LUNSP4Vda7IdsRApODAJ9KE3EuvptwyiUpWGFpMqg/7QZk6ACeJIr/
+d2MV6NJpjnSSm593iWZij8s=
+=Bnou
+-----END PGP SIGNATURE-----
diff --git a/net-dialup/ivam2/files/digest-ivam2-0.3-r1 b/net-dialup/ivam2/files/digest-ivam2-0.3-r1
new file mode 100644
index 000000000000..4b934d402807
--- /dev/null
+++ b/net-dialup/ivam2/files/digest-ivam2-0.3-r1
@@ -0,0 +1 @@
+MD5 d41126fa711a6750068dbe017cac4149 ivam2-0.3.tar.gz 306202
diff --git a/net-dialup/ivam2/files/ivam2-0.3-base64-enc.patch b/net-dialup/ivam2/files/ivam2-0.3-base64-enc.patch
new file mode 100644
index 000000000000..bd2efac1e7af
--- /dev/null
+++ b/net-dialup/ivam2/files/ivam2-0.3-base64-enc.patch
@@ -0,0 +1,28 @@
+diff -Nru ivam2-0.3.orig/clients/ivam-newmessage ivam2-0.3/clients/ivam-newmessage
+--- ivam2-0.3.orig/clients/ivam-newmessage	2004-01-18 16:53:48.000000000 +0200
++++ ivam2-0.3/clients/ivam-newmessage	2005-07-03 12:26:37.000000000 +0300
+@@ -24,6 +24,15 @@
+     exit 1
+ fi
+ 
++if which mimencode &>/dev/null ; then
++	BASE64_ENCODE="mimencode"
++elif which openssl &>/dev/null ; then
++	BASE64_ENCODE="openssl base64 -e"
++else
++	echo "Cannot encode the new message: mimencode or openssl not found" > /dev/stderr
++	exit 1
++fi
++
+ EMAIL=root
+ [ -r "$SPOOLDIR/EMAIL" ] && EMAIL=$(cat "$SPOOLDIR/EMAIL")
+ 
+@@ -68,7 +77,7 @@
+ 
+ EOF
+ 
+-    zcat -f "$1" | sox -t raw -Ub -r8000 -c1 - -t raw -sw - | oggenc --quiet -q0 -r -C1 -B16 -R8000 -a "IVAM Voicebox" -t "Phone call from $CALLERMSN to $RINGMSN, $DATE" -o- - | mimencode
++    zcat -f "$1" | sox -t raw -Ub -r8000 -c1 - -t raw -sw - | oggenc --quiet -q0 -r -C1 -B16 -R8000 -a "IVAM Voicebox" -t "Phone call from $CALLERMSN to $RINGMSN, $DATE" -o- - | $BASE64_ENCODE
+ 
+ cat <<EOF
+ --${BOUND}--
diff --git a/net-dialup/ivam2/ivam2-0.3-r1.ebuild b/net-dialup/ivam2/ivam2-0.3-r1.ebuild
new file mode 100644
index 000000000000..cdaddd1b17b2
--- /dev/null
+++ b/net-dialup/ivam2/ivam2-0.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ivam2/ivam2-0.3-r1.ebuild,v 1.1 2005/07/03 09:41:20 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="Automatic phone answering machine software for ISDN"
+SRC_URI="http://0pointer.de/lennart/projects/ivam2/${P}.tar.gz"
+HOMEPAGE="http://0pointer.de/lennart/projects/ivam2/"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2"
+IUSE=""
+SLOT="0"
+
+DEPEND="virtual/libc
+	dev-libs/liboop
+	>=dev-libs/libdaemon-0.4
+	>=dev-lang/python-2.3
+	net-dialup/isdn4k-utils"
+RDEPEND="${DEPEND}
+	media-sound/sox
+	media-sound/vorbis-tools
+	|| ( net-mail/metamail dev-libs/openssl )" #needed for base64 encoding
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-base64-enc.patch
+}
+
+src_compile() {
+	local myconf="--disable-lynx --disable-xmltoman --disable-gengetopt"
+	econf $myconf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	keepdir /var/spool/ivam2
+	make install DESTDIR=${D} || die "make install failed"
+	dodoc doc/{README,README.VoiceBox,TODO}
+	dohtml doc/*.{html,css}
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/ivam2.init ivam2
+}
+
+pkg_preinst() {
+	enewgroup ivam || die "Problem adding ivam group"
+	enewuser ivam -1 /bin/false /dev/null ivam || die "Problem adding ivam user"
+}
+
+pkg_postinst() {
+	chown ivam:ivam /var/spool/ivam2
+}
diff --git a/net-dialup/ivam2/ivam2-0.3.ebuild b/net-dialup/ivam2/ivam2-0.3.ebuild
index 1b9872e0bc03..6f825acb4463 100644
--- a/net-dialup/ivam2/ivam2-0.3.ebuild
+++ b/net-dialup/ivam2/ivam2-0.3.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/ivam2/ivam2-0.3.ebuild,v 1.3 2005/06/26 08:45:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ivam2/ivam2-0.3.ebuild,v 1.4 2005/07/03 09:41:20 mrness Exp $
 
 inherit eutils
 
@@ -18,6 +18,10 @@ DEPEND="virtual/libc
 	>=dev-libs/libdaemon-0.4
 	>=dev-lang/python-2.3
 	net-dialup/isdn4k-utils"
+RDEPEND="${DEPEND}
+	media-sound/sox
+	media-sound/vorbis-tools
+	net-mail/metamail"
 
 src_compile() {
 	local myconf="--disable-lynx --disable-xmltoman --disable-gengetopt"