[gentoo-commits] gentoo-x86 commit in x11-terms/gnome-terminal: gnome-terminal-2.32.1-r1.ebuild ChangeLog

["Alexandre Rostovtsev (tetromino)" <tetromino@gentoo.org>]

tetromino    14/01/02 23:58:54

  Modified:             gnome-terminal-2.32.1-r1.ebuild ChangeLog
  Log:
  Fix underlinking failure (bug #496804, thanks to M8R-u38wij).
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

Revision  Changes    Path
1.12                 x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild?r1=1.11&r2=1.12

Index: gnome-terminal-2.32.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-terminal-2.32.1-r1.ebuild	9 Apr 2013 16:45:12 -0000	1.11
+++ gnome-terminal-2.32.1-r1.ebuild	2 Jan 2014 23:58:54 -0000	1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild,v 1.11 2013/04/09 16:45:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild,v 1.12 2014/01/02 23:58:54 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -21,6 +21,7 @@
 	>=x11-libs/gtk+-2.18:2
 	>=gnome-base/gconf-2.31.3
 	>=x11-libs/vte-0.26.0:0
+	x11-libs/libICE
 	x11-libs/libSM
 	gnome-base/libgnome"
 DEPEND="${RDEPEND}
@@ -33,6 +34,12 @@
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
+src_prepare() {
+	# fix underlinking, bug #496804; avoid eautoreconf
+	sed -e 's/SMCLIENT_PKGS="sm"/SMCLIENT_PKGS="sm ice"/' -i configure.ac configure || die
+	gnome2_src_prepare
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if [[ ${REPLACING_VERSIONS} < 2.32.1-r1 ]]; then



1.279                x11-terms/gnome-terminal/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/gnome-terminal/ChangeLog?rev=1.279&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/gnome-terminal/ChangeLog?rev=1.279&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-terms/gnome-terminal/ChangeLog?r1=1.278&r2=1.279

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v
retrieving revision 1.278
retrieving revision 1.279
diff -u -r1.278 -r1.279
--- ChangeLog	24 Dec 2013 17:44:09 -0000	1.278
+++ ChangeLog	2 Jan 2014 23:58:54 -0000	1.279
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/gnome-terminal
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.278 2013/12/24 17:44:09 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/gnome-terminal/ChangeLog,v 1.279 2014/01/02 23:58:54 tetromino Exp $
+
+  02 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-terminal-2.32.1-r1.ebuild:
+  Fix underlinking failure (bug #496804, thanks to M8R-u38wij).
 
 *gnome-terminal-3.10.2 (24 Dec 2013)