Fixed ebuild to use kde.eclass, built without arts and a few other bits. Fixes bug 82095.

(Portage version: 2.0.51-r15)

6 files changed, 178 insertions, 17 deletions

diff --git a/sci-calculators/kconvert/ChangeLog b/sci-calculators/kconvert/ChangeLog
index 0085b3e7347b..96c7cae7b940 100644
--- a/sci-calculators/kconvert/ChangeLog
+++ b/sci-calculators/kconvert/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-calculators/kconvert
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-calculators/kconvert/ChangeLog,v 1.2 2004/12/24 20:05:08 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/kconvert/ChangeLog,v 1.3 2005/02/24 17:22:27 cryos Exp $
+
+*kconvert-1.1-r1 (24 Feb 2005)
+
+  24 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kconvert-1.1-arts-configure.patch, +kconvert-1.1-r1.ebuild,
+  kconvert-1.1.ebuild:
+  Fixed up the ebuild to use kde.eclass, added a configure patch to build
+  without arts and changed to need-kde 3. This fixes bug 82095. Also updated the
+  description a little.
 
 *kconvert-1.1 (24 Dec 2004)
 
diff --git a/sci-calculators/kconvert/Manifest b/sci-calculators/kconvert/Manifest
index b83754a9dfcd..75567daa47b9 100644
--- a/sci-calculators/kconvert/Manifest
+++ b/sci-calculators/kconvert/Manifest
@@ -1,14 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 82e1ead1a48055c3be1c37be0d0256b3 kconvert-1.1.ebuild 708
-MD5 d353e299e478ab964309adf618f323cf ChangeLog 973
+MD5 a6c5eb5dd7fc0c439d9df2ec91472cf2 kconvert-1.1-r1.ebuild 607
+MD5 a0796c8d70ad643bb72450e42b84c6d3 kconvert-1.1.ebuild 708
+MD5 1cfa3d4edbdc9866ddf565e8ceb2aa58 ChangeLog 1265
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 31a95bb775a9baed77444a65967ef24f files/digest-kconvert-1.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBzHZ6I1lqEGTUzyQRAj2hAJsHFr8EGZx//PwYEGsGm7O0oMmUywCghJ60
-3y5DZd7aUz2nNu/D5P9TW7A=
-=OiuP
------END PGP SIGNATURE-----
+MD5 31a95bb775a9baed77444a65967ef24f files/digest-kconvert-1.1-r1 64
+MD5 07a28b2a2552da0e9079a5ac342e8f7c files/kconvert-1.1-arts-configure.patch 3533
diff --git a/sci-calculators/kconvert/files/digest-kconvert-1.1-r1 b/sci-calculators/kconvert/files/digest-kconvert-1.1-r1
new file mode 100644
index 000000000000..2e2b6ef8a3ca
--- /dev/null
+++ b/sci-calculators/kconvert/files/digest-kconvert-1.1-r1
@@ -0,0 +1 @@
+MD5 7ae71d48d637549cd233ff2e7e1c311e kconvert-1.1.tar.gz 440218
diff --git a/sci-calculators/kconvert/files/kconvert-1.1-arts-configure.patch b/sci-calculators/kconvert/files/kconvert-1.1-arts-configure.patch
new file mode 100644
index 000000000000..eb8eb69a882a
--- /dev/null
+++ b/sci-calculators/kconvert/files/kconvert-1.1-arts-configure.patch
@@ -0,0 +1,135 @@
+--- configure.orig	2005-02-24 17:05:17.967356592 +0000
++++ configure	2005-02-24 17:07:25.941901504 +0000
+@@ -10820,132 +10820,6 @@
+ 
+    fi
+ 
+-   echo "$as_me:10823: 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:10868: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-
+-    { { echo "$as_me:10871: 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:10880: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
+-      MCOPIDL=$kde_cv_path
+-
+-   fi
+-
+-   echo "$as_me:10886: 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:10931: result: not found" >&5
+-echo "${ECHO_T}not found" >&6
+-
+-    { { echo "$as_me:10934: 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:10943: result: $kde_cv_path" >&5
+-echo "${ECHO_T}$kde_cv_path" >&6
+-      ARTSCCONFIG=$kde_cv_path
+-
+-   fi
+-
+    echo "$as_me:10949: checking for kde-config" >&5
+ echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
+    if test -n "$KDECONFIG"; then
diff --git a/sci-calculators/kconvert/kconvert-1.1-r1.ebuild b/sci-calculators/kconvert/kconvert-1.1-r1.ebuild
new file mode 100644
index 000000000000..5b3ba5450be8
--- /dev/null
+++ b/sci-calculators/kconvert/kconvert-1.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/kconvert/kconvert-1.1-r1.ebuild,v 1.1 2005/02/24 17:22:27 cryos Exp $
+
+inherit kde
+
+DESCRIPTION="KDE tool to cnovert between different units"
+HOMEPAGE="http://apps.kde.com/na/2/counter/vid/5632/kcurl"
+SRC_URI="http://ftp.kde.com/Math_Science/KConvert/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+
+need-kde 3
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	kde_src_unpack
+	use arts || epatch ${FILESDIR}/${P}-arts-configure.patch
+}
diff --git a/sci-calculators/kconvert/kconvert-1.1.ebuild b/sci-calculators/kconvert/kconvert-1.1.ebuild
index 12d685690f2b..b0b91eaea7f1 100644
--- a/sci-calculators/kconvert/kconvert-1.1.ebuild
+++ b/sci-calculators/kconvert/kconvert-1.1.ebuild
@@ -1,10 +1,10 @@
-# 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/sci-calculators/kconvert/kconvert-1.1.ebuild,v 1.1 2004/12/24 15:00:13 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-calculators/kconvert/kconvert-1.1.ebuild,v 1.2 2005/02/24 17:22:27 cryos Exp $
 inherit kde-functions
 need-qt 3
 
-DESCRIPTION="Converting Toolbetween Metric and Imperial"
+DESCRIPTION="KDE tool to cnovert between different units"
 HOMEPAGE="http://apps.kde.com/na/2/counter/vid/5632/kcurl"
 SRC_URI="http://ftp.kde.com/Math_Science/KConvert/${P}.tar.gz"