Add patch to compile without arts (#87925). Thanks to prymitive <prymitive@o2.pl>.

Package-Manager: portage-2.0.51.19

4 files changed, 168 insertions, 19 deletions

diff --git a/net-misc/knetmonapplet/ChangeLog b/net-misc/knetmonapplet/ChangeLog
index 0654a60d5ad2..c493cb0b9d30 100644
--- a/net-misc/knetmonapplet/ChangeLog
+++ b/net-misc/knetmonapplet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/knetmonapplet
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/ChangeLog,v 1.9 2004/08/29 18:05:23 kugelfang Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/ChangeLog,v 1.10 2005/04/05 17:15:25 greg_g Exp $
+
+  05 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/knetmonapplet-0.9-noarts.patch, knetmonapplet-0.9.ebuild:
+  Add patch to compile without arts (#87925). Thanks to prymitive
+  <prymitive@o2.pl>.
 
   29 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> knetmonapplet-0.9.ebuild:
   Marked ~amd64.
diff --git a/net-misc/knetmonapplet/Manifest b/net-misc/knetmonapplet/Manifest
index f98a9211b564..d8b29b6af80d 100644
--- a/net-misc/knetmonapplet/Manifest
+++ b/net-misc/knetmonapplet/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dc7d5a84917550a48f51c31e4a6747ff ChangeLog 1311
+MD5 9d50ef8b089ca884d499f0c786c0c00a ChangeLog 1514
 MD5 6037b951324be8d75e66c59d2f044774 knetmonapplet-0.6.6.ebuild 592
-MD5 71d2bbf483ac36a8b16be57bbaf716ce knetmonapplet-0.9.ebuild 591
+MD5 477d5eb3ee74eca41f01688ce34c0367 knetmonapplet-0.9.ebuild 659
 MD5 ce6272804a46fc47fbda45f19d153a9c files/digest-knetmonapplet-0.6.6 71
+MD5 8798ce976a6ab0a43270915a13ed53bc files/knetmonapplet-0.9-noarts.patch 3828
 MD5 f6e8238f1cafc06e30b26f90dedfca95 files/digest-knetmonapplet-0.9 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBYHNEI1lqEGTUzyQRAnbzAJ90XgnA6Wx8moCq2u+eDQhA+34GggCgo1wx
-iHdWhnSvxOC05lHoHsLlgis=
-=1UVI
------END PGP SIGNATURE-----
diff --git a/net-misc/knetmonapplet/files/knetmonapplet-0.9-noarts.patch b/net-misc/knetmonapplet/files/knetmonapplet-0.9-noarts.patch
new file mode 100644
index 000000000000..71764dcd5044
--- /dev/null
+++ b/net-misc/knetmonapplet/files/knetmonapplet-0.9-noarts.patch
@@ -0,0 +1,149 @@
+--- configure.orig	2005-04-03 16:34:01.000000000 +0200
++++ configure	2005-04-03 16:31:56.000000000 +0200
+@@ -259,7 +259,7 @@ PACKAGE_STRING=
+ PACKAGE_BUGREPORT=
+ 
+ ac_unique_file="acinclude.m4"
+-ac_default_prefix=${KDEDIR:-/usr/local/kde}
++ac_default_prefix=${KDEDIR:-/usr/kde/3.4}
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+@@ -12973,137 +12973,6 @@ echo "${ECHO_T}$kde_cv_path" >&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 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:$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 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:$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
diff --git a/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild b/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild
index 515829de6cfb..bf69fab30396 100644
--- a/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild
+++ b/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild
@@ -1,20 +1,24 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild,v 1.7 2004/10/03 21:46:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knetmonapplet/knetmonapplet-0.9.ebuild,v 1.8 2005/04/05 17:15:25 greg_g Exp $
 
-inherit kde
-need-kde 3
+inherit kde eutils
 
 DESCRIPTION="Graphical network monitor for the KDE panel"
 SRC_URI="http://ftp.kde.com/Computer_Devices/Networking/Monitoring/KnetmonApplet/${P}.tar.gz"
 HOMEPAGE="http://perso.club-internet.fr/hftom/knetmonapplet/"
-
 LICENSE="GPL-2"
+
+SLOT="0"
 KEYWORDS="x86 ~amd64"
 IUSE=""
 
+need-kde 3
+
 src_unpack() {
 	kde_src_unpack
 
+	use arts || epatch "${FILESDIR}/${P}-noarts.patch"
+
 	rm -f $S/knetmon/uiconfig.{h,cpp,moc}
 }