[gentoo-commits] proj/sci:master commit in: sci-mathematics/petsc/files/, sci-mathematics/petsc/

["Justin Lecher" <jlec@gentoo.org>]

commit:     5cc1b725f0d81b13573c72be6d1414f0337b0205
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 22 09:31:07 2013 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 22 09:31:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5cc1b725

sci-mathematics/petsc: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; drop old

Package-Manager: portage-2.2.0_alpha163

---
 sci-mathematics/petsc/ChangeLog                    |   11 +-
 .../petsc/files/petsc-3.1_p8-configure-pic.patch   |   11 -
 .../petsc/files/petsc-3.1_p8-disable-rpath.patch   |   16 --
 .../petsc/files/petsc-3.2_p7-configure-pic.patch   |   11 -
 .../files/petsc-3.2_p7-disable-env-warnings.patch  |   13 --
 .../petsc/files/petsc-3.2_p7-disable-rpath.patch   |   16 --
 sci-mathematics/petsc/metadata.xml                 |   20 +-
 sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild       |  202 ------------------
 sci-mathematics/petsc/petsc-3.2_p7.ebuild          |  215 --------------------
 sci-mathematics/petsc/petsc-3.3_p5.ebuild          |    6 +-
 10 files changed, 22 insertions(+), 499 deletions(-)

diff --git a/sci-mathematics/petsc/ChangeLog b/sci-mathematics/petsc/ChangeLog
index 4bc96b9..fc4e7d4 100644
--- a/sci-mathematics/petsc/ChangeLog
+++ b/sci-mathematics/petsc/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for sci-mathematics/petsc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> -petsc-3.1_p8-r1.ebuild,
+  -files/petsc-3.1_p8-configure-pic.patch,
+  -files/petsc-3.1_p8-disable-rpath.patch, -petsc-3.2_p7.ebuild,
+  -files/petsc-3.2_p7-configure-pic.patch,
+  -files/petsc-3.2_p7-disable-env-warnings.patch,
+  -files/petsc-3.2_p7-disable-rpath.patch, petsc-3.3_p5.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  drop old
+
   06 Mar 2012; Jens-Malte Gottfried <jmgottfried@web.de>
   petsc-3.1_p8-r1.ebuild, +files/petsc-3.1_p8-configure-pic.patch,
   +files/petsc-3.1_p8-disable-rpath.patch:

diff --git a/sci-mathematics/petsc/files/petsc-3.1_p8-configure-pic.patch b/sci-mathematics/petsc/files/petsc-3.1_p8-configure-pic.patch
deleted file mode 100644
index bbfdae1..0000000
--- a/sci-mathematics/petsc/files/petsc-3.1_p8-configure-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/BuildSystem/config/setCompilers.py.old	2010-09-07 21:41:32.693103846 +0200
-+++ config/BuildSystem/config/setCompilers.py	2010-09-07 21:41:45.322093881 +0200
-@@ -875,7 +875,7 @@
-       languages.append('FC')
-     for language in languages:
-       self.pushLanguage(language)
--      for testFlag in ['-PIC', '-fPIC', '-KPIC','-qpic']:
-+      for testFlag in ['-fPIC', '-PIC', '-KPIC', '-qpic']:
-         try:
-           self.framework.logPrint('Trying '+language+' compiler flag '+testFlag)
-           if not self.checkLinkerFlag(testFlag):

diff --git a/sci-mathematics/petsc/files/petsc-3.1_p8-disable-rpath.patch b/sci-mathematics/petsc/files/petsc-3.1_p8-disable-rpath.patch
deleted file mode 100644
index 3c443b2..0000000
--- a/sci-mathematics/petsc/files/petsc-3.1_p8-disable-rpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- config/BuildSystem/config/setCompilers.py	2010-11-24 18:01:17.110124425 +0100
-+++ config/BuildSystem/config/setCompilers.py	2010-11-24 18:02:28.710104226 +0100
-@@ -1186,12 +1186,7 @@
-     for language in languages:
-       flag = '-L'
-       self.pushLanguage(language)
--      # test '-R' before '-rpath' as sun compilers [c,fortran] don't give proper errors with wrong options.
--      if not Configure.isDarwin():      
--        testFlags = ['-Wl,-rpath,', '-R','-rpath ' , '-Wl,-R,']
--      else:
--        testFlags = []
--      # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux accepts -Wl,-rpath, but  f90 & CC do not.
-+      testFlags = []
-       if self.isSun(self.framework.getCompiler()):
-         testFlags.insert(0,'-R')
-       for testFlag in testFlags:

diff --git a/sci-mathematics/petsc/files/petsc-3.2_p7-configure-pic.patch b/sci-mathematics/petsc/files/petsc-3.2_p7-configure-pic.patch
deleted file mode 100644
index bbfdae1..0000000
--- a/sci-mathematics/petsc/files/petsc-3.2_p7-configure-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/BuildSystem/config/setCompilers.py.old	2010-09-07 21:41:32.693103846 +0200
-+++ config/BuildSystem/config/setCompilers.py	2010-09-07 21:41:45.322093881 +0200
-@@ -875,7 +875,7 @@
-       languages.append('FC')
-     for language in languages:
-       self.pushLanguage(language)
--      for testFlag in ['-PIC', '-fPIC', '-KPIC','-qpic']:
-+      for testFlag in ['-fPIC', '-PIC', '-KPIC', '-qpic']:
-         try:
-           self.framework.logPrint('Trying '+language+' compiler flag '+testFlag)
-           if not self.checkLinkerFlag(testFlag):

diff --git a/sci-mathematics/petsc/files/petsc-3.2_p7-disable-env-warnings.patch b/sci-mathematics/petsc/files/petsc-3.2_p7-disable-env-warnings.patch
deleted file mode 100644
index d2ee44e..0000000
--- a/sci-mathematics/petsc/files/petsc-3.2_p7-disable-env-warnings.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: petsc-3.2-p6/config/BuildSystem/config/setCompilers.py
-===================================================================
---- petsc-3.2-p6.orig/config/BuildSystem/config/setCompilers.py
-+++ petsc-3.2-p6/config/BuildSystem/config/setCompilers.py
-@@ -1463,7 +1463,7 @@ This way - mpi compilers from '''+self.a
-                  'LDFLAGS','LIBS','MPI_DIR']
-     for envVal in ignoreEnv:
-       if envVal in os.environ:
--        self.logPrintBox('***** WARNING: '+envVal+' found in enviornment variables - ignoring ******')
-+        #self.logPrintBox('***** WARNING: '+envVal+' found in enviornment variables - ignoring ******')
-         del os.environ[envVal]
-     return
- 

diff --git a/sci-mathematics/petsc/files/petsc-3.2_p7-disable-rpath.patch b/sci-mathematics/petsc/files/petsc-3.2_p7-disable-rpath.patch
deleted file mode 100644
index 3c443b2..0000000
--- a/sci-mathematics/petsc/files/petsc-3.2_p7-disable-rpath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- config/BuildSystem/config/setCompilers.py	2010-11-24 18:01:17.110124425 +0100
-+++ config/BuildSystem/config/setCompilers.py	2010-11-24 18:02:28.710104226 +0100
-@@ -1186,12 +1186,7 @@
-     for language in languages:
-       flag = '-L'
-       self.pushLanguage(language)
--      # test '-R' before '-rpath' as sun compilers [c,fortran] don't give proper errors with wrong options.
--      if not Configure.isDarwin():      
--        testFlags = ['-Wl,-rpath,', '-R','-rpath ' , '-Wl,-R,']
--      else:
--        testFlags = []
--      # test '-R' before '-Wl,-rpath' for SUN compilers [as cc on linux accepts -Wl,-rpath, but  f90 & CC do not.
-+      testFlags = []
-       if self.isSun(self.framework.getCompiler()):
-         testFlags.insert(0,'-R')
-       for testFlag in testFlags:

diff --git a/sci-mathematics/petsc/metadata.xml b/sci-mathematics/petsc/metadata.xml
index f0f9f18..2e5b489 100644
--- a/sci-mathematics/petsc/metadata.xml
+++ b/sci-mathematics/petsc/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</herd>
-<use>
-  <flag name="afterimage">Use Afterstep image library (media-libs/libafterimage)</flag>
-  <flag name="hypre">Use HYPRE (sci-mathematics/hypre) and for preconditioning</flag>
-  <flag name="metis">Use METIS (sci-libs/parmetis) for partitioning</flag>
-  <flag name="complex-scalars">Make scalars complex</flag>
-  <flag name="sparse">Use suitesparse (sci-libs/suitesparse) including cholmod (sci-libs/cholmod) for sparse factorization</flag>
-  <flag name="superlu">Use superlu (sci-libs/superlu) for preconditioning</flag>
-  <!-- Disabled:
+  <herd>sci-mathematics</herd>
+  <use>
+    <flag name="afterimage">Use Afterstep image library (media-libs/libafterimage)</flag>
+    <flag name="hypre">Use HYPRE (sci-mathematics/hypre) and for preconditioning</flag>
+    <flag name="metis">Use METIS (sci-libs/parmetis) for partitioning</flag>
+    <flag name="complex-scalars">Make scalars complex</flag>
+    <flag name="sparse">Use suitesparse (sci-libs/suitesparse) including cholmod (sci-libs/cholmod) for sparse factorization</flag>
+    <flag name="superlu">Use superlu (sci-libs/superlu) for preconditioning</flag>
+    <!-- Disabled:
   <flag name="boost">Use boost (dev-libs/boost)</flag>
 	-->
-</use>
+  </use>
 </pkgmetadata>

diff --git a/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild b/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild
deleted file mode 100644
index 4185075..0000000
--- a/sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit flag-o-matic fortran-2 toolchain-funcs eutils
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="http://www.mcs.anl.gov/petsc/petsc-as/"
-SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz"
-
-LICENSE="petsc"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="complex-scalars cxx debug doc fortran hdf5 hypre metis mpi static-libs X"
-
-RDEPEND="mpi? ( virtual/mpi[cxx?,fortran?] )
-	X? ( x11-libs/libX11 )
-	virtual/lapack
-	virtual/blas
-	hypre? ( sci-libs/hypre )
-	metis? ( sci-libs/parmetis )
-	hdf5? ( sci-libs/hdf5[!mpi?] )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/gcc[fortran?]"
-
-S="${WORKDIR}/${MY_P}"
-
-if use hypre; then
-	use cxx || die "hypre needs cxx, please enable cxx or disable hypre use flag"
-	use mpi || die "hypre needs mpi, please enable mpi or disable hypre use flag"
-fi
-
-src_prepare(){
-	epatch \
-		"${FILESDIR}"/${P}-configure-pic.patch \
-		"${FILESDIR}"/${P}-disable-rpath.patch
-}
-
-src_configure(){
-	local mylang
-	local myopt
-	local myconf
-
-	use cxx && mylang="cxx" || mylang="c"
-	use debug && myopt="debug" || myopt="opt"
-
-	export PETSC_DIR="${S}" || die
-	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}" || die
-
-	myconf[10]="--with-blas-lapack-lib=$(pkg-config --libs lapack)"
-	myconf[11]="CFLAGS=${CFLAGS}"
-	myconf[12]="CXXFLAGS=${CXXFLAGS}"
-	myconf[13]="LDFLAGS=${LDFLAGS}"
-	myconf[14]="--with-windows-graphics=0"
-	myconf[15]="--with-matlab=0"
-	myconf[16]="--with-python=0"
-	myconf[17]="--with-clanguage=${mylang}"
-	myconf[18]="--with-single-library=1"
-	myconf[19]="--with-petsc-arch=${PETSC_ARCH}"
-	myconf[20]="--with-precision=double"
-	myconf[21]="--with-gnu-compilers=1"
-	use amd64 \
-		&& myconf[22]="--with-64-bit-pointers=1" \
-		|| myconf[22]="--with-64-bit-pointers=0"
-	use cxx \
-		&& myconf[23]="--with-c-support=1"
-	use amd64 \
-		&& myconf[24]="--with-64-bit-indices=1" \
-		|| myconf[24]="--with-64-bit-indices=0"
-
-	if use mpi; then
-		myconf[30]="--with-cc=/usr/bin/mpicc"
-		myconf[31]="--with-cxx=/usr/bin/mpicxx"
-		use fortran && myconf[32]="--with-fc=/usr/bin/mpif77"
-		myconf[33]="--with-mpi=1"
-		myconf[34]="--with-mpi-compilers=1"
-	else
-		myconf[30]="--with-cc=$(tc-getCC)"
-		myconf[31]="--with-cxx=$(tc-getCXX)"
-		use fortran && myconf[32]="--with-fc=$(tc-getF77)"
-		myconf[33]="--with-mpi=0"
-	fi
-
-	use X \
-		&& myconf[40]="--with-X=1" \
-		|| myconf[40]="--with-X=0"
-	use static-libs \
-		&& myconf[41]="--with-shared=0" \
-		|| myconf[41]="--with-shared=1"
-	use fortran \
-		&& myconf[43]="--with-fortran=1" \
-		|| myconf[43]="--with-fortran=0"
-
-	if use debug; then
-		strip-flags
-		filter-flags -O*
-		myconf[44]="--with-debugging=1"
-	else
-		myconf[44]="--with-debugging=0"
-	fi
-
-	if use hypre; then
-		# hypre cannot handle 64 bit indices, therefore disabled
-		myconf[24]="--with-64-bit-indices=0"
-		myconf[52]="--with-hypre=1"
-		myconf[53]="--with-hypre-include=/usr/include/hypre"
-		use static-libs \
-			&& myconf[54]="--with-hypre-lib=/usr/$(get_libdir)/libHYPRE.a" \
-			|| myconf[54]="--with-hypre-lib=/usr/$(get_libdir)/libHYPRE.so"
-	else
-		myconf[52]="--with-hypre=0"
-	fi
-
-	if use metis; then
-		# parmetis cannot handle 64 bit indices, therefore disabled
-		myconf[24]="--with-64-bit-indices=0"
-		myconf[61]="--with-parmetis=1"
-		myconf[62]="--with-parmetis-include=/usr/include/parmetis"
-		myconf[63]="--with-parmetis-lib=/usr/$(get_libdir)/libparmetis.so"
-	else
-		myconf[61]="--with-parmetis=0"
-	fi
-
-	if use hdf5; then
-		myconf[71]="--with-hdf5=1"
-		myconf[72]="--with-hdf5-include=/usr/include"
-		myconf[73]="--with-hdf5-lib=/usr/$(get_libdir)/libhdf5.so"
-	else
-		myconf[71]="--with-hdf5=0"
-	fi
-
-	myconf[81]="--with-scotch=0"
-
-	if use complex-scalars; then
-		# cannot enable C support with complex scalars
-		# (cannot even set configure option to zero!)
-		myconf[23]=""
-		myconf[82]="--with-scalar-type=complex"
-	fi
-
-	einfo "Configure options: ${myconf[@]}"
-	python "${S}/config/configure.py" "${myconf[@]}" \
-		|| die "PETSc configuration failed"
-}
-
-src_install(){
-	insinto /usr/include/"${PN}"
-	doins "${S}"/include/*.h "${S}"/include/*.hh
-	insinto /usr/include/"${PN}/${PETSC_ARCH}"/include
-	doins "${S}/${PETSC_ARCH}"/include/*
-	if use fortran; then
-		insinto /usr/include/"${PN}"/finclude
-		doins "${S}"/include/finclude/*.h
-	fi
-	insinto /usr/include/"${PN}"/conf
-	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
-
-	dosed "s:${S}:/usr:g" /usr/include/"${PN}/${PETSC_ARCH}"/include/petscconf.h
-	dosed "s:${PETSC_ARCH}/lib:$(get_libdir):g" /usr/include/"${PN}/${PETSC_ARCH}"/include/petscconf.h
-	dosed "s:INSTALL_DIR =.*:INSTALL_DIR = /usr:" /usr/include/"${PN}/${PETSC_ARCH}"/conf/petscvariables
-
-	cat >> "${T}"/99petsc <<- EOF
-	PETSC_ARCH=${PETSC_ARCH}
-	PETSC_DIR=/usr/include/${PN}
-	EOF
-	doenvd "${T}"/99petsc
-
-	if ! use mpi ; then
-		insinto /usr/include/"${PN}"/mpiuni
-		doins "${S}"/include/mpiuni/*.h
-	fi
-
-	if use doc ; then
-		dodoc docs/manual.pdf
-		dohtml -r docs/*.html docs/changes docs/manualpages
-	fi
-
-	use static-libs \
-		&& dolib.a  "${S}/${PETSC_ARCH}"/lib/*.a  \
-		|| dolib.so "${S}/${PETSC_ARCH}"/lib/*.so
-}
-
-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=53386"
-	elog "This ebuild is known to have parallel build issues, "
-	elog "hopefully resolved by upstream soon."
-	elog "Another problem is that you can break this package by"
-	elog "switching your mpi implementation without rebuild petsc."
-}

diff --git a/sci-mathematics/petsc/petsc-3.2_p7.ebuild b/sci-mathematics/petsc/petsc-3.2_p7.ebuild
deleted file mode 100644
index 6bd5bc4..0000000
--- a/sci-mathematics/petsc/petsc-3.2_p7.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit base flag-o-matic fortran-2 toolchain-funcs versionator
-
-MY_P="${PN}-$(replace_version_separator _ -)"
-
-DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation"
-HOMEPAGE="http://www.mcs.anl.gov/petsc/"
-SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${MY_P}.tar.gz"
-
-LICENSE="petsc"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="afterimage complex-scalars cxx debug doc
-	fortran hdf5 hypre metis mpi sparse superlu threads X"
-# Failed: boost imagemagick
-
-# hypre and superlu curretly exclude each other due to missing linking to hypre
-# if both are enabled
-REQUIRED_USE="
-	hypre? ( cxx mpi )
-	hdf5? ( mpi )
-	afterimage? ( X )
-	^^ ( hypre superlu )
-"
-#	imagemagick? ( X )
-
-RDEPEND="
-	virtual/blas
-	virtual/lapack
-	afterimage? ( media-libs/libafterimage )
-	hdf5? ( sci-libs/hdf5[mpi?] )
-	hypre? ( sci-libs/hypre[mpi?] )
-	metis? ( sci-libs/parmetis )
-	mpi? ( virtual/mpi[cxx?,fortran?] )
-	sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 )
-	superlu? ( sci-libs/superlu )
-	X? ( x11-libs/libX11 )
-"
-#	boost? ( dev-libs/boost )
-#	imagemagick? ( media-gfx/imagemagick )
-
-DEPEND="${RDEPEND}
-	virtual/fortran
-	virtual/pkgconfig
-	dev-lang/python
-	dev-util/cmake
-"
-# cmake is used for parralel building
-# in some configuration setups, legacy build is used (slow)
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure-pic.patch
-	"${FILESDIR}"/${P}-disable-env-warnings.patch
-	"${FILESDIR}"/${P}-disable-rpath.patch
-)
-
-src_configure() {
-	# petsc uses --with-blah=1 and --with-blah=0 to en/disable options
-	petsc_enable() {
-		use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0"
-	}
-	# add external library:
-	# petsc_with use_flag libname libdir
-	# petsc_with use_flag libname include linking_libs
-	petsc_with() {
-		local myuse p=${2:-${1}}
-		if use ${1}; then
-			myuse="--with-${p}=1"
-			if [[ $# -ge 4 ]]; then
-				myuse="${myuse} --with-${p}-include=${3}"
-				shift 3
-				myuse="${myuse} --with-${p}-lib=$@"
-			else
-				myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}"
-			fi
-		else
-			myuse="--with-${p}=0"
-		fi
-		echo ${myuse}
-	}
-
-	# select between configure options depending on use flag
-	petsc_select() {
-		use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4"
-	}
-
-	local mylang
-	local myopt
-
-	use cxx && mylang="cxx" || mylang="c"
-	use debug && myopt="debug" || myopt="opt"
-
-	# environmental variables expected by petsc during build
-	export PETSC_DIR="${S}"
-	export PETSC_ARCH="linux-gnu-${mylang}-${myopt}"
-
-	if use debug; then
-		strip-flags
-		filter-flags -O*
-	fi
-
-	# run petsc configure script
-	econf \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		--with-shared-libraries \
-		--with-single-library \
-		--with-clanguage=${mylang} \
-		$(petsc_enable cxx c-support) \
-		--with-petsc-arch=${PETSC_ARCH} \
-		--with-precision=double \
-		--with-gnu-compilers \
-		--with-blas-lapack-lib="$(pkg-config --libs lapack)" \
-		$(petsc_enable debug debugging) \
-		$(petsc_enable mpi) \
-		$(petsc_select mpi cc mpicc $(tc-getCC)) \
-		$(petsc_select mpi cxx mpicxx $(tc-getCXX)) \
-		$(petsc_enable fortran) \
-		$(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \
-		$(petsc_enable mpi mpi-compilers) \
-		$(petsc_enable threads pthread) \
-		$(petsc_enable threads pthreadclasses) \
-		$(petsc_select complex-scalars scalar-type complex real) \
-		--with-windows-graphics=0 \
-		--with-matlab=0 \
-		--with-cmake=cmake \
-		$(petsc_with afterimage afterimage \
-			/usr/include/libAfterImage -lAfterImage) \
-		$(petsc_with hdf5) \
-		$(petsc_with hypre hypre \
-			/usr/include/hypre -lHYPRE) \
-		$(petsc_with metis parmetis) \
-		$(petsc_with sparse cholmod) \
-		$(petsc_with superlu superlu \
-			/usr/include/superlu -lsuperlu) \
-		$(petsc_with X x) \
-		$(petsc_with X x11) \
-		--with-imagemagick=0 \
-		--with-python=0 \
-		--with-scotch=0
-
-# not yet tested:
-#		python bindings, sctotch, netcdf, scalapack
-# non-working:
-#		fftw: no mpi-implementaion available in gentoo
-
-# failed dependencies, perhaps fixed in upstream soon:
-#		$(petsc_with boost) \
-#		$(petsc_with imagemagick imagemagick \
-#			/usr/include/ImageMagick $(pkg-config --libs MagickCore)) \
-}
-
-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 include/*.h*
-	insinto /usr/include/${PN}/${PETSC_ARCH}/include
-	doins ${PETSC_ARCH}/include/*
-	if use fortran; then
-		insinto /usr/include/${PN}/finclude
-		doins include/finclude/*.h
-	fi
-	insinto /usr/include/${PN}/conf
-	doins conf/{variables,rules,test}
-	insinto /usr/include/${PN}/${PETSC_ARCH}/conf
-	doins ${PETSC_ARCH}/conf/{petscrules,petscvariables,RDict.db}
-	insinto /usr/include/${PN}/private
-	doins include/private/*.h
-
-	# fix configuration files: replace ${S} by installed location
-	sed -i \
-		-e "s:${S}::g" \
-		"${ED}"/usr/include/${PN}/${PETSC_ARCH}/include/petscconf.h \
-		"${ED}"/usr/include/${PN}/${PETSC_ARCH}/conf/petscvariables || die
-	sed -i \
-		-e "s:usr/lib:usr/$(get_libdir):g" \
-		"${ED}"/usr/include/${PN}/${PETSC_ARCH}/include/petscconf.h || die
-
-	# add information about installation directory and
-	# PETSC_ARCH to environmental variables
-	cat >> 99petsc <<- EOF
-		PETSC_ARCH=${PETSC_ARCH}
-		PETSC_DIR=${EPREFIX}/usr/include/${PN}
-	EOF
-	doenvd 99petsc
-
-	if ! use mpi ; then
-		insinto /usr/include/${PN}/mpiuni
-		doins include/mpiuni/*.h
-	fi
-
-	if use doc ; then
-		dodoc docs/manual.pdf
-		dohtml -r docs/*.html docs/changes docs/manualpages
-	fi
-
-	dolib.so ${PETSC_ARCH}/lib/*.so
-}
-
-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=53386"
-}

diff --git a/sci-mathematics/petsc/petsc-3.3_p5.ebuild b/sci-mathematics/petsc/petsc-3.3_p5.ebuild
index 81de267..e0a1340 100644
--- a/sci-mathematics/petsc/petsc-3.3_p5.ebuild
+++ b/sci-mathematics/petsc/petsc-3.3_p5.ebuild
@@ -45,9 +45,7 @@ RDEPEND="
 #	imagemagick? ( media-gfx/imagemagick )
 
 DEPEND="${RDEPEND}
-	virtual/fortran
 	virtual/pkgconfig
-	dev-lang/python
 	dev-util/cmake
 "
 # cmake is used for parralel building
@@ -128,7 +126,7 @@ src_configure() {
 		--with-petsc-arch=${PETSC_ARCH} \
 		--with-precision=double \
 		--with-gnu-compilers \
-		--with-blas-lapack-lib="$(pkg-config --libs lapack)" \
+		--with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs lapack)" \
 		$(petsc_enable debug debugging) \
 		$(petsc_enable mpi) \
 		$(petsc_select mpi cc mpicc $(tc-getCC)) \
@@ -165,7 +163,7 @@ src_configure() {
 #		$(petsc_with metis parmetis) \ # needs metis too (>=5.0.2)
 #		$(petsc_with boost) \
 #		$(petsc_with imagemagick imagemagick \
-#			/usr/include/ImageMagick $(pkg-config --libs MagickCore)) \
+#			/usr/include/ImageMagick $($(tc-getPKG_CONFIG) --libs MagickCore)) \
 }
 
 src_install() {