[gentoo-commits] proj/qt:master commit in: app-emulation/qtemu/

[gentoo-commits] proj/qt:master commit in: app-emulation/qtemu/

[Johannes Huber]

commit:     ae13a635aa59cfa0552ded775040702fb35a86e4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  4 13:58:00 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Feb  4 13:58:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=ae13a635

[app-emulation/qtemu] EAPI 4.

(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)

---
 app-emulation/qtemu/qtemu-2.0_alpha1.ebuild |    4 ++--
 app-emulation/qtemu/qtemu-9999.ebuild       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild b/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
index d98fc4f..f315c7e 100644
--- a/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
+++ b/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils qt4-edge cmake-utils
 

diff --git a/app-emulation/qtemu/qtemu-9999.ebuild b/app-emulation/qtemu/qtemu-9999.ebuild
index eb8fb83..2773811 100644
--- a/app-emulation/qtemu/qtemu-9999.ebuild
+++ b/app-emulation/qtemu/qtemu-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils qt4-edge cmake-utils subversion
 

[gentoo-commits] proj/qt:master commit in: app-emulation/qtemu/

[Michael Palimaka]

commit:     0f5ae17f0ba56a4e5bf70aa3a07a1298b22abfa7
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  8 12:54:06 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb  8 12:55:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0f5ae17f

[app-emulation/qtemu] Move Creative Commons licenses to shorter names.

Package-Manager: portage-2.1.11.50

---
 app-emulation/qtemu/Manifest                |    2 +-
 app-emulation/qtemu/qtemu-2.0_alpha1.ebuild |    2 +-
 app-emulation/qtemu/qtemu-9999.ebuild       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-emulation/qtemu/Manifest b/app-emulation/qtemu/Manifest
index 938467f..848eed1 100644
--- a/app-emulation/qtemu/Manifest
+++ b/app-emulation/qtemu/Manifest
@@ -1 +1 @@
-DIST qtemu-2.0alpha1.tar.bz2 874624 RMD160 bdff8fbaf3f25b7e6366bb9002286d6b58cd4365 SHA1 44f4405c13ee640699dc7b5a5fcdb2f42fbd0fe7 SHA256 8cae401ad3d9309bd2458ea3ddeb0235d9b44dfdc4b1c1770409372e2b9de272
+DIST qtemu-2.0alpha1.tar.bz2 874624 SHA256 8cae401ad3d9309bd2458ea3ddeb0235d9b44dfdc4b1c1770409372e2b9de272

diff --git a/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild b/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
index 8e4133b..3136306 100644
--- a/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
+++ b/app-emulation/qtemu/qtemu-2.0_alpha1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A graphical user interface for QEMU written in Qt4."
 HOMEPAGE="http://qtemu.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2.1 CCPL-Attribution-3.0"
+LICENSE="GPL-2 LGPL-2.1 CC-BY-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="qemu"

diff --git a/app-emulation/qtemu/qtemu-9999.ebuild b/app-emulation/qtemu/qtemu-9999.ebuild
index 9a00f6c..9ec66e0 100644
--- a/app-emulation/qtemu/qtemu-9999.ebuild
+++ b/app-emulation/qtemu/qtemu-9999.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A graphical user interface for QEMU written in Qt4"
 HOMEPAGE="http://qtemu.sourceforge.net/"
 ESVN_REPO_URI="http://qtemu.svn.sourceforge.net/svnroot/qtemu/trunk/qtemu"
 
-LICENSE="GPL-2 LGPL-2.1 CCPL-Attribution-3.0"
+LICENSE="GPL-2 LGPL-2.1 CC-BY-3.0"
 SLOT="0"
 KEYWORDS=""
 IUSE="kvm"

[gentoo-commits] proj/qt:master commit in: app-emulation/qtemu/

[Michael Palimaka]

commit:     7bba3b71de54136b6193fecfb3082a14b59ee734
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 13:20:24 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 13:20:24 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=7bba3b71

[app-emulation/qtemu] Sync live ebuild with release.

Package-Manager: portage-2.1.11.51

---
 app-emulation/qtemu/metadata.xml      |    1 -
 app-emulation/qtemu/qtemu-9999.ebuild |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-emulation/qtemu/metadata.xml b/app-emulation/qtemu/metadata.xml
index 7577f8b..af46327 100644
--- a/app-emulation/qtemu/metadata.xml
+++ b/app-emulation/qtemu/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>qt</herd>
 <use>
-	<flag name="kvm"> Enable kvm based virtual machines </flag>
 	<flag name="qemu"> Enable qemu based virtual machines </flag>
 </use>
 </pkgmetadata>

diff --git a/app-emulation/qtemu/qtemu-9999.ebuild b/app-emulation/qtemu/qtemu-9999.ebuild
index 9ec66e0..28b66a1 100644
--- a/app-emulation/qtemu/qtemu-9999.ebuild
+++ b/app-emulation/qtemu/qtemu-9999.ebuild
@@ -13,13 +13,12 @@ ESVN_REPO_URI="http://qtemu.svn.sourceforge.net/svnroot/qtemu/trunk/qtemu"
 LICENSE="GPL-2 LGPL-2.1 CC-BY-3.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="kvm"
+IUSE="qemu"
 
 DEPEND="net-libs/libvncserver
 	x11-libs/qt-gui:4
 	x11-libs/qt-webkit:4"
 RDEPEND="${DEPEND}
-	!kvm? ( app-emulation/qemu )
-	kvm? ( app-emulation/qemu-kvm )"
+	qemu? ( app-emulation/qemu )"
 
 DOCS=(CHANGELOG README TODO)