Documentation and examples are not installed by default anymore but with use flags. Pre-pocessor flags on sparc don't use asm (see bug #238444).

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64

8 files changed, 100 insertions, 83 deletions

diff --git a/sci-libs/cln/ChangeLog b/sci-libs/cln/ChangeLog
index 20a4717fdbea..b0d3e529d233 100644
--- a/sci-libs/cln/ChangeLog
+++ b/sci-libs/cln/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/cln
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/ChangeLog,v 1.25 2008/09/26 00:27:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/ChangeLog,v 1.26 2008/09/30 12:58:09 bicatali Exp $
+
+  30 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/cln-1.2.2-docs.patch, +files/cln-1.2.2-examples.patch,
+  metadata.xml, -cln-1.2.0.ebuild, -cln-1.2.1.ebuild, cln-1.2.2.ebuild:
+  Documentation and examples are not installed by default anymore but with
+  use flags. Pre-pocessor flags on sparc don't use asm (see bug #238444).
 
   26 Sep 2008; Brent Baude <ranger@gentoo.org> cln-1.2.2.ebuild:
   stable ppc, bug 238444
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index b8ca3797b05b..0d76c4638e9d 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cln-1.2.2-docs.patch 697 RMD160 b69b4e1c46c7e71162272dd14cd8523814915c12 SHA1 4181aada3545b9d1b3981d0cb688d7d8bc77a720 SHA256 1623aed262253dd5ae638e28df8fc0407ec62b0df913b78649666aa2a04b4ee3
+AUX cln-1.2.2-examples.patch 905 RMD160 f4ddec8a773e6eda6abc38fe7daef34e67bc5f00 SHA1 08f9d10ac78c42b9518b24d782afa08fa8cdc654 SHA256 171661c787f607615265ad2ca7e48d46978b10497286f4a8111cf45445ce970d
 DIST cln-1.1.13.tar.bz2 1708927 RMD160 798e8e2a8d4aa81b770b6606ae1fe617bcb0cbc3 SHA1 61c130cbb00ed95a19ee9dffc136b2823e452647 SHA256 fb570c0ac44aef1ffe251fdf2a9b40448c95aa21398b492566203dd982b18c03
-DIST cln-1.2.0.tar.bz2 1746401 RMD160 81c502ba32c44fbf2e7ab229465ef0714facfdab SHA1 603bc7f3c269112572580a0bca98a4160c6da76d SHA256 8a26b62238754e6ccaeec25711259f02a3b8b145caed2f46b22fd2e2c62e41a8
-DIST cln-1.2.1.tar.bz2 1742827 RMD160 7e594582269b99cc7bad1ceb6a4889e9e5197b86 SHA1 1ddd4922e9109b39f0cdf78e3f1c992d6693f47a SHA256 aa8f1470d2add9095c8e8e9cecf99b100fa45e710e520672c6222e3c55b15f5a
 DIST cln-1.2.2.tar.bz2 1742427 RMD160 e53ceebede73fb3f97ca85aeba1c821e1e7d3c38 SHA1 2d2a5d3e383a3043c5bf68299a466685ef4ec8ec SHA256 3de70896cb9eaa7d4cb957890adb88cd7d7a9ce84c0e2a87cd18afde017392e5
 EBUILD cln-1.1.13.ebuild 892 RMD160 8601f5e6d737eb2f4f3367b9c55425d52f3a08fb SHA1 2bfd8b3f84ae0f7be6bfed6e24a6f460c7b4622e SHA256 d15d890e89c4b91f7c364fd40b90e2bcfb8a4e1e43f203aece9a47fbde19ff2e
-EBUILD cln-1.2.0.ebuild 909 RMD160 ac6831228e88f0edc6b7090daa891b5806e337d5 SHA1 688f0113eea91c14f4d77c35b450f1439d29a5b2 SHA256 5a85b2d94f632806b358f082293fb29f17d68a5e10baf62b97f49aaae12fa2e7
-EBUILD cln-1.2.1.ebuild 941 RMD160 5ef3c5371f5e8e5eca2c765df28a22cf0c210964 SHA1 20141d01ff4372c8054332d118c7466e24915a19 SHA256 55856dbb672af5c03981d1593bb8b474e5b99b6b403a00e007ac5eeb94d7b5da
-EBUILD cln-1.2.2.ebuild 938 RMD160 91b2ef290fe21490058e29fac5b4bf134b268b40 SHA1 1a9ab853ab5cf176a6194c78957d6af5216d6ffa SHA256 39842f373af31dd884c075ec5008042d357dbaff2f388969649a3c8cba1fcbc2
-MISC ChangeLog 4387 RMD160 b47102f59cb5eef5cf0b27d492b82d3edfb3fbd6 SHA1 7d97779529a07a89845d5a6c6c8d9a7b58546914 SHA256 4b99b7ef529cad0c3973a4cf96bf0eb367c2e3e703215441349cce6c79e8bab6
-MISC metadata.xml 581 RMD160 d758e78f005a5c8af4b912070dc1ac18882db082 SHA1 affd5ee1ee7250b6605868ddd852b959ed4a1214 SHA256 dda95cf3a1e5bca672e916dd61cdf7e591faaea85cfdf7aaa37ff7476443b95c
+EBUILD cln-1.2.2.ebuild 1370 RMD160 3bf8fbbe8ad7875bdbfa7e915baee70af7d44d9f SHA1 dd0762ce8bcbd7834c3cd4df64908cbe266f9fa7 SHA256 400c9b4c1dd1dd2662eff916e0b5b6a7e3eaa6afc3d5f62f676c08653eab2f94
+MISC ChangeLog 4730 RMD160 2c856ab1921f3c7ada6c200986414482fa29481e SHA1 4691ac39c878c4065d57817693fad04cd9381363 SHA256 4332cc38148811a4ab0ebc44a277948a22fcb1f45c1de26a0b024a9e057a7a53
+MISC metadata.xml 593 RMD160 ce586bb59c0087d4dba849975dfbabc74989606f SHA1 2359f5958d97f3120a2674c2a4f0613648eec6a5 SHA256 d7f828add4f742b5a7672ec92b76f6c1f5ab7e568f5d620d2373cdeb3524be81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjiIm4ACgkQ1ycZbhPLE2APNwCbB9jt02WPT8tuEwWiU9F/2b9O
+6GYAnA6E4rSL7wnXu1KTfSR1yVq4ZmKQ
+=HPZu
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/cln/cln-1.2.0.ebuild b/sci-libs/cln/cln-1.2.0.ebuild
deleted file mode 100644
index 0e7c35037591..000000000000
--- a/sci-libs/cln/cln-1.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.2.0.ebuild,v 1.1 2008/02/01 20:08:30 bicatali Exp $
-
-inherit flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="CLN, a class library (C++) for numbers"
-
-HOMEPAGE="http://www.ginac.de/CLN/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2
-	ftp://ftp.santafe.edu/pub/gnu/${P}.tar.bz2
-	ftp://ftp.ilog.fr/pub/Users/haible/gnu/${P}.tar.bz2"
-DEPEND="dev-libs/gmp"
-
-src_compile () {
-	# -Os causes segmentation faults (see bug #174576)
-	replace-flags -Os -O2
-
-	econf  \
-		--libdir=/usr/$(get_libdir) \
-		--datadir=/usr/share/doc/${PF} || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/sci-libs/cln/cln-1.2.1.ebuild b/sci-libs/cln/cln-1.2.1.ebuild
deleted file mode 100644
index 204a31018cb5..000000000000
--- a/sci-libs/cln/cln-1.2.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.2.1.ebuild,v 1.1 2008/03/28 14:44:13 bicatali Exp $
-
-inherit flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="CLN, a class library (C++) for numbers"
-
-HOMEPAGE="http://www.ginac.de/CLN/"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2
-	ftp://ftp.santafe.edu/pub/gnu/${P}.tar.bz2
-	ftp://ftp.ilog.fr/pub/Users/haible/gnu/${P}.tar.bz2"
-DEPEND="dev-libs/gmp"
-
-src_compile () {
-	# -Os causes segmentation faults (see bug #174576)
-	# checked for 1.2.1, gcc-4.2.3
-	replace-flags -Os -O2
-
-	econf  \
-		--libdir=/usr/$(get_libdir) \
-		--datadir=/usr/share/doc/${PF} || die "econf failed."
-	emake || die "emake failed."
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/sci-libs/cln/cln-1.2.2.ebuild b/sci-libs/cln/cln-1.2.2.ebuild
index 4115545d50d7..8a2cbcbaac3a 100644
--- a/sci-libs/cln/cln-1.2.2.ebuild
+++ b/sci-libs/cln/cln-1.2.2.ebuild
@@ -1,34 +1,53 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.2.2.ebuild,v 1.2 2008/09/26 00:27:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.2.2.ebuild,v 1.3 2008/09/30 12:58:09 bicatali Exp $
 
-inherit flag-o-matic toolchain-funcs multilib
+inherit eutils flag-o-matic multilib
 
-DESCRIPTION="CLN, a class library (C++) for numbers"
+DESCRIPTION="Class library (C++) for numbers"
 
 HOMEPAGE="http://www.ginac.de/CLN/"
 
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~amd64 ppc ~sparc ~x86"
-IUSE=""
+IUSE="doc examples"
 
 SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2
 	ftp://ftp.santafe.edu/pub/gnu/${P}.tar.bz2
 	ftp://ftp.ilog.fr/pub/Users/haible/gnu/${P}.tar.bz2"
 DEPEND="dev-libs/gmp"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# avoid building tests and examples by default
+	epatch "${FILESDIR}"/${P}-examples.patch
+	# avoid installing dvi and html docs by default
+	epatch "${FILESDIR}"/${P}-docs.patch
+}
+
 src_compile () {
 	# -Os causes segmentation faults (see bug #174576)
 	# checked for 1.2.1, gcc-4.2.3
 	replace-flags -Os -O2
-
+	use sparc && append-cppflags "-DNO_ASM"
 	econf  \
 		--libdir=/usr/$(get_libdir) \
-		--datadir=/usr/share/doc/${PF} || die "econf failed."
-	emake || die "emake failed."
+		--datadir=/usr/share/doc/${PF} \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README ChangeLog TODO* NEWS
+	if use doc; then
+		dodoc doc/cln.ps
+		dohtml doc/cln/*
+	fi
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
 }
diff --git a/sci-libs/cln/files/cln-1.2.2-docs.patch b/sci-libs/cln/files/cln-1.2.2-docs.patch
new file mode 100644
index 000000000000..f30658628508
--- /dev/null
+++ b/sci-libs/cln/files/cln-1.2.2-docs.patch
@@ -0,0 +1,17 @@
+--- doc/Makefile.in~	2008-01-19 20:50:47.000000000 +0000
++++ doc/Makefile.in	2008-09-29 13:08:08.000000000 +0100
+@@ -80,14 +80,10 @@
+ 	  echo " install-info --info-dir=${DESTDIR}${infodir} ${DESTDIR}${infodir}/${PACKAGE}.info";\
+ 	  install-info --info-dir=${DESTDIR}${infodir} ${DESTDIR}${infodir}/${PACKAGE}.info || :;\
+ 	else : ; fi
+-	${INSTALL_DATA} ${srcdir}/${PACKAGE}/${PACKAGE}*.html ${DESTDIR}${htmldir}
+-	${INSTALL_DATA} ${srcdir}/${PACKAGE}.dvi ${DESTDIR}${dvidir}/${PACKAGE}.dvi
+ 
+ installdirs : force
+ 	${MKDIR} ${DESTDIR}${datadir}
+ 	${MKDIR} ${DESTDIR}${infodir}
+-	${MKDIR} ${DESTDIR}${htmldir}
+-	${MKDIR} ${DESTDIR}${dvidir}
+ 
+ uninstall : force
+ 	@if (install-info --version && \
diff --git a/sci-libs/cln/files/cln-1.2.2-examples.patch b/sci-libs/cln/files/cln-1.2.2-examples.patch
new file mode 100644
index 000000000000..479cc84d5606
--- /dev/null
+++ b/sci-libs/cln/files/cln-1.2.2-examples.patch
@@ -0,0 +1,34 @@
+--- tests/Makefile.in~	2006-10-11 20:08:32.000000000 +0100
++++ tests/Makefile.in	2008-09-29 13:19:05.000000000 +0100
+@@ -95,7 +95,9 @@
+ MODULES_timesqrtmodp = timesqrtmodp
+ MODULES_main = main
+ 
+-all : exam${EXEEXT} tests${EXEEXT}
++all :
++
++build : exam${EXEEXT} tests${EXEEXT}
+ 
+ %.s : %.c
+ 	${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@
+@@ -171,7 +173,7 @@
+ 
+ uninstall :
+ 
+-check : all
++check : build
+ 	./exam${EXEEXT}
+ 	./tests${EXEEXT}
+ 
+--- examples/Makefile.in~	2006-09-06 21:09:08.000000000 +0100
++++ examples/Makefile.in	2008-09-29 13:17:24.000000000 +0100
+@@ -62,7 +62,8 @@
+ MODULES_perfnum = perfnum
+ MODULES_pi = pi
+ 
+-all : $(addsuffix ${EXEEXT}, contfrac e fibonacci legendre lucaslehmer nextprime perfnum pi)
++all:
++build : $(addsuffix ${EXEEXT}, contfrac e fibonacci legendre lucaslehmer nextprime perfnum pi)
+ 
+ %.s : %.c
+ 	${CC} ${CFLAGS} ${CPPFLAGS} ${TARGET_ARCH} -S $< -o $@
diff --git a/sci-libs/cln/metadata.xml b/sci-libs/cln/metadata.xml
index b30aa50c6bec..66e000d46f88 100644
--- a/sci-libs/cln/metadata.xml
+++ b/sci-libs/cln/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+<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