Fix first half of bug 269988 (USE debug usage) wrt #269988 by Piotr Trojanek.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 38 insertions, 224 deletions

diff --git a/dev-libs/zthread/ChangeLog b/dev-libs/zthread/ChangeLog
index 0e165b0fdd76..6990db9cf631 100644
--- a/dev-libs/zthread/ChangeLog
+++ b/dev-libs/zthread/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/zthread
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.24 2009/09/23 16:51:16 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.25 2010/04/16 17:42:04 ssuominen Exp $
+
+  16 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  zthread-2.3.2-r1.ebuild:
+  Fix first half of bug 269988 (USE debug usage) wrt #269988 by Piotr
+  Trojanek.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> zthread-2.3.1.ebuild,
   zthread-2.3.1-r1.ebuild:
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
deleted file mode 100644
index a5bddde965b1..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.1-fix-ac-arg-enable-debug.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-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
deleted file mode 100644
index 0f623bfcb49e..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.1-fix-underquoted-m4-defs.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 79dddbb82d25..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.1-respect-DESTDIR.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-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/zthread-2.3.1-r1.ebuild b/dev-libs/zthread/zthread-2.3.1-r1.ebuild
deleted file mode 100644
index 22ccb37a1fa3..000000000000
--- a/dev-libs/zthread/zthread-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 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.3 2009/09/23 16:51:16 patrick Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
-
-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=""
-
-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
-
-	AT_M4DIR="share" eautoreconf
-}
-
-src_compile() {
-	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
-}
diff --git a/dev-libs/zthread/zthread-2.3.2-r1.ebuild b/dev-libs/zthread/zthread-2.3.2-r1.ebuild
index 17ac32b72a07..fa32ec30a632 100644
--- a/dev-libs/zthread/zthread-2.3.2-r1.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r1.ebuild
@@ -1,48 +1,57 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.3.2-r1.ebuild,v 1.1 2009/04/19 20:00:34 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.3.2-r1.ebuild,v 1.2 2010/04/16 17:42:04 ssuominen Exp $
 
-inherit flag-o-matic eutils
+EAPI=2
+inherit eutils flag-o-matic
 
-MY_P="ZThread-${PV}"
+MY_P=ZThread-${PV}
 
 DESCRIPTION="A platform-independent multi-threading and synchronization library for C++"
 HOMEPAGE="http://zthread.sourceforge.net/"
 SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="debug doc kernel_linux"
+IUSE="debug doc kernel_linux static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
 
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
 	epatch "${FILESDIR}"/${P}-no-fpermissive.diff
 }
 
-src_compile() {
+src_configure() {
+	local myconf
+	use debug && myconf="--enable-debug"
+
 	econf \
-		$(use_enable debug) \
 		$(use_enable kernel_linux atomic-linux) \
-		|| die "configure failed"
-	emake || die "make failed"
-
-	if use doc ; then
-		doxygen doc/zthread.doxygen || die "generating docs failed"
-		cp ./doc/documentation.html ./doc/html/index.html
-		cp ./doc/zthread.css ./doc/html/zthread.css
-		cp ./doc/bugs.js ./doc/html/bugs.js;
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake || die
+
+	if use doc; then
+		doxygen doc/zthread.doxygen || die
+		cp doc/documentation.html doc/html/index.html || die
+		cp doc/zthread.css doc/html/zthread.css || die
+		cp doc/bugs.js doc/html/bugs.js || die
 	fi
 }
 
 src_install() {
-	# Uses it's own install-hooks and ignores DESTDIR
-	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog README NEWS TODO
+	einstall || die
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
 	use doc && dohtml doc/html/*
+
+	find "${D}" -name '*.la' -delete
 }
diff --git a/dev-libs/zthread/zthread-2.3.2.ebuild b/dev-libs/zthread/zthread-2.3.2.ebuild
deleted file mode 100644
index 1b6474ceaa04..000000000000
--- a/dev-libs/zthread/zthread-2.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/zthread-2.3.2.ebuild,v 1.1 2007/09/24 21:22:15 dev-zero Exp $
-
-inherit flag-o-matic
-
-MY_P="ZThread-${PV}"
-
-DESCRIPTION="A platform-independent multi-threading and synchronization library for C++"
-HOMEPAGE="http://zthread.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="debug doc kernel_linux"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	append-flags -fpermissive
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable kernel_linux atomic-linux) \
-		|| die "configure failed"
-	emake || die "make failed"
-
-	if use doc ; then
-		doxygen doc/zthread.doxygen || die "generating docs failed"
-		cp ./doc/documentation.html ./doc/html/index.html
-		cp ./doc/zthread.css ./doc/html/zthread.css
-		cp ./doc/bugs.js ./doc/html/bugs.js;
-	fi
-}
-
-src_install() {
-	# Uses it's own install-hooks and ignores DESTDIR
-	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog README NEWS TODO
-	use doc && dohtml doc/html/*
-}