ebuild cleanup - add esound as an optional dependency

3 files changed, 17 insertions, 12 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 34be87258173..e0f5f81fa6a0 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.64 2003/12/02 02:00:32 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.65 2003/12/24 19:23:38 caleb Exp $
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> arts-1.2.0_beta2.ebuild:
+  ebuild cleanup - add esound as a optional dependency
 
 *arts-1.2.0_beta2 (01 Dec 2003)
 
diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index 10e13df65233..a90eb3b96543 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -4,9 +4,9 @@ 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 3ee400d7cafc50b52cab7b4ea121e019 arts-1.2.0_beta2.ebuild 2787
+MD5 8649ace40bb3a328f08de0aeb5da708b arts-1.2.0_beta2.ebuild 2808
 MD5 84e7f3bac423a53ca09cd5a130897670 arts-1.1.2-r1.ebuild 2718
-MD5 c6978b62e48a32a9a46a5c0801e77d23 ChangeLog 9048
+MD5 b171e3efcc95a84888fb157f3d5a92af ChangeLog 9176
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 69577c6c31a8a2e17cd4894daa79848b arts-1.1.4.ebuild 2993
 MD5 9ffc978b18c6e1ad49a0c7eec49074f6 files/optional-deps.diff 3154
diff --git a/kde-base/arts/arts-1.2.0_beta2.ebuild b/kde-base/arts/arts-1.2.0_beta2.ebuild
index 3dd163ce2cf1..4e0564f458f9 100644
--- a/kde-base/arts/arts-1.2.0_beta2.ebuild
+++ b/kde-base/arts/arts-1.2.0_beta2.ebuild
@@ -1,9 +1,9 @@
 # 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.1 2003/12/02 02:00:32 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.2.0_beta2.ebuild,v 1.2 2003/12/24 19:23:38 caleb Exp $
 inherit kde-base flag-o-matic
 
-IUSE="alsa oggvorbis artswrappersuid mad"
+IUSE="alsa oggvorbis esd artswrappersuid mad"
 
 set-kdedir 3.2
 need-qt 3.2
@@ -17,12 +17,14 @@ DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manag
 
 KEYWORDS="~x86"
 
-newdepend "alsa? ( media-libs/alsa-lib )
+newdepend "alsa? ( media-libs/alsa-lib virtual/alsa )
 	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
+	esd? ( media-libs/esound )
 	mad? ( media-libs/libmad media-libs/libid3tag )
 	media-libs/audiofile
 	>=dev-libs/glib-2
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	>=sys-apps/portage-2.0.49-r8"
 
 if [ "${COMPILER}" == "gcc3" ]; then
 	# GCC 3.1 kinda makes arts buggy and prone to crashes when compiled with
@@ -36,20 +38,20 @@ filter-flags "-foptimize-sibling-calls"
 SLOT="3.2"
 LICENSE="GPL-2 LGPL-2"
 
-use alsa && myconf="$myconf --enable-alsa" || myconf="$myconf --disable-alsa"
-use oggvorbis || myconf="$myconf --disable-vorbis"
-use mad || myconf="$myconf --disable-libmad"
+myconf="$myconf `use_enable alsa`"
+myconf="$myconf `use_enable oggvorbis`"
+myconf="$myconf `use_enable mad 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"
+# 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 -f $S/configure
+	# rm -f $S/configure
 }
 
 src_install() {