summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Bickel <mabi@gentoo.org>2012-03-19 20:49:45 +0000
committerMatti Bickel <mabi@gentoo.org>2012-03-19 20:49:45 +0000
commite2d8f8ee87ab9211ff6b6eb273bd4b802f294ce2 (patch)
tree075109fd4d541033826549c4842fd17b14374600 /dev-lang/lua
parentDrop ia64/sparc keywords (diff)
downloadgentoo-2-e2d8f8ee87ab9211ff6b6eb273bd4b802f294ce2.tar.gz
gentoo-2-e2d8f8ee87ab9211ff6b6eb273bd4b802f294ce2.tar.bz2
gentoo-2-e2d8f8ee87ab9211ff6b6eb273bd4b802f294ce2.zip
deprecated patch from 5.1.4 applies to 5.1.5, too (bug #408827)
(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/lua')
-rw-r--r--dev-lang/lua/ChangeLog5
-rw-r--r--dev-lang/lua/lua-5.1.5.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-lang/lua/ChangeLog b/dev-lang/lua/ChangeLog
index 1a6d8887e8be..81f1e0487d8c 100644
--- a/dev-lang/lua/ChangeLog
+++ b/dev-lang/lua/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/lua
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.159 2012/03/17 21:23:08 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/ChangeLog,v 1.160 2012/03/19 20:49:45 mabi Exp $
+
+ 19 Mar 2012; Matti Bickel <mabi@gentoo.org> lua-5.1.5.ebuild:
+ deprecated patch from 5.1.4 applies to 5.1.5, too (bug #408827)
*lua-5.2.0-r1 (17 Mar 2012)
diff --git a/dev-lang/lua/lua-5.1.5.ebuild b/dev-lang/lua/lua-5.1.5.ebuild
index a0d423e89d12..b608d7550325 100644
--- a/dev-lang/lua/lua-5.1.5.ebuild
+++ b/dev-lang/lua/lua-5.1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.5.ebuild,v 1.1 2012/03/17 20:41:46 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.1.5.ebuild,v 1.2 2012/03/19 20:49:45 mabi Exp $
EAPI=4
@@ -34,8 +34,9 @@ src_prepare() {
sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
if ! use deprecated ; then
- epatch "${FILESDIR}"/${P}-deprecated.patch
- epatch "${FILESDIR}"/${P}-test.patch
+ # patches from 5.1.4 still apply
+ epatch "${FILESDIR}"/${PN}-5.1.4-deprecated.patch
+ epatch "${FILESDIR}"/${PN}-5.1.4-test.patch
fi
if ! use readline ; then