Version bump per bug #285944, includes natively the system-lua patch, translations updates, import patch from upstream bug #594014 in order to fix a typo for system lua check (AM_CONDITIONNAL)

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

4 files changed, 72 insertions, 2 deletions

diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog
index 7e5e4cc8da56..b94712da6d29 100644
--- a/x11-themes/gtk-engines/ChangeLog
+++ b/x11-themes/gtk-engines/ChangeLog
@@ -1,6 +1,15 @@
 # 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.147 2009/09/03 10:46:19 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.148 2009/09/23 09:23:09 mrpouet Exp $
+
+*gtk-engines-2.18.3 (23 Sep 2009)
+
+  23 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+  +gtk-engines-2.18.3.ebuild,
+  +files/gtk-engines-2.18.3-fix-system-lua-check.patch:
+  Version bump per bug #285944, includes natively the system-lua patch,
+  translations updates, import patch from upstream bug #594014 in order to
+  fix a typo for system lua check (AM_CONDITIONNAL).
 
   03 Sep 2009; Romain Perier <mrpouet@gentoo.org>
   gtk-engines-2.18.2-r1.ebuild, files/gtk-engines-2.18.2-system-lua.patch:
diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest
index 55fb9238c021..7aa40e38a30f 100644
--- a/x11-themes/gtk-engines/Manifest
+++ b/x11-themes/gtk-engines/Manifest
@@ -1,8 +1,11 @@
 AUX gtk-engines-2.18.2-system-lua.patch 5576 RMD160 7a313c239a923ebb9ad2428761d154eb165a85af SHA1 8919b991c740a66f01c8134cb687af1c23272c51 SHA256 ebb19c712ee6e2ce6d7f87e4d4396a8ef057b428522050389176feb09c4a53fa
+AUX gtk-engines-2.18.3-fix-system-lua-check.patch 862 RMD160 c14e110e1c2f604e6b42d8034d78c6d29ca39428 SHA1 3c5d009bfe73237927bb0dbe78f3a815c485b1a3 SHA256 5d1ab916b9146859cbdde2af627d63c69faad41438fd747e14ca2476fd3ee9bb
 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
+DIST gtk-engines-2.18.3.tar.bz2 605104 RMD160 b03ef6bbfd5b9dfd18c0b1d3586c084d5c51602e SHA1 f66efb8785b576126b5f57d99d985042b9614f5c SHA256 51593f77e5e425dccc3ee5b76cd81b4d706e04e3d9f3814679886fe015351975
 EBUILD gtk-engines-2.16.1.ebuild 715 RMD160 6b84ee59d056edc716bbe9dc30577a17f0389041 SHA1 c3ecd3238725e4c6275e585c0141db1ba4c5e763 SHA256 d2431df4fbe9768012b07b63e194a223f169315a67bf009b07f432710eee7662
 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 19308 RMD160 d5c4e9dacda225b1d55e2192c081a40a8e53e592 SHA1 9341718767fe3500ce9febbaaa754e39dda19d46 SHA256 0fd50c1727d0dd6f9ba2625e998e3a485bd2e64ca27067754c683d4eaa377582
+EBUILD gtk-engines-2.18.3.ebuild 1083 RMD160 c9aa1ce9e45a58bb8c23542fd9178d150eb38bcc SHA1 85b31304d8d074d292b709a53eda244441eadb19 SHA256 68d09760f5f4444cd630ad691509f913a4cd2622c4a522e9cb4d1b762a4d768f
+MISC ChangeLog 19680 RMD160 310aab52d78c4579250d6af1e4506251e26d9822 SHA1 03ed77838867c1a7f1885f14a16cfd4ac3ca98d6 SHA256 61950f8192df98c84d238b9ccc7a57cae8ced24d3c7a58bf83923b04e6f02ab5
 MISC metadata.xml 568 RMD160 55afc3bd5e963a38ca159fe1855fb86c1d205ed1 SHA1 fefe96510715292236a409394ac78e1b092043bc SHA256 cfae48dc83100358d4370ba22eaa6284c74288b749e2f34525358e3627fa8a89
diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.18.3-fix-system-lua-check.patch b/x11-themes/gtk-engines/files/gtk-engines-2.18.3-fix-system-lua-check.patch
new file mode 100644
index 000000000000..b6413f7ee249
--- /dev/null
+++ b/x11-themes/gtk-engines/files/gtk-engines-2.18.3-fix-system-lua-check.patch
@@ -0,0 +1,21 @@
+From 5a5eb6dd706179da9294e939ede807170b99c1a5 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <benjamin@sipsolutions.net>
+Date: Tue, 22 Sep 2009 09:43:28 +0000
+Subject: Correct the SYSTEM_LUA conditional check. (patch from bug #594014)
+
+---
+diff --git a/configure.ac b/configure.ac
+index 06f388c..9061044 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ AC_ARG_ENABLE(deprecated,	[  --disable-deprecated    disable deprecated function
+ 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=$withval], 	[system_lua="no"])
+ 
+-AM_CONDITIONAL([SYSTEM_LUA], [test x$system_lua = xtrue])
++AM_CONDITIONAL([SYSTEM_LUA], [test x$system_lua = xyes])
+ 
+ BUILD_ENGINES=""
+ BUILD_THEMES=""
+--
+cgit v0.8.2
diff --git a/x11-themes/gtk-engines/gtk-engines-2.18.3.ebuild b/x11-themes/gtk-engines/gtk-engines-2.18.3.ebuild
new file mode 100644
index 000000000000..e73cacb4776e
--- /dev/null
+++ b/x11-themes/gtk-engines/gtk-engines-2.18.3.ebuild
@@ -0,0 +1,37 @@
+# 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.3.ebuild,v 1.1 2009/09/23 09:23:09 mrpouet Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="GTK+2 standard engines and themes"
+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 lua"
+
+RDEPEND=">=x11-libs/gtk+-2.12
+	lua? ( dev-lang/lua )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.31
+	>=dev-util/pkgconfig-0.9"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-animation $(use_enable lua) $(use_with lua system-lua)"
+	use accessibility || G2CONF="${G2CONF} --disable-hc"
+}
+src_prepare() {
+	gnome2_src_prepare
+	# Fix typo in AM_CONDITIONNAL for system lua feature,
+	# upstream bug #594014.
+	epatch "${FILESDIR}"/${P}-fix-system-lua-check.patch
+	intltoolize --automake --copy --force || die "intltoolize failed"
+	eautoreconf
+}