From fe48e91039d2758f30166b25a5223a0f53433e24 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Jan 2024 22:48:12 +0000 Subject: gentoo auto-resync : 22:01:2024 - 22:48:12 --- sci-mathematics/nauty/Manifest | 4 - .../files/nauty-2.8.6-gentreeg-gentourng.patch | 144 --------------------- sci-mathematics/nauty/nauty-2.8.6-r1.ebuild | 72 ----------- 3 files changed, 220 deletions(-) delete mode 100644 sci-mathematics/nauty/files/nauty-2.8.6-gentreeg-gentourng.patch delete mode 100644 sci-mathematics/nauty/nauty-2.8.6-r1.ebuild (limited to 'sci-mathematics/nauty') diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest index f106f8b5d8f4..8008e0bfe9dc 100644 --- a/sci-mathematics/nauty/Manifest +++ b/sci-mathematics/nauty/Manifest @@ -1,9 +1,5 @@ -AUX nauty-2.8.6-gentreeg-gentourng.patch 3005 BLAKE2B be0473d69c5be8ed74ed4291fd8307d5a3e347506aeea3293c3b9f10ce9484b76ec2db151fed2d035e81b47e95642afd281210a8d180bf1ca3f4bec761b6c93a SHA512 7d1da82d956a73f72a3f4b198537734734332ea9152d0b006c53cd84f9469179b705fb5c2da73c677beb7a4405403022e084f2118eac76beff0a8fa994f33ad7 DIST nauty-includes.patch 2530 BLAKE2B 8789bc2f65b89aa3bbf27e517f1c56340f9bde089ef54aa28757c66c3954b5c54e8a09b6989ad8d57098970240dd1838baa0003766fe10c7f6c32041abf461e3 SHA512 d11f530fecb86edc9e95f0b4d91240778047c0e84d6259c80490358baf0a3eeaa112acfe1fcdb594da6c6e17855f5e21cb75c88446b8d6d9e96402be0e5e6af2 -DIST nauty2_8_6.tar.gz 1546765 BLAKE2B be8aa8ef816c8833a79876e6bf99b0dc4a23922f48684c8a3272c01b0b4eb64959366cae363fbda4200354a0833942b64e85c009fc35a3d6fa02f9b74c9b9a74 SHA512 9bc597d4341a6a67aece0ad95ecd4a649f675def73e97af1d215cf7399cbd3fb8e39f140cbd6f69740f2083c7a5739d5089e746bb3f831250709e0d2b43548b5 DIST nauty2_8_8.tar.gz 2302360 BLAKE2B 4a37b345b239de11948d180f306e984dfec4aa26eb2720d0f0f09acd120a60b4f678375baa10d3f64f3e2f501c35cbfa58e10fc44252eb7b952a1592727a3b7f SHA512 c0495256b92b0742e7f0a3ad8b43f400e7b4bc4b58dff560e7d0a868f392b0462424566b8ebba5ec08499551eab091b6a8e2c0ddba4953ab7592906034812c18 -DIST nauty_2.8.6+ds-1.debian.tar.xz 62852 BLAKE2B fcbbed54b10d9dd4bdf82d8a72ef91866a235c7679266b8f395e2fe6b44a679e98f85462a42037094d856130d5456d9989749c416932f895bc17df8ef32241a2 SHA512 3784e0ec15c64ea6850f9198c61af3924fcedf1ffa4715fbd53a9bd1cd7defd69b543a8d4e6d46ef727918661409e2de77c89c3ca79f36769c1335b30bdd305c DIST nauty_2.8.8+ds-1.debian.tar.xz 65176 BLAKE2B 3615819098169caf1648271c0725e146c87ab794776c02f5bd77b7092a2c1d9b93d663ef4a9cf027fda956d40f24bb99a909f89a4564b99429b67f781d39cfc2 SHA512 f81aa3c4a142c4efa5ce97c241f95cba9916d49f02c2b3dfbd76227f2db20ec5e2a3ebe371c5748681fc3492df9ff9bca2456d76e1c70e435aa5baf1522391d5 -EBUILD nauty-2.8.6-r1.ebuild 1809 BLAKE2B 8d68bbb927ba796d1a366bd0480bf19cba44ffe942dadf25868ce2fd6bf793cd923aaca064260477f53e2f16e53c2b3b68d52afa6e1e7276045347f539849d3c SHA512 31d01361a5c594d085533338297c72b6375409ffb3f78de693bdca8088232de89f3bde12acf0f88f27b6dc5877755286f1356df35b6635c4ddc73a2d2019cce3 EBUILD nauty-2.8.8.ebuild 1955 BLAKE2B 44fdce9e00cc86fa9f2b31fbf3119ddcc29366dcd7d6e3c54b261dc185d780b3f3ca0d6ad8906e1bc260a385109b7738f990b413b9ef41513674dde6ecb1bf60 SHA512 f8c27dc70c207669eb8b9efb7caa38d7d7144e54e3fe192a8bc416469c2d904c4e22c81a808fb8400cacd1188f004467086c80b495a24e95486dbb64cd44711d MISC metadata.xml 554 BLAKE2B a6fbface4e867c9299680da9d2fefce4194771220489b4d9a81d295bbf1a8048fe1bf23e3c3225501a18b23af8a7daea3533f8a7c250afc7f9a4bbbf60fc8efd SHA512 c7b67c8516b9bad6cd9f60a54b3b3a4974a72e81071f53cd6562a5bea2e2b8ae990119e4391615dd3b2e30282bf70924c4f2f4b5ccd3dcf1cb7399e7de189387 diff --git a/sci-mathematics/nauty/files/nauty-2.8.6-gentreeg-gentourng.patch b/sci-mathematics/nauty/files/nauty-2.8.6-gentreeg-gentourng.patch deleted file mode 100644 index 322b25326ee0..000000000000 --- a/sci-mathematics/nauty/files/nauty-2.8.6-gentreeg-gentourng.patch +++ /dev/null @@ -1,144 +0,0 @@ -From edb0474a4db8e69f971e4eebe18716309f5a7bb3 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky -Date: Tue, 17 Jan 2023 19:44:49 -0500 -Subject: [PATCH 1/1] Upstream fixes for gentreeg and gentourng. - -https://mailman.anu.edu.au/pipermail/nauty/2023-January/000903.html ---- - gentourng.c | 2 +- - gentreeg.c | 95 ++++++++++++++++++++++++++++------------------------- - 2 files changed, 51 insertions(+), 46 deletions(-) - -diff --git a/gentourng.c b/gentourng.c -index 634e5e8..5c7ffff 100644 ---- a/gentourng.c -+++ b/gentourng.c -@@ -1408,7 +1408,7 @@ PLUGIN_INIT - (*outproc)(outfile,g,1); - } - } -- else -+ else if (!connec || maxn != 2) - { - makeleveldata(); - -diff --git a/gentreeg.c b/gentreeg.c -index 946d5f8..15bf87b 100644 ---- a/gentreeg.c -+++ b/gentreeg.c -@@ -1,4 +1,4 @@ --/* gentree version 1.3; Brendan McKay Oct 2022 */ -+/* gentree version 1.4; Brendan McKay Dec 2022 */ - /* This program is a wrapper for the program FreeTrees.c written - * by Gang Li & Frank Ruskey. See below for their original - * comments. */ -@@ -32,49 +32,54 @@ Counts for n=1..45: - 1: 1 - 2: 1 - 3: 1 -- 4: 1 -- 5: 2 -- 6: 3 -- 7: 6 -- 8: 11 -- 9: 23 --10: 47 --11: 106 --12: 235 --13: 551 --14: 1301 --15: 3159 --16: 7741 --17: 19320 --18: 48629 --19: 123867 --20: 317955 --21: 823065 --22: 2144505 --23: 5623756 --24: 14828074 --25: 39299897 --26: 104636890 --27: 279793450 --28: 751065460 --29: 2023443032 --30: 5469566585 --31: 14830871802 --32: 40330829030 --33: 109972410221 --34: 300628862480 --35: 823779631721 --36: 2262366343746 --37: 6226306037178 --38: 17169677490714 --39: 47436313524262 --40: 131290543779126 --41: 363990257783343 --42: 1010748076717151 --43: 2810986483493475 --44: 7828986221515605 --45: 21835027912963086 --********************************/ -+ 4: 2 -+ 5: 3 -+ 6: 6 -+ 7: 11 -+ 8: 23 -+ 9: 47 -+10: 106 -+11: 235 -+12: 551 -+13: 1301 -+14: 3159 -+15: 7741 -+16: 19320 -+17: 48629 -+18: 123867 -+19: 317955 -+20: 823065 -+21: 2144505 -+22: 5623756 -+23: 14828074 -+24: 39299897 -+25: 104636890 -+26: 279793450 -+27: 751065460 -+28: 2023443032 -+29: 5469566585 -+30: 14830871802 -+31: 40330829030 -+32: 109972410221 -+33: 300628862480 -+34: 823779631721 -+35: 2262366343746 -+36: 6226306037178 -+37: 17169677490714 -+38: 47436313524262 -+39: 131290543779126 -+40: 363990257783343 -+41: 1010748076717151 -+42: 2810986483493475 -+43: 7828986221515605 -+44: 21835027912963086 -+45: 60978390985918906 -+46: 170508699155987862 -+47: 477355090753926460 -+48: 1337946100045842285 -+49: 3754194185716399992 -+50: 10545233702911509534 -+*******************************/ - - /* Comments on original program by original authors */ - /*==============================================================*/ -@@ -676,7 +681,7 @@ PLUGIN_INIT - } - else if (nv == 2) - { -- if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 2) -+ if (res == 0 && maxdeg >= 1 && mindiam <= 1 && maxdiam >= 1) - { - par[1] = 0; - par[2] = 1; --- -2.38.2 - diff --git a/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild b/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild deleted file mode 100644 index 680f026d9f50..000000000000 --- a/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -MY_PV=${PV//./_} -DEBIAN_PATCH_VERSION=1 - -DESCRIPTION="Computing automorphism groups of graphs and digraphs" -HOMEPAGE="https://pallini.di.uniroma1.it/" - -SRC_URI="https://pallini.di.uniroma1.it/${PN}${MY_PV}.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}+ds-${DEBIAN_PATCH_VERSION}.debian.tar.xz - https://src.fedoraproject.org/rpms/nauty/raw/f35/f/nauty-includes.patch" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~riscv ~x86" -IUSE="cpu_flags_x86_popcnt examples" - -BDEPEND="sys-apps/help2man" -DEPEND="dev-libs/gmp:0 - sys-libs/zlib - sci-mathematics/cliquer" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}${MY_PV}" - -DOCS=( schreier.txt formats.txt changes24-28.txt ) - -PATCHES=( - "${FILESDIR}/${P}-gentreeg-gentourng.patch" - "${WORKDIR}/debian/patches/upstream-fix-gt_numorbits.patch" - "${WORKDIR}/debian/patches/upstream-C2help2man.patch" - "${WORKDIR}/debian/patches/upstream-autotoolization.patch" - "${DISTDIR}/nauty-includes.patch" - "${WORKDIR}/debian/patches/unbundle-cliquer.patch" - "${WORKDIR}/debian/patches/upstream-zlib-dimacs2g.patch" - "${WORKDIR}/debian/patches/fall-off.patch" - "${WORKDIR}/debian/patches/format.patch" -) - -src_prepare() { - default - rm makefile || die - - # The debian patch looks for , but the autotools-form of - # cliquer installs that header as . - sed -e 's~~~' -i nautycliquer.h || die - - eautoreconf -} - -src_configure() { - econf --disable-static \ - --enable-tls \ - --enable-generic \ - $(use_enable cpu_flags_x86_popcnt popcnt) -} - -src_install() { - default - - if use examples; then - docinto examples - dodoc nautyex*.c - fi - - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3