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
commit895645288e74be9dcd2cbe8b37785bb8b78a5fb6 (patch)
tree4419aaaf506469d58a12ea3fea75e15c1398e5be /dev-lang
parentDrop ia64/sparc keywords (diff)
downloadhistorical-895645288e74be9dcd2cbe8b37785bb8b78a5fb6.tar.gz
historical-895645288e74be9dcd2cbe8b37785bb8b78a5fb6.tar.bz2
historical-895645288e74be9dcd2cbe8b37785bb8b78a5fb6.zip
deprecated patch from 5.1.4 applies to 5.1.5, too (bug #408827)
Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/lua/ChangeLog5
-rw-r--r--dev-lang/lua/Manifest4
-rw-r--r--dev-lang/lua/lua-5.1.5.ebuild7
3 files changed, 10 insertions, 6 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/Manifest b/dev-lang/lua/Manifest
index ff435eac4e5e..6133eb51e2bc 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -25,8 +25,8 @@ DIST lua-5.1.5.tar.gz 221213 RMD160 b0c2234675335a8bf158a125b6778cf800c754a0 SHA
DIST lua-5.2.0.tar.gz 246377 RMD160 6153bddd57493490b72e700cc99135432bf653f0 SHA1 08f84c355cdd646f617f09cebea48bd832415829 SHA256 cabe379465aa8e388988073d59b69e76ba0025429d2c1da80821a252cdf6be0d
EBUILD lua-5.1.4-r4.ebuild 3145 RMD160 bf486b578561b16a7c148430fa7a8c9c9ef15fef SHA1 947ce75e6f870b40f53b9df630f5b1df1e62e28f SHA256 e7bd80f13d14ab0ce5fd15fd2a8f665d04da2d26ec40b3a11af9f3e7355ff38a
EBUILD lua-5.1.4-r8.ebuild 3199 RMD160 5f45782eab260d044a43aba2212d0ac7c90d1387 SHA1 60fca10e077f2f549ccafa657875faaa0b55b2e0 SHA256 30f1cf4aa50bc2b2a45783f6b96e9710dc60c89f2c9bc97b6175a79d2ec16fec
-EBUILD lua-5.1.5.ebuild 3197 RMD160 e2723b2eb6c2bf1006ab51a795aadb57e1c7c8db SHA1 ced3e07805e95eb9346bd59a9ebc7575335fb807 SHA256 c36210eda5362963f1fddb9183213e3286034356da82e953b73003b8133af5ba
+EBUILD lua-5.1.5.ebuild 3246 RMD160 14a940c419c7cdb2f9a6a9f5682b8e60d7eed5c7 SHA1 6a829c4fc52ebc986f0f8ff5613713485cd7f08d SHA256 9cb006e69805e10c9c6f9a31bec274cbf0e11a693f50dd668eb70f5aa08d6da0
EBUILD lua-5.2.0-r1.ebuild 3010 RMD160 52c641f34f02e03eb51c89e1f01c0938e2ebdea7 SHA1 76a9940ecfb3e28cef6cf7cbdfdc088ee954d1da SHA256 1d92d023b0d09408186520a953adada0017c0721f76864bd1990c8d44d00cd40
EBUILD lua-5.2.0.ebuild 2936 RMD160 c81e275cddcca4af7f2487388d811753a656bd53 SHA1 78ee175a99c0bc357a770528905fbf1be82eef2a SHA256 4c047ef8e60e42de4b126df49d76ee0a86fd7ef5606c2aa6a3ee18ffd9787463
-MISC ChangeLog 24590 RMD160 43e770c9da1a0a209162041a7124b2c3017d0e5c SHA1 16facfdd51e3afe4aac89d0a2907b27fa26ec1d3 SHA256 4e53383be86d7a26fbb8878d978b43e59f1c99214cc69c1b9a70e42eaab2d285
+MISC ChangeLog 24721 RMD160 37c4de2c28115514a476270be9b09917bbe154cd SHA1 6664f572af6dfe280c367897a316578e49b081cc SHA256 625a7827fa930509d6c4a485b419d3d350a04d8387be016ac50a5a9f757b40a6
MISC metadata.xml 418 RMD160 ff4ea0d01af18280fc00136f8e502fd90f7d8b89 SHA1 25d2a98fa8edbd5bc471dacd60cbe1f3821b3383 SHA256 ecdbace4d7d07830cc308755b909384644dc449cf7a3f32faefeecf6d3752b55
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