gentoo resync : 15.12.2019

3 files changed, 2 insertions, 72 deletions

diff --git a/sci-libs/libcerf/Manifest b/sci-libs/libcerf/Manifest
index 7a2d453e7d9c..d95496f490a4 100644
--- a/sci-libs/libcerf/Manifest
+++ b/sci-libs/libcerf/Manifest
@@ -1,4 +1,3 @@
-AUX libcerf-1.3-autotools.patch 2758 BLAKE2B 29bb371d1ce1794762df0a18b25110cd8833e96072c65d7660eac53139f6ef2ce8ea726b22faf8d26e97d9790e437acd92e7eb135014c03ee5f85d9f9b9fa4d6 SHA512 f4e99359d9ac5719138108c88f9e1b9f88e986df9e024633ca929a7f09dac826022ac1017f67af55115739d2cf0d4e0de56d751b219c3e4f620948df8cfd74fa
 DIST libcerf-1.5.tgz 413926 BLAKE2B 1208c77658625d00d37f95f5dda9e07f99c91dc6b6fede4b8f936637dddd7450fa42c0ed3c8ff4c72bca0abe0195d6ebb58fdaa8c1bd535d8a488344fcccafad SHA512 bb97a1142d26dd2507a3fabc543accd5416f5ef3565bad6ea68ca8a62e13cb480b6e05bd8fe2215ed0133f43d4107fdc72efaedfcff7ffc0314492e97a92a8a3
-EBUILD libcerf-1.5.ebuild 780 BLAKE2B f61c14a08a3995062b2e94608422daf9c21a659faafb72e30ce4928d6481a386b84aad5cc5da53f1142e118a0d41002f1c0c7b9d4e8820a2db8dbf60152b6f05 SHA512 9333bbfef8c6833259e3fce5c06d2058fced746dffa654fc8592a9960cb24c9a77e6ff265039c4f0e2429fef85d5ce0e05532ac8d028b3b0a806310e02fa1494
+EBUILD libcerf-1.5.ebuild 807 BLAKE2B d1a97b4f7df76b5efbb59d5e77d87dcbf28488266cada96065bcbe93edae62260b770fac395d2aa81cf47306aad272b373a6872acd662ea307554fa3b4aa5edb SHA512 2a25d110a9bacb8242097e2a55de791d0ed868935ed599c5177dce5d3d9d55cff4b8e12fee943bf901b29ed95cb60b1390fa6feea8288cec24c04b91ac8bfb29
 MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
diff --git a/sci-libs/libcerf/files/libcerf-1.3-autotools.patch b/sci-libs/libcerf/files/libcerf-1.3-autotools.patch
deleted file mode 100644
index caa00dd133ed..000000000000
--- a/sci-libs/libcerf/files/libcerf-1.3-autotools.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Send upstream (j.wuttke@fz-juelich.de) 14.07.14
-diff -Naur libcerf-1.3.orig/configure.ac libcerf-1.3/configure.ac
---- libcerf-1.3.orig/configure.ac	2013-07-17 03:49:33.000000000 -0600
-+++ libcerf-1.3/configure.ac	2014-07-21 17:01:15.399324021 -0600
-@@ -19,7 +19,7 @@
- # Website:
- #   http://apps.jcns.fz-juelich.de/libcerf
- 
--AC_INIT([cerf],[1:3],[http://apps.jcns.fz-juelich.de/libcerf])
-+AC_INIT([libcerf],[1:3],[http://apps.jcns.fz-juelich.de/libcerf])
-   # version is current:revision:age; for simplicity, we always put age=0
-   # <- http://www.sourceware.org/autobook/autobook/autobook_91.html
- 
-@@ -31,7 +31,7 @@
- LT_INIT([disable-static])
- 
- AC_PROG_CC_C99
--AC_SUBST(AM_CFLAGS,"-pedantic -Wall -Werror")
-+AC_SUBST(AM_CFLAGS,"-pedantic -Wall")
- AC_CONFIG_HEADERS([config.h]) # to avoid endless -D options
- AC_HEADER_STDC
- 
-diff -Naur libcerf-1.3.orig/libcerf.pc.in libcerf-1.3/libcerf.pc.in
---- libcerf-1.3.orig/libcerf.pc.in	2013-07-17 03:51:59.000000000 -0600
-+++ libcerf-1.3/libcerf.pc.in	2014-07-14 11:18:01.646512503 -0600
-@@ -7,4 +7,5 @@
- Description: Complex error function library
- Version: @PACKAGE_VERSION@
- Libs: -L${libdir} -lcerf
-+Libs.private: -lm
- Cflags: -I${includedir}
-diff -Naur libcerf-1.3.orig/man/Makefile.am libcerf-1.3/man/Makefile.am
---- libcerf-1.3.orig/man/Makefile.am	2013-02-01 02:00:14.000000000 -0700
-+++ libcerf-1.3/man/Makefile.am	2014-07-14 11:17:36.266182267 -0600
-@@ -19,9 +19,8 @@
- # Website:
- #   http://apps.jcns.fz-juelich.de/libcerf
- 
--man_MANS = w_of_z.3 im_w_of_x.3 dawson.3 cdawson.3 cerf.3 cerfc.3 erfcx.3 cerfcx.3 erfi.3 cerfi.3 voigt.3 
--auxdir = $(datadir)/man/html
--aux_DATA = w_of_z.html voigt.html dawson.html cerf.html erfcx.html erfi.html
-+man_MANS = w_of_z.3 im_w_of_x.3 dawson.3 cdawson.3 libcerf-cerf.3 cerfc.3 erfcx.3 cerfcx.3 erfi.3 cerfi.3 voigt.3 
-+html_DATA = w_of_z.html voigt.html dawson.html cerf.html erfcx.html erfi.html
- 
- w_of_z.3 : w_of_z.pod
- 	pod2man -s 3 -c "libcerf manual" $< > $@
-@@ -35,7 +34,7 @@
- cdawson.3 : dawson.pod
- 	pod2man -s 3 -c "libcerf manual" $< > $@
- 
--cerf.3 : cerf.pod
-+libcerf-cerf.3 : cerf.pod
- 	pod2man -s 3 -c "libcerf manual" $< > $@
- 
- cerfc.3 : cerf.pod
-diff -Naur libcerf-1.3.orig/test/Makefile.am libcerf-1.3/test/Makefile.am
---- libcerf-1.3.orig/test/Makefile.am	2013-07-17 01:45:37.000000000 -0600
-+++ libcerf-1.3/test/Makefile.am	2014-07-14 11:16:00.204932368 -0600
-@@ -20,8 +20,10 @@
- #   http://apps.jcns.fz-juelich.de/libcerf
- 
- AM_CFLAGS += -I$(srcdir)/../lib
--noinst_PROGRAMS = test_libcerf_1 runvoigt run_w_of_z
-+noinst_PROGRAMS = runvoigt run_w_of_z
- test_libcerf_1_SOURCES = test1.c
- runvoigt_SOURCES = runvoigt.c
- run_w_of_z_SOURCES = run_w_of_z.c
- AM_LDFLAGS = -lm -L../lib -lcerf
-+check_PROGRAMS = test_libcerf_1
-+TESTS = test_libcerf_1
diff --git a/sci-libs/libcerf/libcerf-1.5.ebuild b/sci-libs/libcerf/libcerf-1.5.ebuild
index 5bf866a00bf3..3294d3848a94 100644
--- a/sci-libs/libcerf/libcerf-1.5.ebuild
+++ b/sci-libs/libcerf/libcerf-1.5.ebuild
@@ -11,6 +11,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 src_configure() {
 	econf --enable-shared $(use_enable static-libs static)