Version bump.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 97 insertions, 5 deletions

diff --git a/dev-lua/lpeg/ChangeLog b/dev-lua/lpeg/ChangeLog
index 85d22f537208..ba39666d2209 100644
--- a/dev-lua/lpeg/ChangeLog
+++ b/dev-lua/lpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lua/lpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/lpeg/ChangeLog,v 1.8 2014/12/09 09:54:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lpeg/ChangeLog,v 1.9 2014/12/17 01:25:11 radhermit Exp $
+
+*lpeg-0.12.1 (17 Dec 2014)
+
+  17 Dec 2014; Tim Harder <radhermit@gentoo.org> +lpeg-0.12.1.ebuild,
+  +files/lpeg-0.12.1-makefile.patch:
+  Version bump.
 
   09 Dec 2014; Jeroen Roovers <jer@gentoo.org> lpeg-0.12.ebuild:
   Stable for HPPA (bug #526016).
diff --git a/dev-lua/lpeg/Manifest b/dev-lua/lpeg/Manifest
index 1b48fbb46950..5b109139f44f 100644
--- a/dev-lua/lpeg/Manifest
+++ b/dev-lua/lpeg/Manifest
@@ -2,14 +2,21 @@
 Hash: SHA256
 
 AUX lpeg-0.12-makefile.patch 833 SHA256 0d3614bc95a706bbe31be40406b7e5e0f00152f8c0d12c947b7b65250d621509 SHA512 50b880fca90ff5d833ea83ce66aae1a5c846d20ea161ef317f9d926c7d4327687d09eb95c70b7a5b0f63096c31df028c5a7edd6b361753a53ef75519cdcf0d55 WHIRLPOOL f1600193dedf7b8f0b36cb6f9e428dd0c64dfe97680db77ce1c68cb165654b8d630da27e391e03687aec6e204a003efe243a09f596416c7abf90bb1864868d72
+AUX lpeg-0.12.1-makefile.patch 820 SHA256 2fd3cfdcdfeb1f3a556b16b6f40b77543c2b571d7a77edcf376f0436ad9f50c9 SHA512 8f49c6c3b1575cc77d0d9d6c8b75098889af1f8fda58fee1f58150669909e6c4ecbd953738e9c917adcbb1bddc16debe5564b70694d6983295439e06e26782d6 WHIRLPOOL 617fdf2eda8351c469bfbd1c9bb25b7036565a6e8898b6281d250213e8da43354d0057f7f6b7668538bdb8bbc662ee8f23bba94dfe48bf04e49f106d8e3611c6
+DIST lpeg-0.12.1.tar.gz 67519 SHA256 60c6752dd043034c01929b04dab377d139f53bc098710cf735be53dd603fa22a SHA512 8cd47e169ce97c2eb40b865b0ef975b7a8fc58de1bde504518d9396b2a12efd92e7b2cfa1ccca59dd6a0cc22444fd1915a09e0d17fe78ba2a59bc3748546f60c WHIRLPOOL 0053b5df6c71b4b99d32f00c16b6156d7c96b4298059a17b8233c253db874117afd8daf217e19f8688a809b6f19f2293bca855af0c10c916b9fa22b29d43ad4b
 DIST lpeg-0.12.tar.gz 66649 SHA256 efa545144cd219eee823af7624d90f78c2230677ba740b7151c5d0c303778b76 SHA512 bf8c4fe486f5e965b793d8526dd1fc5c8905c4b065a1abe52ec8e41ebbe48292315a7460dc56fb7a029b4673057f9da7e53854bb79bb54dd8a4378391efc24a2 WHIRLPOOL 3e131da888eff53fbfa6203ed363f34832c52fb0fafca9006dd1da956c89a76528dc9aaf255426a148497c55df74ccb72cf87e234f5c432c4e2c28a5dfd0a9a1
+EBUILD lpeg-0.12.1.ebuild 910 SHA256 c093207f4aeee039517c72d37f10e4de1df8e2e8e720f89649836d90ba9dd2c3 SHA512 6859582c99ec801c5bf3809b91d4781ccd14d72f5db9b00f8f5755472310dca4f5d92583f0c030325ebe386d45a5a703896a2cb47f9da3d58e17e2386f90d0e4 WHIRLPOOL c7b760d566a8e1c314ab06c61511a270140b598d4b210d9cb59e475e09e76816a0d6b4409a3bf2e4d3b4111ee6487a651f02bc4b2a3c8c46ee741292be3cf60a
 EBUILD lpeg-0.12.ebuild 899 SHA256 053617eec2badb739e2f3233fa6b68d127588aa084649cfc6965d02c280980ba SHA512 beebf238f8080a56581688cf2660e3f27c0bcaed361c67f49cc48db9f652647cd81be55dbc18ea8837954689fdf83d5b80a35bf8bd6a34f78c5bb0718fedda73 WHIRLPOOL b0379958ae65c35d83fbb64b9cc0fa36a2c56b3e2bc2540c7932dd55752be5716961a2eee7207cf39b884119718917e8f7a280429b52c91f9c9c8a946f79cb35
-MISC ChangeLog 1101 SHA256 bf8473da7cede88e23e8080d95457673712b0a7fd534fb6994aca4c25393f2e1 SHA512 acf4b49cd34f9e36aadfb6863e197efd29b7417b24f1bb15ae6e661656853307e53f3bc0d23e8faa465828add0a09d59a9bb59dbb3391dff2eb1689c3edeb13a WHIRLPOOL fd176d9447645a2032f5a339294ac0dabc544edc2b461ad85a23c0828fe4073d517346fe22f652b1e32fd2b87544de50a4c0c829bb8a4a720e7811a836c41a21
+MISC ChangeLog 1259 SHA256 d5ccbc99d63ff93e2fcd40935a87e624c36b982bbc9ace56994d710b94628372 SHA512 1afbbdf26a7881f90f5682224bfd422b58f0b3e521e3591f6e7c8baa54c578f9deb0f69a2fb2b9278aad98c5eccdeb0c9dbd5cca9dbfd95caaf2640a092f258a WHIRLPOOL 343bf960d1adab1bce89538607562483b9137c75cb638a80f3fe6c67bea24539073803ee69c6b30407db36f8b46cf5e80b565e61f42cb072df46ec61bde3fb67
 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSGxr4ACgkQVWmRsqeSphPiiQCfeA4HpGfEGBVufbamSUd1lUu6
-QYQAn3XPaK94kUEiOE5cxG+Z8jiGCoDT
-=bL2+
+iQEcBAEBCAAGBQJUkNuCAAoJEEqz6FtPBkyj1W8H/0Gli6qi0qIwD/25kXF3scsI
+5OriKqmUcdHb/xJqtQm7lS6I6KUgXdWVuEv51B/eO5Zud4UuHAq3ni6WeCdwqKMX
+iXVnD9vAiTSv/017G7Nkm2ZGPHcCyc+DcDuWWDKbl858HMBYVESTXqAMc3h75M2j
+a/PBKiVYowGCmxBaztO1it77+l4xT7K2Vg6u3C3KOUynbwaT8mN+nk5aac4rMSRs
+IyR98RD/Qgf5Qnb0icUsYBplFQ4xFn7+b/+trsPRSpPOqHV2CQ9Upsu5Kca+eVAU
+Bgf1ZLU4A3Mrggw/urd3LBHlAeXWdJPwxlPYK3rijcA9XuQy6ZSd81uudc2WTxM=
+=K5rt
 -----END PGP SIGNATURE-----
diff --git a/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
new file mode 100644
index 000000000000..a0be0558aa97
--- /dev/null
+++ b/dev-lua/lpeg/files/lpeg-0.12.1-makefile.patch
@@ -0,0 +1,37 @@
+--- lpeg-0.12.1/makefile
++++ lpeg-0.12.1/makefile
+@@ -1,7 +1,7 @@
+ LIBNAME = lpeg
+ LUADIR = ../lua/
+ 
+-COPT = -O2
++#COPT = -O2
+ # COPT = -DLPEG_DEBUG -g
+ 
+ CWARNS = -Wall -Wextra -pedantic \
+@@ -22,21 +22,21 @@
+ # -Wunreachable-code \
+ 
+ 
+-CFLAGS = $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
++CFLAGS += $(CWARNS) $(COPT) -std=c99 -I$(LUADIR) -fPIC
+ CC = gcc
+ 
+ FILES = lpvm.o lpcap.o lptree.o lpcode.o lpprint.o
+ 
+ # For Linux
+ linux:
+-	make lpeg.so "DLLFLAGS = -shared -fPIC"
++	$(MAKE) lpeg.so "DLLFLAGS = -shared -fPIC"
+ 
+ # For Mac OS
+ macosx:
+-	make lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
++	$(MAKE) lpeg.so "DLLFLAGS = -bundle -undefined dynamic_lookup"
+ 
+ lpeg.so: $(FILES)
+-	env $(CC) $(DLLFLAGS) $(FILES) -o lpeg.so
++	env $(CC) $(DLLFLAGS) $(LDFLAGS) $(FILES) -o lpeg.so
+ 
+ $(FILES): makefile
+ 
diff --git a/dev-lua/lpeg/lpeg-0.12.1.ebuild b/dev-lua/lpeg/lpeg-0.12.1.ebuild
new file mode 100644
index 000000000000..01ace250a448
--- /dev/null
+++ b/dev-lua/lpeg/lpeg-0.12.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lpeg/lpeg-0.12.1.ebuild,v 1.1 2014/12/17 01:25:11 radhermit Exp $
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs eutils multilib
+
+DESCRIPTION="Parsing Expression Grammars for Lua"
+HOMEPAGE="http://www.inf.puc-rio.br/~roberto/lpeg/"
+SRC_URI="http://www.inf.puc-rio.br/~roberto/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~x86"
+IUSE="debug doc"
+
+RDEPEND=">=dev-lang/lua-5.1"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	use debug && append-cflags -DLPEG_DEBUG
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	lua test.lua || die
+}
+
+src_install() {
+	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+	doexe lpeg.so
+
+	dodoc HISTORY
+
+	use doc && dohtml *
+}