Revision bump; added some patches to fix the --enable-debug configure option, the underquoted m4 definition, and lack of DESTDIR support in Makefile.am's. Also removed unused gcc34 patch.

(Portage version: 2.1_pre1)

8 files changed, 177 insertions, 35 deletions

diff --git a/dev-libs/zthread/ChangeLog b/dev-libs/zthread/ChangeLog
index bd1cce324977..609326f1a84e 100644
--- a/dev-libs/zthread/ChangeLog
+++ b/dev-libs/zthread/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/zthread
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.19 2005/11/25 12:33:41 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.20 2005/12/24 00:48:27 ka0ttic Exp $
+
+*zthread-2.3.1-r1 (24 Dec 2005)
+
+  24 Dec 2005; Aaron Walker <ka0ttic@gentoo.org> -files/zthread-gcc34.patch,
+  +files/zthread-2.3.1-fix-ac-arg-enable-debug.diff,
+  +files/zthread-2.3.1-fix-underquoted-m4-defs.diff,
+  +files/zthread-2.3.1-respect-DESTDIR.diff, +zthread-2.3.1-r1.ebuild:
+  Revision bump; added some patches to fix the --enable-debug configure
+  option, the underquoted m4 definition, and lack of DESTDIR support in
+  Makefile.am's. Also removed unused gcc34 patch.
 
   25 Nov 2005; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
   Added to cpp herd.
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index f5b4d7a400a6..e18cde4c8432 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -1,15 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c89633dad82cdbbc28cd62a0ecf67963 ChangeLog 2510
+MD5 30d98950d11b50720ecdcdf3805bada0 ChangeLog 2992
 MD5 368ff02a9eb850ad51265d76953eb2e0 files/digest-zthread-2.3.1 65
-MD5 e7a8dff68ee9c400e82941b399176b6c files/zthread-gcc34.patch 819
+MD5 368ff02a9eb850ad51265d76953eb2e0 files/digest-zthread-2.3.1-r1 65
+MD5 ed8ab8426a69abdf6dec8acba3046fda files/zthread-2.3.1-fix-ac-arg-enable-debug.diff 1423
+MD5 a9dd7f2367fa359af1a388a9f2b879c8 files/zthread-2.3.1-fix-underquoted-m4-defs.diff 838
+MD5 ca06fec3017d7287600e0a3803e556c3 files/zthread-2.3.1-respect-DESTDIR.diff 1075
 MD5 694f01269d0e6ca70d0d588a68181808 metadata.xml 157
+MD5 e484189796ce3ea36c4763b1de3306de zthread-2.3.1-r1.ebuild 1429
 MD5 e6d03e8760b0917b08762eba9d8c8842 zthread-2.3.1.ebuild 893
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDhwS1EZCkKN40op4RAnJyAKCiB5b1HWR/qnsJircYKgLwuZyw2ACfWF7w
-f/qegWv+50e4TiuabPMwBhM=
-=jPu2
------END PGP SIGNATURE-----
diff --git a/dev-libs/zthread/files/digest-zthread-2.3.1-r1 b/dev-libs/zthread/files/digest-zthread-2.3.1-r1
new file mode 100644
index 000000000000..1e7450f73cf4
--- /dev/null
+++ b/dev-libs/zthread/files/digest-zthread-2.3.1-r1
@@ -0,0 +1 @@
+MD5 21c3075808b04949bec419010b0d188c ZThread-2.3.1.tar.gz 427364
diff --git a/dev-libs/zthread/files/zthread-2.3.1-fix-ac-arg-enable-debug.diff b/dev-libs/zthread/files/zthread-2.3.1-fix-ac-arg-enable-debug.diff
new file mode 100644
index 000000000000..a5bddde965b1
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-2.3.1-fix-ac-arg-enable-debug.diff
@@ -0,0 +1,60 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN ZThread-2.3.1.orig/configure.ac ZThread-2.3.1/configure.ac
+--- ZThread-2.3.1.orig/configure.ac	2005-11-29 17:56:05.000000000 -0500
++++ ZThread-2.3.1/configure.ac	2005-11-29 18:44:52.000000000 -0500
+@@ -81,7 +81,7 @@
+ case "$CXX" in
+   *cl.exe)   # Microsoft Visual Studio
+   CXXFLAGS="/nologo /MT /W3 /GX /O2 /YX /FD /c"
+-  CXXFLAGS="$CXXFLAGS /D \"_MBCS\" /D \"_LIB" /D \"WIN32\"
++  CXXFLAGS="$CXXFLAGS /D \"_MBCS\" /D \"_LIB\" /D \"WIN32\""
+   ;;
+   *)         # GNU
+   CXXFLAGS="$CXXFLAGS -Wall"
+@@ -95,27 +95,27 @@
+ 
+ dnl Check for debug-mode
+ AC_ARG_ENABLE(debug,
+-[  --enable-debug          Enable debug symbols [default=no]],
++    AC_HELP_STRING([--enable-debug],[Enable debug symbols [default=no]]),
++    [ENABLE_DEBUG=$enableval],[ENABLE_DEBUG=no])
+ 
+-[
+-dnl Enable debug info
+-case "$CXX" in
+-  *cl.exe)
+-    ;;
+-  *)
+-    CXXFLAGS="$CXXFLAGS -g"
+-esac
+-],[
+-dnl Disable debug info
+-case "$CXX" in
+-  *cl.exe)
+-    CXXFLAGS="$CXXFLAGS /D NDEBUG"
+-    ;;
+-  *)
+-
+-    CXXFLAGS="$CXXFLAGS -DNDEBUG"
+-esac
+-])
++if test x"$ENABLE_DEBUG" = "xyes" ; then
++    case "$CXX" in
++	*cl.exe)
++	    ;;
++	*)
++	    CXXFLAGS="$CXXFLAGS -g"
++	    ;;
++    esac
++else
++    case "$CXX" in
++	*cl.exe)
++	    CXXFLAGS="$CXXFLAGS /D NDEBUG"
++	    ;;
++	*)
++	    CXXFLAGS="$CXXFLAGS -DNDEBUG"
++	    ;;
++    esac
++fi
+ 
+ dnl Select implementation
+ AC_MSG_CHECKING(for target implementation)
diff --git a/dev-libs/zthread/files/zthread-2.3.1-fix-underquoted-m4-defs.diff b/dev-libs/zthread/files/zthread-2.3.1-fix-underquoted-m4-defs.diff
new file mode 100644
index 000000000000..0f623bfcb49e
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-2.3.1-fix-underquoted-m4-defs.diff
@@ -0,0 +1,24 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN ZThread-2.3.1.orig/share/pthread.m4 ZThread-2.3.1/share/pthread.m4
+--- ZThread-2.3.1.orig/share/pthread.m4	2005-11-29 17:56:04.000000000 -0500
++++ ZThread-2.3.1/share/pthread.m4	2005-11-29 18:05:15.000000000 -0500
+@@ -17,7 +17,7 @@
+ GNU Pth can also be used if it was configured with --enable-pthread.
+ EOF
+ 
+-AC_DEFUN(AM_DETECT_PTHREAD,
++AC_DEFUN([AM_DETECT_PTHREAD],
+ [
+ 
+ pthread_explicit="no"
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN ZThread-2.3.1.orig/share/zthread.m4 ZThread-2.3.1/share/zthread.m4
+--- ZThread-2.3.1.orig/share/zthread.m4	2005-11-29 17:56:04.000000000 -0500
++++ ZThread-2.3.1/share/zthread.m4	2005-11-29 18:05:22.000000000 -0500
+@@ -15,7 +15,7 @@
+ dnl ZTHREAD_CXXFLAGS
+ dnl ZTHREAD_LIBS
+ dnl 
+-AC_DEFUN(AM_PATH_ZTHREAD,
++AC_DEFUN([AM_PATH_ZTHREAD],
+ [
+ 
+ 
diff --git a/dev-libs/zthread/files/zthread-2.3.1-respect-DESTDIR.diff b/dev-libs/zthread/files/zthread-2.3.1-respect-DESTDIR.diff
new file mode 100644
index 000000000000..79dddbb82d25
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-2.3.1-respect-DESTDIR.diff
@@ -0,0 +1,23 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN ZThread-2.3.1.orig/Makefile.am ZThread-2.3.1/Makefile.am
+--- ZThread-2.3.1.orig/Makefile.am	2005-11-29 17:56:05.000000000 -0500
++++ ZThread-2.3.1/Makefile.am	2005-11-29 18:22:38.000000000 -0500
+@@ -8,14 +8,14 @@
+ 
+ ## install the config script
+ install-exec-hook:
+-	$(mkinstalldirs) $(bindir)
+-	$(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir)
++	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(DESTDIR)$(bindir)
+ 
+ ## install the config script & m4 macros
+ install-data-hook:
+-	$(mkinstalldirs) $(datadir)/aclocal
+-	$(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(datadir)/aclocal
+-	$(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(datadir)/aclocal
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/aclocal
++	$(INSTALL_DATA) $(top_srcdir)/share/zthread.m4 $(DESTDIR)$(datadir)/aclocal
++	$(INSTALL_DATA) $(top_srcdir)/share/pthread.m4 $(DESTDIR)$(datadir)/aclocal
+ 	mkdir -p $(DESTDIR)$(includedir)/zthread
+ 	cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/
+ 
diff --git a/dev-libs/zthread/files/zthread-gcc34.patch b/dev-libs/zthread/files/zthread-gcc34.patch
deleted file mode 100644
index 51c716b00abe..000000000000
--- a/dev-libs/zthread/files/zthread-gcc34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur ZThread-2.2.10/src/posix/FastLock.h ZThread-2.2.10-gentoo/src/posix/FastLock.h
---- ZThread-2.2.10/src/posix/FastLock.h	2002-07-02 20:23:05.000000000 +0000
-+++ ZThread-2.2.10-gentoo/src/posix/FastLock.h	2004-06-18 11:20:01.038016496 +0000
-@@ -28,6 +28,7 @@
- #include "zthread/Exceptions.h"
- #include "zthread/NonCopyable.h"
- #include <pthread.h>
-+#include <assert.h>
- 
- namespace ZThread {
- 
-diff -Naur ZThread-2.2.10/tests/ReadWriteTests.cxx ZThread-2.2.10-gentoo/tests/ReadWriteTests.cxx
---- ZThread-2.2.10/tests/ReadWriteTests.cxx	2002-06-29 14:31:17.000000000 +0000
-+++ ZThread-2.2.10-gentoo/tests/ReadWriteTests.cxx	2004-06-18 11:20:19.312238392 +0000
-@@ -3,6 +3,7 @@
- #include "zthread/BiasedReadWriteLock.h"
- 
- #include <iostream>
-+#include <assert.h>
- using namespace std;
- using namespace ZThread;
- 
diff --git a/dev-libs/zthread/zthread-2.3.1-r1.ebuild b/dev-libs/zthread/zthread-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..7a89852e99ca
--- /dev/null
+++ b/dev-libs/zthread/zthread-2.3.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.3.1-r1.ebuild,v 1.1 2005/12/24 00:48:27 ka0ttic Exp $
+
+inherit eutils flag-o-matic
+
+MY_P="ZThread-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="a platform-independent object-oriented threading architecture"
+HOMEPAGE="http://www.cs.buffalo.edu/~crahen/projects/zthread/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="debug"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-underquoted-m4-defs.diff
+	epatch ${FILESDIR}/${P}-fix-ac-arg-enable-debug.diff
+	epatch ${FILESDIR}/${P}-respect-DESTDIR.diff
+}
+
+src_compile() {
+	einfo "Regenerating autoconf/automake files"
+	libtoolize --copy --force || die "libtoolize failed"
+	aclocal -I share || die "aclocal failed"
+	autoheader || die "autoheader failed"
+	automake --add-missing --copy || die "automake failed"
+	autoconf || die "autoconf failed"
+
+
+	local myconf
+	use debug \
+		&& myconf="--enable-debug=yes" \
+		|| myconf="--enable-debug=no"
+
+	append-flags -fpermissive
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO THANK.YOU
+}