Fix kernel configuration check, bug #504822. Clean up old revision.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

diff --git a/gnome-extra/gnome-boxes/ChangeLog b/gnome-extra/gnome-boxes/ChangeLog
index d627ce62be497ff182aad381e40385b5d95f7481..d645c83b4d543c5769222ec7d08678470e1e8bf6 100644 (file)
--- a/gnome-extra/gnome-boxes/ChangeLog
+++ b/gnome-extra/gnome-boxes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-boxes
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-boxes/ChangeLog,v 1.9 2014/07/24 18:20:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-boxes/ChangeLog,v 1.10 2014/12/21 11:23:11 eva Exp $
+
+  21 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-boxes-3.10.2.ebuild, gnome-boxes-3.12.3.ebuild:
+  Fix kernel configuration check, bug #504822. Clean up old revision.
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> gnome-boxes-3.10.2.ebuild,
   gnome-boxes-3.12.3.ebuild:

diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 9ab0ac56837c4b65bd2313cee89261c5e20b9963..8403de4d68c9d20ffd3c25d45ca6728195cae2a4 100644 (file)
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,20 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnome-boxes-3.10.2.tar.xz 1753384 SHA256 9e055627cff5f59323bc95ad65ab361fc26328854d5a421bd09c899c466f2ec4 SHA512 7c98faa7ab9c17c60a976e893b9ce2f7a43e93c0543c4289091a505f822a5c59907b3cd4e2b43c75223e39bea7fcd6631a952752baca1f81e6175896d4972095 WHIRLPOOL c525f34050075af605ff05368843f07d246ec3ada6121ad3c4606b4f2bd18d2ecb7f8949a0ca618da4a7a2f0d7f4c2cf70a2847b866d6ae2206966a00b87d48d
 DIST gnome-boxes-3.12.3.tar.xz 2197824 SHA256 bf57525106baaa635d08a4a4c6ed81e4b8c8708897f2fe7c2623810aec9b6408 SHA512 931cec25dfc9d5788f37ec9a49927b79117a31125302e4d95eaa144f8e8f313adf6190520ed626c078ba80d81ddf7c4b4b827f4da1f46cf9205d5b62f4182a11 WHIRLPOOL 76b5b2d8da7882efe88cc876853024fdcbc31fc2e62f98297986a138aa62180170529be1ab333cae67c1a3e533ced84aa8525ba6f759424baa5c2220a641a2b3
-EBUILD gnome-boxes-3.10.2.ebuild 2493 SHA256 c795943046bf9014a29d440a4700cde9ecd6afc30d83408973be7796876de9bc SHA512 91f98ebfff4504ec3576ca70f6f78e6ec6a9f4a7c4cf628faef3d9136167b3c342df04192a28230dec97c011c756245ccf983fc0b8681bb6e75920314a992670 WHIRLPOOL d6446851d6bd634021f3eb7245855271912b835848ca92b99a6f6e2bab4f6c97e2af875ab9ef70dcbb90b2c4881382f6dac0b938d525a5afaab3bbb38bd4a652
-EBUILD gnome-boxes-3.12.3.ebuild 2495 SHA256 174f587c068c69e7ca5bc6e3dea3f5261885dc6e34997cbc4bddd2c51fe496d0 SHA512 c32d000f5d18677c370c4944c0793f0a3135c6b0ff9dfee2c37df321e622f705298766096b3b2f1ce55d01fdfe784a191ad298802aaa8929300c4aad9d7bb90d WHIRLPOOL 0fda27eae426cc47ba4bd41ea97c0550d7b02eafb61114b1af54aaa634a5e93a099983dd755e7a07168a92a71a20c454cd14c99739a562089f403733ad81136b
-MISC ChangeLog 1451 SHA256 ccc11ee5457e82ef19fb6590cd7c6ff0dc5f907c633c50f969f5a21f67dc8a36 SHA512 d3199db2548fd090a1567bcd6cdb7ec9e2bb8e2bd700a83588f4b7bf9632664338a81618c187f695db265a774a20493de691abaa637d8bea0091700578356c39 WHIRLPOOL 8610660b23b391b730fc4224f942ce6beb3903ef7661d4abbe709a60f1da250a3fc619f52703ce931eb788f8636eb238c88898428678dc27e656b57c564b7747
+EBUILD gnome-boxes-3.12.3.ebuild 2534 SHA256 052806ac90f4bed57f86028e9d7694bad7949292c6021712b549625972bef5fb SHA512 0c1daf095bd3cfd26d4536c263f77d690c88600234626c6c5546430a7b1781f44c86c9eafac4a2b6940cb9fef9d105cb3d00a75f4d6630f80f7505ab752111ac WHIRLPOOL 8e75372ceff7448a5f3ee153233b4a9f42f86ffe383de3cb9dd44975defe2c0dd6860d8d0df8e837ca6456fdc307dafabc1cc03da8dcf0c74b0e5fe544dfc1fc
+MISC ChangeLog 1628 SHA256 52b1f2d4ef05a1e97ffe1d0f195a9f6965663f5b98933b9a46e060cac08b74a7 SHA512 4377e5232b322cf7189abccd76b735549a83227aa5068b688230dc1bac6ed0ca0fd16329709a3384c85762148546e251a9af7cdda14116743d57d29ebd70e52d WHIRLPOOL dd02c26134399a8b3587c54b65d448ab72e0214ad395c87437891c96d925091b9492dd775101a3835a9182cef8a17bbab5f32d0e60e65a76399af5b06a9a198f
 MISC metadata.xml 293 SHA256 975789115a155b336cdb334b400915714ea2751a8b7e2b3ea1d625ef217c7f5e SHA512 00e9f59a1910ed19e375aba020f9a7da70910cf898c29cc52a93ea95d201bf918d34a367d9f3ff2d6a1f19873f1e09f57a7dce9a786436691d1734f59de8f7dd WHIRLPOOL 6fb3bca81ab0cc0db8eda687e7f9f9f81785c120b2b17bc22017104e1118ef8c027b4c8d19d1d855bbfbdd867a7d551ae6b7f561a7dae944d27a5e6d1367aec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT0U5iAAoJEEdUh39IaPFNk84IAIykV0jsVm3GO9reKdFqy4cv
-phvUM0CUteq5Yw3I7wJh8NdXAVebM/G1ZqpWS80arD3TbMyRfdrRAPq17FotblT3
-LkZFIWc1In9WJt6mb224YkdHmRT/6jTIE5qqDBYpv+ZZo15J4rahqjKQNOFuttfh
-+5zYCdAyTayboQH1YA08PhllmErR0IJR7d+W7wABCYDfNLGcuoZPS2tJRaKG2KDr
-5vItN0ArwlN2RQ8gZq4+oi9jEn/L0G69PoXW0/xVG9d2HObLtH/yTkBf5eeoszkF
-LdHYA4iTNH5jbU3zni1RIKheHlHUl4vPUJgOA7gNfzgZ4nao3RKoVbqkRh5BF5g=
-=w3jq
+iEYEAREIAAYFAlSWraAACgkQ1fmVwcYIWAY4aACeOjtoy8GNNQ3uNzDIunMSVjLD
+XeoAni5EixZc0dD2jYjZW/6Gn9xt6uFK
+=RbIg
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.10.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.10.2.ebuild
deleted file mode 100644 (file)
index e06dbfa..0000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.10.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-boxes/gnome-boxes-3.10.2.ebuild,v 1.5 2014/07/24 18:20:19 ssuominen Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.22"
-
-inherit linux-info gnome2 vala
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Boxes"
-
-LICENSE="LGPL-2"
-SLOT="0"
-
-# We force 'bindist' due licenses from gnome-boxes-nonfree
-IUSE="smartcard usbredir" #bindist
-KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only
-
-# NOTE: sys-fs/* stuff is called via exec()
-# FIXME: ovirt is not available in tree
-RDEPEND="
-       >=dev-libs/glib-2.32:2
-       >=dev-libs/gobject-introspection-0.9.6
-       >=dev-libs/libxml2-2.7.8:2
-       >=sys-libs/libosinfo-0.2.7
-       >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?]
-       >=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-       >=app-emulation/libvirt-glib-0.1.7
-       >=x11-libs/gtk+-3.9:3
-       >=net-libs/gtk-vnc-0.4.4[gtk3]
-       >=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?]
-
-       >=app-misc/tracker-0.16:0=[iso]
-
-       >=media-libs/clutter-gtk-1.3.2:1.0
-       >=media-libs/clutter-1.11.14:1.0
-       >=sys-apps/util-linux-2.20
-       >=net-libs/libsoup-2.38:2.4
-
-       sys-fs/fuse
-       sys-fs/fuseiso
-       sys-fs/mtools
-       virtual/libgudev:=
-"
-#      !bindist? ( gnome-extra/gnome-boxes-nonfree )
-
-DEPEND="${RDEPEND}
-       app-text/yelp-tools
-       dev-util/desktop-file-utils
-       >=dev-util/intltool-0.40
-       >=sys-devel/gettext-0.17
-       virtual/pkgconfig
-"
-
-pkg_pretend() {
-       linux_config_exists
-
-       if ! { linux_chkconfig_present KVM_AMD || \
-               linux_chkconfig_present KVM_INTEL; }; then
-               ewarn "You need KVM support in your kernel to use GNOME Boxes!"
-       fi
-}
-
-src_prepare() {
-       # Do not change CFLAGS, wondering about VALA ones but appears to be
-       # needed as noted in configure comments below
-       sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
-
-       vala_src_prepare
-       gnome2_src_prepare
-}
-
-src_configure() {
-       DOCS="AUTHORS README NEWS THANKS TODO"
-       # debug needed for splitdebug proper behavior (cardoe)
-       gnome2_src_configure \
-               --enable-debug \
-               --disable-strict-cc \
-               $(use_enable usbredir) \
-               $(use_enable smartcard) \
-               --enable-ovirt=no
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       elog "Before running gnome-boxes, you will need to load the KVM modules"
-       elog "If you have an Intel Processor, run:"
-       elog "  modprobe kvm-intel"
-       einfo
-       elog "If you have an AMD Processor, run:"
-       elog "  modprobe kvm-amd"
-}

diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.12.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.12.3.ebuild
index 94554bef4078d2f26a5bff2f34a1308c79be4683..efbda5d0ae61ce3304c22785950755dd37b43d42 100644 (file)
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.12.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.12.3.ebuild
@@ -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/gnome-extra/gnome-boxes/gnome-boxes-3.12.3.ebuild,v 1.3 2014/07/24 18:20:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-boxes/gnome-boxes-3.12.3.ebuild,v 1.4 2014/12/21 11:23:11 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -62,11 +62,13 @@ If you have an AMD Processor, run:
 # modprobe kvm-amd"
 
 pkg_pretend() {
-       linux_config_exists
+       linux-info_get_any_version
 
-       if ! { linux_chkconfig_present KVM_AMD || \
-               linux_chkconfig_present KVM_INTEL; }; then
-               ewarn "You need KVM support in your kernel to use GNOME Boxes!"
+       if linux_config_exists; then
+               if ! { linux_chkconfig_present KVM_AMD || \
+                       linux_chkconfig_present KVM_INTEL; }; then
+                       ewarn "You need KVM support in your kernel to use GNOME Boxes!"
+               fi
        fi
 }