gentoo auto-resync : 11:08:2022 - 14:19:56

6 files changed, 88 insertions, 22 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index aebf372056fe..ab09138c652e 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/nauty/Manifest b/sci-mathematics/nauty/Manifest
index 4efa59d87abd..601dc7f80fc4 100644
--- a/sci-mathematics/nauty/Manifest
+++ b/sci-mathematics/nauty/Manifest
@@ -1,5 +1,8 @@
 DIST nauty-includes.patch 2530 BLAKE2B 8789bc2f65b89aa3bbf27e517f1c56340f9bde089ef54aa28757c66c3954b5c54e8a09b6989ad8d57098970240dd1838baa0003766fe10c7f6c32041abf461e3 SHA512 d11f530fecb86edc9e95f0b4d91240778047c0e84d6259c80490358baf0a3eeaa112acfe1fcdb594da6c6e17855f5e21cb75c88446b8d6d9e96402be0e5e6af2
 DIST nauty27r3.tar.gz 1721200 BLAKE2B 2071f241dc531a056c678be0ec40497421440f2d5f1796ba20c1257feff426a452df592912faadca08010b29afbbc8cc0552c0517c168af3de9f3334b60d7f18 SHA512 8d6d92de8d348d3874677a55773088f4ff5b9a45fd9ed3802c9b1590072f5861946ac1d21892f4b383a9e36f6c9ac08270d021429cf36da3e5038e6a38d9fb6c
+DIST nauty27r4.tar.gz 1731562 BLAKE2B 104481e5af3333b60574a7185848832ad08b0cfeb8378e3c89ddd3f2cc87023cd701889356fa196b529ddbf19232a733fe3e694d9573adef04c2ad86baaf38e5 SHA512 2ed691bf0a6806f77cccbd95ee7687a66b6e6342493a0d65636166727cf4ea8cd887187d88a3154d911f665deb8d6f5bbaba33c8a1b740a564a1fc52bf4b4520
 DIST nauty_2.7r3+ds-1.debian.tar.xz 45520 BLAKE2B 5078ab84d1fcdbddc0f7442ebed57fb63551701295615b99f2833c300168dd7f71205fa3cc2e9ea977f52e389b67883b68e7d5d39e1698c6040913e4571fa4f9 SHA512 8618c78a7c6f1d579cb20048fcf55fb45b69d8d1cebd7f2c9aee664768ab78f0ab1930863c8475a153c9ac9f4692cf6e43f96d01c4a219eae1f23bb61cb50407
+DIST nauty_2.7r4+ds-1.debian.tar.xz 45712 BLAKE2B e4a7a1d2b70b5fa969f708bbd56b47aaf422c268be23ffa7ceb3f9cc21ff8d27270556adadd43fe60309e7840e1541a586b1d9d42d90ba6207801e170b747922 SHA512 7384e7637a875c35f6da94707576aa26a94f981a750eb80991a837fa9ae245680f11ca57cf24a9efe1164dcd386c9888270688c1b3de30d1a81b67bb7c670dd9
 EBUILD nauty-2.7.3.ebuild 1961 BLAKE2B af67f6907cc1ccf3bae706626e1d682c33b55aa0f0b85773968cf07f6d2ee5d7a3692d948f7aaf4ebfb30827c177f63db6fe2e7d0fe99165c720b555f4259645 SHA512 93691377b8e67eca41e8d80c2902f91c8182714eff9f3c4cae2e4afd03d379b71c0f710785671a35569105b6294abb8d4fcb9e57ab6c82ba06814955dd01dc66
+EBUILD nauty-2.7.4.ebuild 2320 BLAKE2B 015c98f4c476ccdb866cab3f8e651b5f1422c4c87cd62d4d0b96741e5820237b89caf744428b4191fdf29ba33a1fb2570d96fad3b684f0a3cb00e4cd663eb86f SHA512 df91230fd04016d66e3cc8cbd3236a3718fbfcf5946612068c49f5509b156d42dee0d71d708e763abdf30f9aa8169f89b53ad492b0b2229093b8439f5b9c87fa
 MISC metadata.xml 546 BLAKE2B a4224bf8078d785c2f6a90c3041db97b0dac92eca9ab9513989f899fc7b57e5a95d918a4abc7cbf2d8605107c764e32d4473cea6fa59703a0571aedf48aa5bfe SHA512 ff16cdbedc93669baa03da38ff27683c1a638390611b5c67f1be271542c1cb332e164743b3c9e8b43e89f14316970603bbe7f9130ad656257d8e0a654ce63238
diff --git a/sci-mathematics/nauty/nauty-2.7.4.ebuild b/sci-mathematics/nauty/nauty-2.7.4.ebuild
new file mode 100644
index 000000000000..d6f312ce894b
--- /dev/null
+++ b/sci-mathematics/nauty/nauty-2.7.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+MY_PV1=$(ver_rs 2 'r')
+MY_PV=$(ver_rs 1 '' $(ver_rs 2 'r'))
+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}_${MY_PV1}+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="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-27.txt )
+
+PATCHES=(
+	"${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
+)
+
+src_prepare() {
+	default
+	rm makefile || die
+
+	# The debian patch looks for <cliquer.h>, but the autotools-form of
+	# cliquer installs that header as <cliquer/cliquer.h>.
+	sed -e 's~<cliquer\.h>~<cliquer/cliquer\.h>~' -i nautycliquer.h || die
+
+	# The debian autotools patch has only a placeholder in LT_INIT for
+	# the version that we must provide.
+	sed -e "s/@INJECTVER@/${PV}/" -i configure.ac || die
+
+	# This is not great, since consumers should expect to see the
+	# upstream versioning scheme in e.g. PKG_CHECK_MODULES. However, the
+	# upstream version is next to impossible to use for comparisons, so
+	# at least this fixes the QA warning and makes the pkg-config
+	# version useful on Gentoo?
+	sed -e "s/^Version:.*/Version: ${PV}/" -i nauty.pc.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# Fedora has a patch to enable popcnt at runtime on CPUs that support it,
+	# but their patch isn't applying cleanly. What's worse, the patch doesn't
+	# support clang (bug 732020).
+	econf --disable-static \
+		  --disable-popcnt \
+		  --enable-tls \
+		  --enable-generic
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc nautyex*.c
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-mathematics/planarity/Manifest b/sci-mathematics/planarity/Manifest
index c9b7be6c6acc..e98843e9284b 100644
--- a/sci-mathematics/planarity/Manifest
+++ b/sci-mathematics/planarity/Manifest
@@ -1,5 +1,3 @@
-DIST planarity-3.0.1.1.tar.gz 456236 BLAKE2B 60040c8e205dbd9eb67667c6554836a9545bab74ccfb51e319edb191425f1b74403916e7887d06cb2d570eb17694338819ee5fd9828d6636ebecbade8915cdfa SHA512 50d2b6905d20252a6d482aae15984673972508540416a3e9396ff67923bf3bfb5668ef00309d42e540e5c8dd3ac4636ef54da2e5ee334075e87d2f3af6488035
 DIST planarity-3.0.2.0.tar.gz 462194 BLAKE2B 7927b04cb7c9839637fe13228da50cee581ef7fd7fdaaa9ff2dc62348ba10c7f42ba88a75801034fedc973cf86fca6396ba2fb0b1f71407d850b73b8a9fc4fd0 SHA512 dbbc97cd9cf0a5497fbca76f3b0741d3bcfca110c7022150750e73179a0a0441428c854479831395b8f6340d0554b1c0e7cf7eaa63f7fe40d2a59365488c7013
-EBUILD planarity-3.0.1.1.ebuild 495 BLAKE2B 5d6efacc1d86e54c2654d652215e1316fb38c3a26815c8263062d59c9c58462fdb96975136818186bf33688159a5499a7d4c8ad39573e0f2f10c9be40c96402a SHA512 1e09d7570c132e2bc3c9afef16cbcda9eac31d24f41c389580d741dc4212055c509db617f2028fdabdbda18af75c34ba13927ff19d865e8bf3755843ef7b3580
-EBUILD planarity-3.0.2.0.ebuild 505 BLAKE2B 8c6e8b4d24d4a7209a3c08bc9027bd2652df4c450166a4afb4511610433fffa69d5d70ff0890514a896c42df9860d2e71ce76c8d907b93a972a39d340523779d SHA512 4fd94b0d971c2cf0c4373713a3b1a27201938b561542c7ace17b5dbef55c87952af3ae273584096fd33d8ef8a4efe6bd04cd2f9bd7faff739351d67e6dc3b284
+EBUILD planarity-3.0.2.0.ebuild 503 BLAKE2B 1af02f1e899c4b275f7f87c8c14e922768dee30ca062b8f7ec2c5377feec5f0ead2b71fcb3427b673404b844845cf010b0e0a19f5cd3b871f9a7a899183f50dc SHA512 96466aa877988ee4087292c2218a80f3af1128db9f19b03e479287fb834c3e9ea1ab3249bfbe76c7e4bc63c20ae41062582afcd558d209d37a29a1cd027488cc
 MISC metadata.xml 809 BLAKE2B 6c3ad8e9bbbc3cfbd8c18183051153054b2ab7f4dd94e69c8f4f98a955001330d1e51e6b1da7f98a7ce29f7920b7a55a31624828a5aeaf7831ace0b4cf5dbec0 SHA512 5aa885d48f2d4626ed54a67abcc068186189e726ddb68bc889b6dc7d9aa09da30dbf7bb284020503d70bc94a25b5e16c907fe992862c2c2a6c344e2977e57f25
diff --git a/sci-mathematics/planarity/planarity-3.0.1.1.ebuild b/sci-mathematics/planarity/planarity-3.0.1.1.ebuild
deleted file mode 100644
index a043769c34af..000000000000
--- a/sci-mathematics/planarity/planarity-3.0.1.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The edge addition planarity suite of graph algorithms"
-HOMEPAGE="https://github.com/graph-algorithms/edge-addition-planarity-suite/"
-
-SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
index be7ad0f4831b..1c8db97eb865 100644
--- a/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
+++ b/sci-mathematics/planarity/planarity-3.0.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/graph-algorithms/edge-addition-planarity-suite/relea
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_install() {
 	default