Clean up autotools.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 159 insertions, 7 deletions

diff --git a/dev-libs/zthread/ChangeLog b/dev-libs/zthread/ChangeLog
index 8f1e04e02510..6c3506b8d980 100644
--- a/dev-libs/zthread/ChangeLog
+++ b/dev-libs/zthread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/zthread
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.30 2011/03/15 16:30:30 flameeyes Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/zthread/ChangeLog,v 1.31 2012/01/13 03:23:01 vapier Exp $
+
+*zthread-2.3.2-r2 (13 Jan 2012)
+
+  13 Jan 2012; Mike Frysinger <vapier@gentoo.org> +zthread-2.3.2-r2.ebuild,
+  +files/zthread-2.3.2-automake.patch, +files/zthread-2.3.2-m4-quote.patch:
+  Clean up autotools.
 
   15 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   zthread-2.3.2-r1.ebuild:
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index d41951bfa475..29362c8a2a34 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -1,15 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX zthread-2.3.2-automake.patch 1287 RMD160 be59e22327c783766327eab32146b6f2c92f3e9a SHA1 7e0c0200772b1a2d552684314dbfa3efa288a171 SHA256 9df40b2532e2cb3e59ef884ac20b63d5de43b141fd12263db3cda138ff92d470
+AUX zthread-2.3.2-m4-quote.patch 554 RMD160 7b619cb2c00ceb210194ec68c9e9099663df6b9b SHA1 b86b597b22ff628c34236a0cec36e713a125429b SHA256 6ef0a0732917e46102b02ac7bbcfa69eed7eba340816d2526ba21de023c730ce
 AUX zthread-2.3.2-no-fpermissive.diff 2010 RMD160 0a40511669b688f34f18423e2529e00a1022ee36 SHA1 82a67e151c8a41c178392c2560a1abc485aee58b SHA256 f1f37cffbff4c3dd825ff482b80686672902b817529519851f1b554d50ce29d3
 DIST ZThread-2.3.2.tar.gz 412527 RMD160 8419afad91ea8db1fff7ce3bf7784329839dd2e8 SHA1 574902824cbb1830d70e049a1cd7b684a6919815 SHA256 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854
 EBUILD zthread-2.3.2-r1.ebuild 1365 RMD160 6c91b0ef6ff59a78ec1946a108047c5211dc861a SHA1 48869ed06b76c3d540b2e25f35a61cbf4e22782b SHA256 9698029a1c82895ffaa8f30a2df4822b14870c17908f85a80c9b3dd8cafd3cd8
-MISC ChangeLog 4432 RMD160 da3494e69de5c5cb09a37c971b0ae468d4ad3300 SHA1 0b23f8e4c31d488821b877fd0fc2f30479f7a5f0 SHA256 d5f8d7255e21c03f34c97f75b89202d7a8790fab1838936c4dfce1b9a2510fb3
+EBUILD zthread-2.3.2-r2.ebuild 1533 RMD160 d7f2f2727ef90af7cd84e46e318ac2c8e40e9a91 SHA1 850a082077d8b27f35a5f4f2d080928f8494920b SHA256 7c9b2ca2272b930cdb62d2ae5e12dab3e964c7db774a5c53987223a4ae7f78be
+MISC ChangeLog 4637 RMD160 4d7e1a7dfee4b29c8885f13bcc9637eae1f6fec1 SHA1 078be11e59228d71c92834e67dff778d51a8e314 SHA256 26d8436ddd1c8d15aa87ff8603d114c930bf3a335461811184f83197bfbbf4a9
 MISC metadata.xml 157 RMD160 1a16d7c8813911ff609857e1d437b678c924114c SHA1 c82a897a9ef30c4e459bcb4ce934e0a966c11d4d SHA256 e44459c87638f81370c6caee91f75bf864c56875d2b17f69ec7473c81ff58f9f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk1/lDQACgkQAiZjviIA2XhdIwCfYzAMRBi3wmpUR9oFs/HVL5D2
-A8AAnRLjfAa6JUSTNHM7YKIcY02e3V/r
-=EPVF
+iQIcBAEBAgAGBQJPD6OnAAoJELEHsLL7fEFWjPAP/jWvAVJhCLQwKCfTHq2SZicN
+Ee78RB4KJt9fbSAxP2CBGMWqz7vVQhkPsXxdxLhuu+M0KJNUwvKfJRujMKCXYNEk
++cIYUY2/DOvRNjSXDH/hZ6QwEQIigUuX9Oehrx1eLOKU6xuhdE5y11M/UZJVupY+
+7f7Gb+6iMjqGqtintidPkSNtn9xybYsStrqsrzxsfQPy6FkJ+u1Q5sEXVEMarzOf
+sELxRO3jjcsEVKpd6tHw7Rf71GaLJ9xGc2CmGsI2JJwooiI2pJ53/8CDHe8Q6Sx5
+IVPO+CQnths7cu82NYR2jW0xf1OL7pa9U1lEhoCUFWicvdQQZofTnGJDKrBL+F79
+wNLYW5UttIhihn37JTVwc/vNpEWyQa7K3/pEIDXLCtpCK0l1vZuiJTxCRfTbsYpT
++3X46SVzy7Z8uu2P2OJc9w7SkIO8EEl482CvwIasVRIKlskoG/MU10LJAzByM7vB
+IIVp+8KfK8Cwm4LqKjWLVKaAZKiMBUpJoHYiIXf1yoJ00jPbqk3clg8wHLGliyxO
+Zgk/owSl18Cm7C/bADm22Cbjx0MWBjlBW5z/iTPZCWktniZE9erDqpTApwk6tYvk
+8BvXvNzRVcrh80rIrbTVOdVTbMlQWSmWugdUMnhTZVyAibu/Dj88znPjDbBrxFPl
+3vHryGJ2DQIZIKqb8TSQ
+=3Tfq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/zthread/files/zthread-2.3.2-automake.patch b/dev-libs/zthread/files/zthread-2.3.2-automake.patch
new file mode 100644
index 000000000000..f2eae68c505b
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-2.3.2-automake.patch
@@ -0,0 +1,45 @@
+use standard automake rules rather than hand coding the install rules
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,24 +24,13 @@
+ MIT.TXT \
+ depcomp
+ 
++bin_SCRIPTS = share/zthread-config
+ 
+-## install the config script
+-install-exec-hook:
+-	$(mkinstalldirs) $(bindir)
+-	$(INSTALL_PROGRAM) $(top_srcdir)/share/zthread-config $(bindir)
++aclocaldir = $(datadir)/aclocal
++aclocal_DATA = share/zthread.m4 share/pthread.m4
+ 
+-## 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
+-	mkdir -p $(DESTDIR)$(includedir)/zthread
+-	cp -pR $(top_srcdir)/include/zthread $(DESTDIR)$(includedir)/
+-
+-## uninstall the config script & m4 macros
+-uninstall-local:
+-	-rm -rf $(datadir)/aclocal/pthread.m4
+-	-rm -rf $(datadir)/aclocal/zthread.m4
++zincludedir = $(includedir)/zthread
++zinclude_HEADERS = include/zthread/*.h
+ 
+ distclean-local: 
+ 	-rm -rf $(top_srcdir)/$(PACKAGE)-$(VERSION).tar.gz
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,8 +21,6 @@
+ INCLUDES = -I$(top_srcdir)/include
+ SUBDIRS=.
+ 
+-libdir=$(prefix)/lib
+-
+ lib_LTLIBRARIES = libZThread.la
+ 
+ libZThread_la_LIBADD=@LINKER_OPTIONS@ @EXTRA_LINKER_OPTIONS@
diff --git a/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch
new file mode 100644
index 000000000000..72163a3b12a3
--- /dev/null
+++ b/dev-libs/zthread/files/zthread-2.3.2-m4-quote.patch
@@ -0,0 +1,26 @@
+fix m4 warnings:
+zthread.m4:34: warning: underquoted definition of AM_PATH_ZTHREAD
+pthread.m4:39: warning: underquoted definition of AM_DETECT_PTHREAD
+
+--- a/share/zthread.m4
++++ b/share/zthread.m4
+@@ -31,7 +31,7 @@
+ dnl ZTHREAD_CXXFLAGS
+ dnl ZTHREAD_LIBS
+ dnl 
+-AC_DEFUN(AM_PATH_ZTHREAD,
++AC_DEFUN([AM_PATH_ZTHREAD],
+ [
+ 
+ 
+--- a/share/pthread.m4
++++ b/share/pthread.m4
+@@ -36,7 +36,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 --git a/dev-libs/zthread/zthread-2.3.2-r2.ebuild b/dev-libs/zthread/zthread-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..b531b620503f
--- /dev/null
+++ b/dev-libs/zthread/zthread-2.3.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/01/13 03:23:01 vapier Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+MY_P=ZThread-${PV}
+DESCRIPTION="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 static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
+	epatch "${FILESDIR}"/${P}-no-fpermissive.diff
+	epatch "${FILESDIR}"/${P}-m4-quote.patch
+	epatch "${FILESDIR}"/${P}-automake.patch
+
+	AT_M4DIR="share" eautoreconf
+}
+
+src_configure() {
+	local myconf
+	# Autoconf does not support --disable-debug properly.
+	use debug && myconf="--enable-debug"
+
+	econf \
+		$(use_enable kernel_linux atomic-linux) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	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() {
+	emake install DESTDIR="${ED}"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	use doc && dohtml doc/html/*
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+}