More qt fixes

7 files changed, 7 insertions, 159 deletions

diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index 04686d1cf506..02f37a3581d2 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,18 +1,14 @@
 MD5 28a643d6bb6a22518803e2bc7229794f arts-1.0.4-r1.ebuild 1040
-MD5 aa34526bbb65b5e284d92b674d35e5f0 arts-1.1.1.ebuild 1871
-MD5 6a6c45bdbbc95118032c31644c63f2ef arts-1.1.3.ebuild 2936
 MD5 607f672ecc731b167ca9f2a98646fea9 arts-1.2.0_beta1-r1.ebuild 2790
 MD5 e419d02f1b1d63659351f826d353442b arts-1.0.5b.ebuild 1439
 MD5 fbaf43a8376702c18d2975d9064d8dbd arts-1.1.2.ebuild 2741
-MD5 ea07433f20d10ffcbc342ca100c768c3 arts-1.2.0_beta2.ebuild 2826
+MD5 e5ede067284fb12fcbef1508df724e7f arts-1.2.0_beta2.ebuild 2833
 MD5 84e7f3bac423a53ca09cd5a130897670 arts-1.1.2-r1.ebuild 2718
 MD5 72029c57fb12afd4f956573a0dcb5f65 ChangeLog 9618
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 11f66268354452f1416e0f34dc384dd3 arts-1.1.4.ebuild 3023
+MD5 a17deb531f0cde2e580cccb4e303a736 arts-1.1.4.ebuild 3030
 MD5 9ffc978b18c6e1ad49a0c7eec49074f6 files/optional-deps.diff 3154
-MD5 0618185a5569820b71b70e635ac9cd2a files/digest-arts-1.1.1 63
 MD5 8a2eb6e84c39661304e7c3c395ecb5b5 files/digest-arts-1.1.2 63
-MD5 a501dd1ce9294fceb81a87c056db568f files/digest-arts-1.1.3 63
 MD5 be627646b998d386b73ecb0f03922ead files/digest-arts-1.1.4 63
 MD5 783f52e41abb732466bec517c6ff1ae1 files/digest-arts-1.0.5b 200
 MD5 9eb075bd57fb70c3cafa5cd05d36640b files/arts-1.1.4-alsafix.diff 1543
diff --git a/kde-base/arts/arts-1.1.1.ebuild b/kde-base/arts/arts-1.1.1.ebuild
deleted file mode 100644
index e66d00ac1190..000000000000
--- a/kde-base/arts/arts-1.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.1.1.ebuild,v 1.4 2003/06/30 11:25:38 brad Exp $
-inherit kde-base flag-o-matic
-
-# this is the arts 1.1 from kde 3.1, as opposed to arts 1.1.0 from kde 3.1 beta2 and friends
-
-IUSE="alsa"
-SRC_URI="mirror://kde/stable/3.1.1/src/${P}.tar.bz2"
-KEYWORDS="x86 ppc sparc ~alpha"
-HOMEPAGE="http://multimedia.kde.org"
-DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
-set-kdedir 3.1
-need-qt 3.1.0
-
-if [ "${COMPILER}" == "gcc3" ]; then
-	# GCC 3.1 kinda makes arts buggy and prone to crashes when compiled with 
-	# these.. Even starting a compile shuts down the arts server
-	filter-flags "-fomit-frame-pointer -fstrength-reduce"
-fi
-
-#fix bug 13453
-filter-flags "-foptimize-sibling-calls"
-
-SLOT="3.1"
-LICENSE="GPL-2 LGPL-2"
-
-use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
-
-src_unpack() {
-	kde_src_unpack
-	kde_sandbox_patch ${S}/soundserver
-}
-
-src_install() {
-	kde_src_install
-	dodoc ${S}/doc/{NEWS,README,TODO}
-
-	# moved here from kdelibs so that when arts is installed
-	# without kdelibs it's still in the path.
-	dodir /etc/env.d
-echo "PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${PREFIX}/lib
-CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/49kdepaths-3.1.1 # number goes down with version upgrade
-
-	echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/56kdedir-3.1.1 # number goes up with version upgrade
-
-}
-
-pkg_postinst() {
-
-einfo "Run chmod +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."
-
-}
diff --git a/kde-base/arts/arts-1.1.3.ebuild b/kde-base/arts/arts-1.1.3.ebuild
deleted file mode 100644
index 0da57b236822..000000000000
--- a/kde-base/arts/arts-1.1.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.1.3.ebuild,v 1.7 2003/09/17 01:22:21 weeve Exp $
-inherit kde-base flag-o-matic
-
-IUSE="alsa oggvorbis artswrappersuid mad"
-
-set-kdedir 3.1
-need-qt 3.1.0
-
-SRC_URI="mirror://kde/stable/3.1.3/src/${P}.tar.bz2"
-HOMEPAGE="http://multimedia.kde.org"
-DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
-
-KEYWORDS="x86 ~ppc sparc ~alpha ~hppa"
-
-newdepend "alsa? ( media-libs/alsa-lib )
-	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
-	mad? ( media-libs/libmad media-libs/libid3tag )
-	media-libs/audiofile
-	>=dev-libs/glib-2"
-
-if [ "${COMPILER}" == "gcc3" ]; then
-	# GCC 3.1 kinda makes arts buggy and prone to crashes when compiled with
-	# these.. Even starting a compile shuts down the arts server
-	filter-flags "-fomit-frame-pointer -fstrength-reduce"
-fi
-
-#fix bug 13453
-filter-flags "-foptimize-sibling-calls"
-
-SLOT="3.1"
-LICENSE="GPL-2 LGPL-2"
-
-use alsa && myconf="$myconf --with-alsa" || myconf="$myconf --without-alsa"
-use oggvorbis || myconf="$myconf --disable-vorbis"
-use mad || myconf="$myconf --disable-libmad"
-
-# patch to configure.in.in that makes the vorbis, libmad deps optional
-# has no version number in its filename because it's the same for all
-# arts versions - the patched file hasn't changed in a year's time
-PATCHES="$FILESDIR/optional-deps.diff"
-
-src_unpack() {
-	kde_src_unpack
-	kde_sandbox_patch ${S}/soundserver
-	# for the configure.in.in patch, for some reason it's not automatically picked up
-	rm $S/configure
-	kde_fix_autodetect
-}
-
-src_compile() {
-	kde_src_compile myconf
-	kde_fix_head_instances acinclude.m4 aclocal.m4 admin/cvs.sh admin/libtool.m4 debian/rules
-	kde_src_compile configure
-	kde_src_compile make
-}
-
-src_install() {
-	kde_src_install
-	dodoc ${S}/doc/{NEWS,README,TODO}
-
-	# moved here from kdelibs so that when arts is installed
-	# without kdelibs it's still in the path.
-	dodir /etc/env.d
-echo "PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
-LDPATH=${PREFIX}/lib
-CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/49kdepaths-3.1.2 # number goes down with version upgrade
-
-	echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/56kdedir-3.1.2 # number goes up with version upgrade
-
-	# used for realtime priority, but off by default as it is a security hazard
-	use artswrappersuid && chmod +s ${D}/${PREFIX}/bin/artswrapper
-
-}
-
-pkg_postinst() {
-
-	if [ -z "`use artswrappersuid`" ]; then
-		einfo "Run chmod +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/arts-1.1.4.ebuild b/kde-base/arts/arts-1.1.4.ebuild
index 910f2b416b97..ed248f9ccc62 100644
--- a/kde-base/arts/arts-1.1.4.ebuild
+++ b/kde-base/arts/arts-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.1.4.ebuild,v 1.13 2004/01/03 13:58:27 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.1.4.ebuild,v 1.14 2004/01/04 02:20:24 caleb Exp $
 inherit kde flag-o-matic
 
 IUSE="alsa oggvorbis artswrappersuid mad"
@@ -17,8 +17,8 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
 	mad? ( media-libs/libmad media-libs/libid3tag )
 	media-libs/audiofile
-	>=dev-libs/glib-2"
-need-qt 3.1.0
+	>=dev-libs/glib-2
+	>=x11-libs/qt-3.1.0"
 
 if [ "${COMPILER}" == "gcc3" ]; then
 	# GCC 3.1 kinda makes arts buggy and prone to crashes when compiled with
diff --git a/kde-base/arts/arts-1.2.0_beta2.ebuild b/kde-base/arts/arts-1.2.0_beta2.ebuild
index aa7b0a2ae699..915391df48f9 100644
--- a/kde-base/arts/arts-1.2.0_beta2.ebuild
+++ b/kde-base/arts/arts-1.2.0_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.0_beta2.ebuild,v 1.8 2004/01/03 13:58:27 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.0_beta2.ebuild,v 1.9 2004/01/04 02:20:24 caleb Exp $
 inherit kde flag-o-matic
 
 IUSE="alsa oggvorbis esd artswrappersuid mad"
@@ -22,8 +22,8 @@ DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
 	mad? ( media-libs/libmad media-libs/libid3tag )
 	media-libs/audiofile
 	>=dev-libs/glib-2
+	>=x11-libs/qt-3.2
 	>=sys-apps/portage-2.0.49-r8"
-need-qt 3.2
 
 if [ "${COMPILER}" == "gcc3" ]; then
 	# GCC 3.1 kinda makes arts buggy and prone to crashes when compiled with
diff --git a/kde-base/arts/files/digest-arts-1.1.1 b/kde-base/arts/files/digest-arts-1.1.1
deleted file mode 100644
index a3eea70aea45..000000000000
--- a/kde-base/arts/files/digest-arts-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 67be8c2a84d6b928f407947138a77982 arts-1.1.1.tar.bz2 974608
diff --git a/kde-base/arts/files/digest-arts-1.1.3 b/kde-base/arts/files/digest-arts-1.1.3
deleted file mode 100644
index 3b9d6a06a2cf..000000000000
--- a/kde-base/arts/files/digest-arts-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f04eb6ef387d63741561ab6623696322 arts-1.1.3.tar.bz2 986366