dcallagh-exheres

commit 8e6381dece4b832cc114813b9665489853a7900e
parent 98debe62aab8e1ad85596a7381ccf6c4d0f2db89
Author: Dan Callaghan <djc@djc.id.au>
Date:   Sun,  3 Jul 2011 22:02:18 +1000

luaexpat

Diffstat:
M
metadata/categories.conf
 | 
1
+
A
packages/dev-lua/luaexpat/files/luaexpat-1.2.0-paths.patch
 | 
58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
packages/dev-lua/luaexpat/luaexpat-1.2.0.exheres-0
 | 
25
+++++++++++++++++++++++++

3 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/metadata/categories.conf b/metadata/categories.conf
@@ -3,6 +3,7 @@ app-backup
 app-text
 dev-haskell
 dev-libs
+dev-lua
 dev-python
 dev-scm
 gnome-desktop
diff --git a/packages/dev-lua/luaexpat/files/luaexpat-1.2.0-paths.patch b/packages/dev-lua/luaexpat/files/luaexpat-1.2.0-paths.patch
@@ -0,0 +1,58 @@
+diff -ur luaexpat-1.2.0.orig/config luaexpat-1.2.0/config
+--- luaexpat-1.2.0.orig/config	2011-06-04 00:17:04.000000000 +1000
++++ luaexpat-1.2.0/config	2011-07-03 21:58:23.449064365 +1000
+@@ -1,12 +1,8 @@
+ # Installation directories
+ # System's libraries directory (where binary libraries are installed)
+-LUA_LIBDIR= /usr/local/lib/lua/5.0
++LUA_LIBDIR= /usr/lib/lua/5.1
+ # System's lua directory (where Lua libraries are installed)
+-LUA_DIR= /usr/local/share/lua/5.0
++LUA_DIR= /usr/share/lua/5.1
+-# Lua includes directory
+-LUA_INC= /usr/local/include
+-# Expat includes directory
+-EXPAT_INC= /usr/local/include
+ 
+ # OS dependent
+ LIB_OPTION= -shared #for Linux
+@@ -17,8 +13,7 @@
+ # (according to Lua 5.1 definition:
+ # first version digit * 100 + second version digit
+ # e.g. Lua 5.0.2 => 500, Lua 5.1 => 501, Lua 5.1.1 => 501)
+-LUA_VERSION_NUM= 500
++LUA_VERSION_NUM= 501
+-COMPAT_DIR= ../compat/src
+ 
+ # Compilation parameters
+ CWARNS = -Wall -pedantic \
+@@ -31,6 +26,6 @@
+         -Wshadow \
+         -Wwrite-strings
+ 
+-CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \
+-   -I$(COMPAT_DIR) -I$(EXPAT_INC)
++CFLAGS ?= -O2
++CFLAGS += $(CWARNS) -ansi -fPIC $(shell pkg-config --cflags lua)
+-CC = gcc
++CC ?= gcc
+diff -ur luaexpat-1.2.0.orig/makefile luaexpat-1.2.0/makefile
+--- luaexpat-1.2.0.orig/makefile	2011-06-04 00:17:04.000000000 +1000
++++ luaexpat-1.2.0/makefile	2011-07-03 20:24:04.777166552 +1000
+@@ -18,11 +18,11 @@
+ 	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
+ 
+ install:
+-	mkdir -p $(LUA_LIBDIR)
++	mkdir -p $(DESTDIR)$(LUA_LIBDIR)
+-	cp src/$(LIBNAME) $(LUA_LIBDIR)
++	cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR)
+-	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
++	cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
+-	mkdir -p $(LUA_DIR)/$T
++	mkdir -p $(DESTDIR)$(LUA_DIR)/$T
+-	cp src/$T/lom.lua $(LUA_DIR)/$T
++	cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T
+ 
+ clean:
+ 	rm -f src/$(LIBNAME) $(OBJS)
diff --git a/packages/dev-lua/luaexpat/luaexpat-1.2.0.exheres-0 b/packages/dev-lua/luaexpat/luaexpat-1.2.0.exheres-0
@@ -0,0 +1,25 @@
+# Copyright 2011 Dan Callaghan <djc@djc.id.au>
+# Distributed under the terms of the GNU General Public License v2
+
+SUMMARY="SAX XML parser library for Lua, based on Expat"
+HOMEPAGE="http://matthewwild.co.uk/projects/${PN}/"
+DOWNLOADS="http://matthewwild.co.uk/projects/${PN}/${PNV}.tar.gz"
+
+LICENCES="MIT"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+
+DEPENDENCIES="
+    build+run:
+        dev-lang/lua[>=5.1]
+        dev-libs/expat
+"
+
+BUGS_TO="djc@djc.id.au"
+
+DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}/${PNV}-paths.patch" )
+
+src_configure() {
+    :
+}
+