gentoo resync : 12.01.2019

5 files changed, 48 insertions, 6 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 2d8929395354..476d495c57d7 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/lua-cjson/Manifest b/dev-lua/lua-cjson/Manifest
index 7aaf5873d669..f56776b59c14 100644
--- a/dev-lua/lua-cjson/Manifest
+++ b/dev-lua/lua-cjson/Manifest
@@ -1,3 +1,3 @@
 DIST lua-cjson-2.1.0.tar.gz 86024 BLAKE2B 21dbf84cda2c973088dc9ba165351f3af35d4f604ef465abd91f37807a6c037f612f36c87b9458abef9afa06e1738e933fcce7be9edd2f9a5e301985f413a1db SHA512 4343513b942f2ed98dc1ea6d7e852303bc1263f8acc5c70c8d674aec7adfc8279c5af7d5173a417b6f9a74543b8f6c8f98742d002f4f75832bbf23bb5a30ad2f
-EBUILD lua-cjson-2.1.0.ebuild 765 BLAKE2B ce8e5aa06cceba2be9f4436d5f5f2c3356521fcaa6237fe5cf37035ab37d70ba501d3bfb67bdb546d18559bb0bd53d987cbf3445a438f8622f8ee7c8ac350f33 SHA512 f5cf61e13d1306b058196ae7c87038f19d43c98c53c81f9ab769b728f2af9343829926ba9bf5192fe1a37e0e42659036209c227853d0728e3b9f722a6c6fa41c
+EBUILD lua-cjson-2.1.0.ebuild 784 BLAKE2B 4a64cbd26700a4ad9240862f9c5beb708a97f1a6fa51141f05bd4a1bad80212fd07cc822715b34f6d38f6b6c83b13f366b43bea18f8ef2e8be8065f38eb91a6b SHA512 2b10a5c31ba56e72920049081060433ecb93f0832b795c50ee60e06e44ce4544ea41edad71c9f6418ce89f7b0326a53b676c0ac34c396b2c31ab6e6141aa3b2d
 MISC metadata.xml 250 BLAKE2B b6882e74d55aa6fb27d372e6b27adc8751cd6bcbc6bbddf7b60b8a666d866a9ea95675b1ea1f0ab644eeeef2ca0ca599fadade594d80b649b2914b0581d805c2 SHA512 c9d378944a0bf99a43e176e333e565fe0e7af8000dbeac1b65e5d0f850eba07d88b15917d3b9bcbe05e927a94b36e310aff905e2147707b674a62f67bb048da5
diff --git a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
index 1dd13c83607d..7070319a3902 100644
--- a/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
+++ b/dev-lua/lua-cjson/lua-cjson-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND=">=dev-lang/lua-5.1:0"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-lang/perl )"
 
 DOCS=( NEWS THANKS )
 
@@ -29,6 +29,6 @@ src_test() {
 }
 
 src_install() {
+	use doc && local HTML_DOCS=( manual.html performance.html )
 	cmake-utils_src_install
-	use doc && dohtml manual.html performance.html
 }
diff --git a/dev-lua/luaossl/Manifest b/dev-lua/luaossl/Manifest
index fc527a12f5e9..8f742b63b039 100644
--- a/dev-lua/luaossl/Manifest
+++ b/dev-lua/luaossl/Manifest
@@ -1,5 +1,7 @@
 DIST luaossl-20150727.tar.gz 355486 BLAKE2B 81907c3a3f565432eb2d2b17db48f381496837924ce999a58a4528a46b1b43fdd7b14041bab2a4536c89a37c6f31926f353d1bb1997e9ffd57ab6e2cfb83b6ef SHA512 de565ff7b9ac07493e771045b05902dd64e8b6c458180dd03d08cf900067d1b9cb88385c69dc29fb45774e4ec36b563cab705b34d37cec2f5cc792cf4f7b5049
 DIST luaossl-rel-20180708.tar.gz 455381 BLAKE2B d57e27638e6aee44a94f85094bab9161f0b87bdb379863fdef4517a1cb3415f4ef7e62967ee1e3fa2dde4d5629a24d732dc8ea0fd2ea54ccd84f69c4b18e2c57 SHA512 b2a73a7e7ace9a01c8c5a26603107f7741de88de32c393ed9134b70d55278c81d48e357955e671654825de282449b9570ecdc6a4fbcf4890439c0200ba471338
+DIST luaossl-rel-20181207.tar.gz 472294 BLAKE2B 1dd991cd73a432b7f8918d391bd3cbea98d77d4bd6390815840e3c7f63e98b9bcca6d9a4841da663ba7ecaa19880a4f3db4fce09d47d103cfd85f8d920efe84d SHA512 e5412c115d0dda3b3f2446ffd9a8d9b78be3800e834d7a43ec2cde16e56798fe2467d91add3ab8030321e6bf1a12349ecd5987dd88216ab0d7ba4ff451f0fb91
 EBUILD luaossl-20150727.ebuild 1008 BLAKE2B 13aa6f30dc48ce88bea032225c5e82eb9bc7b98b692a9fe4554bd71c17e8d5e7b86a79e0adb50cb79ca06255da7185b7f2b1e1ac730ffa66ae39587475ee07b8 SHA512 76e0a12cf036ed3ca5c26248d6263540f4924469a42dda5ff48f1f485f1abf6de5714613f75a5fcd6bcb3b35030c45c1f35dcc17ad91b47f1c71d1b2cfbe4cd9
 EBUILD luaossl-20180708.ebuild 921 BLAKE2B 7124683a0b21b71e8785ab8517012a9750a366afcb9eb5f1b82d5917fff5527499369ef7ed4891165e42a18fb09bd83763952d778b92db46838bcdb2dbf5276b SHA512 587d420d87f6b4f27e3267eaa12a96d5993cf557a43ba06f603a9acbe04231837368c6dedf0929d6025cd886981ccc120eab5c86517e509edb312d112ff78e22
+EBUILD luaossl-20181207.ebuild 918 BLAKE2B 7a5c045918ede1bc8e78cb196995c348a52de086ae2328f0684ca7fd383ad55a86379581be2e590e2f072ad766cf74c7f0cc8f853fd5b51422bacb66ba6cae58 SHA512 d8964fe24ca6c5f54f0d03b7ae597f2a427c4e0787d99f4b18f9c3e60709b9150d0047613389409d9e79b295dc50c49322c25894b7b7f6f08625633674c2663e
 MISC metadata.xml 446 BLAKE2B e11f955abb7417868998af974278f1aeacfcc45c99727f9085958f1947873911a6c52e049782195fcc143336ac4359ac536797f3348df75295b64b48cafe759a SHA512 31b5c084ab50a3864d5bb189e55181a43d7ff2a2ff45738e00d5d863819ad2405b778f93caa12d9f62015e321252bcd1fdd776b7ff3a6299c58fc5cf74f6d547
diff --git a/dev-lua/luaossl/luaossl-20181207.ebuild b/dev-lua/luaossl/luaossl-20181207.ebuild
new file mode 100644
index 000000000000..300a08cda740
--- /dev/null
+++ b/dev-lua/luaossl/luaossl-20181207.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_P=${PN}-rel-${PV}
+DESCRIPTION="Most comprehensive OpenSSL module in the Lua universe."
+HOMEPAGE="https://github.com/wahern/luaossl"
+SRC_URI="https://github.com/wahern/luaossl/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( >=dev-lang/lua-5.1:0 )
+	dev-libs/openssl:0[-bindist]
+	!dev-lua/lua-openssl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	LUA_VERSION="$($(tc-getPKG_CONFIG) --variable=$(usex luajit abiver V) $(usex luajit luajit lua))"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" prefix="${EPREFIX}/usr" openssl${LUA_VERSION}
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install${LUA_VERSION}
+}