From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S3oD9-00064i-Vk for garchives@archives.gentoo.org; Sat, 03 Mar 2012 12:37:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 411DDE066B; Sat, 3 Mar 2012 12:37:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 13708E0675 for ; Sat, 3 Mar 2012 12:37:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09F8D1B4025 for ; Sat, 3 Mar 2012 12:37:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C75A5E542C for ; Sat, 3 Mar 2012 12:37:10 +0000 (UTC) From: "Jens-Malte Gottfried" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jens-Malte Gottfried" Message-ID: <1330777087.41ed1fd94c2ef4ab44e3c65aa04214e09e767d90.jmg@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/petsc/petsc-3.2_p6.ebuild X-VCS-Directories: sci-mathematics/petsc/ X-VCS-Committer: jmg X-VCS-Committer-Name: Jens-Malte Gottfried X-VCS-Revision: 41ed1fd94c2ef4ab44e3c65aa04214e09e767d90 X-VCS-Branch: master Date: Sat, 3 Mar 2012 12:37:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 7ed02a82-228c-4ca2-9423-8490fad5ff72 X-Archives-Hash: ca8a2a4052aa11c34b7f756e2a9a5b79 commit: 41ed1fd94c2ef4ab44e3c65aa04214e09e767d90 Author: Jens-Malte Gottfried web de> AuthorDate: Sat Mar 3 12:18:07 2012 +0000 Commit: Jens-Malte Gottfried godefridus de> CommitDate: Sat Mar 3 12:18:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D41ed1fd9 fixed banned dosed, added more comments --- sci-mathematics/petsc/petsc-3.2_p6.ebuild | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sci-mathematics/petsc/petsc-3.2_p6.ebuild b/sci-mathematics/= petsc/petsc-3.2_p6.ebuild index d82206c..643e146 100644 --- a/sci-mathematics/petsc/petsc-3.2_p6.ebuild +++ b/sci-mathematics/petsc/petsc-3.2_p6.ebuild @@ -110,6 +110,10 @@ src_configure(){ } =20 src_install(){ + # petsc install structure is very different from + # installing headers to /usr/include/petsc and lib to /usr/lib + # it also installs many unneeded executables and scripts + # so manual install is easier than cleanup after "emake install" insinto /usr/include/"${PN}" doins "${S}"/include/*.h "${S}"/include/*.hh insinto /usr/include/"${PN}/${PETSC_ARCH}"/include @@ -122,14 +126,16 @@ src_install(){ doins "${S}"/conf/{variables,rules,test} insinto /usr/include/"${PN}/${PETSC_ARCH}"/conf doins "${S}/${PETSC_ARCH}"/conf/{petscrules,petscvariables,RDict.db} - insinto /usr/include/"${PN}"/private doins "${S}"/include/private/*.h =20 - dosed "s:${S}:/usr:g" /usr/include/"${PN}/${PETSC_ARCH}"/include/petscc= onf.h - dosed "s:${PETSC_ARCH}/lib:$(get_libdir):g" /usr/include/"${PN}/${PETSC= _ARCH}"/include/petscconf.h - dosed "s:INSTALL_DIR =3D.*:INSTALL_DIR =3D /usr:" /usr/include/"${PN}/$= {PETSC_ARCH}"/conf/petscvariables + # fix configuration files: replace ${S} by installed location + sed -i "s:${S}:/usr:g" ${D}/usr/include/"${PN}/${PETSC_ARCH}"/include/p= etscconf.h + sed -i "s:${PETSC_ARCH}/lib:$(get_libdir):g" ${D}/usr/include/"${PN}/${= PETSC_ARCH}"/include/petscconf.h + sed -i "s:INSTALL_DIR =3D.*:INSTALL_DIR =3D /usr:" ${D}/usr/include/"${= PN}/${PETSC_ARCH}"/conf/petscvariables =20 + # add information about installation directory and + # PETSC_ARCH to environmental variables cat >> "${T}"/99petsc <<- EOF PETSC_ARCH=3D${PETSC_ARCH} PETSC_DIR=3D/usr/include/${PN} @@ -153,4 +159,7 @@ pkg_postinst() { elog "The petsc ebuild is still under development." elog "Help us improve the ebuild in:" elog "http://bugs.gentoo.org/show_bug.cgi?id=3D53386" + elog "Note that PETSC_ARCH may be dropped in future since " \ + "upstream now also supports installations without " \ + "different subdirectories." }