Fix bugs #104174 and #144243.

(Portage version: 2.1.1_pre5-r3)

4 files changed, 152 insertions, 1 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 6ca70c009e75..0811f30346d5 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.231 2006/08/02 09:42:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.232 2006/08/23 16:43:59 carlo Exp $
+
+*arts-3.5.4-r1 (23 Aug 2006)
+
+  23 Aug 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/arts-1.5.4-multilib.patch, +arts-3.5.4-r1.ebuild:
+  Fix bugs #104174 and #144243.
 
   02 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> arts-3.5.4.ebuild:
   Remove configure file to force regeneration of autotools, and fix quoting.
diff --git a/kde-base/arts/arts-3.5.4-r1.ebuild b/kde-base/arts/arts-3.5.4-r1.ebuild
new file mode 100644
index 000000000000..4ff33749185a
--- /dev/null
+++ b/kde-base/arts/arts-3.5.4-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.4-r1.ebuild,v 1.1 2006/08/23 16:43:59 carlo Exp $
+
+inherit kde flag-o-matic eutils versionator
+set-kdedir 3.5
+
+MY_PV="1.$(get_version_component_range 2-3)"
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RESTRICT="test"
+
+DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
+HOMEPAGE="http://multimedia.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
+#SRC_URI="mirror://kde/stable/3.5/src/${PN}-${MY_PV}.tar.bz2"
+LICENSE="GPL-2 LGPL-2"
+
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa esd artswrappersuid jack mp3 nas vorbis"
+
+RDEPEND="$(qt_min_version 3.3)
+	>=dev-libs/glib-2
+	alsa? ( media-libs/alsa-lib )
+	vorbis? ( media-libs/libogg
+			  media-libs/libvorbis )
+	esd? ( media-sound/esound )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
+	mp3? ( media-libs/libmad )
+	nas? ( media-libs/nas )
+	media-libs/audiofile"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
+	${FILESDIR}/arts-1.5.0-bindnow.patch
+	${FILESDIR}/arts-1.5.4-multilib.patch"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported
+	# before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers
+	local nosspflags
+
+	nosspflags="$(test-flags -fno-stack-protector -fno-stack-protector-all)"
+	sed -i -e "s:KDE_CXXFLAGS =\(.*\):KDE_CXXFLAGS = \1 ${nosspflags}:" \
+		"${S}/mcopidl/Makefile.am"
+
+	# Fix libao/gaim problems with aRTs. See bug #116290.
+	epatch "${FILESDIR}/arts-1.5.0-check_tmp_dir.patch"
+
+	rm -f "${S}/configure"
+}
+
+src_compile() {
+	myconf="$(use_enable alsa) $(use_enable vorbis)
+			$(use_enable mp3 libmad) $(use_with jack)
+			$(use_with esd) $(use_with nas)
+		--with-audiofile --without-mas"
+
+	#fix bug 13453
+	filter-flags -foptimize-sibling-calls
+
+	# breaks otherwise <gustavoz>
+	use sparc && export CFLAGS="-O1" && export CXXFLAGS="-O1"
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	# used for realtime priority, but off by default as it is a security hazard
+	use artswrappersuid && chmod u+s "${D}/${PREFIX}/bin/artswrapper"
+}
+
+pkg_postinst() {
+	if ! use artswrappersuid ; then
+		einfo "Run chmod u+s ${PREFIX}/bin/artswrapper to let artsd use realtime priority"
+		einfo "and so avoid possible skips in sound. However, on untrusted systems this"
+		einfo "creates the possibility of a DoS attack that'll use 100% cpu at realtime"
+		einfo "priority, and so is off by default. See bug #7883."
+		einfo "Or, you can set the local artswrappersuid USE flag to make the ebuild do this."
+	fi
+}
diff --git a/kde-base/arts/files/arts-1.5.4-multilib.patch b/kde-base/arts/files/arts-1.5.4-multilib.patch
new file mode 100644
index 000000000000..fca790ff973e
--- /dev/null
+++ b/kde-base/arts/files/arts-1.5.4-multilib.patch
@@ -0,0 +1,52 @@
+--- artsc/artsdsp.in.orig	2006-08-23 16:30:16.000000000 +0200
++++ artsc/artsdsp.in	2006-08-23 16:50:07.000000000 +0200
+@@ -94,6 +94,9 @@
+ binary=`which $1`
+ machine=`uname -m`
+ 
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++
+ set `file -L $binary`
+ 
+ case $2 in
+@@ -106,10 +109,16 @@
+ 
+ case $3 in
+     32-bit)
+-       arch_libdir=lib
++       artsd=`which artsd`
++       set `file -L $artsd`
++       if test "$3" == "32-bit"; then
++         libdir=${prefix}/lib
++       else
++         libdir=/emul/linux/x86/usr/lib
++       fi
+        ;;
+     64-bit)
+-       arch_libdir=lib64
++        libdir=${prefix}/lib64
+        ;;
+     *)
+        exit 1
+@@ -117,10 +126,6 @@
+ 
+ set $origargs
+ 
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=${prefix}/${arch_libdir}
+-
+ if test "$single_thread" = 1; then
+   LD_PRELOAD=${libdir}/libartsdsp_st.so.0
+ else
+@@ -129,6 +134,9 @@
+ if test -f ${libdir}/libdl.so.2; then
+   LD_PRELOAD=$LD_PRELOAD:${libdir}/libdl.so.2
+ fi
++if test -f ${libdir}/libaoss.so.0; then
++  LD_PRELOAD=$LD_PRELOAD:${libdir}/libaoss.so.0
++fi
+ export LD_PRELOAD
+ 
+ # invoke the program with the args given
diff --git a/kde-base/arts/files/digest-arts-3.5.4-r1 b/kde-base/arts/files/digest-arts-3.5.4-r1
new file mode 100644
index 000000000000..29e46054f64a
--- /dev/null
+++ b/kde-base/arts/files/digest-arts-3.5.4-r1
@@ -0,0 +1,3 @@
+MD5 886ba4a13dc0da312d94c09f50c3ffe6 arts-1.5.4.tar.bz2 967063
+RMD160 6f0b3649e22a65618494418de0d45726b61df10b arts-1.5.4.tar.bz2 967063
+SHA256 a5bdd1a9fd0cf6886b6e4dffb4d02f82ff60964fb2af276d86cd37b71a6cf74c arts-1.5.4.tar.bz2 967063