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

diff --git a/app-cdr/arson/ChangeLog b/app-cdr/arson/ChangeLog
index 77c4536a7a2c5f347f3f96a102bae28319d0e4c6..7182354b493a6ff83c1e5da413c0cd75924b35ca 100644 (file)
--- a/app-cdr/arson/ChangeLog
+++ b/app-cdr/arson/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/arson
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/ChangeLog,v 1.36 2004/10/06 20:12:27 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/ChangeLog,v 1.37 2004/11/25 22:22:24 motaboy Exp $
+
+  25 Nov 2004; Simone Gotti <motaboy@gentoo.org> metadata.xml,
+  +files/arson-0.9.8_beta2-configure-arts.patch, arson-0.9.8_beta2.ebuild:
+  Added a patch to the configure script to honor the arts USE flag. Fixes bug
+  #71816.
 
   06 Oct 2004; Lars Weiler <pylon@gentoo.org> arson-0.9.8_beta2.ebuild:
   Changed dependency from app-cdr/cdrtools to virtual/cdrtools. This resolves

diff --git a/app-cdr/arson/Manifest b/app-cdr/arson/Manifest
index 650a667ec997061b28bf2acef5f4446161a06826..199e8e9f6e0aae4a2788f4b35c958eb9be012fb3 100644 (file)
--- a/app-cdr/arson/Manifest
+++ b/app-cdr/arson/Manifest
@@ -1,11 +1,12 @@
-MD5 ae0ebf3987c353675f18bd3904b15160 ChangeLog 4112
 MD5 afa195b3544f19c95efbd6e7139eede4 arson-0.9.7-r1.ebuild 889
 MD5 17458afd55b02365996a2c83273d3a76 arson-0.9.7-r3.ebuild 1050
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 bd6d97663849911c01b5224b252962cf arson-0.9.8_beta2.ebuild 1207
-MD5 dbcb408efd85de0535addf120954d78d files/arson-0.9.7-crashfix.diff 404
+MD5 5849b872ffc5265bc814d81384e1b782 ChangeLog 4341
+MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
+MD5 cd6cb0ae11cea8865a287fa982335495 arson-0.9.8_beta2.ebuild 1266
 MD5 9043ac80aa72f06250eaf3ac47e4f25a files/arson-0.9.7-gcc33-multiline-string-fix.patch 1681
+MD5 d1a2f8143625c8d49b900ca77960bdd6 files/digest-arson-0.9.8_beta2 69
 MD5 36dfe8c597aa471beb98dc30e3606d47 files/arson-0.9.7-write-img-fix.diff 1689
+MD5 224916aa019778de8b0a63f9a08dd422 files/arson-0.9.8_beta2-configure-arts.patch 3533
+MD5 dbcb408efd85de0535addf120954d78d files/arson-0.9.7-crashfix.diff 404
 MD5 12bb89bba9ef85545f69d581706c82bf files/digest-arson-0.9.7-r1 69
 MD5 12bb89bba9ef85545f69d581706c82bf files/digest-arson-0.9.7-r3 69
-MD5 d1a2f8143625c8d49b900ca77960bdd6 files/digest-arson-0.9.8_beta2 69

diff --git a/app-cdr/arson/arson-0.9.8_beta2.ebuild b/app-cdr/arson/arson-0.9.8_beta2.ebuild
index e645d60031b5524a26fad7f3e5ce69eb2ac88c91..7be5867bf9ecaa95d1c02ac1cbd1f108c8f27d72 100644 (file)
--- a/app-cdr/arson/arson-0.9.8_beta2.ebuild
+++ b/app-cdr/arson/arson-0.9.8_beta2.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-cdr/arson/arson-0.9.8_beta2.ebuild,v 1.11 2004/10/06 20:12:27 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/arson/arson-0.9.8_beta2.ebuild,v 1.12 2004/11/25 22:22:24 motaboy Exp $
 
 inherit kde eutils gcc
 
@@ -29,8 +29,8 @@ DEPEND=">=media-sound/cdparanoia-3.9.8
 need-kde 3
 
 #added base_src_unpack() with conditional fix of code allowing compilation with gcc-3.4.0
-base_src_unpack() {
-       unpack ${A}
+src_unpack() {
+       kde_src_unpack
        cd ${S}/src/
 
        if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
@@ -39,6 +39,8 @@ base_src_unpack() {
                sed -i "s:(font()):(font):" wizard.cpp
        fi
        cd ${S}
+
+       use arts || epatch ${FILESDIR}/${P}-configure-arts.patch
 }
 
 src_compile() {

diff --git a/app-cdr/arson/files/arson-0.9.8_beta2-configure-arts.patch b/app-cdr/arson/files/arson-0.9.8_beta2-configure-arts.patch
new file mode 100644 (file)
index 0000000..f48edfa
--- /dev/null
+++ b/app-cdr/arson/files/arson-0.9.8_beta2-configure-arts.patch
@@ -0,0 +1,135 @@
+--- configure.orig     2004-11-20 16:13:02.045713120 +0000
++++ configure  2004-11-20 16:13:41.196761256 +0000
+@@ -20700,132 +20700,6 @@
+ 
+    fi
+ 
+-   echo "$as_me:20697: 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:20742: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-
+-    { { echo "$as_me:20745: error: The important program mcopidl was not found!
+-Please check whether you installed KDE correctly.
+-" >&5
+-echo "$as_me: error: The important program mcopidl was not found!
+-Please check whether you installed KDE correctly.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-   else
+-      echo "$as_me:20754: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
+-      MCOPIDL=$kde_cv_path
+-
+-   fi
+-
+-   echo "$as_me:20760: 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:20805: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-
+-    { { echo "$as_me:20808: error: The important program artsc-config was not found!
+-Please check whether you installed KDE correctly.
+-" >&5
+-echo "$as_me: error: The important program artsc-config was not found!
+-Please check whether you installed KDE correctly.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-   else
+-      echo "$as_me:20817: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
+-      ARTSCCONFIG=$kde_cv_path
+-
+-   fi
+-
+    echo "$as_me:20823: checking for kde-config" >&5
+ echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
+    if test -n "$KDECONFIG"; then

diff --git a/app-cdr/arson/metadata.xml b/app-cdr/arson/metadata.xml
index d8b96be3c5cd34ef10346690f4c871a3c235ccb7..b435a8440ccd8fddc579b7c82a03a8dd4c11bda4 100644 (file)
--- a/app-cdr/arson/metadata.xml
+++ b/app-cdr/arson/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-       <herd>no-herd</herd>
-       <maintainer>
-               <email>bug-wranglers@gentoo.org</email>
-               <description>This package lacks a primary herd or maintainer.</description>
-       </maintainer>
+<herd>kde-other</herd>
 </pkgmetadata>