Stable on x86 wrt bug#414353. Remove older.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

5 files changed, 32 insertions, 100 deletions

diff --git a/app-emulation/aqemu/ChangeLog b/app-emulation/aqemu/ChangeLog
index 0784b4a68f30..99d2579c4cdb 100644
--- a/app-emulation/aqemu/ChangeLog
+++ b/app-emulation/aqemu/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2012/05/02 17:19:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/ChangeLog,v 1.14 2012/05/04 17:57:16 scarabeus Exp $
+
+  04 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -aqemu-0.8.1.ebuild,
+  -aqemu-0.8.2-r1.ebuild, aqemu-0.8.2-r2.ebuild:
+  Stable on x86 wrt bug#414353. Remove older.
 
   02 May 2012; Agostino Sarubbo <ago@gentoo.org> aqemu-0.8.2-r2.ebuild:
   Stable for amd64, wrt bug #414353
diff --git a/app-emulation/aqemu/Manifest b/app-emulation/aqemu/Manifest
index 16a207bb30ae..ca4bd2e585d2 100644
--- a/app-emulation/aqemu/Manifest
+++ b/app-emulation/aqemu/Manifest
@@ -1,24 +1,27 @@
 -----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 1022 RMD160 386e590b5907439698ad1b86e34d492bdef2ca3f SHA1 369fba35378bf9cabf8372dce254e55947a9927c SHA256 1f16ef0b960508d79ec6a83c4be332a7b4304456103fbce9bfe67b1744092e0a
-EBUILD aqemu-0.8.2-r2.ebuild 1096 RMD160 0599e323ada84cad20dd7b3cb2a816c3cbfe02b8 SHA1 f653552b7c6cc2cbfe6a25673ea26cdcce01433d SHA256 f4f8919f884186ca8879d21b41a7ee5e465daaf3ce7eed840a7081bcfc49c915
-MISC ChangeLog 2192 RMD160 d08b6c835b76a42e47ba8a54c298394d61c000e6 SHA1 851f7134427ae52441060136583d66cab9c3b1de SHA256 4d6d6922e42dc37ab7ab8e838215f31cb64c33153a7ba8b012ede4d02d17fddc
+EBUILD aqemu-0.8.2-r2.ebuild 1049 RMD160 267e4a9205efe6f4bd92b767748935edae656835 SHA1 cf06836d9b2f95890178e2211ff5c9f22d703782 SHA256 26bb623e796edd023146fe07d43703dc28e62ce22eb59215441043fde99eea84
+MISC ChangeLog 2370 RMD160 a618531a9b4beea086aedd193deefa37922d4b3a SHA1 ed433e8b912cb9f77782725903bafa4ee62f9898 SHA256 bd0a83536b5e9420d7b5c61ba100d4dda16c05334b8b4f39ef8fa491fb5a6061
 MISC metadata.xml 468 RMD160 3eabab2f96a65e8734998747cbde60f5b1c8221d SHA1 989a999252a590e39e5575bef6dfaec7787b44b0 SHA256 6347654d50f8912fe819bb3f888f8a56828f50fad03695f95cdc0ef735fe2494
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPoWyhAAoJEOTDgjZ80txdN5kIAJeOOR9UFHKeN3yBXD2vEzNx
-58in3hPYCUuo1xTUhgxKHDyhuU6IDuEzTM3AkFgwTwzeJyDEaLtSD/GsZzfmRzVC
-3DlR/8wv7tj53MJmF2BxJunNJl4cZclKNGAUAu0X5tfJGRH7EueZ4n+a38IMhaRH
-CXhW/pVG5YGDvx3uoSaBlZuopD1/K3NKtAaOj7b73F8eCX49t2QEjgjrAFNRBc62
-qO768OsvAct9jd55cNLzo12W8cLD/wzolecw5gSW7dN3/ManSLa6IhMGeu0Yo1/3
-pXSXeshs68mwgQnu73pY+nUfNP9X4dYQrHVn7KEB38Nw/J3fg0ukpUq5xGUuIWg=
-=WRFG
+iQIcBAEBAgAGBQJPpBiCAAoJEOSiRoyO7jvoRnAP/3vHSSIAW+mB/rtjkXQ5zAp0
+CM8O18QVojKhXwesTP+8T3+ssmnoksZuw2KVQXtQZ3UPMTAC2QNTzJy4dIf+ooDC
+bJuxzbQFW++ULcLQ8XwnvjscDN4bKHhS/bgedbh6YGG5ZF5nlLKynkqE7eP7tnnF
+NiTgDAjMqJ266xOJuNuZke+H6DzzevR7h4rBhWwZ7aDmLyqQQ37SXS9f7837CUEr
+9u1/YW0IlT/QXx9UeUY0A6JbeEqLdc1uBMxEnECxT5Ay8IzeoXgSnDS4pDf2oimB
+2cfqHZ22BA8T2SHEKYFnKq229oUImo7nD90eU0W+pGm5rwylyeb8Z7ZV5TZ+EptI
+Os8wtyACEzcxihUea86aXlNyDLVPVg37KeB+ZgcGRZfIacBqfKf/eFGilBXiHABN
+Hb1JKHXN1H7sidBwd51CgfMve9vSJ4OJMlJjAAnUjVXmoE0eR2dQJEYcNQeCu9hB
+CWt0TIN8yjmed3WEABR2GyG3GlPV7Vh0BMV62rXihfdMn4vX7CbZM0erc+zqCX+L
+nhA+VLkAIVh0F46ITTf8j/MqsjZ2pF2gd0sUQOirqr7E6mlWms1O4WWpWs4MUmxZ
+R1BloIqWU5kpV6rrflQYvt0q4JsQs7ICB0aMcMFpZL1oAMaRrTmTd7fYp62l9by4
+S1UdTEFvAPcEIFanG94n
+=vURK
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/aqemu/aqemu-0.8.1.ebuild b/app-emulation/aqemu/aqemu-0.8.1.ebuild
deleted file mode 100644
index 61198ae098dc..000000000000
--- a/app-emulation/aqemu/aqemu-0.8.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.1.ebuild,v 1.3 2011/09/04 17:36:42 phajdan.jr Exp $
-
-EAPI="2"
-
-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"
-
-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
-}
diff --git a/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild b/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild
deleted file mode 100644
index 2bbff69713cf..000000000000
--- a/app-emulation/aqemu/aqemu-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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-r1.ebuild,v 1.4 2012/04/04 19:37:12 jdhore 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)
-
-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/aqemu-0.8.2-r2.ebuild b/app-emulation/aqemu/aqemu-0.8.2-r2.ebuild
index 6af35c50ce9b..c3f2b0bdb29c 100644
--- a/app-emulation/aqemu/aqemu-0.8.2-r2.ebuild
+++ b/app-emulation/aqemu/aqemu-0.8.2-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2012/05/02 17:19:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aqemu/aqemu-0.8.2-r2.ebuild,v 1.3 2012/05/04 17:57:16 scarabeus Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kvm vnc"
 
 DEPEND="${RDEPEND}"
@@ -24,17 +24,17 @@ RDEPEND="kvm? ( app-emulation/qemu-kvm )
 	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 )
+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
+	local mycmakeargs=(
+		"-DMAN_PAGE_COMPRESSOR="
+		"-DWITHOUT_EMBEDDED_DISPLAY=$(use vnc && echo "OFF" || echo "ON")"
+	)
 
 	cmake-utils_src_configure
 }