Fix path so that it build with both 2.2 and 1.5. Closes bug #212800.

Package-Manager: portage-2.1.4.4

3 files changed, 14 insertions, 10 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 502513cbf2c8..e111ae8470cc 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.101 2008/03/08 23:34:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.102 2008/03/09 12:57:23 flameeyes Exp $
+
+  09 Mar 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/pulseaudio-0.9.9+ltdl-2.2.patch:
+  Fix path so that it build with both 2.2 and 1.5. Closes bug #212800.
 
 *pulseaudio-0.9.9-r53 (08 Mar 2008)
 *pulseaudio-0.9.9-r3 (08 Mar 2008)
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 80add212dd70..9605b46170c6 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -7,7 +7,7 @@ AUX pulseaudio-0.9.8-create-directory.patch 685 RMD160 87c287d3ff6047c9bee892271
 AUX pulseaudio-0.9.8-esoundpath.patch 1798 RMD160 c009c0d1cfdf0bb9db6ef476df29bca56b68ab58 SHA1 5901b164c5b4bd3fa485dbc1a5a950f2ba5794a9 SHA256 4ae132c68a19f07ecf1fef9c55cebc7615e38b157dc196961f666c3914a4641b
 AUX pulseaudio-0.9.8-polkit.patch 766 RMD160 20bafbeae68fb9092dd3ef2d6d7facca86091d42 SHA1 490aeea34db54e779b84e9922bdb372e1cdcde7e SHA256 112d4da6597783e4dd3d69b73fe08c91631e280b23e84a41c2f1f8b3d9c8d368
 AUX pulseaudio-0.9.8-svn2074.patch 412 RMD160 49e416e5e9747cd7c2065b98220e99910375f826 SHA1 9a6d61fd8a000baa4699904154453b83c7bae6f9 SHA256 70b0baed200e5c86672f395520131af797eab7e8ea7fbad2b9caf00ad3e22b65
-AUX pulseaudio-0.9.9+ltdl-2.2.patch 2990 RMD160 6f752b636e4c4e1b2e4995fcd2c73d9f9a23cf21 SHA1 c0769c1a0a2a41041d0c79cfc801a36721b82508 SHA256 13713993d95dc912259c844a19d6541c968ff490d64ee3632f4ebd84fa9e4c41
+AUX pulseaudio-0.9.9+ltdl-2.2.patch 3018 RMD160 924b330d2046b8b8bfc3bbd317e475129f707f6d SHA1 ef44d2d18ffe3eab7fa1ea6c002aae4802c4eb08 SHA256 aff720c1cf7ab124646cbbae4a2a21a6f4925a70f1d61a979866fab606fef811
 AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd
 AUX pulseaudio.init.d-2 632 RMD160 5baf66e3f64e406b7e23ffbe13774e32595cff19 SHA1 e0a46567d43f7e3620c8da90654a0f16235a36fa SHA256 24c7f5319161105e46382c7c1340ae634d54cfbe32cdf70c86d6fd6c40782ee0
 AUX pulseaudio.init.d-3 1727 RMD160 ffe93d7c5300ae7974e9b5c02987a23422940d35 SHA1 437b6a0b856e44dffa89c44a2934b4d87b0e187f SHA256 8f31a03b430b5a6a7525e2251842cf685e55983c1f6d7036ae8b0aa9c8f9e2fb
@@ -19,12 +19,12 @@ EBUILD pulseaudio-0.9.9-r2.ebuild 5809 RMD160 425cef53074809572fede56346268c1a62
 EBUILD pulseaudio-0.9.9-r3.ebuild 5889 RMD160 d78dc6272930fef0d22a107fef00f74195dd5aff SHA1 99a932fe7989d0520441681aa1cfc5832010a85c SHA256 ff194bbc2d690ce37025640a54a96bb8d1b738b43c6139daa6fc4b134f54174f
 EBUILD pulseaudio-0.9.9-r53.ebuild 5852 RMD160 4efe5a6cb832342897e4a3bf4a8edd208aa8ae48 SHA1 06eecb1aa957b085e8cd80ade72abcb58e06cc35 SHA256 6863cf3e17fed9c2ab2d8e8908970ae4b2ddca17415e82c3a53b56a1eb44c019
 EBUILD pulseaudio-0.9.9.ebuild 5810 RMD160 db6a3d4da34ea78d6cf5901c57bc74b48082fd66 SHA1 7a659611de1b5ad7acb8e4e5ebac8ac6ec2c06f7 SHA256 90128fff4ccca7e019cd772e0faab2dc68ec8c2149aa476ddc77e1b63201279b
-MISC ChangeLog 18297 RMD160 0fc30f9823244c8d124c971f7b30f2f74413f4b8 SHA1 d05561bb61419eef5a5491cb1eb32a1029fd5485 SHA256 474a496296ff28e081194b81f9fdf59896b05506956251529784f0b79700f670
+MISC ChangeLog 18463 RMD160 e9973b6e7d88217c3f873008e9ec9902355ba1ab SHA1 731725f256ffdf1c1f34807fa565b67167dcbd8a SHA256 7524cd199a553a668c02abd2d8ad1c0759656a8d5ba888dd3b47e059791c4847
 MISC metadata.xml 1106 RMD160 451b24728e90377bc829a999a76fca5b4bc91078 SHA1 6b242be79913c9ffa2aafdd95149a7fa93b3c764 SHA256 995d3c7013901cd84098a1b40975c54863751e8668874f763ec70b81e23e9a9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH0yJwAiZjviIA2XgRAsuoAJwNtcoZrw+2r22xS/IK9FikcmM30wCg2I66
-VEmyDPlrhOnAXQv/s2WXkCc=
-=jpJN
+iD8DBQFH0965AiZjviIA2XgRAjVPAJ9KKVYkPl7I/rQQSX3nukl5eK7ZDACgmQS4
+kSmr7rIa99zQzT1P1G0bBKY=
+=nVzC
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch
index c140a7b9bfc9..a466e2cc188b 100644
--- a/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.9+ltdl-2.2.patch
@@ -6,7 +6,7 @@ Index: src/daemon/ltdl-bind-now.c
  #include <sys/dl.h>
  #endif
  
-+#ifndef HAVE_LT_USER_DLLOADER
++#ifndef HAVE_STRUCT_LT_USER_DLLOADER
 +/* Only used with ltdl 2.2 */
 +#include <string.h>
 +#endif
@@ -30,7 +30,7 @@ Index: src/daemon/ltdl-bind-now.c
  void pa_ltdl_init(void) {
  
  #ifdef PA_BIND_NOW
-+# ifdef HAVE_LT_USER_DLLOADER
++# ifdef HAVE_STRUCT_LT_USER_DLLOADER
      lt_dlloader *place;
      static const struct lt_user_dlloader loader = {
          .module_open = bind_now_open,
@@ -50,7 +50,7 @@ Index: src/daemon/ltdl-bind-now.c
 +#endif
  
  #ifdef PA_BIND_NOW
-+# ifdef HAVE_LT_USER_DLLOADER
++# ifdef HAVE_STRUCT_LT_USER_DLLOADER
  
      if (!(place = lt_dlloader_find("dlopen")))
          place = lt_dlloader_next(NULL);
@@ -93,7 +93,7 @@ Index: configure.ac
 +LIBS="$LIBS $LIBLTDL"
 +AC_CHECK_FUNCS([lt_dlmutex_register])
 +LIBS=$old_LIBS
-+AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
 +
  if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
      AC_MSG_ERROR([[