Add lua USE-flag per bug #283407, Fix the patch which did not work with --enable-animation --disable-lua --without-system-lua.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 26 insertions, 21 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index e8e91344e279..7e5e4cc8da56 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/gtk-engines
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.146 2009/08/31 20:16:07 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.147 2009/09/03 10:46:19 mrpouet Exp $
+
+  03 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+  gtk-engines-2.18.2-r1.ebuild, files/gtk-engines-2.18.2-system-lua.patch:
+  Add lua USE-flag per bug #283407, Fix the patch which did not work with
+  --enable-animation --disable-lua --without-system-lua.
 
   31 Aug 2009; Romain Perier <mrpouet@gentoo.org>
   gtk-engines-2.18.2-r1.ebuild:
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index dae37a6591f9..55fb9238c021 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -1,8 +1,8 @@
-AUX gtk-engines-2.18.2-system-lua.patch 5373 RMD160 e45cac6b11dcfbf5614162135812d80bf055ed99 SHA1 1e19f3ec6a3b8acee3aa303b321a64f1190991e8 SHA256 5eb05bc37d9e0397f83c99d1adccf8bab245460bfbfd983a652bdf8fab50c40e
+AUX gtk-engines-2.18.2-system-lua.patch 5576 RMD160 7a313c239a923ebb9ad2428761d154eb165a85af SHA1 8919b991c740a66f01c8134cb687af1c23272c51 SHA256 ebb19c712ee6e2ce6d7f87e4d4396a8ef057b428522050389176feb09c4a53fa
 DIST gtk-engines-2.16.1.tar.bz2 588253 RMD160 72d84e5a4d1e32345a40249ead9579d3ee73badb SHA1 d2d3ba7377b72a54cee99cbc546e19b3fc508b41 SHA256 5ce5bd23df9c26444c92d415935622d5f1f7c1c9669ec5165607de05125dc2c1
 DIST gtk-engines-2.18.2.tar.bz2 663756 RMD160 014364d551fbc094dcd8fc30ad91a63b7b8255e5 SHA1 6f1fd455b28e8de6156a7d17fb012cf510bbabd3 SHA256 3e43b76e7af008fa0ab5d17f83ec7a98ff39637f0c2c34e51fc9503a633cdd1a
 EBUILD gtk-engines-2.16.1.ebuild 715 RMD160 6b84ee59d056edc716bbe9dc30577a17f0389041 SHA1 c3ecd3238725e4c6275e585c0141db1ba4c5e763 SHA256 d2431df4fbe9768012b07b63e194a223f169315a67bf009b07f432710eee7662
-EBUILD gtk-engines-2.18.2-r1.ebuild 1226 RMD160 358dd760c1173060995194aa7bc9027fc177244c SHA1 0bcf15c2eefcc3a3aa2b438e90e385e4f9f3ab90 SHA256 35eb0b1fdf02d562534de1eb4f916450ed15758c718e24fd3d318f2fadc78e92
+EBUILD gtk-engines-2.18.2-r1.ebuild 1151 RMD160 8a066c091ea6616053d968f88d6f0a5231122963 SHA1 ccbf58350a35959332899a17a1dbab4bcb54a6c2 SHA256 755eb9eb81a61731aed167cd5fb4c88cacced0dc96c81623990f3ceab79155c1
 EBUILD gtk-engines-2.18.2.ebuild 928 RMD160 960db624c016e6b1af583db59380c496443ac6a7 SHA1 54a0e2d2d402f5e3e941e1f09ed48ecac3965e41 SHA256 5297e3dc4e689be164b61ecae1bb88cae3dae0c360e3a9a1e932dcb96a1a0c6d
-MISC ChangeLog 19051 RMD160 c0b19bacfa399f8fbcc4e00863ec8ac211e267a7 SHA1 43ce536d2dc98f4e807dcb86ed58f037c10c8d2b SHA256 43f7e2a8d160a460e40f382e582ba508a13e0626a647577a2e1a3c8d24154e85
+MISC ChangeLog 19308 RMD160 d5c4e9dacda225b1d55e2192c081a40a8e53e592 SHA1 9341718767fe3500ce9febbaaa754e39dda19d46 SHA256 0fd50c1727d0dd6f9ba2625e998e3a485bd2e64ca27067754c683d4eaa377582
 MISC metadata.xml 568 RMD160 55afc3bd5e963a38ca159fe1855fb86c1d205ed1 SHA1 fefe96510715292236a409394ac78e1b092043bc SHA256 cfae48dc83100358d4370ba22eaa6284c74288b749e2f34525358e3627fa8a89
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch b/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch
index 418fbd3c9c4c..ea56941caac0 100644
--- a/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.18.2-system-lua.patch
@@ -1,23 +1,26 @@
-From 7508e8941bc664df0e7b8c952d82d901f9a95c75 Mon Sep 17 00:00:00 2001
-From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
-Date: Mon, 31 Aug 2009 16:09:55 +0300
-Subject: [PATCH] Added configure option to use system liblua for Lua engine.
+From 832010dc4c679a35103d2add5c7e6a28bf5f8b07 Mon Sep 17 00:00:00 2001
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Thu, 3 Sep 2009 12:35:15 +0200
+Subject: [PATCH] Add configure option to use lua system library instead of embedded version
+
+Fixed version: Replaced $enableval by $withval in AC_ARG_WITH(system-lua...),
+otherwises it was impossible to exec the configure script correctly with the following options:
+--enable-animation --disable-lua --without-system-lua, because LUA was checked anyway.
 
-Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
 ---
  configure.ac            |   10 ++++
  engines/lua/Makefile.am |  118 +++++++++++++++++++++++++----------------------
  2 files changed, 73 insertions(+), 55 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index df673ed..3c3ce2a 100644
+index df673ed..6273675 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -45,6 +45,9 @@ AC_ARG_ENABLE(paranoia, 	[  --enable-paranoia       use wall, werror, ansi, peda
  AC_ARG_ENABLE(deprecated,	[  --disable-deprecated    disable deprecated functions in gtk et al],	[deprecated=$enableval],		[deprecated="no"])
  
  AC_ARG_ENABLE(schemas,		[  --disable-schema        disable engine schemas],	[schemas=$enableval],	[schemas="yes"])
-+AC_ARG_WITH(system-lua,	[  --with-system-lua        link with system Lua library], 		[system_lua=$enableval], 	[system_lua="no"])
++AC_ARG_WITH(system-lua,	[  --with-system-lua        link with system Lua library], [system_lua=$withval], [system_lua="no"])
 +
 +AM_CONDITIONAL([SYSTEM_LUA], [test x$system_lua = xtrue])
  
@@ -179,5 +182,5 @@ index 736154d..6243e5a 100644
  -include $(top_srcdir)/git.mk
  
 -- 
-1.6.3.3
+1.6.4.2
 
diff --git a/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild
index 5e547ff92d67..bde1cdf90645 100644
--- a/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild
+++ b/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild,v 1.2 2009/08/31 20:16:07 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild,v 1.3 2009/09/03 10:46:19 mrpouet Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -13,10 +13,10 @@ HOMEPAGE="http://www.gtk.org/"
 LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility"
+IUSE="accessibility lua"
 
 RDEPEND=">=x11-libs/gtk+-2.12
-	dev-lang/lua"
+	lua? ( dev-lang/lua )"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.31
 	>=dev-util/pkgconfig-0.9"
@@ -24,18 +24,15 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} --enable-animation --enable-lua --with-system-lua"
+	G2CONF="${G2CONF} --enable-animation $(use_enable lua) $(use_with lua system-lua)"
 	use accessibility || G2CONF="${G2CONF} --disable-hc"
 }
-
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
 	# Don't use liblua embedded version, use system lib instead
-	# fix bug #255773, import from upstream bug #593674
+	# fix bug #255773, import from upstream bug #593674, FIXED VERSION
+	# (patch commented out)
 	epatch "${FILESDIR}"/${P}-system-lua.patch
 	intltoolize --automake --copy --force || die "intltoolize failed"
 	eautoreconf