summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-09-25 03:49:06 +0000
committerMike Frysinger <vapier@gentoo.org>2012-09-25 03:49:06 +0000
commit42902a891eb905614f22cefd1650c7921ca605c5 (patch)
treeaa800d99d6d429773a9bb63838d1a2f86140df19 /x11-libs/wxGTK
parentRemove old. (diff)
downloadgentoo-2-42902a891eb905614f22cefd1650c7921ca605c5.tar.gz
gentoo-2-42902a891eb905614f22cefd1650c7921ca605c5.tar.bz2
gentoo-2-42902a891eb905614f22cefd1650c7921ca605c5.zip
Fix setup of wx_cv_std_libpath #421851 by Xavier Miller.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/wxGTK')
-rw-r--r--x11-libs/wxGTK/ChangeLog5
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild6
2 files changed, 7 insertions, 4 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 613194c5064e..0cd4277df70c 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/wxGTK
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.295 2012/09/16 17:07:18 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.296 2012/09/25 03:49:06 vapier Exp $
+
+ 25 Sep 2012; Mike Frysinger <vapier@gentoo.org> wxGTK-2.8.12.1.ebuild:
+ Fix setup of wx_cv_std_libpath #421851 by Xavier Miller.
17 Sep 2012; Ryan Hill <dirtyepic@gentoo.org> wxGTK-2.9.3.1.ebuild:
SLOT gstreamer deps.
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
index c20aeeb98d6f..832d2acc88be 100644
--- a/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.12 2012/09/16 02:54:04 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1.ebuild,v 1.13 2012/09/25 03:49:06 vapier Exp $
EAPI="4"
-inherit eutils versionator flag-o-matic
+inherit eutils versionator flag-o-matic multilib
DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
HOMEPAGE="http://wxwidgets.org/"
@@ -71,7 +71,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874
epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923
sed \
- -e "/wx_cv_std_libpath/s: /usr: ${EPREFIX}/usr:g" \
+ -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
-i configure || die
}