Add patch from upstream to fix configure error w/ GCC 4.5 (bug #322145 by

Bartosz Brachaczek/Thomas Pfaff). Tweak automagic patch to avoid
collision. Fix wxGTK DEPEND (bug #327801 by Arttu Valo).

Package-Manager: portage-2.2_rc88/cvs/Linux x86_64

5 files changed, 125 insertions, 25 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 8144014b0841..d024b71a1e03 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.141 2010/06/16 12:42:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.142 2010/10/04 08:52:58 dirtyepic Exp $
+
+  04 Oct 2010; Ryan Hill <dirtyepic@gentoo.org> audacity-1.3.12.ebuild,
+  files/audacity-1.3.12-automagic.patch, +files/audacity-1.3.12-gcc45.patch:
+  Add patch from upstream to fix configure error w/ GCC 4.5 (bug #322145 by
+  Bartosz Brachaczek/Thomas Pfaff). Tweak automagic patch to avoid
+  collision. Fix wxGTK DEPEND (bug #327801 by Arttu Valo).
 
   16 Jun 2010; Alexis Ballier <aballier@gentoo.org>
   -files/audacity-1.3.7-cflags.patch, -audacity-1.3.9.ebuild,
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 8f1fe85899a9..e8df465b6c93 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX audacity-1.3.12-automagic.patch 2616 RMD160 46df352f4bf38276764361a13788547f9aa96d9e SHA1 f0f36031d277e1fd32681144ae1eb3669a54fc0e SHA256 655dbfc792c0c3373cf7062db0c478a1bd632aa1e7209f19f057a7d983d20960
+AUX audacity-1.3.12-automagic.patch 2227 RMD160 be4438ab70efa46b638e8bcc29d9c6fa6de2998c SHA1 280564911fd67b19ca79c01af10cf396ce6fe405 SHA256 f1f106f0f1e57d91f74dd0a4466edc6efd861bff7909caa4cf0e596aea38b850
+AUX audacity-1.3.12-gcc45.patch 3166 RMD160 173af2b6202e195b18b378855d5124b72b33b4c9 SHA1 415080721c40d871f4c3f4160c578e854ab8641c SHA256 31b220b43f611773d80af756323317f23c9d9009e10bcd1696d1fb9a26ece896
 AUX audacity-1.3.8-automagic.patch 2625 RMD160 af4edacf4d9d331b7daa56d20ee55da5ae7759dc SHA1 4e91de0cecde8a75f14830e9446d6fbb0fc3036a SHA256 a7cc0fd0566877d50d5c8d0568a26dc163f2db1b74314791ff0b4060dafdae81
 AUX audacity-1.3.8-gsocket-conflict.patch 410 RMD160 c5e2716c4a7e9df8d4ebf05a3f226c719c1715e0 SHA1 fe9a1c08399bad5d34839c78c023bd9fea9228fd SHA256 2b77e18c378696392d04e5e1e14285433ee9e904bc95bdd1ec245edfd31efb20
 DIST audacity-minsrc-1.3.12-beta.tar.bz2 6087920 RMD160 47dd021c24fb6ed05a845604db28056d981c28d3 SHA1 3df2187c9e869be6745fb1e1396586b9b0486485 SHA256 f0f55839ca3013d2e43e5114c73d195bc34503685aeab683eafca4d1bbf3b768
 DIST audacity-minsrc-1.3.8.tar.bz2 6734200 RMD160 3ae7ed409520b62f40e4c9fcd49ea5a25827b8a3 SHA1 8b8e5dbbf38546c08eb77005f77648d28836dfd4 SHA256 50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf
-EBUILD audacity-1.3.12.ebuild 2611 RMD160 33e02639afd57b46aa41e2777fc0640952c423ab SHA1 84a20ef7cf1f20e0c31120fd3be16bfec9f56d1a SHA256 8c40dbb66f36465f9f92fc3681c9a5040c693b1cf4010d1b707286df572af496
+EBUILD audacity-1.3.12.ebuild 2660 RMD160 5953c7f89ee7afd1594513e9216ad8d1e407d507 SHA1 46d41740387bc1829b686a1780f79c53e17bb1e0 SHA256 0890c87d57e59966119fc3088fbbfffd96daa2109f7feb8a24af1a2118772028
 EBUILD audacity-1.3.8.ebuild 2645 RMD160 57193ede7b6070a39e273956454b3d1745400eff SHA1 4416347b21cfe056a3be4d5b8db69d5d1ebbf378 SHA256 f1be23f771d0ca552a85af52783a5ec14a9ec3818a624b7856273f98ab2c7cfb
-MISC ChangeLog 23384 RMD160 713a95fa56716d2fb79464ba93a0a7b57c425329 SHA1 03f44e2253eb6cc3642dfaa82ebcc5b58d6ba629 SHA256 ed809a44c72ce1851683773aa588027e297653d2f9b36f790b6413fb04619c2c
+MISC ChangeLog 23737 RMD160 478176888831edb7afff27bf3d1146d1f7ed6bc3 SHA1 6e08800923e0c9e0809028c12bd5af206cc6e2c3 SHA256 64a76d52cde34981192d350b94bfe16fa5ba5e33f40070139d3bc85b3f1ad212
 MISC metadata.xml 727 RMD160 3306c64d261828fe7ef77a6b10b86bdef95a7e90 SHA1 037f78e7a8bcd2a9691ea7a09078941b385b6737 SHA256 43d8778afc3c468b262cddd50200c8b0c54674fda12b8d8e55b0ce0f8f1a6e85
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwYxsgACgkQvFcC4BYPU0q6lQCeJup9oOErNM/J66aDwxnfBE5y
-epMAn36pXRcSN55st8WQ2m5c6aLSgB9w
-=vQTp
+iEYEARECAAYFAkyplwQACgkQiqiDRvmkBmIfzQCfYuCfGhu7CuawTmmNijERSJIG
+qmoAoKFIkL7yscObnD8FbxeeBSIhPQvN
+=qHkb
 -----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.12.ebuild b/media-sound/audacity/audacity-1.3.12.ebuild
index 9f0c7e2f0bda..7182eba25e8a 100644
--- a/media-sound/audacity/audacity-1.3.12.ebuild
+++ b/media-sound/audacity/audacity-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.1 2010/04/12 08:38:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.12.ebuild,v 1.2 2010/10/04 08:52:58 dirtyepic Exp $
 
 EAPI=2
 
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 RESTRICT="test"
 
-COMMON_DEPEND="=x11-libs/wxGTK-2.8*
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
 	>=app-arch/zip-2.3
 	>=media-libs/libsndfile-1.0.0
 	dev-libs/expat
@@ -49,6 +49,7 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.12-automagic.patch"
+	epatch "${FILESDIR}/${PN}-1.3.12-gcc45.patch"
 	AT_M4DIR="${S}/m4" eautoreconf
 }
 
diff --git a/media-sound/audacity/files/audacity-1.3.12-automagic.patch b/media-sound/audacity/files/audacity-1.3.12-automagic.patch
index a7aa66d83d46..92405e9413ae 100644
--- a/media-sound/audacity/files/audacity-1.3.12-automagic.patch
+++ b/media-sound/audacity/files/audacity-1.3.12-automagic.patch
@@ -1,7 +1,6 @@
-diff -ur ../audacity-src-1.3.12-beta.orig/configure.in ./configure.in
---- ../audacity-src-1.3.12-beta.orig/configure.in	2010-03-30 12:32:42.000000000 +0100
-+++ ./configure.in	2010-04-02 17:03:07.154028262 +0100
-@@ -559,6 +559,8 @@
+--- a/configure.in
++++ b/configure.in
+@@ -559,6 +559,8 @@ case "${host_os}" in
  esac
  
  dnl PortAudio configuration
@@ -10,7 +9,7 @@ diff -ur ../audacity-src-1.3.12-beta.orig/configure.in ./configure.in
  
  LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
  EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
-@@ -575,13 +577,21 @@
+@@ -575,13 +577,21 @@ case "${host_os}" in
        ;;
     *)
        dnl Unix
@@ -39,19 +38,18 @@ diff -ur ../audacity-src-1.3.12-beta.orig/configure.in ./configure.in
        fi
        AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
        if [[ $have_asihpi = "yes" ]] ; then
-Only in .: configure.in.orig
-diff -ur ../audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac ./lib-src/portmixer/configure.ac
---- ../audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac	2010-03-30 12:29:47.000000000 +0100
-+++ ./lib-src/portmixer/configure.ac	2010-04-02 17:03:07.154028262 +0100
-@@ -97,6 +97,7 @@
- AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
- AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
+--- a/lib-src/portmixer/configure.ac
++++ b/lib-src/portmixer/configure.ac
+@@ -31,6 +31,8 @@ AC_ARG_ENABLE([debug],
+   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
+   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
  
 +AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++
  #
- # Set up to use the identified ones
+ # Check for portaudio path
  #
-@@ -107,7 +108,7 @@
+@@ -107,7 +109,7 @@ if [[ $have_oss = "yes" ]] ; then
     objects="$objects px_unix_oss.o"
  fi
  
@@ -60,4 +58,3 @@ diff -ur ../audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac ./lib-s
     AC_MSG_NOTICE(Including support for ALSA);
     AC_DEFINE(PX_USE_LINUX_ALSA)
     objects="$objects px_linux_alsa.o"
-Only in ./lib-src/portmixer: configure.ac.orig
diff --git a/media-sound/audacity/files/audacity-1.3.12-gcc45.patch b/media-sound/audacity/files/audacity-1.3.12-gcc45.patch
new file mode 100644
index 000000000000..198873c57f90
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.12-gcc45.patch
@@ -0,0 +1,95 @@
+https://bugs.gentoo.org/322145
+http://bugzilla.audacityteam.org/show_bug.cgi?id=221
+
+--- lib-src/portmixer/configure.ac
++++ lib-src/portmixer/configure.ac
+@@ -49,34 +49,57 @@
+ fi
+ 
+ #
++# Check which APIs are available
++#
++
++have_oss=no
++AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
++
++AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no)
++AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
++AC_CHECK_HEADER(windows.h, have_windows=yes, have_windows=no)
++
++#
+ # Make sure the support is there
+ #
+ have_support=yes
+-AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
+-		AC_MSG_WARN("Missing support in pa_win_ds.h");
+-fi
+-AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
++
++if [[ $have_alsa = "yes" ]] ; then
++	AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in pa_linux_alsa.h");
++	fi
+ fi
+-AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
+-		AC_MSG_WARN("Missing support in pa_win_wmme.h");
+-fi
+-AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
++
++if [[ $have_coreaudio = "yes" ]] ; then
++	AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in pa_mac_core.h");
++	fi
+ fi
+-AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
+-if [[ $have_support = "no" ]] ; then
++
++if [[ $have_oss = "yes" ]] ; then
++	AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in pa_unix_oss.h");
++	fi
+ fi
++
++if [[ $have_windows = "yes" ]] ; then
++	AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
++		AC_MSG_WARN("Missing support in pa_win_ds.h");
++	fi
++	AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
++	if [[ $have_support = "no" ]] ; then
++		AC_MSG_WARN("Missing support in pa_win_wmme.h");
++	fi
++fi
++
+ AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h], , [have_support=no])
+ if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in portaudio.h");
+ fi
+-
+ if [[ $have_support = "no" ]] ; then
+    AC_MSG_ERROR("Your version of portaudio does not include required functions"); 
+ fi
+@@ -88,16 +111,6 @@
+ AC_SUBST( objects, [px_mixer.o] )
+ 
+ #
+-# Check which APIs are available
+-#
+-
+-have_oss=no
+-AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
+-
+-AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
+-AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
+-
+-#
+ # Set up to use the identified ones
+ #
+ AC_MSG_NOTICE(---------------------------------------);