Fix from friendly administrator, use -2 instead of -w in SOX parameters wrt #250320.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 119 insertions, 13 deletions

diff --git a/net-dialup/capisuite/ChangeLog b/net-dialup/capisuite/ChangeLog
index 516cfdb97a7e..77fce6448100 100644
--- a/net-dialup/capisuite/ChangeLog
+++ b/net-dialup/capisuite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/capisuite
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.34 2009/02/14 23:27:19 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/ChangeLog,v 1.35 2009/05/12 18:01:29 ssuominen Exp $
+
+*capisuite-0.4.5-r6 (12 May 2009)
+
+  12 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +capisuite-0.4.5-r6.ebuild, +files/capisuite-0.4.5-sox.patch:
+  Fix from friendly administrator, use -2 instead of -w in SOX parameters
+  wrt #250320.
 
   14 Feb 2009; Markus Meier <maekke@gentoo.org> capisuite-0.4.5-r5.ebuild:
   amd64/x86 stable, bug #245571
diff --git a/net-dialup/capisuite/Manifest b/net-dialup/capisuite/Manifest
index 54a8d7d71a11..4e60961d4282 100644
--- a/net-dialup/capisuite/Manifest
+++ b/net-dialup/capisuite/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX capisuite-0.4.5-as-needed.patch 761 RMD160 af5d008fa6a8780b3211439640de71795f3a47e7 SHA1 68a314a3126507c80513e7812c7f4c5f455cd47e SHA256 53751ba6c6a2cbc99b250ba2e089642c73d2f6235babcee05f43cdc36eaf8001
 AUX capisuite-0.4.5-capi4linux_v3.diff 4395 RMD160 fe35892044e30b3ddc8c9259e2afccb8d567c334 SHA1 8a8be7685c2b508e0d002b68c57ea1b8400b2f81 SHA256 69d1e2ea6668bb237b0b4bbfb4058ebb9c53b4c3b4e676c7ce1cb422031b1693
 AUX capisuite-0.4.5-date-header.patch 821 RMD160 3478796dcfa1e18be480a0fd595bccbe7359e748 SHA1 f484e07bed321ad88eb0191db4e283f3af655fca SHA256 36d7388c9fb3700718cf2df6124d9343a0494c1b802570afa7cc95a44264cc18
 AUX capisuite-0.4.5-gcc43.patch 656 RMD160 cdcb12694b74ffe4dfcba5b1f5ee7922c6638cbf SHA1 5b4ab9517670b226ffc58c4dff05993e6e2d9dad SHA256 a177c318ea08d199129f39f5fb1236cfb51d2186374451d52c58b5fdd0f20764
 AUX capisuite-0.4.5-python25.patch 2146 RMD160 57c7befe06546f9a020b39a5a3863377b11168df SHA1 fb067b217ddf4eb6d62c8d66346e961819ed6117 SHA256 54c219bff3e358117b869c59b22502f463854745c55492929c3ea16dade43680
+AUX capisuite-0.4.5-sox.patch 859 RMD160 12554758b530a53dacb84ba201644bf3bfc3be7e SHA1 32a1febb82281803f17939ccede40f82e6a43241 SHA256 36b1e5e6b3dbe8a575a2ffd9e24f284d4a3ac458e6e4d1986bd843a7b1dd3522
 AUX capisuite-0.4.5-syntax.patch 6589 RMD160 c55076a42b73a6237a1c933405f2340871cbdc78 SHA1 fcfc38c10f2483c547c3ee7ddf3c9629a2211ab1 SHA256 a8d9a678051c155769edfd6d3d6bebf6d6ea282d04738c949aeb4fe83536c04c
 AUX capisuite-fax-compatibility.patch 423 RMD160 a09d1b952166318a97115c752db1a2bc95c4829e SHA1 5ab1c7eda924b8e133e8123fc2fa3f280d87ba71 SHA256 a64a3cb28aea777f19a84027fda3594cc4e632ebeab4f8f6c448ab386dfb105a
 AUX capisuite.initd 1417 RMD160 980820221421d8e8a1f417344dd891c5204a8be8 SHA1 22460b69f59c36ca3ec6ee4519f812170a38113a SHA256 35ad8798dd863cc5f6f2d9c429274a19b04dcab1f96b26c02f8e00f268f5df58
@@ -13,12 +11,6 @@ AUX capisuite.logrotated 1003 RMD160 9ededfb533e51659da71f052b921c01901425ec6 SH
 DIST capisuite-0.4.5.tar.gz 1184603 RMD160 f28b9cb42a6cfa6d790ec76e74a33a0b7a799762 SHA1 c0a8b19a23df1272f56fd6692ee7e758013ab5d2 SHA256 3e94e42eae6477a222c608c2cd040568fd9fcfa4e8eb0b06a538175d44cbae96
 EBUILD capisuite-0.4.5-r4.ebuild 2325 RMD160 c643a795de24704e3aea4cedc637b6dd925303d0 SHA1 48b94af999dc0704391731223ec8cde59a085b63 SHA256 b14f9ec0c2df462693564036ab88f7a287b4402c5a532022bb77c21e8103a836
 EBUILD capisuite-0.4.5-r5.ebuild 2289 RMD160 fe6696e16e1e997aacfdc7cbab4252fcab5d90e7 SHA1 e665c52dce2ec08d07cc32442b58802df4ae45da SHA256 c4e370de587593f6c7cfbaf784591ce55824a04732903e463d138d925a0a2c17
-MISC ChangeLog 6057 RMD160 51ce0845b2073f2f8a8ab73e8e988b3fbfdb1e36 SHA1 0781205f7bfaa4fd37c557f1bca0918bba9ceb33 SHA256 cd7f68f93a11c1306bf17151753cb9f10ad490c20614eb298a20ca6347aca582
+EBUILD capisuite-0.4.5-r6.ebuild 2331 RMD160 cd6b34d9a9b3382b3d32ccc6fc731c81551fdb57 SHA1 21637bbee749bbc379b7354f97411a932c9d7e25 SHA256 e33fcd584171789c433faef2e0132e0e32ba6e9b4007499f2b265e82f8144bcd
+MISC ChangeLog 6303 RMD160 c84ec01cb8fb9effe713ddbbdbfb24f695141d41 SHA1 552fc73510c5c7747fb620ef07ca559931f0c441 SHA256 16467dc7cb7b1e4ec5888f17bfaddb8a1a70935e63ec906f8dde2ea7807d5d48
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmXU5QACgkQkKaRLQcq0GI6tgCfZXBt3Dc5xbLv1AH6Rfc8vvj6
-LssAnja8G8SCTduihLUrcokewnjD7ZkM
-=shMI
------END PGP SIGNATURE-----
diff --git a/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild b/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild
new file mode 100644
index 000000000000..e34a05c9c48a
--- /dev/null
+++ b/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/capisuite/capisuite-0.4.5-r6.ebuild,v 1.1 2009/05/12 18:01:29 ssuominen Exp $
+
+inherit eutils autotools flag-o-matic multilib python
+
+DESCRIPTION="ISDN telecommunication suite providing fax and voice services"
+HOMEPAGE="http://www.capisuite.de"
+SRC_URI="http://www.capisuite.de/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="virtual/python
+	media-sound/sox
+	>=media-libs/tiff-3.7.1
+	media-gfx/jpeg2ps
+	media-gfx/sfftobmp
+	virtual/ghostscript
+	net-dialup/capi4k-utils"
+RDEPEND="${DEPEND}
+	virtual/mta"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# taken from capisuite-0.4.5-5.src.rpm (SuSE-9.3)
+	epatch "${FILESDIR}/${P}-capi4linux_v3.diff"
+
+	# patched scripts/cs_helpers.pyin (bug #96540)
+	epatch "${FILESDIR}/${P}-date-header.patch"
+
+	# patched src/backend/connection.cpp (bug #69522)
+	epatch "${FILESDIR}/${PN}-fax-compatibility.patch"
+
+	# patched scripts/{incoming,idle}.py (bug #147854)
+	epatch "${FILESDIR}/${P}-syntax.patch"
+
+	# GCC 4.3 patches (bug #236777)
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
+	# Python 2.5 patches (bug #232734)
+	epatch "${FILESDIR}/${P}-python25.patch"
+
+	# Compability with current SOX (bug #250320)
+	epatch "${FILESDIR}/${P}-sox.patch"
+
+	# run autotools
+	eautoreconf
+}
+
+src_compile() {
+	strip-flags  # see bug #90901
+
+	econf --localstatedir=/var \
+		--with-docdir="/usr/share/doc/${PF}" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed."
+
+	rm -f "${D}"/usr/{lib,share}/capisuite/README
+	rmdir -p --ignore-fail-on-non-empty "${D}/var/log"
+	rm -f "${D}/usr/share/doc/${PF}"/{COPYING,manual.pdf}
+	keepdir /var/spool/capisuite/{done,failed,sendq,users}
+
+	dodir /etc/init.d
+	newinitd "${FILESDIR}/capisuite.initd" capisuite
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/capisuite.logrotated" capisuite
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	exeinto /etc/cron.daily
+	doexe capisuite.cron
+
+	insinto /etc/capisuite
+	doins cronjob.conf
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/cs_helpers.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/net-dialup/capisuite/files/capisuite-0.4.5-sox.patch b/net-dialup/capisuite/files/capisuite-0.4.5-sox.patch
new file mode 100644
index 000000000000..ef58325ff6e9
--- /dev/null
+++ b/net-dialup/capisuite/files/capisuite-0.4.5-sox.patch
@@ -0,0 +1,12 @@
+diff -ur capisuite-0.4.5.orig/scripts/cs_helpers.pyin capisuite-0.4.5/scripts/cs_helpers.pyin
+--- capisuite-0.4.5.orig/scripts/cs_helpers.pyin	2004-11-28 15:35:23.000000000 +0200
++++ capisuite-0.4.5/scripts/cs_helpers.pyin	2009-05-12 20:58:34.000000000 +0300
+@@ -227,7 +227,7 @@
+ 		elif (mail_type=="la"): # voice file
+ 			# la -> wav
+ 			# don't use stdout as sox needs a file to be able to seek in it otherwise the header will be incomplete
+-			ret = os.spawnlp(os.P_WAIT,"sox","sox",attachment,"-w",basename+"wav")
++			ret = os.spawnlp(os.P_WAIT,"sox","sox",attachment,"-2",basename+"wav")
+ 			if (ret or not os.access(basename+"wav",os.R_OK)):
+ 				raise "conv-error","Error while calling sox. Not installed?"
+ 			filepart = email.MIMEAudio.MIMEAudio(open(basename+"wav").read(),"x-wav",email.Encoders.encode_base64,name=os.path.basename(basename)+"wav")