Added a patch for the configure script to honor the "arts" USE flag. Now it should compile also with

4 files changed, 154 insertions, 4 deletions

diff --git a/app-misc/kdirstat/ChangeLog b/app-misc/kdirstat/ChangeLog
index 7fcc4e532954..bb4243f12f34 100644
--- a/app-misc/kdirstat/ChangeLog
+++ b/app-misc/kdirstat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/kdirstat
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kdirstat/ChangeLog,v 1.13 2004/06/30 13:12:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kdirstat/ChangeLog,v 1.14 2004/10/19 21:32:13 motaboy Exp $
+
+  19 Oct 2004; <motaboy@gentoo.org> +files/kdirstat-2.4.0-configure.patch,
+  kdirstat-2.4.0.ebuild:
+  Added a patch for the configure script to honor the "arts" USE flag. Now it
+  should compile also with USE=-arts.
 
   30 Jun 2004; Aron Griffis <agriffis@gentoo.org> kdirstat-2.4.0.ebuild:
   inherit eutils, trim trailing whitespace
diff --git a/app-misc/kdirstat/Manifest b/app-misc/kdirstat/Manifest
index 8e12410196e2..938fde676f0d 100644
--- a/app-misc/kdirstat/Manifest
+++ b/app-misc/kdirstat/Manifest
@@ -1,9 +1,10 @@
 MD5 6ea8dfb73199f2eebc72cf079c7198f1 kdirstat-2.2.0.ebuild 464
-MD5 0540e62e0abacd6c0c6463be216b0b6b ChangeLog 1954
+MD5 3b4bf27d5f319d8f5eabbe8a549ae177 ChangeLog 2171
 MD5 085535450e113091ef8b6a437f6dd5de kdirstat-2.3.7.ebuild 463
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 6f8a14a6381e6ff0e33ed2ae70f61f2e kdirstat-2.4.0.ebuild 578
+MD5 1c29832759093f1fe75a1a346b66763e kdirstat-2.4.0.ebuild 550
 MD5 ea038c6b98cd537013bdfe6344d0401a files/digest-kdirstat-2.2.0 63
 MD5 6c8b58bdea9797a5386fae5a69f23bc5 files/digest-kdirstat-2.3.7 67
 MD5 50612723fa9ed6e09e2f2b300d07aa1b files/digest-kdirstat-2.4.0 67
+MD5 12d1a6dba51fffa13b56b37b8c58b68a files/kdirstat-2.4.0-configure.patch 3569
 MD5 1293616790e16b7e5814d2a9b6a975be files/kdirstatapp.h.fix.patch 248
diff --git a/app-misc/kdirstat/files/kdirstat-2.4.0-configure.patch b/app-misc/kdirstat/files/kdirstat-2.4.0-configure.patch
new file mode 100644
index 000000000000..babb6dac4c4a
--- /dev/null
+++ b/app-misc/kdirstat/files/kdirstat-2.4.0-configure.patch
@@ -0,0 +1,142 @@
+--- configure.orig	2004-10-19 01:48:58.195581776 +0000
++++ configure	2004-10-19 01:49:46.182286688 +0000
+@@ -23891,139 +23891,6 @@
+ 
+    fi
+ 
+-
+-   echo "$as_me:$LINENO: checking for mcopidl" >&5
+-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
+-   if test -n "$MCOPIDL"; then
+-        kde_cv_path="$MCOPIDL";
+-   else
+-        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
+-
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-        kde_cv_path="NONE"
+-	dirs="$kde_default_bindirs"
+-	kde_save_IFS=$IFS
+-	IFS=':'
+-	for dir in $PATH; do
+-	  dirs="$dirs $dir"
+-        done
+-	IFS=$kde_save_IFS
+-
+-        for dir in $dirs; do
+-	  if test -x "$dir/mcopidl"; then
+-	    if test -n ""
+-	    then
+-              evalstr="$dir/mcopidl  2>&1 "
+-	      if eval $evalstr; then
+-                kde_cv_path="$dir/mcopidl"
+-                break
+-	      fi
+-            else
+-		kde_cv_path="$dir/mcopidl"
+-                break
+-	    fi
+-          fi
+-        done
+-
+-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
+-
+-
+-fi
+-
+-
+-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
+-
+-   fi
+-
+-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-
+-    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
+-Please check whether you installed aRts correctly.
+-" >&5
+-echo "$as_me: error: The important program mcopidl was not found!
+-Please check whether you installed aRts correctly.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-   else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
+-      MCOPIDL=$kde_cv_path
+-
+-   fi
+-
+-
+-   echo "$as_me:$LINENO: checking for artsc-config" >&5
+-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
+-   if test -n "$ARTSCCONFIG"; then
+-        kde_cv_path="$ARTSCCONFIG";
+-   else
+-        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
+-
+-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-        kde_cv_path="NONE"
+-	dirs="$kde_default_bindirs"
+-	kde_save_IFS=$IFS
+-	IFS=':'
+-	for dir in $PATH; do
+-	  dirs="$dirs $dir"
+-        done
+-	IFS=$kde_save_IFS
+-
+-        for dir in $dirs; do
+-	  if test -x "$dir/artsc-config"; then
+-	    if test -n ""
+-	    then
+-              evalstr="$dir/artsc-config  2>&1 "
+-	      if eval $evalstr; then
+-                kde_cv_path="$dir/artsc-config"
+-                break
+-	      fi
+-            else
+-		kde_cv_path="$dir/artsc-config"
+-                break
+-	    fi
+-          fi
+-        done
+-
+-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
+-
+-
+-fi
+-
+-
+-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
+-
+-   fi
+-
+-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
+-      echo "$as_me:$LINENO: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-
+-    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
+-Please check whether you installed aRts correctly.
+-" >&5
+-echo "$as_me: error: The important program artsc-config was not found!
+-Please check whether you installed aRts correctly.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-   else
+-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
+-      ARTSCCONFIG=$kde_cv_path
+-
+-   fi
+-
+-
+    echo "$as_me:$LINENO: checking for kde-config" >&5
+ echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
+    if test -n "$KDECONFIG"; then
diff --git a/app-misc/kdirstat/kdirstat-2.4.0.ebuild b/app-misc/kdirstat/kdirstat-2.4.0.ebuild
index 858eb4d55795..406b6d5f08ff 100644
--- a/app-misc/kdirstat/kdirstat-2.4.0.ebuild
+++ b/app-misc/kdirstat/kdirstat-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/kdirstat/kdirstat-2.4.0.ebuild,v 1.7 2004/06/30 13:12:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/kdirstat/kdirstat-2.4.0.ebuild,v 1.8 2004/10/19 21:32:13 motaboy Exp $
 
 inherit kde eutils
 
@@ -20,4 +20,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/kdirstat/
 	epatch ${FILESDIR}/kdirstatapp.h.fix.patch
+	cd ${S}
+	! useq arts && epatch ${FILESDIR}/kdirstat-2.4.0-configure.patch
 }