summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-10-06 00:37:36 +0200
committerUlrich Müller <ulm@gentoo.org>2012-10-06 00:37:36 +0200
commit91e8122f98927a69d3d2039d53e39e372c537af7 (patch)
tree31f32749d823af7aab4685185bba59a7fc5cbc68 /app-editors/emacs-xwidget
parentVersion bump. Add metadata.xml. (diff)
downloademacs-91e8122f98927a69d3d2039d53e39e372c537af7.tar.gz
emacs-91e8122f98927a69d3d2039d53e39e372c537af7.tar.bz2
emacs-91e8122f98927a69d3d2039d53e39e372c537af7.zip
With USE=xwidgets, add webkit-gtk as dependency and enable gtk3.
(Portage version: 2.1.11.24/git/Linux x86_64, signed Manifest commit with key 7DC6EA25)
Diffstat (limited to 'app-editors/emacs-xwidget')
-rw-r--r--app-editors/emacs-xwidget/ChangeLog4
-rw-r--r--app-editors/emacs-xwidget/Manifest30
-rw-r--r--app-editors/emacs-xwidget/emacs-xwidget-24.2.9999.ebuild22
3 files changed, 36 insertions, 20 deletions
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index c1a03d2..d3bab1f 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Oct 2012; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.2.9999.ebuild:
+ With USE=xwidgets, add webkit-gtk as dependency and enable gtk3. Drop ~hppa
+ and ~sh keywords.
+
*emacs-xwidget-24.2.9999 (04 Oct 2012)
04 Oct 2012; Ulrich Müller <ulm@gentoo.org> -emacs-xwidget-24.0.9999.ebuild,
diff --git a/app-editors/emacs-xwidget/Manifest b/app-editors/emacs-xwidget/Manifest
index 3cb6b32..ab4d5ca 100644
--- a/app-editors/emacs-xwidget/Manifest
+++ b/app-editors/emacs-xwidget/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-EBUILD emacs-xwidget-24.2.9999.ebuild 10786 SHA256 d123dcf70d3c27ed63f8e76fd581d655213e253d7e16fe859a8e578784eda362 SHA512 2b9ecaa8414c3d68acc1e3804c515d946da7ec11e378162fe5e40940dc3706ba7b50f27a11bf99c376a9a3146d7c1d4138363d0b1b74accc7544e6ce6880478a WHIRLPOOL 15b2f27cca593f6fda2a7686abad3498922602b9f6f05123c170c134095f6ad6108fcda405a2829a69196fd668796d7de3c891a33d9ea9638054985418c99b45
-MISC ChangeLog 490 SHA256 85e816eb7e006097df111aa7a8dffd2755efbbc3fd995bb1886fc1f0e10afb15 SHA512 07da3334944da0dd0ad1a047cd7923b30ede97d4d0e2da281ac51153599182849de8d042a5d57212e157a28ea332efa678fa53402fbbfb79c4915ed7f4444eb6 WHIRLPOOL 0fdcca99ddd3196f8627a18d001e51d4944b374c0dc54638ac78c1237e7945198a168671994780fb70cdafc43717e5ffa5aa50d43027a5fc4ced075ac556c5c4
+EBUILD emacs-xwidget-24.2.9999.ebuild 11068 SHA256 fb280a28484a91ab1f369839e78ee92f08d9df250777b0582f6bc35ddcbd4501 SHA512 495377cee4061c5bed3fcf268d804c52dd9fc040709aeb59ab581fe6451f984067822b4698e2326792f37dd0298297e02ed98e0ae0393791b2700d4434c8cffa WHIRLPOOL a283977b06bbac342f14e8828d2319354be414f008327a55faee6e319b67294ae99cbad84bee48893bc062c759f669fbc54604565ad404192ebf44b21f7a1431
+MISC ChangeLog 668 SHA256 d56290ad3c9b27d2d2181579c79ed779ac0200738d70231b82ebd8a456db7a57 SHA512 3125b4832e9affef4f066d8a9f4f0a08ac44f996dd422eb2b49695144132fe0e69f3f063671d91fdc55e2de9eaf69679882b086664af32e9de5aa00deb6e0e5c WHIRLPOOL e7a370c1d39e1db60da9f9147416c7cb0daf441eacc1973650bb40e5a7df08ecb0ef92fcf25f81248476739526469bc82aab88f59f1dc7105a2fe088b2e39cda
MISC metadata.xml 2510 SHA256 d8bd6bc0fc3e060d81b24d6ba1502e2774f75e65a255cdf53a78ad1d39876836 SHA512 daf94df4e6dec88573d3057c9488a267eb7bcad7bcc17c37aaf8677719dfe374b4ea1c29aff539d92da942a0b0ae91dcdb3db5d8745090bad2e8bc2e522c0b39 WHIRLPOOL 49aa7387d3c848240cd4797b5957396990c9c865ae3614fe96d18ecf818902c2cb6fcfbe7a77d1d96a84fdc9afe01bdbf068b26fc78037a9b3e03f5a6b34400f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQbfkiAAoJEDxpGckxwJCBDqkP/3c3pyqysZv9irsxKOdgc3of
-6FkcMD+F4NqkDcdzHXtk8S9AST4u0rBGtVD4WqYLHWe1duciuEdbaAvklxrBHLQt
-uBw80ahH50lxX/3pwKp6XuchGZDhlLHDHzjWgIdw5hSQC+8SpB6jGNvtC7ecs9rv
-lDiXiFC10+kKRnPASeQnzdwGkDv6Ydu9JHfI+wojo1ttJVCAKkNRdSwhoi3XULAR
-4NAbDamVwqon8UNSxxU0kYGTm5S1edK5SrXM0O5ZCHxOOuFlsm/Gzm1iqKzgbROS
-pKGv2MWbStVO9a13epPYtLmo0LJI+tp02C7zEyVP1Sq241xq8PGqjPL4eorDIh/e
-nXnRVkxgtxDF4wpoxZyrMdfsaKYhnlF56Pk8glDRtyjwmnR+0Ewez6B3mIblmWVy
-eIxgYq0vQKMvzROiNbZfKCJH7x34EWhdYd3vtckdgd6F8m9/QNQ/2DKZ5BE/g5v3
-sXxlUonTQv61H3eFJZtezEeN3RMiaMWZ/BbbLGn7bRSYVbGh0F5HNhLaCpKyq4sB
-uS0o8Bp/nqzlnWJj2GNCAUMjSkyJJ9c1JX/npySDF1iTdTdZ/+Wem9Gt2xDM9vOv
-nXSWlQWBJstr52UT/3fAgy7PaE5KjEZszv/5zLhwmRVBFWbniOOolH+nydk9FA6H
-qk60iU41iTwfdMA210EZ
-=FsU+
+iQIcBAEBCAAGBQJQb2EwAAoJEDxpGckxwJCB74kP/1ysAQjaV7i1V0O+rAGr3Usn
+BSkjoDA+9KEObl3zWjZjpHh2RKW2BXsA1jfv2brQCFzxCRPLqJUpM0stTJwjVKaI
+eiDvb9zdQEFhqR9rPIN4c5lB7dKDmii8Jj3Ky795cB9mjBt1JL510kXKRX33Um36
+V2bL7aN6kGOq4bR/50UYFLYDTWiCQSfPV1oyn3f8vUarYqV2AKSTm6q6ce/QVfgO
+eoHNmXkDtA/lCXUdUih6vGgyZissJMr6Rc4b1woe8n+QPuXUGIr7wprF19Ew6POB
+I4F9+jmQ1Q9nQkO6OE5YARYNXoBfH3OuJkGPBzP63v1h8xTbGepGuJ4INIgecp3y
+CNH+JDPLFId9yTJpf4Ll+ucFVIJ9++w6aVe4ev/R4QmvDP1trI6KMwGdOrX7hzKC
+gMwNWkH8NRBVtIP0nuuJua5Xbtp93GEMc5QgjKoERJcHFdyIBIUToiY2ZhXhSNJ2
+wrMzaX1hcLRewvM+zSBlDx1Tj9sNGTlyuQSgUjKy8mTSAIgjQvUMTxJ0BGVL+aK6
+lZLL51V9P1swUaT76w9aDp5DrKLHjJegsxZuv2Y7QAc+a9IDIMdgNEwlwAgbCgL+
+j7SuWwSm/yp1h1pfdiyGj5jboi767b9ITDj7u8JToouc3QK865gzXCCDMSy8z7N5
+18/KEGZ+h4uk8fyX9r0f
+=5hDv
-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.2.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.2.9999.ebuild
index 72f9660..c7e6f97 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.2.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.2.9999.ebuild
@@ -31,7 +31,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets"
RDEPEND="sys-libs/ncurses
@@ -69,8 +69,14 @@ RDEPEND="sys-libs/ncurses
)
)
gtk? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
+ xwidgets? (
+ x11-libs/gtk+:3
+ net-libs/webkit-gtk:3
+ )
+ !xwidgets? (
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
+ )
)
!gtk? (
Xaw3d? ( x11-libs/libXaw3d )
@@ -171,8 +177,12 @@ src_configure() {
if use gtk; then
einfo "Configuring to build with GIMP Toolkit (GTK+)"
- myconf="${myconf} --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
- myconf="${myconf} $(use_with xwidgets)"
+ if use xwidgets; then
+ myconf="${myconf} --with-x-toolkit=gtk3 --with-xwidgets"
+ else
+ myconf="${myconf} --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+ myconf="${myconf} --without-xwidgets"
+ fi
local f
for f in athena Xaw3d motif; do
use ${f} && ewarn "USE flag \"${f}\" ignored" \
@@ -190,6 +200,8 @@ src_configure() {
einfo "Configuring to build with no toolkit"
myconf="${myconf} --with-x-toolkit=no"
fi
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
else
myconf="${myconf} --without-x --without-ns"
fi