Add as-needed patch thanks to TGL <degrenier@easyconnect.fr> in bug 132473

Package-Manager: portage-2.1.2_pre3-r6

4 files changed, 74 insertions, 11 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index bb2ef21a9b8c..f11801fa83eb 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.51 2006/10/19 15:52:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.52 2006/10/22 20:20:38 genstef Exp $
+
+  22 Oct 2006; Stefan Schweizer <genstef@gentoo.org>
+  +files/djvulibre-3.5.17-pthread-flag.patch, djvu-3.5.17.ebuild:
+  Add as-needed patch thanks to TGL <degrenier@easyconnect.fr> in bug 132473
 
   19 Oct 2006; Bryan Østergaard <kloeri@gentoo.org> djvu-3.5.17.ebuild:
   Stable on Alpha.
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 2301cac6f8bb..26daada816c4 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -10,6 +10,10 @@ AUX djvu-3.5.17-dont-prestrip-bins.patch 1586 RMD160 0dfc6e238a795ae1017366c7461
 MD5 d6c0c71675e509501f69b0f47f991560 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
 RMD160 0dfc6e238a795ae1017366c7461f4b11ca732a31 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
 SHA256 9f82c40011fbac673d2d28587af63a8d13d9e3503e7554a5f26964e4d206cc45 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
+AUX djvulibre-3.5.17-pthread-flag.patch 2419 RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 SHA1 2c028fd4bff1316a9278bc9047f6595ea3fc1e64 SHA256 e5bd52eba105c7792866f13f5abccf07daca220dc68ac045a4abc431c329805f
+MD5 90ec522dba21d16d4df5e55e50e2a36d files/djvulibre-3.5.17-pthread-flag.patch 2419
+RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 files/djvulibre-3.5.17-pthread-flag.patch 2419
+SHA256 e5bd52eba105c7792866f13f5abccf07daca220dc68ac045a4abc431c329805f files/djvulibre-3.5.17-pthread-flag.patch 2419
 AUX gentoo-acdesktop.m4 2491 RMD160 1795c1b9bcb6aacd54962a65d5b8d551c15c17d4 SHA1 946fe237382867a0d580bcf6b57b2f818e6338e7 SHA256 0a9ec40c7ebe2a75025cd832a1d6eba25dc904593702e4e312662eb689ae5eef
 MD5 0da6de34d8db09192d2c881416108427 files/gentoo-acdesktop.m4 2491
 RMD160 1795c1b9bcb6aacd54962a65d5b8d551c15c17d4 files/gentoo-acdesktop.m4 2491
@@ -34,14 +38,14 @@ EBUILD djvu-3.5.16.ebuild 1992 RMD160 e1cb01d1f00a6d00d21af18ed08e5557f358752d S
 MD5 5382c76fbd87445ad1baa3217208ca78 djvu-3.5.16.ebuild 1992
 RMD160 e1cb01d1f00a6d00d21af18ed08e5557f358752d djvu-3.5.16.ebuild 1992
 SHA256 9cee0f36f78bc1b0253739c1bb10e814d893fbd4d73605d160c36bc2addefcd3 djvu-3.5.16.ebuild 1992
-EBUILD djvu-3.5.17.ebuild 1918 RMD160 d59bb2223a1b3a09c60252befc12f2b2e209414a SHA1 b1879c6e6c56b99ae420e6de897926159003e96f SHA256 de7bc82bf54a1cedd6908abddd15a66095da65ed6c73a1215a905a65812a9774
-MD5 60f33297a2506a5ad4517c5d2974fa77 djvu-3.5.17.ebuild 1918
-RMD160 d59bb2223a1b3a09c60252befc12f2b2e209414a djvu-3.5.17.ebuild 1918
-SHA256 de7bc82bf54a1cedd6908abddd15a66095da65ed6c73a1215a905a65812a9774 djvu-3.5.17.ebuild 1918
-MISC ChangeLog 6113 RMD160 0eca13a240aee354aff369aa7a01f634d69e9856 SHA1 26ca00b239cf978f5f04cf5ce350ba23c87b2208 SHA256 e37490af9ba1c49d577f092778c7f832d507addc9c64ac51a6c0869075867030
-MD5 b28024cb1991491cc739cf7b82c782e1 ChangeLog 6113
-RMD160 0eca13a240aee354aff369aa7a01f634d69e9856 ChangeLog 6113
-SHA256 e37490af9ba1c49d577f092778c7f832d507addc9c64ac51a6c0869075867030 ChangeLog 6113
+EBUILD djvu-3.5.17.ebuild 1955 RMD160 c7cbf531ef0e788dcedea27853e395c6ac2eb71b SHA1 1bef7510bfc8621c1b183ca90550e392c2150e1e SHA256 bcc4e6365422522f91a600525e1c0d6c4dba0f4133abc3b53d15671013831a05
+MD5 c2f9ba1fbf007ea9fe71ad9b1149589b djvu-3.5.17.ebuild 1955
+RMD160 c7cbf531ef0e788dcedea27853e395c6ac2eb71b djvu-3.5.17.ebuild 1955
+SHA256 bcc4e6365422522f91a600525e1c0d6c4dba0f4133abc3b53d15671013831a05 djvu-3.5.17.ebuild 1955
+MISC ChangeLog 6311 RMD160 e744c0caf101f1700d28ad17efdc242bcad12fea SHA1 f74aa882104ed5b2f00ad739e5150447d22e0cea SHA256 764bd903a2ca118835b0b3794721d24402d5f5c357139b6f1b8132e35c918887
+MD5 8156d1adc9cbb117f65e67f44eeb43b4 ChangeLog 6311
+RMD160 e744c0caf101f1700d28ad17efdc242bcad12fea ChangeLog 6311
+SHA256 764bd903a2ca118835b0b3794721d24402d5f5c357139b6f1b8132e35c918887 ChangeLog 6311
 MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
diff --git a/app-text/djvu/djvu-3.5.17.ebuild b/app-text/djvu/djvu-3.5.17.ebuild
index 5b2ce24582a8..6cb4d0a6486c 100644
--- a/app-text/djvu/djvu-3.5.17.ebuild
+++ b/app-text/djvu/djvu-3.5.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.17.ebuild,v 1.13 2006/10/19 15:52:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.17.ebuild,v 1.14 2006/10/22 20:20:38 genstef Exp $
 
 inherit nsplugins flag-o-matic fdo-mime eutils multilib toolchain-funcs
 
@@ -25,7 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch "${FILESDIR}/${P}-dont-prestrip-bins.patch" || die "patch failed"
+	epatch "${FILESDIR}/${P}-dont-prestrip-bins.patch"
+	epatch "${FILESDIR}/djvulibre-3.5.17-pthread-flag.patch"
 
 	# Replace autochecking acdesktop.m4 with a gentoo-specific one
 	cp "${FILESDIR}/gentoo-acdesktop.m4" "${S}/gui/desktop/acdesktop.m4"
diff --git a/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch b/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch
new file mode 100644
index 000000000000..58dfd8f764d4
--- /dev/null
+++ b/app-text/djvu/files/djvulibre-3.5.17-pthread-flag.patch
@@ -0,0 +1,54 @@
+--- config/acinclude.m4.orig	2006-05-08 15:05:41.000000000 +0200
++++ config/acinclude.m4	2006-05-08 15:22:15.000000000 +0200
+@@ -332,7 +332,9 @@
+ fi
+ # Create a list of thread flags to try.  Items starting with a "-" are
+ # C compiler flags, and other items are library names, except for "none"
+-# which indicates that we try without any flags at all.
++# which indicates that we try without any flags at all. Also, combinations
++# of items (for instance, both a compiler flag and a library name) can be 
++# specified using a colon separator.
+ acx_pthread_flags="pthreads none -Kthread -kthread lthread 
+                    -pthread -pthreads -mthreads pthread
+                    --thread-safe -mt"
+@@ -364,12 +366,40 @@
+         acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+         ;;
+ esac
++case "${host_os}-${GCC}" in
++        *linux*-yes)
++        # On Linux/GCC, libtool uses -nostdlib for linking, which cancel part
++        # of the -pthread flag effect (libpthread is not automatically linked).
++        # So we'll try to link with both -pthread and -lpthread first:
++        acx_pthread_flags="-pthread:pthread $acx_pthread_flags"
++        ;;
++esac
+ if test x"$acx_pthread_ok" = xno; then
+ for flag in $acx_pthread_flags; do
+         case $flag in
+                 none)
+                 AC_MSG_CHECKING([whether pthreads work without any flags])
+                 ;;
++                *:*)
++                PTHREAD_CFLAGS=""
++                PTHREAD_LIBS=""
++                message="whether pthreads work with"
++                while test x"$flag" != x; do
++                        subflag=`echo $flag | cut -d: -f1`
++                        case $subflag in
++                                -*)
++                                PTHREAD_CFLAGS="$PTHREAD_CFLAGS $subflag"
++                                message="$message $subflag"
++                                ;;
++                                *)
++                                PTHREAD_LIBS="$PTHREAD_LIBS -l$subflag"
++                                message="$message -l$subflag"
++                                ;;
++                        esac
++                        flag=`echo $flag | cut -s -d: -f2-`
++                done
++                AC_MSG_CHECKING([$message])
++                ;;
+                 -*)
+                 AC_MSG_CHECKING([whether pthreads work with $flag])
+                 PTHREAD_CFLAGS="$flag"