Version bump: gmp-6.0.0 and above required. isl-0.15 is bundled, we match version with the system isl. Patch to avoid use of undocumented isl print functions committed uptream f38b4fa.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

4 files changed, 101 insertions, 19 deletions

diff --git a/dev-libs/cloog/ChangeLog b/dev-libs/cloog/ChangeLog
index 69ae4500b505..222194a162df 100644
--- a/dev-libs/cloog/ChangeLog
+++ b/dev-libs/cloog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/cloog
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/ChangeLog,v 1.33 2015/07/15 08:39:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/ChangeLog,v 1.34 2015/07/28 12:53:43 blueness Exp $
+
+*cloog-0.18.4 (28 Jul 2015)
+
+  28 Jul 2015; Anthony G. Basile <blueness@gentoo.org> +cloog-0.18.4.ebuild,
+  cloog-9999.ebuild:
+  Version bump: gmp-6.0.0 and above required.  isl-0.15 is bundled, we match
+  version with the system isl.  Patch to avoid use of undocumented isl print
+  functions committed uptream f38b4fa.
 
   15 Jul 2015; Mike Frysinger <vapier@gentoo.org>
   files/cloog-0.18.3-isl-0.15.patch:
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index 377e3575af39..97af5d88cb2a 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -5,26 +5,28 @@ AUX cloog-0.18.3-isl-0.15.patch 2621 SHA256 ac4cddf2cc35384a62083e963fddfe594b51
 DIST cloog-0.18.0.tar.gz 3776262 SHA256 1c4aa8dde7886be9cbe0f9069c334843b21028f61d344a2d685f88cb1dcf2228 SHA512 34404984c4269dfc19673712271b08f220b6b49e451e7479cefbc5d2f27ab8e780f5d51fbbc7cecb974dab655673d8348f2a1ece3a60feaeeb9413fccf16eb1d WHIRLPOOL e079de53e876448f1e9b783c864b820ebae39fca4f51d59e2528b1b68530910c48b23719e3fd760bf105e03838651e15f367709a2c8dde022627fe3f158134ea
 DIST cloog-0.18.1.tar.gz 3857324 SHA256 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196 SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9 WHIRLPOOL 7e5497cdc6d3df14305f848f0222ab41890c9a1a4668e1ccb8afc2b9f14b8c8b65f80a2fec6d6a94d1b91cf83b741d0108815707eb29aa59a439ed2c07f27378
 DIST cloog-0.18.3.tar.gz 4577597 SHA256 460c6c740acb8cdfbfbb387156b627cf731b3837605f2ec0001d079d89c69734 SHA512 14fc2af0da62cd17b1a9f5a7a1704da6bfe5dc78639928637588203e61847795a652ff788c313c34b6e7dd85fb329678eb4f72e0e1c9c149be6619ebf046cff8 WHIRLPOOL b35a16151c209500af836cb8ad32ec6479a01d2994860a379599e7a2183eab452dcffa757bad8c2af867cb71716c588415924b8c91db895372de88131b650490
+DIST cloog-0.18.4.tar.gz 4796456 SHA256 325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23 WHIRLPOOL 0b82eec2d91bcdf839c71fd58e14562aabd837236303ffd95ee105d9c59bc728ad795deab3fb78855dc34abdf08a62b61f0587e85c1b84c6fa7f23fed35d7850
 EBUILD cloog-0.18.0.ebuild 972 SHA256 39026dfe0fb33662bd0b8276ab4184b1fc22c514a37791da6c83d0f6eaaeeacc SHA512 781256d90396c41f720922e316d8e3eecc438955ab9598cd5b221e36799a9053f4de4090b21f51295fd9fce99f3d43e24399f4e027a9012c7760a7d344ccc470 WHIRLPOOL 78b6e92d9ae1f8e2b90ed7be7349c6324be9641104133ae03f80a627ddaee9c3f21d8873fbe32f00296aba6744da6af8cfcd363c4cc28d065d2621ba1fce6687
 EBUILD cloog-0.18.1.ebuild 1109 SHA256 eaeb3f6dab2f1d31cb00cbd5014d29059ff74c5b1655e4dda0f0a4672e8dabc6 SHA512 a12239545aded198a993adc6fd4122282c89dc6fff0dab10a06c55e75d72c1b72d3562e3e4424cc434d4672d37eba0c6f95489c58c8963f3e93d4c21f67174f0 WHIRLPOOL b34b0578585058d94e36c55aae770f93a02e7d7b14ff5aaf45f65c4906933733489369c50e70e2faf220f71142a76e2d6987e6a6a9c18682d7a40e7b41c15fdd
 EBUILD cloog-0.18.3.ebuild 1590 SHA256 55d01a8d12ca64fa7eb99294c0fa8579e10336fa36fd1e7a17f62ca1926f47df SHA512 28fee6078bb18c9a9394b2a9e057ab8b4c677b8af83f68b908c3122512cc09f1068db524186b1c2e39149e08d2fd49d5a04338080fade3a8c7b111ef35436ab4 WHIRLPOOL 28da95cb7bcd536f38cd325783df545f2c54740d3090930e38a998736345921d25b45360fddb66a11dbecd497a389098a97563ba1a310daeffa7649a350fd193
-EBUILD cloog-9999.ebuild 1333 SHA256 6d96f3f8e72c4da922d857ad49ffc5752eb9d5103af5bb2bc9657e609a867bd5 SHA512 2f581f77112a240d2a43fc0078934ff1db03ae544fba6e84cb71fb9230a6a8fa55991ac49c97388d312e520463ea19528e1cd1d4c447e9e59324db528c69f906 WHIRLPOOL 3411b3aefcb404a3b202070b3bf9b11938487468753ee0139c3c8f47493412b3eb11d7285273f80f659209bd2b976604c2be5e1c410b6c62d9513b3c1d45ee0f
-MISC ChangeLog 4607 SHA256 54a14265a91a6c3ee35f469d808616d11f9e01784fa42b204ece9f7feea7b9b0 SHA512 63e287b3b443c7b88d4d4d96ce9cf8e810ca2238d086e74c80a1e6c9d62e91de3d0b55b1e24fb2991dcc1e91dd3c02b4990bdcdad2b142169c93f50121ee3d86 WHIRLPOOL 339fc4910c33eaff8daacc8a61863c293ae31ada664f5f0d79573b69a5ac7efda3a45d15d9491366144c6db0637201922c71dfdfbd67ae3f46c6b8ab6a3de6cc
+EBUILD cloog-0.18.4.ebuild 1546 SHA256 fa7243dca1abed964801b9bae168efc773bc9057c12f8882d51f3b3840142baf SHA512 86c900f6d269500a39fa18da862e05866148a6330253df79677121bf475a149414e7ee7bccb6a31716db697242a4287e23629ef34c8cfa715803cf32024eb131 WHIRLPOOL e213520ffd5579124af105018c9963c947bd6133477e399527e3884c235c72fa134a9b311b30f15e4b49de0506490ad0209c57c4d2e28eddf962ad69d09605e2
+EBUILD cloog-9999.ebuild 1544 SHA256 137a57b6a1160bbe760bfbbe08c5bee90237e4c93ed1ad67fc8697ca04e369f2 SHA512 34c6fe025ee2edee961e46476692b2793cecc246144f34017e9dc529138601b9cd8a750ed5fef08e482865b6564788dbcd84d21606ee136532a74fb7808db71c WHIRLPOOL 4b811d5c5c5bf53e013a1ded37b2c8e4f783bb750e4e8166043300226c30302d9a20adb8626fe9459152b9b460fd72c05679ff91902fbb3f62ca63777c74ba16
+MISC ChangeLog 4930 SHA256 f743b0f04c5a9b90a32f3500029d2b09e7734d978a51d1e82ad8f780883412d5 SHA512 a63a880e3b45fcf4cf475352cd4214a68059ea3818cb61a7861f632f17d43f740b82427ff9865901b7e7027e28a7f49a55253b841f6019a6dd16b2de3da498ee WHIRLPOOL 292d0add607d11ca0e916b65ec7ba335f6fe07bda600c4441bc67e03d4024b00b8764daa116f7239bbce509c9a6f3eb2ba3ade9e46d9fdae8dcc0e0d32deb9f9
 MISC metadata.xml 230 SHA256 15b25471afdabcaf32e2d45f2bee7575d349e323f0aa1e6bac9435c35dcd9a60 SHA512 2fc852dd6ff117d199eca85ee24e5d20e16fb2072ea00bd7a217f3a0841120393e5bcb994902dd8c9a4d1488ccac59774cddda844f4d51e16a8d7581fdd7d3c0 WHIRLPOOL 5f8a73e1b50c38fd9f761c766b70d662abbf6c1738d2a7bb71b6be79bd5136fc7f8bc61e5d98d8c9b8afe6625061de49ac00488007edb7591fa99915ee0868c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVphwoAAoJEPGu1DbS6WIANeMQAIJwpX5/qheq8AEGMlk3YmEn
-xjG/fFLczDpy7oJS/fN3aF4Z1O2xxXWYQ+U03vxfNZm0Ku5nYWMdKrUqzZLdwKPR
-wVy09pbOKIplNbPq2gyK37gYSVgyd5nlndvgcWYhSNgUqm+4GgY+SmUj50ZvvjeR
-xFwW+pAeFa2FBZr5Ou9kg/Vn+FzkXUlflVvUR/AUdOT24PCQMX8SmAH/mSLi02Dp
-qPVBsuMJTtRwobi1IkZE0iAf5ts7SzNVcNrvbnxSKgO1sf3lu6rUc/MxGPALOBzP
-3GOj1wJ2+Rqt88f74gfonkyn8UpHWquaSUU2Ue7GGyGHl5xurOdWR/Utvz+GMShF
-ueiVBjtlossjHF0A6M98K7j4JjI63NbIHX4XW2X7d8LjfsDoHPTMhbyqoeHcxfrJ
-fz93Rgrf3/NcekPOwuUET0XM4InQDP3VwHRJg/suflJBkHk2IPZVxDBRm3vZaNpm
-AnHhMMsnyrtzN7V0VRbzbqpe3blPYfopR4q2MB84FBLZQR18g6wuhv3yo0koJfk1
-UIwZxTNxpi2bXRittBCOahlRvr++wWo94ooPiTq40YaEB/BjSWeinj9YjDEciAfQ
-9mRXminpV2TVqGdpvs8BPN3/x0atUFyp2DWXfnsCgaRmZqatUy3Au7X9A6SZbdD+
-mk3AOHqfBzpfdVtBjz1M
-=T8Ss
+iQIcBAEBCAAGBQJVt3wJAAoJEJOE+m71LUu6DmYQAJ01ZxmyyNN/P1Jq4th2HcA9
+rK/sI0nhuCWDDNbBwbn8XD6qXZm7ORn8pNiDsJlSfRAkqvyN4aaMtFXcV5Oo/TEX
+oInH+Pu66pYxQF2Brzr7gMSq2Ly4jhkx4C+HkkHn264gTuimCnXcRuKJoGbivjux
+QDDmG37t8c40QwpXxOKrgaJteE4Ktjm5KKwm4uAz9Q57sNM9kakdoo6juy9OtyeT
+zCD9vul4spDwCPulN5z3YvE+hIKlL3ZhG8b8Uig/G9ja7GA2Qa/RQXBw7uUpOVUe
+Cx+pBe685HLzocIhe+xxYUFoNm4i2xwewb+gJju8CdPhRRb90OQURCUC4UhQi0PK
+yX4+XwPXLDgYjuFAwtfGihV5CxMdhN+mYwDuqEjswBM6yXy2w2M3Jy+tTikQEgbY
+xXzMZgDGOrRbv5WpgydTHkWjjlU7OZQQUN7shV5AmYL4zzY6INLm6yZ6EBu5GnhY
+tXjmJn7ZkTdmSMvONCUH8GJmomQNeODv0AKFcfoPUjQDasYCz4ERs56VSk6/RqTA
+1LIcCzlc7HNK5JD1w6z2XPg4VPX+AIl4u33VcYX5mQNai3omsiAzrPA+D9BesdZf
+Y2Fw21M66reJjVUdWZJ+/iqCwN6+cBUiXp33zKqKLIxCSBUjb1qn9q19/amd4WCb
+XY+29Mo81nyKt3RMFFcP
+=hc03
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
new file mode 100644
index 000000000000..5aceae9645fd
--- /dev/null
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/cloog-0.18.4.ebuild,v 1.1 2015/07/28 12:53:43 blueness Exp $
+
+EAPI="5"
+
+inherit eutils multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://repo.or.cz/cloog.git"
+	inherit autotools git-2
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="A loop generator for scanning polyhedra"
+HOMEPAGE="http://www.bastoul.net/cloog/"
+
+LICENSE="LGPL-2.1"
+SLOT="0/4"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
+	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]
+	!dev-libs/cloog-ppl"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+DOCS=( README )
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		./get_submodules.sh
+		eautoreconf -i
+	else
+		# m4/ax_create_pkgconfig_info.m4 includes LDFLAGS
+		# sed to avoid eautoreconf
+		sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
+	fi
+
+	# Make sure we always use the system isl.
+	rm -rf isl
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-gmp=system \
+		--with-isl=system \
+		--with-osl=no \
+		$(use_enable static-libs static)
+}
+
+# The default src_test() fails, so we'll just run these directly
+multilib_src_test () {
+	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	emake -j1 check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index 419b446d8a16..44d14ebf7ee8 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/cloog-9999.ebuild,v 1.5 2015/03/17 05:29:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cloog/cloog-9999.ebuild,v 1.6 2015/07/28 12:53:43 blueness Exp $
 
 EAPI="5"
 
@@ -21,8 +21,8 @@ LICENSE="LGPL-2.1"
 SLOT="0/4"
 IUSE="static-libs"
 
-RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/isl-0.14:0/14[${MULTILIB_USEDEP}]
+RDEPEND=">=dev-libs/gmp-6.0.0[${MULTILIB_USEDEP}]
+	>=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]
 	!dev-libs/cloog-ppl"
 DEPEND="${DEPEND}
 	virtual/pkgconfig"
@@ -38,6 +38,9 @@ src_prepare() {
 		# sed to avoid eautoreconf
 		sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die
 	fi
+
+	# Make sure we always use the system isl.
+	rm -rf isl
 }
 
 multilib_src_configure() {
@@ -48,6 +51,12 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 }
 
+# The default src_test() fails, so we'll just run these directly
+multilib_src_test () {
+	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	emake -j1 check
+}
+
 multilib_src_install_all() {
 	einstalldocs
 	prune_libtool_files