Filtered CFLAGS=-fdirectives-only and minor QA fixes, switch to EAPI=2

Package-Manager: portage-2.2_rc27/cvs/Linux x86_64

3 files changed, 38 insertions, 21 deletions

diff --git a/sci-libs/cln/ChangeLog b/sci-libs/cln/ChangeLog
index 9715eb3b7138..8ef3474f2591 100644
--- a/sci-libs/cln/ChangeLog
+++ b/sci-libs/cln/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/cln
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/ChangeLog,v 1.31 2009/03/11 18:02:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/ChangeLog,v 1.32 2009/04/01 12:05:53 bicatali Exp $
+
+  01 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> cln-1.2.2.ebuild:
+  Filtered CFLAGS=-fdirectives-only and minor QA fixes, switch to EAPI=2
 
   11 Mar 2009; Jeroen Roovers <jer@gentoo.org> cln-1.2.2.ebuild:
   Marked ~hppa (bug #260777). Do not use deprecated hppa1.1 asm.
diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest
index adff75784fc3..1eb7912b5c68 100644
--- a/sci-libs/cln/Manifest
+++ b/sci-libs/cln/Manifest
@@ -1,8 +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.2.tar.bz2 1742427 RMD160 e53ceebede73fb3f97ca85aeba1c821e1e7d3c38 SHA1 2d2a5d3e383a3043c5bf68299a466685ef4ec8ec SHA256 3de70896cb9eaa7d4cb957890adb88cd7d7a9ce84c0e2a87cd18afde017392e5
 EBUILD cln-1.1.13.ebuild 946 RMD160 a0cbac8d8313b45001a2bb4f5b505f63175c7f1b SHA1 d5f51250feb45f26374ff8baa0d3e924485d6c9c SHA256 ffcdcbc9224e1a0ce40851e555c6245e885726ee01084aa6070f27d5da78217a
-EBUILD cln-1.2.2.ebuild 1466 RMD160 85132ead7506a26c54be65fe9c96060ad4617619 SHA1 f70b98268c8d05d08eb9198ec6b4d6ed0896b5b1 SHA256 5daaf351441cf86f0cc5812efb06fc016d713e939f5f3aaf14e1f72d9ae270ed
-MISC ChangeLog 5319 RMD160 192f108d62f45240a6bca5bb3de2275febcabaa5 SHA1 128d10ddc446ba977723d0296028255df181f60b SHA256 04b8a5973f7f170e7ee31d35c6cd453edcb18fd0df1b664ff45be71fb3907f13
+EBUILD cln-1.2.2.ebuild 1521 RMD160 568fff552d1e59e0abd3af9dc98d9eb26400eb04 SHA1 5b03bf0c930942c065be04bdc4525952088548dc SHA256 597725177ba5032a297f63acf04639816a2ab8ee52a0c61024e63a9ba95c1d24
+MISC ChangeLog 5471 RMD160 6524c09f24d5fa8c3d5c63ec67daad18dbab6001 SHA1 320153544f3261b21a49d408ab3d4e4caea935fb SHA256 fcc0f1f2fea54605eee975f7e7a94841a77abdabaeaf3ae3f78df273bcbb8f54
 MISC metadata.xml 593 RMD160 ce586bb59c0087d4dba849975dfbabc74989606f SHA1 2359f5958d97f3120a2674c2a4f0613648eec6a5 SHA256 d7f828add4f742b5a7672ec92b76f6c1f5ab7e568f5d620d2373cdeb3524be81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknTWKcACgkQ1ycZbhPLE2COYACfXgvs/kpXuXDPF4/qkIk7AeeP
+VLIAn19v7KmEvq1gAk81Q7OP9+XxTH+Q
+=gL5r
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/cln/cln-1.2.2.ebuild b/sci-libs/cln/cln-1.2.2.ebuild
index 8dc43c21a7b1..949b89672faa 100644
--- a/sci-libs/cln/cln-1.2.2.ebuild
+++ b/sci-libs/cln/cln-1.2.2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 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.8 2009/03/11 18:02:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.2.2.ebuild,v 1.9 2009/04/01 12:05:53 bicatali Exp $
 
-inherit eutils flag-o-matic multilib
+EAPI=2
+inherit eutils flag-o-matic
 
 DESCRIPTION="Class library (C++) for numbers"
 HOMEPAGE="http://www.ginac.de/CLN/"
@@ -16,29 +17,32 @@ KEYWORDS="amd64 ~hppa ppc ~ppc64 sparc x86"
 IUSE="doc examples"
 
 DEPEND="dev-libs/gmp"
+RDEPEND="${DEPEND}"
 
-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 () {
+pkg_setup() {
 	# -Os causes segmentation faults (see bug #174576)
-	# checked for 1.2.1, gcc-4.2.3
+	# checked for 1.2.2, gcc-4.3.3
 	replace-flags -Os -O2
 	# ftracer buggy bug #237451
 	filter-flags -ftracer
+	# -fdirectives-only also buggy bug #263257
+	filter-flags -fdirectives-only
 	use sparc && append-cppflags "-DNO_ASM"
 	use hppa && append-cppflags "-DNO_ASM"
+}
+
+
+src_prepare() {
+	# 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_configure () {
 	econf  \
 		--libdir=/usr/$(get_libdir) \
-		--datadir=/usr/share/doc/${PF} \
-		|| die "econf failed"
-	emake || die "emake failed"
+		--datadir=/usr/share/doc/${PF}
 }
 
 src_install () {
@@ -46,10 +50,10 @@ src_install () {
 	dodoc README ChangeLog TODO* NEWS
 	if use doc; then
 		dodoc doc/cln.ps
-		dohtml doc/cln/*
+		dohtml doc/cln/* || die
 	fi
 	if use examples; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples
+		doins -r examples || die
 	fi
 }