Marked ~amd64 and patched configure so that is does not need arts, closes bug 104084. Version bump.

(Portage version: 2.0.51.22-r2)

6 files changed, 190 insertions, 7 deletions

diff --git a/net-misc/knutclient/ChangeLog b/net-misc/knutclient/ChangeLog
index 38e971702bbb..817baed63c65 100644
--- a/net-misc/knutclient/ChangeLog
+++ b/net-misc/knutclient/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/knutclient
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/ChangeLog,v 1.11 2004/12/30 17:28:02 carlo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/ChangeLog,v 1.12 2005/08/31 18:25:48 cryos Exp $
+
+*knutclient-0.8.6 (31 Aug 2005)
+
+  31 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/knutclient-0.8.5-arts-configure.patch, knutclient-0.8.5.ebuild,
+  +knutclient-0.8.6.ebuild:
+  Marked ~amd64 and patched configure so that is does not need arts, closes
+  bug 104084. Version bump.
 
   30 Dec 2004; Carsten Lohrke <carlo@gentoo.org> knutclient-0.8.5.ebuild:
   stable on x86
diff --git a/net-misc/knutclient/Manifest b/net-misc/knutclient/Manifest
index a932ad247c29..c4f53221a747 100644
--- a/net-misc/knutclient/Manifest
+++ b/net-misc/knutclient/Manifest
@@ -1,4 +1,7 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 4c9360e6610ca65586afa9ffdcd11b0d knutclient-0.8.5.ebuild 626
+MD5 6f25599cb3e214d227508595b794a3c9 knutclient-0.8.6.ebuild 633
 MD5 eee721c882a7d44a5e43d24ce2149265 ChangeLog 1311
-MD5 f2a52fbb4c52486afed46e8647c2e1b6 knutclient-0.8.5.ebuild 528
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 aecc8da463fd7a070c24c5441ebb5e5c files/digest-knutclient-0.8.5 69
+MD5 e4d5c361a955a869636e3e5e42a72a3a files/digest-knutclient-0.8.6 69
+MD5 8e2ff7d646fbe3bf5bd42a98079b5a6e files/knutclient-0.8.5-arts-configure.patch 3569
diff --git a/net-misc/knutclient/files/digest-knutclient-0.8.6 b/net-misc/knutclient/files/digest-knutclient-0.8.6
new file mode 100644
index 000000000000..185de2f927f4
--- /dev/null
+++ b/net-misc/knutclient/files/digest-knutclient-0.8.6
@@ -0,0 +1 @@
+MD5 08889c7f220ecbe029de7f43182ec3b5 knutclient-0.8.6.tar.gz 1395983
diff --git a/net-misc/knutclient/files/knutclient-0.8.5-arts-configure.patch b/net-misc/knutclient/files/knutclient-0.8.5-arts-configure.patch
new file mode 100644
index 000000000000..f4f0338b01a4
--- /dev/null
+++ b/net-misc/knutclient/files/knutclient-0.8.5-arts-configure.patch
@@ -0,0 +1,142 @@
+--- configure.orig	2005-08-31 19:13:02.000000000 +0100
++++ configure	2005-08-31 19:15:10.000000000 +0100
+@@ -24766,139 +24766,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/net-misc/knutclient/knutclient-0.8.5.ebuild b/net-misc/knutclient/knutclient-0.8.5.ebuild
index 6abb19ee9cdb..9fb3d6517b43 100644
--- a/net-misc/knutclient/knutclient-0.8.5.ebuild
+++ b/net-misc/knutclient/knutclient-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# 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/knutclient/knutclient-0.8.5.ebuild,v 1.2 2004/12/30 17:28:02 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.8.5.ebuild,v 1.3 2005/08/31 18:25:48 cryos Exp $
 
 inherit kde
 
@@ -13,7 +13,12 @@ SRC_URI="ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="~ppc ~sparc x86"
 IUSE=""
 
 need-kde 3.1
+
+src_unpack() {
+	kde_src_unpack
+	use arts || epatch ${FILESDIR}/${P}-arts-configure.patch
+}
diff --git a/net-misc/knutclient/knutclient-0.8.6.ebuild b/net-misc/knutclient/knutclient-0.8.6.ebuild
new file mode 100644
index 000000000000..0d9d3764d205
--- /dev/null
+++ b/net-misc/knutclient/knutclient-0.8.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/knutclient/knutclient-0.8.6.ebuild,v 1.1 2005/08/31 18:25:48 cryos Exp $
+
+inherit kde
+
+MY_P=${P/_/-}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Client for the NUT UPS monitoring daemon"
+HOMEPAGE="http://www.alo.cz/knutclient-pop-en.html"
+SRC_URI="ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+need-kde 3.1
+
+src_unpack() {
+	kde_src_unpack
+	use arts || epatch ${FILESDIR}/${PN}-0.8.5-arts-configure.patch
+}