diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-12 17:00:25 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-12 17:00:25 +0000 |
| commit | d10a53f99fe03d84d731a31fbfe854219476ddb8 (patch) | |
| tree | 4c4b457f4da5660b3dded721a1a75fff0462d550 /sci-libs | |
| parent | Add dependency on app-vim/align, update HOMEPAGE, and remove old. (diff) | |
| download | historical-d10a53f99fe03d84d731a31fbfe854219476ddb8.tar.gz historical-d10a53f99fe03d84d731a31fbfe854219476ddb8.tar.bz2 historical-d10a53f99fe03d84d731a31fbfe854219476ddb8.zip | |
Move to eapi4. Punt .la files. Run eselect only if really required for pretend phase.
Package-Manager: portage-2.2.0_alpha40/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/gsl/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/gsl/Manifest | 14 | ||||
| -rw-r--r-- | sci-libs/gsl/gsl-1.15.ebuild | 33 |
3 files changed, 31 insertions, 22 deletions
diff --git a/sci-libs/gsl/ChangeLog b/sci-libs/gsl/ChangeLog index 30c9c6309817..1238fd416976 100644 --- a/sci-libs/gsl/ChangeLog +++ b/sci-libs/gsl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/gsl # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.80 2011/05/21 10:18:03 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/ChangeLog,v 1.81 2011/06/12 17:00:25 scarabeus Exp $ + + 12 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> gsl-1.15.ebuild: + Move to eapi4. Punt .la files. Run eselect only if really required for + pretend phase. *gsl-1.15 (21 May 2011) diff --git a/sci-libs/gsl/Manifest b/sci-libs/gsl/Manifest index f34087f07bb6..adc2ec4f8437 100644 --- a/sci-libs/gsl/Manifest +++ b/sci-libs/gsl/Manifest @@ -14,17 +14,13 @@ EBUILD gsl-1.13-r1.ebuild 2499 RMD160 eac99f47572f42bf5775308d58203c8269dd8266 S EBUILD gsl-1.13-r2.ebuild 2895 RMD160 1c0f307ce8db13d392979a9ff42fe8e8d1f9f0f8 SHA1 34f52f512490e4f4e3baf9cdd5e63e420cc7cd7e SHA256 235544a1203786d81cc1dbef0502f4c40d2ce3660315ce71a7074f807807b9f6 EBUILD gsl-1.14-r1.ebuild 3108 RMD160 1f80e8fea12674fd2e6078a35d79960cb3820340 SHA1 e60a8b126a7b67478a2bf0a30ef49ce6eaba2072 SHA256 59aa4c07edc6aa7d4faea2f7c84d6b179d86bc1e0f61e02e8d5887cd3d33f3ba EBUILD gsl-1.14.ebuild 2837 RMD160 0d2c96da12bd4de9c885b23f5638a6aec79691ea SHA1 b020646d4bf435886cdf6f36ce1ee5775a3f8128 SHA256 320a21ccd946d2bf630905767e72731098371907b8e6462f62724b45884ae37b -EBUILD gsl-1.15.ebuild 3101 RMD160 a373fe1150d6bd7d5ff35b4bea2464c6fc45ec52 SHA1 6c5b62f14381a77e1a1336d9b1303b80d61fcaf4 SHA256 46ccb8cc1ed2038ffc47ff7e11a37514a2cc1bdf939234241e8228cda531488f -MISC ChangeLog 12171 RMD160 e0babe2e6119b03bf47ce1c120af61bb4275a979 SHA1 7fb75b2e0ac37cef7c0211f5f0ed6148c98d8683 SHA256 25ea4da9393c0b07ad82622535e1246592ed744bf3afda8e67cfc1c2d5ac264e +EBUILD gsl-1.15.ebuild 3149 RMD160 ec6085fc80dc5594c5c584f601cc8f0e745c18e4 SHA1 94b8eb14190b647a87efb83ae8dcc4dcba465544 SHA256 61925ba77a5790110210c7b5d3e24f6e80ee137bfae0d0065504e399650d4451 +MISC ChangeLog 12337 RMD160 44f5c846e9e7237c6f230b206ebb582bbde4fdfa SHA1 754fd3bd40107398fae673c7b1c25038e3d7b31d SHA256 10a5a26d537d9da6f3efecd0e113031481bc9ee3a5150a85c8edf641e780ebb0 MISC metadata.xml 1016 RMD160 e7cbe5d4daaf4f4d5eb1c81c4cc090bb3ee807f2 SHA1 d9f77f0a5a0ff8148d3eb27509dde65f1991a034 SHA256 a74ce60d545607bcbd1828028da835f69e19f306b6ea4957ca3555411d9894af -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBAgAGBQJN15FiAAoJEOeBhlrCAAWGvZAH/3KK9zQ91HhlPzSGkDeViMTB -oypZFzZRMdletdsLI3cefVJ9uJVgEA6Qre5E7qCNYVerX/CFzOdeepQNMIGLp7gt -yS5hRNEenOiARYwHH798V+6ciRT6Apvj1CXUSPSrHDRd+D1RMbaxOHp9qYkILYw1 -yu595ksCc9PO+vo1KcB4a2aE1QMfnKdluG+Z3mOVAJfP3f2wBze3+U6a6IzWg/Yz -e+/uR9BwPMXsa8CZiVUbsryikN+1tUryF0kAac/wj+WKu6rgTiJo8gdS4bhH2tqF -KREetqO4RhccfF0gljSmVKuOkeLDmj3PxVYKlJKQhxyTH6McXo81R73/YkTkfRI= -=OzPP +iEYEARECAAYFAk308HgACgkQHB6c3gNBRYcVEwCeMaTg0IdTircXD7J43ceSKQuS +lmwAn24Okejo9+EXMukyvGtOLGRN0zMv +=Fgfg -----END PGP SIGNATURE----- diff --git a/sci-libs/gsl/gsl-1.15.ebuild b/sci-libs/gsl/gsl-1.15.ebuild index 763073162f75..6b89346fc583 100644 --- a/sci-libs/gsl/gsl-1.15.ebuild +++ b/sci-libs/gsl/gsl-1.15.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.15.ebuild,v 1.1 2011/05/21 10:18:03 ottxor Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gsl/gsl-1.15.ebuild,v 1.2 2011/06/12 17:00:25 scarabeus Exp $ -EAPI="3" +EAPI=4 inherit eutils flag-o-matic autotools toolchain-funcs @@ -20,16 +20,24 @@ DEPEND="${RDEPEND} app-admin/eselect-cblas dev-util/pkgconfig" -pkg_setup() { - ESELECT_PROF="gsl" +DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO ) + +pkg_pretend() { # prevent to use external cblas from a previously installed gsl - local current_lib=$(eselect cblas show | cut -d' ' -f2) - if use cblas-external && [[ ${current_lib} == gsl ]]; then - ewarn "USE flag cblas-external is set: linking gsl with an external cblas." - ewarn "However the current selected external cblas is gsl." - ewarn "Please install and/or eselect another cblas" - die "Circular gsl dependency" + local current_lib + if use cblas-external; then + current_lib=$(eselect cblas show | cut -d' ' -f2) + if [[ ${current_lib} == gsl ]]; then + ewarn "USE flag cblas-external is set: linking gsl with an external cblas." + ewarn "However the current selected external cblas is gsl." + ewarn "Please install and/or eselect another cblas" + die "Circular gsl dependency" + fi fi +} + +pkg_setup() { + ESELECT_PROF="gsl" # bug 349005 [[ $(tc-getCC)$ == *gcc* ]] && \ @@ -63,8 +71,9 @@ src_configure() { } src_install() { - emake install DESTDIR="${D}" || die "emake install failed." - dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO + default + + find "${ED}" -name '*.la' -exec rm -f {} + # take care of pkgconfig file for cblas implementation. sed -e "s/@LIBDIR@/$(get_libdir)/" \ |