alsa-utils-1.0.15_rc1 needs some more "convincing".

Package-Manager: portage-2.1.3.9

4 files changed, 61 insertions, 15 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 2066be8b5e33..56615b10ef4d 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.215 2007/09/17 16:57:06 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.216 2007/09/17 17:06:31 phreak Exp $
+
+  17 Sep 2007; Christian Heim <phreak@gentoo.org>
+  +files/alsa-utils-1.0.15_rc1-seq.patch, alsa-utils-1.0.15_rc1.ebuild:
+  alsa-utils-1.0.15_rc1 needs some more "convincing".
 
 *alsa-utils-1.0.15_rc1 (17 Sep 2007)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 6260b08b202b..650b0ecbc4ab 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -25,6 +25,10 @@ AUX alsa-utils-1.0.14_rc2-seq.patch 1581 RMD160 66b1abc9b0cf810a5d51ae4878754d7f
 MD5 9450bed77397033fbf23bb4074c4b634 files/alsa-utils-1.0.14_rc2-seq.patch 1581
 RMD160 66b1abc9b0cf810a5d51ae4878754d7fd767c3ce files/alsa-utils-1.0.14_rc2-seq.patch 1581
 SHA256 4ee63baf37506098b50d15c21aabadd7d80f7561a824bab541e89b4320da86c7 files/alsa-utils-1.0.14_rc2-seq.patch 1581
+AUX alsa-utils-1.0.15_rc1-seq.patch 1660 RMD160 5dc64e594f8f295eee21ea3152b83e9c9d13255c SHA1 ffa5d1ec3ec8f42bb27914e5f481780be7f1e71b SHA256 654b0df3b4fe026e502914142a8cefe983fd72c23486447e58a36356434a2093
+MD5 f4950a09bfd23833e5e7b3c323615690 files/alsa-utils-1.0.15_rc1-seq.patch 1660
+RMD160 5dc64e594f8f295eee21ea3152b83e9c9d13255c files/alsa-utils-1.0.15_rc1-seq.patch 1660
+SHA256 654b0df3b4fe026e502914142a8cefe983fd72c23486447e58a36356434a2093 files/alsa-utils-1.0.15_rc1-seq.patch 1660
 AUX alsasound-1.0.10_rc2 7183 RMD160 7c1368905cc0fbe266e840f358a3502bbedb6d9c SHA1 70260ad940df48464a4089f014b73956a690eb3e SHA256 f9f51f35e0fafb87ac9d5f2b48835142e34bcaecc30eb28c92e2af6b16d4c083
 MD5 6e3b02ef9e95e47eb339f6a3d0d91daa files/alsasound-1.0.10_rc2 7183
 RMD160 7c1368905cc0fbe266e840f358a3502bbedb6d9c files/alsasound-1.0.10_rc2 7183
@@ -66,14 +70,14 @@ EBUILD alsa-utils-1.0.14_rc2-r3.ebuild 2252 RMD160 a6e22f35ff9c5bb88cda6d61a0711
 MD5 10ccd69d04a5eb566a4cdb0d3691fecf alsa-utils-1.0.14_rc2-r3.ebuild 2252
 RMD160 a6e22f35ff9c5bb88cda6d61a0711899bdbb4ee3 alsa-utils-1.0.14_rc2-r3.ebuild 2252
 SHA256 d76c90e6a2ffeb0237939c151f935963f98d417c7603a9fd21c61959e75b3a4e alsa-utils-1.0.14_rc2-r3.ebuild 2252
-EBUILD alsa-utils-1.0.15_rc1.ebuild 2312 RMD160 426e9128db05cc7dc9d0c539408440a3b8b475ad SHA1 769d1d5aadc4e932c0dd20464a690210bd38dd77 SHA256 9aa58c1db38655eda3ea1e2f1d90b33532609d16ca160c561b6f048dd9ce4b11
-MD5 64c5d09d5945b27fb32b36ad5909f973 alsa-utils-1.0.15_rc1.ebuild 2312
-RMD160 426e9128db05cc7dc9d0c539408440a3b8b475ad alsa-utils-1.0.15_rc1.ebuild 2312
-SHA256 9aa58c1db38655eda3ea1e2f1d90b33532609d16ca160c561b6f048dd9ce4b11 alsa-utils-1.0.15_rc1.ebuild 2312
-MISC ChangeLog 32381 RMD160 ffdc328d21f8db734526badf6bde91a6dd5f9c95 SHA1 fe67bcfbc03e9419df89ad8739fcf8adb936ddca SHA256 ad4d3122159d1eaec5cadaac8401af6b79341501b9fbb7d503e6f1bd86c8a7f1
-MD5 3dc743986556ece98478ac03b86f99b3 ChangeLog 32381
-RMD160 ffdc328d21f8db734526badf6bde91a6dd5f9c95 ChangeLog 32381
-SHA256 ad4d3122159d1eaec5cadaac8401af6b79341501b9fbb7d503e6f1bd86c8a7f1 ChangeLog 32381
+EBUILD alsa-utils-1.0.15_rc1.ebuild 2269 RMD160 5ee6b7f1a006cf5bcb0454ad7a0b86099346f587 SHA1 157f7904ab9921b1a7de428b2f1074fe9c0603e4 SHA256 2b1c1ae082dca2659469ca86f433183d72732787e95747ec5eff2240d553c6aa
+MD5 dd9020923f8f75e6ec7912bba4fb94c2 alsa-utils-1.0.15_rc1.ebuild 2269
+RMD160 5ee6b7f1a006cf5bcb0454ad7a0b86099346f587 alsa-utils-1.0.15_rc1.ebuild 2269
+SHA256 2b1c1ae082dca2659469ca86f433183d72732787e95747ec5eff2240d553c6aa alsa-utils-1.0.15_rc1.ebuild 2269
+MISC ChangeLog 32558 RMD160 a17a9b93e8ca8418f36b5e79e93ad060c1d98b51 SHA1 02297e093c8f44a0a6e09efaa92b7d9dfc908cb8 SHA256 d8c7f6d2846c1de2d5d5ed2492efa6361de462da1bf8fd372a5407975456aff9
+MD5 9ce2c8f01f2f8cb503c41a5fc33c7b40 ChangeLog 32558
+RMD160 a17a9b93e8ca8418f36b5e79e93ad060c1d98b51 ChangeLog 32558
+SHA256 d8c7f6d2846c1de2d5d5ed2492efa6361de462da1bf8fd372a5407975456aff9 ChangeLog 32558
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -99,7 +103,7 @@ SHA256 f3bb99bb7c81d2ab3250d016670381ad12f5d834cc44b9cfe5f3a01feb72671d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG7rHuyuNVb5qfaOYRAk5DAJ9oqmKyUiQuRYLdgpjJV1GhZKV9KgCfY+VW
-GtVTGWQjyFJK5PsuVnjh1Uk=
-=URP4
+iD8DBQFG7rQkyuNVb5qfaOYRAoCBAJ9PCi2rq4L0XyTIfHn5Q2k5yeBbEwCeMuHN
+vL1JbMPtvVzHrdJZ6d98XKk=
+=XQda
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.15_rc1.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.15_rc1.ebuild
index b42200e86cf5..57b221639a9c 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.15_rc1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.15_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.15_rc1.ebuild,v 1.1 2007/09/17 16:57:06 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/alsa-utils-1.0.15_rc1.ebuild,v 1.2 2007/09/17 17:06:31 phreak Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -42,8 +42,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PN}-1.0.11_rc2-nls.patch"
 	epatch "${FILESDIR}/${PN}-1.0.11_rc5-alsaconf-redirect.patch"
-	epatch "${FILESDIR}/${P}-seq.patch"
-	epatch "${FILESDIR}/${P}-remove-debug-printing.patch"
+	epatch "${FILESDIR}/${PN}-1.0.15_rc1-seq.patch"
 
 	AT_M4DIR="m4" eautoreconf
 }
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.15_rc1-seq.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.15_rc1-seq.patch
new file mode 100644
index 000000000000..172be7c15729
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.15_rc1-seq.patch
@@ -0,0 +1,39 @@
+diff -Nrup alsa-utils-1.0.15rc1.orig/Makefile.am alsa-utils-1.0.15rc1/Makefile.am
+--- alsa-utils-1.0.15rc1.orig/Makefile.am	2007-08-30 10:30:27.000000000 +0200
++++ alsa-utils-1.0.15rc1/Makefile.am	2007-09-17 19:03:12.000000000 +0200
+@@ -4,7 +4,12 @@ ALSAMIXER_DIR=alsamixer
+ else
+ ALSAMIXER_DIR=
+ endif
+-SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset seq speaker-test utils m4 po
++
++if BUILD_SEQ
++SEQ_DIR=seq
++endif
++
++SUBDIRS= include alsactl alsaconf $(ALSAMIXER_DIR) amidi amixer aplay iecset $(SEQ_DIR) speaker-test utils m4 po
+ EXTRA_DIST= config.rpath  config.rpath mkinstalldirs ChangeLog INSTALL TODO README configure hgcompile depcomp
+ AUTOMAKE_OPTIONS=foreign
+ ACLOCAL_AMFLAGS = -I m4
+diff -Nrup alsa-utils-1.0.15rc1.orig/configure.in alsa-utils-1.0.15rc1/configure.in
+--- alsa-utils-1.0.15rc1.orig/configure.in	2007-08-30 10:30:29.000000000 +0200
++++ alsa-utils-1.0.15rc1/configure.in	2007-09-17 19:02:27.000000000 +0200
+@@ -82,6 +82,18 @@ AC_ARG_WITH(testsound,
+   TESTSOUND="$dir/test.wav")
+ AC_SUBST(TESTSOUND)
+ 
++AC_ARG_ENABLE([sequencer],
++  [AC_HELP_STRING([--disable-sequencer], [Disable sequencer utilities (aconnect, aplaymidi, aseqdump, aseqnet)])] )
++
++if test "x$enable_sequencer" != "xno"; then
++   AC_CHECK_LIB([asound], [snd_seq_open], [has_seq=yes], [has_seq=no])
++fi
++if test "x$enable_sequencer" = "xyes" && test "x$has_seq" = "xno"; then
++   AC_MSG_FAILURE([cannot find snd_seq_open. ALSA was built without sequencer support])
++fi
++
++AM_CONDITIONAL([BUILD_SEQ], [test "x$has_seq" = "xyes"])
++
+ AM_CONFIG_HEADER(include/aconfig.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.