]> Pileus Git - ~andy/sunrise/commitdiff
dev-lua/luacrypto: version bump, new build system upstream, remove old
authorhasufell <julian.ospald@googlemail.com>
Sun, 22 Apr 2012 13:47:26 +0000 (15:47 +0200)
committerhasufell <julian.ospald@googlemail.com>
Sun, 22 Apr 2012 13:47:26 +0000 (15:47 +0200)
dev-lua/luacrypto/ChangeLog
dev-lua/luacrypto/Manifest
dev-lua/luacrypto/files/20120413-makefile.patch [deleted file]
dev-lua/luacrypto/luacrypto-0.3.0_p20120413.ebuild [deleted file]
dev-lua/luacrypto/luacrypto-0.3.1_p20120320.ebuild [new file with mode: 0644]

index 9777387517eda143ba6a43a9656f6107d4c5a79e..747fcef512d828e64a633265d6606d39776bd2ba 100644 (file)
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*luacrypto-0.3.1_p20120320 (22 Apr 2012)
+
+  22 Apr 2012; hasufell <julian.ospald@googlemail.com>
+  -files/20120413-makefile.patch, -luacrypto-0.3.0_p20120413.ebuild,
+  +luacrypto-0.3.1_p20120320.ebuild:
+  version bump, new build system upstream, remove old
+
   16 Apr 2012; hasufell <julian.ospald@googlemail.com>
   files/20120413-makefile.patch, luacrypto-0.3.0_p20120413.ebuild:
   update SRC_URI, makefile fix
index 232421bb0c222edc3d908f0a4435baa1a60f21ab..5110956060cf72fb921dd9cabcc2d5f37d95f06d 100644 (file)
@@ -1,5 +1,4 @@
-AUX 20120413-makefile.patch 2118 RMD160 d725521505718fc973252c9c2bc390793a417d7e SHA1 9adcfa7011b8fb6c4f39fbfa358c3b7e91291763 SHA256 2a6db4eddb05962a79836536403abd90c2fc408a264bffc0e4cdbced7a84f6ae
-DIST luacrypto-0.3.0_p20120413.tar.gz 50913 RMD160 f41ad6f1aa28f4295f3498f23de9a0d51223a38a SHA1 bca2c485bd39cb20d14f28fd17f1aedda7df6b82 SHA256 3a44978a437290497118de752d144155b98c223b53af726f45f4180778e89235
-EBUILD luacrypto-0.3.0_p20120413.ebuild 825 RMD160 6dc9272135d358f7fea605d86f3c887e61bfe0b0 SHA1 e0ff943c4af342e3df2f1c03cdd644f128df96c3 SHA256 d86beefdae1691d429a09c0ffbfdab0b93f6bc4bf7f454e7023cb7cf13fe6bc0
-MISC ChangeLog 484 RMD160 2f779f5d402d0e6e634774e64dca682f1b5b11d1 SHA1 58f832c28d94b38703ecd16ef1bcf0d63bed578a SHA256 8f85a982aba743404f7aabc25870085900d9909254674c2dd9d74f16ff4e49ea
+DIST luacrypto-0.3.1_p20120320.tar.gz 373239 RMD160 0a6809a126ad0c0d9ba2d30acb269b7b4809ebc4 SHA1 6f8ef800b7b41a8e477b2fe03a592bee26132dde SHA256 97715a25162aa286d7394c344c57e81cddd4d0a9bbb0f6d502ce008c614ec907
+EBUILD luacrypto-0.3.1_p20120320.ebuild 551 RMD160 498c47a883e072a05585546020f865afc862481a SHA1 3a1034584339c77201e591d204410684ddd922fc SHA256 804f6822f9c243379f2d40560a3029cf99a0bdf2596fd42722e3e24c3f6d9654
+MISC ChangeLog 742 RMD160 676a2e02252479590226bb1817260cd706974a93 SHA1 bf6ad0a9cca63330c2c02be8f5a49a87450b1a0a SHA256 3ebe194e73dbc51b864af94644fbaf4db8d8d51925c3b1a831fb486755816006
 MISC metadata.xml 214 RMD160 efd8175069efb91061298ff4584218b633e44678 SHA1 d372fdbfcb7fd07a4082961d3f3527be4fca1d60 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154
diff --git a/dev-lua/luacrypto/files/20120413-makefile.patch b/dev-lua/luacrypto/files/20120413-makefile.patch
deleted file mode 100644 (file)
index d53f99a..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From: hasufell <julian.ospald@googlemail.com>
-Date: Fri Apr 13 19:03:38 UTC 2012
-Subject: build system
-
---- config
-+++ config
-@@ -1,22 +1,17 @@
--# Installation directories
--# System's libraries directory (where binary libraries are installed)
--LUA_LIBDIR= /usr/lib/lua/5.1
--# Lua includes directory
--LUA_INC= /usr/include/lua5.1
--
--# OS dependent
--LIB_OPTION= -shared #for Linux
--#LIB_OPTION= -bundle -undefined dynamic_lookup #for MacOS X
--
- # Lua version number (first and second digits of target version)
- LUA_VERSION_NUM= 514
--LIBNAME= $T.so
-+LIBNAME = liblua$T.so
-+
-+# Lua flags
-+LUA_CPPFLAGS = $(shell pkg-config --cflags lua)
--OPENSSL_LIBS= -lcrypto -lssl
--OPENSSL_INCS= -I/usr/include/openssl
-+# Openssl flags
-+OPENSSL_LIBS = $(shell pkg-config --libs openssl)
-+OPENSSL_CPPFLAGS = $(shell pkg-config --cflags openssl)
- # Compilation directives
--WARN= -O2 -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
--INCS= -I$(LUA_INC)
--CFLAGS= -shared $(WARN) $(OPENSSL_INCS) $(INCS)
--CC= gcc
-+CC ?= gcc
-+CFLAGS += -Wall -fPIC -W -Waggregate-return -Wcast-align -Wmissing-prototypes -Wnested-externs -Wshadow -Wwrite-strings
-+CPPFLAGS += $(OPENSSL_CPPFLAGS) $(LUA_CPPFLAGS)
-+LDFLAGS += -shared
-+LIBS += $(OPENSSL_LIBS)
---- Makefile
-+++ Makefile
-@@ -4,6 +4,10 @@
- include $(CONFIG)
-+PREFIX ?= /usr/local
-+LIBDIR ?= lib
-+LUAINCDIR = $(shell pkg-config --variable=includedir lua)
-+
- OBJS= src/l$T.o
- SRCS= src/l$T.h src/l$T.c
- TESTS=tests/*.lua
-@@ -11,11 +15,13 @@
- lib: src/$(LIBNAME)
- src/$(LIBNAME): $(OBJS)
--      export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) $(CFLAGS) $(LIB_OPTION) -o src/$(LIBNAME) $(OBJS) $(OPENSSL_LIBS)
-+      $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o src/$(LIBNAME) $(OBJS) $(LIBS)
- install: src/$(LIBNAME)
--      mkdir -p $(LUA_LIBDIR)
--      cp src/$(LIBNAME) $(LUA_LIBDIR)
-+      install -d ${DESTDIR}${LUAINCDIR}
-+      install -m644 src/lcrypto.h ${DESTDIR}${LUAINCDIR}/lcrypto.h
-+      install -d ${DESTDIR}${PREFIX}/${LIBDIR}
-+      install -m755 src/$(LIBNAME) ${DESTDIR}${PREFIX}/${LIBDIR}/$(LIBNAME)
- clean:
-       rm -f src/$(LIBNAME) $(OBJS) $(COMPAT_O)
diff --git a/dev-lua/luacrypto/luacrypto-0.3.0_p20120413.ebuild b/dev-lua/luacrypto/luacrypto-0.3.0_p20120413.ebuild
deleted file mode 100644 (file)
index be585bf..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Lua Crypto Library"
-HOMEPAGE="https://github.com/LuaDist/luacrypto"
-SRC_URI="mirror://github/hasufell/tinkerbox/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/lua-5.1
-       dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig"
-
-pkg_setup() {
-       tc-export CC
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/20120413-makefile.patch
-}
-
-src_install() {
-       if use doc; then
-               dodoc README
-               dohtml -r doc/*
-       fi
-
-       emake \
-               DESTDIR="${D}" \
-               PREFIX="/usr" \
-               LIBDIR=$(get_libdir) \
-               install
-}
-
-pkg_postinst() {
-       elog "Note that upstream names the library \"crypto.so\"."
-       elog "and not \"libluacrypto.so\"."
-}
diff --git a/dev-lua/luacrypto/luacrypto-0.3.1_p20120320.ebuild b/dev-lua/luacrypto/luacrypto-0.3.1_p20120320.ebuild
new file mode 100644 (file)
index 0000000..ce37d4c
--- /dev/null
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit autotools
+
+DESCRIPTION="Lua Crypto Library"
+HOMEPAGE="https://github.com/mkottman/luacrypto.git" # most active fork
+SRC_URI="mirror://github/hasufell/tinkerbox/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/lua-5.1
+       dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+src_configure() {
+       econf \
+               --htmldir=/usr/share/doc/${PF}/html
+}
+
+src_test() {
+       emake test
+}