| 1 |
mrpouet 09/09/03 10:46:20 |
| 2 |
|
| 3 |
Modified: gtk-engines-2.18.2-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add lua USE-flag per bug #283407, Fix the patch which did not work with --enable-animation --disable-lua --without-system-lua. |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: gtk-engines-2.18.2-r1.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.18.2-r1.ebuild,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- gtk-engines-2.18.2-r1.ebuild 31 Aug 2009 20:16:07 -0000 1.2 |
| 22 |
+++ gtk-engines-2.18.2-r1.ebuild 3 Sep 2009 10:46:19 -0000 1.3 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $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 $ |
| 27 |
+# $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 $ |
| 28 |
|
| 29 |
EAPI="2" |
| 30 |
GCONF_DEBUG="no" |
| 31 |
@@ -13,10 +13,10 @@ |
| 32 |
LICENSE="LGPL-2.1" |
| 33 |
SLOT="2" |
| 34 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
| 35 |
-IUSE="accessibility" |
| 36 |
+IUSE="accessibility lua" |
| 37 |
|
| 38 |
RDEPEND=">=x11-libs/gtk+-2.12 |
| 39 |
- dev-lang/lua" |
| 40 |
+ lua? ( dev-lang/lua )" |
| 41 |
DEPEND="${RDEPEND} |
| 42 |
>=dev-util/intltool-0.31 |
| 43 |
>=dev-util/pkgconfig-0.9" |
| 44 |
@@ -24,18 +24,15 @@ |
| 45 |
DOCS="AUTHORS ChangeLog NEWS README" |
| 46 |
|
| 47 |
pkg_setup() { |
| 48 |
- G2CONF="${G2CONF} --enable-animation --enable-lua --with-system-lua" |
| 49 |
+ G2CONF="${G2CONF} --enable-animation $(use_enable lua) $(use_with lua system-lua)" |
| 50 |
use accessibility || G2CONF="${G2CONF} --disable-hc" |
| 51 |
} |
| 52 |
- |
| 53 |
src_prepare() { |
| 54 |
gnome2_src_prepare |
| 55 |
|
| 56 |
- # Fix intltoolize broken file, see upstream #577133 |
| 57 |
- sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ |
| 58 |
- || die "sed failed" |
| 59 |
# Don't use liblua embedded version, use system lib instead |
| 60 |
- # fix bug #255773, import from upstream bug #593674 |
| 61 |
+ # fix bug #255773, import from upstream bug #593674, FIXED VERSION |
| 62 |
+ # (patch commented out) |
| 63 |
epatch "${FILESDIR}"/${P}-system-lua.patch |
| 64 |
intltoolize --automake --copy --force || die "intltoolize failed" |
| 65 |
eautoreconf |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.147 x11-themes/gtk-engines/ChangeLog |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/ChangeLog?rev=1.147&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/ChangeLog?rev=1.147&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/gtk-engines/ChangeLog?r1=1.146&r2=1.147 |
| 74 |
|
| 75 |
Index: ChangeLog |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v |
| 78 |
retrieving revision 1.146 |
| 79 |
retrieving revision 1.147 |
| 80 |
diff -u -r1.146 -r1.147 |
| 81 |
--- ChangeLog 31 Aug 2009 20:16:07 -0000 1.146 |
| 82 |
+++ ChangeLog 3 Sep 2009 10:46:19 -0000 1.147 |
| 83 |
@@ -1,6 +1,11 @@ |
| 84 |
# ChangeLog for x11-themes/gtk-engines |
| 85 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 86 |
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.146 2009/08/31 20:16:07 mrpouet Exp $ |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.147 2009/09/03 10:46:19 mrpouet Exp $ |
| 88 |
+ |
| 89 |
+ 03 Sep 2009; Romain Perier <mrpouet@g.o> |
| 90 |
+ gtk-engines-2.18.2-r1.ebuild, files/gtk-engines-2.18.2-system-lua.patch: |
| 91 |
+ Add lua USE-flag per bug #283407, Fix the patch which did not work with |
| 92 |
+ --enable-animation --disable-lua --without-system-lua. |
| 93 |
|
| 94 |
31 Aug 2009; Romain Perier <mrpouet@g.o> |
| 95 |
gtk-engines-2.18.2-r1.ebuild: |
Archives