Version bump (bug #363751). Migrate to virtual/ffmpeg (bug #362109) and update to EAPI 4.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 180 insertions, 2 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 880758c6b085..b9f23b2729aa 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/audacity
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.151 2011/03/24 15:59:17 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.152 2011/04/19 02:13:49 radhermit Exp $
+
+*audacity-1.3.13 (19 Apr 2011)
+
+  19 Apr 2011; Tim Harder <radhermit@gentoo.org> +audacity-1.3.13.ebuild,
+  +files/audacity-1.3.13-automagic.patch:
+  Version bump (bug #363751). Migrate to virtual/ffmpeg (bug #362109) and
+  update to EAPI 4.
 
   24 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org>
   audacity-1.3.12.ebuild:
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 8536b636fd13..0f056ad51c42 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,13 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX audacity-1.3.12-automagic.patch 2227 RMD160 be4438ab70efa46b638e8bcc29d9c6fa6de2998c SHA1 280564911fd67b19ca79c01af10cf396ce6fe405 SHA256 f1f106f0f1e57d91f74dd0a4466edc6efd861bff7909caa4cf0e596aea38b850
 AUX audacity-1.3.12-ffmpeg.patch 2247 RMD160 278ecc43b796dc272be6d70cd4d233d5e5704ddd SHA1 601b893304d359596919acd1429764910035692d SHA256 07d325b3a3aacb2b264327c4d57d5769dbab3dce13f32c91cafe8c64db7e8a08
 AUX audacity-1.3.12-gcc45.patch 3166 RMD160 173af2b6202e195b18b378855d5124b72b33b4c9 SHA1 415080721c40d871f4c3f4160c578e854ab8641c SHA256 31b220b43f611773d80af756323317f23c9d9009e10bcd1696d1fb9a26ece896
 AUX audacity-1.3.12-portaudio-shell.patch 372 RMD160 6c53e1a94b82c41691adf18a9933bb9ac483d263 SHA1 53e0db1b0db818f27a8563d1ae402d5bda24e298 SHA256 0d89f40ebc9a73a656319b009828ea50b0e3e15d220493c313f6ad02f8321974
 AUX audacity-1.3.12-widget-extra-only-needed-cflags.patch 944 RMD160 8aa031e43d7c2ec19c02840d21bb341dc9d0a686 SHA1 df5834728ed26f414ca0aa2904aac3f88e0b4afb SHA256 e8765b9d8abe0b4fb5e1b83a3c2dfdabd48c808795220db9e893c83a0e8fcd3f
+AUX audacity-1.3.13-automagic.patch 2306 RMD160 1b5177bdeee1acd55f09b8c428114d0a7e8fc719 SHA1 7ea05df2066602d080308f33813518cde5878bf6 SHA256 5ed3dddb9e095b7f17437ea0d62f357e14cef7e64987b393aa47589541cccbb2
 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.13-beta.tar.bz2 6450901 RMD160 36c7e8b6dbd5dbfd265afe00fd7ea6e34894a29e SHA1 47a1340699958c8e1804f374209835be865d7027 SHA256 4c2eda638e16e16dfddd202e86ccbe1d170b04c26cfb2c12ffcba0b79e7e1e83
 DIST audacity-minsrc-1.3.8.tar.bz2 6734200 RMD160 3ae7ed409520b62f40e4c9fcd49ea5a25827b8a3 SHA1 8b8e5dbbf38546c08eb77005f77648d28836dfd4 SHA256 50132fead4de4382e603fa14f0a7ffe87c4db86ddcfda1a472b8fa0dc7fb41cf
 EBUILD audacity-1.3.12.ebuild 2795 RMD160 192a0794f22f5f9978655ca7f8ee040ed0ce386e SHA1 a4345e100fdc9a63b811365d695315e882a91de0 SHA256 63a0cb8297423b3a19aa99889fde48c57b0a2d52abeccb8c3a1e1492e6bf3791
+EBUILD audacity-1.3.13.ebuild 2575 RMD160 de50b9f621bd66165a37d52ce546b74e01bb84d6 SHA1 daf3a91ff438bd89b233bad9c72cf47da26143c2 SHA256 6037f7dcf20153f1acee29594d5860832211468f6031a06683622c5dc236d9c2
 EBUILD audacity-1.3.8.ebuild 2699 RMD160 185af076fe1282edbc9967806ccddb6e1cc308a1 SHA1 627e347be9963b0d3bb72ece4a18ff0e95ae5144 SHA256 a9c2115cf926a3a6eff6f97d1ec24b2e2b1f7a580093001af446afebd3211df0
-MISC ChangeLog 25157 RMD160 ddd8715abcf12c567561369364e635bcf107bdd5 SHA1 aea8d5547ec992b18e681b6e02be319f298089f6 SHA256 f2e831264e5725483526387409261f38d9a714bd40060d6d641fadd9b8f95451
+MISC ChangeLog 25399 RMD160 26679f3d82a1563b8191d503981cd35ecb91ba63 SHA1 fff5fc52759e73e79b1c02a9273b2c5982614154 SHA256 a0f1d17c573ae22682bb49faeef35a7fbbcbf5421011e00d6327ce177e259b16
 MISC metadata.xml 727 RMD160 3306c64d261828fe7ef77a6b10b86bdef95a7e90 SHA1 037f78e7a8bcd2a9691ea7a09078941b385b6737 SHA256 43d8778afc3c468b262cddd50200c8b0c54674fda12b8d8e55b0ce0f8f1a6e85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNrO/mAAoJEEqz6FtPBkyjoD4H/iqepiNUYNzbiIuiLcCoDTaJ
+AmJQfdEdbZ6zxlU0RDAIQC6hhJ+Ka52j+0faMBlSWdYl+kVNI6csaOqyGfYBCOQ4
+UVyoHMZrTUZmYt1wgaDUZ8IVaaZzg06jV7DBXALtCtQJj5FgKz2oDsVbhwHGJSH5
+pTtV3auGe3XV6MqbGWYx4KGQdvcODdjuzTyCtccxpWwh1d1YywzBpT2uzpm8w06d
+Kac6/YGd2f76al0G/i8pW/djjGPpChGbsqS0c60V3EeQn3WOOD9Ws5QjgSr0BdSc
+qjUuiIgdNT+C26W0JFs1M/kNCO1YP+GSWU1FtGPPp/IIMccr3y4O94Qxt+UxVLk=
+=E8RP
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.13.ebuild b/media-sound/audacity/audacity-1.3.13.ebuild
new file mode 100644
index 000000000000..e0244d0a7265
--- /dev/null
+++ b/media-sound/audacity/audacity-1.3.13.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.13.ebuild,v 1.1 2011/04/19 02:13:50 radhermit Exp $
+
+EAPI=4
+
+inherit eutils wxwidgets autotools versionator
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}-beta"
+MY_T="${PN}-minsrc-${MY_PV}-beta"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://audacity.sourceforge.net/"
+SRC_URI="http://${PN}.googlecode.com/files/${MY_T}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+	>=app-arch/zip-2.3
+	>=media-libs/libsndfile-1.0.0
+	dev-libs/expat
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	mp3? ( >=media-libs/libmad-0.14.2b )
+	flac? ( >=media-libs/flac-1.2.0[cxx] )
+	id3tag? ( media-libs/libid3tag )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+	twolame? ( media-sound/twolame )
+	ffmpeg? ( virtual/ffmpeg )
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#	lv2? ( >=media-libs/slv2-0.6.0 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-automagic.patch"
+	AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+	WX_GTK_VER="2.8"
+	need-wxwidgets unicode
+
+	# * always use system libraries if possible
+	# * options listed in the order that configure --help lists them
+	# * if libsamplerate not requested, use libresample instead.
+	econf \
+		--enable-unicode \
+		--enable-nyquist \
+		$(use_enable ladspa) \
+		--with-libsndfile=system \
+		--with-expat=system \
+		$(use_with libsamplerate) \
+		$(use_with !libsamplerate libresample) \
+		$(use_with vorbis libvorbis) \
+		$(use_with mp3 libmad) \
+		$(use_with flac libflac) \
+		$(use_with id3tag libid3tag) \
+		$(use_with soundtouch) \
+		$(use_with vamp libvamp) \
+		$(use_with twolame libtwolame) \
+		$(use_with ffmpeg) \
+		$(use_with midi) \
+		$(use_with alsa) \
+		$(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Remove bad doc install
+	rm -rf "${D}"/usr/share/doc
+
+	# Install our docs
+	dodoc README.txt
+}
diff --git a/media-sound/audacity/files/audacity-1.3.13-automagic.patch b/media-sound/audacity/files/audacity-1.3.13-automagic.patch
new file mode 100644
index 000000000000..4e7c2917e5db
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.13-automagic.patch
@@ -0,0 +1,61 @@
+--- audacity-src-1.3.13-beta.orig/configure.in
++++ audacity-src-1.3.13-beta/configure.in
+@@ -173,6 +173,9 @@
+             lib_preference=$withval,
+             lib_preference="system local")
+ 
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
++
+ dnl AC_ARG_WITH(wx-version,
+ dnl            [AS_HELP_STRING([--with-wx-version],
+ dnl                            [select wxWidgets version (if both installed) [2.8,]])],
+@@ -574,13 +577,21 @@
+       ;;
+    *)
+       dnl Unix
+-      AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+-      if [[ $have_alsa = "yes" ]] ; then
+-         LIBS="$LIBS -lasound"
+-      fi
+-      PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
+-      if [[ $have_jack = "yes" ]] ; then
+-         LIBS="$LIBS $JACK_LIBS"
++      if test "x$with_alsa" != "xno"; then
++         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
++         if [[ $have_alsa = "yes" ]] ; then
++            LIBS="$LIBS -lasound"
++        else
++            AC_MSG_WARN([Support for alsa not available])
++         fi
++      fi        
++      if test "x$with_jack" != "xno"; then
++         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
++         if [[ $have_jack = "yes" ]] ; then
++            LIBS="$LIBS $JACK_LIBS"
++        else
++            AC_MSG_WARN([Support for jack not available])
++         fi
+       fi
+       AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
+       if [[ $have_asihpi = "yes" ]] ; then
+--- audacity-src-1.3.13-beta.orig/lib-src/portmixer/configure.ac
++++ audacity-src-1.3.13-beta/lib-src/portmixer/configure.ac
+@@ -31,6 +31,8 @@
+   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
+   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
+ 
++AC_ARG_WITH([alsa], AC_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++
+ #
+ # Check for portaudio path
+ #
+@@ -133,7 +135,7 @@
+    have_support=yes
+ fi
+ 
+-if [[ $have_alsa = "yes" ]] ; then
++if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
+    AC_MSG_NOTICE([Including support for ALSA])
+    AC_DEFINE(PX_USE_LINUX_ALSA)
+    objects="$objects px_linux_alsa.o"