gentoo auto-resync : 18:01:2023 - 05:56:19

3 files changed, 148 insertions, 2 deletions

diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index f6ecb6fd554b..258266665bd5 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -1,8 +1,9 @@
+AUX nauty-2.8.6-gentreeg-gentourng.patch 3005 BLAKE2B be0473d69c5be8ed74ed4291fd8307d5a3e347506aeea3293c3b9f10ce9484b76ec2db151fed2d035e81b47e95642afd281210a8d180bf1ca3f4bec761b6c93a SHA512 7d1da82d956a73f72a3f4b198537734734332ea9152d0b006c53cd84f9469179b705fb5c2da73c677beb7a4405403022e084f2118eac76beff0a8fa994f33ad7
 DIST nauty-includes.patch 2530 BLAKE2B 8789bc2f65b89aa3bbf27e517f1c56340f9bde089ef54aa28757c66c3954b5c54e8a09b6989ad8d57098970240dd1838baa0003766fe10c7f6c32041abf461e3 SHA512 d11f530fecb86edc9e95f0b4d91240778047c0e84d6259c80490358baf0a3eeaa112acfe1fcdb594da6c6e17855f5e21cb75c88446b8d6d9e96402be0e5e6af2
 DIST nauty27r4.tar.gz 1731562 BLAKE2B 104481e5af3333b60574a7185848832ad08b0cfeb8378e3c89ddd3f2cc87023cd701889356fa196b529ddbf19232a733fe3e694d9573adef04c2ad86baaf38e5 SHA512 2ed691bf0a6806f77cccbd95ee7687a66b6e6342493a0d65636166727cf4ea8cd887187d88a3154d911f665deb8d6f5bbaba33c8a1b740a564a1fc52bf4b4520
 DIST nauty2_8_6.tar.gz 1546765 BLAKE2B be8aa8ef816c8833a79876e6bf99b0dc4a23922f48684c8a3272c01b0b4eb64959366cae363fbda4200354a0833942b64e85c009fc35a3d6fa02f9b74c9b9a74 SHA512 9bc597d4341a6a67aece0ad95ecd4a649f675def73e97af1d215cf7399cbd3fb8e39f140cbd6f69740f2083c7a5739d5089e746bb3f831250709e0d2b43548b5
 DIST nauty_2.7r4+ds-1.debian.tar.xz 45712 BLAKE2B e4a7a1d2b70b5fa969f708bbd56b47aaf422c268be23ffa7ceb3f9cc21ff8d27270556adadd43fe60309e7840e1541a586b1d9d42d90ba6207801e170b747922 SHA512 7384e7637a875c35f6da94707576aa26a94f981a750eb80991a837fa9ae245680f11ca57cf24a9efe1164dcd386c9888270688c1b3de30d1a81b67bb7c670dd9
 DIST nauty_2.8.6+ds-1.debian.tar.xz 62852 BLAKE2B fcbbed54b10d9dd4bdf82d8a72ef91866a235c7679266b8f395e2fe6b44a679e98f85462a42037094d856130d5456d9989749c416932f895bc17df8ef32241a2 SHA512 3784e0ec15c64ea6850f9198c61af3924fcedf1ffa4715fbd53a9bd1cd7defd69b543a8d4e6d46ef727918661409e2de77c89c3ca79f36769c1335b30bdd305c
 EBUILD nauty-2.7.4.ebuild 2318 BLAKE2B 2dd9d949fd6ce32e77c66b7fe8dbe1cf09c01d554a5293843550921b2266eafdff5b95112850ef1860971d0530c719c27ced2dd425651150ed7e7cd6cd174b03 SHA512 505a7dc984b7f49fcc033a32fea185cffebc99bc66eebde505980810cb9516228eedbc68cd98187355bbaa829c74bfba4dc503ce8bcdf1a4cbd84d93f8250875
-EBUILD nauty-2.8.6.ebuild 1765 BLAKE2B f0714a8d49c9bb96dff10e008b7312e3d4f7476de7bbb85f3d206d3da4cb515f4898093e73c3502feac653a13bc0bf4c00b37de83e3df46de5c9dfa3c5692822 SHA512 cc68bdbb9f13c2ddd1ca707ab949e920607bd855a192cfc929962d2f9c82f252572f23534c8375b6e84b102e44bb233ce8e2c386c824f4eb777c25a5664d1cec
+EBUILD nauty-2.8.6-r1.ebuild 1810 BLAKE2B 30eaf1e9f64b5b3b83fa7bf57b85754b09b8a0419c9511ad53ee950c19c6787c613f5482c3beab3c5c47c9545bcd0bd9bbb552b2e077c518ed627afd785d7ba9 SHA512 8a56e3dd400ab44bcd4313aa02e3590cf19a593a1aa10d6d3e229ba12a208f4759868251159a929fe2db1210dd1146838fe65a1f3496329d4caa4bc2fc24c994
 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
new file mode 100644
index 000000000000..322b25326ee0
--- /dev/null
+++ b/sci-mathematics/nauty/files/nauty-2.8.6-gentreeg-gentourng.patch
@@ -0,0 +1,144 @@
+From edb0474a4db8e69f971e4eebe18716309f5a7bb3 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+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.ebuild b/sci-mathematics/nauty/nauty-2.8.6-r1.ebuild
index 4fc0728515d0..60c6882b1049 100644
--- a/sci-mathematics/nauty/nauty-2.8.6.ebuild
+++ b/sci-mathematics/nauty/nauty-2.8.6-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=8
@@ -31,6 +31,7 @@ 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"