do not force doc install

Package-Manager: portage-2.2.01.20796-prefix/cvs/Linux x86_64

4 files changed, 17 insertions, 68 deletions

diff --git a/sci-astronomy/wcslib/ChangeLog b/sci-astronomy/wcslib/ChangeLog
index 0175f43592d2..3a2ea7e90501 100644
--- a/sci-astronomy/wcslib/ChangeLog
+++ b/sci-astronomy/wcslib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-astronomy/wcslib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.29 2012/07/17 19:59:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/ChangeLog,v 1.30 2012/08/05 20:50:19 bicatali Exp $
+
+  05 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -wcslib-4.13.4.ebuild,
+  wcslib-4.14.ebuild:
+  do not force doc install
 
 *wcslib-4.14 (17 Jul 2012)
 
diff --git a/sci-astronomy/wcslib/Manifest b/sci-astronomy/wcslib/Manifest
index f6c588484e4f..40a19884f730 100644
--- a/sci-astronomy/wcslib/Manifest
+++ b/sci-astronomy/wcslib/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST wcslib-4.13.4.tar.bz2 1583119 SHA256 7fb7bd9a87fb0faf412a4a5fe072db417562f397622b746c6b6c392b1b426719 SHA512 950b7a704b8647e91925889fb51ca0a5c723b4100167fa45c53d0a77432f0e5fb26f189bddf69f5d39c76d89b1435ba00bf5634b86571cfc502b16762735adf3 WHIRLPOOL 92bbd278d9c4042f8ad491de851a38eb1b98d63ccb6e46c9d1bf9ce43f91674383cf4060b748d198a37ad0a75f2b80679d3a33510bcf53ca7f1bbd4096678117
 DIST wcslib-4.14.tar.bz2 1591911 SHA256 f6fccfa4452a28b3b6f7c9e3a2f547ca429d04bf7bf56949ed54392267a99002 SHA512 7513dda03a2cb413584f203fdb91bceee90c7374449d6827adbb27f81623f8d5ace212d7ee19a4152b456929b19fe8b30d09ae101f05dcfc52dbfce7353449fb WHIRLPOOL b120561a67c5961e0eb54cc856fa49a60e5482c56e8f475c54ba5f53eb61dd15e2da2438c2dba8c8332d46c1f1ad65eecbddd7484363cf2909595a1ac28c8d00
-EBUILD wcslib-4.13.4.ebuild 1276 SHA256 05e8cbd5b06ec8ee5fd5c58a4d741991b149531367872d1426f7ce3bdae1d9df SHA512 a6e10d77a1eaed998989892ad7422e48d582949189e97b622ffd6117e1b1dedad0c67786ed49712575c4a1f56ec218e516bb920fbf63f972f447af11a16fa5e9 WHIRLPOOL 39ed3b3204cb6551fa040385a004791a7700f7851911c40918d0ed33302f10c9c727438e76defb391ccfdd128281652a6981f1ff078f0437e5e3a0fc19dc47ed
-EBUILD wcslib-4.14.ebuild 1296 SHA256 c449279a242a552286563ac46e173c3b20a5379d79c9b13a7c4819eda9e5f950 SHA512 9335c3a7734f442c62fd68f24e039249dda7f9dff4a49978a96788367945781f1739a224ed8da69ff515b24ececd59af4b8b058f8625dbc16f8d73232c25b92b WHIRLPOOL 717bb9c585e5118dfbee84fbc0bae10d81b4d6c4df70435575fc5e56d24fd02f448bb83933bce8ad7d04ab2fdf1a099d3399ec5eb4e2b6df9c9a884657f1ad29
-MISC ChangeLog 5521 SHA256 c7ceb45124d6a6b881084e14973125241a7194a94031ffb50424cebee956abeb SHA512 23224a6377fd4182b47146c23fc093c1bc0fb2822f1428d0fe563b920bc754b4118c809a0ea77bb33bd0e0d7e82e387f88b2a1afa260fa1100682494b499c47a WHIRLPOOL 38211298b50c0ead55b7b33b279f97415d70cd2a7085700a3eaac58bf14c61df0c63217e3ba50fe9e80f0b5b62ed6e1726e3f142675a5a12abfa70c988ddccd8
+EBUILD wcslib-4.14.ebuild 1395 SHA256 5a83db11ef92e382b6722b9e548b9aa76d4eb9c5e4e7e667932b90f5077036fa SHA512 c021c3e7bcecffd22af2897386e035c4ddc80893168c2d8e2de3f3e382898151f9ec115c28bf0e41654c59228f2f808777fb5cc75b3aa2119a62159f4df96cb8 WHIRLPOOL f647bab55b6f4bfbe20fed51ab0a3e7eecda692bf55ee1b2e0dfc5644a2ef83c376bc0cb09c26b06aa5d6ba42ad45e0410dfeac800c83c267912d458b747419c
+MISC ChangeLog 5649 SHA256 7b78eeefc56ccf445faf3e566949e980f54ea8b9d1bbdcf596c330e553c88ca2 SHA512 9398ee30033e13d70f5864975acb67dade782679583aa3cfdd70cf5d77a36b38f0fc3bf144ed3b09d7c872427cfe97d0f31f0d55c081add864e795c67aeb5ce9 WHIRLPOOL 1c526427056f09f15d498845923eb8c87e7b39bfee99e70880e645197ba3dfe9e783ba0b5e6a7a5e416cc7d6bb328a81d19efef236dc7ba53d07c58b37c4c962
 MISC metadata.xml 752 SHA256 ff8e4736cef8416a7771c3a7a6a8c970ab475d6ceff4194398251b57e3b02253 SHA512 b89e79aa327906309b364fdeafa05e6da2b644855fbe650485e361b90195d4cdb0f093b6a5ecf7a04df75967be87fe18e07b469cf019472b3932a33a2f737fe0 WHIRLPOOL 1dac61166e43db986a8f5843335bc49d7d13d1fa739bd1f152375e970a533e258b3094dea589c82c347b58b4f1143ac5b6ac6f6bf04841664d2b9c84211b707d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAFxJsACgkQ1ycZbhPLE2CJFwCeOFr7dGWKK6Nd4mvc4scllOdA
-7IEAoIWctMuupikEeH2TAs8b07col+BK
-=jWLm
+iEYEAREIAAYFAlAe3JEACgkQ1ycZbhPLE2CJCQCfQrskNcrYWGMiPt9Nfil79Wxw
+n1kAnjNPsGn/NwMe1xdaYknV1kwrbyo1
+=aTUl
 -----END PGP SIGNATURE-----
diff --git a/sci-astronomy/wcslib/wcslib-4.13.4.ebuild b/sci-astronomy/wcslib/wcslib-4.13.4.ebuild
deleted file mode 100644
index e24a4ce4f6af..000000000000
--- a/sci-astronomy/wcslib/wcslib-4.13.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.13.4.ebuild,v 1.1 2012/04/05 20:42:47 xarthisius Exp $
-
-EAPI=4
-
-inherit eutils fortran-2
-
-DESCRIPTION="Astronomical World Coordinate System transformations library"
-HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
-SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="fortran fits pgplot static-libs"
-
-RDEPEND="fortran? ( virtual/fortran )
-	fits? ( sci-libs/cfitsio )
-	pgplot? ( sci-libs/pgplot )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's/COPYING\*//' GNUmakefile || die
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable static-libs static) \
-		$(use_enable fortran) \
-		$(use_with fits cfitsio) \
-		$(use_with pgplot)
-}
-
-src_compile() {
-	# nasty makefile, debugging means full rewrite
-	emake -j1
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install () {
-	default
-	# static libs are same as shared (compiled with PIC)
-	# so they are not compiled twice
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.a
-}
diff --git a/sci-astronomy/wcslib/wcslib-4.14.ebuild b/sci-astronomy/wcslib/wcslib-4.14.ebuild
index 5c9a5eae2c99..0714fa0d39fc 100644
--- a/sci-astronomy/wcslib/wcslib-4.14.ebuild
+++ b/sci-astronomy/wcslib/wcslib-4.14.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.14.ebuild,v 1.1 2012/07/17 19:59:47 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/wcslib/wcslib-4.14.ebuild,v 1.2 2012/08/05 20:50:19 bicatali Exp $
 
 EAPI=4
 
-inherit eutils fortran-2
+inherit eutils fortran-2 multilib
 
 DESCRIPTION="Astronomical World Coordinate System transformations library"
 HOMEPAGE="http://www.atnf.csiro.au/people/mcalabre/WCS/"
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.atnf.csiro.au/pub/software/${PN}/${P}.tar.bz2"
 SLOT="0"
 LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fortran fits pgplot static-libs"
+IUSE="doc fortran fits pgplot static-libs"
 
 RDEPEND="fortran? ( virtual/fortran )
 	fits? ( sci-libs/cfitsio )
@@ -51,5 +51,7 @@ src_install () {
 	default
 	# static libs are same as shared (compiled with PIC)
 	# so they are not compiled twice
-	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.a
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/lib*.a
+	use doc || rm -r "${ED}"/usr/share/doc/${PF}/html \
+		"${ED}"/usr/share/doc/${PF}/*.pdf
 }