Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/aqemu/files/, app-emulation/aqemu/
Date: Sun, 12 Feb 2017 16:07:23
Message-Id: 1486915633.e8c66d943e29a4f51c744dc26e3b55ef6aa54df0.johu@gentoo
1 commit: e8c66d943e29a4f51c744dc26e3b55ef6aa54df0
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 12 16:01:47 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 12 16:07:13 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c66d94
7
8 app-emulation/aqemu: Remove 0.8.2 (r3)
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 app-emulation/aqemu/Manifest | 1 -
13 app-emulation/aqemu/aqemu-0.8.2-r3.ebuild | 41 ----------------------
14 .../aqemu/files/aqemu-0.8.2_desktop_file.patch | 33 -----------------
15 .../aqemu/files/aqemu-0.8.2_format-security.patch | 38 --------------------
16 .../aqemu/files/aqemu-0.8.2_qt48_build.patch | 27 --------------
17 .../aqemu/files/aqemu-0.8.2_sigsev_propertis.patch | 41 ----------------------
18 6 files changed, 181 deletions(-)
19
20 diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
21 index 09013e24e8..49e74a8a05 100644
22 --- a/app-emulation/aqemu/Manifest
23 +++ b/app-emulation/aqemu/Manifest
24 @@ -1,2 +1 @@
25 -DIST aqemu-0.8.2.tar.bz2 1025129 SHA256 03c4a95328f78238021168ca4887f9735641f10eb4eb1eff58b08c15b748bf03 SHA512 45f27f82ca307ffc50ea26a57631b47236fd04915274bb00a0720e65859e183d56c3243e0e31d71e5280d0941a9c80c1457b09d393e5c4d4deeb1fea4159459d WHIRLPOOL c5a058883df1424d5d1b2b028fca7fd6aae8b72281060a305a428e63ad5bfb1d062c56c18878b6a279a79953a88c760553a701b5c3346113836eb56ab4a30aa2
26 DIST v0.9.2.tar.gz 1373465 SHA256 e3d54de00ebdce3754f97f7e0e7cce8cebb588e8ce6bc249401cc909281b08de SHA512 9d4808172ee1be82509956560e4d3f9ee349fedd920342146083cc9bc79ef51fc95937c64f20ffb13e2849c577f95f59b5b65271d6e29e2d2e1ec2d1562006ba WHIRLPOOL ddefe4c3265b10940c3d65a5f6182ecfce627bcc45486d7a2b8701a6152b8a144242ea55018437f71773f7b8bb70b763095b5db6f933fdacd7b16b1f22112b87
27
28 diff --git a/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild b/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild
29 deleted file mode 100644
30 index c37c3a905f..0000000000
31 --- a/app-emulation/aqemu/aqemu-0.8.2-r3.ebuild
32 +++ /dev/null
33 @@ -1,41 +0,0 @@
34 -# Copyright 1999-2014 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -# $Id$
37 -
38 -EAPI=4
39 -
40 -inherit cmake-utils
41 -
42 -DESCRIPTION="Graphical interface for QEMU and KVM emulators, using Qt4"
43 -HOMEPAGE="https://sourceforge.net/projects/aqemu"
44 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="0"
48 -KEYWORDS="~amd64 ~x86"
49 -IUSE="vnc"
50 -
51 -DEPEND="${RDEPEND}"
52 -RDEPEND="app-emulation/qemu
53 - vnc? ( net-libs/libvncserver )
54 - dev-qt/qtgui:4
55 - dev-qt/qttest:4
56 - dev-qt/qtxmlpatterns:4"
57 -
58 -DOCS="AUTHORS CHANGELOG README TODO"
59 -
60 -PATCHES=(
61 - "${FILESDIR}"/aqemu-0.8.2_sigsev_propertis.patch
62 - "${FILESDIR}"/aqemu-0.8.2_qt48_build.patch
63 - "${FILESDIR}"/aqemu-0.8.2_desktop_file.patch
64 - "${FILESDIR}"/aqemu-0.8.2_format-security.patch
65 -)
66 -
67 -src_configure() {
68 - local mycmakeargs=(
69 - "-DMAN_PAGE_COMPRESSOR="
70 - "-DWITHOUT_EMBEDDED_DISPLAY=$(use vnc && echo "OFF" || echo "ON")"
71 - )
72 -
73 - cmake-utils_src_configure
74 -}
75
76 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
77 deleted file mode 100644
78 index 4cf20ea578..0000000000
79 --- a/app-emulation/aqemu/files/aqemu-0.8.2_desktop_file.patch
80 +++ /dev/null
81 @@ -1,33 +0,0 @@
82 -From 2a0f32e8cb46c8a1c0a33ed151737e5abb5679ed Mon Sep 17 00:00:00 2001
83 -From: Andrey Rijov <rdron@×××××××××××××××××.net>
84 -Date: Mon, 31 Oct 2011 19:38:17 +0400
85 -Subject: [PATCH] Updated aqemu.desktop file (See bug: 3430317)
86 -
87 ----
88 - menu_data/aqemu.desktop | 9 +++++----
89 - 1 files changed, 5 insertions(+), 4 deletions(-)
90 -
91 ---- a/menu_data/aqemu.desktop
92 -+++ b/menu_data/aqemu.desktop
93 -@@ -1,14 +1,15 @@
94 - [Desktop Entry]
95 - Encoding=UTF-8
96 --Name=AQEMU
97 - Exec=aqemu
98 - Terminal=false
99 - Type=Application
100 --Icon=aqemu_48x48.png
101 -+Icon=aqemu_48x48
102 - StartupNotify=true
103 - Categories=System;Emulator;
104 -
105 --Name[ru]=AQEMU
106 -+Name=AQEMU
107 -+Comment=Virtual machine manager
108 - Name[en]=AQEMU
109 --Comment[ru]=Управление виртуальными машинами
110 - Comment[en]=Virtual machine manager
111 -+Name[ru]=AQEMU
112 -+Comment[ru]=Управление виртуальными машинами
113 ---
114 -1.7.4.1
115
116 diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch b/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch
117 deleted file mode 100644
118 index d6ce93969b..0000000000
119 --- a/app-emulation/aqemu/files/aqemu-0.8.2_format-security.patch
120 +++ /dev/null
121 @@ -1,38 +0,0 @@
122 ---- aqemu-0.8.2-orig/Utils.cpp
123 -+++ aqemu-0.8.2-format-security/Utils.cpp
124 -@@ -66,9 +66,9 @@ void AQDebug( const QString &sender, con
125 - std::cout << QString( "\nAQEMU Debug [%1] >>>\nSender: %2\nMessage: %3" )
126 - .arg(Messages_Index).arg(sender).arg(mes).toStdString();
127 - #else
128 -- qDebug( qPrintable(QString(
129 -+ qDebug() << qPrintable(QString(
130 - "\n\33[32mAQEMU Debug\33[0m [%1] >>>\n\33[32mSender:\33[0m %2\n\33[32mMessage:\33[0m %3")
131 -- .arg(Messages_Index).arg(sender).arg(mes)) );
132 -+ .arg(Messages_Index).arg(sender).arg(mes));
133 - #endif
134 - }
135 -
136 -@@ -87,9 +87,9 @@ void AQWarning( const QString &sender, c
137 - std::cout << QString( "\nAQEMU Warning [%1] >>>\nSender: %2\nMessage: %3" )
138 - .arg(Messages_Index).arg(sender).arg(mes).toStdString();
139 - #else
140 -- qDebug( qPrintable(QString(
141 -+ qDebug() << qPrintable(QString(
142 - "\n\33[34mAQEMU Warning\33[0m [%1] >>>\n\33[34mSender:\33[0m %2\n\33[34mMessage:\33[0m %3")
143 -- .arg(Messages_Index).arg(sender).arg(mes)) );
144 -+ .arg(Messages_Index).arg(sender).arg(mes));
145 - #endif
146 - }
147 -
148 -@@ -108,9 +108,9 @@ void AQError( const QString &sender, con
149 - std::cout << QString( "\nAQEMU Error [%1] >>>\nSender: %2\nMessage: %3" )
150 - .arg(Messages_Index).arg(sender).arg(mes).toStdString();
151 - #else
152 -- qDebug( qPrintable(QString(
153 -+ qDebug() << qPrintable(QString(
154 - "\n\33[31mAQEMU Error\33[0m [%1] >>>\n\33[31mSender:\33[0m %2\n\33[31mMessage:\33[0m %3")
155 -- .arg(Messages_Index).arg(sender).arg(mes)) );
156 -+ .arg(Messages_Index).arg(sender).arg(mes));
157 - #endif
158 - }
159 -
160
161 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
162 deleted file mode 100644
163 index afd1f0c853..0000000000
164 --- a/app-emulation/aqemu/files/aqemu-0.8.2_qt48_build.patch
165 +++ /dev/null
166 @@ -1,27 +0,0 @@
167 -From 9b21d88a4f4a681f9e80c11e83e81c976e0fc91e Mon Sep 17 00:00:00 2001
168 -From: Andrey Rijov <rdron@×××××××××××××××××.net>
169 -Date: Sat, 29 Oct 2011 10:20:32 +0400
170 -Subject: [PATCH 1/1] Fix build error on Qt 4.8
171 -
172 ----
173 - Embedded_Display/vncview.cpp | 4 ++--
174 - 1 files changed, 2 insertions(+), 2 deletions(-)
175 -
176 -diff --git a/Embedded_Display/vncview.cpp b/Embedded_Display/vncview.cpp
177 -index 9e105c9..0be5944 100644
178 ---- a/Embedded_Display/vncview.cpp
179 -+++ b/Embedded_Display/vncview.cpp
180 -@@ -27,8 +27,8 @@
181 - #include <QMessageBox>
182 - #include <QInputDialog>
183 - #define KMessageBox QMessageBox
184 -- #define error(parent, message, caption) \
185 -- critical(parent, caption, message)
186 -+/* #define error(parent, message, caption) \
187 -+ critical(parent, caption, message)*/
188 - #else
189 - #include "settings.h"
190 - #include <KActionCollection>
191 ---
192 -1.7.4.1
193 -
194
195 diff --git a/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch b/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch
196 deleted file mode 100644
197 index b7cc5950bd..0000000000
198 --- a/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch
199 +++ /dev/null
200 @@ -1,41 +0,0 @@
201 ---- a/Device_Manager_Widget.cpp 2011-09-13 21:45:58.883389571 +0200
202 -+++ b/Device_Manager_Widget.cpp 2011-09-13 21:55:01.401866022 +0200
203 -@@ -981,9 +981,10 @@
204 - {
205 - if( ui.Devices_List->currentItem()->data(512).toString() == "device" + QString::number(fx) )
206 - {
207 -- finded = true;
208 --
209 - Storage_Devices.removeAt( fx );
210 -+ ui.Devices_List->takeItem( ui.Devices_List->currentRow() );
211 -+ finded = true;
212 -+ break;
213 - }
214 - }
215 -
216 -@@ -993,10 +994,24 @@
217 - "Incorrect Device!" );
218 - return;
219 - }
220 -+ else
221 -+ {
222 -+ // Rename items
223 -+ for( int ix = 0, count = 0; ix < ui.Devices_List->count(); ++ix )
224 -+ {
225 -+ if( ui.Devices_List->item(ix)->data(512).toString().contains("device") )
226 -+ {
227 -+ ui.Devices_List->item(ix)->setData( 512, QString("device%1").arg(count) );
228 -+ ++count;
229 -+ }
230 -+ }
231 -+
232 -+ emit Device_Changet();
233 -+ return;
234 -+ }
235 - }
236 -
237 - ui.Devices_List->takeItem( ui.Devices_List->currentRow() );
238 --
239 - emit Device_Changet();
240 - }
241 -