From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- dev-libs/cloog/Manifest | 11 +--- dev-libs/cloog/cloog-0.18.0.ebuild | 40 ------------ dev-libs/cloog/cloog-0.18.1.ebuild | 5 +- dev-libs/cloog/cloog-0.18.3.ebuild | 64 ------------------ dev-libs/cloog/cloog-0.18.4.ebuild | 5 +- dev-libs/cloog/cloog-9999.ebuild | 3 +- dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch | 82 ------------------------ 7 files changed, 8 insertions(+), 202 deletions(-) delete mode 100644 dev-libs/cloog/cloog-0.18.0.ebuild delete mode 100644 dev-libs/cloog/cloog-0.18.3.ebuild delete mode 100644 dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch (limited to 'dev-libs/cloog') diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest index 112957ab87f7..ad1a701760bd 100644 --- a/dev-libs/cloog/Manifest +++ b/dev-libs/cloog/Manifest @@ -1,11 +1,6 @@ -AUX cloog-0.18.3-isl-0.15.patch 2621 BLAKE2B 4e39bc94154f195d085b433f77218c1de4d1271a90cafc1a120f11c0540e4ce5cffdb18716f9bae28f3b9195c92cb49b7f0eb6e33041c78a9eae010f045d30e4 SHA512 bace93aa2ae345f4b7a0261cf3b195e070c99f08494dad66b15576c35a0269893fc4f250a941be4af9505d13d5c9cb7b9b157afb0af6c83016c4e868add83735 -DIST cloog-0.18.0.tar.gz 3776262 BLAKE2B fec90c701f2042c0bfdd68099ec6ef66ecc261193ff48c76787d1ad28e689be8d1685dfc99f0ddbe2a1cbf83aebe30eb0571dfeca53c03f6abaf190ca35d492c SHA512 34404984c4269dfc19673712271b08f220b6b49e451e7479cefbc5d2f27ab8e780f5d51fbbc7cecb974dab655673d8348f2a1ece3a60feaeeb9413fccf16eb1d DIST cloog-0.18.1.tar.gz 3857324 BLAKE2B 5898cb8d8f36e55dbe38e7866e07c0abaf8ca0b9e619a5ff963ae975148166fc9bb1c77a33aef1ea2014e739e4ea1c37e4bc2ce5e7411d900fb472192e6fed7b SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9 -DIST cloog-0.18.3.tar.gz 4577597 BLAKE2B 179f13d4cf1f3c13ed5afcbad9226a1fc496aac5c56f6129457516a8e52ec753c8ac3532f7ac975b62e0dc09ed4b84523ebb7146a7bd991bee04d3416558c8c4 SHA512 14fc2af0da62cd17b1a9f5a7a1704da6bfe5dc78639928637588203e61847795a652ff788c313c34b6e7dd85fb329678eb4f72e0e1c9c149be6619ebf046cff8 DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23 -EBUILD cloog-0.18.0.ebuild 840 BLAKE2B d63d1b1784224c0899582ee6ebb5db655fb8b200b7eeffc4341e6a4ff2c7ca9aa09e44ad68b471a60f47d41dd38dd34c790333c2f831ecc64450d3afde8e5f30 SHA512 d54e4fc522de8958bcf9646ea93d75051d69d2fb2513bc688a878a171958958159e7e8c8a878cd270d36ece4bf22475c7c5bfc9c22cdfd36f737a5dc8d53541d -EBUILD cloog-0.18.1.ebuild 980 BLAKE2B 215f1dcf700347cb08524aaa48c59280f219a92030f2e66477cec0fb78743cb8ab7764b158a6870b2dc1cd223e59903cdb9062485065f66841b1da360c724c76 SHA512 bfeb6d8c65bd0fc0660202096d1ed81ef1f12b39044e7510c332778a66525d79ca1da67e5e3091fec49d57e237b874d806997049b58ca6c1d48a6d135e296595 -EBUILD cloog-0.18.3.ebuild 1459 BLAKE2B 825d4835090613a1c3c1afaa268df3ccbc3a144ae448e6249579d8c0d17eb67c34f87e248e6455183f3e1638729bc691622492f63d24a9b8cfe0684a97f73908 SHA512 6015ddc56d837da19424d3ea9c8ed1e22574ce74cd6e2a5956af6c4747decefef7c0fc6821eb89aca740dbeb0bfedeaabc873885621cbccf0980dca567ae6fc5 -EBUILD cloog-0.18.4.ebuild 1404 BLAKE2B c4b1fff243f356387c1519f6656ec5c5597edb5792aba006b5993c4081b877bc0507fc05b178dde6a14984fce516addf829c62b3d9babbdfbf16791c94b856b9 SHA512 80a9e7a7dce501f3b0fcf03db3659fe1bc4c59eb7f95105941fed6064394bce50579f5df84faa2ec226a2b620d7ca918ac9a7720109f12f6f43408dc5db5622b -EBUILD cloog-9999.ebuild 1444 BLAKE2B acd027483a3a3722c216caff695c1cb10e7110c4b42a99ab56810d6909747c32d10b2ad8b4d16f843d6646cb7b590a778843d521064ad729da8c33342811341d SHA512 25d3f5b6e24f118f2fb65df7400e0a077063593186034dbe86665b452d95d3fa76f6c8a0cc3ccb0248b83ea5b11e16da3fc1a7ba288288b7370ff772595709b0 +EBUILD cloog-0.18.1.ebuild 956 BLAKE2B c44da8bbbf08d94f698afdcde8df7036afb48311b08ed2d4b621b4ea60fb94930a9d66b932b583cde71f38605c32eece10671fa146575039a8ef6799b4e18153 SHA512 04efdf5e56db932ec5f2d79be56d636ddec2c4e1ab4a0b2bff1d2aa51cecd1baa83421a333eb59c8a518cc692f2730788580c5deaa4449c439d407c1cab8a805 +EBUILD cloog-0.18.4.ebuild 1380 BLAKE2B 4a7a58ae194c707f99604da1f8d414d326d386f08eea555a2f243d8665f7fa34f7307c305ec4ffe0bc26c148aed645f01680b1b3d45bb4bc0e972be71885b0ce SHA512 5d28cf652cb5f9818a39cedde6a4efb420772df45cd8590f83942640e102b8ae4ecc319f2d56a686f40f50c074299d3b03c9d2c2b570c0a4b461a82d15b9f17e +EBUILD cloog-9999.ebuild 1423 BLAKE2B d49b09e116b2def2833c51cb36368c4de5a6a93028c4bec106a5fe1b1196db363b621c0be13d1f2183cf45e91e875a41f26af01a62d3c2ec41e1494153453d28 SHA512 c4926861ae72ba72f661140986c2da1fbec32bdc169f7bdc4455ce73e0539741b1f764e94a921aa7061832718d3e33f89384c602dd9338de755613f368adc931 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b diff --git a/dev-libs/cloog/cloog-0.18.0.ebuild b/dev-libs/cloog/cloog-0.18.0.ebuild deleted file mode 100644 index 8e70a9c5c215..000000000000 --- a/dev-libs/cloog/cloog-0.18.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils - -DESCRIPTION="A loop generator for scanning polyhedra" -HOMEPAGE="http://www.bastoul.net/cloog/" -SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="static-libs" - -DEPEND="dev-libs/gmp - =dev-libs/isl-0.12.2:0/10[${MULTILIB_USEDEP}]" DEPEND="${DEPEND} virtual/pkgconfig" diff --git a/dev-libs/cloog/cloog-0.18.3.ebuild b/dev-libs/cloog/cloog-0.18.3.ebuild deleted file mode 100644 index 12ab4e9cdeb5..000000000000 --- a/dev-libs/cloog/cloog-0.18.3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils multilib-minimal - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="git://repo.or.cz/cloog.git" - inherit autotools git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" - 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-5.1.3-r1[${MULTILIB_USEDEP}] - >=dev-libs/isl-0.14: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 - - epatch "${FILESDIR}"/${P}-isl-0.15.patch - - # 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-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild index e02d356227a4..88f667583d90 100644 --- a/dev-libs/cloog/cloog-0.18.4.ebuild +++ b/dev-libs/cloog/cloog-0.18.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -21,8 +21,7 @@ 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" + >=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]" DEPEND="${DEPEND} virtual/pkgconfig" diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild index fa0e96d64965..87fbec10982d 100644 --- a/dev-libs/cloog/cloog-9999.ebuild +++ b/dev-libs/cloog/cloog-9999.ebuild @@ -21,8 +21,7 @@ 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" + >=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]" DEPEND="${DEPEND} virtual/pkgconfig" diff --git a/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch b/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch deleted file mode 100644 index 70ce3b86ec02..000000000000 --- a/dev-libs/cloog/files/cloog-0.18.3-isl-0.15.patch +++ /dev/null @@ -1,82 +0,0 @@ -add support for isl-0.15+ - ---- a/source/isl/domain.c -+++ b/source/isl/domain.c -@@ -68,25 +68,39 @@ - void cloog_domain_print_constraints(FILE *foo, CloogDomain *domain, - int print_number) - { -+ isl_printer *printer; - isl_basic_set *bset; - isl_set *set = isl_set_from_cloog_domain(domain); - -- if (print_number) -- isl_set_print(set, foo, 0, ISL_FORMAT_EXT_POLYLIB); -- else { -+ printer = isl_printer_to_file(isl_set_get_ctx(set), foo); -+ printer = isl_printer_set_indent(printer, 0); -+ printer = isl_printer_set_prefix(printer, NULL); -+ printer = isl_printer_set_suffix(printer, NULL); -+ -+ if (print_number) { -+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB); -+ printer = isl_printer_print_set(printer, set); -+ } else { - assert(isl_set_n_basic_set(set) == 1); - bset = isl_set_copy_basic_set(set); -- isl_basic_set_print(bset, foo, -- 0, NULL, NULL, ISL_FORMAT_POLYLIB); -+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_POLYLIB); -+ isl_printer_print_basic_set(printer, bset); - isl_basic_set_free(bset); - } -+ -+ isl_printer_free(printer); - } - - - void cloog_scattering_print_constraints(FILE *foo, CloogScattering *scattering) - { -+ isl_printer *printer; - isl_map *map = isl_map_from_cloog_scattering(scattering); -- isl_map_print(map, foo, 0, ISL_FORMAT_EXT_POLYLIB); -+ printer = isl_printer_to_file(isl_map_get_ctx(map), foo); -+ printer = isl_printer_set_indent(printer, 0); -+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB); -+ printer = isl_printer_print_map(printer, map); -+ isl_printer_free(printer); - } - - -@@ -343,6 +357,7 @@ - void cloog_domain_print_structure(FILE *file, CloogDomain *domain, int level, - const char *name) - { -+ isl_printer *printer; - int i ; - isl_set *set = isl_set_from_cloog_domain(domain); - -@@ -358,7 +373,11 @@ - for (i = 0; i < level+1; ++i) - fprintf(file, "|\t"); - -- isl_set_print(set, file, 0, ISL_FORMAT_ISL); -+ printer = isl_printer_to_file(isl_set_get_ctx(set), file); -+ printer = isl_printer_set_indent(printer, 0); -+ printer = isl_printer_set_output_format(printer, ISL_FORMAT_EXT_POLYLIB); -+ printer = isl_printer_print_set(printer, set); -+ isl_printer_free(printer); - - fprintf(file, "\n"); - } ---- a/source/isl/constraints.c -+++ b/source/isl/constraints.c -@@ -450,7 +450,7 @@ CloogConstraintSet *cloog_constraint_set_copy(CloogConstraintSet *constraints) - { - isl_basic_set *bset; - bset = cloog_constraints_set_to_isl(constraints); -- return cloog_constraint_set_from_isl_basic_set(isl_basic_set_dup(bset)); -+ return cloog_constraint_set_from_isl_basic_set(isl_basic_set_copy(bset)); - } - - -- cgit v1.2.3