Stable on x86 wrt bug#414353. Remove older.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

4 files changed, 16 insertions, 87 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/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
 }