gentoo resync : 20.03.2021

4 files changed, 46 insertions, 20 deletions

diff --git a/sci-visualization/quickplot/Manifest b/sci-visualization/quickplot/Manifest
index 271b84a5090b..cec84ad42200 100644
--- a/sci-visualization/quickplot/Manifest
+++ b/sci-visualization/quickplot/Manifest
@@ -1,5 +1,6 @@
+AUX quickplot-1.0.1_rc-automake.patch 544 BLAKE2B ba3a3a2c6a8351a71a8fee0e8e9b663a7d824dd62608ba8de1678e8b1039a96365db56c329b50e82a73870bd584ae9d847bf1095eaa336438e9e2e923dc76a76 SHA512 bca9e0c2e2d7a3644ded230ef933fbc716a7ca87f62b20a47f930bf8f10a7bb7d8ba36869c4564c6370f566d6f57802b5b387e76b2d44aacd59ad544a8d73775
 DIST quickplot-0.10.6.tar.xz 445172 BLAKE2B bcb2c694cc6a3777b7d88a5fbd6562d2612f76b0fabde67562ddba44708db0674336b72f5223aa6043524e9c6cb057e518b076086f2c05370bef6eb54b07e8bf SHA512 10b5277d8d0b8febc3c663256f3912bdd9d879b3038a5fdd3a7adc223419893ee56b825f04b5bee29883f30acb3b6a329d8e314b049fef26d6220192767d4adb
 DIST quickplot-1.0.1rc.tar.gz 303055 BLAKE2B 52c8b60b0f79171358d81691f8824e39c1e3bafc1c084c3a52037e8cd1148e8bf68027ccc90593eca15fcbee0074d42ad7def1eb9d1f5c656b86e12adb6cfdcc SHA512 9cfaaafb7db379fb43b2975d588464288ac18eb21b3248fb02e5a30b0fa0950313a9818cfec23821046f9819d78255f02dff9970668a4b4ed8c4f452d6df3451
 EBUILD quickplot-0.10.6.ebuild 998 BLAKE2B 156205b729053992a6d80118c0bff6f90bbe8bdc2af9cb042fb692cf0ac8f088265331529c22566ffcb964f877c5ac062cf553d258a3ae09bbec8131860d573d SHA512 3ad72225a71f9c3e4c2c5e2f9e409ec0f30ffdc30817b46277590e314a089cfbea95cda0a874eb15baf0ff37942df0e4423c5bfebae2ec804ca455504a76f850
-EBUILD quickplot-1.0.1_rc.ebuild 1057 BLAKE2B 4b496544bf2632ba005ea519071bdc957339d3a8267905e14c025786b15fc5541c81a6d4beec3521c2c0c25890028260f1ac75e62a744b56e3a085a7e30e72cf SHA512 d02264953582e47bfa69dbe439b782bf9c8f70d9d34e8c1acaeb9f1c9ff1d5b7f659408dc4ce9dfb312eb3471c549cd5b3d25f1a299db9d4189e1d717750fba1
-MISC metadata.xml 853 BLAKE2B 96a2968fcecaddf9d143be2c33c4065b6809417d997aa1ca2fda48dbc755178d1c32d47d2e82aa507fbc614c41c9f3395de7310e61abe8bf3a9da70a915547e5 SHA512 8485d4cad78fd9161043a10a764dd494f2b9a5aded964366b3bbe519b423c793cdbabeb29c16e207a7f989339390f03beb57bd918d0df70321b7518f501bfece
+EBUILD quickplot-1.0.1_rc.ebuild 1032 BLAKE2B 825cc7a512a18099c844fd558997d2a1441b9023e1317027c06f02f8671466b09cd0d793c1ad5c6497c3f5ce043ed87f002a2ca854a73c320b80cb96699c0a91 SHA512 7ebd9fea51c58945cd0cc0c7cf06f103dbe1447a5f24412dfb3f96bb4c5f164ff2c9cb3590bc7eebce9eeb51f234ada59a55c20b6f87f5531acda8b001c5909b
+MISC metadata.xml 853 BLAKE2B 8e5a7f7a90c345657b2ae6b9460bad955899cecbdf38c9fa668f1da36a35928268368bb6339e43874733124b553ba6a2a8177a060e4dc5a9204ee3e88b5c74de SHA512 ec630df795d369d1ebbdb5cccf33b55134e6d4400d97caed721b0a02882c5cc321ac21c526b50d1556f9c4e21504a51dfbfdcb2b463ffa09d2f81d0890bf0cd9
diff --git a/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch b/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch
new file mode 100644
index 000000000000..e88259f0bd24
--- /dev/null
+++ b/sci-visualization/quickplot/files/quickplot-1.0.1_rc-automake.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -193,7 +193,7 @@
+ endif
+ 
+ # We look at a sndfile symbol when libquickplot runs
+-libquickplot_la_LIBADD = $(sndfile_LIBS)
++libquickplot_la_LIBADD = $(sndfile_LIBS) -lm
+ 
+ if QP_DEBUG
+ libquickplot_la_SOURCES += debug_spew.c
+@@ -336,8 +336,8 @@
+ if HAVE_LOCAL_SCREENSHOTS
+ 
+ install-exec-hook:
+-	mkdir -p $(htmldir)
+-	cp ScreenShot_* _ScreenShot_* $(htmldir)
++	mkdir -p $(DESTDIR)$(htmldir)
++	cp ScreenShot_* _ScreenShot_* $(DESTDIR)$(htmldir)
+ 
+ thumbs.htm: mk_thumbs.htm.bash
+ 	./mk_thumbs.htm.bash > $@
diff --git a/sci-visualization/quickplot/metadata.xml b/sci-visualization/quickplot/metadata.xml
index f2f18fe4b41c..dfb4c4b2cae6 100644
--- a/sci-visualization/quickplot/metadata.xml
+++ b/sci-visualization/quickplot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
index 3b95c16cf526..19ccf287fd22 100644
--- a/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
+++ b/sci-visualization/quickplot/quickplot-1.0.1_rc.ebuild
@@ -1,49 +1,52 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools desktop
 
 MY_P=${P/_rc/rc}
 
 DESCRIPTION="A fast interactive 2D plotter"
-HOMEPAGE="http://quickplot.sourceforge.net/ https://github.com/lanceman2/quickplot"
+HOMEPAGE="
+	http://quickplot.sourceforge.net/
+	https://github.com/lanceman2/quickplot"
 SRC_URI="https://github.com/lanceman2/${PN}/archive/${MY_P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
 
-SLOT="0"
 LICENSE="GPL-3"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
 
 RDEPEND="
-	media-libs/libsndfile
+	media-libs/libsndfile:=
 	>=sys-libs/readline-0.6.2:0=
 	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	media-gfx/imagemagick
+DEPEND="${RDEPEND}"
+BDEPEND="
+	media-gfx/imagemagick[png]
 	virtual/pkgconfig
 	www-client/lynx"
 
-S="${WORKDIR}/${PN}-${MY_P}"
+PATCHES=( "${FILESDIR}"/${P}-automake.patch )
 
 src_prepare() {
-	sed -i \
-		-e '/libquickplot_la_LIBADD/s:$: -lm:g' \
-		-e 's/ $(htmldir)/ $(DESTDIR)$(htmldir)/g' \
-		Makefile.am || die
 	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
-		--enable-developer \
-		$(use_enable static-libs static)
+		--disable-static \
+		--enable-developer
 }
 
 src_install() {
 	default
+
 	make_desktop_entry 'quickplot --no-pipe' Quickplot quickplot Graphics
-	mv "${ED%/}"/usr/share/applications/quickplot{*,}.desktop || die
+	mv "${ED}"/usr/share/applications/quickplot{*,}.desktop || die
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }