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).

(Portage version: 2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64)

7 files changed, 85 insertions, 76 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/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