[gentoo-commits] proj/musl:master commit in: dev-libs/gmp/, dev-libs/gmp/files/

[Anthony G. Basile]

commit:     533da7794f465bd1769c7115103e76887fd6dd36
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 23:50:36 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 23:50:36 2015 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=533da779

dev-libs/gmp: in tree versions works.

 dev-libs/gmp/Manifest                          |   6 --
 dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch |  20 -----
 dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch  |  17 ----
 dev-libs/gmp/gmp-5.1.3-r99.ebuild              | 120 -------------------------
 dev-libs/gmp/metadata.xml                      |   8 --
 5 files changed, 171 deletions(-)

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
deleted file mode 100644
index 31ebc91..0000000
--- a/dev-libs/gmp/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gmp-4.1.4-noexecstack.patch 474 SHA256 68601777151a1628d7bc839eddd037685c5d2e76c9453166890a5eb3cf6000c3 SHA512 74b8b68061a1a5ac0f8b163974834465e86e930884e1a9cd15c4c948fdae95ffdcbb6e0210d56df6d0dcf1ccbe13dbdfe45552e645c3fdea6454747731b63bc8 WHIRLPOOL d8a0f81d4e97f6996bf68dd3d5488762e221f43a26e1cbff27adb372a40075d35fbb0e956ccd45c8b320a900d284f16d0649293cc907daab45d02cb30e74373b
-AUX gmp-5.1.3-secure-plt.patch 445 SHA256 6f3b512ad1a693c738155a9fc60d05576b6a9ca0de569bc937f98aa423b421ba SHA512 ec9b98f4dc1ad4b6ecdf4ebb5599bcaeee8d88b0f377a5b06ca0731049172712de1471c5fc1c7c3a5e38f72341047d7a561c70e203e2fb099de02350b406254a WHIRLPOOL 59e90fb588d70e543451e2e7728e1786e3004454ceb4869115c2d2c1164d46189eae035ef64f0fb0b053305fdada1052ce7285b678a7a688a88b422eb4af43d3
-DIST gmp-5.1.3.tar.xz 1818812 SHA256 dee2eda37f4ff541f30019932db0c37f6f77a30ba3609234933b1818f9b07071 SHA512 44bbec2b2a6480d4c9a9a633cca4fe0de966c13bc08bdcd8b934d81e21f3dfacaecf273f149dc613d365277d280ecee43cffdafaec1bd1239a7ed903f8658b5b WHIRLPOOL 0c4365a129136655046a8e46c4e2487a981c03de97ec47899f752cbd6e61661c6068b19c547acce8436f7a9af91396545c9bf7aa9de73a0f29384bbfebef927f
-DIST gmp-man-5.1.3.pdf 1159009 SHA256 56b0e21329f46ef1d59c1f191afc82c59f8b72273a8131ed9b5000b7d0689c38 SHA512 ba6a4b0bd2b5ee4d284dd13e9c5531fcb9cfbbbc80f40df458d73c80a1aa250b750cfdd5039998e8b0c7259a8b4d24bd0c7b59a90108f9b680bee62e6948d59e WHIRLPOOL ade206d7e1f543ed028f51e247067eec4511bd0f2499103e1e6296fad2bf50c4f8e09cf7688cc5dd56ee572cf889508ac7918f85e5f91d29d088882f7734a4e0
-EBUILD gmp-5.1.3-r99.ebuild 3089 SHA256 61aa3568d2f4d744ebbe1124cd78cfd59af1d850d77d254b482be4b0b13357a5 SHA512 98ae1ccc1ecc4c5da575f8244e6d3a21d9ee40f65fffb97355659a4e21a24c95b2ef5304e256f149b35aaebbbd13f9c2e79a1a847cbcf17d5512449c23640fb8 WHIRLPOOL c474042bea0425f6a3c3c30bff1075ea35108e471d2ac6195f80aff655332dadbf8d97a9957e4a28152721e3a5185be547f848b5e09729f8eb7faef668b94976
-MISC metadata.xml 315 SHA256 f6cfb0b2b72dab3e088b68df3d21db3f8463b30571e6de17d1431a57f1bc8d26 SHA512 109d0cbf90eff7264eb6502397024425664d8349229ba334797fcca61852e92ea2c3064579c4765793a69e2811a44ffa63b3091f2ffa5a433dc22ab308a2bcba WHIRLPOOL 3320121476ba2740ee9ee338374cccc853990f229e0cb3a23b5c0ed3e925485f5fd4b797b04ec4ae419eadfc5b9a057dcd9435fe507cca65560e09ad158c1ffb

diff --git a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch b/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch
deleted file mode 100644
index 093bec1..0000000
--- a/dev-libs/gmp/files/gmp-4.1.4-noexecstack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fixed executable stack
-
-http://bugs.gentoo.org/115038
-
---- gmp-4.1.4/configure
-+++ gmp-4.1.4/configure
-@@ -21689,6 +21689,13 @@
- fi
- echo "')" >> $gmp_configm4
- echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4
-+# Gentoo hack
-+case $host_os in
-+	*linux*)
-+		echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4
-+		echo '.previous' >> $gmp_configm4
-+		;;
-+esac
- 
- # Create Makefiles
- # FIXME: Upcoming version of autoconf/automake may not like broken lines.

diff --git a/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch b/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch
deleted file mode 100644
index 7fe6752..0000000
--- a/dev-libs/gmp/files/gmp-5.1.3-secure-plt.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make it work with secure_plt
-diff -ru a/gmp-5.1.3/mpn/powerpc32/elf.m4 b/gmp-5.1.3/mpn/powerpc32/elf.m4
---- a/gmp-5.1.3/mpn/powerpc32/elf.m4
-+++ b/gmp-5.1.3/mpn/powerpc32/elf.m4
-@@ -41,8 +41,10 @@
- m4_assert_numargs(2)
- `ifdef(`PIC',`
- 	mflr	r0
--	bl	_GLOBAL_OFFSET_TABLE_@local-4
--	mflr	$1
-+	bcl 20, 31, 1f
-+1:	mflr $1
-+	addis $1, $1, (_GLOBAL_OFFSET_TABLE_-1b)@ha
-+	addi $1, $1, (_GLOBAL_OFFSET_TABLE_-1b)@l
- 	mtlr	r0
- 	lwz	$1, $2@got($1)
- ',`

diff --git a/dev-libs/gmp/gmp-5.1.3-r99.ebuild b/dev-libs/gmp/gmp-5.1.3-r99.ebuild
deleted file mode 100644
index 5620a88..0000000
--- a/dev-libs/gmp/gmp-5.1.3-r99.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmp/gmp-5.1.3-r1.ebuild,v 1.19 2014/05/14 14:41:58 ago Exp $
-
-EAPI="4"
-
-inherit flag-o-matic eutils libtool toolchain-funcs multilib-minimal
-
-MY_PV=${PV/_p*}
-MY_P=${PN}-${MY_PV}
-PLEVEL=${PV/*p}
-DESCRIPTION="Library for arithmetic on arbitrary precision integers, rational numbers, and floating-point numbers"
-HOMEPAGE="http://gmplib.org/"
-SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-	ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
-	doc? ( http://gmplib.org/${PN}-man-${MY_PV}.pdf )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="doc cxx pgo static-libs"
-
-DEPEND="sys-devel/m4
-	app-arch/xz-utils"
-RDEPEND="abi_x86_32? (
-	!<=app-emulation/emul-linux-x86-baselibs-20131008-r1
-	!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-)"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
-HTML_DOCS=( doc )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
-
-src_prepare() {
-	[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
-	epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
-
-	epatch "${FILESDIR}"/${PN}-5.1.3-secure-plt.patch
-
-	# note: we cannot run autotools here as gcc depends on this package
-	elibtoolize
-
-	# GMP uses the "ABI" env var during configure as does Gentoo (econf).
-	# So, to avoid patching the source constantly, wrap things up.
-	mv configure configure.wrapped || die
-	cat <<-\EOF > configure
-	#!/bin/sh
-	exec env ABI="$GMPABI" "$0.wrapped" "$@"
-	EOF
-	chmod a+rx configure
-}
-
-multilib_src_configure() {
-	# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
-	# http://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
-	if [[ ${CHOST} == hppa2.0-* ]] ; then
-		export GMPABI="1.0"
-	fi
-
-	# ABI mappings (needs all architectures supported)
-	case ${ABI} in
-		32|x86)       GMPABI=32;;
-		64|amd64|n64) GMPABI=64;;
-		[onx]32)      GMPABI=${ABI};;
-	esac
-	export GMPABI
-
-	tc-export CC
-	ECONF_SOURCE="${S}" econf \
-		--localstatedir=/var/state/gmp \
-		--enable-shared \
-		$(use_enable cxx) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	emake
-
-	if use pgo ; then
-		emake -j1 -C tune tuneup
-		ebegin "Trying to generate tuned data"
-		./tune/tuneup | tee gmp.mparam.h.new
-		if eend $(( 0 + ${PIPESTATUS[*]/#/+} )) ; then
-			mv gmp.mparam.h.new gmp-mparam.h || die
-			emake clean
-			emake
-		fi
-	fi
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# should be a standalone lib
-	rm -f "${D}"/usr/$(get_libdir)/libgmp.la
-	# this requires libgmp
-	local la="${D}/usr/$(get_libdir)/libgmpxx.la"
-	use static-libs \
-		&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
-		|| rm -f "${la}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${D}"/usr/share/doc/${PF}/
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libgmp.so.3
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libgmp.so.3
-}

diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
deleted file mode 100644
index b419bd1..0000000
--- a/dev-libs/gmp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>toolchain</herd>
-<use>
- <flag name='pgo'>after building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
-</use>
-</pkgmetadata>