summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2014-01-02 23:58:54 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2014-01-02 23:58:54 +0000
commitb5fb127c58435419c5bf5856c22d3f5778d01142 (patch)
tree5001d8a268bc5088d4f2d834bde923989f2bc27b /x11-terms
parentVersion bump. (diff)
downloadgentoo-2-b5fb127c58435419c5bf5856c22d3f5778d01142.tar.gz
gentoo-2-b5fb127c58435419c5bf5856c22d3f5778d01142.tar.bz2
gentoo-2-b5fb127c58435419c5bf5856c22d3f5778d01142.zip
Fix underlinking failure (bug #496804, thanks to M8R-u38wij).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'x11-terms')
-rw-r--r--x11-terms/gnome-terminal/ChangeLog8
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild11
2 files changed, 15 insertions, 4 deletions
diff --git a/x11-terms/gnome-terminal/ChangeLog b/x11-terms/gnome-terminal/ChangeLog
index 06c369583b3c..9658f7ebb1d2 100644
--- a/x11-terms/gnome-terminal/ChangeLog
+++ b/x11-terms/gnome-terminal/ChangeLog
@@ -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)
diff --git a/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild
index 53f75cb02b23..1595771f00ab 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-2.32.1-r1.ebuild
@@ -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 @@ RDEPEND=">=dev-libs/glib-2.25.12:2
>=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 @@ DEPEND="${RDEPEND}
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