gentoo resync : 25.08.2020

4 files changed, 63 insertions, 5 deletions

diff --git a/sci-libs/bliss/Manifest b/sci-libs/bliss/Manifest
index 4ff70c136aaa..c3bfb54ed04a 100644
--- a/sci-libs/bliss/Manifest
+++ b/sci-libs/bliss/Manifest
@@ -1,7 +1,9 @@
 AUX bliss-0.73-autotools.patch 3117 BLAKE2B d74cd207311cd1f6ef5be1c5c411493542146e8ba69fe0e40392458f758eec84411eedbe075ae8f3669fb4e8b6cdfb9e09db077c918db5d1b7203275d6004b05 SHA512 98333e4d97eca83776148b06e8ec41b283fa2a85a77a2c1281084a5af5efefb22ca34b9b6a11e2b9fdb71af944c6c56247291ea6721bd6d6dcf855e73116351e
+AUX bliss-0.73-clang.patch 457 BLAKE2B 2875a16231e17d6cb8079fc67ad74df69b126d626cbbd7ccf588d9e96da7fcf8e3d645af876e2311d415a37985e68c0df72aa53b5fbb5691d9dc45773e42e226 SHA512 f496b178645a34ed65dbd4829f7bd1a9aaaf7c1e91e50e2c0e8957f20c5908728ba307c2afcbf6912fac3cb927d6e9a07ba27b4bce327c6061912f6afe883402
 AUX bliss-0.73-error.patch 14317 BLAKE2B b053cf310604c57fb4a51d3c9dee8f780b7ad55d8c2b955cb033ac342f64d50aa18c064604f68206c8fce8c08f89bdb0faeb48701c8255beff1034326f93e261 SHA512 d4adcd652016d4b62e4b366cdbd5bd60f1dbaf89619e1d8d4dad6092a3dbb4e27e12aa13c1fc1f12481f144696b2e1392ecbc67dab0485959450d39013613a14
 AUX bliss-0.73-rehn.patch 1669 BLAKE2B 6e109c0bc59c0000603dd59467b989a572f502aa352a4b09cec85a608f90163175cb4babcfbc8495a246e8a3406186feeda366131c3c637a9aab93d9c698d36e SHA512 ae70ebcd3d9ef2f744e951dfb9cc2b48bee741ee7ead557a0fdfdacbd1895b015bb9a8da986fa36b084d4c92f7a28adad1df14c0814847d84c46f73cb69123b7
 AUX bliss-0.73.1.in 1482 BLAKE2B 740fc9aa59ab9ea7819a1785aa3f0609774f0b89b08ffe3276b002f0f55eb5332ffda4952a54aa91f621ec533e1cf08b734a9686ca727e528a311d209401782c SHA512 7eb1d08f9c40358ef986d8fe31d42eb90dc57879cb399f45dcf5df85eecdc6fd86208f1bf06c21a6875e5a3fb5a634d818edd75ce2ccd855910feeb22b714f4b
 DIST bliss-0.73.zip 94108 BLAKE2B 836184b31fa28db3328c21e7563366a93cf1645b02b96e185838e3c2513393b1d0a54783ca14c6d7f1a1d5055800bc3d7acde3c584e61e66c9ab93936824353b SHA512 30f505945c577d8bcb265a349f5bc9d4dcd96555fa3add285199cdd95ea2710f04409008ff06432daffab62c132e884845eae7f823191407906202862509e05d
 EBUILD bliss-0.73-r1.ebuild 1043 BLAKE2B 764f07e6857243a5d043718b3c70ee3a76809c581f514ff000ba22d6278e2561aa1f039a546d41494301fe148395ab29ced93fd9e57f58c572c975da8b9d657a SHA512 81c15201073a7151be82baeb4438f9677332c30b89f9154c55e62e4438caa8992558f307f60f068d53f216bddbf9b9fa7006d44bb1afbba29db4d7ca562b0b46
-MISC metadata.xml 377 BLAKE2B b5594a48d54d5813fff3f3fa785c528170c1892573d7e94efd0371899afbf01c357f994f8694a9d5f9d74361b15f1d560402d913ce4d2f15c425dbc86d841dbc SHA512 c1a74f1feabe9c0b1179889514cffb7bf130a483990de7d235e177e345c0d1813c09b9751a1c94ced6f9d5c19b1428a0d62ab4d2e8876502dfeb5b7f5806afbf
+EBUILD bliss-0.73-r2.ebuild 1072 BLAKE2B 33e191a48064d3a02b3626f004e2a803d998dfa21d0e1fd699d71b70756f85e1d7d43a0f4425bab89820b24657f5fee0f2fd703bcf782ead4c9fd281444cdb60 SHA512 5c059e2681445fc77f9828c508ef832d0072410c984c9962b391501744c70df8b9e4ce8c31d820071aa4279d1a45c781463a7322add743d955235bcffd0a42a0
+MISC metadata.xml 257 BLAKE2B e4f657523a349a531d465953f61a55f61c3d1262af149695624b6f601aa464e39a1bceec34b26d97804e441ac6b45e48f930006a77e60e031a3e321b8297ed4a SHA512 ac9b4b4f3ef6a190cf1465bfac8aaf69c9c7b91e2cf3876e19a0b39264accaae12e301a2059bacff7781d0fb1f40499cb2930be0cd3f7ef9cb1a40d266ad059f
diff --git a/sci-libs/bliss/bliss-0.73-r2.ebuild b/sci-libs/bliss/bliss-0.73-r2.ebuild
new file mode 100644
index 000000000000..9293ac0a67aa
--- /dev/null
+++ b/sci-libs/bliss/bliss-0.73-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+SRC_URI="http://www.tcs.hut.fi/Software/${PN}/${P}.zip"
+DESCRIPTION="Compute Automorphism Groups and Canonical Labelings of Graphs"
+HOMEPAGE="http://www.tcs.hut.fi/Software/bliss/"
+
+LICENSE="LGPL-3"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc gmp static-libs"
+
+RDEPEND="gmp? ( dev-libs/gmp:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( app-doc/doxygen )"
+
+#patches from http://pkgs.fedoraproject.org/cgit/rpms/bliss.git/tree/
+PATCHES=(
+	"${FILESDIR}"/${P}-error.patch
+	"${FILESDIR}"/${P}-rehn.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-autotools.patch
+)
+
+src_prepare() {
+	default
+	cp "${FILESDIR}/${P}.1.in" "${PN}.1.in" || die
+	rm Makefile || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with gmp) $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake all $(usex doc html "")
+}
+
+src_install() {
+	default
+	use static-libs || find "${ED}" -name '*.la' -delete
+	use doc && dodoc -r html
+}
diff --git a/sci-libs/bliss/files/bliss-0.73-clang.patch b/sci-libs/bliss/files/bliss-0.73-clang.patch
new file mode 100644
index 000000000000..8a2e4bb6ca47
--- /dev/null
+++ b/sci-libs/bliss/files/bliss-0.73-clang.patch
@@ -0,0 +1,11 @@
+--- ./bliss.cc.orig	2020-07-10 10:34:44.946000000 -0600
++++ ./bliss.cc	2020-07-10 10:35:36.076000000 -0600
+@@ -59,7 +59,7 @@
+   else program_name = argv0;  
+   if(!program_name or *program_name == 0) program_name = "bliss";
+ 
+-  fprintf(fp, "bliss version %s (compiled "__DATE__")\n", bliss::version);
++  fprintf(fp, "bliss version %s (compiled %s)\n", bliss::version, __DATE__);
+   fprintf(fp, "Copyright 2003-2015 Tommi Junttila\n");
+   fprintf(fp,
+ "\n"
diff --git a/sci-libs/bliss/metadata.xml b/sci-libs/bliss/metadata.xml
index 0668c1ada0d5..9b3cd6685a18 100644
--- a/sci-libs/bliss/metadata.xml
+++ b/sci-libs/bliss/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
 <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>