summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-09-09 20:52:43 +0200
committerMichał Górny <mgorny@gentoo.org>2015-09-09 20:52:43 +0200
commit86bf11a383f70d105cce050c6625f19677d0c885 (patch)
treedf4922a3b4c9281c3cad4a7d148b5db68163900a
parentapp-emulation/phpvirtualbox: Update header (diff)
parentsci-misc/boinc: Switch to wxGTK 3.0, fixes bug #556670 (diff)
downloadgentoo-86bf11a383f70d105cce050c6625f19677d0c885.tar.gz
gentoo-86bf11a383f70d105cce050c6625f19677d0c885.tar.bz2
gentoo-86bf11a383f70d105cce050c6625f19677d0c885.zip
Merge sci-misc/boinc: Mask USE=X on ~ia64 & ~sparc, use wxGTK 3.0
Pull-Request: https://github.com/gentoo/gentoo/pull/7 Fixes: https://bugs.gentoo.org/show_bug.cgi?id=556670
-rw-r--r--profiles/arch/ia64/package.use.mask4
-rw-r--r--profiles/arch/sparc/package.use.mask4
-rw-r--r--sci-misc/boinc/boinc-7.4.42-r1.ebuild (renamed from sci-misc/boinc/boinc-7.4.42.ebuild)4
3 files changed, 10 insertions, 2 deletions
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 98707f56e8ef..0bccfdc17696 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -277,3 +277,7 @@ dev-lisp/clisp hyperspec pari svm
# missing keywords
media-plugins/gst-plugins-meta dts dv lame libvisual modplug mms taglib vcd wavpack
+
+# Marius Brehler <marfbre@linux.sungazer.de> (13 Aug 2015)
+# missing keyword
+>=sci-misc/boinc-7.4.42-r1 X
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 2c81a64d755f..b75b6b5e5bc5 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -321,3 +321,7 @@ net-libs/ortp srtp
# Ultrabug <ultrabug@gentoo.org) (05 Sept 2011)
# missing keyword for net-libs/zeromq
app-admin/rsyslog zeromq
+
+# Marius Brehler <marfbre@linux.sungazer.de> (13 Aug 2015)
+# missing keyword
+>=sci-misc/boinc-7.4.42-r1 X
diff --git a/sci-misc/boinc/boinc-7.4.42.ebuild b/sci-misc/boinc/boinc-7.4.42-r1.ebuild
index 2cfff07888ef..40a8b1660034 100644
--- a/sci-misc/boinc/boinc-7.4.42.ebuild
+++ b/sci-misc/boinc/boinc-7.4.42-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
virtual/jpeg:0=
x11-libs/gtk+:2
>=x11-libs/libnotify-0.7
- x11-libs/wxGTK:2.8[X,opengl]
+ x11-libs/wxGTK:3.0[X,opengl,webkit]
)
"
DEPEND="${RDEPEND}
@@ -74,7 +74,7 @@ src_configure() {
# look for wxGTK
if use X; then
- WX_GTK_VER="2.8"
+ WX_GTK_VER="3.0"
need-wxwidgets unicode
myeconfargs+=(--with-wx-config="${WX_CONFIG}")
else