Move scons to DEPEND wrt #220441. Remove old versions and keyword ~amd64 for testing.

Package-Manager: portage-2.1.5

6 files changed, 15 insertions, 114 deletions

diff --git a/dev-lang/toluapp/ChangeLog b/dev-lang/toluapp/ChangeLog
index 373f9d64e26e..20be9a724bbb 100644
--- a/dev-lang/toluapp/ChangeLog
+++ b/dev-lang/toluapp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/toluapp
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/ChangeLog,v 1.16 2007/03/26 09:17:13 opfer Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/ChangeLog,v 1.17 2008/05/17 18:40:27 drac Exp $
+
+  17 May 2008; Samuli Suominen <drac@gentoo.org>
+  -files/toluapp-1.0.2-gentoo.patch, -toluapp-1.0.2.ebuild,
+  -toluapp-1.0.7_p1.ebuild, toluapp-1.0.92.ebuild:
+  Move scons to DEPEND wrt #220441. Remove old versions and keyword ~amd64
+  for testing.
 
   26 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   toluapp-1.0.92.ebuild:
diff --git a/dev-lang/toluapp/Manifest b/dev-lang/toluapp/Manifest
index f987e83d8a8e..1b472a63986f 100644
--- a/dev-lang/toluapp/Manifest
+++ b/dev-lang/toluapp/Manifest
@@ -1,9 +1,4 @@
-AUX toluapp-1.0.2-gentoo.patch 829 RMD160 9e995be94f9081b3729aae517c5b685e2a6e82ee SHA1 cdd04d5fc8f39879528f320837deb165c87a3998 SHA256 cf5a0342352a03bf933b8c396d10832034bef7d6aee99efbac7d648708351a9b
-DIST tolua++-1.0.2.tar.bz2 138866 RMD160 6a787b73e5a33ad2f632805ef46162a4bb09f168 SHA1 780f50d2b2011eb0743d4823fd0cdbf413e75c6b SHA256 ea0d5414e68c7a9d28f7f8df069386f08b7aa381820ee0a8d20b8dbbcc04ef0e
 DIST tolua++-1.0.92.tar.bz2 153961 RMD160 8feeaddbfbef1728d2928ae99393b343b3d01f0f SHA1 f8315776cb36ad675ef6319a78af1cfa79d173f9 SHA256 fd2199f669d7d7c11f5451001ee1601add263203b2522363b3632411437e4fac
-DIST tolua++_1.0.7-1.tar.gz 297902 RMD160 b5fd091722c67fb2c839bc3b99e90e3ecd67248f SHA1 eb3f0434e5ac6845ad65a3759156b76b9d235e30 SHA256 98b7beb123b3b44abe2a740198217ff7d5243f991469118d25b096eceed2be5e
-EBUILD toluapp-1.0.2.ebuild 907 RMD160 bf39a2532d0190e57c2b9b1aabdb8cf0b3a856b0 SHA1 125096cbce7f544f630f4e32744dff15d6d246f5 SHA256 67d2427994739262f0f84022126d5df45707ae76c1ef401706fe71b51dd71a05
-EBUILD toluapp-1.0.7_p1.ebuild 967 RMD160 befdf69b5319bf4e74dcbb622004ef965b172e35 SHA1 04e1b94703aa154b7e27ff2281b4084746a77c22 SHA256 f88ccff6f02c4b37f1be40814008b93539a73ae71c512598bfc84ec4d78b8f4d
-EBUILD toluapp-1.0.92.ebuild 998 RMD160 6150f369074106f627b7ab0cccbcf6745c0c8542 SHA1 19c9c17cb7f06bd79a2a44ad18ed59439c0b978f SHA256 58ab4834f0c0c7581c98d1cfb27ca65bfc3e712b249f09d65dc2d4a5ffe9528e
-MISC ChangeLog 1888 RMD160 615042284252b6b8f56d04b6bb39b180bbc9794c SHA1 873f2a79cc37d2e3ca29ec5106a7becf76bcd462 SHA256 5dd65322a1b49c346b1576ff39fb4da9343d4274f37b65ce57fea66af526fc4a
+EBUILD toluapp-1.0.92.ebuild 1025 RMD160 b0cc3499e55eab6f63c6d85e20ea843e5fa3567b SHA1 d2fe9b9ac990d04098814eb10719d2bdbd5717cb SHA256 79fc642fb5bdad82e2d9e10a3ea414de88c825d5300a57c3b6258ae46de93b48
+MISC ChangeLog 2138 RMD160 0405e441fc36761fbbc8cf6251886a03fc84f0ec SHA1 0b37cc630d31f0900cd9e45fde3140cf297a0c51 SHA256 ee65aa65525fd8cd6c091841dde8a8caf2a5e73262ccc1f6a1817213871bc6c5
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
diff --git a/dev-lang/toluapp/files/toluapp-1.0.2-gentoo.patch b/dev-lang/toluapp/files/toluapp-1.0.2-gentoo.patch
deleted file mode 100644
index 35be06176d5c..000000000000
--- a/dev-lang/toluapp/files/toluapp-1.0.2-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur tolua++-1.0.2/config_linux.py tolua++/config_linux.py
---- tolua++-1.0.2/config_linux.py	2003-10-23 10:56:24.000000000 +0200
-+++ tolua++/config_linux.py	2004-05-09 15:48:57.414493136 +0200
-@@ -3,7 +3,6 @@
- # use 'scons -h' to see the list of command line options available

- 

- # Compiler flags (based on Debian's installation of lua)

--CCFLAGS = ['-I/usr/include/lua50']

- 

- # this is the default directory for installation. Files will be installed on

- # <prefix>/bin, <prefix>/lib and <prefix>/include when you run 'scons install'

-@@ -13,8 +12,8 @@
- #

- # You can see more 'generic' options for POSIX systems on config_posix.py

- 

--prefix = '/usr/local'

-+prefix = '/usr'

- 

- # libraries (based on Debian's installation of lua)

--LIBS = ['lua50', 'lualib50', 'dl', 'm']

-+LIBS = ['lua', 'lualib', 'dl', 'm']

- 

diff --git a/dev-lang/toluapp/toluapp-1.0.2.ebuild b/dev-lang/toluapp/toluapp-1.0.2.ebuild
deleted file mode 100644
index 950f17339448..000000000000
--- a/dev-lang/toluapp/toluapp-1.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/toluapp-1.0.2.ebuild,v 1.6 2005/04/24 12:36:15 hansmi Exp $
-
-inherit eutils toolchain-funcs
-
-MY_PN=${PN/toluapp/tolua++}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A tool to integrate C/C++ code with Lua."
-HOMEPAGE="http://www.codenix.com/~tolua/"
-SRC_URI="http://www.codenix.com/~tolua/${MY_P}.tar.bz2"
-KEYWORDS="x86 ppc"
-LICENSE="as-is"
-SLOT="0"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=dev-lang/lua-5
-	dev-util/scons
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/toluapp-1.0.2-gentoo.patch
-}
-
-src_compile() {
-	scons CC="$(tc-getCC)" CCFLAGS="${CFLAGS}" LINK="$(tc-getCC)" all
-}
-
-src_install() {
-	dobin bin/tolua++
-	dolib.a lib/libtolua++.a
-	insinto /usr/include
-	doins include/tolua++.h
-	dodoc INSTALL README
-	dohtml doc/*
-}
diff --git a/dev-lang/toluapp/toluapp-1.0.7_p1.ebuild b/dev-lang/toluapp/toluapp-1.0.7_p1.ebuild
deleted file mode 100644
index 7818517b1f10..000000000000
--- a/dev-lang/toluapp/toluapp-1.0.7_p1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/toluapp-1.0.7_p1.ebuild,v 1.1 2006/04/05 21:24:44 twp Exp $
-
-inherit eutils toolchain-funcs
-
-MY_PN=${PN/toluapp/tolua++}
-MY_PV=${PV/_p/-}
-MY_P=${MY_PN}_${MY_PV}
-DESCRIPTION="A tool to integrate C/C++ code with Lua."
-HOMEPAGE="http://www.codenix.com/~tolua/"
-SRC_URI="http://www.codenix.com/~tolua/${MY_P}.tar.gz"
-KEYWORDS="~x86 ~ppc"
-LICENSE="as-is"
-SLOT="0"
-IUSE=""
-S=${WORKDIR}/${MY_PN}-${PV/_*/}
-
-DEPEND=">=dev-lang/lua-5
-	dev-util/scons
-	>=sys-apps/sed-4"
-
-src_compile() {
-	sed -i -e "s/lua50/lua/g" -e "s/lualib50/lualib/" ${S}/config_linux.py
-	scons \
-		CC=$(tc-getCC) \
-		CCFLAGS="${CFLAGS}" \
-		LINK=$(tc-getCC) \
-		prefix=${D}/usr \
-		install || die
-}
-
-src_install() {
-	dobin bin/tolua++
-	dolib.a lib/libtolua++.a
-	insinto /usr/include
-	doins include/tolua++.h
-	dodoc INSTALL README
-	dohtml doc/*
-}
diff --git a/dev-lang/toluapp/toluapp-1.0.92.ebuild b/dev-lang/toluapp/toluapp-1.0.92.ebuild
index 3de1f7a76984..6f2070d4111c 100644
--- a/dev-lang/toluapp/toluapp-1.0.92.ebuild
+++ b/dev-lang/toluapp/toluapp-1.0.92.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/toluapp-1.0.92.ebuild,v 1.3 2007/03/26 09:17:13 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/toluapp/toluapp-1.0.92.ebuild,v 1.4 2008/05/17 18:40:27 drac Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,13 +9,14 @@ MY_P=${MY_PN}-${PV}
 DESCRIPTION="A tool to integrate C/C++ code with Lua."
 HOMEPAGE="http://www.codenix.com/~tolua/"
 SRC_URI="http://www.codenix.com/~tolua/${MY_P}.tar.bz2"
-KEYWORDS="ppc x86"
+KEYWORDS="~amd64 ppc x86"
 LICENSE="as-is"
 SLOT="0"
 IUSE=""
 S=${WORKDIR}/${MY_P}
 
-DEPEND=">=dev-lang/lua-5.1.1
+RDEPEND=">=dev-lang/lua-5.1.1"
+DEPEND="${RDEPEND}
 	dev-util/scons
 	>=sys-apps/sed-4"