remove old and fix build with gcc 4.3 for latest version

(Portage version: 2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64)

7 files changed, 23 insertions, 370 deletions

diff --git a/media-sound/k3guitune/ChangeLog b/media-sound/k3guitune/ChangeLog
index 4eaf0e07c0d6..be10afb6e922 100644
--- a/media-sound/k3guitune/ChangeLog
+++ b/media-sound/k3guitune/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/k3guitune
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/ChangeLog,v 1.17 2008/06/21 09:28:51 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/ChangeLog,v 1.18 2008/08/06 22:57:52 aballier Exp $
+
+  06 Aug 2008; Alexis Ballier <aballier@gentoo.org>
+  -files/k3guitune-0.4.1-configure.patch,
+  -files/k3guitune-0.5-configure.patch, +files/k3guitune-1.0-gcc43.patch,
+  -k3guitune-0.4.1.ebuild, -k3guitune-0.5.ebuild, k3guitune-1.0.ebuild:
+  remove old and fix build with gcc 4.3 for latest version
 
   21 Jun 2008; Christian Faulhammer <opfer@gentoo.org> k3guitune-1.0.ebuild:
   stable x86, bug 226769
diff --git a/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch b/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch
deleted file mode 100644
index c7fb661c4eee..000000000000
--- a/media-sound/k3guitune/files/k3guitune-0.4.1-configure.patch
+++ /dev/null
@@ -1,163 +0,0 @@
---- configure.orig	2005-06-30 20:27:58.000000000 +0300
-+++ configure	2005-06-30 20:28:25.000000000 +0300
-@@ -14073,138 +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
--   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
-    if test -n "$KDECONFIG"; then
---- k3guitune/Makefile.am	2004-07-12 12:08:48.000000000 +0300
-+++ k3guitune/Makefile.am	2005-06-30 20:30:54.000000000 +0300
-@@ -4,7 +4,7 @@
- ## INCLUDES were found outside kdevelop specific part
- 
- k3guitune_SOURCES = audiodlg.cpp soundinput.cpp k2guitune.cpp guitune.cpp osziview.cpp main.cpp logview.cpp k2guitune_meta_unload.cpp
--k3guitune_LDADD = -lartsc -lkdeui -lkdecore $(LIBSOCKET)
-+k3guitune_LDADD = -lkdeui -lkdecore $(LIBSOCKET)
- 
- 
- EXTRA_DIST = k3guitune.desktop k2guitune_meta_unload.cpp logview.cpp logview.h main.cpp osziview.cpp osziview.h resources.h guitune.cpp guitune.h k2guitune.cpp k2guitune.h k3guituneui.rc soundinput.h soundinput.cpp audiodlg.h audiodlg.cpp 
---- k3guitune/Makefile.in	2005-06-30 20:31:48.000000000 +0300
-+++ k3guitune/Makefile.in	2005-06-30 20:31:03.000000000 +0300
-@@ -305,7 +305,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- k3guitune_SOURCES = audiodlg.cpp soundinput.cpp k2guitune.cpp guitune.cpp osziview.cpp main.cpp logview.cpp k2guitune_meta_unload.cpp
--k3guitune_LDADD = -lartsc -lkdeui -lkdecore $(LIBSOCKET)
-+k3guitune_LDADD = -lkdeui -lkdecore $(LIBSOCKET)
- EXTRA_DIST = k3guitune.desktop k2guitune_meta_unload.cpp logview.cpp logview.h main.cpp osziview.cpp osziview.h resources.h guitune.cpp guitune.h k2guitune.cpp k2guitune.h k3guituneui.rc soundinput.h soundinput.cpp audiodlg.h audiodlg.cpp 
- 
- ####### kdevelop will overwrite this part!!! (end)############
diff --git a/media-sound/k3guitune/files/k3guitune-0.5-configure.patch b/media-sound/k3guitune/files/k3guitune-0.5-configure.patch
deleted file mode 100644
index abe0885133b9..000000000000
--- a/media-sound/k3guitune/files/k3guitune-0.5-configure.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Nur k3guitune-0.5.orig/configure k3guitune-0.5/configure
---- k3guitune-0.5.orig/configure	2005-08-16 13:29:01.000000000 +0200
-+++ k3guitune-0.5/configure	2005-08-24 09:43:26.000000000 +0200
-@@ -14086,138 +14086,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
-    if test -n "$KDECONFIG"; then
diff --git a/media-sound/k3guitune/files/k3guitune-1.0-gcc43.patch b/media-sound/k3guitune/files/k3guitune-1.0-gcc43.patch
new file mode 100644
index 000000000000..5ac67cc79f46
--- /dev/null
+++ b/media-sound/k3guitune/files/k3guitune-1.0-gcc43.patch
@@ -0,0 +1,13 @@
+Index: k3guitune-1.0/k3guitune/soundinput.h
+===================================================================
+--- k3guitune-1.0.orig/k3guitune/soundinput.h
++++ k3guitune-1.0/k3guitune/soundinput.h
+@@ -41,7 +41,7 @@ class SoundInputException : public std::
+   */
+  class SoundInput {
+   public:
+-    static SoundInput *autodetect( const char *alsa_devicename, const char *dsp_devicename, int &blksize, int &sampfreq, double &sampfreq );
++    static SoundInput *autodetect( const char *alsa_devicename, const char *dsp_devicename, int &blksize, int &sampfreq1, double &sampfreq2 );
+     virtual ~SoundInput();
+     virtual int getData( short int *buf, int blksize ) = 0;
+  };
diff --git a/media-sound/k3guitune/k3guitune-0.4.1.ebuild b/media-sound/k3guitune/k3guitune-0.4.1.ebuild
deleted file mode 100644
index 1ce8dd16e73d..000000000000
--- a/media-sound/k3guitune/k3guitune-0.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.7 2005/08/23 22:23:05 greg_g Exp $
-
-inherit kde eutils
-
-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="alsa? ( media-libs/alsa-lib )"
-
-need-kde 3
-
-src_unpack() {
-	kde_src_unpack
-
-	use arts || epatch "${FILESDIR}/${P}-configure.patch"
-}
-
-src_compile() {
-	local myconf="$(use_enable alsa) $(use_enable arts) $(use_enable oss)"
-
-	kde_src_compile
-}
diff --git a/media-sound/k3guitune/k3guitune-0.5.ebuild b/media-sound/k3guitune/k3guitune-0.5.ebuild
deleted file mode 100644
index bd87d470692a..000000000000
--- a/media-sound/k3guitune/k3guitune-0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/k3guitune-0.5.ebuild,v 1.4 2007/09/21 16:16:35 opfer Exp $
-
-inherit kde eutils
-
-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="amd64 ~ppc x86"
-IUSE="alsa arts oss"
-
-DEPEND="alsa? ( media-libs/alsa-lib )"
-
-need-kde 3
-
-src_unpack() {
-	kde_src_unpack
-
-	use arts || epatch "${FILESDIR}/${P}-configure.patch"
-}
-
-src_compile() {
-	# jack support needs a version of bio2jack not released yet.
-	local myconf="$(use_enable alsa) $(use_enable arts)
-	              $(use_enable oss) --disable-jack"
-
-	kde_src_compile
-}
diff --git a/media-sound/k3guitune/k3guitune-1.0.ebuild b/media-sound/k3guitune/k3guitune-1.0.ebuild
index 19f493ecf14b..3023de624323 100644
--- a/media-sound/k3guitune/k3guitune-1.0.ebuild
+++ b/media-sound/k3guitune/k3guitune-1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/k3guitune-1.0.ebuild,v 1.3 2008/06/21 09:28:51 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/k3guitune/k3guitune-1.0.ebuild,v 1.4 2008/08/06 22:57:52 aballier Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="A program for KDE that lets you tune musical instruments."
 HOMEPAGE="http://home.planet.nl/~lamer024/k3guitune.html"
@@ -30,6 +30,7 @@ done
 
 src_unpack() {
 	kde_src_unpack
+	epatch "${FILESDIR}/${P}-gcc43.patch"
 
 	for X in ${LANGS} ; do
 		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}.po"