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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

8 files changed, 40 insertions, 231 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/Manifest b/dev-libs/zthread/Manifest
index 9a76474dc897..d47b2fe3f536 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -1,12 +1,7 @@
-AUX zthread-2.3.1-fix-ac-arg-enable-debug.diff 1423 RMD160 728b8215c12a0513c55884106ca1aa313ccc9121 SHA1 b1b6426ab30dcb52c5fdfb51114ce472bc70c2e4 SHA256 0ab1c92dc3d58ed19473f6428dd71efd75db7b704910beabb944323983e661e9
-AUX zthread-2.3.1-fix-underquoted-m4-defs.diff 838 RMD160 508eac753c32f501ccd698d88b3e43a8ccb472c1 SHA1 550a00d90663a91e4330259180132bdcd57b3ac1 SHA256 e82162b6732643c67f1ce2d7419dc9b21e23ebc13f95869e8fbdf1593e5be176
-AUX zthread-2.3.1-respect-DESTDIR.diff 1075 RMD160 3bde6f5e59f632c7f06ea38fadda5f05f9a4d2cb SHA1 562d2a04b4d15c052ff5f127bd21ba55086d1d87 SHA256 cc1dc3e031c2b4738a1e262c7b747218e40dd4efdf6dc991050346f2c7dd4063
 AUX zthread-2.3.2-no-fpermissive.diff 2010 RMD160 0a40511669b688f34f18423e2529e00a1022ee36 SHA1 82a67e151c8a41c178392c2560a1abc485aee58b SHA256 f1f37cffbff4c3dd825ff482b80686672902b817529519851f1b554d50ce29d3
 DIST ZThread-2.3.1.tar.gz 427364 RMD160 dae7a280cd671c7a8d87a243ea10942d890ee89b SHA1 093204d22fc52886e612efd24c93ea252c30b8f5 SHA256 726eaa358ddce23e75eb3c24668ef334159b6a953e80bff0a2d1b8f7bca86f00
 DIST ZThread-2.3.2.tar.gz 412527 RMD160 8419afad91ea8db1fff7ce3bf7784329839dd2e8 SHA1 574902824cbb1830d70e049a1cd7b684a6919815 SHA256 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854
-EBUILD zthread-2.3.1-r1.ebuild 1234 RMD160 d5cff703d696a336828d78153cfd3d778d1adde9 SHA1 0ccd55ccef317bd4c09e700dc682ef5c3298555a SHA256 8f0e08ce17a0ddb9e349b6bffe2fa91ba0cfd4e9655ff00d039f217e4fe655ab
 EBUILD zthread-2.3.1.ebuild 882 RMD160 d229ab939ae151a16e321ea422ea2d0b6dab34dc SHA1 692b29f20d5d43846b747749122af452073c7363 SHA256 d87856be5c5d5d90634c821337d84dcb6bec2cfc61c49fd958eff257b591b42b
-EBUILD zthread-2.3.2-r1.ebuild 1279 RMD160 560e491cd135dad754b6865402adaa513ebdb1da SHA1 87c42f452864e030fe868fc4172cb44d028706eb SHA256 f8f43807b870b4370cb13ad19139b06f2d203f692b5deb4c1cef36999908fa11
-EBUILD zthread-2.3.2.ebuild 1207 RMD160 8faee3ab91d383ba56f5fc5a648b27a05bf6cd22 SHA1 7a743dee6ce8ae5c2759ada1ee1beb7d7ace5633 SHA256 2cfece1c5970cbe17ee0267f0566e82682a0fcd109f64b9362c17f3991f6e2b9
-MISC ChangeLog 3701 RMD160 cb13d4036ef4ca3c2d999391ca01fc614635e1a6 SHA1 99ace14be965f5ba6ed0d47e12b0e0bdff5dfab7 SHA256 8ba6f57e4a413b8c5d2619515c9c3c7c2e9c39173ae93aedb10d3895eb0c3e0c
+EBUILD zthread-2.3.2-r1.ebuild 1342 RMD160 904bdcedb12ec335fbd20cac593a043611606b12 SHA1 a8fec089f67ec5e8cfe20bd65e6db22e7e2dbf72 SHA256 fe5aae2309a624730e4a734cfa22aad06ecbf59d3bc275e0e07490879fd943e4
+MISC ChangeLog 3867 RMD160 58f313a1c5cc9e99d16bc26c13f0b398fdd4e750 SHA1 477e38e36773a74950938f84f117a80801437a9b SHA256 6f43b51616ac74f7701e8ee16cfcedc2952abbf275c159c55eaf493d68712b40
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
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/*
-}