From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- dev-libs/cloog/Manifest | 7 +-- dev-libs/cloog/cloog-0.18.4.ebuild | 61 --------------------------- dev-libs/cloog/cloog-0.20.0.ebuild | 57 +++++++++++++++++++++++++ dev-libs/cloog/cloog-9999.ebuild | 54 +++++++++++------------- dev-libs/cloog/files/cloog-0.20.0-notex.patch | 37 ++++++++++++++++ 5 files changed, 122 insertions(+), 94 deletions(-) delete mode 100644 dev-libs/cloog/cloog-0.18.4.ebuild create mode 100644 dev-libs/cloog/cloog-0.20.0.ebuild create mode 100644 dev-libs/cloog/files/cloog-0.20.0-notex.patch (limited to 'dev-libs/cloog') diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest index 0a3ed090ad71..fa183df87e2d 100644 --- a/dev-libs/cloog/Manifest +++ b/dev-libs/cloog/Manifest @@ -1,4 +1,5 @@ -DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23 -EBUILD cloog-0.18.4.ebuild 1385 BLAKE2B cf3f72b4e6405fab7b1e376466ff9d6f4173c91310342731f6f728ee129fd624d481af98f28c7480559e4d893e2c4448dbfcec30ff97ba877cf02521341af8e7 SHA512 f6bf82c8d1a78e78aab1151f724cb3dbcb2b4a8ae178f27aed12d9df4ffde4e1f4646d0f3313e8f68c60b1d08633a6f6688ffb6bff0d57d45419c62db5a51621 -EBUILD cloog-9999.ebuild 1418 BLAKE2B 6669775c81ec4e0f23b7e5208dc29fbabc21b29d467c52a3e66ddd026ca0cfc9ea1bdd65fdde5abb7b0decef0f7863fdd62112ca265e4e9c028636224985385f SHA512 cedf51282c4e46ec1f62b920fe25bef47dc25e75fde881a9e35a9340ce055bd57bc2b7ef785486d8510e3130bf48f45b91d2e263f9b1b1559005f0bb4405e123 +AUX cloog-0.20.0-notex.patch 1326 BLAKE2B c0a6b0961b46523219bbe55ad962ff3b7cf3f335dfe9a3cb7d0c783573026647317c74e5fefd7dd7c7ef7f16a4a5de4c317fd82be692fd31f8c36e4538b448b6 SHA512 4c011cedb37d0ec2ba97bc0904721a463197fce789eff657d05372b31df639af54bb2830729c32b78f9c4095f97a994fa9b1118de17ded0f0a00f9d4bfb9714f +DIST cloog-0.20.0.tar.gz 512106 BLAKE2B ac5ce6b7bb6ad586fc614c02b7c2e7c17322e49a775e21b50fb9862e487b4278a2b1024a7269830b55be1ae3c4b4c70f3d411d6c86052483bda124bc9bc07b20 SHA512 2663bbce49c42436681750968823dbee9b3cfbe4c086f5b340d11e51d8c8f138d1a2ccfd1691ae4395b94c082ccc49c0d7e5a1475b29192d13ab3c0148a8c347 +EBUILD cloog-0.20.0.ebuild 1268 BLAKE2B f739e60090f936c9ccd47b307e1a8cc9625b80be11a2192887969007f26e9f7c4b1235f125dc1c06deef4a74feda8e3531c240fd015d6618ed64d87313e21a20 SHA512 4abd7c18401cb9381d60191865a0aa7161020664699f402283423651551fc6c87ebe6a5d96ed7c4279a6367a63da4279a3010158a47d2994af0a86c8d0ec3f83 +EBUILD cloog-9999.ebuild 1268 BLAKE2B f739e60090f936c9ccd47b307e1a8cc9625b80be11a2192887969007f26e9f7c4b1235f125dc1c06deef4a74feda8e3531c240fd015d6618ed64d87313e21a20 SHA512 4abd7c18401cb9381d60191865a0aa7161020664699f402283423651551fc6c87ebe6a5d96ed7c4279a6367a63da4279a3010158a47d2994af0a86c8d0ec3f83 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild deleted file mode 100644 index cc37d6f8a906..000000000000 --- a/dev-libs/cloog/cloog-0.18.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils ltprune 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 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-6.0.0[${MULTILIB_USEDEP}] - >=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]" -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-0.20.0.ebuild b/dev-libs/cloog/cloog-0.20.0.ebuild new file mode 100644 index 000000000000..590340afe675 --- /dev/null +++ b/dev-libs/cloog/cloog-0.20.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit autotools + +DESCRIPTION="A loop generator for scanning polyhedra" +HOMEPAGE="http://www.bastoul.net/cloog/ https://github.com/periscop/cloog" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/periscop/cloog" +else + SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz" + S="${WORKDIR}"/cloog-${P} + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0/4" +IUSE="static-libs" + +RDEPEND=" + dev-libs/gmp:= + dev-libs/isl:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch ) + +DOCS=( README ) + +src_prepare() { + default + AT_NO_RECURSIVE=yes eautoreconf -i + # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS + # sed to avoid eautoreconf + sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die + + # Make sure we always use the system isl. + rm -rf isl || die +} + +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 +src_test() { + emake -j1 check +} diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild index c85bd46b030f..590340afe675 100644 --- a/dev-libs/cloog/cloog-9999.ebuild +++ b/dev-libs/cloog/cloog-9999.ebuild @@ -3,47 +3,47 @@ EAPI="7" -inherit eutils multilib-minimal +inherit autotools -if [[ ${PV} == *9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://repo.or.cz/cloog.git" +DESCRIPTION="A loop generator for scanning polyhedra" +HOMEPAGE="http://www.bastoul.net/cloog/ https://github.com/periscop/cloog" + +if [[ ${PV} == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/periscop/cloog" else + SRC_URI="https://github.com/periscop/cloog/archive/${P}.tar.gz" + S="${WORKDIR}"/cloog-${P} KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~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-6.0.0[${MULTILIB_USEDEP}] - >=dev-libs/isl-0.15:0=[${MULTILIB_USEDEP}]" -DEPEND="${DEPEND} - virtual/pkgconfig" +RDEPEND=" + dev-libs/gmp:= + dev-libs/isl:= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-0.20.0-notex.patch ) DOCS=( README ) src_prepare() { default - - 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 + AT_NO_RECURSIVE=yes eautoreconf -i + # m4/ax_create_pkgconfig_info.m4 includes LDFLAGS + # sed to avoid eautoreconf + sed -i -e '/Libs:/s:@LDFLAGS@ ::' configure || die # Make sure we always use the system isl. - rm -rf isl + rm -rf isl || die } -multilib_src_configure() { +src_configure() { ECONF_SOURCE="${S}" econf \ --with-gmp=system \ --with-isl=system \ @@ -52,12 +52,6 @@ multilib_src_configure() { } # The default src_test() fails, so we'll just run these directly -multilib_src_test() { - echo ">>> Test phase [check]: ${CATEGORY}/${PF}" +src_test() { emake -j1 check } - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete -} diff --git a/dev-libs/cloog/files/cloog-0.20.0-notex.patch b/dev-libs/cloog/files/cloog-0.20.0-notex.patch new file mode 100644 index 000000000000..72c75a1820d4 --- /dev/null +++ b/dev-libs/cloog/files/cloog-0.20.0-notex.patch @@ -0,0 +1,37 @@ +diff --git a/Makefile.am b/Makefile.am +index 9edba30..fcca42f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -181,19 +181,6 @@ doc: + @echo " *-----------------------------------------------*/" + doxygen ./autoconf/Doxyfile + +-#/***************************************************************************** +-# * Doc * +-# *****************************************************************************/ +- +-if HAVE_TEXI2DVI +-pdf_DATA = doc/cloog.pdf +-dist_pdf_DATA = doc/cloog.pdf +-doc/cloog.pdf: doc/cloog.texi doc/gitversion.texi +- $(TEXI2DVI) -I $(top_builddir)/doc --pdf $< -o $@ +-endif +- +-doc/gitversion.texi: @GIT_INDEX@ +- echo '@set VERSION '`$(top_builddir)/genversion.sh`'' > $@ + + #/***************************************************************************** + # * Tests * +diff --git a/configure.ac b/configure.ac +index 88d346d..fec9b04 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -72,8 +72,6 @@ AC_CHECK_PROG(CD, cd) + dnl Configure needs an empty install.sh file with this, i HATE that... + AC_PROG_INSTALL + AC_PROG_LIBTOOL +-AC_CHECK_PROG(TEXI2DVI, texi2dvi, texi2dvi, []) +-AM_CONDITIONAL(HAVE_TEXI2DVI, test -n "$TEXI2DVI") + + AX_CC_MAXOPT + AC_SUBST(CFLAGS_WARN) -- cgit v1.2.3