added prefix support (bug #476336)

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key C2000586)

3 files changed, 23 insertions, 11 deletions

diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog
index 7f4e88bb456b..e7aeb117f420 100644
--- a/dev-libs/mpfr/ChangeLog
+++ b/dev-libs/mpfr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/mpfr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.166 2013/04/29 16:08:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.167 2013/07/21 21:52:36 ottxor Exp $
+
+  21 Jul 2013; Christoph Junghans <ottxor@gentoo.org> mpfr-2.4.2_p3-r1.ebuild,
+  mpfr-3.1.2.ebuild:
+  added prefix support (bug #476336)
 
   29 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> mpfr-3.1.2.ebuild:
   Keyword amd64-linux
diff --git a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
index 940f91c3e128..f205eee988ed 100644
--- a/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild,v 1.1 2011/10/03 15:17:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild,v 1.2 2013/07/21 21:52:36 ottxor Exp $
 
 # this ebuild is only for the libmpfr.so.1 ABI SONAME
 
 EAPI="3"
 
-inherit eutils
+inherit eutils libtool
 
 MY_PV=${PV/_p*}
 MY_P=${PN}-${MY_PV}
@@ -16,7 +16,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2"
@@ -28,6 +28,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${MY_PV}/patch*
 	sed -i '/if test/s:==:=:' configure #261016
 	find . -type f -print0 | xargs -0 touch -r configure
+
+	# needed for FreeMiNT
+	[[ ${CHOST} == *-mint* ]] && elibtoolize
 }
 
 src_configure() {
@@ -40,5 +43,5 @@ src_compile() {
 
 src_install() {
 	emake install-libLTLIBRARIES DESTDIR="${D}" || die
-	rm "${D}"/usr/*/libmpfr.{la,so} || die
+	rm "${ED}"/usr/*/libmpfr.{la,so,dylib,a} || die
 }
diff --git a/dev-libs/mpfr/mpfr-3.1.2.ebuild b/dev-libs/mpfr/mpfr-3.1.2.ebuild
index b113bc398090..662ba82eccc2 100644
--- a/dev-libs/mpfr/mpfr-3.1.2.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.1.2.ebuild,v 1.2 2013/04/29 16:08:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-3.1.2.ebuild,v 1.3 2013/07/21 21:52:36 ottxor Exp $
 
 EAPI="3"
 
 # NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils multilib
+inherit eutils libtool multilib
 
 MY_PV=${PV/_p*}
 MY_P=${PN}-${MY_PV}
@@ -16,7 +16,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[static-libs?]"
@@ -39,11 +39,16 @@ src_prepare() {
 	done
 	sed -i '/if test/s:==:=:' configure #261016
 	find . -type f -print0 | xargs -0 touch -r configure
+
+	# needed for FreeMiNT
+	[[ ${CHOST} == *-mint* ]] && elibtoolize
 }
 
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--with-gmp-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-gmp-include="${EPREFIX}"/usr/include \
 		$(use_enable static-libs static)
 }
 
@@ -61,9 +66,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libmpfr.so.1
+	preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1)
 }
 
 pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr.so.1
+	preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1)
 }