The wrong patch was removed, restore and close bug #158912, thanks to Carl Fongheiser...

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index d6c05202c463a80b4bd844b2b888150b4ba3835d..7e97edba1ff8a0cd74d0d1765be6c15b3681881d 100644 (file)
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX alsa-plugins-1.0.11-automagic.patch 2387 RMD160 7ba1283bd2ac8c94b690db18ed80f2154df4e755 SHA1 fd6242d06959e20ecf4f69dabefd0f29e2fe192c SHA256 ce8a8a7de749167dce31008283045548077fc8a29704ab7742071e7deff87d39
 MD5 11501a02f6428eb443cb507593790efd files/alsa-plugins-1.0.11-automagic.patch 2387
 RMD160 7ba1283bd2ac8c94b690db18ed80f2154df4e755 files/alsa-plugins-1.0.11-automagic.patch 2387
 SHA256 ce8a8a7de749167dce31008283045548077fc8a29704ab7742071e7deff87d39 files/alsa-plugins-1.0.11-automagic.patch 2387
-AUX alsa-plugins-1.0.12_rc1-automagic.patch 2414 RMD160 75c1c36c5d5165b020cd48ea17b0542ce24868a3 SHA1 5618f950e52d560e3be7c9cc2618553cc279cc65 SHA256 ccdd300d969676df8950543d74daf936f6de9abcf6cab816d67bb16d36b084f5
-MD5 446adb89a1a3a503fe7686afe7d1c05f files/alsa-plugins-1.0.12_rc1-automagic.patch 2414
-RMD160 75c1c36c5d5165b020cd48ea17b0542ce24868a3 files/alsa-plugins-1.0.12_rc1-automagic.patch 2414
-SHA256 ccdd300d969676df8950543d74daf936f6de9abcf6cab816d67bb16d36b084f5 files/alsa-plugins-1.0.12_rc1-automagic.patch 2414
+AUX alsa-plugins-1.0.12-automagic.patch 2414 RMD160 bef06a60e3a97d3a672df70314113e7d35a159fc SHA1 93a44aa404869de2f6966a18b0b9f614e56dfdd1 SHA256 95d0bf84d68d2c8452b926d9dba4bf7a0c35c107b850d05dc78df6e9d7de29e0
+MD5 de22c1807fab5042d487c2c8c23d8198 files/alsa-plugins-1.0.12-automagic.patch 2414
+RMD160 bef06a60e3a97d3a672df70314113e7d35a159fc files/alsa-plugins-1.0.12-automagic.patch 2414
+SHA256 95d0bf84d68d2c8452b926d9dba4bf7a0c35c107b850d05dc78df6e9d7de29e0 files/alsa-plugins-1.0.12-automagic.patch 2414
 AUX alsa-plugins-1.0.14_rc1-automagic.patch 2892 RMD160 46c8541aa738d7f1b78c07318bc26bb7739020f2 SHA1 ad5ff0d6c6eb807ce06d71d2dff2600877bc3ac6 SHA256 04a820b2c2a0ce7c518fceafa290965b9caec62a6293938b74c1c828080f2ce0
 MD5 903355c77eb3b9e47cdd95e4f6acdff2 files/alsa-plugins-1.0.14_rc1-automagic.patch 2892
 RMD160 46c8541aa738d7f1b78c07318bc26bb7739020f2 files/alsa-plugins-1.0.14_rc1-automagic.patch 2892
@@ -25,10 +28,10 @@ EBUILD alsa-plugins-1.0.14_rc1-r1.ebuild 2036 RMD160 8503a9656f2249e78f97413c39f
 MD5 3d1c7e94cac57380f30ec5fb39e2fea7 alsa-plugins-1.0.14_rc1-r1.ebuild 2036
 RMD160 8503a9656f2249e78f97413c39f1845bbc523ec4 alsa-plugins-1.0.14_rc1-r1.ebuild 2036
 SHA256 3222f4cfc8b6b0d8bcc0f7a668883f2b144d3316a29c1255df1939b32828ca7e alsa-plugins-1.0.14_rc1-r1.ebuild 2036
-MISC ChangeLog 5636 RMD160 6f0c5a6008bca2264dbb8094e5328a13e8b0298c SHA1 37b8e0e8cae1216440b3a46a628b404b754c25b2 SHA256 fc0ed898ae0b8eaa349b51ebc781013273ad939de31921dc471f6585e3ac80f2
-MD5 7581f72c8763fe8fb916efb8c3b07a32 ChangeLog 5636
-RMD160 6f0c5a6008bca2264dbb8094e5328a13e8b0298c ChangeLog 5636
-SHA256 fc0ed898ae0b8eaa349b51ebc781013273ad939de31921dc471f6585e3ac80f2 ChangeLog 5636
+MISC ChangeLog 5894 RMD160 0575cc1c902d70afb1f05078dbdec7dc845417ab SHA1 e56a2a41c2fba07f41f2f686a843a337b9d909ec SHA256 928226b22af4e6fcf9afe02703f6c3e4d3e09bdde3ae708e945bb0d8e4326332
+MD5 ba993fd2fdd6d6bee6b050f07a55618b ChangeLog 5894
+RMD160 0575cc1c902d70afb1f05078dbdec7dc845417ab ChangeLog 5894
+SHA256 928226b22af4e6fcf9afe02703f6c3e4d3e09bdde3ae708e945bb0d8e4326332 ChangeLog 5894
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -42,3 +45,10 @@ SHA256 2b594d9cf70f24ecde16e8490847dcfb6af2d0798118499a70ca8dd121d0e5da files/di
 MD5 b9da0eb6c825f1335da114643e86019e files/digest-alsa-plugins-1.0.14_rc1-r1 274
 RMD160 065fb23936a36039c9fea104769307ed86a5ee5c files/digest-alsa-plugins-1.0.14_rc1-r1 274
 SHA256 312aabedc10ebec429bc2e873989bbc3be013f3761a9f6cbb786a1f0ba5b42cd files/digest-alsa-plugins-1.0.14_rc1-r1 274
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFkIn7AiZjviIA2XgRAuH5AJ93YSMl8OqylDYNQBO9xqSC52MKxQCfeePl
+RxK6F1RkzmBpxNGYQN/OZys=
+=BrjJ
+-----END PGP SIGNATURE-----

diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.12_rc1-automagic.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.0.12_rc1-automagic.patch
deleted file mode 100644 (file)
index daad8f0..0000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.0.12_rc1-automagic.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: alsa-plugins-1.0.12rc1/configure.in
-===================================================================
---- alsa-plugins-1.0.12rc1.orig/configure.in
-+++ alsa-plugins-1.0.12rc1/configure.in
-@@ -13,15 +13,29 @@ PKG_CHECK_MODULES(ALSA, alsa >= 1.0.11)
- AC_CHECK_LIB(asound, snd_pcm_ioplug_create,,
-            AC_ERROR([*** libasound has no external plugin SDK]), -ldl)
- 
--PKG_CHECK_MODULES(JACK, jack >= 0.98, [HAVE_JACK=yes], [HAVE_JACK=no])
-+AC_ARG_ENABLE([jack],
-+      AC_HELP_STRING([--disable-jack], [Disable building of JACK plugin]))
-+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(polypaudio, [polyplib >= 0.9.0], [HAVE_POLYP=yes], [HAVE_POLYP=no])
-+AC_ARG_ENABLE([polypaudio],
-+      AC_HELP_STRING([--disable-polypaudio], [Disable building of polypaudio plugin]))
-+if test "x$enable_polypaudio" != "xno"; then
-+      PKG_CHECK_MODULES(polypaudio, [polyplib >= 0.9.0], [HAVE_POLYP=yes], [HAVE_POLYP=no])
-+fi
- AM_CONDITIONAL(HAVE_POLYP, test x$HAVE_POLYP = xyes)
- 
--PKG_CHECK_MODULES(samplerate, [samplerate], [HAVE_SAMPLERATE=yes], [HAVE_SAMPLERATE=no])
-+AC_ARG_ENABLE([samplerate],
-+      AC_HELP_STRING([--disable-samplerate], [Disable building of samplerate plugin]))
-+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)
- 
-+AC_ARG_ENABLE([avcodec],
-+      AC_HELP_STRING([--disable-avcodec], [Disable building of avcodec code (a52 plugin)]))
- AC_ARG_WITH([avcodec-includedir],
-       [--with-avcodec-includedir=dir    AVcodec include directory],
-       [AVCODEC_CFLAGS="-I$withval"], [AVCODEC_CFLAGS=""])
-@@ -35,9 +49,11 @@ LDFLAGS="$LDFLAGS $AVCODEC_LIBS"
- AC_SUBST(AVCODEC_CFLAGS)
- AVCODEC_LIBS="$AVCODEC_LIBS -lavcodec"
- AC_SUBST(AVCODEC_LIBS)
--AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
--if test x$HAVE_AVCODEC = xyes; then
--  AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no])
-+if test "x$enable_avcodec" != "xno"; then
-+      AC_CHECK_LIB([avcodec], [avcodec_open], [HAVE_AVCODEC=yes], [HAVE_AVCODEC=no])
-+      if test x$HAVE_AVCODEC = xyes; then
-+        AC_CHECK_HEADER([ffmpeg/avcodec.h], [], [HAVE_AVCODEC=no])
-+      fi
- fi
- AM_CONDITIONAL(HAVE_AVCODEC, test x$HAVE_AVCODEC = xyes)
- CFLAGS="$CFLAGS_saved"