fixed bug #354355, removed old stuff

(Portage version: 2.2.0_alpha23/cvs/Linux x86_64)

8 files changed, 48 insertions, 202 deletions

diff --git a/www-client/luakit/ChangeLog b/www-client/luakit/ChangeLog
index 87cac1d3e069..8466bc047890 100644
--- a/www-client/luakit/ChangeLog
+++ b/www-client/luakit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/luakit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.14 2011/01/06 20:43:41 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/ChangeLog,v 1.15 2011/02/14 07:49:34 wired Exp $
+
+*luakit-2010.12.25-r1 (14 Feb 2011)
+
+  14 Feb 2011; Alex Alexander <wired@gentoo.org> -luakit-2010.08.07.ebuild,
+  -luakit-2010.08.13.ebuild, -luakit-2010.08.30-r1.ebuild,
+  luakit-2010.09.24.ebuild, -luakit-2010.12.25.ebuild,
+  +luakit-2010.12.25-r1.ebuild, +files/luakit-2010.12.25-fix-deprecated.patch,
+  luakit-9999.ebuild:
+  fixed bug #354355, removed old stuff
 
 *luakit-2010.12.25 (06 Jan 2011)
 
diff --git a/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch b/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch
new file mode 100644
index 000000000000..71eba8942bfc
--- /dev/null
+++ b/www-client/luakit/files/luakit-2010.12.25-fix-deprecated.patch
@@ -0,0 +1,25 @@
+Change handling of "argument table" in `lousy/util.lua` from
+deprecated (Lua 5.0) to modern (5.1 and up) syntax.
+
+written by Stjujsckij Nickolaj
+
+https://bugs.gentoo.org/show_bug.cgi?id=354355
+https://github.com/mason-larobina/luakit/commit/99b1bb394beff0dd872dd822c930d412b98d00a9
+--- a/lib/lousy/util.lua
++++ b/lib/lousy/util.lua
+@@ -98,9 +98,9 @@ end
+ -- @return A new table containing all keys from the arguments.
+ function table.join(...)
+     local ret = {}
+-    for i = 1, arg.n do
+-        if arg[i] then
+-            for k, v in pairs(arg[i]) do
++    for i, tbl in pairs({...}) do
++        if tbl then
++            for k, v in pairs(tbl) do
+                 if type(k) == "number" then
+                     rtable.insert(ret, v)
+                 else
+-- 
+1.7.4.rc3
+
diff --git a/www-client/luakit/luakit-2010.08.07.ebuild b/www-client/luakit/luakit-2010.08.07.ebuild
deleted file mode 100644
index 0799c61a9bd6..000000000000
--- a/www-client/luakit/luakit-2010.08.07.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.08.07.ebuild,v 1.2 2010/08/14 18:26:54 wired Exp $
-
-EAPI=3
-
-IUSE=""
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/mason-larobina/luakit.git"}
-	EGIT_BRANCH="develop"
-	EGIT_COMMIT="develop"
-	KEYWORDS=""
-	SRC_URI=""
-else
-	inherit base
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://github.com/mason-larobina/${PN}/tarball/${PV} -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua"
-HOMEPAGE="http://www.luakit.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	>=dev-lang/lua-5.1
-	dev-libs/glib:2
-	dev-libs/libxdg-basedir
-	net-libs/libsoup
-	net-libs/webkit-gtk
-	x11-libs/gtk+:2
-"
-
-DEPEND="
-	dev-util/gperf
-	${RDEPEND}
-"
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/mason-larobina-luakit-*
-		S=$(pwd)
-	fi
-}
-
-src_compile() {
-	emake PREFIX="/usr"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install ||
-		die "Installation failed"
-}
diff --git a/www-client/luakit/luakit-2010.08.13.ebuild b/www-client/luakit/luakit-2010.08.13.ebuild
deleted file mode 100644
index 13714407ce77..000000000000
--- a/www-client/luakit/luakit-2010.08.13.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.08.13.ebuild,v 1.2 2010/08/14 18:26:54 wired Exp $
-
-EAPI=3
-
-IUSE=""
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/mason-larobina/luakit.git"}
-	EGIT_BRANCH="develop"
-	EGIT_COMMIT="develop"
-	KEYWORDS=""
-	SRC_URI=""
-else
-	inherit base
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://github.com/mason-larobina/${PN}/tarball/${PV} -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua"
-HOMEPAGE="http://www.luakit.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	>=dev-lang/lua-5.1
-	dev-libs/glib:2
-	dev-libs/libxdg-basedir
-	net-libs/libsoup
-	net-libs/webkit-gtk
-	x11-libs/gtk+:2
-"
-
-DEPEND="
-	dev-util/gperf
-	${RDEPEND}
-"
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/mason-larobina-luakit-*
-		S=$(pwd)
-	fi
-}
-
-src_compile() {
-	emake PREFIX="/usr"
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install ||
-		die "Installation failed"
-}
diff --git a/www-client/luakit/luakit-2010.08.30-r1.ebuild b/www-client/luakit/luakit-2010.08.30-r1.ebuild
deleted file mode 100644
index 251f8d70637c..000000000000
--- a/www-client/luakit/luakit-2010.08.30-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.08.30-r1.ebuild,v 1.2 2010/09/12 21:54:43 wired Exp $
-
-EAPI=3
-
-IUSE="helpers vim-syntax"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"git://github.com/mason-larobina/luakit.git"}
-	[[ ${EGIT_BRANCH} == "master" ]] && EGIT_BRANCH="develop"
-	[[ ${EGIT_COMMIT} == "master" ]] && EGIT_COMMIT=${EGIT_BRANCH}
-	KEYWORDS=""
-	SRC_URI=""
-else
-	inherit base
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://github.com/mason-larobina/${PN}/tarball/${PV} -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="fast, small, webkit-gtk based micro-browser extensible by lua"
-HOMEPAGE="http://www.luakit.org"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-COMMON_DEPEND="
-	>=dev-lang/lua-5.1
-	dev-libs/glib:2
-	net-libs/libsoup
-	net-libs/webkit-gtk
-	x11-libs/gtk+:2
-"
-
-DEPEND="
-	dev-util/gperf
-	sys-apps/help2man
-	${COMMON_DEPEND}
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	helpers? (
-		x11-misc/dmenu
-	)
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		git_src_prepare
-	else
-		cd "${WORKDIR}"/mason-larobina-luakit-*
-		S=$(pwd)
-	fi
-}
-
-src_compile() {
-	if [[ ${PV} == *9999* ]]; then
-		emake PREFIX="/usr"
-	else
-		emake PREFIX="/usr" VERSION="${PV}"
-	fi
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" DOCDIR="${D}/usr/share/doc/${PF}" install ||
-		die "Installation failed"
-
-	if use vim-syntax; then
-		local t
-		for t in $(ls "${S}"/extras/vim/); do
-			insinto /usr/share/vim/vimfiles/"${t}"
-			doins "${S}"/extras/vim/"${t}"/luakit.vim ||
-				die "vim-${t} doins failed"
-		done
-	fi
-}
diff --git a/www-client/luakit/luakit-2010.09.24.ebuild b/www-client/luakit/luakit-2010.09.24.ebuild
index 5973b109ca1e..91853dbc41a4 100644
--- a/www-client/luakit/luakit-2010.09.24.ebuild
+++ b/www-client/luakit/luakit-2010.09.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.09.24.ebuild,v 1.1 2010/09/24 10:04:31 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.09.24.ebuild,v 1.2 2011/02/14 07:49:34 wired Exp $
 
 EAPI=3
 
@@ -26,7 +26,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 COMMON_DEPEND="
-	>=dev-lang/lua-5.1
+	>=dev-lang/lua-5.1[deprecated]
 	dev-libs/glib:2
 	net-libs/libsoup
 	net-libs/webkit-gtk
diff --git a/www-client/luakit/luakit-2010.12.25.ebuild b/www-client/luakit/luakit-2010.12.25-r1.ebuild
index ca71104b12f2..e22c552a2103 100644
--- a/www-client/luakit/luakit-2010.12.25.ebuild
+++ b/www-client/luakit/luakit-2010.12.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.12.25.ebuild,v 1.1 2011/01/06 20:43:41 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-2010.12.25-r1.ebuild,v 1.1 2011/02/14 07:49:34 wired Exp $
 
 EAPI=3
 
@@ -47,12 +47,18 @@ RDEPEND="
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 "
 
+PATCHES=(
+	# bug 354355
+	"${FILESDIR}/${P}-fix-deprecated.patch"
+)
+
 src_prepare() {
 	if [[ ${PV} == *9999* ]]; then
 		git_src_prepare
 	else
 		cd "${WORKDIR}"/mason-larobina-luakit-*
 		S=$(pwd)
+		base_src_prepare
 	fi
 }
 
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index a51b98dc9fbc..6215b2efa0d7 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.11 2010/11/06 11:05:18 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/luakit/luakit-9999.ebuild,v 1.12 2011/02/14 07:49:34 wired Exp $
 
 EAPI=3
 
@@ -53,6 +53,7 @@ src_prepare() {
 	else
 		cd "${WORKDIR}"/mason-larobina-luakit-*
 		S=$(pwd)
+		base_src_prepare
 	fi
 }