sci-libs/cln: Import some arm and s390x related patches from fedora, move to autotools-utils.eclass; add missing eclass

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

7 files changed, 121 insertions, 19 deletions

diff --git a/sci-libs/cln/ChangeLog b/sci-libs/cln/ChangeLog
index 7c84fd84226f..4d80d2eb6aa1 100644
--- a/sci-libs/cln/ChangeLog
+++ b/sci-libs/cln/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/cln
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/ChangeLog,v 1.52 2011/06/13 21:39:56 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/ChangeLog,v 1.53 2012/10/10 13:29:45 jlec Exp $
+
+*cln-1.3.2-r1 (10 Oct 2012)
+
+  10 Oct 2012; Justin Lecher <jlec@gentoo.org> cln-1.3.1.ebuild,
+  +cln-1.3.2-r1.ebuild, +files/cln-1.3.2-arm.patch,
+  +files/cln-1.3.2-s390x.patch, metadata.xml:
+  Import some arm and s390x related patches from fedora, move to
+  autotools-utils.eclass; add missing eclass
 
 *cln-1.3.2 (13 Jun 2011)
 
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index cae66005d2c8..90fd1448b497 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX cln-1.2.2-gcc-4.4.patch 152 RMD160 4d004e57ce670608c9a9cc191716d261663ce994 SHA1 3d2f389e902876ee28fea64ea0c9b5aaf43686f2 SHA256 b3eb75149dd402127f1446147a73ec6b9650f673cd88d318ce0e415f790284ea
-DIST cln-1.3.1.tar.bz2 1258397 RMD160 bc3be659dfccafb6029af2bf761decceb51fbf4e SHA1 351506da9bd7b0b3cefd3a5424823797fb589acc SHA256 8a194ce7bb8a69b3f324e0472adda9543b675089e619fccf289c57bb8b97a8e9
-DIST cln-1.3.2.tar.bz2 1275638 RMD160 8644a278e99c3e15ebf83f5e641758bdecad8b23 SHA1 c30dca80e75f45e2107f233075e6d0339ea884b0 SHA256 5c70c46b953b3b71ed2a2e28362b9adfacfae24b2b678d81bcc053ab779e7173
-EBUILD cln-1.3.1.ebuild 1578 RMD160 a0b79e1fca86b4e08d8e20c196e21754a1a50ed5 SHA1 4b3e6a28cd10d40aa1d6a66775b9d3b21ff5f985 SHA256 a76ddda2052e693f8942586e9f2b3f5e0e87e4985c08439aa4886976f5af86f6
-EBUILD cln-1.3.2.ebuild 1275 RMD160 eedb7575065621ec7c50270521cea8cc9356036a SHA1 06ce928ea54734cbd66ab7125b8a0383b7546fe3 SHA256 9f11f9c3ec153c4db65a16b4030d4b925e5c2368e67e74f8fa4311867af140e6
-MISC ChangeLog 7733 RMD160 216f6f8f8d442ed30324391ad541684cb3ed06e3 SHA1 48f24dc3a17f094b883483c906bf1a24f9d02225 SHA256 d342a7f48ffa2c3f009dc84ab798defbacbee666762327717655d034cf0b166e
-MISC metadata.xml 593 RMD160 ce586bb59c0087d4dba849975dfbabc74989606f SHA1 2359f5958d97f3120a2674c2a4f0613648eec6a5 SHA256 d7f828add4f742b5a7672ec92b76f6c1f5ab7e568f5d620d2373cdeb3524be81
+AUX cln-1.2.2-gcc-4.4.patch 152 SHA256 b3eb75149dd402127f1446147a73ec6b9650f673cd88d318ce0e415f790284ea SHA512 c29df16b02199ad3193c5a0a7be32ba5d690d7d73ae8ba72cdb53a99138b8592d5fe4257acb4f8a5af94a6d7e25d1b98eb3e5184ddfe5ceab9037b9e1a8bfac0 WHIRLPOOL 04a632c1e9b2850a21222925a112f7f0e2b12959060fe944d1ffe2d33cec6d29c25778d2ddb1fdf2d41f631ce96b4a0631aa075631d48b4d9437fe8aac059768
+AUX cln-1.3.2-arm.patch 340 SHA256 ff5fd9300bb5a83c64b2c9c416fc5daed13d2a8527df4da021e02f46c5311254 SHA512 b16e00091ade3f77f54a88130a5953a8d677cbcc124a89e632266313b42c042cda57da4bececdc4740c1dce366a06593ad5cec21bf047ea43ea4927d2e08e020 WHIRLPOOL 0533b8c75f43aadd694abbdbb45a9fc5a9ac3fa0c10307bbb8975c9d45498ef3f0aa0f66c3efdcdc8e641a338ff0f67bb071afbe35b6579ea770e60540379c43
+AUX cln-1.3.2-s390x.patch 1154 SHA256 75ce241b1a0fa9031effec9ede426e50081b6fc33b5539b09108a36c6e58bd8a SHA512 f24d389971508926d60ba026142adaa3f78576584b2e20fe99bb3de120ac1916a09666126371d7be83e5acdbbdbf0e8ffca2aa5398447164a0c2564577261632 WHIRLPOOL f981ba8b4807244d33c943ea03a674d3439173cfe0b6351f5bf94dd3b7ec98d0a112f032d15eda3a4987cb9842b9918533c540a9e998954b1034edb052008cff
+DIST cln-1.3.1.tar.bz2 1258397 SHA256 8a194ce7bb8a69b3f324e0472adda9543b675089e619fccf289c57bb8b97a8e9 SHA512 f3613233655d9ce3b39d1ddd6fc94610a68416fc3b042271cedeefb4c2c45a84def8739c3ba79cc5d2a58bb7ac1ec2e0c64d010b7eadbb002ad412e6629c9f46 WHIRLPOOL d97742e9b66b465f05f1d6a6c1e9e0646f9c26a1b4326bda08d2d969dff3065c84d421c1d7a1649934f6b5a3ddb1672cde68966fd6951d851de927d81fd7be15
+DIST cln-1.3.2.tar.bz2 1275638 SHA256 5c70c46b953b3b71ed2a2e28362b9adfacfae24b2b678d81bcc053ab779e7173 SHA512 3a0340f7a9205bfbb033591246e36f419c687081191152e873f1172379de155180f7b969b7f559abccf64f470942bd0ac0674c43f6523499322fb492c2c33726 WHIRLPOOL 5aa4f59da5b3af949dfd985f767bc5744b4f218a8035faa031528c2c4589e24a1269b448ea523c57e4378922dd9ab433cad2f9e2b9954d8bdfbdca2fbb7c6b68
+EBUILD cln-1.3.1.ebuild 1586 SHA256 12a402d7dfa661ece923162be3e1d487805d1f6efe988b18be1cf3e7b13c3c61 SHA512 8429224d95a8a3de7ea2f595b54c7846b8277427ee627adef82b81b0fb5def3e3bdb0681998b6d1b72107d46f9d56017aad3be17cc15d0c8a1a5b1fdabed875a WHIRLPOOL 2cdc42c443a11a5217f1267d8a1c185439010fa1b012a86a415079c8182797ce884a8632fdd5741ec9b3178c209755eebc97484ea2d8f0124b248d41b9509f8a
+EBUILD cln-1.3.2-r1.ebuild 1514 SHA256 6cf3644f51470945f983a75c3c38e8218e73a44110438d259af8599b06a1fbf2 SHA512 11f5c09de927dd42d42c65d941c7f7e1276c7408f77ed269ad2ce1ea826c47312d82aeabbe46a18f83080da1604b8ed93dc5831343f33c22ca13ac094fd13890 WHIRLPOOL 62ab67921ebe9a3fb767a493c93199e3222ee65683ef97b9de1648099b617b8b84533572d6d0f8982ad6f47addfd5e69cb1bf3094c2a05837018120b88110e7f
+EBUILD cln-1.3.2.ebuild 1275 SHA256 9f11f9c3ec153c4db65a16b4030d4b925e5c2368e67e74f8fa4311867af140e6 SHA512 06f2d86f71469e01654531bd4190be7ec4adaaf09a95090024630719a7fc8500ef212f6ddced97e69cd14e696b6d5733c21394322bb0a826ed215af99cc86581 WHIRLPOOL caf5cd66d9d7867f895a2bca0edb8b16762ff614a79dec77faf0efd88def76263638d99f69b1e328170d630c0ce19891bf3c6f1d48afc1c16bc59545a6553a26
+MISC ChangeLog 8032 SHA256 41016415403bef9c68c67f224eac720c7987400ab86dd3bf53c8349568f0a890 SHA512 47a3648dbcd306a03338e5a37c30c32be355ea9e54cae8535b376885162868dabc078e8981734bb50ca19278129a9adde7cf6266da98b077a684c969f8488594 WHIRLPOOL 372665f28c8d760602c326baddfe036e0b55f3a2f61d6435035765d2f81e778619536415be0818db5915da75b928a2c34414539f26b3348fa45bda40da572389
+MISC metadata.xml 595 SHA256 a2b66f261e485284df228528542f216728cf76d7ab65bc210eb04437770ff271 SHA512 5e382db62d72482da50d6ec485ef863021dc39e6a63e1e88a7b5c03de3ee5b643e7831a2001ab3a3a5b23f3d36650223dadeb48849992301bead179685335197 WHIRLPOOL 77aa9eada90f7ebdaf307d0eac9c37ee39d1bd9a30bf0b882c883f1f01a052eeefa456c75e8493208eca0824ac1d11c1496d4b89f4a63544b42d72377fffb448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk32g7YACgkQ1ycZbhPLE2Bs4QCeIejv9kB4mV1svmA5mWctf6dE
-I9YAnRvK1zAKswXVOPprXRb7HPjt1q/2
-=VdiU
+iEYEAREIAAYFAlB1eEoACgkQgAnW8HDreRaVogCdH6Mkf50y5GX495XjFTYIFX+g
+MfkAn2bKyIPbQuxUOlBSBIRux9cp4ajV
+=CuiV
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cln/cln-1.3.1.ebuild b/sci-libs/cln/cln-1.3.1.ebuild
index 12c5f4d22a89..98081f677dd0 100644
--- a/sci-libs/cln/cln-1.3.1.ebuild
+++ b/sci-libs/cln/cln-1.3.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.3.1.ebuild,v 1.11 2010/10/15 09:44:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.3.1.ebuild,v 1.12 2012/10/10 13:29:45 jlec Exp $
 
 EAPI=2
-inherit eutils flag-o-matic
+
+inherit eutils flag-o-matic multilib
 
 DESCRIPTION="Class library (C++) for numbers"
 HOMEPAGE="http://www.ginac.de/CLN/"
diff --git a/sci-libs/cln/cln-1.3.2-r1.ebuild b/sci-libs/cln/cln-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..a78a171fe107
--- /dev/null
+++ b/sci-libs/cln/cln-1.3.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.3.2-r1.ebuild,v 1.1 2012/10/10 13:29:45 jlec Exp $
+
+EAPI=4
+
+inherit autotools-utils flag-o-matic
+
+DESCRIPTION="Class library (C++) for numbers"
+HOMEPAGE="http://www.ginac.de/CLN/"
+SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc examples static-libs"
+
+DEPEND="dev-libs/gmp
+	doc? ( virtual/latex-base )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-s390x.patch
+	"${FILESDIR}"/${P}-arm.patch
+	)
+
+pkg_setup() {
+	use sparc && append-cppflags "-DNO_ASM"
+	use hppa && append-cppflags "-DNO_ASM"
+	use arm && append-cppflags "-DNO_ASM"
+}
+
+src_prepare() {
+	# avoid building examples
+	# do it in Makefile.in to avoid time consuming eautoreconf
+	sed -i -e '/^SUBDIRS.*=/s/examples doc benchmarks/doc/' Makefile.in || die
+	autotools-utils_src_prepare
+}
+
+src_configure () {
+	local myeconfargs=( --datadir="${EPREFIX}"/usr/share/doc/${PF} )
+	autotools-utils_src_configure
+}
+src_compile() {
+	autotools-utils_src_compile
+	use doc && autotools-utils_src_compile html pdf
+}
+
+src_install () {
+	use doc && DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/cln.pdf") && HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/doc/")
+	autotools-utils_src_install
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*.cc
+	fi
+}
diff --git a/sci-libs/cln/files/cln-1.3.2-arm.patch b/sci-libs/cln/files/cln-1.3.2-arm.patch
new file mode 100644
index 000000000000..571bd24e68f6
--- /dev/null
+++ b/sci-libs/cln/files/cln-1.3.2-arm.patch
@@ -0,0 +1,13 @@
+--- src/base/digitseq/cl_asm_arm_.cc	2009-05-10 16:32:30.000000000 -0400
++++ src/base/digitseq/cl_asm_arm_.cc.new	2009-12-29 09:03:02.161401990 -0500
+@@ -77,8 +77,8 @@
+ #else
+ #define DECLARE_FUNCTION(x)
+ #endif
+-#define GLABEL(x) _##x##:
+-#define LABEL(x) x##:
++#define GLABEL(x) _##x:
++#define LABEL(x) x:
+ #define RRX rrx
+ #define END
+ 
diff --git a/sci-libs/cln/files/cln-1.3.2-s390x.patch b/sci-libs/cln/files/cln-1.3.2-s390x.patch
new file mode 100644
index 000000000000..c0b1082ca096
--- /dev/null
+++ b/sci-libs/cln/files/cln-1.3.2-s390x.patch
@@ -0,0 +1,20 @@
+--- include/cln/types.h	2009-06-14 15:49:32.000000000 -0400
++++ include/cln/types.h.new	2009-12-29 09:01:31.751401399 -0500
+@@ -48,7 +48,7 @@
+     #undef HAVE_LONGLONG
+    #endif
+   #endif
+-  #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__sparc64__) || defined(__x86_64__))
++  #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__sparc64__) || defined(__x86_64__))
+     // 64 bit registers in hardware
+     #define HAVE_FAST_LONGLONG
+   #endif
+@@ -127,7 +127,7 @@
+     typedef int sintD;
+     typedef unsigned int uintD;
+   #else  // we are not using GMP, so just guess something reasonable
+-    #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__)))
++    #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__x86_64__)))
+       #define intDsize 64
+       typedef sint64  sintD;
+       typedef uint64  uintD;
diff --git a/sci-libs/cln/metadata.xml b/sci-libs/cln/metadata.xml
index 66e000d46f88..ffaaa7776575 100644
--- a/sci-libs/cln/metadata.xml
+++ b/sci-libs/cln/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<longdescription lang="en">
+	<herd>sci-mathematics</herd>
+	<longdescription lang="en">
   A Class Library for Numbers is a library for computations with all
   kinds of numbers in arbitrary precision. It has a set of number
   classes, including integers (with unlimited precision), reals with