Add aqemu-0.8.2-r1, drop 0.8.2

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

diff --git a/app-emulation/aqemu/ChangeLog b/app-emulation/aqemu/ChangeLog
index ec913159240067cf40032f6ade56835db15d640d..168d8401dac475de04de94920b35b0b308766e30 100644 (file)
--- a/app-emulation/aqemu/ChangeLog
+++ b/app-emulation/aqemu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/aqemu
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/ChangeLog,v 1.5 2011/09/04 17:36:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/ChangeLog,v 1.6 2011/09/11 16:55:20 maksbotan Exp $
+
+*aqemu-0.8.2-r1 (11 Sep 2011)
+
+  11 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> -aqemu-0.8.2.ebuild,
+  +aqemu-0.8.2-r1.ebuild, +files/aqemu-0.8.2_sigsev_propertis.patch:
+  Add aqemu-0.8.2-r1 with patch from upstream git, drop aqemu-0.8.2. Thanks to
+  Andreis Vinogradovs <spamslepnoga@inbox.ru>
 
   04 Sep 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> aqemu-0.8.1.ebuild:
   x86 stable wrt bug #380471

diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
index 5b122c9e38d5bf7db4ac611172a6cfe6223e090d..3bd3c5daf7cc89e10fa15848d97e458f0ac7d53c 100644 (file)
--- a/app-emulation/aqemu/Manifest
+++ b/app-emulation/aqemu/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX aqemu-0.8.2_sigsev_propertis.patch 1965 RMD160 3e5c537d4df15453c3f21982ca75a06490f87c44 SHA1 8af499a6e709f843895845ed4536a5997820716a SHA256 8520dfe78e994bbe50d19fbf9cb59166a906486d18f4047ee6bc94899954d2f0
 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.ebuild 956 RMD160 c7b00c6fc79968b43010c94916d2d3a40e66da11 SHA1 82864a8425fd5bac2d50d2aed0d194dee2636120 SHA256 6660cb44cbd0cd6d9e12d0e5bd2b6f742157b11cc9089a943c3dca7381aa0270
-MISC ChangeLog 989 RMD160 3a8d5d8b1f1125a907fb11b53f6dde254beb2860 SHA1 ebdbc8e6c691844669e078820a4a3e7ff33684e2 SHA256 cc693a6bd7ca67393eaab999e9cf0a2702af5ec851c16d54c0302b2ec5820460
+EBUILD aqemu-0.8.2-r1.ebuild 1099 RMD160 0bf05f29056884c678324c1f3b1041531f62cc09 SHA1 66a8f10811d3d2a819e0d7853db2cd1ac41cbdb9 SHA256 daf970c0885355e72fdc01bc1c8035fd9c69e8c9159d862db331f65f0892b0ac
+MISC ChangeLog 1287 RMD160 d0131d0cf8c397b0425cfd8d0923eb0318746550 SHA1 d2048283012471a303c7d580a978368153525a97 SHA256 ce022cf4f44ebd6cc9103ac3340dc3b8714ae9e583fc0b1dffcb9d705017ac90
 MISC metadata.xml 481 RMD160 84242f9fd03ff83cffef4008dc3d2fba6fa6cf40 SHA1 7037069b232f8cd261bf2e6b5705c1741e166ddb SHA256 13ded8adcfd4adde882cd251dafd457714b00da69b34e7d1eef6253214224b1f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk5jtyoACgkQuUQtlDBCeQIGwACeP6tb0bVn64SHQ+SzNTkXQm2W
-Oa0An2SMgaoz9t5LR6C8Foiyq/xxRx9R
-=Udx4
------END PGP SIGNATURE-----

diff --git a/app-emulation/aqemu/aqemu-0.8.2.ebuild b/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild
similarity index 50%
rename from app-emulation/aqemu/aqemu-0.8.2.ebuild
rename to app-emulation/aqemu/aqemu-0.8.2-r1.ebuild
index f453299d7d0c5b66aec63a6f21f11d381e524c84..1517e4352ac9ce996d78a6cf6d761a610334cc07 100644 (file)
--- a/app-emulation/aqemu/aqemu-0.8.2.ebuild
+++ b/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.ebuild,v 1.1 2011/07/29 12:06:37 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild,v 1.1 2011/09/11 16:55:20 maksbotan Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit  cmake-utils
 
@@ -17,21 +17,22 @@ 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"
+       !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)
 
 src_configure() {
-       local mycmakeargs=" -DCMAKE_VERBOSE_MAKEFILE=OFF"
-       if use vnc; then
-               mycmakeargs+=" -DWITHOUT_EMBEDDED_DISPLAY=OFF "
-       else
-               mycmakeargs+=" -DWITHOUT_EMBEDDED_DISPLAY=ON "
-       fi
-
-       cmake-utils_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_sigsev_propertis.patch b/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch
new file mode 100644 (file)
index 0000000..6fa33a3
--- /dev/null
+++ b/app-emulation/aqemu/files/aqemu-0.8.2_sigsev_propertis.patch
@@ -0,0 +1,45 @@
+X-Git-Url: http://aqemu.git.sourceforge.net/git/gitweb.cgi?p=aqemu%2Faqemu;a=blobdiff_plain;f=Device_Manager_Widget.cpp;h=671930a152de6bf98b9218df7cb9cb1ca29e570d;hp=7288bafc6887841b94dd846a9df523205aa72a22;hb=18
+
+diff --git a/Device_Manager_Widget.cpp b/Device_Manager_Widget.cpp
+index 7288baf..671930a 100644
+--- a/Device_Manager_Widget.cpp
++++ b/Device_Manager_Widget.cpp
+@@ -981,9 +981,10 @@ void Device_Manager_Widget::on_actionDelete_triggered()
+               {
+                       if( ui.Devices_List->currentItem()->data(512).toString() == "device" + QString::number(fx) )
+                       {
+-                              finded = true;
+-                              
+                               Storage_Devices.removeAt( fx );
++                              ui.Devices_List->takeItem( ui.Devices_List->currentRow() );
++                              finded = true;
++                              break;
+                       }
+               }
+               
+@@ -993,10 +994,24 @@ void Device_Manager_Widget::on_actionDelete_triggered()
+                                        "Incorrect Device!" );
+                       return;
+               }
++              else
++              {
++                      // Rename items
++                      for( int ix = 0, count = 0; ix < ui.Devices_List->count(); ++ix )
++                      {
++                              if( ui.Devices_List->item(ix)->data(512).toString().contains("device") )
++                              {
++                                      ui.Devices_List->item(ix)->setData( 512, QString("device%1").arg(count) );
++                                      ++count;
++                              }
++                      }
++                      
++                      emit Device_Changet();
++                      return;
++              }
+       }
+       
+       ui.Devices_List->takeItem( ui.Devices_List->currentRow() );
+-      
+       emit Device_Changet();
+ }
+