3 files changed, 14 insertions, 59 deletions
diff --git a/dev-libs/mpfr/ChangeLog b/dev-libs/mpfr/ChangeLog
index 8ceaca38cd07..55183d40944e 100644
--- a/dev-libs/mpfr/ChangeLog
+++ b/dev-libs/mpfr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/mpfr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.183 2014/03/26 05:45:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/ChangeLog,v 1.184 2014/06/06 19:58:16 vapier Exp $
+
+  06 Jun 2014; Mike Frysinger <vapier@gentoo.org> -mpfr-2.4.2_p3.ebuild,
+  mpfr-2.4.2_p3-r1.ebuild:
+  Move the ABI-only ebuild into stable.
 
 *mpfr-3.1.2_p5 (26 Mar 2014)
 
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 80431863dc31..8f6bf18bce05 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-2013 Gentoo Foundation
+# Copyright 1999-2014 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.3 2013/08/25 02:37:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/mpfr/mpfr-2.4.2_p3-r1.ebuild,v 1.4 2014/06/06 19:58:16 vapier Exp $
 
 # this ebuild is only for the libmpfr.so.1 ABI SONAME
 
-EAPI="3"
+EAPI="4"
 
-inherit eutils libtool
+inherit eutils libtool flag-o-matic
 
 MY_PV=${PV/_p*}
 MY_P=${PN}-${MY_PV}
@@ -32,14 +32,16 @@ src_prepare() {
 }
 
 src_configure() {
+	# Newer gmp has deleted this define, so export it for older mpfr.
+	append-cppflags -D__gmp_const=const
 	econf --disable-static
 }
 
 src_compile() {
-	emake libmpfr.la || die
+	emake libmpfr.la
 }
 
 src_install() {
-	emake install-libLTLIBRARIES DESTDIR="${D}" || die
-	rm "${ED}"/usr/*/libmpfr.{la,so,dylib,a} || die
+	emake install-libLTLIBRARIES DESTDIR="${D}"
+	rm -f "${ED}"/usr/*/libmpfr.{la,so,dylib,a}
 }
diff --git a/dev-libs/mpfr/mpfr-2.4.2_p3.ebuild b/dev-libs/mpfr/mpfr-2.4.2_p3.ebuild
deleted file mode 100644
index c7b45c58514c..000000000000
--- a/dev-libs/mpfr/mpfr-2.4.2_p3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.10 2012/04/19 02:35:54 vapier Exp $
-
-# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="http://www.mpfr.org/"
-SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/gmp-4.1.4-r2"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	[[ ${PLEVEL} == ${PV} ]] && return 0
-	for ((i=1; i<=PLEVEL; ++i)) ; do
-		patch=patch$(printf '%02d' ${i})
-		if [[ -f ${FILESDIR}/${MY_PV}/${patch} ]] ; then
-			epatch "${FILESDIR}"/${MY_PV}/${patch}
-		elif [[ -f ${DISTDIR}/${PN}-${MY_PV}_p${i} ]] ; then
-			epatch "${DISTDIR}"/${PN}-${MY_PV}_p${i}
-		else
-			ewarn "${DISTDIR}/${PN}-${MY_PV}_p${i}"
-			die "patch ${i} missing - please report to bugs.gentoo.org"
-		fi
-	done
-	sed -i '/if test/s:==:=:' configure #261016
-	find . -type f -print0 | xargs -0 touch -r configure
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	rm "${D}"/usr/share/doc/${PN}/*.html || die
-	mv "${D}"/usr/share/doc/{${PN},${PF}} || die
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-	dohtml *.html
-	prepalldocs
-}