Version bump; port disable-setjmp patch (and simplify); add debug USE flag.

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

4 files changed, 107 insertions, 7 deletions

diff --git a/sys-libs/libunwind/ChangeLog b/sys-libs/libunwind/ChangeLog
index 6af0a679f72b..ce2793a8bf6a 100644
--- a/sys-libs/libunwind/ChangeLog
+++ b/sys-libs/libunwind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libunwind
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.14 2011/08/04 14:01:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/ChangeLog,v 1.15 2011/08/28 14:17:43 flameeyes Exp $
+
+*libunwind-1.0 (28 Aug 2011)
+
+  28 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> +libunwind-1.0.ebuild,
+  +files/libunwind-1.0-disable-setjmp.patch:
+  Version bump; port disable-setjmp patch (and simplify); add debug USE flag.
 
   04 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> libunwind-0.99-r1.ebuild:
   USE="static-libs" and remove unnecessary libtool files
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index a2f891eac448..4477bc9e0c4a 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libunwind-0.99-disable-setjmp.patch 8566 RMD160 56d373ca810a237388f6a7c156a64cc223899a8b SHA1 619744fbc19ac0fac93059e21fb6647f03dc2b7d SHA256 d9cce99c7e53414b7c364c1e1fd14332bc9d2decae26750244af166d6fb820ef
 AUX libunwind-0.99-implicit-declaration.patch 486 RMD160 0e1e3d5f4665bcf3ac049ded1928b17c8ae7f2df SHA1 3bd36046e74524f009dcda5b96ad298262d9ad65 SHA256 f8f72c6160c6741ea2a3d251662fe3d8ecd63bfcf488527838e6d95e4dddd2a1
+AUX libunwind-1.0-disable-setjmp.patch 1561 RMD160 0fbfc1090af1e1f18e266e8e464ee9c00bed9b98 SHA1 09bc593e8e77138e0ac7786a7ecb951698b254cb SHA256 75be9cd703451b6ea5f45b78ca8c1ae421526658a20d4ef147de2389578821e2
 DIST libunwind-0.99.tar.gz 711817 RMD160 d51876e9db75c5d456a3a2a4651f027a0a0e8930 SHA1 2969f68f27b2ede08ae129178a9b393f92be73d2 SHA256 56083aae17eab3ccb7a36b95f0430f5a5f258755bf193bb5ca4fd4b918356164
+DIST libunwind-1.0.tar.gz 1028566 RMD160 039c2bb9dfb36a632c1b909bc02e7519b197fd4c SHA1 5b1190e7b7800dde1f9909d994f4f69c2e8f7a7e SHA256 2d846b7e239c4d433e8bd5adec91ed79e3f2a2c27361d17bef2f023d0061e78a
 EBUILD libunwind-0.99-r1.ebuild 1103 RMD160 3ee34667f6aff1dd5c80f0e938412ffc43c3f8fa SHA1 9930e2a3fd722c1f0e1864ce0ed84daa6f087897 SHA256 c7d2344f6dfd0d1267872210318faf2eb661ef2ff9744629c134cf33d24831f7
 EBUILD libunwind-0.99.ebuild 792 RMD160 3b0a257dfdc1af83907b2cbf91343db2724d7536 SHA1 9da7870302c91974e15836a5e9ddf283b8795ec8 SHA256 da2cc22e66858da94303010dedc8f2d3a71bd5bbd9ea6e48442285980a0bfc64
-MISC ChangeLog 2009 RMD160 0ab3b6d154bb8d842a2370336a5f63ffb3191359 SHA1 7df39c57e72a1fccb030b3b3cc6745f48225069e SHA256 c76e489f8052b59ced8d6570653076038e2aa003f2c8abed73e949769c015f87
+EBUILD libunwind-1.0.ebuild 1319 RMD160 cd769bbc33cf42975d47938d5162aadef5d0a802 SHA1 1bfcc6119fc1e3cbc8500aaee26520df3db8cdb1 SHA256 7d925b8fc9899437ecf0b920f4030a21f31d75e6872bca95be66679b1f980100
+MISC ChangeLog 2242 RMD160 52197e483306a2d201621bbc36629cc39df4cde5 SHA1 6d5105b97bd026285cb6b81dc291b059ad04f385 SHA256 1c982743ff96729a17417171a198f2c64023956bb69f769bace363da2299c3f1
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk46pZ4ACgkQXkR9YqOcLPGODQEAovkbZZ+CnR4wFjxvz6DuNVF7
-hHIAus62YLYc2Of5j6gBAI9dsUoBcjXIcPj8LBPODdaOZZ48DqF4rfoD5Qp5qpQI
-=TUMe
+iEYEARECAAYFAk5aTgEACgkQAiZjviIA2Xh2AgCg7hNR/dUVMzfldNYvy1nz91xQ
+jVsAoLuzhiYOnjudpbfnchrfsy9owrLf
+=l24K
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libunwind/files/libunwind-1.0-disable-setjmp.patch b/sys-libs/libunwind/files/libunwind-1.0-disable-setjmp.patch
new file mode 100644
index 000000000000..6b83dbbd780a
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.0-disable-setjmp.patch
@@ -0,0 +1,42 @@
+http://cvs.fedoraproject.org/viewvc/rpms/libunwind/devel/libunwind-disable-setjmp.patch?revision=1.1&view=markup
+http://bugs.gentoo.org/show_bug.cgi?id=299344
+
+At least x86_64 version cannot work, src/setjmp/setjmp.c and
+src/setjmp/sigsetjmp.c are not even compiled, src/x86_64/longjmp.S does not
+match src/setjmp/setjmp.c + include/tdep-x86_64/jmpbuf.h .
+
+Index: libunwind-1.0/src/Makefile.am
+===================================================================
+--- libunwind-1.0.orig/src/Makefile.am
++++ libunwind-1.0/src/Makefile.am
+@@ -9,7 +9,7 @@ lib_LIBRARIES =
+ lib_LTLIBRARIES =
+ if !REMOTE_ONLY
+ lib_LIBRARIES += libunwind-ptrace.a
+-lib_LTLIBRARIES += libunwind.la libunwind-setjmp.la
++lib_LTLIBRARIES += libunwind.la #libunwind-setjmp.la
+ endif
+ 
+ noinst_HEADERS =
+Index: libunwind-1.0/tests/Makefile.am
+===================================================================
+--- libunwind-1.0.orig/tests/Makefile.am
++++ libunwind-1.0/tests/Makefile.am
+@@ -27,7 +27,7 @@ if ARCH_IA64
+ 			Gia64-test-nat Lia64-test-nat			\
+ 			Gia64-test-rbs Lia64-test-rbs			\
+ 			Gia64-test-readonly Lia64-test-readonly		\
+-			ia64-test-setjmp ia64-test-sig
++			ia64-test-sig
+ else
+ if ARCH_PPC64
+ if USE_ALTIVEC
+@@ -44,7 +44,7 @@ endif #ARCH_IA64
+ 			Gtest-dyn1 Ltest-dyn1				 \
+ 			Gtest-trace Ltest-trace				 \
+ 			test-async-sig test-flush-cache test-init-remote \
+-			test-mem test-setjmp test-ptrace		 \
++			test-mem test-ptrace		 \
+ 			Ltest-nomalloc Ltest-nocalloc rs-race
+  noinst_PROGRAMS_cdep = forker mapper test-ptrace-misc			 \
+ 			Gperf-simple Lperf-simple
diff --git a/sys-libs/libunwind/libunwind-1.0.ebuild b/sys-libs/libunwind/libunwind-1.0.ebuild
new file mode 100644
index 000000000000..bc432dd2a9f3
--- /dev/null
+++ b/sys-libs/libunwind/libunwind-1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libunwind/libunwind-1.0.ebuild,v 1.1 2011/08/28 14:17:43 flameeyes Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Portable and efficient API to determine the call-chain of a program"
+HOMEPAGE="http://savannah.nongnu.org/projects/libunwind"
+SRC_URI="http://download.savannah.nongnu.org/releases/libunwind/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="7"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="static-libs debug"
+
+RESTRICT="test"		 # https://savannah.nongnu.org/bugs/?22368
+					 # https://bugs.gentoo.org/273372
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-disable-setjmp.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	# do not $(use_enable) because the configure.in is broken and parses
+	# --disable-debug the same as --enable-debug.
+	use debug && myconf+=" --enable-debug"
+
+	econf $(use_enable static-libs static) \
+		${myconf}
+}
+
+src_test() {
+	# explicitly allow parallel build of tests
+	emake check
+}
+
+src_install() {
+	default
+	# libunwind-ptrace.a (and libunwind-ptrace.h) is separate API and without
+	# shared library, so we keep it in any case
+	use static-libs || rm -f "${D}"usr/lib*/libunwind{-generic.a,*.la}
+}