Move the ABI-only ebuild into stable.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 29 insertions, 75 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/Manifest b/dev-libs/mpfr/Manifest
index 167a4c5d8310..f3016ed17637 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -31,8 +31,7 @@ DIST mpfr-3.0.1.tar.bz2 1154306 SHA256 e1977099bb494319c0f0c1f85759050c418a56884
 DIST mpfr-3.1.0.tar.bz2 1203891 SHA256 74a7bbbad168dd1cc414f1c9210b8fc16ccfc8e422d34b3371a8978e31eab680 SHA512 86083d8cf9dbcf1e33fcf1d73da8bd5b98fbc9187acf36b2d84c453fd18010aa659960a8026470e49d535d957f764941926a78acb31fe2869bf9a92524e0e81c WHIRLPOOL 7eb97b6df3ca8f903e2fa65c2f184edbf6cf990ce512eaf9598a52db381d74879e5549bf019e89b7d7d260d1347e19d6c03e8365e8340591e110d011090a7a4b
 DIST mpfr-3.1.1.tar.xz 1071688 SHA256 49d5acc32dbeec30a8e26af9c19845763d63feacb8bf97b12876008419f5a17a SHA512 4fcc87e19a08622b3211a33807e708b78da6c8659f391003703a9e170c485f56e6ebfff48d42afca7b4edb14fd9487684c4d8fd6c9f805ed62b6d5259d5721a8 WHIRLPOOL c4fdb3c7fba779cfa8900cd3b05322d4853bb6114ea42a5ec315d4489c25e962185f3e3cd3b3214360b55a58da02987c62c5ca92fb14989b38bd8c93bccd63d5
 DIST mpfr-3.1.2.tar.xz 1074388 SHA256 399d0f47ef6608cc01d29ed1b99c7faff36d9994c45f36f41ba250147100453b SHA512 8d594206afb2637ed39ad564d42c8c4d02b042b95925f5c6ec891e5cb87f7155195559c7ff477256a088ecaaa3c2b0d35a9d11a74ed526a1080d49b2950e5587 WHIRLPOOL 1e391888d9cecc71617e99eb841cafac536e703b12d46a53fdcf773cc2654c98ca6bde2358f997c8b7bfd832bdb0c395b224df8a460a8fb5b4ad6f2c2e092b17
-EBUILD mpfr-2.4.2_p3-r1.ebuild 1332 SHA256 545ff4aee0ddf6f6df9f778835eda8ea2833499d941995caac7409dc7acaa4a1 SHA512 a30aaf35f4a82be066307e7dbb64a70683c9b3bc2c12784278c0299c9919f860e32f12ef08dd422f98cc39be39a61055cfcb39a31321b0b70c6ff1073b13fc39 WHIRLPOOL bc53b602baa552ec1e635cb1da898040ef7c878e70aea727708f4fe767357f3405f7e7951af3eba867ac0a38e14388c8044992124386d8dff3fbfab6a4e8c671
-EBUILD mpfr-2.4.2_p3.ebuild 1536 SHA256 f380276e5161d8724d40aa4bc3f1f196787c6f0a03099b5d8838a01e946508d4 SHA512 b8f81c80b435c58b812283b978b4eab9c4e66a8cc206721477b26047d4ab8b6b8902f4d9bcfcc38d8486629828a5b54819519c3983d4a24f8ad91a7319cd652d WHIRLPOOL ae29d9214b89d8e726e9d6858bd9f5319cd625dd131d15e44bbdad2d982839c0269526194335e86fbfbcd2ec6a8bdc37af4119e569a52e4c4ace6429b8998f6c
+EBUILD mpfr-2.4.2_p3-r1.ebuild 1431 SHA256 8facfef5d1a82c3862fc231b38e45558b87bc4e9539c3a4a4423b1a2b6d6f740 SHA512 18fa4ad9c5e4af2b4e8de85ea8f6885ce70ea159076ebd17ed4507c51f38e60d2865216bc1ce638ab7984c0b048d597b99ddbdb2f2e612b3227c4d615e61ee9a WHIRLPOOL 873e320cccdd9359ca5d205d21aa8703fc2009378064b43b61ef612f638598952ebb1b19c9269f3be456ab4b222a62a14385cfb7287470e185453e1137062042
 EBUILD mpfr-3.0.0_p3.ebuild 1692 SHA256 d646350c940c10c432a31d78ad7073e294bc60bf53d41b6fde1e0c7798db3932 SHA512 855dae5d805e9c3547419ed7dc1409f65653fd96a02f860c7acfb033700f1f78841ea6b2ccc34d3c975cc640997c6d1f075d561b9e61619c21d02a9e3eb9e98e WHIRLPOOL 44e067f6660aa6c4b9859d8ce8714d112c8dcb6ff482a53150f2a2ab6fb84dcb6229866dbad1eaddba6764b0554f2bb17ac5bd7947b3afc0431a7d1b10bbdbf6
 EBUILD mpfr-3.0.1.ebuild 1700 SHA256 c3e8921034f5f87586b9e14326e152c4072c15ae18b6d2a6a62cb16b9e32e3d4 SHA512 b006d0664ae56c0f8e510372d99ba349c736c11b109e7dd1a5f675b47c885b5644bb2ce119e9334bfa4afd366015f076e62d0263d491d9a7ce43e85f4adb4521 WHIRLPOOL f88d7a77c35d1eba770d72b5170a6fff8d756d809b178743f5e2774517517457d3a109e58e255b1802eb37b6f3c17011011e1f0a04315d0eccd5fe7ebe3fd2e9
 EBUILD mpfr-3.0.1_p4-r1.ebuild 1854 SHA256 8791dcf9d32b3b927964cebc15cf5f7a138af0ac2af5623a3ea6edfb7af8d66c SHA512 87f8459e697410f36e9ef5442955646b75e5a3893cf6d3962ec263fa44b9cf703a3aa7c0b6578a1d65610fa010683b072af525a2643874b5f409405860388b34 WHIRLPOOL a46061e0da9c34e97bc54c309df5b94bc27d77a9a110e49f0904cd8feb8a546607e961c68c9b615da2f74e0d8ffc99f66e07500a6315d12c8125c577c7a6d295
@@ -43,22 +42,22 @@ EBUILD mpfr-3.1.1.ebuild 1951 SHA256 321164e9f88fb4c8808a683a6d321bd61d73a699b3e
 EBUILD mpfr-3.1.1_p2.ebuild 2001 SHA256 8d6ac46fb831639463332927299ce3f9590aefade2cd6c073ce81add9e179835 SHA512 09dd693570a57debf2ceae007c22efd285691ae19757cfe64ed0bdfab116b3b208b95a612827b1bbfd0d2f980f653851172608fa0f75eae0bcc3a4cb20af0575 WHIRLPOOL 0396d497db15ff7d9044f945066ad8231cf7dd536d7dece981789f1140b6f2d6a0f2a12720bf25da7893a3c11859b914d9e6803a2f0063e01d71840c9e6eb4ff
 EBUILD mpfr-3.1.2-r1.ebuild 2332 SHA256 3fb9870ae85a546129ebe2ffcc141d88a811e30bb7765d5648c8d4bf58bd3983 SHA512 969d8526129e122bff3e78275ab356d3855eac35b00ab39d4ec815a44105558c8bc5b12a88ea637dfd7e9e8bf825479db2a226524c2d112e5904b76e843745b3 WHIRLPOOL da14e103a6b9e1fb4c6621681703cf03918bcc8b5459142a01f59802b532e1d0d3b4a58cd8998764a8ff3c07427cf19df5d21d7a4267b771626c19fd50c5f37c
 EBUILD mpfr-3.1.2_p5.ebuild 2343 SHA256 eeda4fa6d5dc6e174e208bea29ea58ece393065da2f3d91ef271d1d8ad3c223b SHA512 0dcfbd476e07483494bf15eec9d5197385dbc96639a04700bf1e339f6bc2594f7fb74fc2b0fd0ea554be15f6ae0fb9c14b5ee4f3a4cfaccd6f29490458ad72ec WHIRLPOOL e779be16adaf459bb9733d32e9b6bcdd08d6af6f4bd8c6e0025a310d8becfe780948f5efca66287f985fd26816c91aac2883bf5b72d242af2a4e1f606d67d9bc
-MISC ChangeLog 22897 SHA256 89cd68dda73840c319d5dc671c7e3be8a35938cbf554d6f660f708dee15f6d28 SHA512 6027ed7d655e05a5d77631e16519c42db9272b95e5d4b23c892873ca69a5dcba34df171dc2f404cc2c5da716371368e87d963561c18ef57eeac3008f3dd1d7fd WHIRLPOOL 14e560963d4308181b1bd983d2d98df01dcb066663a262096c1af0136dbbc1fa711d0bb5c9eaa33a8b1369ce3ac1d11281c7beb1809a1c81ddb3bfd3ce8e3e45
+MISC ChangeLog 23038 SHA256 772fb91714eae4c54338e8e9708e28415045ac5b271368a920b94da9c5ffeb41 SHA512 5c17d9670c1894c8b747d8a146b0dc07f4510f09428901114a2118a1b4692ebde92d3cdd56584423888a8c02ca5187f5a24c1d6224c0cf01a7fd12f0a66873a8 WHIRLPOOL 686fb01164837fd239a53f63f280207b3041d6fcc9c8fd44d69aa5372047d5b09f37094379612a67d7ffb728194d45167a4a807fb9175d3431eb714f24615001
 MISC metadata.xml 162 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a SHA512 2a857e10b277827773a6c7967e070d7bfff23d75f44fa4d4fa8a7339df3225e6dba512a865d91c9c55bdb013dafdce85dface1b845acfbb5473e232666cdda45 WHIRLPOOL f7586c1570803b3e646f0be89ba6c767e82ec6889ef92d15f62a38f1410ed9d82c36892e5e83f694471959783d0d5ad667f1a39b7eb51f2080c269d5fa23d819
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMml3AAoJEPGu1DbS6WIAhVgP/jgj/u4LhBR3XqO/sPh86cEi
-6bncGPIWHWu+C3RqrJDvWPTfyuOqprHfselijBoArksJrxc/KYIiQD36XWOgcSlS
-PoB1Clo+0DNizVxw1+Gz+xwCmWYAQhzAGmnQVHY169yfWw+zPwNqjVKORgH7F1SF
-vjqIuEhm4D7bz30TFDm0NaLQ99WIEMbn7zK6rdwiQxnbpTFhai3TgNS5uqnsfLDj
-Jf3zCr8UZPuYVVNtpbIwX5iSwgnSdSsJVQgcpoBbjV2s7OZR896QXwkIiC1a8N6W
-e2XU4UGm34nlCcTKSi8lbS56qXaBgLBHlbNr4HrjF3gYK4NIUWwGdHB9SsdXJSaD
-i/nCDtpQUYt5mtt1zwrSm6V9Zz9FVVHovaoBfUmXC4373s4ylsTdV0DLZf7uS+9O
-87e1JIgTQ3ilWPfZCxgjknOQUDv9ugQ8/lgflcR2Nhs9QW36uPFY98cCCI/iQB1n
-i6IFzITpAXUZlAIT/wTqiDWxTkvz35Ylv89tO5CY3nlY1tG+igp9o6L1lz7CIUr9
-ZANuyFkRvCAx+SIvadsfkLKm2p0KvcboAgwpSJPldFEAcjjOBEefT3VJdaf6TZhP
-FCx0MvbrO3/kgzlzLuWGtwf07XlNx3XLR1MB/ZeTRUt2PvrZ+NFONCnbxum08krr
-1aWpwzmdC6koFmrS335a
-=vW2G
+iQIcBAEBCAAGBQJTkh1eAAoJEPGu1DbS6WIARHIP/2HiexDc1HIbmcDFS31PjZwG
+CKIgUc3XW/GO/DBgEWx/vA443GFfsp0On879ezDO6ZWFc7UgcmRceMXZDouO9ES4
+3K6tcDsWuk+EBcYBPSl8/JxdBtDcokbOAODPyNFGTtcxbEwR22dgfNZTm0t5v1vf
+vascrB8oIlT44gY7asr5bLz99t04vy7esfQSjpgiJyfE87imEd5M1bOBJoCUVk2J
+Rs9IG+BY277dwf7rDUrvsKpmP6v9CQUKQ6kkYPiEoS4BM4d+TYaDOlopO6ru1A3/
+hAA78Nqtq9yuVRhu8p2HRiHhRJAaTbRAWYT0N2gIF6sYLxa4iEdxBpwnTWfd1GGj
+VBP6TIrgkeA9ABk9u+SAIYCZLXZz1Vk9mqcSnvRiSIV8227IvYqSX8seXGczVKfh
+Q3etfE1H2kcAI2BXi6x2U+HwQDbP2UvtYgeYUJbCjKnXMq5RcoXz+kHLU3jnCJ2b
+VmEzTs+ijXNRm44VD0TnXpcjWriHtuqiTR5ytMrW11807GM3fY+YOAwFA9MLNMqY
+pqoo+5NZ2pRGLyGuPF+dvfZRdkR+X0AP/6Cx1I2olpxGO/+qWjvPHi6xjA0g1BZZ
+XVhVzrMvGYZMkp5uvUAUw2rdObmLPlmcdGZM2/ebtAZAFbFSfh7TWWNbAv2REFzH
+gCwTcSSWERjQM1b+DFem
+=Qw14
 -----END PGP SIGNATURE-----
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
-}