Update the patch (and the econf options) with what upstream wanted, just to avoid diverging.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 38 insertions, 28 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index c38c75df6d42..ce1cd4252bd8 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.80 2008/11/13 00:39:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.81 2008/11/13 12:30:00 flameeyes Exp $
+
+  13 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/alsa-plugins-1.0.18-automagic.patch, alsa-plugins-1.0.18.ebuild:
+  Update the patch (and the econf options) with what upstream wanted, just
+  to avoid diverging.
 
 *alsa-plugins-1.0.18 (13 Nov 2008)
 
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index ba2a254f7283..df18e33ce09d 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -7,7 +7,7 @@ AUX alsa-plugins-1.0.12-automagic.patch 2414 RMD160 bef06a60e3a97d3a672df7031411
 AUX alsa-plugins-1.0.14_rc1-automagic.patch 2892 RMD160 46c8541aa738d7f1b78c07318bc26bb7739020f2 SHA1 ad5ff0d6c6eb807ce06d71d2dff2600877bc3ac6 SHA256 04a820b2c2a0ce7c518fceafa290965b9caec62a6293938b74c1c828080f2ce0
 AUX alsa-plugins-1.0.14_rc1-init-ffmpeg.patch 393 RMD160 2c39a3bc0860cebd86542f3afe60f061146b4efa SHA1 ac1839723063fcf3286d1ddf1bd291ba6c0b1220 SHA256 6dfabe2b373e702ebd617754e4a4a32d4fccd1e35c47b280136fe49c2faa8b1e
 AUX alsa-plugins-1.0.17-automagic.patch 2409 RMD160 9a4f13962e395de52c9b1b5c4d38e2f7d5f5b97d SHA1 e389bfbdb2d0d50f577e36a7cf00b58b752a2621 SHA256 5272c5f0d86d577f517d0652a4b7eee9977adb25aefa71d0a8690e5bc1607df0
-AUX alsa-plugins-1.0.18-automagic.patch 2807 RMD160 8f223e44ceed993445a4864434cf458448981d18 SHA1 0d5406843f067fd705ee5f14a86624f5a8d01ee0 SHA256 29fe5e3e357fb2bf1420bb0046e02589d032f6c1d8d819689f800081955ac18e
+AUX alsa-plugins-1.0.18-automagic.patch 2980 RMD160 792d3b3c49849a47dba14db36a552531928f434e SHA1 42975db4ed1c14805e1c9656f238d98d72c94f12 SHA256 bcdf59d7d2d55498cb67b14dd6539c6b7944d837aa504f3f3993e130d1c4bbd3
 AUX ffmpeg-headers.patch 2016 RMD160 2a0e21f32de08172912d14ab007db1af46bf4e96 SHA1 dc1e77310c76c135798669cb36f880beae6cb249 SHA256 9badd3be64569e92b45353175e4db1e977cf7c5c18d1fb489405fd3c94bb1e45
 DIST alsa-plugins-1.0.15.tar.bz2 306676 RMD160 8064f45f5ffeb24a0e70b0465ba1c15837744133 SHA1 513ce4035bd4bd95f1e2d125aab567be53160d72 SHA256 3fec2349a94254c82dd568a8f4f8b8ef9735aee7dc56a5cf93e80f5938df9e95
 DIST alsa-plugins-1.0.16.tar.bz2 306914 RMD160 8ff2960cc139b1e9988c2c10cc45b9950193cb39 SHA1 692bbe5871547db33ffd8cf78e5f894cb2080a2d SHA256 ff6da9a1208363be135c27ee31d26e45dc2ff2124654f03f9fd1c20ac99f78da
@@ -16,13 +16,13 @@ DIST alsa-plugins-1.0.18.tar.bz2 312656 RMD160 83b570d5346c7c79f5fe628e381ba1cf8
 EBUILD alsa-plugins-1.0.15.ebuild 2185 RMD160 3389c1ebbad1bd2e2a5e9b25bd895c0ca885fc6b SHA1 814347e456cf4f923a7c4d717a4659aa5fcd672c SHA256 bbea051f98ae1f8078e51d728cce0fc0ee4a3d2e211c7a6cd97fd1edb573242a
 EBUILD alsa-plugins-1.0.16.ebuild 2199 RMD160 8be103cba6c1213b0b846ab124f5f28e4c852dde SHA1 0217716ff51d5ea931da448e219f2c1a49338519 SHA256 48469aa1bc70722677330a5a6a9939394e8a6f5a196ad125548ef370cec3992b
 EBUILD alsa-plugins-1.0.17-r1.ebuild 1998 RMD160 c0497b50c678d0f2ce333925e44a0cc12e729b7c SHA1 d7c77da8649a676ac863c4c9e20591cf82c3808a SHA256 72b58499c5701d61965b984536f6a5508745fb03ee149ad89d05d97fb4ad7ccd
-EBUILD alsa-plugins-1.0.18.ebuild 1984 RMD160 557f0fd48926f31cfc9c9be6b14742a7adacc377 SHA1 9d23efa61fb704824b72df6fb5c133b8453bd865 SHA256 bad6f6c7dafa2523e25f26c75658fa2b56fb715e7f16a98135a1250775f2458d
-MISC ChangeLog 12629 RMD160 9fd26a281e3c6ba53725dfa21de4850d910a28a1 SHA1 f1b4f4329326d7afe2965dc962d44f7cf6717d5f SHA256 9c33d33f67154965f01bacc534cb15d93e182994171440ba93a0c23664e7e9dc
+EBUILD alsa-plugins-1.0.18.ebuild 1992 RMD160 bd6680f030cdccac1da874a9e9e99c8e52d38c1c SHA1 4b77d9b73890e0d5210065aeb288c468b677392b SHA256 07ec281c1e13c9b84c8fb497efa0039ee962e0bf554a0b81b2a3b6684dc5d664
+MISC ChangeLog 12853 RMD160 41abca7fef9fbacf8dc3999c191c80e6d3da8f73 SHA1 0997b60d68e8080df874b90f0df9cd75c935de1d SHA256 2975bb7522cb8f6a46d60441a058e9c7cc38b02303326f558b0d493eae094bff
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkbdzkACgkQAiZjviIA2XhonACffnF15dToPHODba/IQT4CbKJB
-CwcAniE0J1uGKUQf0iW3alNIjlypsK+F
-=g0WS
+iEYEARECAAYFAkkcHc0ACgkQAiZjviIA2XiNTACdEQU3D9c6bD5aOLC7SLutnSZe
+tcYAoKdnia+A7bW3dFtyt1vqeTJk/clT
+=G9W7
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.18.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.18.ebuild
index 58c2f1e5670c..48a79a8f7d61 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.18.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.18.ebuild,v 1.1 2008/11/13 00:39:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.18.ebuild,v 1.2 2008/11/13 12:30:00 flameeyes Exp $
 
 EAPI=2
 
@@ -51,10 +51,10 @@ src_configure() {
 	use debug || append-flags -DNDEBUG
 
 	econf \
-		$(use_with ffmpeg avcodec) \
-		$(use_with jack) \
-		$(use_with libsamplerate samplerate) \
-		$(use_with pulseaudio) \
+		$(use_enable ffmpeg avcodec) \
+		$(use_enable jack) \
+		$(use_enable libsamplerate samplerate) \
+		$(use_enable pulseaudio) \
 		$(use_with speex speex lib) \
 		--disable-dependency-tracking \
 		|| die "econf failed"
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.18-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.18-automagic.patch
index 8720f8c4852b..a85114d7a990 100644
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.18-automagic.patch
+++ b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.18-automagic.patch
@@ -1,7 +1,10 @@
-From 4aed9c0b2ae244f1a57337ff8c3dc6070c087c49 Mon Sep 17 00:00:00 2001
+From 8e4cd0e52ceda7acbf52616beadf7a355208400e Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Diego=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
-Date: Thu, 13 Nov 2008 01:23:35 +0100
+Date: Thu, 13 Nov 2008 13:10:31 +0100
 Subject: [PATCH] Allow opt-out from jack, pulseaudio and avcodec dependencies.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
 
 Without this patch the jack, pulseaudio and avcodec discovery was
 "automagic", without a way for the user to disable the relative
@@ -10,12 +13,14 @@ plugins if the dependencies are installed but the plugin is unwanted.
 This patch does not change the default behaviour but allows to opt-out
 from the plugins by passing the relative --without option at
 ./configure time.
+
+Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
 ---
  configure.in |   31 ++++++++++++++++++++++++++-----
  1 files changed, 26 insertions(+), 5 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index 9efb890..ffb6528 100644
+index 9efb890..4b5b278 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -15,13 +15,28 @@ PKG_CHECK_MODULES(ALSA, alsa >= 1.0.11)
@@ -23,28 +28,28 @@ index 9efb890..ffb6528 100644
  	     AC_ERROR([*** libasound has no external plugin SDK]), -ldl)
  
 -PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no])
-+AC_ARG_WITH([jack],
-+      AS_HELP_STRING([--without-jack], [Disable building of JACK plugin]))
++AC_ARG_ENABLE([jack],
++      AS_HELP_STRING([--disable-jack], [Disable building of JACK plugin]))
 +
-+if test "x$with_jack" != "xno"; then
++if test "x$enable_jack" != "xno"; then
 +  PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no])
 +fi
  AM_CONDITIONAL(HAVE_JACK, test x$HAVE_JACK = xyes)
  
 -PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no])
-+AC_ARG_WITH([pulseaudio],
-+      AS_HELP_STRING([--without-pulseaudio], [Disable building of pulseaudio plugin]))
++AC_ARG_ENABLE([pulseaudio],
++      AS_HELP_STRING([--disable-pulseaudio], [Disable building of pulseaudio plugin]))
 +
-+if test "x$with_pulseaudio" != "xno"; then
++if test "x$enable_pulseaudio" != "xno"; then
 +  PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no])
 +fi
  AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes)
  
 -PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no])
-+AC_ARG_WITH([samplerate],
-+      AS_HELP_STRING([--without-samplerate], [Disable building of samplerate plugin]))
++AC_ARG_ENABLE([samplerate],
++      AS_HELP_STRING([--disable-samplerate], [Disable building of samplerate plugin]))
 +
-+if test "x$with_samplerate" != "xno"; then
++if test "x$enable_samplerate" != "xno"; then
 +  PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no])
 +fi
  AM_CONDITIONAL(HAVE_SAMPLERATE, test x$HAVE_SAMPLERATE = xyes)
@@ -56,14 +61,14 @@ index 9efb890..ffb6528 100644
  
 -PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
 -if test "$HAVE_AVCODEC" != "yes"; then
-+AC_ARG_WITH([avcodec],
-+      AS_HELP_STRING([--without-avcodec], [Don't build plugins depending on avcodec (a52)]))
++AC_ARG_ENABLE([avcodec],
++      AS_HELP_STRING([--disable-avcodec], [Don't build plugins depending on avcodec (a52)]))
 +
-+if test "x$with_avcodec" != "xno"; then
++if test "x$enable_avcodec" != "xno"; then
 +  PKG_CHECK_MODULES(AVCODEC, [libavcodec], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
 +fi
 +
-+if test "$HAVE_AVCODEC" = "no"; then
++if test "x$HAVE_AVCODEC" = "xno"; then
    AC_ARG_WITH([avcodec-includedir],
  	AS_HELP_STRING([--with-avcodec-includedir=dir],
  		[AVcodec include directory]),