x86 stable and cleanups

6 files changed, 8 insertions, 155 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 35b83f8ab9a2..328a55e6adc4 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.81 2004/03/09 12:16:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.82 2004/03/12 20:37:33 caleb Exp $
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild,
+  arts-1.2.1.ebuild, files/arts-1.1.4-alsafix.diff,
+  files/arts-1.1.4-amd64.patch:
+  x86 stable and old cleanups
 
 *arts-1.2.1 (09 Mar 2004)
 
diff --git a/kde-base/arts/arts-1.1.4.ebuild b/kde-base/arts/arts-1.1.4.ebuild
deleted file mode 100644
index 1fdb24af123e..000000000000
--- a/kde-base/arts/arts-1.1.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2004 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.15 2004/01/11 02:31:36 agriffis Exp $
-inherit kde flag-o-matic
-
-IUSE="alsa oggvorbis artswrappersuid mad"
-
-set-kdedir 3.1
-
-SRC_URI="mirror://kde/stable/3.1.4/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 amd64"
-
-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
-	>=x11-libs/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"
-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
-	epatch ${FILESDIR}/${P}-alsafix.diff
-	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
-	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
-}
-
-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.4 # number goes down with version upgrade
-
-	echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/56kdedir-3.1.4 # 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.2.1.ebuild b/kde-base/arts/arts-1.2.1.ebuild
index b717c84a85e8..c0965df96de7 100644
--- a/kde-base/arts/arts-1.2.1.ebuild
+++ b/kde-base/arts/arts-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1.ebuild,v 1.4 2004/03/10 13:34:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.1.ebuild,v 1.5 2004/03/12 20:37:33 caleb Exp $
 
 inherit kde flag-o-matic
 set-kdedir 3.2
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PV/1.2.1/3.2.1}/src/${PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.2"
-KEYWORDS="~x86 ~ppc ~sparc hppa ~amd64 ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~sparc hppa ~amd64 ~alpha ~ia64"
 IUSE="alsa oggvorbis esd artswrappersuid mad"
 
 DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
diff --git a/kde-base/arts/files/arts-1.1.4-alsafix.diff b/kde-base/arts/files/arts-1.1.4-alsafix.diff
deleted file mode 100644
index 09e6aa68617b..000000000000
--- a/kde-base/arts/files/arts-1.1.4-alsafix.diff
+++ /dev/null
@@ -1,48 +0,0 @@
---- arts/configure.in.in	2003/09/03 00:02:52	1.81.2.7
-+++ arts/configure.in.in	2003/11/24 15:53:20	1.81.2.8
-@@ -497,6 +497,26 @@ AC_DEFUN([AC_CHECK_LIBASOUND],
-       #include <alsa/asoundlib.h>
-       #endif
-     ],[
-+      #if (SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)
-+        /* we have ALSA 1.x */
-+      #else
-+        #error not ALSA 1.x
-+      #endif
-+    ],
-+    kde_has_alsa_1_0=yes,
-+    kde_has_alsa_1_0=no)
-+  fi
-+
-+  if test "x$kde_has_asoundlib" = "xyes"; then
-+    AC_TRY_COMPILE([
-+      #include "confdefs.h"
-+      #ifdef HAVE_SYS_ASOUNDLIB_H
-+      #include <sys/asoundlib.h>
-+      #endif
-+      #ifdef HAVE_ALSA_ASOUNDLIB_H
-+      #include <alsa/asoundlib.h>
-+      #endif
-+    ],[
-     #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)
-       /* we have ALSA 0.5.x */
-     #else
-@@ -523,6 +543,18 @@ AC_DEFUN([AC_CHECK_LIBASOUND],
-           AC_DEFINE(HAVE_SND_PCM_RESUME, 1,
-             [Define if libasound has snd_pcm_resume()])])
-       fi
-+      if test "x$kde_has_alsa_1_0" = "xyes"; then
-+        LIBASOUND="-lasound"
-+        AC_DEFINE(HAVE_LIBASOUND2, 1,
-+          [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
-+	AC_DEFINE(ALSA_PCM_OLD_SW_PARAMS_API, 1,
-+          [Define if you have alsa 1.x])
-+	AC_DEFINE(ALSA_PCM_OLD_HW_PARAMS_API, 1,
-+          [Define if you have alsa 1.x])
-+        AC_CHECK_LIB(asound,snd_pcm_resume,[
-+          AC_DEFINE(HAVE_SND_PCM_RESUME, 1,
-+            [Define if libasound has snd_pcm_resume()])])
-+      fi
-     ])
-   fi
-   AC_SUBST(LIBASOUND)
diff --git a/kde-base/arts/files/arts-1.1.4-amd64.patch b/kde-base/arts/files/arts-1.1.4-amd64.patch
deleted file mode 100644
index 61fe8f9c06e8..000000000000
--- a/kde-base/arts/files/arts-1.1.4-amd64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- flow/gsl/gslglib.h	2003-07-13 15:33:38.000000000 -0400
-+++ flow/gsl/gslglib.h	2003-09-27 18:12:04.368204936 -0400
-@@ -507,6 +507,9 @@
- #if !defined (G_VA_COPY)
- #  if defined (__GNUC__) && ( defined (__PPC__) || defined (__s390__) ) && (defined (_CALL_SYSV) || defined (_WIN32) || defined (__s390__) )
- #    define G_VA_COPY(ap1, ap2)   (*(ap1) = *(ap2))
-+#  elif defined (__x86_64__)
-+#    include <stdarg.h>
-+#    define G_VA_COPY(ap1, ap2) __va_copy((ap1), (ap2))
- #  elif defined (G_VA_COPY_AS_ARRAY)
- #    define G_VA_COPY(ap1, ap2)   g_memmove ((ap1), (ap2), sizeof (va_list))
- #  else /* va_list is a pointer */
diff --git a/kde-base/arts/files/digest-arts-1.1.4 b/kde-base/arts/files/digest-arts-1.1.4
deleted file mode 100644
index 6cdfa961e81e..000000000000
--- a/kde-base/arts/files/digest-arts-1.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aa4bef1e80cd3795e3fd832471e348e9 arts-1.1.4.tar.bz2 987612