[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: dbda7d259111a90728d62fc56e6d664d5a745f0e Author: Eli Schwartz gmail com> AuthorDate: Tue Mar 5 01:37:21 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 5 04:47:50 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbda7d25 sci-mathematics/glpk: mark as LTO-unsafe, strict-aliasing unsafe It has been reported upstream but no response. Closes: https://bugs.gentoo.org/863047 Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 11 ++- sci-mathematics/glpk/glpk-5.0-r2.ebuild | 9 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index 4035b2d2c2a9..cdfbef93af93 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -49,6 +49,15 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/863047 + # https://lists.gnu.org/archive/html/bug-glpk/2022-08/msg0.html + # No upstream response... + # + # Do not trust it to LTO either. + append-flags -fno-strict-aliasing + filter-lto + local myconf if use mysql || use odbc; then myconf="--enable-dl" diff --git a/sci-mathematics/glpk/glpk-5.0-r2.ebuild b/sci-mathematics/glpk/glpk-5.0-r2.ebuild index ccc0e863233f..af7007591862 100644 --- a/sci-mathematics/glpk/glpk-5.0-r2.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r2.ebuild @@ -53,6 +53,15 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/863047 + # https://lists.gnu.org/archive/html/bug-glpk/2022-08/msg0.html + # No upstream response... + # + # Do not trust it to LTO either. + append-flags -fno-strict-aliasing + filter-lto + local myconf if use mysql || use odbc; then myconf="--enable-dl"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 0611fccf617f3869fc6b3b88358e2280dfd27b74 Author: Michael Orlitzky gentoo org> AuthorDate: Wed Jan 10 18:14:44 2024 + Commit: Michael Orlitzky gentoo org> CommitDate: Wed Jan 10 18:15:58 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0611fccf sci-mathematics/glpk: update EAPI 7 -> 8, add libltdl dep With USE=mysql or USE=odbc, dev-libs/libltdl is required (per INSTALL). Closes: https://bugs.gentoo.org/921718 Signed-off-by: Michael Orlitzky gentoo.org> sci-mathematics/glpk/glpk-5.0-r2.ebuild | 96 + 1 file changed, 96 insertions(+) diff --git a/sci-mathematics/glpk/glpk-5.0-r2.ebuild b/sci-mathematics/glpk/glpk-5.0-r2.ebuild new file mode 100644 index ..ccc0e863233f --- /dev/null +++ b/sci-mathematics/glpk/glpk-5.0-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="GNU Linear Programming Kit" +HOMEPAGE="https://www.gnu.org/software/glpk/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/40" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="doc examples gmp odbc mysql" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + sci-libs/amd:0= + sci-libs/colamd:= + sys-libs/zlib:0= + gmp? ( dev-libs/gmp:0= ) + mysql? ( + dev-db/mysql-connector-c + dev-libs/libltdl + ) + odbc? ( + || ( + dev-db/libiodbc:0 + dev-db/unixODBC:0 + ) + dev-libs/libltdl + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.65-fix-mysql-include-prefix.patch + "${FILESDIR}"/${PN}-4.65-debundle-system-libs.patch +) + +src_prepare() { + # TODO: the ODBC library is dlopen()ed, so we only want to append + # -I to the preprocessor flags, and not all of the CFLAGS that + # were used to build libiodbc. That fix and the pkg-config fallback + # should be sent upstream, and placed into CPPFLAGS rather than + # CFLAGS (as configure.ac does now). + use odbc && [[ -z $(type -P odbc_config) ]] && \ + append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc) + + default + + eautoreconf +} + +src_configure() { + local myconf + if use mysql || use odbc; then + myconf="--enable-dl" + else + myconf="--disable-dl" + fi + + econf ${myconf} \ + --disable-static \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_with gmp) +} + +src_install() { + default + + if use examples; then + # The top-level Makefile descends into the "examples" directory + # unconditionally, building a program and excreting build + # artifacts that we don't want to install. Note: this still + # leaves the example program /usr/bin/glpsol installed. An + # additional "emake ... uninstall" could probably take care + # of that if desired. + emake -C examples clean + + # Installing the Makefiles for the examples does the user no + # good without the top-level Makefile. + rm examples/Makefile{.in,.am,} \ + || die "failed to remove example Makefiles" + + insinto "/usr/share/doc/${PF}" + doins -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi + + use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt + + # no static archives + find "${D}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 2e5cf4059662fc26b1a45fd04b81bf5f021ced51 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jun 2 16:13:14 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jun 3 11:12:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e5cf405 sci-mathematics/glpk: destabilize for ~ppc Signed-off-by: Arthur Zamarin gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index b02c398a95be..4035b2d2c2a9 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 89b466741382fad63a853a181f741274f985a778 Author: WANG Xuerui gentoo org> AuthorDate: Sat Dec 3 10:13:18 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Sun Dec 4 09:22:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b46674 sci-mathematics/glpk: keyword 5.0-r1 for ~loong Signed-off-by: WANG Xuerui gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index 0659c6bd33a1..b02c398a95be 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 7c42db9449f33aa33804a2c37645906780ede535 Author: Sam James gentoo org> AuthorDate: Tue Oct 18 01:47:03 2022 + Commit: Sam James gentoo org> CommitDate: Tue Oct 18 02:17:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c42db94 sci-mathematics/glpk: add savannah upstream metadata Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml index 8161ed7c3b78..1019dad1d684 100644 --- a/sci-mathematics/glpk/metadata.xml +++ b/sci-mathematics/glpk/metadata.xml @@ -4,7 +4,7 @@ robb...@gentoo.org - + m...@gentoo.org @@ -25,4 +25,7 @@ (MIP), and other related problems. It is a set of routines written in ANSI C and organized in the form of a callable library. + +glpk +
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
commit: d6ff8dba33190ef7bc124b688c9d8ccaa3839cce Author: Michael Orlitzky gentoo org> AuthorDate: Tue Nov 2 22:52:24 2021 + Commit: Michael Orlitzky gentoo org> CommitDate: Tue Nov 2 23:05:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6ff8dba sci-mathematics/glpk: remove old "unused" glpk-4.65.ebuild. Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Michael Orlitzky gentoo.org> sci-mathematics/glpk/Manifest | 1 - .../glpk/files/glpk-4.65-longstep_verbosity.patch | 23 --- sci-mathematics/glpk/glpk-4.65.ebuild | 77 -- 3 files changed, 101 deletions(-) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index 30d7dbde93e..6558f5696c6 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -1,2 +1 @@ -DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375 DIST glpk-5.0.tar.gz 4132649 BLAKE2B f8204f66a97af950c13ee72ee9541f305745741d1231325670ede14663cb6c28ec6fbc44b3625973f1924ca078183d1d43f494ad43a7b48b45be131882b1 SHA512 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d diff --git a/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch b/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch deleted file mode 100644 index 1b78ece3e69..000 --- a/sci-mathematics/glpk/files/glpk-4.65-longstep_verbosity.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://lists.gnu.org/archive/html/bug-glpk/2018-03/msg0.html - -diff --git a/src/draft/glpios03.c b/src/draft/glpios03.c -index 21d6a00..eb34ad0 100644 a/src/draft/glpios03.c -+++ b/src/draft/glpios03.c -@@ -920,13 +920,10 @@ int ios_driver(glp_tree *T) - #if 0 - ((glp_iocp *)T->parm)->msg_lev = GLP_MSG_DBG; - #endif --#if 1 /* 16/III-2016 */ -+#if 1 /* 01/III-2018 */ - if (((glp_iocp *)T->parm)->flip) --#if 0 /* 20/I-2018 */ -- xprintf("WARNING: LONG-STEP DUAL SIMPLEX WILL BE USED\n"); --#else -- xprintf("Long-step dual simplex will be used\n"); --#endif -+ if (T->parm->msg_lev >= GLP_MSG_ALL) -+xprintf("Long-step dual simplex will be used\n"); - #endif - /* on entry to the B&B driver it is assumed that the active list - contains the only active (i.e. root) subproblem, which is the diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild deleted file mode 100644 index abc284449ff..000 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="GNU Linear Programming Kit" -HOMEPAGE="https://www.gnu.org/software/glpk/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/40" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc examples gmp odbc mysql" - -BDEPEND="virtual/pkgconfig" -DEPEND=" - sci-libs/amd:0= - sci-libs/colamd:= - sys-libs/zlib:0= - gmp? ( dev-libs/gmp:0= ) - mysql? ( dev-db/mysql-connector-c ) - odbc? ( - || ( - dev-db/libiodbc:0 - dev-db/unixODBC:0 - ) - )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.65-fix-mysql-include-prefix.patch - "${FILESDIR}"/${PN}-4.65-debundle-system-libs.patch - "${FILESDIR}"/${PN}-4.65-longstep_verbosity.patch -) - -src_prepare() { - # TODO: the ODBC library is dlopen()ed, so we only want to append - # -I to the preprocessor flags, and not all of the CFLAGS that - # were used to build libiodbc. That fix and the pkg-config fallback - # should be sent upstream, and placed into CPPFLAGS rather than - # CFLAGS (as configure.ac does now). - use odbc && [[ -z $(type -P odbc_config) ]] && \ - append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc) - - default - eautoreconf -} - -src_configure() { - local myconf - if use mysql || use odbc; then - myconf="--enable-dl" - else - myconf="--disable-dl" - fi - - econf ${myconf} \ - --disable-static \ - $(use_enable mysql) \ - $(use_enable odbc) \ - $(use_with gmp) -} - -src_install() { - default - if use examples; then - insinto "/usr/share/doc/${PF}" - doins -r examples - docompress -x "/usr/share/doc/${PF}/examp
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: c68ecfcda81c9ab85de05c07271ee7f3662dc50e Author: Sam James gentoo org> AuthorDate: Tue Nov 2 22:21:04 2021 + Commit: Sam James gentoo org> CommitDate: Tue Nov 2 22:21:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68ecfcd sci-mathematics/glpk: Stabilize 5.0-r1 arm, #821322 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index 0e77ed92842..0659c6bd33a 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 0cf250cbfd5cf7a3b90f30d54eccaee3b77e126f Author: Sam James gentoo org> AuthorDate: Tue Nov 2 22:21:01 2021 + Commit: Sam James gentoo org> CommitDate: Tue Nov 2 22:21:01 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf250cb sci-mathematics/glpk: Stabilize 5.0-r1 arm64, #821322 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index 79a3a11a23d..0e77ed92842 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 18657ed813a0d88855024df54b68174afe9a70a5 Author: Sam James gentoo org> AuthorDate: Tue Nov 2 15:46:53 2021 + Commit: Sam James gentoo org> CommitDate: Tue Nov 2 15:46:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18657ed8 sci-mathematics/glpk: Stabilize 5.0-r1 x86, #821322 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index ad9acc70689..79a3a11a23d 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: ff50daaf67c36a0ae9b6128c3e145ea0fe6398d1 Author: Sam James gentoo org> AuthorDate: Tue Nov 2 15:46:27 2021 + Commit: Sam James gentoo org> CommitDate: Tue Nov 2 15:46:27 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff50daaf sci-mathematics/glpk: Stabilize 5.0-r1 amd64, #821322 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index e9199b3a262..ad9acc70689 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 4e4120a0bdaa23e83f6ea381cf1f8466d5c00dca Author: Sam James gentoo org> AuthorDate: Tue Nov 2 15:45:52 2021 + Commit: Sam James gentoo org> CommitDate: Tue Nov 2 15:45:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e4120a0 sci-mathematics/glpk: Stabilize 5.0-r1 sparc, #821322 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index 5f584097633..e9199b3a262 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 8553404ce16f1519d6f4821530bbd8437366a7fa Author: Sam James gentoo org> AuthorDate: Tue Nov 2 15:45:45 2021 + Commit: Sam James gentoo org> CommitDate: Tue Nov 2 15:45:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8553404c sci-mathematics/glpk: Stabilize 5.0-r1 ppc64, #821322 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index 10c2fd30430..5f584097633 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 4de7dae47f909e0780b2f9ae97362c3d174763e6 Author: Sam James gentoo org> AuthorDate: Tue Nov 2 15:45:42 2021 + Commit: Sam James gentoo org> CommitDate: Tue Nov 2 15:45:42 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de7dae4 sci-mathematics/glpk: Stabilize 5.0-r1 ppc, #821322 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index 1d6d7344baa..10c2fd30430 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 6bbcdf2dfda899eb60a4672c6aa842d10364eb88 Author: Marek Szuba gentoo org> AuthorDate: Wed Jul 14 16:12:00 2021 + Commit: Marek Szuba gentoo org> CommitDate: Wed Jul 14 16:14:46 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbcdf2d sci-mathematics/glpk: keyword 5.0-r1 for ~riscv Signed-off-by: Marek Szuba gentoo.org> sci-mathematics/glpk/glpk-5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-5.0-r1.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild index 8bf55ceb4aa..1d6d7344baa 100644 --- a/sci-mathematics/glpk/glpk-5.0-r1.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: a36cbeb1287c096d09464f527fd9ce6c4450155a Author: Michael Orlitzky gentoo org> AuthorDate: Wed Mar 31 12:57:15 2021 + Commit: Michael Orlitzky gentoo org> CommitDate: Wed Mar 31 13:03:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36cbeb1 sci-mathematics/glpk: don't install build artifacts with USE=examples. The build system for glpk automatically descends into the "examples" directory to build an example program. Afterwards, when we install the entire "examples" directory to honor USE=examples, we wind up installing the build artifacts for that program as well. This commit adds an extra "emake clean" to remove the build artifacts, and an "rm" to get rid of the (useless, to the end user) example Makefiles themselves. Closes: https://bugs.gentoo.org/779358 Reported-by: Alessandro Barbieri gmail.com> Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Michael Orlitzky gentoo.org> .../glpk/{glpk-5.0.ebuild => glpk-5.0-r1.ebuild} | 16 1 file changed, 16 insertions(+) diff --git a/sci-mathematics/glpk/glpk-5.0.ebuild b/sci-mathematics/glpk/glpk-5.0-r1.ebuild similarity index 76% rename from sci-mathematics/glpk/glpk-5.0.ebuild rename to sci-mathematics/glpk/glpk-5.0-r1.ebuild index c91cdf6a34a..8bf55ceb4aa 100644 --- a/sci-mathematics/glpk/glpk-5.0.ebuild +++ b/sci-mathematics/glpk/glpk-5.0-r1.ebuild @@ -44,6 +44,7 @@ src_prepare() { append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc) default + eautoreconf } @@ -64,11 +65,26 @@ src_configure() { src_install() { default + if use examples; then + # The top-level Makefile descends into the "examples" directory + # unconditionally, building a program and excreting build + # artifacts that we don't want to install. Note: this still + # leaves the example program /usr/bin/glpsol installed. An + # additional "emake ... uninstall" could probably take care + # of that if desired. + emake -C examples clean + + # Installing the Makefiles for the examples does the user no + # good without the top-level Makefile. + rm examples/Makefile{.in,.am,} \ + || die "failed to remove example Makefiles" + insinto "/usr/share/doc/${PF}" doins -r examples docompress -x "/usr/share/doc/${PF}/examples" fi + use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt # no static archives
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 5d87b7d24b2182641cb051acfc55a01431ddb934 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 6 15:18:35 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 6 15:19:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d87b7d2 sci-mathematics/glpk: drop x86-macos Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 4 ++-- sci-mathematics/glpk/glpk-5.0.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index 741587830d0..abc284449ff 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig" diff --git a/sci-mathematics/glpk/glpk-5.0.ebuild b/sci-mathematics/glpk/glpk-5.0.ebuild index 83c12e1926e..c91cdf6a34a 100644 --- a/sci-mathematics/glpk/glpk-5.0.ebuild +++ b/sci-mathematics/glpk/glpk-5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: ce8bb0f47c30f54e025afcd122ad8eaa54ea1f07 Author: François Bissey gmail com> AuthorDate: Wed Dec 16 20:49:10 2020 + Commit: Michael Orlitzky gentoo org> CommitDate: Thu Dec 17 01:18:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8bb0f4 sci-mathematics/glpk: Upstream bump Closes: https://github.com/gentoo/gentoo/pull/18685 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: François René Pierre Bissey gmail.com> Signed-off-by: Michael Orlitzky gentoo.org> sci-mathematics/glpk/Manifest| 1 + sci-mathematics/glpk/glpk-5.0.ebuild | 76 2 files changed, 77 insertions(+) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index 05714aa32b3..30d7dbde93e 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -1 +1,2 @@ DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375 +DIST glpk-5.0.tar.gz 4132649 BLAKE2B f8204f66a97af950c13ee72ee9541f305745741d1231325670ede14663cb6c28ec6fbc44b3625973f1924ca078183d1d43f494ad43a7b48b45be131882b1 SHA512 4e92195fa058c707146f2690f3a38b46c33add948c852f67659ca005a6aa980bbf97be96528b0f8391690facb880ac2126cd60198c6c175e7f3f06cca7e29f9d diff --git a/sci-mathematics/glpk/glpk-5.0.ebuild b/sci-mathematics/glpk/glpk-5.0.ebuild new file mode 100644 index 000..83c12e1926e --- /dev/null +++ b/sci-mathematics/glpk/glpk-5.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="GNU Linear Programming Kit" +HOMEPAGE="https://www.gnu.org/software/glpk/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/40" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="doc examples gmp odbc mysql" + +BDEPEND="virtual/pkgconfig" +DEPEND=" + sci-libs/amd:0= + sci-libs/colamd:= + sys-libs/zlib:0= + gmp? ( dev-libs/gmp:0= ) + mysql? ( dev-db/mysql-connector-c ) + odbc? ( + || ( + dev-db/libiodbc:0 + dev-db/unixODBC:0 + ) + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.65-fix-mysql-include-prefix.patch + "${FILESDIR}"/${PN}-4.65-debundle-system-libs.patch +) + +src_prepare() { + # TODO: the ODBC library is dlopen()ed, so we only want to append + # -I to the preprocessor flags, and not all of the CFLAGS that + # were used to build libiodbc. That fix and the pkg-config fallback + # should be sent upstream, and placed into CPPFLAGS rather than + # CFLAGS (as configure.ac does now). + use odbc && [[ -z $(type -P odbc_config) ]] && \ + append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc) + + default + eautoreconf +} + +src_configure() { + local myconf + if use mysql || use odbc; then + myconf="--enable-dl" + else + myconf="--disable-dl" + fi + + econf ${myconf} \ + --disable-static \ + $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_with gmp) +} + +src_install() { + default + if use examples; then + insinto "/usr/share/doc/${PF}" + doins -r examples + docompress -x "/usr/share/doc/${PF}/examples" + fi + use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt + + # no static archives + find "${D}" -name '*.la' -delete || die +}
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 996de3746023bf0de686039ec5faf138e2d98da6 Author: Sam James gentoo org> AuthorDate: Sat Nov 7 17:49:46 2020 + Commit: Sam James gentoo org> CommitDate: Sat Nov 7 17:49:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996de374 sci-mathematics/glpk: Stabilize 4.65 arm, #709830 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index 2a6bc60f06f..741587830d0 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 7de32936a0d35de20cc473e9281d8286571de1cf Author: Sam James gentoo org> AuthorDate: Fri Nov 6 15:19:50 2020 + Commit: Sam James gentoo org> CommitDate: Fri Nov 6 15:19:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de32936 sci-mathematics/glpk: Stabilize 4.65 arm64, #709830 Signed-off-by: Sam James gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index 30668cbb935..2a6bc60f06f 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-3" SLOT="0/40" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 9cb2f52e90d4c3895338713b9ee8fcecad15936b Author: David Seifert gentoo org> AuthorDate: Sun Aug 23 17:01:31 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Aug 23 17:01:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb2f52e sci-mathematics/glpk: Remove libtool archives Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: David Seifert gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index a08a4af54c4..30668cbb935 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -6,13 +6,13 @@ EAPI=7 inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="GNU Linear Programming Kit" -LICENSE="GPL-3" HOMEPAGE="https://www.gnu.org/software/glpk/"; SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" +LICENSE="GPL-3" SLOT="0/40" -IUSE="doc examples gmp odbc mysql static-libs" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="doc examples gmp odbc mysql" BDEPEND="virtual/pkgconfig" DEPEND=" @@ -21,13 +21,18 @@ DEPEND=" sys-libs/zlib:0= gmp? ( dev-libs/gmp:0= ) mysql? ( dev-db/mysql-connector-c ) - odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )" + odbc? ( + || ( + dev-db/libiodbc:0 + dev-db/unixODBC:0 + ) + )" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${PN}-4.65-fix-mysql-include-prefix.patch" - "${FILESDIR}/${PN}-4.65-debundle-system-libs.patch" - "${FILESDIR}/${PN}-4.65-longstep_verbosity.patch" + "${FILESDIR}"/${PN}-4.65-fix-mysql-include-prefix.patch + "${FILESDIR}"/${PN}-4.65-debundle-system-libs.patch + "${FILESDIR}"/${PN}-4.65-longstep_verbosity.patch ) src_prepare() { @@ -52,9 +57,9 @@ src_configure() { fi econf ${myconf} \ + --disable-static \ $(use_enable mysql) \ $(use_enable odbc) \ - $(use_enable static-libs static) \ $(use_with gmp) } @@ -66,4 +71,7 @@ src_install() { docompress -x "/usr/share/doc/${PF}/examples" fi use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt + + # no static archives + find "${D}" -name '*.la' -delete || die }
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
commit: 8d6799bcf05704fc9645c8a5668edc16e8c39cf6 Author: Michael Orlitzky gentoo org> AuthorDate: Mon Apr 13 17:36:52 2020 + Commit: Michael Orlitzky gentoo org> CommitDate: Mon Apr 13 17:36:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6799bc sci-mathematics/glpk: remove old "unused" version and files. Closes: https://bugs.gentoo.org/666060 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Michael Orlitzky gentoo.org> sci-mathematics/glpk/Manifest | 1 - .../files/glpk-4.63-debundle-system-libs.patch | 94 -- sci-mathematics/glpk/glpk-4.63.ebuild | 63 --- 3 files changed, 158 deletions(-) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index 6c89c63e486..05714aa32b3 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -1,2 +1 @@ -DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375 diff --git a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch deleted file mode 100644 index e836219d0ad..000 --- a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch +++ /dev/null @@ -1,94 +0,0 @@ -Remove suitesparse (camd,colamd) and zlib bundles -bicatali - apr 2014 -Updated for 4.57 by soap (Jan 2016) -Updated for 4.60 by bicatali (Dec 2016) -Updated for 4.63 by bicatali (Jul 2017) - -diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/configure.ac glpk-4.63/configure.ac glpk-4.63.orig/configure.ac2017-07-25 00:00:00.0 -0700 -+++ glpk-4.63/configure.ac 2017-07-27 14:10:47.986520907 -0700 -@@ -69,6 +69,11 @@ - dnl Check for math library - AC_CHECK_LIB([m], [exp]) - -+AC_CHECK_LIB([amd], [amd_1]) -+AC_CHECK_LIB([colamd], [colamd]) -+AC_CHECK_HEADER([amd.h]) -+AC_CHECK_LIB([z], [gzopen]) -+ - dnl Check for header - AC_CHECK_HEADER([sys/time.h], -AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A])) -diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/src/Makefile.am glpk-4.63/src/Makefile.am glpk-4.63.orig/src/Makefile.am 2017-07-25 00:00:00.0 -0700 -+++ glpk-4.63/src/Makefile.am 2017-07-27 14:11:30.841536062 -0700 -@@ -6,18 +6,15 @@ - - libglpk_la_CPPFLAGS = \ - -I$(srcdir) \ ---I$(srcdir)/amd \ - -I$(srcdir)/api \ - -I$(srcdir)/bflib \ - -I$(srcdir)/cglib \ ---I$(srcdir)/colamd \ - -I$(srcdir)/env \ - -I$(srcdir)/minisat \ - -I$(srcdir)/misc \ - -I$(srcdir)/mpl \ - -I$(srcdir)/proxy \ ---I$(srcdir)/simplex \ ---I$(srcdir)/zlib -+-I$(srcdir)/simplex - - libglpk_la_LDFLAGS = \ - -version-info 42:2:2 \ -@@ -57,18 +54,6 @@ - glpssx01.c \ - glpssx02.c \ - lux.c \ --amd/amd_1.c \ --amd/amd_2.c \ --amd/amd_aat.c \ --amd/amd_control.c \ --amd/amd_defaults.c \ --amd/amd_dump.c \ --amd/amd_info.c \ --amd/amd_order.c \ --amd/amd_post_tree.c \ --amd/amd_postorder.c \ --amd/amd_preprocess.c \ --amd/amd_valid.c \ - api/advbas.c \ - api/asnhall.c \ - api/asnlp.c \ -@@ -142,7 +127,6 @@ - cglib/gmigen.c \ - cglib/mirgen.c \ - cglib/spv.c \ --colamd/colamd.c \ - env/alloc.c \ - env/dlsup.c \ - env/env.c \ -@@ -196,21 +180,6 @@ - simplex/spxprob.c \ - simplex/spychuzc.c \ - simplex/spychuzr.c \ --simplex/spydual.c \ --zlib/adler32.c \ --zlib/compress.c \ --zlib/crc32.c \ --zlib/deflate.c \ --zlib/gzclose.c \ --zlib/gzlib.c \ --zlib/gzread.c \ --zlib/gzwrite.c \ --zlib/inffast.c \ --zlib/inflate.c \ --zlib/inftrees.c \ --zlib/trees.c \ --zlib/uncompr.c \ --zlib/zio.c \ --zlib/zutil.c -+simplex/spydual.c - - ## eof ## diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild deleted file mode 100644 index e895918d23a..000 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="GNU Linear Programming Kit" -LICENSE="GPL-3" -HOMEPAGE="https://www.gnu.org/software/glpk/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -SLOT="0/40" -IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" - -RDEPEND=" - sci-libs/amd:0= - sci-libs/colamd:= - sys-libs/zlib:0= -
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 9b5f0474bf103aaf1d254977a61646a30b23fd84 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 13 16:11:12 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 13 16:12:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b5f0474 sci-mathematics/glpk: x86 stable wrt bug #717072 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index 1a512338e27..a08a4af54c4 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" BDEPEND="virtual/pkgconfig" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 8f5ed315f7e9abff6e7b24e4b0bf35722e3638a1 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 13 14:46:20 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 13 14:46:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f5ed315 sci-mathematics/glpk: amd64 stable wrt bug #717072 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index 99952688b70..1a512338e27 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" BDEPEND="virtual/pkgconfig" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: c3d90e97393867ed729929578480300d0900e10b Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 13 10:18:36 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 13 10:18:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d90e97 sci-mathematics/glpk: ppc64 stable wrt bug #717072 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index 8d9c25a7de9..99952688b70 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" BDEPEND="virtual/pkgconfig" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 0d3befa09e37c17f3bcd033a45cdf4c2cd45 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 13 10:17:08 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 13 10:17:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d3befa0 sci-mathematics/glpk: ppc stable wrt bug #717072 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index 3fb0a682a99..8d9c25a7de9 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" BDEPEND="virtual/pkgconfig" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 8549722dfe5b9841ae21839668a342e774d27f28 Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Apr 13 07:50:37 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Apr 13 08:05:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8549722d sci-mathematics/glpk: stable 4.65 for sparc, bug #717072 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> sci-mathematics/glpk/glpk-4.65.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.65.ebuild b/sci-mathematics/glpk/glpk-4.65.ebuild index 258796fa21a..3fb0a682a99 100644 --- a/sci-mathematics/glpk/glpk-4.65.ebuild +++ b/sci-mathematics/glpk/glpk-4.65.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" BDEPEND="virtual/pkgconfig" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 2f570375a471eea1b6a55aebfd9441232021e8a5 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sat Apr 11 14:58:50 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Apr 11 15:57:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f570375 sci-mathematics/glpk: drop to ~hppa Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> sci-mathematics/glpk/glpk-4.63.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 4bbce40b381..e895918d23a 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
commit: 20a34c28e3afae7c20221d6fb76ae83d119c1375 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Mar 6 21:50:06 2020 + Commit: Michael Orlitzky gentoo org> CommitDate: Sat Mar 7 02:13:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a34c28 sci-mathematics/glpk: new version 4.65. This new upstream version fixes a few minor ebuild issues: * I've attempted to fix the MySQL include location in a more standard way, by using mysql_config (bug 597620). Another solution was already present in v4.63, so I've marked this bug as resolved. * The virtual/mysql dependency was replaced, per bug 666060. This will be completely resolved when v4.65 goes stable and v4.63 is removed. We also include a new patch, from upstream, to quiet some overly-verbose output. The patch to debundle the system libraries was forward-ported to the new version thanks to François Bissey, who maintained an ebuild for v4.65 in the sage-on-gentoo overlay until now. Bug: https://bugs.gentoo.org/666060 Closes: https://bugs.gentoo.org/597620 Closes: https://bugs.gentoo.org/711648 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Orlitzky gentoo.org> sci-mathematics/glpk/Manifest | 1 + .../files/glpk-4.65-debundle-system-libs.patch | 91 ++ .../files/glpk-4.65-fix-mysql-include-prefix.patch | 47 +++ .../glpk/files/glpk-4.65-longstep_verbosity.patch | 23 ++ sci-mathematics/glpk/glpk-4.65.ebuild | 69 5 files changed, 231 insertions(+) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index e7dae3fabf9..6c89c63e486 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -1 +1,2 @@ DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c +DIST glpk-4.65.tar.gz 4167110 BLAKE2B 4ccb5cd8301bdca2ccdecfc1648642afe26ff0a1ee9a75cb5a3906838086e5c41edfb16e7c55f4ad677d192f6a66b866f2d917c5be7103da7141bfb1f74e636b SHA512 997e8e599ff1718a08c66b86eadd0e01f4644899f1e95920f8ae91d66b4d8361021766b346845f4dcbcfe667b41ab72ea3d377017a0ebf85d7ece091cfd81375 diff --git a/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch new file mode 100644 index 000..78af8b8d943 --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.65-debundle-system-libs.patch @@ -0,0 +1,91 @@ +diff --git a/configure.ac b/configure.ac +index 96c4cc5..29e11f9 100644 +--- a/configure.ac b/configure.ac +@@ -69,6 +69,11 @@ AC_PROG_LIBTOOL + dnl Check for math library + AC_CHECK_LIB([m], [exp]) + ++AC_CHECK_LIB([amd], [amd_1]) ++AC_CHECK_LIB([colamd], [colamd]) ++AC_CHECK_HEADER([amd.h]) ++AC_CHECK_LIB([z], [gzopen]) ++ + dnl Check for header + AC_CHECK_HEADER([sys/time.h], +AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A])) +diff --git a/src/Makefile.am b/src/Makefile.am +index eb5dc1b..b814627 100644 +--- a/src/Makefile.am b/src/Makefile.am +@@ -6,10 +6,8 @@ lib_LTLIBRARIES = libglpk.la + + libglpk_la_CPPFLAGS = \ + -I$(srcdir) \ +--I$(srcdir)/amd \ + -I$(srcdir)/api \ + -I$(srcdir)/bflib \ +--I$(srcdir)/colamd \ + -I$(srcdir)/draft \ + -I$(srcdir)/env \ + -I$(srcdir)/intopt \ +@@ -18,8 +16,7 @@ libglpk_la_CPPFLAGS = \ + -I$(srcdir)/mpl \ + -I$(srcdir)/npp \ + -I$(srcdir)/proxy \ +--I$(srcdir)/simplex \ +--I$(srcdir)/zlib ++-I$(srcdir)/simplex + + libglpk_la_LDFLAGS = \ + -version-info 43:0:3 \ +@@ -27,18 +24,6 @@ libglpk_la_LDFLAGS = \ + ${NOUNDEFINED} + + libglpk_la_SOURCES = \ +-amd/amd_1.c \ +-amd/amd_2.c \ +-amd/amd_aat.c \ +-amd/amd_control.c \ +-amd/amd_defaults.c \ +-amd/amd_dump.c \ +-amd/amd_info.c \ +-amd/amd_order.c \ +-amd/amd_post_tree.c \ +-amd/amd_postorder.c \ +-amd/amd_preprocess.c \ +-amd/amd_valid.c \ + api/advbas.c \ + api/asnhall.c \ + api/asnlp.c \ +@@ -104,7 +89,6 @@ bflib/scf.c \ + bflib/scfint.c \ + bflib/sgf.c \ + bflib/sva.c \ +-colamd/colamd.c \ + draft/bfd.c \ + draft/bfx.c \ + draft/glpapi06.c \ +@@ -202,21 +186,6 @@ simplex/spxprim.c \ + simplex/spxprob.c \ + simplex/spychuzc.c \ + simplex/spychuzr.c \ +-simplex/spydual.c \ +-zlib/adler32.c \ +-zlib/compress.c \ +-zlib/crc32.c \ +-zlib/deflate.c \ +-zlib/gzclose.c \ +-zlib/gzlib.c \ +-zlib/gzread.c \ +-zlib/gzwrite.c \ +-zlib/inffast.c \ +-zlib/inflate.c \ +-zlib/inftrees.c \ +-zlib/trees.c \ +-zlib/uncompr.c \ +-zlib/zio.c \ +-zlib/zutil.c ++simplex/spydual.c + + ## eof ## diff --git a/sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch b/sci-mathematics/glpk/files/glpk-4.65-fix-mysql-include-prefix.patch new file mode 100644 index 000..4dd6583d6de --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.65-fix-my
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: ab834ffe5dc482e7e663176ffe293440a285 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Mar 6 21:52:04 2020 + Commit: Michael Orlitzky gentoo org> CommitDate: Sat Mar 7 02:13:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab834ffe sci-mathematics/glpk: add myself and François Bissey as maintainers. Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Orlitzky gentoo.org> sci-mathematics/glpk/metadata.xml | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml index 237a45406ed..eef02da51bb 100644 --- a/sci-mathematics/glpk/metadata.xml +++ b/sci-mathematics/glpk/metadata.xml @@ -3,15 +3,26 @@ robb...@gentoo.org + + +m...@gentoo.org + + +frp.bis...@gmail.com +François Bissey + + +proxy-ma...@gentoo.org +Proxy Maintainers sci-mathemat...@gentoo.org Gentoo Mathematics Project - The GNU Linear Programming Kit package is intended for solving - large-scale linear programming (LP), mixed integer programming - (MIP), and other related problems. It is a set of routines written - in ANSI C and organized in the form of a callable library. +The GNU Linear Programming Kit package is intended for solving +large-scale linear programming (LP), mixed integer programming +(MIP), and other related problems. It is a set of routines written +in ANSI C and organized in the form of a callable library.
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 424ab08f0e139226daea9ac2834555b65544f84f Author: Martin Mokrejs gmail com> AuthorDate: Sat Apr 21 08:12:23 2018 + Commit: Tony Vroon gentoo org> CommitDate: Fri Jul 13 10:43:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=424ab08f sci-matchematics/glpk: respect EPREFIX Prepend EPREFIX in front of hardcoded include path. All modified ebuilds emerged successfully on a Gentoo::RAP host. Bug: https://bugs.gentoo.org/597620 Closes: https://github.com/gentoo/gentoo/pull/7238 sci-mathematics/glpk/glpk-4.63.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 4721b183285..b32475f03a7 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -29,6 +29,7 @@ PATCHES=( ) src_prepare() { + sed -e 's#CPPFLAGS="-I/usr/include/mysql#CPPFLAGS="-I'"${EPREFIX}"'/usr/include/mysql#' -i configure.ac || die use odbc && [[ -z $(type -P odbc_config) ]] && \ append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
commit: 43dcca1e982da01f52b0bd50a5510c6581145dc4 Author: David Seifert gentoo org> AuthorDate: Wed Apr 18 12:50:45 2018 + Commit: David Seifert gentoo org> CommitDate: Wed Apr 18 16:44:11 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43dcca1e sci-mathematics/glpk: Remove old Package-Manager: Portage-2.3.29, Repoman-2.3.9 Closes: https://bugs.gentoo.org/626228 Closes: https://github.com/gentoo/gentoo/pull/8056 sci-mathematics/glpk/Manifest | 7 -- .../glpk/files/glpk-4.52.1-mariadb-5.5.patch | 11 --- .../files/glpk-4.54-debundle-system-libs.patch | 86 .../files/glpk-4.57-debundle-system-libs.patch | 88 - .../files/glpk-4.60-debundle-system-libs.patch | 92 -- sci-mathematics/glpk/glpk-4.45.ebuild | 63 --- sci-mathematics/glpk/glpk-4.48.ebuild | 52 sci-mathematics/glpk/glpk-4.54.ebuild | 58 -- sci-mathematics/glpk/glpk-4.55.ebuild | 58 -- sci-mathematics/glpk/glpk-4.57.ebuild | 61 -- sci-mathematics/glpk/glpk-4.60.ebuild | 61 -- sci-mathematics/glpk/glpk-4.61-r1.ebuild | 62 --- 12 files changed, 699 deletions(-) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index 3c19e916d3e..e7dae3fabf9 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -1,8 +1 @@ -DIST glpk-4.45.tar.gz 3132439 BLAKE2B 1c3c8123fbb91c4d0357553ca5cbaea3b69c07f79e2353289f4ca17f7f02e06c8639257fc752a9d513481803c66ab1218ede51cf053d6d77a468bbaa208f36d8 SHA512 27089b760d89ee16c5a3332d319007af4b05e8d27df0b990311508f856a01461d8b7b40b111bbf1f3dd4d754af84000112f95349d5286e6d3e42e56226f98649 -DIST glpk-4.48.tar.gz 3488482 BLAKE2B c96c278b8eac7b79aa642106fc3563123f812546fc2e8967a107acd50f010107ea5ef2e005f18117c0ff5061cdf6c3b14eafed22827177cd6516857dc585b18f SHA512 16795e6cf4db302f25e06e5c9a660e5ed8c7b24ffc5126cde0f864e83fa77d4d61838eab4f716291d568963dddf7442a36a39425a62bd58bd00ca73dac4ffa70 -DIST glpk-4.54.tar.gz 3098202 BLAKE2B 32d4f6715e893e52982e572424e18642d80c76b5a8cefb30ee6ec49ae334f8fb3fa2e1e92fe4a90ceb048a4c02cde7248a777a5a88f797a9751777cf523840f9 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070 -DIST glpk-4.55.tar.gz 3424345 BLAKE2B cc4e7b6edeb4497c3aa41151f53c1f48070ba3b83e04ecd48dd2d51f2d464be26440213e1f21cad92159c9326e5c5472f63c5ecfd25b1dfc44e39c3bbafc9eac SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689 -DIST glpk-4.57.tar.gz 3782998 BLAKE2B 031db9f4cc1aec933f551926fb0a65190609132de6692e3cb7f3ad4940b7b25d7f9b267cca671abc53fc803025389858557413a4a658489b6c55e2df13e507ec SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 -DIST glpk-4.60.tar.gz 4160915 BLAKE2B 26cd258701574825ce9333803fc0f1991cec62206563afb9ca0a1dec0e2b55f58661b066ae8a328d11f2bc7cb2be9c77535804d16c267b51d67a1e3696de8395 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a -DIST glpk-4.61.tar.gz 4116291 BLAKE2B aaf67b2e6729772540887174e6241576cc2fe530074d7304eb319e852f8474a8e50f7ee0b9a7d0e2d38f08eb63484eef2b62d92e495ba0520a2715736b57fd17 SHA512 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1 DIST glpk-4.63.tar.gz 4131787 BLAKE2B 791fa1a1424011668019e180fc245c0319f601255f596affe87afa0df47d9d615a8accd794d51c15bff5fe4fe6409369362f6c9e82bdde67903177b8da55e891 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c diff --git a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch b/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch deleted file mode 100644 index 06aa8e5de95..000 --- a/sci-mathematics/glpk/files/glpk-4.52.1-mariadb-5.5.patch +++ /dev/null @@ -1,11 +0,0 @@ glpk-4.52.1/src/glpsql.c.orig 2014-02-05 22:14:21.487843989 +0100 -+++ glpk-4.52.1/src/glpsql.c 2014-02-05 22:14:32.764510562 +0100 -@@ -1106,8 +1106,6 @@ - #define byte_defined 1 - #endif - --#include --#include - #include - - struct db_mysql diff --git a/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch deleted file mode 100644 index a3140341a48..000 --- a/sci-mathematics/glpk/files/glpk-4.54-debundle-system-libs.patch +++ /dev/null @@ -1,86 +0,0 @@ -Remove suitesparse (camd,colamd) and zlib bundles -bicatali - apr 2014 - configure.ac.orig 2014-04-05 14:18:56.045148287 -0700 -
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: b6cfd2f0ca77b895fd51ca0efbb78264464aaa37 Author: Tobias Klausmann gentoo org> AuthorDate: Wed Apr 18 12:17:52 2018 + Commit: Tobias Klausmann gentoo org> CommitDate: Wed Apr 18 12:17:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6cfd2f0 sci-mathematics/glpk-4.63-r0: alpha stable Gentoo-Bug: http://bugs.gentoo.org/626228 sci-mathematics/glpk/glpk-4.63.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index a4a40128c43..4721b183285 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: c03a5e0dc501f563b23b0fed35003e6f37cbc4ae Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Apr 4 22:32:23 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Apr 4 22:32:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03a5e0d sci-mathematics/glpk: stable 4.63 for hppa, bug #626228 Package-Manager: Portage-2.3.28, Repoman-2.3.9 RepoMan-Options: --include-arches="hppa" sci-mathematics/glpk/glpk-4.63.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 0da9d80e7ae..a4a40128c43 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 3dfef5cfeb84ef6f543d01125db8e152b687132b Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Mar 3 17:55:27 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Mar 3 17:56:10 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dfef5cf sci-mathematics/glpk: stable 4.63 for ppc, bug #626228 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="ppc" sci-mathematics/glpk/glpk-4.63.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 1d50881a973..0da9d80e7ae 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: f5909b607eca7396627caf62cabdf0d3435c900f Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Dec 16 13:07:10 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Dec 16 13:07:33 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5909b60 sci-mathematics/glpk: stable 4.63 for ppc64, bug #626228 Package-Manager: Portage-2.3.18, Repoman-2.3.6 RepoMan-Options: --include-arches="ppc64" sci-mathematics/glpk/glpk-4.63.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 721e5260065..1d50881a973 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 7cc35197b05317d7adf0764ee9895f8fc5230d39 Author: Tobias Klausmann gentoo org> AuthorDate: Sat Dec 16 08:19:54 2017 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Dec 16 08:19:54 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc35197 sci-mathematics/glpk-4.63-r0: amd64 stable Gentoo-Bug: http://bugs.gentoo.org/626228 sci-mathematics/glpk/glpk-4.63.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 37c071da162..721e5260065 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 08cb9759a48d39cc33e14705f3df6c0d2a3d1c22 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Dec 12 18:01:43 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Dec 12 18:39:10 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08cb9759 sci-mathematics/glpk: x86 stable (bug #626228) Package-Manager: Portage-2.3.16, Repoman-2.3.6 sci-mathematics/glpk/glpk-4.63.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 7e40891d647..37c071da162 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 875cf22a0ecceddca76d7ee8668d36e0759b8d75 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Nov 8 22:23:37 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Nov 8 22:27:21 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875cf22a sci-mathematics/glpk: stable 4.63 for sparc, bug #626228 (thanks to Rolf Eike Beer) Package-Manager: Portage-2.3.13, Repoman-2.3.4 RepoMan-Options: --include-arches="sparc" sci-mathematics/glpk/glpk-4.63.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 73e2f18581c..7e40891d647 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 7a6aca830ca4acc66dcf5268fefc6fd8f000a785 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Sep 2 16:04:14 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Sep 2 16:07:19 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a6aca83 sci-mathematics/glpk: stable 4.63 for ia64, bug #626228 Package-Manager: Portage-2.3.8, Repoman-2.3.3 RepoMan-Options: --include-arches="ia64" sci-mathematics/glpk/glpk-4.63.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild index 9c15f085e03..73e2f18581c 100644 --- a/sci-mathematics/glpk/glpk-4.63.ebuild +++ b/sci-mathematics/glpk/glpk-4.63.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
commit: 15e2a359852b0253e6249d8215494123de9529cc Author: Robin H. Johnson gentoo org> AuthorDate: Thu Jul 27 21:18:51 2017 + Commit: Robin H. Johnson gentoo org> CommitDate: Thu Jul 27 21:19:18 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e2a359 sci-mathematics/glpk: bump. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=626224 Package-Manager: portage-2.3.6 sci-mathematics/glpk/Manifest | 1 + .../files/glpk-4.63-debundle-system-libs.patch | 94 ++ sci-mathematics/glpk/glpk-4.63.ebuild | 62 ++ 3 files changed, 157 insertions(+) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index 4cd6181920b..871b1b8e1ea 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -5,3 +5,4 @@ DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5d DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62 DIST glpk-4.60.tar.gz 4160915 SHA256 1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a WHIRLPOOL dfde976f9a32ba1751d1a0748c21023e0df802a1f22501c70091cbfb273bde8b73951eceb2a0768bc5634d6786c1cdb109e36af78e72ac7825fa9743737721f4 DIST glpk-4.61.tar.gz 4116291 SHA256 9866de4182d4ce21da11b88573b66bb7858574f89c28be6967ac22dfaba9 SHA512 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1 WHIRLPOOL 01228c555ba7d17668a35a80bdf37dba00a1a105291288aa5ebef43c3ea3999e81042e0f98b5bfbfd7d44804a79014281120aaf10ca181be1b0615b97925407c +DIST glpk-4.63.tar.gz 4131787 SHA256 914d27f1a51c2bf4a51f1bd4a507f875fcca99db7b219380b836a25b29b3e7f6 SHA512 3ee9b9ec5322282a9c62b2ee209fc7760383a6a764ef3816445ffb66f15ed4d00309bff1b98d50c243b58aa74f83072afde45c389799e637e11e86f4db45276c WHIRLPOOL 30facc4776e3db4232ff2924452ee0601bda78b3888f162a12e84af2f2232fbcbd986a9e849a6ce38fa19688c45eb6c6852ca76cc277ea5324e8a55fe899088e diff --git a/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch new file mode 100644 index 000..e836219d0ad --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.63-debundle-system-libs.patch @@ -0,0 +1,94 @@ +Remove suitesparse (camd,colamd) and zlib bundles +bicatali - apr 2014 +Updated for 4.57 by soap (Jan 2016) +Updated for 4.60 by bicatali (Dec 2016) +Updated for 4.63 by bicatali (Jul 2017) + +diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/configure.ac glpk-4.63/configure.ac +--- glpk-4.63.orig/configure.ac2017-07-25 00:00:00.0 -0700 glpk-4.63/configure.ac 2017-07-27 14:10:47.986520907 -0700 +@@ -69,6 +69,11 @@ + dnl Check for math library + AC_CHECK_LIB([m], [exp]) + ++AC_CHECK_LIB([amd], [amd_1]) ++AC_CHECK_LIB([colamd], [colamd]) ++AC_CHECK_HEADER([amd.h]) ++AC_CHECK_LIB([z], [gzopen]) ++ + dnl Check for header + AC_CHECK_HEADER([sys/time.h], +AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A])) +diff -Nuar --exclude '*.orig' --exclude '*.rej' --exclude '*~' glpk-4.63.orig/src/Makefile.am glpk-4.63/src/Makefile.am +--- glpk-4.63.orig/src/Makefile.am 2017-07-25 00:00:00.0 -0700 glpk-4.63/src/Makefile.am 2017-07-27 14:11:30.841536062 -0700 +@@ -6,18 +6,15 @@ + + libglpk_la_CPPFLAGS = \ + -I$(srcdir) \ +--I$(srcdir)/amd \ + -I$(srcdir)/api \ + -I$(srcdir)/bflib \ + -I$(srcdir)/cglib \ +--I$(srcdir)/colamd \ + -I$(srcdir)/env \ + -I$(srcdir)/minisat \ + -I$(srcdir)/misc \ + -I$(srcdir)/mpl \ + -I$(srcdir)/proxy \ +--I$(srcdir)/simplex \ +--I$(srcdir)/zlib ++-I$(srcdir)/simplex + + libglpk_la_LDFLAGS = \ + -version-info 42:2:2 \ +@@ -57,18 +54,6 @@ + glpssx01.c \ + glpssx02.c \ + lux.c \ +-amd/amd_1.c \ +-amd/amd_2.c \ +-amd/amd_aat.c \ +-amd/amd_control.c \ +-amd/amd_defaults.c \ +-amd/amd_dump.c \ +-amd/amd_info.c \ +-amd/amd_order.c \ +-amd/amd_post_tree.c \ +-amd/amd_postorder.c \ +-amd/amd_preprocess.c \ +-amd/amd_valid.c \ + api/advbas.c \ + api/asnhall.c \ + api/asnlp.c \ +@@ -142,7 +127,6 @@ + cglib/gmigen.c \ + cglib/mirgen.c \ + cglib/spv.c \ +-colamd/colamd.c \ + env/alloc.c \ + env/dlsup.c \ + env/env.c \ +@@ -196,21 +180,6 @@ + simplex/spxprob.c \ + simplex/spychuzc.c \ + simplex/spychuzr.c \ +-simplex/spydual.c \ +-zlib/adler32.c \ +-zlib/compress.c \ +-zlib/crc32.c \ +-zlib/deflate.c \ +-zlib/gzclose.c \ +-zlib/gzlib.c \ +-zlib/gzread.c \ +-zlib/gzwrite.c \ +-zlib/inffast.c \ +-zlib/inflate.c \ +-zlib/i
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 62b0f3d1c0d42d8af4b1d95eb41fd2d216529042 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jul 1 09:48:41 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jul 1 09:48:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62b0f3d1 sci-mathematics/glpk: ia64 keyworded, bug #575366 Package-Manager: Portage-2.3.6, Repoman-2.3.2 sci-mathematics/glpk/glpk-4.61-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.61-r1.ebuild b/sci-mathematics/glpk/glpk-4.61-r1.ebuild index 5b8ec992692..dfc1dfe7f6c 100644 --- a/sci-mathematics/glpk/glpk-4.61-r1.ebuild +++ b/sci-mathematics/glpk/glpk-4.61-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: cc32f416118fe724ed1c3c8a8add70cde3341c16 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jul 1 09:39:31 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jul 1 09:39:31 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc32f416 sci-mathematics/glpk: ia64 keyworded, bug #575366 Package-Manager: Portage-2.3.6, Repoman-2.3.2 sci-mathematics/glpk/glpk-4.60.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/glpk/glpk-4.60.ebuild b/sci-mathematics/glpk/glpk-4.60.ebuild index d015207ec49..e860582c03f 100644 --- a/sci-mathematics/glpk/glpk-4.60.ebuild +++ b/sci-mathematics/glpk/glpk-4.60.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 7991f7474c829755bfb2dddb00d1330305be3425 Author: Alexis Ballier gentoo org> AuthorDate: Thu Jun 22 11:09:55 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Jun 22 11:47:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7991f747 sci-mathematics/glpk: keyword ~arm64 Package-Manager: Portage-2.3.6, Repoman-2.3.2 sci-mathematics/glpk/glpk-4.61-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/glpk/glpk-4.61-r1.ebuild b/sci-mathematics/glpk/glpk-4.61-r1.ebuild index 0c701874fe5..5b8ec992692 100644 --- a/sci-mathematics/glpk/glpk-4.61-r1.ebuild +++ b/sci-mathematics/glpk/glpk-4.61-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/40" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 6a352873fc006562c910e46bb16b81e186b5b341 Author: Sébastien Fabbro gentoo org> AuthorDate: Tue Mar 7 00:20:35 2017 + Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Mar 7 00:20:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a352873 sci-mathematics/glpk: reverting, got tricked by git foo Package-Manager: Portage-2.3.4, Repoman-2.3.2 sci-mathematics/glpk/glpk-4.61-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/glpk/glpk-4.61-r1.ebuild b/sci-mathematics/glpk/glpk-4.61-r1.ebuild index 7861c425102..0c701874fe5 100644 --- a/sci-mathematics/glpk/glpk-4.61-r1.ebuild +++ b/sci-mathematics/glpk/glpk-4.61-r1.ebuild @@ -44,8 +44,8 @@ src_configure() { myconf="--disable-dl" fi - econf ${myconf} -\ $(use_enable mysql) \ + econf ${myconf} \ + $(use_enable mysql) \ $(use_enable odbc) \ $(use_enable static-libs static) \ $(use_with gmp)
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 56f9cee6550b82754fffbb0f66d6b29ae065ebda Author: Sébastien Fabbro gentoo org> AuthorDate: Mon Mar 6 23:45:08 2017 + Commit: Sebastien Fabbro gentoo org> CommitDate: Tue Mar 7 00:17:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f9cee6 sci-mathematics/glpk: re-revert Package-Manager: Portage-2.3.4, Repoman-2.3.2 sci-mathematics/glpk/glpk-4.61-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/glpk/glpk-4.61-r1.ebuild b/sci-mathematics/glpk/glpk-4.61-r1.ebuild index 0c701874fe5..7861c425102 100644 --- a/sci-mathematics/glpk/glpk-4.61-r1.ebuild +++ b/sci-mathematics/glpk/glpk-4.61-r1.ebuild @@ -44,8 +44,8 @@ src_configure() { myconf="--disable-dl" fi - econf ${myconf} \ - $(use_enable mysql) \ + econf ${myconf} +\ $(use_enable mysql) \ $(use_enable odbc) \ $(use_enable static-libs static) \ $(use_with gmp)
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: d08d63e2f21ab105b32edd6858ecf2d69d1d6d8c Author: Robin H. Johnson gentoo org> AuthorDate: Mon Mar 6 18:14:35 2017 + Commit: Robin H. Johnson gentoo org> CommitDate: Mon Mar 6 18:15:04 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d08d63e2 sci-mathematics/glpk: fix configure typo per bug #611694, revbump to apply to users Package-Manager: portage-2.3.3 Signed-off-by: Robin H. Johnson gentoo.org> sci-mathematics/glpk/{glpk-4.61.ebuild => glpk-4.61-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-mathematics/glpk/glpk-4.61.ebuild b/sci-mathematics/glpk/glpk-4.61-r1.ebuild similarity index 96% rename from sci-mathematics/glpk/glpk-4.61.ebuild rename to sci-mathematics/glpk/glpk-4.61-r1.ebuild index 7861c425102..0c701874fe5 100644 --- a/sci-mathematics/glpk/glpk-4.61.ebuild +++ b/sci-mathematics/glpk/glpk-4.61-r1.ebuild @@ -44,8 +44,8 @@ src_configure() { myconf="--disable-dl" fi - econf ${myconf} -\ $(use_enable mysql) \ + econf ${myconf} \ + $(use_enable mysql) \ $(use_enable odbc) \ $(use_enable static-libs static) \ $(use_with gmp)
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: 79e3b551a94804ca0e6f2a046a39ed20a9f1e3d7 Author: Sébastien Fabbro gentoo org> AuthorDate: Sat Mar 4 00:09:47 2017 + Commit: Sebastien Fabbro gentoo org> CommitDate: Sat Mar 4 00:10:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e3b551 sci-mathematics/glpk: version bump Package-Manager: Portage-2.3.4, Repoman-2.3.2 sci-mathematics/glpk/Manifest | 1 + sci-mathematics/glpk/glpk-4.61.ebuild | 62 +++ 2 files changed, 63 insertions(+) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index 01f8b293921..4cd6181920b 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -4,3 +4,4 @@ DIST glpk-4.54.tar.gz 3098202 SHA256 ab72c8078402d34d176eda18c3f9a6ef006e223d530 DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5dc48a38b13d620bf2b1de7 SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689 WHIRLPOOL 4b3f543c862008dd09e867947c0383eb2f482f63b8fe30d9f682ccc7d0af1693af043c8cd63362be1bc736ef39393d59cdf0196326b08c7f48495bb5b5937487 DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62 DIST glpk-4.60.tar.gz 4160915 SHA256 1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a WHIRLPOOL dfde976f9a32ba1751d1a0748c21023e0df802a1f22501c70091cbfb273bde8b73951eceb2a0768bc5634d6786c1cdb109e36af78e72ac7825fa9743737721f4 +DIST glpk-4.61.tar.gz 4116291 SHA256 9866de4182d4ce21da11b88573b66bb7858574f89c28be6967ac22dfaba9 SHA512 0bcf89b62a2b3f565356b7ae538c5af6f3b4283234827c4212284d4924ce93980f6971f51313f1c08790e23e860771545dc58fdb8b35405d37404589683f40a1 WHIRLPOOL 01228c555ba7d17668a35a80bdf37dba00a1a105291288aa5ebef43c3ea3999e81042e0f98b5bfbfd7d44804a79014281120aaf10ca181be1b0615b97925407c diff --git a/sci-mathematics/glpk/glpk-4.61.ebuild b/sci-mathematics/glpk/glpk-4.61.ebuild new file mode 100644 index 000..7861c425102 --- /dev/null +++ b/sci-mathematics/glpk/glpk-4.61.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="GNU Linear Programming Kit" +LICENSE="GPL-3" +HOMEPAGE="https://www.gnu.org/software/glpk/"; +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +SLOT="0/40" +IUSE="doc examples gmp odbc mysql static-libs" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" + +RDEPEND=" + sci-libs/amd:0= + sci-libs/colamd:= + sys-libs/zlib:0= + gmp? ( dev-libs/gmp:0= ) + mysql? ( virtual/mysql ) + odbc? ( || ( dev-db/libiodbc:0 dev-db/unixODBC:0 ) )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-4.60-debundle-system-libs.patch +) + +src_prepare() { + use odbc && [[ -z $(type -P odbc_config) ]] && \ + append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc) + + default + eautoreconf +} + +src_configure() { + local myconf + if use mysql || use odbc; then + myconf="--enable-dl" + else + myconf="--disable-dl" + fi + + econf ${myconf} +\ $(use_enable mysql) \ + $(use_enable odbc) \ + $(use_enable static-libs static) \ + $(use_with gmp) +} + +src_install() { + default + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples + docompress -x /usr/share/doc/${PF}/examples + fi + use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt +}
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/files/
commit: c8e9d2336ab0cd6dd0fc18d3f9f4b17375070528 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Wed Feb 1 18:41:11 2017 + Commit: David Seifert gentoo org> CommitDate: Wed Feb 1 22:39:09 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8e9d233 sci-mathematics/glpk: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/3764 .../files/glpk-4.53-debundle-system-libs.patch | 87 -- 1 file changed, 87 deletions(-) diff --git a/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch deleted file mode 100644 index 326e613.. --- a/sci-mathematics/glpk/files/glpk-4.53-debundle-system-libs.patch +++ /dev/null @@ -1,87 +0,0 @@ -Remove suitesparse (camd,colamd) and zlib bundles - configure.ac.orig 2014-03-24 10:40:24.406906149 -0700 -+++ configure.ac 2014-03-24 10:41:15.637207696 -0700 -@@ -140,6 +140,13 @@ -AC_MSG_RESULT([no]) - fi - -+AC_CHECK_LIB([amd], [amd_1]) -+AC_CHECK_LIB([colamd], [colamd]) -+ -+AC_CHECK_HEADER([amd.h]) -+ -+AC_CHECK_LIB([z], [gzopen]) -+ - AC_CONFIG_FILES( -[src/Makefile examples/Makefile Makefile]) - AC_OUTPUT src/Makefile.am.orig 2014-03-24 10:40:24.413906191 -0700 -+++ src/Makefile.am2014-03-24 10:41:15.636207690 -0700 -@@ -6,15 +6,12 @@ - - libglpk_la_CPPFLAGS = \ - -I$(srcdir) \ ---I$(srcdir)/amd \ - -I$(srcdir)/bflib \ - -I$(srcdir)/cglib \ ---I$(srcdir)/colamd \ - -I$(srcdir)/env \ - -I$(srcdir)/minisat \ - -I$(srcdir)/misc \ ---I$(srcdir)/proxy \ ---I$(srcdir)/zlib -+-I$(srcdir)/proxy - - libglpk_la_LDFLAGS = \ - -version-info 37:0:1 \ -@@ -93,18 +90,6 @@ - glpssx02.c \ - glptsp.c \ - lux.c \ --amd/amd_1.c \ --amd/amd_2.c \ --amd/amd_aat.c \ --amd/amd_control.c \ --amd/amd_defaults.c \ --amd/amd_dump.c \ --amd/amd_info.c \ --amd/amd_order.c \ --amd/amd_post_tree.c \ --amd/amd_postorder.c \ --amd/amd_preprocess.c \ --amd/amd_valid.c \ - bflib/fhv.c \ - bflib/fhvint.c \ - bflib/ifu.c \ -@@ -114,7 +99,6 @@ - bflib/sva.c \ - cglib/cfg.c \ - cglib/cfg1.c \ --colamd/colamd.c \ - env/alloc.c \ - env/dlsup.c \ - env/env.c \ -@@ -147,21 +131,6 @@ - misc/wclique.c \ - misc/wclique1.c \ - proxy/proxy.c \ --proxy/proxy1.c \ --zlib/adler32.c \ --zlib/compress.c \ --zlib/crc32.c \ --zlib/deflate.c \ --zlib/gzclose.c \ --zlib/gzlib.c \ --zlib/gzread.c \ --zlib/gzwrite.c \ --zlib/inffast.c \ --zlib/inflate.c \ --zlib/inftrees.c \ --zlib/trees.c \ --zlib/uncompr.c \ --zlib/zio.c \ --zlib/zutil.c -+proxy/proxy1.c - - ## eof ##
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/, sci-mathematics/glpk/files/
commit: 73177f3314cad1552a6e971bffba67f1e4cfb416 Author: Sébastien Fabbro gentoo org> AuthorDate: Mon Dec 12 04:28:11 2016 + Commit: Sebastien Fabbro gentoo org> CommitDate: Mon Dec 12 06:22:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73177f33 sci-mathematics/glpk: version bump to 4.60 Adapted patch to debundle zlib and suitesparse Package-Manager: portage-2.3.3 sci-mathematics/glpk/Manifest | 1 + .../files/glpk-4.60-debundle-system-libs.patch | 92 ++ sci-mathematics/glpk/glpk-4.60.ebuild | 62 +++ 3 files changed, 155 insertions(+) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index 3695385..01f8b29 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -3,3 +3,4 @@ DIST glpk-4.48.tar.gz 3488482 SHA256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec DIST glpk-4.54.tar.gz 3098202 SHA256 ab72c8078402d34d176eda18c3f9a6ef006e223d530897a4d1d73fb4ad12f9a1 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070 WHIRLPOOL 56ff0baf5e98fdc8e12e4d4db664a4a287dc358dd75839d90d463c04e3e7d97b1023ea93217dd642f6737cccddecdb8f534980e48f8893aff395dc430622de69 DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5dc48a38b13d620bf2b1de7 SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689 WHIRLPOOL 4b3f543c862008dd09e867947c0383eb2f482f63b8fe30d9f682ccc7d0af1693af043c8cd63362be1bc736ef39393d59cdf0196326b08c7f48495bb5b5937487 DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62 +DIST glpk-4.60.tar.gz 4160915 SHA256 1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297 SHA512 521bc48c588318fe6075eb66b1c43465200039f64b105b4a24f9f6eb9bb4742c7ebc96750ce999f64c60d6531486476386467dd41e949f1a00cba0cf00fbe20a WHIRLPOOL dfde976f9a32ba1751d1a0748c21023e0df802a1f22501c70091cbfb273bde8b73951eceb2a0768bc5634d6786c1cdb109e36af78e72ac7825fa9743737721f4 diff --git a/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch new file mode 100644 index ..8790de5 --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.60-debundle-system-libs.patch @@ -0,0 +1,92 @@ +Remove suitesparse (camd,colamd) and zlib bundles +bicatali - apr 2014 +Updated for 4.57 by soap (Jan 2016) +Updated for 4.60 by bicatali (Dec 2016) + +--- glpk-4.60/configure.ac glpk-4.60/configure.ac +@@ -59,6 +59,11 @@ + dnl Check for math library + AC_CHECK_LIB([m], [exp]) + ++AC_CHECK_LIB([amd], [amd_1]) ++AC_CHECK_LIB([colamd], [colamd]) ++AC_CHECK_HEADER([amd.h]) ++AC_CHECK_LIB([z], [gzopen]) ++ + dnl Check for header + AC_CHECK_HEADER([sys/time.h], +AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A])) + +--- glpk-4.60/src/Makefile.am glpk-4.60/src/Makefile.am +@@ -6,18 +6,15 @@ + + libglpk_la_CPPFLAGS = \ + -I$(srcdir) \ +--I$(srcdir)/amd \ + -I$(srcdir)/api \ + -I$(srcdir)/bflib \ + -I$(srcdir)/cglib \ +--I$(srcdir)/colamd \ + -I$(srcdir)/env \ + -I$(srcdir)/minisat \ + -I$(srcdir)/misc \ + -I$(srcdir)/mpl \ + -I$(srcdir)/proxy \ +--I$(srcdir)/simplex \ +--I$(srcdir)/zlib ++-I$(srcdir)/simplex + + libglpk_la_LDFLAGS = \ + -version-info 41:0:1 \ +@@ -63,18 +60,6 @@ + glpssx02.c \ + lux.c \ + spv.c \ +-amd/amd_1.c \ +-amd/amd_2.c \ +-amd/amd_aat.c \ +-amd/amd_control.c \ +-amd/amd_defaults.c \ +-amd/amd_dump.c \ +-amd/amd_info.c \ +-amd/amd_order.c \ +-amd/amd_post_tree.c \ +-amd/amd_postorder.c \ +-amd/amd_preprocess.c \ +-amd/amd_valid.c \ + api/advbas.c \ + api/asnhall.c \ + api/asnlp.c \ +@@ -142,7 +127,6 @@ + cglib/gmicut.c \ + cglib/gmigen.c \ + cglib/mirgen.c \ +-colamd/colamd.c \ + env/alloc.c \ + env/dlsup.c \ + env/env.c \ +@@ -195,21 +179,6 @@ + simplex/spxprob.c \ + simplex/spychuzc.c \ + simplex/spychuzr.c \ +-simplex/spydual.c \ +-zlib/adler32.c \ +-zlib/compress.c \ +-zlib/crc32.c \ +-zlib/deflate.c \ +-zlib/gzclose.c \ +-zlib/gzlib.c \ +-zlib/gzread.c \ +-zlib/gzwrite.c \ +-zlib/inffast.c \ +-zlib/inflate.c \ +-zlib/inftrees.c \ +-zlib/trees.c \ +-zlib/uncompr.c \ +-zlib/zio.c \ +-zlib/zutil.c ++simplex/spydual.c + + ## eof ## diff --git a/sci-mathematics/glpk/glpk-4.60.ebuild b/sci-mathematics/glpk/glpk-4.60.ebuild new file mode 100644 index ..23b3767 --- /dev/null +++ b/sci-mathematics/glpk/glpk-4.60.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/
commit: aa8936a1db4cafe2a30b782a327bc12658f8d52c Author: Fabian Groffen gentoo org> AuthorDate: Sat Jan 23 11:05:13 2016 + Commit: Fabian Groffen gentoo org> CommitDate: Sat Jan 23 11:05:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa8936a1 sci-mathematics/glpk: drop prefix keywords which don't have the new deps, bug #511446 Package-Manager: portage-2.2.26 sci-mathematics/glpk/glpk-4.54.ebuild | 2 +- sci-mathematics/glpk/glpk-4.55.ebuild | 2 +- sci-mathematics/glpk/glpk-4.57.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sci-mathematics/glpk/glpk-4.54.ebuild b/sci-mathematics/glpk/glpk-4.54.ebuild index 919ff47..22a6f14 100644 --- a/sci-mathematics/glpk/glpk-4.54.ebuild +++ b/sci-mathematics/glpk/glpk-4.54.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/36" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" RDEPEND=" sci-libs/amd:0= diff --git a/sci-mathematics/glpk/glpk-4.55.ebuild b/sci-mathematics/glpk/glpk-4.55.ebuild index 919ff47..22a6f14 100644 --- a/sci-mathematics/glpk/glpk-4.55.ebuild +++ b/sci-mathematics/glpk/glpk-4.55.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/36" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" RDEPEND=" sci-libs/amd:0= diff --git a/sci-mathematics/glpk/glpk-4.57.ebuild b/sci-mathematics/glpk/glpk-4.57.ebuild index 0ac5698..fc4451f 100644 --- a/sci-mathematics/glpk/glpk-4.57.ebuild +++ b/sci-mathematics/glpk/glpk-4.57.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/36" IUSE="doc examples gmp odbc mysql static-libs" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" RDEPEND=" sci-libs/amd:0=
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/glpk/files/, sci-mathematics/glpk/
commit: f23b73c589538413c79a28dbca7340c91c0380e5 Author: David Seifert gentoo org> AuthorDate: Thu Jan 14 19:30:55 2016 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 14 19:31:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23b73c5 sci-mathematics/glpk: Version bump to 4.57 Gentoo-Bug: 562018 In addition, modernize to EAPI=6 and amend patch. Package-Manager: portage-2.2.26 sci-mathematics/glpk/Manifest | 1 + .../files/glpk-4.57-debundle-system-libs.patch | 88 ++ sci-mathematics/glpk/glpk-4.57.ebuild | 62 +++ 3 files changed, 151 insertions(+) diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest index 0a4f763..3695385 100644 --- a/sci-mathematics/glpk/Manifest +++ b/sci-mathematics/glpk/Manifest @@ -2,3 +2,4 @@ DIST glpk-4.45.tar.gz 3132439 SHA256 9207cb613d4436d9a66bc1b1f2018176d106cef0e92 DIST glpk-4.48.tar.gz 3488482 SHA256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec3f3e86c5b71c79ac6adb1 SHA512 16795e6cf4db302f25e06e5c9a660e5ed8c7b24ffc5126cde0f864e83fa77d4d61838eab4f716291d568963dddf7442a36a39425a62bd58bd00ca73dac4ffa70 WHIRLPOOL c3e826d08cc6033e8553d7d1fb2a556d42622f38a184e8bbc18bf29d872103245218482b749bfb214cf707cc60eaaf54d7e6840537b483cf8e63c2d33b2c313d DIST glpk-4.54.tar.gz 3098202 SHA256 ab72c8078402d34d176eda18c3f9a6ef006e223d530897a4d1d73fb4ad12f9a1 SHA512 7eb815a6d8416dd9f2bb94e9a4aef493c171898404ebc6276fcc1c4f3b4244220213a2bd098707104589348080820a7cb8a717aab73ca513f05b2f9a10aea070 WHIRLPOOL 56ff0baf5e98fdc8e12e4d4db664a4a287dc358dd75839d90d463c04e3e7d97b1023ea93217dd642f6737cccddecdb8f534980e48f8893aff395dc430622de69 DIST glpk-4.55.tar.gz 3424345 SHA256 37090d7f16796ec1034496e182a39d5cc8bb7c9fb5dc48a38b13d620bf2b1de7 SHA512 a0c8ce0c850e0075098f0526db8f7584a86d5cb44d8ddefa55abf9f1f66af89f5aec19cf1cad51fc5585d8dfa50eab6ece984a038e00c472aec2ef1473eac689 WHIRLPOOL 4b3f543c862008dd09e867947c0383eb2f482f63b8fe30d9f682ccc7d0af1693af043c8cd63362be1bc736ef39393d59cdf0196326b08c7f48495bb5b5937487 +DIST glpk-4.57.tar.gz 3782998 SHA256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c SHA512 1979e59b96ce359168a81b720207045916f66c5755023b02c2e197e5a713d456165d94f1e40830547dc072de865f94e3b3a4d8e66d5d15aeb93f304f1893fe48 WHIRLPOOL 225760810ae9efbff31d0238dff08d966db5167e9b61a79f960d03b6d6bdaa2ed7d9b1e7608a99418d5346d3e8ddbe8b58f0d561aaacb292decf235b821fbc62 diff --git a/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch b/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch new file mode 100644 index 000..d9efff2 --- /dev/null +++ b/sci-mathematics/glpk/files/glpk-4.57-debundle-system-libs.patch @@ -0,0 +1,88 @@ +Remove suitesparse (camd,colamd) and zlib bundles +bicatali - apr 2014 +Updated for 4.57 by soap (Jan 2016) + +--- glpk-4.57/configure.ac glpk-4.57/configure.ac +@@ -59,6 +59,11 @@ + dnl Check for math library + AC_CHECK_LIB([m], [exp]) + ++AC_CHECK_LIB([amd], [amd_1]) ++AC_CHECK_LIB([colamd], [colamd]) ++AC_CHECK_HEADER([amd.h]) ++AC_CHECK_LIB([z], [gzopen]) ++ + dnl Check for header + AC_CHECK_HEADER([sys/time.h], +AC_DEFINE([HAVE_SYS_TIME_H], [1], [N/A])) +--- glpk-4.57/src/Makefile.am glpk-4.57/src/Makefile.am +@@ -6,16 +6,13 @@ + + libglpk_la_CPPFLAGS = \ + -I$(srcdir) \ +--I$(srcdir)/amd \ + -I$(srcdir)/bflib \ + -I$(srcdir)/cglib \ +--I$(srcdir)/colamd \ + -I$(srcdir)/env \ + -I$(srcdir)/minisat \ + -I$(srcdir)/misc \ + -I$(srcdir)/proxy \ +--I$(srcdir)/simplex \ +--I$(srcdir)/zlib ++-I$(srcdir)/simplex + + libglpk_la_LDFLAGS = \ + -version-info 38:0:2 \ +@@ -90,18 +87,6 @@ + glpssx01.c \ + glpssx02.c \ + lux.c \ +-amd/amd_1.c \ +-amd/amd_2.c \ +-amd/amd_aat.c \ +-amd/amd_control.c \ +-amd/amd_defaults.c \ +-amd/amd_dump.c \ +-amd/amd_info.c \ +-amd/amd_order.c \ +-amd/amd_post_tree.c \ +-amd/amd_postorder.c \ +-amd/amd_preprocess.c \ +-amd/amd_valid.c \ + bflib/btf.c \ + bflib/btfint.c \ + bflib/fhv.c \ +@@ -115,7 +100,6 @@ + bflib/sva.c \ + cglib/cfg.c \ + cglib/cfg1.c \ +-colamd/colamd.c \ + env/alloc.c \ + env/dlsup.c \ + env/env.c \ +@@ -158,21 +142,6 @@ + simplex/spxprob.c \ + simplex/spychuzc.c \ + simplex/spychuzr.c \ +-simplex/spydual.c \ +-zlib/adler32.c \ +-zlib/compress.c \ +-zlib/crc32.c \ +-zlib/deflate.c \ +-zlib/gzclose.c \ +-zlib/gzlib.c \ +-zlib/gzread.c \ +-zlib/gzwrite.c \ +-zlib/inffast.c \ +-zlib/inflate.c \ +-zlib/inftrees.c \ +-zlib/trees.c \ +-zlib/uncompr.c \ +-zlib/zio.c \ +-zlib/zutil.c ++simplex/spydual.c + + ## eof ## diff --git a/sci-mathematics/glpk/glpk-4.57.ebuild b/sci-mathematics/glpk/glpk-4.57.ebuild new file mode 100644 index 000..0ac5698 --- /dev/null +++ b/sci-mathematics/glpk/glpk-4.57.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="GNU Li