rhill 14/05/23 08:21:26
Modified: ChangeLog wxGTK-2.8.12.1-r1.ebuild
wxGTK-3.0.0.0.ebuild
Removed: wxGTK-2.8.12.1.ebuild
Log:
Restore gconf dep to 2.8 (bug #501672). Apply libpath hack to 3.0.0.0 as
well (bug #499984).
Signed-off-by: Ryan Hill <rh...@gentoo.org>
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
957A8463)
Revision Changes Path
1.314 x11-libs/wxGTK/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.314&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?rev=1.314&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/ChangeLog?r1=1.313&r2=1.314
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- ChangeLog 19 Mar 2014 16:14:28 -0000 1.313
+++ ChangeLog 23 May 2014 08:21:26 -0000 1.314
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/wxGTK
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.313 2014/03/19
16:14:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.314 2014/05/23
08:21:26 rhill Exp $
+
+ 23 May 2014; Ryan Hill <rh...@gentoo.org> -wxGTK-2.8.12.1.ebuild,
+ wxGTK-2.8.12.1-r1.ebuild, wxGTK-3.0.0.0.ebuild:
+ Restore gconf dep to 2.8 (bug #501672). Apply libpath hack to 3.0.0.0 as
+ well (bug #499984).
19 Mar 2014; Agostino Sarubbo <a...@gentoo.org> wxGTK-2.8.12.1-r1.ebuild:
Stable for alpha, wrt bug #499476
1.12 x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild?rev=1.12&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild?rev=1.12&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild?r1=1.11&r2=1.12
Index: wxGTK-2.8.12.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wxGTK-2.8.12.1-r1.ebuild 19 Mar 2014 16:14:28 -0000 1.11
+++ wxGTK-2.8.12.1-r1.ebuild 23 May 2014 08:21:26 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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-r1.ebuild,v
1.11 2014/03/19 16:14:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild,v
1.12 2014/05/23 08:21:26 rhill Exp $
EAPI="5"
@@ -37,6 +37,7 @@
x11-libs/pango[X]
gnome? ( gnome-base/libgnomeprintui:2.2 )
gstreamer? (
+ gnome-base/gconf:2
media-libs/gstreamer:0.10
media-libs/gst-plugins-base:0.10 )
opengl? ( virtual/opengl )
1.4 x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild?r1=1.3&r2=1.4
Index: wxGTK-3.0.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wxGTK-3.0.0.0.ebuild 27 Jan 2014 17:35:05 -0000 1.3
+++ wxGTK-3.0.0.0.ebuild 23 May 2014 08:21:26 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v 1.3
2014/01/27 17:35:05 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild,v 1.4
2014/05/23 08:21:26 rhill Exp $
EAPI="5"
@@ -65,6 +65,11 @@
src_prepare() {
epatch "${FILESDIR}"/${P}-collision.patch
+
+ # https://bugs.gentoo.org/421851
+ # https://bugs.gentoo.org/499984
+ sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
epatch_user
}
