Change the ebuild to use the kde eclass.

Package-Manager: portage-2.0.51.19

5 files changed, 104 insertions, 31 deletions

diff --git a/media-sound/k3guitune/ChangeLog b/media-sound/k3guitune/ChangeLog
index 62256de46165..275dc8dbb3da 100644
--- a/media-sound/k3guitune/ChangeLog
+++ b/media-sound/k3guitune/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/k3guitune
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/ChangeLog,v 1.7 2004/10/15 09:18:03 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/ChangeLog,v 1.8 2005/04/03 16:48:08 greg_g Exp $
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/k3guitune-0.4.1-configure.patch, metadata.xml,
+  k3guitune-0.4.1.ebuild:
+  Change the ebuild to use the kde eclass.
 
   15 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
   Added arts as a dependency because you can't build without mcopidl.
diff --git a/media-sound/k3guitune/Manifest b/media-sound/k3guitune/Manifest
index c70e38a5fd29..9c9da5264d0e 100644
--- a/media-sound/k3guitune/Manifest
+++ b/media-sound/k3guitune/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c414db75a6e927f368c5e91aae39358a ChangeLog 1115
-MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
-MD5 4648657cb5aebe0fceb2b3954af6ecde k3guitune-0.4.1.ebuild 852
+MD5 8939f3ac1b8e4bbd549b3aa643d12c5a metadata.xml 245
+MD5 07a25c3337fac5d12454ea39685de35a k3guitune-0.4.1.ebuild 755
+MD5 bf631d920a244992fbd2640723514ddb ChangeLog 1287
 MD5 78dbcff7a5cfeefae7ca2772b582de38 files/digest-k3guitune-0.4.1 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBb5XVArHZZzCEUG0RAlFjAJ9bbGvnHL2J7niZBBhduxQtF4yV0wCfVI1X
-yMdoPBmLPQO68wZwGB7K47A=
-=sq7P
------END PGP SIGNATURE-----
+MD5 5b7366832476e18b4d3ba25a7c2a823a files/k3guitune-0.4.1-configure.patch 1964
diff --git a/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch b/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch
new file mode 100644
index 000000000000..de1e258c9a1a
--- /dev/null
+++ b/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch
@@ -0,0 +1,75 @@
+diff -Nur k3guitune-0.4.1.orig/configure k3guitune-0.4.1/configure
+--- k3guitune-0.4.1.orig/configure	2004-08-18 15:10:29.000000000 +0200
++++ k3guitune-0.4.1/configure	2005-04-03 18:41:51.000000000 +0200
+@@ -14073,71 +14073,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
diff --git a/media-sound/k3guitune/k3guitune-0.4.1.ebuild b/media-sound/k3guitune/k3guitune-0.4.1.ebuild
index 36ed77992646..fba05c7f182f 100644
--- a/media-sound/k3guitune/k3guitune-0.4.1.ebuild
+++ b/media-sound/k3guitune/k3guitune-0.4.1.ebuild
@@ -1,29 +1,30 @@
-# 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/media-sound/k3guitune/k3guitune-0.4.1.ebuild,v 1.5 2004/10/15 09:18:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/k3guitune-0.4.1.ebuild,v 1.6 2005/04/03 16:48:08 greg_g Exp $
 
-IUSE="alsa oss debug xinerama"
+inherit kde
 
-DESCRIPTION="A program for KDE 3 that lets you tune musical instruments."
+DESCRIPTION="A program for KDE that lets you tune musical instruments."
 HOMEPAGE="http://home.planet.nl/~lamer024/k3guitune.html"
 SRC_URI="http://home.planet.nl/~lamer024/files/${P}.tar.bz2"
-
 LICENSE="GPL-2"
+
 SLOT="0"
 KEYWORDS="x86 ~ppc amd64"
+IUSE="alsa arts oss"
 
-DEPEND=">=kde-base/kdelibs-3
-	kde-base/arts
-	alsa? ( media-libs/alsa-lib )"
+DEPEND="alsa? ( media-libs/alsa-lib )"
 
-src_compile() {
-	local myconf
-	myconf="$(use_enable alsa) $(use_enable oss) $(use_enable debug) $(use_with xinerama)"
-	econf ${myconf} || die
-	emake || die
+need-kde 3
+
+src_unpack() {
+	kde_src_unpack
+
+	use arts || epatch "${FILESDIR}/${P}-configure.patch"
 }
 
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
+src_compile() {
+	local myconf="$(use_enable alsa) $(use_enable arts) $(use_enable oss)"
+
+	kde_src_compile
 }
diff --git a/media-sound/k3guitune/metadata.xml b/media-sound/k3guitune/metadata.xml
index f82b535a5130..a88dc78de2f0 100644
--- a/media-sound/k3guitune/metadata.xml
+++ b/media-sound/k3guitune/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sound</herd>
+<herd>kde-other</herd>
 <maintainer>
   <email>pkdawson@gentoo.org</email>
 </maintainer>