| 1 |
tetromino 14/01/05 08:17:07 |
| 2 |
|
| 3 |
Modified: ChangeLog gedit-2.30.4.ebuild |
| 4 |
Log: |
| 5 |
Fix underlinking failure (bug #497110, thanks to d_dart). |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.362 app-editors/gedit/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/ChangeLog?rev=1.362&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/ChangeLog?rev=1.362&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/ChangeLog?r1=1.361&r2=1.362 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v |
| 19 |
retrieving revision 1.361 |
| 20 |
retrieving revision 1.362 |
| 21 |
diff -u -r1.361 -r1.362 |
| 22 |
--- ChangeLog 24 Dec 2013 15:28:59 -0000 1.361 |
| 23 |
+++ ChangeLog 5 Jan 2014 08:17:07 -0000 1.362 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-editors/gedit |
| 26 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.361 2013/12/24 15:28:59 pacho Exp $ |
| 28 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.362 2014/01/05 08:17:07 tetromino Exp $ |
| 30 |
+ |
| 31 |
+ 05 Jan 2014; Alexandre Rostovtsev <tetromino@g.o> gedit-2.30.4.ebuild, |
| 32 |
+ +files/gedit-2.30.4-underlinking.patch: |
| 33 |
+ Fix underlinking failure (bug #497110, thanks to d_dart). |
| 34 |
|
| 35 |
*gedit-3.10.3 (24 Dec 2013) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.14 app-editors/gedit/gedit-2.30.4.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild?rev=1.14&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild?rev=1.14&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild?r1=1.13&r2=1.14 |
| 45 |
|
| 46 |
Index: gedit-2.30.4.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v |
| 49 |
retrieving revision 1.13 |
| 50 |
retrieving revision 1.14 |
| 51 |
diff -u -r1.13 -r1.14 |
| 52 |
--- gedit-2.30.4.ebuild 3 May 2012 18:33:00 -0000 1.13 |
| 53 |
+++ gedit-2.30.4.ebuild 5 Jan 2014 08:17:07 -0000 1.14 |
| 54 |
@@ -1,12 +1,13 @@ |
| 55 |
-# Copyright 1999-2012 Gentoo Foundation |
| 56 |
+# Copyright 1999-2014 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v 1.13 2012/05/03 18:33:00 jdhore Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-2.30.4.ebuild,v 1.14 2014/01/05 08:17:07 tetromino Exp $ |
| 60 |
|
| 61 |
EAPI="3" |
| 62 |
GCONF_DEBUG="no" |
| 63 |
+GNOME2_LA_PUNT="yes" |
| 64 |
PYTHON_DEPEND="python? 2:2.5" |
| 65 |
|
| 66 |
-inherit gnome2 multilib python eutils |
| 67 |
+inherit autotools gnome2 multilib python eutils |
| 68 |
|
| 69 |
DESCRIPTION="A text editor for the GNOME desktop" |
| 70 |
HOMEPAGE="http://live.gnome.org/Gedit" |
| 71 |
@@ -58,23 +59,22 @@ |
| 72 |
} |
| 73 |
|
| 74 |
src_prepare() { |
| 75 |
- gnome2_src_prepare |
| 76 |
- |
| 77 |
# Do not fail if remote mounting is not supported. |
| 78 |
epatch "${FILESDIR}/${PN}-2.30.2-tests-skip.patch" |
| 79 |
|
| 80 |
+ # Underlinking for gmodule and libICE, bug #497110 |
| 81 |
+ epatch "${FILESDIR}/${P}-underlinking.patch" |
| 82 |
+ |
| 83 |
+ rm missing || die # old missing file causes autoreconf warnings |
| 84 |
+ eautoreconf |
| 85 |
+ |
| 86 |
+ gnome2_src_prepare |
| 87 |
+ |
| 88 |
# disable pyc compiling |
| 89 |
mv "${S}"/py-compile "${S}"/py-compile.orig |
| 90 |
ln -s $(type -P true) "${S}"/py-compile |
| 91 |
} |
| 92 |
|
| 93 |
-src_install() { |
| 94 |
- gnome2_src_install |
| 95 |
- |
| 96 |
- # Installed for plugins, but they're dlopen()-ed |
| 97 |
- find "${D}" -name "*.la" -delete || die "remove of la files failed" |
| 98 |
-} |
| 99 |
- |
| 100 |
pkg_postinst() { |
| 101 |
gnome2_pkg_postinst |
| 102 |
use python && python_mod_optimize /usr/$(get_libdir)/gedit-2/plugins |
Archives