From 1d5b43261e598049a7b7a62825ac96bc07286b3b Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Mon, 9 Jan 2012 12:46:58 +0000 Subject: [PATCH] Fix upstream bug: --without-portable was equivalent to --with-portable. Add tests. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- dev-lang/polyml/ChangeLog | 7 ++++++- dev-lang/polyml/Manifest | 11 ++++++----- .../polyml/files/polyml-5.4.1-configure.patch | 11 +++++++++++ dev-lang/polyml/polyml-5.4.1.ebuild | 18 ++++++++++++++---- 4 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 dev-lang/polyml/files/polyml-5.4.1-configure.patch diff --git a/dev-lang/polyml/ChangeLog b/dev-lang/polyml/ChangeLog index 426c34292e52..97503b981dfd 100644 --- a/dev-lang/polyml/ChangeLog +++ b/dev-lang/polyml/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/polyml # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/ChangeLog,v 1.5 2012/01/08 15:25:53 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/ChangeLog,v 1.6 2012/01/09 12:46:58 gienah Exp $ + + 09 Jan 2012; Mark Wright polyml-5.4.1.ebuild, + +files/polyml-5.4.1-configure.patch: + Fix upstream bug: --without-portable was equivalent to --with-portable. Add + tests. 08 Jan 2012; Mark Wright polyml-5.4.1.ebuild: Thanks to few_ and xarthisius for reviewing, remove econf repetition, - on diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest index 2bebd33ac0f9..6435f62959a6 100644 --- a/dev-lang/polyml/Manifest +++ b/dev-lang/polyml/Manifest @@ -2,16 +2,17 @@ Hash: SHA256 AUX polyml-5.4.1-asm.patch 1026 RMD160 21fcef4241ca51394993c12ffc096f015644c578 SHA1 9615dbdb328343fd91326f3d295f5914d8fc3ad5 SHA256 9879c43c7e82e53ff6d15b838b159df3336b791c46e9f80a38f21c4180500bed +AUX polyml-5.4.1-configure.patch 459 RMD160 ba71c7ba76c2b6c1e6b75b60589d6ba6b9593a9f SHA1 82df0e401dc6b47ebf6070b4f9f75ea3fe582c5e SHA256 89e712f53a08386505d8a503f23d6e29310ae1b1ce39e3acaa024ab47ab3b20d DIST polyml.5.2.1.tar.gz 4114551 RMD160 2e46e3fca7e642faed72c427c41e25e2b03fdbf5 SHA1 39cc9451113d41ca9c491167cf3973dfd55b7446 SHA256 c84148ae9a28e782f48208bcb8c5b82ee7bfdc178784fe81694cf1f0789ae62e DIST polyml.5.4.1.tar.gz 6107319 RMD160 7f3916f306f1fa24afb5b7cbb77bac98c9e4ab24 SHA1 85998ff7b290fae821a23fa5303b012ccea07ea1 SHA256 514d1d07be487b783d4dfa29dbd550b3396640579ce135a9eb5a61f08e7f9cac EBUILD polyml-5.2.1.ebuild 599 RMD160 748286377a2d0bca37da410d5cb08edb36fed1f0 SHA1 cf962ed6f3b3d6343b41817996320e9a49beb923 SHA256 ae47586ab5cf84d8d23e59fc3d0a4a1611ab8a6d4abfe60ad0aad71acb69ff08 -EBUILD polyml-5.4.1.ebuild 799 RMD160 fdec02d5312cf61f754fdc2cec2c6a51207da01d SHA1 5687fa659e228c07924512b91ff2b2ae5b063d9f SHA256 e43f9c7610f770a2423616290280c60be275f0f324b8ceef2df3e45e9b1816f3 -MISC ChangeLog 1127 RMD160 cef6d0784ef6645fb1cbf57f3cb02e8cebb37ece SHA1 5a51b9fc50ffac0a7d13be4978df0fb65ffddcc7 SHA256 6dc1c5063437daf445dc6fce3b35391ea5b0164f70d87f276810eef47bc2c76e +EBUILD polyml-5.4.1.ebuild 958 RMD160 2ba3e62168007afd77574708ae1de7bfa8f1b74b SHA1 9292787c6e75cb8ccd268ef617d79047864c888f SHA256 08a72d090955080ffe1d1bd2a265e03491080f5eaccdf66cb2f1349274ec98e1 +MISC ChangeLog 1322 RMD160 ce53ad24d7d95a86ae6294365fb84495800a74d6 SHA1 d3604486a3cb695f7e9cd862a1d16cb5e3b5d764 SHA256 593b968eb448ff8a83a2e28b79b7df95722df6c9420d1f34e1958f41d3afbbf5 MISC metadata.xml 391 RMD160 9d6f9a28ad7361c10eff32d994e7ebbcd10661d5 SHA1 2dc5e3e4d4c5168bb34b3a789d342b4dd0514ff1 SHA256 12fb15a5275bb291c63724d6dd56864a60f465835698701d5798b50688337c5b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk8JtY0ACgkQoBEVQmGOlx9LIQD7Bhh9DB5fYMpj5cqbcNa9l8iC -o78P2JYAO83fyq/cd1sA/iAG6YupZqdt7dqsGh/9P/251iGK3SU4DLOC+9JqphEn -=Fl3X +iF4EAREIAAYFAk8K4dEACgkQoBEVQmGOlx8szgD9EQyyA1qOh461/HhnDr9j2wCC +z80iOlEMA4/lakUrbqwBALf/Gcazh2/QnxeD7UGOkFcGlwTWWEj36Kh6Kc37gcnm +=xPPD -----END PGP SIGNATURE----- diff --git a/dev-lang/polyml/files/polyml-5.4.1-configure.patch b/dev-lang/polyml/files/polyml-5.4.1-configure.patch new file mode 100644 index 000000000000..aaaed02f8e16 --- /dev/null +++ b/dev-lang/polyml/files/polyml-5.4.1-configure.patch @@ -0,0 +1,11 @@ +--- polyml.5.4.1-orig/configure.ac 2010-09-03 21:22:40.000000000 +1000 ++++ polyml.5.4.1/configure.ac 2012-01-09 22:44:04.153668402 +1100 +@@ -321,7 +321,7 @@ + AC_ARG_WITH([portable], + [AS_HELP_STRING([--with-portable], + [Build the portable interpreter version of Poly/ML instead of native @<:@default=no@:>@])], [ +- ac_cv_with_portable=yes], [ ++ ac_cv_with_portable="$withval"], [ + ac_cv_with_portable=no]) + + case "${host_cpu}" in diff --git a/dev-lang/polyml/polyml-5.4.1.ebuild b/dev-lang/polyml/polyml-5.4.1.ebuild index 7571494a9201..b44696a5fc1d 100644 --- a/dev-lang/polyml/polyml-5.4.1.ebuild +++ b/dev-lang/polyml/polyml-5.4.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.4.1.ebuild,v 1.2 2012/01/08 15:25:53 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.4.1.ebuild,v 1.3 2012/01/09 12:46:58 gienah Exp $ EAPI="4" -inherit base +inherit base autotools MY_P=${PN}.${PV} @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="X +gmp portable +threads" +IUSE="X +gmp portable test +threads" RDEPEND="X? ( x11-libs/openmotif ) gmp? ( >=dev-libs/gmp-5 ) @@ -24,7 +24,13 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${MY_P} -PATCHES=("${FILESDIR}/${PN}-5.4.1-asm.patch") +PATCHES=("${FILESDIR}/${PN}-5.4.1-configure.patch" + "${FILESDIR}/${PN}-5.4.1-asm.patch") + +src_prepare() { + base_src_prepare + eautoreconf +} src_configure() { econf \ @@ -33,3 +39,7 @@ src_configure() { $(use_with portable) \ $(use_with threads) } + +src_test() { + emake tests || die "tests failed" +} -- 2.26.2