gentoo resync : 13.06.2020

3 files changed, 32 insertions, 33 deletions

diff --git a/www-apps/webmcp/Manifest b/www-apps/webmcp/Manifest
index 080443033931..097bdcf6a78a 100644
--- a/www-apps/webmcp/Manifest
+++ b/www-apps/webmcp/Manifest
@@ -1,4 +1,4 @@
-AUX webmcp-1.2.6-gentoo.patch 5143 BLAKE2B f4b8ca3ec283f3b4e7149cb746adc889099ac90ffaf5265670ae9446d55135fcd73907e84525f44d0d20a312a6e4033fd503c48caf884c6b106a6c1a054f5c85 SHA512 da2b68d8a7adf787dfb42f2b3f9a73dcbdf256ba1eb665bdf41e19a1e4bfadeb138067abea53d07fa851ec4daa70ab198c9c3ca829ed406ce0dda2796518ae10
+AUX webmcp-1.2.6-gentoo.patch 5156 BLAKE2B 4d0680753a83422483c33909b692bc6a0fdd146216889aa83e6a9b99a15bf92920913330de12f2e2125b976214753ec4853b7dd48dabf8c2a0c88fb9b7d1ada5 SHA512 7e57b4f5f32f280198e8c6e01c21ed1414af3bf87a77022af37e3d144576a7d23c9f912e7f41282ef6d984f4323af1dbdda472cfe076fc62a6ee1a47d0529a7c
 DIST webmcp-v1.2.6.tar.gz 132283 BLAKE2B ed5539b91eeb809a1e19b98f2dc8888c055ec547c95c53c0ea9232531bf9b8432ba6a0ad566a1d2fecbdcc056a52e42e99b973741fc44f923ea88369393c5ade SHA512 a233c312f85851c690f9b020e5df1fffb548c708199279021f384a36cf6e2b73a9b7bc2343c886ccc0e18aecf6d205e2a699fa2398b9bf0da587bc4f8a8f8556
-EBUILD webmcp-1.2.6.ebuild 1414 BLAKE2B 23deebc5359c15f31d9a76b8b2cca925451f8e753385eab93ab7e7e27a6d17a521e2495c56c0742f8eb8dafb22f86dbe7f779ddc4f7e13669a9e02e499d191c2 SHA512 04de52cf954b54031cf41f56dbd10ee655b778688543e5c490c1aa6beb2f357409a71702dcb49ba5a94316f7c10218cdfb7320b335247c65b04f0d892147574a
+EBUILD webmcp-1.2.6.ebuild 1430 BLAKE2B e25f69e511d1b0bc9349761573fb4617e7daa96435584ba313d2d57e71fce09f3792551b3e95bbe8515a39df9e4531e6e5a60e7494029a3bdd780c61d9cf9684 SHA512 635a9ac44d15293681bb3beda2964bbe6d5e37dd4d0429d03242474b56c45f05f73e7d9b3e305c47c4866abb7d7784e96d5744fe9b08c76fc48156775602fa22
 MISC metadata.xml 821 BLAKE2B a116a4db4b1be4a6a860805b866e735633b1ee8031cc0750e9843c201fe5b1d36657f845d0e9fc1e3871ab091601b85996b4ebd5b224ea1fa6139ffc0e6fd8a2 SHA512 68b0741c84f5a93b26b89e56093b9554727ef375ed77e189cdeb62e12dc0a1b8506b56885be46c637e03b388830467eeac3f11511f49668d74dd36ff15f380e8
diff --git a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
index 2fa1eb4aff53..3b399fe96ad9 100644
--- a/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
+++ b/www-apps/webmcp/files/webmcp-1.2.6-gentoo.patch
@@ -1,5 +1,5 @@
---- Makefile.old	2013-03-12 21:49:03.976676966 +0100
-+++ Makefile	2013-03-12 21:50:02.888103540 +0100
+--- a/Makefile	2013-03-12 21:49:03.976676966 +0100
++++ b/Makefile	2013-03-12 21:50:02.888103540 +0100
 @@ -1,11 +1,11 @@
  include Makefile.options
  
@@ -34,8 +34,8 @@
  
  symlinks::
  	ln -s -f ../../libraries/atom/atom.lua framework/lib/
---- Makefile.options.old	2015-05-26 21:43:41.354197822 +0200
-+++ Makefile.options	2015-05-26 22:01:34.594735786 +0200
+--- a/Makefile.options	2015-05-26 21:43:41.354197822 +0200
++++ b/Makefile.options	2015-05-26 22:01:34.594735786 +0200
 @@ -14,13 +14,13 @@
  # C compiler flags
  # TODO: check alternatives to -D_GNU_SOURCE -fPIC
@@ -49,13 +49,13 @@
  
  # linker flags
 -LDFLAGS = -shared -L /usr/lib -L /usr/local/lib
-+LDFLAGS = -shared
++LDFLAGS = -shared $(MYLDFLAGS)
  
  # additional linker flags for parts which depend on PostgreSQL
 -LDFLAGS_PGSQL = -L /usr/local/lib/postgresql -rpath /usr/local/lib/postgresql
 +LDFLAGS_PGSQL =
---- libraries/extos/Makefile.old	2013-03-13 21:49:19.710360750 +0100
-+++ libraries/extos/Makefile	2013-03-13 21:49:47.778096460 +0100
+--- a/libraries/extos/Makefile	2013-03-13 21:49:19.710360750 +0100
++++ b/libraries/extos/Makefile	2013-03-13 21:49:47.778096460 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -65,8 +65,8 @@
  
  extos.o: extos.c
  	$(CC) -c $(CFLAGS) -o extos.o extos.c
---- libraries/mondelefant/Makefile.old	2013-03-13 21:52:54.884250479 +0100
-+++ libraries/mondelefant/Makefile	2013-03-13 21:53:27.511932686 +0100
+--- a/libraries/mondelefant/Makefile	2013-03-13 21:52:54.884250479 +0100
++++ b/libraries/mondelefant/Makefile	2013-03-13 21:53:27.511932686 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -76,8 +76,8 @@
  
  mondelefant_native.o: mondelefant_native.c
  	$(CC) -c $(CFLAGS) $(CFLAGS_PGSQL) -o mondelefant_native.o mondelefant_native.c
---- libraries/multirand/Makefile.old	2013-03-13 21:54:29.399328173 +0100
-+++ libraries/multirand/Makefile	2013-03-13 21:54:58.019048434 +0100
+--- a/libraries/multirand/Makefile	2013-03-13 21:54:29.399328173 +0100
++++ b/libraries/multirand/Makefile	2013-03-13 21:54:58.019048434 +0100
 @@ -1,7 +1,7 @@
  include ../../Makefile.options
  
@@ -87,8 +87,8 @@
  
  multirand.o: multirand.c
  	$(CC) -c $(CFLAGS) -o multirand.o multirand.c
---- libraries/extos/extos.c.old	2013-04-05 23:19:52.028115226 +0200
-+++ libraries/extos/extos.c	2013-04-05 23:20:14.819896253 +0200
+--- a/libraries/extos/extos.c	2013-04-05 23:19:52.028115226 +0200
++++ b/libraries/extos/extos.c	2013-04-05 23:20:14.819896253 +0200
 @@ -12,6 +12,7 @@
  #include <fcntl.h>
  #include <poll.h>
@@ -97,8 +97,8 @@
  
  #define EXTOS_MAX_ERRLEN 80
  #define EXTOS_EXEC_MAX_ARGS 64
---- framework/accelerator/Makefile.old	2014-06-21 20:15:21.019918183 +0200
-+++ framework/accelerator/Makefile	2014-06-21 20:15:44.700471794 +0200
+--- a/framework/accelerator/Makefile	2014-06-21 20:15:21.019918183 +0200
++++ b/framework/accelerator/Makefile	2014-06-21 20:15:44.700471794 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) -o webmcp_accelerator.$(SLIB_EXT) webmcp_accelerator.o
  
@@ -108,8 +108,8 @@
  
  clean::
  	rm -f webmcp_accelerator.so webmcp_accelerator.o
---- libraries/extos/Makefile.old	2014-06-21 20:18:25.594611956 +0200
-+++ libraries/extos/Makefile	2014-06-21 20:18:50.457183029 +0200
+--- a/libraries/extos/Makefile	2014-06-21 20:18:25.594611956 +0200
++++ b/libraries/extos/Makefile	2014-06-21 20:18:50.457183029 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) -o extos.$(SLIB_EXT) extos.o -lrt -lcrypt -llua
  
@@ -119,8 +119,8 @@
  
  clean::
  	rm -f extos.so extos.o
---- libraries/mondelefant/Makefile.old	2014-06-21 20:19:58.218962359 +0200
-+++ libraries/mondelefant/Makefile	2014-06-21 20:20:24.527476578 +0200
+--- a/libraries/mondelefant/Makefile	2014-06-21 20:19:58.218962359 +0200
++++ b/libraries/mondelefant/Makefile	2014-06-21 20:20:24.527476578 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) $(LDFLAGS_PGSQL) -o mondelefant_native.$(SLIB_EXT) mondelefant_native.o -lpq -llua
  
@@ -130,8 +130,8 @@
  
  test:: mondelefant_native.so mondelefant.lua
  	lua -l mondelefant
---- libraries/multirand/Makefile.old	2014-06-21 20:21:36.950197127 +0200
-+++ libraries/multirand/Makefile	2014-06-21 20:22:04.967703944 +0200
+--- a/libraries/multirand/Makefile	2014-06-21 20:21:36.950197127 +0200
++++ b/libraries/multirand/Makefile	2014-06-21 20:22:04.967703944 +0200
 @@ -4,7 +4,7 @@
  	$(LD) $(LDFLAGS) -o multirand.$(SLIB_EXT) multirand.o -llua
  
diff --git a/www-apps/webmcp/webmcp-1.2.6.ebuild b/www-apps/webmcp/webmcp-1.2.6.ebuild
index 8442fcfc0a2f..a156ac3bbf96 100644
--- a/www-apps/webmcp/webmcp-1.2.6.ebuild
+++ b/www-apps/webmcp/webmcp-1.2.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_P=${PN}-v${PV}
 DESCRIPTION="Web application framework written in Lua and C"
@@ -15,18 +15,16 @@ KEYWORDS="~amd64"
 SLOT=0
 IUSE=""
 
-RDEPEND="dev-lang/lua
-	dev-db/postgresql"
+RDEPEND="dev-lang/lua:=
+	dev-db/postgresql:="
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC)
+	emake CC=$(tc-getCC) LD=$(tc-getCC) MYLDFLAGS="${LDFLAGS}"
 	# Dereference symlinks
 	cd framework
 	mkdir lib.link
@@ -61,5 +59,6 @@ src_install() {
 		doins -r demo-app${subdir}
 	done
 	dodoc doc/*sample.conf libraries/mondelefant/example.lua
-	dohtml doc/autodoc.html
+	docinto html
+	dodoc doc/autodoc.html
 }