From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-lua/lua-openssl/Manifest | 4 - .../files/lua-openssl-0.4.1-Makefile.patch | 86 ---------------------- dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild | 46 ------------ dev-lua/lua-openssl/metadata.xml | 8 -- 4 files changed, 144 deletions(-) delete mode 100644 dev-lua/lua-openssl/Manifest delete mode 100644 dev-lua/lua-openssl/files/lua-openssl-0.4.1-Makefile.patch delete mode 100644 dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild delete mode 100644 dev-lua/lua-openssl/metadata.xml (limited to 'dev-lua/lua-openssl') diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest deleted file mode 100644 index be21660b2886..000000000000 --- a/dev-lua/lua-openssl/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX lua-openssl-0.4.1-Makefile.patch 3494 BLAKE2B e007800b599eb7f979fa23ffed4a436f9804c82ec8e4c98307192cc6e25c8c4571bfcf803a99bc6dbf3ac4f05217b7639423e32ce4ac8c73a3a31f25daf73062 SHA512 bc5b4c2dfd95b82bcdef0e0f5467af9249365db73b39ee416795140be95a89c0cc968507d62f9b9424f3a492429a49153bed5f7706a2a878430e6af41be38505 -DIST lua-openssl-0.4.1.tar.gz 363525 BLAKE2B cd2222241f742421c31eb4334a472bdd79b3b348210f02a5d4275163a3d57ea6c13adf894aa9aeb24266a8bedf839aadc3c3923bb65d075963b1810581629fb4 SHA512 c6deda86f77f9d6de1863611db9eb82506ea9789ec0425cb40cdb7d142d53aa633d53e1446b7eeb464636261385822d9cedc841bd35163931cc3758e7c3a308d -EBUILD lua-openssl-0.4.1-r1.ebuild 1109 BLAKE2B 098681960488aa3c080eab0feebce74262ee90878dd0a0e04f55b80104c68212e2175deec6430c55a796e587c5265fce5831b66a359d5dd8e3465633d1d21548 SHA512 501e5d001021d0cf8ace8ba668f6e7b4880a0cb932573e6444ab0dba959c5116b51e700f48cfc08d3219821878a87b61720596ca2de99a387bc3fc8c9470a5dd -MISC metadata.xml 249 BLAKE2B 3ab35857c3c6e5cea39d8d6d3b54fdfefd9877895c470c3ca2cfbb50a298410842de32514bf22d823f789aa09b1bd06a8e35f7282359077324737ec01a7dda25 SHA512 4a88e5a29b58bf05ab0d5ba495f472d5642c757067e19ee24ba751e2e3df458b308714f3744f82b54004ab87289eb33d57b78d0785c99eb08f079e9d3f0f5608 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 - -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/lua-openssl/lua-openssl-0.4.1-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild deleted file mode 100644 index 2c0ad960fe58..000000000000 --- a/dev-lua/lua-openssl/lua-openssl-0.4.1-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="OpenSSL binding for Lua" -HOMEPAGE="https://github.com/zhaozg/lua-openssl" -SRC_URI="https://github.com/zhaozg/lua-openssl/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT openssl PHP-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl luajit" - -RDEPEND=" - luajit? ( dev-lang/luajit:2 ) - !luajit? ( >=dev-lang/lua-5.1:0 ) - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - " -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}/${P}-Makefile.patch" - use luajit && LUAV=luajit || LUAV=lua -} - -src_compile() { - local pkgconfig=$(tc-getPKG_CONFIG) - emake \ - CC="$(tc-getCC) \$(CFLAGS) -Ideps" \ - PKG_CONFIG="$pkgconfig" \ - LUA_CFLAGS="$($pkgconfig --cflags $LUAV)" \ - LUA_LIBS="$($pkgconfig --libs $LUAV)" \ - LUA_LIBDIR="$($pkgconfig --variable INSTALL_CMOD $LUAV)" -} - -src_install() { - emake \ - LUA_LIBDIR="${D}$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $LUAV)" \ - install - einstalldocs -} diff --git a/dev-lua/lua-openssl/metadata.xml b/dev-lua/lua-openssl/metadata.xml deleted file mode 100644 index 5056b9e74ffb..000000000000 --- a/dev-lua/lua-openssl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - zhaozg/lua-openssl - - -- cgit v1.2.3