Added a patch to the configure script to honor the arts USE flag. Fixes bug #70703.

5 files changed, 296 insertions, 3 deletions

diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
index 4e489b577020..3a07bd1073f6 100644
--- a/media-sound/kid3/ChangeLog
+++ b/media-sound/kid3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/kid3
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.10 2004/11/28 19:05:07 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.11 2004/11/28 19:08:02 motaboy Exp $
+
+  28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kid3-0.4-configure.patch, kid3-0.4.ebuild:
+  Added a patch to the configure script to honor the arts USE flag. Fixes bug
+  #70703.
 
   28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
   +files/kid3-0.5-configure.patch, kid3-0.5.ebuild:
diff --git a/media-sound/kid3/files/kid3-0.4-configure.patch b/media-sound/kid3/files/kid3-0.4-configure.patch
new file mode 100644
index 000000000000..2737bd258273
--- /dev/null
+++ b/media-sound/kid3/files/kid3-0.4-configure.patch
@@ -0,0 +1,141 @@
+--- configure.orig	2004-11-10 23:33:24.903907112 +0000
++++ configure	2004-11-10 23:34:19.501607000 +0000
+@@ -23936,138 +23936,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/media-sound/kid3/files/kid3-0.5-configure.patch b/media-sound/kid3/files/kid3-0.5-configure.patch
new file mode 100644
index 000000000000..2737bd258273
--- /dev/null
+++ b/media-sound/kid3/files/kid3-0.5-configure.patch
@@ -0,0 +1,141 @@
+--- configure.orig	2004-11-10 23:33:24.903907112 +0000
++++ configure	2004-11-10 23:34:19.501607000 +0000
+@@ -23936,138 +23936,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/media-sound/kid3/kid3-0.4.ebuild b/media-sound/kid3/kid3-0.4.ebuild
index 8552522d41ad..c120e0c7c263 100644
--- a/media-sound/kid3/kid3-0.4.ebuild
+++ b/media-sound/kid3/kid3-0.4.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/media-sound/kid3/kid3-0.4.ebuild,v 1.7 2004/09/28 19:40:17 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.4.ebuild,v 1.8 2004/11/28 19:08:02 motaboy Exp $
 
 IUSE=""
 
@@ -23,4 +23,5 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc34.patch
+	use arts || epatch ${FILESDIR}/${P}-configure.patch
 }
diff --git a/media-sound/kid3/kid3-0.5.ebuild b/media-sound/kid3/kid3-0.5.ebuild
index 7ff79018eb41..7bc4ccfa1eaf 100644
--- a/media-sound/kid3/kid3-0.5.ebuild
+++ b/media-sound/kid3/kid3-0.5.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/media-sound/kid3/kid3-0.5.ebuild,v 1.2 2004/11/01 20:01:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-0.5.ebuild,v 1.3 2004/11/28 19:05:07 motaboy Exp $
 
 IUSE=""
 
@@ -18,3 +18,8 @@ KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc64"
 DEPEND=">=media-libs/id3lib-3.8.3"
 need-kde 3.1
 
+src_unpack() {
+	kde_src_unpack
+
+	use arts || epatch ${FILESDIR}/${P}-configure.patch
+}