gentoo resync : 22.01.2019

5 files changed, 3 insertions, 90 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 476d495c57d7..5210acc08083 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index fcb4f33d3d2d..c11c0f74e30b 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,5 +1,4 @@
 AUX 0001-fix-libressl-compat.patch 14675 BLAKE2B a90784a7925c5f3eca792d54e60f6b2d56e983f6f72c3a43cc9092242a6f7dac59c33e558d854600a107075c07b412e517ddfd45b902d426f4ec7d7ffafb2d0e SHA512 ebd92ba95304883950719a56466c2abc230b5d77fbf9c58925e52e840089517b5f2c745b27b327ff4fa81b5b3e8908d4cebbafdbf6ba641c2b0fc866f278f966
-AUX lua-openssl-0.4.1-Makefile.patch 3494 BLAKE2B e007800b599eb7f979fa23ffed4a436f9804c82ec8e4c98307192cc6e25c8c4571bfcf803a99bc6dbf3ac4f05217b7639423e32ce4ac8c73a3a31f25daf73062 SHA512 bc5b4c2dfd95b82bcdef0e0f5467af9249365db73b39ee416795140be95a89c0cc968507d62f9b9424f3a492429a49153bed5f7706a2a878430e6af41be38505
 DIST lua-openssl-0.7.3.tar.gz 383743 BLAKE2B 2709eed607e6d752488cacd5b96ee4a845f1ec13948fc7e40e45af968f240579b5d96ab69380f87d7edfc8a55aa44b099e9a592891f78a7928d172f5abcbc9fb SHA512 00eea8d4d04e167456a7602ae111cb768db61f7bdf9e0056c424bdcd67618811cd304543f95ecb273c66c6b41779e2fe721cb43bc332765ce77effb6245edbe2
 DIST lua-openssl-aux-b56f6937096acea34ddf241ec7ea08ac52414d18.tar.gz 3684 BLAKE2B 78e92c6cc1c2a29b00a9179db71a9404aff40a0e844f2f092b7868bbf98b6f3fa9519c63a2c38304ce2928b007bd4c015c5afa66ca32b1646035ebb949b3c655 SHA512 ba1eaf7c6b58fde48f47146d6c773368484ea10a229d6a45f317bda8d8cc21829ceda68071685f1b071e150936362b934b90532344ebb266febcc0efa45904f4
 DIST lua-openssl-compat-daebe77a2f498817713df37f0bb316db1d82222f.tar.gz 51418 BLAKE2B 1d04684e6b6d850bdf6bd3165a90c6a08bd93b757d91e387da152bcb3fc4756db5c16f3cc12ecf33bcdd647742c7923cc2e72627beb5527c5e9dfbfd63c147ba SHA512 60ec9ecfc4e4ad47b6a8189ffb1e7c83fe8b9e9df13cb91bf33725905ab72bff3d3009e8ad04fb73fd7255facdbb8279f20bfd160aee89b12c25431786eaca14
diff --git a/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch b/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch
deleted file mode 100644
index bf5374ee90cd..000000000000
--- a/dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-
-Fix Makefile to respect system CFLAGS, LDFLAGS, and CC provided by environment.
-Allow to specify pkg-config command using variable, to be friendly with
-cross-compiling etc.
-
-diff --git a/Makefile b/Makefile
-index 195ef6b..375fb65 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,9 +2,10 @@ T=openssl
- 

- PREFIX		?=/usr/local

- LIB_OPTION	?= -shared 

-+PKG_CONFIG	?= pkg-config

- 

- #Lua auto detect

--LUA_VERSION ?= $(shell pkg-config luajit --print-provides)

-+LUA_VERSION ?= $(shell $(PKG_CONFIG) luajit --print-provides)

- ifeq ($(LUA_VERSION),)                         ############ Not use luajit

- LUAV		?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")

- LUA_CFLAGS	?= -I$(PREFIX)/include/lua$(LUAV)

-@@ -12,8 +13,8 @@ LUA_LIBS	?= -L$(PREFIX)/lib
- LUA_LIBDIR	?= $(PREFIX)/lib/lua/$(LUAV)

- else

- LUAV		?= $(shell lua -e "_,_,v=string.find(_VERSION,'Lua (.+)');print(v)")

--LUA_CFLAGS	?= $(shell pkg-config luajit --cflags)

--LUA_LIBS	?= $(shell pkg-config luajit --libs)

-+LUA_CFLAGS	?= $(shell $(PKG_CONFIG) luajit --cflags)

-+LUA_LIBS	?= $(shell $(PKG_CONFIG) luajit --libs)

- LUA_LIBDIR	?= $(PREFIX)/lib/lua/$(LUAV)

- endif

- 

-@@ -22,30 +23,30 @@ SYS := $(shell gcc -dumpmachine)
- 

- ifneq (, $(findstring linux, $(SYS)))

- # Do linux things

--LDFLAGS		    = -fPIC -lrt -ldl

--OPENSSL_LIBS	?= $(shell pkg-config openssl --libs) 

--OPENSSL_CFLAGS	?= $(shell pkg-config openssl --cflags)

--CFLAGS		    = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)

-+LDFLAGS		    += -fPIC -lrt -ldl

-+OPENSSL_LIBS	?= $(shell $(PKG_CONFIG) openssl --libs) 

-+OPENSSL_CFLAGS	?= $(shell $(PKG_CONFIG) openssl --cflags)

-+CFLAGS		    += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)

- endif

- ifneq (, $(findstring apple, $(SYS)))

- # Do darwin things

--LDFLAGS		    = -fPIC -lrt -ldl

--OPENSSL_LIBS	?= $(shell pkg-config openssl --libs) 

--OPENSSL_CFLAGS	?= $(shell pkg-config openssl --cflags)

--CFLAGS		    = -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)

-+LDFLAGS		    += -fPIC -lrt -ldl

-+OPENSSL_LIBS	?= $(shell $(PKG_CONFIG) openssl --libs) 

-+OPENSSL_CFLAGS	?= $(shell $(PKG_CONFIG) openssl --cflags)

-+CFLAGS		    += -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)

- endif

- ifneq (, $(findstring mingw, $(SYS)))

- # Do mingw things

- V			= $(shell lua -e "v=string.gsub('$(LUAV)','%.','');print(v)")

--LDFLAGS		= -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll 

-+LDFLAGS		+= -mwindows -lcrypt32 -lssl -lcrypto -lws2_32 $(PREFIX)/bin/lua$(V).dll

- LUA_CFLAGS	= -DLUA_LIB -DLUA_BUILD_AS_DLL -I$(PREFIX)/include/

--CFLAGS		= $(OPENSSL_CFLAGS) $(LUA_CFLAGS)

-+CFLAGS		+= $(OPENSSL_CFLAGS) $(LUA_CFLAGS)

- endif

- ifneq (, $(findstring cygwin, $(SYS)))

- # Do cygwin things

--OPENSSL_LIBS	?= $(shell pkg-config openssl --libs) 

--OPENSSL_CFLAGS  ?= $(shell pkg-config openssl --cflags)

--CFLAGS		= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)

-+OPENSSL_LIBS	?= $(shell $(PKG_CONFIG) openssl --libs) 

-+OPENSSL_CFLAGS  ?= $(shell $(PKG_CONFIG) openssl --cflags)

-+CFLAGS		+= -fPIC $(OPENSSL_CFLAGS) $(LUA_CFLAGS)

- endif

- #custome config

- ifeq (.config, $(wildcard .config))

-@@ -61,7 +62,7 @@ WARN_MOST	= -Wall -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnest
- WARN		= -Wall -Wno-unused-value

- WARN_MIN	= 

- CFLAGS		+= $(WARN_MIN) -DPTHREADS 

--CC= gcc -g $(CFLAGS) -Ideps

-+CC			?= gcc -g $(CFLAGS) -Ideps

- 

- 

- OBJS=src/asn1.o src/auxiliar.o src/bio.o src/cipher.o src/cms.o src/compat.o src/crl.o src/csr.o src/dh.o src/digest.o src/dsa.o \

diff --git a/dev-lua/lutok/Manifest b/dev-lua/lutok/Manifest
index e50e2cb0bd34..96a6fd3fea67 100644
--- a/dev-lua/lutok/Manifest
+++ b/dev-lua/lutok/Manifest
@@ -1,3 +1,3 @@
 DIST lutok-0.4.tar.gz 489570 BLAKE2B b4bc26d9a4901901e6ca66a41bc42ccc2f82697ff14e64c1bea35b4a9ed08b6f13ecfa9aaabb54e25fb3e4f3aea03791c225c4c8fc6ed3e0387d34d933a228e9 SHA512 664f30099bfbb30978e24068a9232a4ff1b5b1839c601bf784f35f6bb1394558067495093a3b0343c94e756d2e4186a32a8227baf5934c15c45905f7c0a5d19c
-EBUILD lutok-0.4-r1.ebuild 747 BLAKE2B 267c98606fe34e92cdf497831b32683b87d7a1478649ac9612ddfaf98ffca84ada56c8b77b548b22bd76e9d2c86a80142cf20c4e0a8957254586dab9e65dc4c5 SHA512 0fcecb12aede8e73bbd4c77ed04d9b7807c42ddc8c56dad74910e8019728ed1d57726d2557313efab76c10a21a5a2c06efe964187528a3612bff215fdacd3ee5
+EBUILD lutok-0.4-r1.ebuild 746 BLAKE2B 0439c502aa0747c41a53ec229b7acae2f27bf1eb19d6ff6d2ac7e4f29daf53b18076b5d9caa485ffc07bb2a54aa68881ca953c3c7084c406d86ebc7dd058cf77 SHA512 b25e1125ae9542ec186ee51195181d42cc37a2c4588e52d12e0c4823f096a162c4f0d68186c80b2f85ed0c13aadb4fb925443b2b99fa6937cc5449b7ab1d9aa6
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-lua/lutok/lutok-0.4-r1.ebuild b/dev-lua/lutok/lutok-0.4-r1.ebuild
index 34302e797060..dbc00eb3fc56 100644
--- a/dev-lua/lutok/lutok-0.4-r1.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"