summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Koltsov <maksbotan@gentoo.org>2012-02-21 11:21:51 +0000
committerMaxim Koltsov <maksbotan@gentoo.org>2012-02-21 11:21:51 +0000
commitc9c45fe393c46c1b6c2dffafbae8c04c806e1983 (patch)
treeb997d6da0d0a3294c8c4d475e5666d57b9274f17 /app-emulation
parentVersion bump. (diff)
downloadhistorical-c9c45fe393c46c1b6c2dffafbae8c04c806e1983.tar.gz
historical-c9c45fe393c46c1b6c2dffafbae8c04c806e1983.tar.bz2
historical-c9c45fe393c46c1b6c2dffafbae8c04c806e1983.zip
Revbump to 0.8.2-r2, fix bug 405117
Package-Manager: portage-2.1.10.48/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/aqemu/ChangeLog8
-rw-r--r--app-emulation/aqemu/Manifest23
-rw-r--r--app-emulation/aqemu/aqemu-0.8.2-r2.ebuild40
-rw-r--r--app-emulation/aqemu/files/aqemu-0.8.2_desktop_file.patch33
-rw-r--r--app-emulation/aqemu/files/aqemu-0.8.2_qt48_build.patch27
5 files changed, 120 insertions, 11 deletions
diff --git a/app-emulation/aqemu/ChangeLog b/app-emulation/aqemu/ChangeLog
index 961911621921..332ed7c53c14 100644
--- a/app-emulation/aqemu/ChangeLog
+++ b/app-emulation/aqemu/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/aqemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/ChangeLog,v 1.10 2012/02/19 10:31:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/ChangeLog,v 1.11 2012/02/21 11:21:51 maksbotan Exp $
+
+*aqemu-0.8.2-r2 (21 Feb 2012)
+
+ 21 Feb 2012; Maxim Koltsov <maksbotan@gentoo.org> +aqemu-0.8.2-r2.ebuild,
+ +files/aqemu-0.8.2_desktop_file.patch, +files/aqemu-0.8.2_qt48_build.patch:
+ Revbump to 0.8.2-r2, fix bug 405117
19 Feb 2012; Agostino Sarubbo <ago@gentoo.org> aqemu-0.8.2-r1.ebuild:
Stable for amd64, wrt bug #404483
diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
index 05597bbb426d..4dd3b991c7a1 100644
--- a/app-emulation/aqemu/Manifest
+++ b/app-emulation/aqemu/Manifest
@@ -1,21 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
+AUX aqemu-0.8.2_desktop_file.patch 873 RMD160 f59c95d70851834668f1c9e186368ab4ac9c3974 SHA1 61ef383bb1ae56e4e667c65cc9aa2c60691142c1 SHA256 19bad3e041ec2415f6804a898b228174ead46674164d46e9ca52b79dfc599104
+AUX aqemu-0.8.2_qt48_build.patch 855 RMD160 701bc5561c73579d755d078a4f29f6732b4ad888 SHA1 45213e17a3eaed7e6c1c5339c1876922b809d534 SHA256 f1c9261b808148d3e5e6d2eaf4f325c78113e114da997581af533775d123d3e7
AUX aqemu-0.8.2_sigsev_propertis.patch 960 RMD160 295570403b15cb01aae11bb194dc217ecaa44a19 SHA1 f1163e4428a3112c76e8d7c134d8c6cbab95542f SHA256 8c42d81dc603635dbf06d1571b4b55097c7ae437256562c5d15e636ce731b24c
DIST aqemu-0.8.1.tar.bz2 963345 RMD160 5ca436fb620e6d05855b4248132262e5c18649b4 SHA1 463f6befa84afec3168d08cd598b911b8666df64 SHA256 0fab894e5f49f688122ad15065bbdf278def1425a5d43ad2d64a21caf8dec41a
DIST aqemu-0.8.2.tar.bz2 1025129 RMD160 fde7ce7ecba5759c3c325830ef8d7ce94a930e7e SHA1 fdc4c6ec9fe3b6fd917036ebcaab3c6d52794fab SHA256 03c4a95328f78238021168ca4887f9735641f10eb4eb1eff58b08c15b748bf03
EBUILD aqemu-0.8.1.ebuild 955 RMD160 8683b7ce703dea8baf538d2d147ae17ee52433b8 SHA1 48d0d5b437e4f0cf90df0f8f835731d0230e33ec SHA256 caeb60ac6ecb1327f4bf190885afaa9532439f2ce59fe970608f8a0221ab67cb
EBUILD aqemu-0.8.2-r1.ebuild 1020 RMD160 05ffa79cafafb348165c98b4b819467f7b4de230 SHA1 c04ded1223e04c4e3704c3ad15e8c16c5e2e203e SHA256 e5073ee8ed231977c4652e6b76d15af46db584fd181f1a3f9c63df2110c8d420
-MISC ChangeLog 1758 RMD160 a0651e6317e9b189c64d807cd593da7405f2bdcc SHA1 69f66d56403a3f5afd945825078bc38559177772 SHA256 8ba639c2f665fb38272d8fa9e9188409910cb585ac6890543e1be6f11bd50b82
+EBUILD aqemu-0.8.2-r2.ebuild 1103 RMD160 cb71f6edbfcd06c0fc98607ede84fc3d0ff2f690 SHA1 35a7ce8d5d628983970c5fd31e2dec15ae80102f SHA256 ff3ab6107007a879187e88f3ce5d913c2894d4da8f23a3e62d3134bf876e8b1b
+MISC ChangeLog 1988 RMD160 e4901bdf07c970d5a88326fe19df052a526f600d SHA1 ff1b9a9d99c97c9aeed9c48518add6d46400ec41 SHA256 5184fc8934ab23ef0853ff2e29f087e6da084b9c947bab64ec7e2046b56a8ed9
MISC metadata.xml 468 RMD160 3eabab2f96a65e8734998747cbde60f5b1c8221d SHA1 989a999252a590e39e5575bef6dfaec7787b44b0 SHA256 6347654d50f8912fe819bb3f888f8a56828f50fad03695f95cdc0ef735fe2494
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPQM+nAAoJEOTDgjZ80txdAnIH/1uyEwyTmmLqYs52sJIHVUvj
-x9e23JCBaJ/cxSClPQMY20WHUzr6k+xYx6Dr0ugrOdDq9orp+z0Hz/w2A1TlhEtn
-gGrj5oWyW5j6NldZk3FOXimoPTMH/kvdqxmq6Bjw/Ign04aGgV0bdOPVoGF5VTlg
-BjatUE35pgEPI4LZXd68/4yXYtwktJWjctBaH63bXd31zOrFE6/pgB3/4SiwdVzS
-5SpjX56f4skHsQ8/e1LEFp0X0CD5I2VYVY5sJzAWr/MbKszOsKh7I2Wss28HnfVK
-DuUINQRCmtYLmxCHRxx7j/DvWuhcctwDhFR+yg2xRR67aDN2Kwx9h29BHcIVgao=
-=iVl2
+iQEcBAEBAgAGBQJPQ37QAAoJEAmJmMX429rePjIIAIqByPjIy1qg1FkWXMHrmJPp
+E3GcJm3eq6wRn1PuMUfyz7R1R4Aw1HmaiIoBQlvfz8UMkZSmbfK7doweNgTiufTl
+D8aXO5/xw6lB/A06Ov2xg4wbkINItKgBT9InzdmNROR3+8i+YMlEAx0ZDqtO4pjW
+2tWlvCQ9stUjZeXLCNz01Z7tP4FEXS1DqemvPWT6YHghdVZ7L+ent+vf0V4BtM1X
+O9Rg0O1m1C9ddrlH4NMBl64wk8el7lcOOZov/tnqsknddhQwXHQr9nVFJ48/r8tB
+gTKkpN3Sub7vWGT+wutjOdCmB/7IqCutOjj+iIV3rqmxxuXeQmCJ11uIqnS6+Hs=
+=ZAY6
-----END PGP SIGNATURE-----
diff --git a/app-emulation/aqemu/aqemu-0.8.2-r2.ebuild b/app-emulation/aqemu/aqemu-0.8.2-r2.ebuild
new file mode 100644
index 000000000000..c05d7b42c463
--- /dev/null
+++ b/app-emulation/aqemu/aqemu-0.8.2-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/aqemu-0.8.2-r2.ebuild,v 1.1 2012/02/21 11:21:51 maksbotan Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="Graphical interface for QEMU and KVM emulators. Using Qt4."
+HOMEPAGE="http://sourceforge.net/projects/aqemu"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kvm vnc"
+
+DEPEND="${RDEPEND}"
+RDEPEND="kvm? ( app-emulation/qemu-kvm )
+ !kvm? ( >=app-emulation/qemu-0.9.0 )
+ vnc? ( net-libs/libvncserver )
+ x11-libs/qt-gui:4
+ x11-libs/qt-test:4
+ x11-libs/qt-xmlpatterns:4"
+
+DOCS="AUTHORS CHANGELOG README TODO"
+PATCHES=( "${FILESDIR}"/aqemu-0.8.2_sigsev_propertis.patch
+"${FILESDIR}"/aqemu-0.8.2_qt48_build.patch
+"${FILESDIR}"/aqemu-0.8.2_desktop_file.patch )
+
+src_configure() {
+ local mycmakeargs=" -DMAN_PAGE_COMPRESSOR="" "
+ if use vnc; then
+ mycmakeargs+=" -DWITHOUT_EMBEDDED_DISPLAY=OFF "
+ else
+ mycmakeargs+=" -DWITHOUT_EMBEDDED_DISPLAY=ON "
+ fi
+
+ cmake-utils_src_configure
+}
diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_desktop_file.patch b/app-emulation/aqemu/files/aqemu-0.8.2_desktop_file.patch
new file mode 100644
index 000000000000..4cf20ea578d0
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.8.2_desktop_file.patch
@@ -0,0 +1,33 @@
+From 2a0f32e8cb46c8a1c0a33ed151737e5abb5679ed Mon Sep 17 00:00:00 2001
+From: Andrey Rijov <rdron@users.sourceforge.net>
+Date: Mon, 31 Oct 2011 19:38:17 +0400
+Subject: [PATCH] Updated aqemu.desktop file (See bug: 3430317)
+
+---
+ menu_data/aqemu.desktop | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+--- a/menu_data/aqemu.desktop
++++ b/menu_data/aqemu.desktop
+@@ -1,14 +1,15 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Name=AQEMU
+ Exec=aqemu
+ Terminal=false
+ Type=Application
+-Icon=aqemu_48x48.png
++Icon=aqemu_48x48
+ StartupNotify=true
+ Categories=System;Emulator;
+
+-Name[ru]=AQEMU
++Name=AQEMU
++Comment=Virtual machine manager
+ Name[en]=AQEMU
+-Comment[ru]=Управление виртуальными машинами
+ Comment[en]=Virtual machine manager
++Name[ru]=AQEMU
++Comment[ru]=Управление виртуальными машинами
+--
+1.7.4.1
diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_qt48_build.patch b/app-emulation/aqemu/files/aqemu-0.8.2_qt48_build.patch
new file mode 100644
index 000000000000..afd1f0c853d4
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.8.2_qt48_build.patch
@@ -0,0 +1,27 @@
+From 9b21d88a4f4a681f9e80c11e83e81c976e0fc91e Mon Sep 17 00:00:00 2001
+From: Andrey Rijov <rdron@users.sourceforge.net>
+Date: Sat, 29 Oct 2011 10:20:32 +0400
+Subject: [PATCH 1/1] Fix build error on Qt 4.8
+
+---
+ Embedded_Display/vncview.cpp | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Embedded_Display/vncview.cpp b/Embedded_Display/vncview.cpp
+index 9e105c9..0be5944 100644
+--- a/Embedded_Display/vncview.cpp
++++ b/Embedded_Display/vncview.cpp
+@@ -27,8 +27,8 @@
+ #include <QMessageBox>
+ #include <QInputDialog>
+ #define KMessageBox QMessageBox
+- #define error(parent, message, caption) \
+- critical(parent, caption, message)
++/* #define error(parent, message, caption) \
++ critical(parent, caption, message)*/
+ #else
+ #include "settings.h"
+ #include <KActionCollection>
+--
+1.7.4.1
+