Sync with portage [Mon Jan 20 16:14:39 MSK 2014].

app-accessibility/brltty/brltty-4.5-r3.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.7 2014/01/18 20:06:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.5-r3.ebuild,v 1.8 2014/01/19 10:17:26 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
 IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 		java +learn-mode +midi ncurses nls ocaml +pcm python usb +speech
 		tcl X"

app-accessibility/speechd-el/Manifest

@@ -1,4 +1 @@
-DIST speechd-el-0.4.tar.gz 131535 SHA256 a34e3093a788e948420965144f6f79fffbe15e64e611eb2a2278e9004199c5cd SHA512 6c144c464d94d9bc278b92097e893d473d4c5c64004a10cbf522a5cc20cb3a5ebc55fa5a5f40cd4b325567556bac4790b3f92bea02c25b0476221bc55bcb16c1 WHIRLPOOL 39ca8fc5cca7ec994ef0b8279365e8ddd6cce5ab2432ccf1b1ddd178f093443e9ce77b5d009dc1a3a5db5390801a0f9ea8178937d44c13474defb300a199db63
-DIST speechd-el-2.2.tar.gz 177968 SHA256 6d57638fb20ef09207bea02b5d6cd65834aa4bbaf9b1b24833ae43c883298657 SHA512 f444f9b553ecfad82218f8d41f9928ff990b55ebed99a9fedffa6ad6273bca87fff2e3464ed934db3d60088c69eb2ba0db61526aa32d8e831129ba4dc5243eaf WHIRLPOOL 9522191c06b055b711135932e603632dddedca1b39d67346eb01d4df92f7d8a84d7f650f6c4785dc2c9c39c3103a7f1782707893a8fe7b9f820b88b41fd61f4c
-DIST speechd-el-2.4.tar.gz 182959 SHA256 bccf6a26cdb6123001473b5a618dc658fef6630014eddaf12fde4b7628458fda SHA512 394c94c32a91ef8a4914b19b57060de42368842a0fb1470d3e478c9b22c591ac05e908490b7da91a279f0c09643e0581bdcc260d4b329b923b4a5b75ebf062bd WHIRLPOOL 34a5c482b9eb7ee52e7922ba7be3bce847152a2d40a864016e7b2926b604b2984ef0777d746db8c742e1eec75775b7be481e5b8594175e0951883e9a7b63fdff
 DIST speechd-el-2.5.tar.gz 183278 SHA256 1ec52b27248e1c68d3ac37bee78842f3e124dc78e63891a1b706519349e4824e SHA512 b4e5d00d3a86be9c42172ab48c5b0c0f5f25817cb542302f04e29f594422247e4b008428dfaaa1bb2e208a71f126b9c86d25186974606bf5764212a0d6a1a09f WHIRLPOOL 3063e34e19e239653455ebe51bbc0e2e8630c21d5bd2342a24e39c1c8d6a831bb595165611cfa9b441fb6e9ccab50d956b81e63bb4235a86a03464812ffbe4ac

app-accessibility/speechd-el/files/speechd-el-2.4-emacs23.patch

@@ -1,62 +0,0 @@
-diff --git a/speechd-braille.el b/speechd-braille.el
-index a79b24e..dfbae4b 100644
---- a/speechd-braille.el
-+++ b/speechd-braille.el
-@@ -116,9 +116,14 @@
- 
- (defclass speechd-braille-emu-driver (speechd-driver)
-   ((name :initform 'braille-emu)
--   (manager :initform (lambda () (speechd-braille--create-manager
--                                  #'speechd-braille--display)))
--   (priority :initform (lambda () speechd-default-text-priority))))
-+  (manager)
-+  (priority)))
-+
-+(defmethod initialize-instance :after
-+    ((this speechd-braille-emu-driver) slots)
-+  (progn
-+    (oset this priority speechd-default-text-priority)
-+    (oset this manager (speechd-braille--create-manager #'speechd-braille--display))))
- 
- (defmethod speechd-braille--make-message
-     ((driver speechd-braille-emu-driver) text cursor)
-diff --git a/speechd-brltty.el b/speechd-brltty.el
-index f6bf353..ec89d04 100644
---- a/speechd-brltty.el
-+++ b/speechd-brltty.el
-@@ -237,10 +237,14 @@ is not recommended to assign or call user commands here."
- 
- (defclass speechd-brltty-driver (speechd-braille-emu-driver)
-   ((name :initform 'brltty)
--   (manager :initform (lambda () (speechd-brltty--create-manager)))
-+   (manager)
-    (brltty-connection :initform 'uninitialized)
-    (brltty-last-try-time :initform 0)))
- 
-+(defmethod initialize-instance :after
-+    ((this speechd-brltty-driver) slots)
-+  (oset this manager (speechd-brltty--create-manager)))
-+
- (defmethod speechd-braille--make-message
-     ((driver speechd-brltty-driver) text message)
-   (list (speechd-brltty--connection driver) text message))
-diff --git a/speechd-out.el b/speechd-out.el
-index aa82f10..0a484e3 100644
---- a/speechd-out.el
-+++ b/speechd-out.el
-@@ -87,9 +87,14 @@
- 
- 
- (defclass speechd-driver ()
--  ((name :initform (error "Driver name not given") :initarg :name
-+  ((name :initarg :name
-          :reader speechd-driver.name)))
- 
-+(defmethod initialize-instance :after
-+    ((this speechd-driver) slots)
-+  (if (not (slot-boundp this 'name))
-+    (error "Driver name not given")))
-+
- (defun speechd-out-register-driver (driver)
-   (let ((class (class-of driver)))
-     (labels ((replace (list)

app-accessibility/speechd-el/speechd-el-0.4.ebuild

@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-0.4.ebuild,v 1.7 2009/10/17 22:01:46 halcy0n Exp $
-
-inherit elisp-common
-
-DESCRIPTION="emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-
-DEPEND=">=app-emacs/elib-1.0
-	app-accessibility/speech-dispatcher"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	insinto /usr/share/emacs/site-lisp/speechd-el
-	doins *.el
-	exeinto /usr/bin
-	doexe speechd-log-extractor
-	dodoc README EMACSPEAK
-}
-
-pkg_postinst() {
-	elog "Execute the following command from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-}

app-accessibility/speechd-el/speechd-el-2.2.ebuild

@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.2.ebuild,v 1.3 2009/10/17 22:01:46 halcy0n Exp $
-
-inherit elisp
-
-DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-DEPEND=">=app-emacs/cedet-1.0_pre4-r2
-	>=app-accessibility/speech-dispatcher-0.5"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	elisp-install ${PN} *.el
-	exeinto /usr/bin
-	doexe speechd-log-extractor
-	dodoc ANNOUNCE NEWS README speechd-speak.pdf
-	doinfo speechd-el.info
-}
-
-pkg_postinst() {
-	elog "Execute the following commands from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-	elog "  M-x speechd-speak RET"
-	elog
-	elog "or add the following to your ~/.emacs file:"
-	elog
-	elog '(autoload \''speechd-speak "speechd-speak" nil t)'
-	elog '(speechd-speak)'
-}

app-accessibility/speechd-el/speechd-el-2.4.ebuild

@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speechd-el/speechd-el-2.4.ebuild,v 1.3 2012/10/19 19:54:09 ago Exp $
-
-EAPI="4"
-NEED_EMACS=23
-inherit elisp eutils
-
-DESCRIPTION="Emacs speech support"
-HOMEPAGE="http://www.freebsoft.org/speechd-el"
-SRC_URI="http://www.freebsoft.org/pub/projects/speechd-el/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="brltty"
-
-DEPEND=""
-RDEPEND=">=app-accessibility/speech-dispatcher-0.7
-	brltty? ( app-accessibility/brltty )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-emacs23.patch
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	elisp-install ${PN} *.el *.elc
-	dobin speechd-log-extractor
-	dodoc ANNOUNCE NEWS README speechd-speak.pdf
-	doinfo speechd-el.info
-}
-
-pkg_postinst() {
-	elog "Execute the following commands from within emacs to get it to speak:"
-	elog "  M-x load-library RET speechd-speak RET"
-	elog "  M-x speechd-speak RET"
-	elog
-	elog "or add the following to your ~/.emacs file:"
-	elog
-	elog "(autoload 'speechd-speak \"speechd-speak\" nil t)"
-	elog '(speechd-speak)'
-}

app-admin/checkrestart/checkrestart-0.47-r2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/checkrestart/checkrestart-0.47-r2.ebuild,v 1.1 2011/12/12 22:54:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/checkrestart/checkrestart-0.47-r2.ebuild,v 1.2 2014/01/19 16:21:39 maekke Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://arcdraco.net/~dragon/${P}-sep.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 RDEPEND="

app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild,v 1.9 2013/12/17 10:54:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-bashcomp/eselect-bashcomp-1.3.6.ebuild,v 1.10 2014/01/19 10:12:37 vapier Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/eselect-${PV}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 
 RDEPEND=">=app-admin/eselect-1.3.8"
 

app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild,v 1.9 2014/01/15 10:44:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild,v 1.10 2014/01/19 17:18:27 pacho Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-lib-bin-symlink-0.1.1

app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild,v 1.8 2014/01/18 20:06:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-postgresql/eselect-postgresql-1.2.1.ebuild,v 1.9 2014/01/19 10:17:40 ago Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gentoo.org/"
 SRC_URI="http://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="app-admin/eselect"

app-admin/eselect-python/eselect-python-20140115.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild,v 1.1 2014/01/19 01:59:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20140115.ebuild,v 1.3 2014/01/19 15:59:11 floppym Exp $
 
 # Keep the EAPI low here because everything else depends on it.
 # We want to make upgrading simpler.
@@ -22,12 +22,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3"
-# Avoid autotool deps for released versions for circ dep issues.
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND="sys-devel/autoconf"
-else
-	DEPEND=""
-fi
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
@@ -45,9 +39,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	local ret=0
+	if has_version 'dev-lang/python'; then
-	ebegin "Running 'eselect python update'"
+		eselect python update --if-unset
-	eselect python update --python2 --if-unset || ret=1
+	fi
-	eselect python update --python3 --if-unset || ret=1
+	if has_version '=dev-lang/python-2*'; then
-	eend ${ret}
+		eselect python update --python2 --if-unset
+	fi
+	if has_version '=dev-lang/python-3*'; then
+		eselect python update --python3 --if-unset
+	fi
 }

app-admin/eselect-python/eselect-python-99999999.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.11 2014/01/18 05:30:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.13 2014/01/19 15:59:11 floppym Exp $
 
 # Keep the EAPI low here because everything else depends on it.
 # We want to make upgrading simpler.
@@ -22,12 +22,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3"
-# Avoid autotool deps for released versions for circ dep issues.
-if [[ ${PV} == "99999999" ]] ; then
-	DEPEND="sys-devel/autoconf"
-else
-	DEPEND=""
-fi
 
 src_unpack() {
 	if [[ ${PV} == "99999999" ]] ; then
@@ -45,9 +39,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	local ret=0
+	if has_version 'dev-lang/python'; then
-	ebegin "Running 'eselect python update'"
+		eselect python update --if-unset
-	eselect python update --python2 --if-unset || ret=1
+	fi
-	eselect python update --python3 --if-unset || ret=1
+	if has_version '=dev-lang/python-2*'; then
-	eend ${ret}
+		eselect python update --python2 --if-unset
+	fi
+	if has_version '=dev-lang/python-3*'; then
+		eselect python update --python3 --if-unset
+	fi
 }

app-admin/lib_users/Manifest

@@ -1,2 +1 @@
-DIST lib_users-0.5.tar.gz 12067 SHA256 2d884bb8b4298918185bb71173a86d337f7647252781a325472d41504b06a206 SHA512 ae7734aeab5048b55e7229afb960c97dad7f8dfa793661af2cddde7f9f88b39e500fdf532d0a03fef3a6bffd8622017a4182b0739d989474c51c5ef0284297ba WHIRLPOOL a2e1aed7b2cf5dfef6e780ff96496762497e597797c5422dd29b0ddaf4af1903d708abffad0c8d2a1dfb0c382254f046342224a0e79609a1ddccc8fd13064421
 DIST lib_users-0.6.tar.gz 13314 SHA256 127cacaf8e108e4254401976e376b7ef9520cabc21b7b469b5cce39dd794a2dd SHA512 9f13878a309e0f879630dd45e5a27601cffc6816eec8497026815e85873e60f4991f2d412b9c82985cbc3c9088bcd6b8cb5b06bc15bbd327cfc5b002644f3db0 WHIRLPOOL 36430733778872bb18b83258c5bfe1e13c187d96d336d49fdc237ceccde662a14fb53faf9c6317194c49a943a0c32bd147797f82fcbbac2ec5a7c5f37d94c276

app-admin/lib_users/lib_users-0.5.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.5.ebuild,v 1.8 2013/08/09 15:44:41 jlec Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Checks /proc for libraries being mapped but marked as deleted"
-HOMEPAGE="http://schwarzvogel.de/software-misc.shtml"
-SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/nose )"
-RDEPEND=""
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_test() {
-	python_execute_nosetests -P .
-}
-
-src_install() {
-	newbin lib_users.py lib_users
-	dodoc README TODO
-}

app-admin/lib_users/lib_users-0.6.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lib_users/lib_users-0.6.ebuild,v 1.7 2013/08/18 13:28:42 ago Exp $
-
-EAPI=5
-
-inherit python
-
-DESCRIPTION="Checks /proc for libraries being mapped but marked as deleted"
-HOMEPAGE="http://schwarzvogel.de/software-misc.shtml"
-SRC_URI="http://schwarzvogel.de/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/nose )"
-RDEPEND=""
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_test() {
-	python_execute_nosetests -P .
-}
-
-src_install() {
-	newbin lib_users.py lib_users
-	dodoc README TODO
-}

app-admin/python-updater/Manifest

@@ -1,2 +1 @@
-DIST python-updater-0.10.tar.bz2 9245 SHA256 7defcf844e3751ce0ead132116b727f947715c7545a7a2f8ffba7cf375213520 SHA512 4e6ce62fef67bc7fd7738d15b49ddff5f0c5c202a197b783bc4ce78005134d0c541ef32e3591cb6523976b2d6a38441677e819905f127e7b25ec1c0f5bf9d68b WHIRLPOOL b68db0d05c03a6aa68f595d23ff072deafa67e1460350e71bac6a30465c4d60459ff6cef54a1bbc4c87711f5d20843aedb575c1248fd698478b23abfbef26eee
 DIST python-updater-0.11.tar.bz2 9355 SHA256 5c88b2a56febe67e783855a1c51c4c89637e948704834ad1f5d1b6e46cc4a7b8 SHA512 613d0b772faed65690b3999fb557f4414926f72f2f6084cf2e91c225a036df8c1a3c73e4fa6feac191cb7ac89035d3bcae9a6b23f479e2cf63d69bb8c57217fe WHIRLPOOL 9eab112192a3515e71d4971b89282d3f9725629af5b4db6a090d74f4c3dc9421dbfbc9c6c0393b3d6387d4926b1eb1bbc6291ac18ae31e86ecfeb37cfba68b14

app-admin/python-updater/python-updater-0.10-r2.ebuild

@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.10-r2.ebuild,v 1.2 2012/04/26 14:54:37 aballier Exp $
-
-inherit eutils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit subversion
-fi
-
-DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
-HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-	ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
-else
-	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-expand-aliases.patch
-	epatch "${FILESDIR}"/${P}-only-alias-sed-if-exists.patch
-}
-
-src_compile() {
-	if [[ "${PV}" == "9999" ]]; then
-		emake ${PN}.1 || die "Generation of man page failed"
-	fi
-}
-
-src_install() {
-	dosbin ${PN} || die "dosbin failed"
-	doman ${PN}.1 || die "doman failed"
-	dodoc AUTHORS || die "dodoc failed"
-}

app-admin/python-updater/python-updater-0.10.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.10.ebuild,v 1.7 2012/03/02 22:08:06 ranger Exp $
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit subversion
-fi
-
-DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
-HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-	ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
-else
-	SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
-
-src_compile() {
-	if [[ "${PV}" == "9999" ]]; then
-		emake ${PN}.1 || die "Generation of man page failed"
-	fi
-}
-
-src_install() {
-	dosbin ${PN} || die "dosbin failed"
-	doman ${PN}.1 || die "doman failed"
-	dodoc AUTHORS || die "dodoc failed"
-}

app-admin/python-updater/python-updater-0.11.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.11.ebuild,v 1.13 2014/01/18 05:55:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-0.11.ebuild,v 1.14 2014/01/20 02:49:18 floppym Exp $
 
 EAPI=5
 
@@ -23,8 +23,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
+RDEPEND="|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
 
 src_compile() {
 	if [[ "${PV}" == "9999" ]]; then

app-admin/python-updater/python-updater-9999.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.10 2014/01/18 05:55:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/python-updater/python-updater-9999.ebuild,v 1.11 2014/01/20 02:49:18 floppym Exp $
 
 EAPI=5
 
@@ -23,8 +23,7 @@ SLOT="0"
 IUSE=""
 
 DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
-RDEPEND="dev-lang/python
+RDEPEND="|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
-	|| ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
 
 src_compile() {
 	if [[ "${PV}" == "9999" ]]; then

app-admin/setools/Manifest

@@ -5,4 +5,5 @@ DIST setools-3.3.7-06-gentoo-patches.tar.gz 6081 SHA256 466241e8c59eb78d7ecbbbba
 DIST setools-3.3.7.tar.bz2 940657 SHA256 2bfa0918746bdcc910b16b26a51109a4ffd07404c306141ada584cb36e3c895a SHA512 ae45a8ae11a3b7952da61b6b4c51adbb6b1b7caa6b15fdbfa71f6f150b6bc55d2d918e9e7720f868b4f432a5df6ed35d63d53a1c7640f015d9fa9c415d6e6a21 WHIRLPOOL a524e948c804a268c5308c1b544552b295e954d98a6fbb606bce2bd3cf33d37ebd3a0805226396c70f03d895a9ab8403d9ceeef4dd0117097851bb2ebb7660a1
 DIST setools-3.3.8-01-fedora-patches.tar.gz 1128 SHA256 420b852d4209d07b73cec84586e000e7a6a719135ea677711abf97d420840bb6 SHA512 1aa2cc50c307929b522e029a552bfd545aef07656d1983289b0ea9be67aa94c07272a59c17630fc09fd79b06845ada318cdfa48d6cc243a24026e015c23b9634 WHIRLPOOL 25ae2b15fb15060fd0d34c55f4cc098b70a3a616f5334b092657a9c5df037b7fcf00fd185f33ba142e47d46c36b2fb7e9434021d6e987832fe833367a50d7449
 DIST setools-3.3.8-01-gentoo-patches.tar.gz 5798 SHA256 3b8fa933617e42f1fe857b2b8b9ae949ea01324f98f17837e988714562b076b8 SHA512 bcca3678b3f3a3abdbac2d05b1007329249e0dda4f84a9c40c3030cdf22f7815a47bcfa68d7c70836ec1b8b2cbfd8c370d7cd7d09c41b3d4983ec23d79468e56 WHIRLPOOL 5a6072e512754caf7af32a626b3213d6a543c51cc0ff67bbd9b3f6bb822a0b8e406f7e245c9d459be27e2d6ecef527633b889aface5bffc2e04cc15f881529bb
+DIST setools-3.3.8-02-gentoo-patches.tar.gz 6296 SHA256 d386e82ebc0070548a401756985854b79674d7b144076b28f4eaf37fccc0fa1a SHA512 d86ff65f23e54a659eeb2e91d71075e8667d972adcc698709c64f33a9702bb196ef0ded4b5d415f8e5b6a552bfddaaf52b42aa71fb21299f29ca2b7ae230adf1 WHIRLPOOL cd50fbd2f7732f447c224000cd2ebf30c17728217f2e0529d297a110e2ea016498b9bce3dc5209ab8e2cd5091e70e55fb85296bb818567ebe781df74d9aaddf5
 DIST setools-3.3.8.tar.bz2 951428 SHA256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 SHA512 2c42ee9904174ed6c6fc129e374ec3591925094ab0ef65001b0104e365c5634bf4a79f28369608c80199d8f59fafaa5f274107c04c129c380eeef7adb0c32667 WHIRLPOOL 11c4065809909764f4364b78df1a8030d189315601b882919ccacb5fb147c1b3a061c5bbf9ced3c243d4615ab7727e9db0c89e931a884ae8b317ae3a879e5371

app-admin/setools/setools-3.3.8-r3.ebuild

@@ -0,0 +1,177 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/setools/setools-3.3.8-r3.ebuild,v 1.1 2014/01/19 20:36:55 swift Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-* 3.*"
+
+inherit autotools java-pkg-opt-2 python eutils
+
+DESCRIPTION="SELinux policy tools"
+HOMEPAGE="http://www.tresys.com/selinux/selinux_policy_tools.shtml"
+SRC_URI="http://oss.tresys.com/projects/setools/chrome/site/dists/${P}/${P}.tar.bz2
+	http://dev.gentoo.org/~swift/patches/setools/${P}-01-fedora-patches.tar.gz
+	http://dev.gentoo.org/~swift/patches/setools/${P}-02-gentoo-patches.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug java python"
+
+DEPEND=">=sys-libs/libsepol-2.1.4
+	sys-libs/libselinux
+	sys-devel/bison
+	sys-devel/flex
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	java? (
+		dev-lang/swig:1
+		>=virtual/jdk-1.4
+	)
+	python? ( dev-lang/swig:1 )
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RDEPEND=">=sys-libs/libsepol-2.1.4
+	sys-libs/libselinux
+	>=dev-db/sqlite-3.2:3
+	dev-libs/libxml2:2
+	java? ( >=virtual/jre-1.4 )
+	X? (
+		>=dev-lang/tk-8.4.9
+		>=dev-tcltk/bwidget-1.8
+		>=gnome-base/libglade-2.0
+		>=x11-libs/gtk+-2.8:2
+	)"
+
+RESTRICT="test"
+
+pkg_setup() {
+	if use java; then
+		java-pkg-opt-2_pkg_setup
+	fi
+
+	if use python; then
+		python_pkg_setup
+		PYTHON_DIRS="libapol/swig/python libpoldiff/swig/python libqpol/swig/python libseaudit/swig/python libsefs/swig/python python"
+	fi
+}
+
+src_prepare() {
+	EPATCH_MULTI_MSG="Applying various (Fedora-provided) setools fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	EPATCH_MULTI_MSG="Applying various (Gentoo) setool fixes... " \
+	EPATCH_SUFFIX="patch" \
+	EPATCH_SOURCE="${WORKDIR}/gentoo-patches" \
+	EPATCH_FORCE="yes" \
+	epatch
+
+	# Disable broken check for SWIG version.
+	sed -e "s/AC_PROG_SWIG(2.0.0)/AC_PROG_SWIG/" -i configure.ac || die "sed failed"
+	# Use swig1.3
+	sed -e 's/AC_PATH_PROG(\[SWIG\],\[swig\])/AC_PATH_PROG([SWIG],[swig1.3])/' -i m4/ac_pkg_swig.m4 || die "failed to set swig1.3"
+	# Fix build failure due to double __init__.py installation
+	sed -e "s/^wrappedpy_DATA = qpol.py \$(pkgpython_PYTHON)/wrappedpy_DATA = qpol.py/" -i libqpol/swig/python/Makefile.am || die
+
+	local dir
+	for dir in ${PYTHON_DIRS}; do
+		# Python bindings are built/installed manually.
+		sed -e "s/MAYBE_PYSWIG = python/MAYBE_PYSWIG =/" -i ${dir%python}Makefile.am || die "sed failed"
+		# Make PYTHON_LDFLAGS replaceable during running `make`.
+		sed -e "/^AM_LDFLAGS =/s/@PYTHON_LDFLAGS@/\$(PYTHON_LDFLAGS)/" -i ${dir}/Makefile.am || die "sed failed"
+	done
+
+	# temporary work around bug #424581 until automake-1.12 is stable (then
+	# depend on it). Need to use MKDIR_P in the mean time for 1.12+.
+	has_version ">=sys-devel/automake-1.12.1" && { find . -name 'Makefile.*' -exec sed -i -e 's:mkdir_p:MKDIR_P:g' {} +  || die; }
+
+	eautoreconf
+
+	# Disable byte-compilation of Python modules.
+	echo '#!/bin/sh' > py-compile
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--with-java-prefix=${JAVA_HOME} \
+		--disable-selinux-check \
+		--disable-bwidget-check \
+		$(use_enable python swig-python) \
+		$(use_enable java swig-java) \
+		$(use_enable X swig-tcl) \
+		$(use_enable X gui) \
+		$(use_enable debug)
+
+	# work around swig c99 issues.  it does not require
+	# c99 anyway.
+	sed -i -e 's/-std=gnu99//' "${S}/libseaudit/swig/python/Makefile"
+}
+
+src_compile() {
+	emake || die "Failed to build setools"
+
+	if use python; then
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			python_copy_sources ${dir}
+			building() {
+				emake \
+					SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
+					PYTHON_LDFLAGS="$(python_get_library -l)" \
+					pyexecdir="$(python_get_sitedir)" \
+					pythondir="$(python_get_sitedir)"
+			}
+			python_execute_function \
+				--action-message "Building of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version)" \
+				--failure-message "Building of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version) failed" \
+				-s --source-dir ${dir} \
+				building
+		done
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use python; then
+		local dir
+		for dir in ${PYTHON_DIRS}; do
+			installation() {
+				emake \
+					DESTDIR="${D}" \
+					pyexecdir="$(python_get_sitedir)" \
+					pythondir="$(python_get_sitedir)" \
+					install
+			}
+			python_execute_function \
+				--action-message "Installation of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version)" \
+				--failure-message "Installation of Python bindings from ${dir} directory with \$(python_get_implementation) \$(python_get_version) failed" \
+				-s --source-dir ${dir} \
+				installation
+		done
+	fi
+}
+
+pkg_postinst() {
+	if use python; then
+		python_mod_optimize setools
+	fi
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup setools
+	fi
+}

app-arch/dpkg/Manifest

@@ -1,5 +1,3 @@
-DIST dpkg_1.16.10.tar.xz 3703340 SHA256 aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2 SHA512 cd7b1159c2071f48f2e369e03b8a3d1f00366bcdabab2ef4c33700e8f3230db5c9991e5937331f7f66f616d2bb798efec12e572af5724e1c9809beb9d5ae627e WHIRLPOOL 5d54eedf2b90f35ea9ee7b5c1bdc6ddc2a3054c893cddb048598d85a6f6a5ea846879d5c1181432bffc0268b404408a6d2d40bce0cfd49784e5b6bca703bae44
-DIST dpkg_1.16.11.tar.xz 3788644 SHA256 fa053acbc1d7d3e28c6329c412a08812b971e84898d06efc7bfa36e6a1cbbd96 SHA512 767b34db7952ef9d1bcbda7569604dccfd9c17d07e0ab2b452703ffb5089e738d4fd0d4b335da5e2440bd00e8d11b69eeaab838ecd66dd398126a93b9c24e3da WHIRLPOOL e6cf94e90597f05f66ef5a90b6c5a9484b9a34933a3d9e2d952230dcbda49e4c1e61a58d2ee13facb4492d312e4f6b4fd80d625f1821f77bbc70e83bfabecde7
 DIST dpkg_1.16.12.tar.xz 3789016 SHA256 af96447758ecbfda51fc57d4b3bc3d208ad6393e71b91c9b52c6687697a208da SHA512 852c9cfeeac278564e605e5a5c4d77cb775ad20cf7fc52fa28c2a6192462ee28c32ecc2b5e434e5eec185deff5039d9fb1802cb4fe6d131b8fba7209f8462d44 WHIRLPOOL 08a415bf48bf91086285b8f71fb29fd3705ddcad85a440e6eab1528399e4d6ed0f59d977382c9daa401dbd4c172fa21a210115fc9af55124c73a628add2b3178
 DIST dpkg_1.17.4.tar.xz 3836352 SHA256 01cdc81c33e77c3d7c40df17e19171794542be7cf12e411381ffcaa8f87b1854 SHA512 5b87c4e8860979eb802df5dd7bd7fa6929d4090be2b546a0c936cecac168e7f94563dfe5848317fe930185b3701fd170df737ecf8d47143153f67f484f4f9480 WHIRLPOOL 93f33e90d87910ccdd9cd57dcde5f5bf2ca7f76de00cf16a7c405050d9c9d9f65329360da01600ef2f2ff8bbb5146cac9a88a2b45ca3f93d7b0d723636b20c3e
 DIST dpkg_1.17.5.tar.xz 3839224 SHA256 b7c465006bb87725cf0fbcf61bd04d9c31384a4a68e41a0aeadacac0eb63f23d SHA512 ec892f50748eb59e71c2d7ed3d8033ee42d1dd8909ac18ae7361714d632d02d3f9ca37fd0beb6f806f8db84920134f1deda7c4559d606daab8070209144dcf4d WHIRLPOOL 6007af93d97f95169b64bbf3b572a2b756ddcc67fd4ca7be25801019fcf04b407aadf4ee6daf8e36f79b38d36c2c5cddd3393ae63fc5695bfef6830af89a7d41

app-arch/dpkg/dpkg-1.16.10.ebuild

@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.10.ebuild,v 1.14 2013/07/02 07:41:42 ago Exp $
-
-EAPI=4
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="bzip2 dselect nls test unicode zlib"
-
-LANGS="
-	ast bs ca cs da de dz el eo es et eu fr gl hu id it ja km ko ku lt mr nb ne
-	nl nn pa pl pt_BR pt ro ru sk sv th tl vi zh_CN zh_TW
-"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( app-text/po4a )
-	sys-devel/flex
-	virtual/pkgconfig
-	test? (
-		dev-perl/DateTime-Format-DateParse
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-	)"
-REQUIRED_USE="dselect? ( nls )"
-
-src_prepare() {
-	# do not expect Debian's gzip --rsyncable extension
-	epatch "${FILESDIR}"/${PN}-1.16.4.2-gzip-rsyncable.patch
-
-	# Force the use of the running bash for get-version (this file is never
-	# installed, so no need to worry about hardcoding a temporary bash)
-	sed -i -e '1c\#!'"${BASH}" get-version || die
-
-	# this test depends on a Debian only gzip extension that adds --rsyncable
-	# which will therefore always fail on Gentoo. (bug #310847).
-	sed -i scripts/Makefile.am \
-		-e '/850_Dpkg_Compression.t/d' \
-		|| die "sed failed"
-
-	# test fails (bug #414095)
-	sed -i utils/Makefile.am \
-		-e '/^test_cases/d;/100_update_alternatives/d' || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable dselect) \
-		$(use_enable unicode) \
-		$(use_with bzip2 bz2) \
-		$(use_with zlib) \
-		${myconf} \
-		--disable-compiler-optimisations \
-		--disable-compiler-warnings \
-		--disable-linker-optimisations \
-		--disable-silent-rules \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var \
-		--without-selinux
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		LINGUAS=none
-	fi
-
-	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install
-	rm "${ED}"/usr/sbin/install-info || die "rm install-info failed"
-	dodoc ChangeLog THANKS TODO
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}

app-arch/dpkg/dpkg-1.16.11.ebuild

@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.11.ebuild,v 1.1 2013/09/28 13:55:18 jer Exp $
-
-EAPI=4
-inherit eutils multilib autotools toolchain-funcs
-
-DESCRIPTION="Package maintenance system for Debian"
-HOMEPAGE="http://packages.qa.debian.org/dpkg"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
-IUSE="bzip2 dselect nls test unicode zlib"
-
-LANGS="
-	ast bs ca cs da de dz el eo es et eu fr gl hu id it ja km ko ku lt mr nb ne
-	nl nn pa pl pt_BR pt ro ru sk sv th tl vi zh_CN zh_TW
-"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND=">=dev-lang/perl-5.6.0
-	dev-perl/TimeDate
-	>=sys-libs/ncurses-5.2-r7
-	zlib? ( >=sys-libs/zlib-1.1.4 )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( app-text/po4a )
-	sys-devel/flex
-	virtual/pkgconfig
-	test? (
-		dev-perl/DateTime-Format-DateParse
-		dev-perl/IO-String
-		dev-perl/Test-Pod
-	)"
-REQUIRED_USE="dselect? ( nls )"
-
-src_prepare() {
-	# do not expect Debian's gzip --rsyncable extension
-	epatch "${FILESDIR}"/${PN}-1.16.4.2-gzip-rsyncable.patch
-
-	# Force the use of the running bash for get-version (this file is never
-	# installed, so no need to worry about hardcoding a temporary bash)
-	sed -i -e '1c\#!'"${BASH}" get-version || die
-
-	# this test depends on a Debian only gzip extension that adds --rsyncable
-	# which will therefore always fail on Gentoo. (bug #310847).
-	sed -i scripts/Makefile.am \
-		-e '/850_Dpkg_Compression.t/d' \
-		|| die "sed failed"
-
-	# test fails (bug #414095)
-	sed -i utils/Makefile.am \
-		-e '/^test_cases/d;/100_update_alternatives/d' || die
-
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		$(use_enable dselect) \
-		$(use_enable unicode) \
-		$(use_with bzip2 bz2) \
-		$(use_with zlib) \
-		${myconf} \
-		--disable-compiler-optimisations \
-		--disable-compiler-warnings \
-		--disable-linker-optimisations \
-		--disable-silent-rules \
-		--disable-start-stop-daemon \
-		--localstatedir="${EPREFIX}"/var \
-		--without-selinux
-}
-
-src_compile() {
-	emake AR=$(tc-getAR)
-}
-
-src_install() {
-	strip-linguas ${LANGS}
-	if [ -z "${LINGUAS}" ] ; then
-		LINGUAS=none
-	fi
-
-	emake DESTDIR="${D}" LINGUAS="${LINGUAS}" install
-	rm "${ED}"/usr/sbin/install-info || die "rm install-info failed"
-	dodoc ChangeLog THANKS TODO
-	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
-	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
-}

app-arch/lbzip2/lbzip2-2.3-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.3-r1.ebuild,v 1.11 2014/01/18 20:06:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lbzip2/lbzip2-2.3-r1.ebuild,v 1.12 2014/01/19 10:17:54 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug symlink"
 
 RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"

app-arch/lzip/lzip-1.15.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.15.ebuild,v 1.7 2014/01/18 20:07:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lzip/lzip-1.15.ebuild,v 1.8 2014/01/19 10:18:08 ago Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sparc x86"
 
 src_configure() {
 	# not autotools-based

app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild,v 1.1 2013/10/08 16:52:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu-daemon/cdemu-daemon-2.1.1.ebuild,v 1.2 2014/01/19 17:23:54 pacho Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/6" # subslot = CDEMU_DAEMON_INTERFACE_VERSION in CMakeLists.txt
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.32:2

app-cdr/cdemu/cdemu-2.1.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.1 2013/10/08 16:52:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdemu/cdemu-2.1.1.ebuild,v 1.2 2014/01/19 17:24:10 pacho Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
 IUSE="+cdemu-daemon"
 
 RDEPEND="${PYTHON_DEPS}

app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild,v 1.3 2014/01/19 01:12:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-3.01_alpha21.ebuild,v 1.4 2014/01/20 02:32:59 patrick Exp $
 
 EAPI=5
 
@@ -128,7 +128,7 @@ src_configure() {
 			"unsigned long int" "unsigned long long"
 			float double "long double" size_t ssize_t ptrdiff_t
 			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-            "char *" "unsigned char *"
+			"char *" "unsigned char *"
 		)
 		for t in "${types[@]}" ; do
 			var="ac_cv_sizeof_${t// /_}"

app-cdr/gcdemu/gcdemu-2.1.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-2.1.1.ebuild,v 1.1 2013/10/08 16:52:28 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gcdemu/gcdemu-2.1.1.ebuild,v 1.2 2014/01/19 17:24:27 pacho Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}

app-crypt/mit-krb5/files/mit-krb5-1.12_uninitialized.patch

@@ -0,0 +1,55 @@
+--- a/src/slave/kprop.c
++++ b/src/slave/kprop.c
+@@ -91,7 +91,7 @@ main(argc, argv)
+     int     argc;
+     char    **argv;
+ {
+-    int     fd, database_fd, database_size;
++    int     fd = -1, database_fd, database_size;
+     krb5_error_code retval;
+     krb5_context context;
+     krb5_creds *my_creds;
+--- a/src/kadmin/ktutil/ktutil_funcs.c
++++ b/src/kadmin/ktutil/ktutil_funcs.c
+@@ -64,7 +64,7 @@
+     krb5_kt_list *list;
+     int idx;
+ {
+-    krb5_kt_list lp, prev;
++    krb5_kt_list lp, prev = NULL;
+     int i;
+ 
+     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
+--- a/src/lib/kadm5/alt_prof.c
++++ b/src/lib/kadm5/alt_prof.c
+@@ -164,7 +164,7 @@
+     char **values;
+     char *valp;
+     int idx;
+-    krb5_boolean val;
++    krb5_boolean val = 0;
+ 
+     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
+     if (kret)
+
+--- a/src/util/profile/prof_init.c
++++ b/src/util/profile/prof_init.c
+@@ -255,7 +255,7 @@ copy_vtable_profile(profile_t profile, profile_t *ret_new_profile)
+ {
+     errcode_t err;
+     void *cbdata;
+-    profile_t new_profile;
++    profile_t new_profile = NULL;
+ 
+     *ret_new_profile = NULL;
+ 
+--- a/src/tests/asn.1/trval.c	2013-04-12 12:51:36.000000000 -0500
++++ b/src/tests/asn.1/trval.c	2013-05-24 04:31:14.077036380 -0500
+@@ -404,7 +404,7 @@
+ {
+     int n;
+     int r = 0;
+-    int rlen2;
++    int rlen2 = 0;
+     int rlent;
+     int save_appl;

app-crypt/mit-krb5/files/mit-krb5-config_LDFLAGS.patch

@@ -0,0 +1,12 @@
+Bug #448778
+--- a/src/build-tools/krb5-config.in	2012-12-18 02:47:04.000000000 +0000
++++ b/src/build-tools/krb5-config.in	2012-12-28 07:13:16.582693363 +0000
+@@ -217,7 +217,7 @@
+ 	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
+ 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+-	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
++	    -e 's#\$(LDFLAGS)##' \
+ 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ 	    -e 's#\$(CFLAGS)##'`
+ 

app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild,v 1.8 2014/01/18 19:57:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/myspell-pt-br/myspell-pt-br-3.0.0.ebuild,v 1.9 2014/01/19 10:14:22 ago Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ SRC_URI="
 
 LICENSE="LGPL-3 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND=""

app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.22 2014/01/04 20:05:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.9999.ebuild,v 1.23 2014/01/19 16:57:21 ulm Exp $
 
 EAPI=5
 
@@ -31,7 +31,6 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 

app-editors/joe/joe-3.7-r2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.7-r2.ebuild,v 1.6 2014/01/18 20:00:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/joe/joe-3.7-r2.ebuild,v 1.7 2014/01/19 10:15:07 ago Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="xterm"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2"

app-editors/nvi/nvi-1.81.6-r4.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r4.ebuild,v 1.6 2014/01/18 20:16:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r4.ebuild,v 1.7 2014/01/19 10:29:36 ago Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ SRC_URI="http://garage.linux.student.kuleuven.be/~skimo/nvi/devel/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="perl tcl unicode"
 
 CDEPEND="|| ( ${DBDEPENDS} )

app-emulation/libvirt/Manifest

@@ -1,7 +1,7 @@
-DIST libvirt-1.0.5.6.tar.gz 23998470 SHA256 171e2497d4d4109f4839f6f4b727b92f02530776b87b7246189d7ca6b44372bf SHA512 119c8c7a584a0fb6ea8e6385d5d5aac814e9f0a975adf4e75ee012d116a139c558ecb121da544e073700f1eb95a9b360fb457ce6cfebeddfb703fe42d41546a7 WHIRLPOOL 5f3b17f07e124816facf847d43bde74cbcd90213206085f770b1cb86240b0ba2a7cde8f1846665ecdaaf261d1ca44eb14226d27223e98b652efcbb834d00a103
 DIST libvirt-1.1.3-062ad8b2.tar.xz 18836 SHA256 a16a72d9cc6b49564e234b39f94a987e20da9fd511203ec1cb4534ccf4570121 SHA512 0734836972ef3e7a2d8bcb1d1ab001b3f15202c2921107c28a17f6ccf4002849c920133969b611560a88ca7f969eea468b1a8bc14b432b270f624c6594fc1ade WHIRLPOOL 340ca175f7322ede982455ba311a19cd5cbb33ea49e1fa3a7ab13a0fdb31c37a8a0fc58cec189efb19a861a21d6c677c3c3533e58e9fb9eaa4ce0f3dde721ec9
 DIST libvirt-1.1.3.1.tar.gz 26595900 SHA256 00383e0beef1854610d8d47fd9347564b3654ce0e4a263e06b0de364a118c93e SHA512 59f79d0fc52ae0c9ae97bcc8fd90f799d6daf63c9a36d38738ec7d7392e630e39347f0c472b02434e83888b3ee0ab62d2b0b4eaa92eed3102ff36ca30f2598aa WHIRLPOOL 92be678e7ef84f9437bb91b1a621e6b35f9ce1383b945e466b4b864c0df1cfb95900da6267263bb1984663ea8e2b5b358bd516748a934835a87be822f5d27e90
+DIST libvirt-1.1.3.3.tar.gz 26611343 SHA256 81f3527b5e647d128af18b21ea924ffb4f8b6420fe87d19f09829af7b31982e9 SHA512 01fb1b70fc537cdb0986f09066df3af61ed3d949814c42438842e4ceb44e919a1a1a4f1d9e3d4adaab050fbcb4dffc218b1b9f7fbbae1d035a7c0edc2fc3f03e WHIRLPOOL cf5cc9d298deac77c7f6ff5a3a8edac8f63bdf93a423fefa8a4969fa0d03ec35864a7fd1894c4fd37daad731c018d3c0b7e55fe92321bbc3f106fb73728f1e8d
 DIST libvirt-1.1.3.tar.gz 26578000 SHA256 af83e65b4b26520662ddd183c1358be0d05138dba3e66745419f06441eff5a7c SHA512 895f8ccf1fdf7a36918e4d460b44b1bf67d06842e39142c89c620f6191e299b53c50f80ab47677d7cba6bd570177d79b5ee0d7d2a11472991590389db51fab9d WHIRLPOOL c046f1182976bbd6bf65b460b2017996e63f67b5cce44f0af859d90f892278d0236192e6e7172e16c85183da6e258a003d9c8757af2079ab4d77de9ca300d986
-DIST libvirt-1.1.4.tar.gz 26799019 SHA256 5910f5cf607a50c606d959e6b1e5d6e67966b7aa7324982afd7f85d9c24bd98f SHA512 64455585b8d7e5c0f701e9803ae00d277ee27f9bec92b9890e487cd0298f5f8ff9075d0b2bc81be67e8d8e03bfe58eb2e4fd6292439acd9d22a3f3e7f5b87efc WHIRLPOOL c8de6024b51988415847463064ccf2bcc9d7cb42be8765fbfcf901b594d963351f312d962ca4fb2a5ecce7c2247a60b6201e57a41ba44caa6211148585d65352
 DIST libvirt-1.2.0-36378d1a.tar.xz 5200 SHA256 1c1448051bad702eccd7a122496f7995427218152b65de12e3d418f7faaf6412 SHA512 4c01d90dc1e2c46ed65a61321887d1337ea2733dfda1361de9560bd5aba68ff51e425190bbe140893dd96f902111ed5be1ba9bc72a356abc0251f30fff645746 WHIRLPOOL f3778cfd56c0a0857607af1c301e3cf8a96ecf87b5ec85d23dbf98512692fd2bb428c923eab69234e6fdad95ed6e195bb01ebdd843df7a18e910e55bb6dccf82
 DIST libvirt-1.2.0.tar.gz 26916717 SHA256 a8e578ae7861db2ac5f454073293d2ef3229fd3f6c4f9029101763244db22ddd SHA512 834274b0249eb39439d21cd9b494fa2acbaee9e5337557b8d57977b483f3e5d00fd0a6743f8f4a02e826114c15d2468ab0c9385e4e4c9537abba18da3d8c5fa6 WHIRLPOOL 057a91ad4296710833721d3a7f9eff616755422462479709b72e5fe679ed8825c5bbfd47fde9f7abaf1e6f4104a680ad874c41bf9759cf45ac7d863061a38cd0
+DIST libvirt-1.2.1.tar.gz 27228694 SHA256 bc29b5751bf36753c17e2fdbb75e70c7b07df3d9527586d3426e90f5f4abb898 SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0 WHIRLPOOL 75c2a37b1101950474aad8931d999564ff575512d38c9e8d2cf989cef3ad7057853046b738b20bd77be80c1e6677319aea7227797ae95ce91512dc36bd05a142

app-emulation/libvirt/libvirt-1.0.5.6.ebuild

@@ -1,433 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.5.6.ebuild,v 1.2 2013/10/25 18:10:42 cardoe Exp $
-
-EAPI=5
-
-#BACKPORTS=b8430867
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_DEPEND="python? 2:2.5"
-#RESTRICT_PYTHON_ABIS="3.*"
-#SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils python user autotools linux-info systemd
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="amd64 x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
-	systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )
-	virt-network? ( libvirtd )
-	firewalld? ( virt-network )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	dev-libs/libgcrypt
-	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	app-misc/scrub
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		sys-power/pm-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-misc/radvd
-		net-firewall/ebtables
-		sys-apps/iproute2[-minimal]
-		firewalld? ( net-firewall/firewalld )
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xhtml1
-	dev-libs/libxslt
-	dev-lang/perl
-	=dev-lang/python-2*"
-
-LXC_CONFIG_CHECK="
-	~CGROUPS
-	~CGROUP_FREEZER
-	~CGROUP_DEVICE
-	~CGROUP_CPUACCT
-	~CGROUP_SCHED
-	~CGROUP_PERF
-	~BLK_CGROUP
-	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
-	~CPUSETS
-	~RESOURCE_COUNTERS
-	~NAMESPACES
-	~UTS_NS
-	~IPC_NS
-	~PID_NS
-	~NET_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-	~BRIDGE_NF_EBTABLES
-	~BRIDGE_EBT_MARK_T
-	~NETFILTER_ADVANCED
-	~NETFILTER_XT_TARGET_CHECKSUM
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MARK
-"
-
-MACVTAP_CONFIG_CHECK="~MACVTAP"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP}"
-	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch_user
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-	# Tweak the init script
-	local avahi_init=
-	local iscsi_init=
-	local rbd_init=
-	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r12" "${S}/libvirtd.init"
-	use avahi && avahi_init='avahi-daemon'
-	use iscsi && iscsi_init='iscsid'
-	use rbd && rbd_init='ceph'
-	use firewalld && firewalld_init='need firewalld'
-
-	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-	local myconf=""
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	myconf+=" --without-xenapi"
-	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-		myconf+=" --with-libxl"
-	else
-		myconf+=" --without-libxl"
-	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	# user privilege bits fir qemu/kvm
-	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
-	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
-	fi
-
-	# audit support
-	myconf="${myconf} $(use_with audit)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# systemd unit files
-	use systemd && myconf="${myconf} --with-init-script=systemd"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF}/python \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/python/examples \
-		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-
-	keepdir /var/lib/libvirt/images
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-
-	# Only sysctl files ending in .conf work
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	use python && python_mod_optimize libvirt.py
-
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if ! use policykit; then
-		elog "To allow normal users to connect to libvirtd you must change the"
-		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	elog
-	elog "For the basic networking support (bridged and routed networks)"
-	elog "you don't need any extra software. For more complex network modes"
-	elog "including but not limited to NATed network, you can enable the"
-	elog "'virt-network' USE flag."
-	elog
-	if has_version net-dns/dnsmasq; then
-		ewarn "If you have a DNS server setup on your machine, you will have"
-		ewarn "to configure /etc/dnsmasq.conf to enable the following settings: "
-		ewarn " bind-interfaces"
-		ewarn " interface or except-interface"
-		ewarn
-		ewarn "Otherwise you might have issues with your existing DNS server."
-	fi
-
-	if use caps && use qemu; then
-		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-	fi
-}
-
-pkg_postrm() {
-	use python && python_mod_cleanup libvirt.py
-}

app-emulation/libvirt/libvirt-1.1.3.3.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.3-r2.ebuild,v 1.1 2013/10/25 20:06:42 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.3.3.ebuild,v 1.1 2014/01/19 21:42:08 cardoe Exp $
 
 EAPI=5
 
-BACKPORTS=062ad8b2
+#BACKPORTS=062ad8b2
 AUTOTOOLIZE=yes
 
 MY_P="${P/_rc/-rc}"
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
+	SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz
 		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
 		${BACKPORTS:+
 			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"

app-emulation/libvirt/libvirt-1.1.4.ebuild

@@ -1,433 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.1.4.ebuild,v 1.2 2013/11/11 03:41:44 floppym Exp $
-
-EAPI=5
-
-#BACKPORTS=062ad8b2
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils python-single-r1 user autotools linux-info systemd readme.gentoo
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://libvirt.org/libvirt.git"
-	AUTOTOOLIZE=yes
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz
-		ftp://libvirt.org/libvirt/${MY_P}.tar.gz
-		${BACKPORTS:+
-			http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~x86"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="audit avahi +caps firewalld fuse iscsi +libvirtd lvm lxc +macvtap nfs \
-	nls numa openvz parted pcap phyp policykit python +qemu rbd sasl \
-	selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc \
-	systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	uml? ( libvirtd )
-	vepa? ( macvtap )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )
-	virt-network? ( libvirtd )
-	firewalld? ( virt-network )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="sys-libs/readline
-	sys-libs/ncurses
-	>=net-misc/curl-7.18.0
-	dev-libs/libgcrypt
-	>=dev-libs/libxml2-2.7.6
-	dev-libs/libnl:3
-	>=net-libs/gnutls-1.0.25
-	net-libs/libssh2
-	sys-apps/dmidecode
-	>=sys-apps/util-linux-2.17
-	sys-devel/gettext
-	>=net-analyzer/netcat6-1.0-r2
-	app-misc/scrub
-	audit? ( sys-process/audit )
-	avahi? ( >=net-dns/avahi-0.6[dbus] )
-	caps? ( sys-libs/libcap-ng )
-	fuse? ( >=sys-fs/fuse-2.8.6 )
-	iscsi? ( sys-block/open-iscsi )
-	lxc? ( sys-power/pm-utils )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
-	nfs? ( net-fs/nfs-utils )
-	numa? (
-		>sys-process/numactl-2.0.2
-		sys-process/numad
-	)
-	openvz? ( sys-kernel/openvz-sources )
-	parted? (
-		>=sys-block/parted-1.8[device-mapper]
-		sys-fs/lvm2
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? ( >=sys-auth/polkit-0.9 )
-	python? ( ${PYTHON_DEPS} )
-	qemu? (
-		>=app-emulation/qemu-0.13.0
-		dev-libs/yajl
-		sys-power/pm-utils
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	selinux? ( >=sys-libs/libselinux-2.0.85 )
-	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
-	xen? ( app-emulation/xen-tools app-emulation/xen )
-	udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
-	virt-network? ( net-dns/dnsmasq
-		>=net-firewall/iptables-1.4.10
-		net-misc/radvd
-		net-firewall/ebtables
-		sys-apps/iproute2[-minimal]
-		firewalld? ( net-firewall/firewalld )
-	)
-	elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-# one? ( dev-libs/xmlrpc-c )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt"
-
-DOC_CONTENTS="For the basic networking support (bridged and routed networks)
-you don't need any extra software. For more complex network modes
-including but not limited to NATed network, you can enable the
-'virt-network' USE flag.\n\n
-If you are using dnsmasq on your system, you will have
-to configure /etc/dnsmasq.conf to enable the following settings:\n\n
- bind-interfaces\n
- interface or except-interface\n\n
-Otherwise you might have issues with your existing DNS server."
-
-LXC_CONFIG_CHECK="
-	~CGROUPS
-	~CGROUP_FREEZER
-	~CGROUP_DEVICE
-	~CGROUP_CPUACCT
-	~CGROUP_SCHED
-	~CGROUP_PERF
-	~BLK_CGROUP
-	~NET_CLS_CGROUP
-	~NETPRIO_CGROUP
-	~CPUSETS
-	~RESOURCE_COUNTERS
-	~NAMESPACES
-	~UTS_NS
-	~IPC_NS
-	~PID_NS
-	~NET_NS
-	~USER_NS
-	~DEVPTS_MULTIPLE_INSTANCES
-	~VETH
-	~MACVLAN
-	~POSIX_MQUEUE
-	~SECURITYFS
-	~!GRKERNSEC_CHROOT_MOUNT
-	~!GRKERNSEC_CHROOT_DOUBLE
-	~!GRKERNSEC_CHROOT_PIVOT
-	~!GRKERNSEC_CHROOT_CHMOD
-	~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
-	~BRIDGE_NF_EBTABLES
-	~BRIDGE_EBT_MARK_T
-	~NETFILTER_ADVANCED
-	~NETFILTER_XT_TARGET_CHECKSUM
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MARK
-"
-
-MACVTAP_CONFIG_CHECK=" ~MACVTAP"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-pkg_setup() {
-	enewgroup qemu 77
-	enewuser qemu 77 -1 -1 qemu kvm
-
-	# Some people used the masked ebuild which was not adding the qemu
-	# user to the kvm group originally. This results in VMs failing to
-	# start for some users. bug #430808
-	egetent group kvm | grep -q qemu
-	if [[ $? -ne 0 ]]; then
-		gpasswd -a qemu kvm
-	fi
-
-	use python && python-single-r1_pkg_setup
-
-	# Handle specific kernel versions for different features
-	kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
-	kernel_is ge 3 6 &&	LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
-	use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
-	use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
-	use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
-	use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	touch "${S}/.mailmap"
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	if [[ ${PV} = *9999* ]]; then
-
-		# git checkouts require bootstrapping to create the configure script.
-		# Additionally the submodules must be cloned to the right locations
-		# bug #377279
-		./bootstrap || die "bootstrap failed"
-		(
-			git submodule status | sed 's/^[ +-]//;s/ .*//'
-			git hash-object bootstrap.conf
-		) >.git-module-status
-	fi
-
-	epatch_user
-
-	[[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
-	# Tweak the init script
-	local avahi_init=
-	local iscsi_init=
-	local rbd_init=
-	local firewalld_init=
-	cp "${FILESDIR}/libvirtd.init-r13" "${S}/libvirtd.init"
-	use avahi && avahi_init='avahi-daemon'
-	use iscsi && iscsi_init='iscsid'
-	use rbd && rbd_init='ceph'
-	use firewalld && firewalld_init='need firewalld'
-
-	sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
-	sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
-	local myconf=""
-
-	## enable/disable daemon, otherwise client only utils
-	myconf="${myconf} $(use_with libvirtd)"
-
-	## enable/disable the daemon using avahi to find VMs
-	myconf="${myconf} $(use_with avahi)"
-
-	## hypervisors on the local host
-	myconf="${myconf} $(use_with xen) $(use_with xen xen-inotify)"
-	myconf+=" --without-xenapi"
-	if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
-		myconf+=" --with-libxl"
-	else
-		myconf+=" --without-libxl"
-	fi
-	myconf="${myconf} $(use_with openvz)"
-	myconf="${myconf} $(use_with lxc)"
-	if use virtualbox && has_version app-emulation/virtualbox-ose; then
-		myconf="${myconf} --with-vbox=/usr/lib/virtualbox-ose/"
-	else
-		myconf="${myconf} $(use_with virtualbox vbox)"
-	fi
-	myconf="${myconf} $(use_with uml)"
-	myconf="${myconf} $(use_with qemu)"
-	myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP
-	myconf="${myconf} $(use_with phyp)"
-	myconf="${myconf} --with-esx"
-	myconf="${myconf} --with-vmware"
-
-	## additional host drivers
-	myconf="${myconf} $(use_with virt-network network)"
-	myconf="${myconf} --with-storage-fs"
-	myconf="${myconf} $(use_with lvm storage-lvm)"
-	myconf="${myconf} $(use_with iscsi storage-iscsi)"
-	myconf="${myconf} $(use_with parted storage-disk)"
-	myconf="${myconf} $(use_with lvm storage-mpath)"
-	myconf="${myconf} $(use_with rbd storage-rbd)"
-	myconf="${myconf} $(use_with numa numactl)"
-	myconf="${myconf} $(use_with numa numad)"
-	myconf="${myconf} $(use_with selinux)"
-	myconf="${myconf} $(use_with fuse)"
-
-	# udev for device support details
-	myconf="${myconf} $(use_with udev)"
-
-	# linux capability support so we don't need privileged accounts
-	myconf="${myconf} $(use_with caps capng)"
-
-	## auth stuff
-	myconf="${myconf} $(use_with policykit polkit)"
-	myconf="${myconf} $(use_with sasl)"
-
-	# network bits
-	myconf="${myconf} $(use_with macvtap)"
-	myconf="${myconf} $(use_with pcap libpcap)"
-	myconf="${myconf} $(use_with vepa virtualport)"
-	myconf="${myconf} $(use_with firewalld)"
-
-	## other
-	myconf="${myconf} $(use_enable nls)"
-	myconf="${myconf} $(use_with python)"
-
-	# user privilege bits fir qemu/kvm
-	if use caps; then
-		myconf="${myconf} --with-qemu-user=qemu"
-		myconf="${myconf} --with-qemu-group=qemu"
-	else
-		myconf="${myconf} --with-qemu-user=root"
-		myconf="${myconf} --with-qemu-group=root"
-	fi
-
-	# audit support
-	myconf="${myconf} $(use_with audit)"
-
-	## stuff we don't yet support
-	myconf="${myconf} --without-netcf"
-
-	# we use udev over hal
-	myconf="${myconf} --without-hal"
-
-	# locking support
-	myconf="${myconf} --without-sanlock"
-
-	# systemd unit files
-	use systemd && myconf="${myconf} --with-init-script=systemd"
-
-	# this is a nasty trick to work around the problem in bug
-	# #275073. The reason why we don't solve this properly is that
-	# it'll require us to rebuild autotools (and we don't really want
-	# to do that right now). The proper solution has been sent
-	# upstream and should hopefully land in 0.7.7, in the mean time,
-	# mime the same functionality with this.
-	case ${CHOST} in
-		*cygwin* | *mingw* )
-			;;
-		*)
-			ac_cv_prog_WINDRES=no
-			;;
-	esac
-
-	econf \
-		${myconf} \
-		--disable-static \
-		--docdir=/usr/share/doc/${PF} \
-		--with-remote \
-		--localstatedir=/var
-
-	if [[ ${PV} = *9999* ]]; then
-		# Restore gnulib's config.sub and config.guess
-		# bug #377279
-		(cd .gnulib && git reset --hard > /dev/null)
-	fi
-}
-
-src_test() {
-	# Explicitly allow parallel build of tests
-	export VIR_TEST_DEBUG=1
-	HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		HTML_DIR=/usr/share/doc/${PF}/html \
-		DOCS_DIR=/usr/share/doc/${PF} \
-		EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
-		SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
-		|| die "emake install failed"
-
-	find "${D}" -name '*.la' -delete || die
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newinitd "${S}/libvirtd.init" libvirtd || die
-	newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
-	newinitd "${FILESDIR}/virtlockd.init" virtlockd || die
-
-	keepdir /var/lib/libvirt/images
-
-	use python && python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# we only ever want to generate this once
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# We really don't want to use or support old PolicyKit cause it
-	# screws with the new polkit integration
-	if has_version sys-auth/policykit; then
-		rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
-	fi
-
-	# Only sysctl files ending in .conf work
-	dodir /etc/sysctl.d
-	mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
-	fi
-
-	# support for dropped privileges
-	if use qemu; then
-		fperms 0750 "${EROOT}/var/lib/libvirt/qemu"
-		fperms 0750 "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if use caps && use qemu; then
-		fowners -R qemu:qemu "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R qemu:qemu "${EROOT}/var/cache/libvirt/qemu"
-	elif use qemu; then
-		fowners -R root:root "${EROOT}/var/lib/libvirt/qemu"
-		fowners -R root:root "${EROOT}/var/cache/libvirt/qemu"
-	fi
-
-	if ! use policykit; then
-		elog "To allow normal users to connect to libvirtd you must change the"
-		elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	readme.gentoo_print_elog
-
-	if use caps && use qemu; then
-		elog "libvirt will now start qemu/kvm VMs with non-root privileges."
-		elog "Ensure any resources your VMs use are accessible by qemu:qemu"
-	fi
-}

app-emulation/libvirt/libvirt-1.2.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.0.ebuild,v 1.2 2013/12/03 18:45:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.2.1.ebuild,v 1.1 2014/01/19 21:35:51 cardoe Exp $
 
 EAPI=5
 

app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild

@@ -0,0 +1,123 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild,v 1.1 2014/01/19 19:22:52 floppym Exp $
+
+EAPI=5
+
+inherit eutils multilib pam user versionator flag-o-matic systemd toolchain-funcs
+
+MY_PV="$(replace_version_separator 3 '-')"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Opensourced tools for VMware guests"
+HOMEPAGE="http://open-vm-tools.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X doc fuse icu modules pam +pic xinerama"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libdnet
+	sys-apps/ethtool
+	sys-process/procps
+	pam? ( virtual/pam )
+	X? (
+		dev-cpp/gtkmm:2.4
+		x11-base/xorg-server
+		x11-drivers/xf86-input-vmmouse
+		x11-drivers/xf86-video-vmware
+		x11-libs/gtk+:2
+		x11-libs/libnotify
+		x11-libs/libX11
+		x11-libs/libXtst
+	)
+	fuse? ( sys-fs/fuse )
+	icu? ( dev-libs/icu:= )
+	xinerama? ( x11-libs/libXinerama )
+"
+
+DEPEND="${COMMON_DEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	virtual/linux-sources
+	sys-apps/findutils
+"
+
+RDEPEND="${COMMON_DEPEND}
+	modules? ( app-emulation/open-vm-tools-kmod )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup vmware
+}
+
+src_prepare() {
+	# Do not filter out Werror
+	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
+	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
+	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
+}
+
+src_configure() {
+	# http://bugs.gentoo.org/402279
+	if has_version '>=sys-process/procps-3.3.2'; then
+		export CUSTOM_PROCPS_NAME=procps
+		export CUSTOM_PROCPS_LIBS="$($(tc-getPKG_CONFIG) --libs libprocps)"
+	fi
+
+	local myeconfargs=(
+		--with-procps
+		--with-dnet
+		--without-kernel-modules
+		$(use_enable doc docs)
+		--docdir=/usr/share/doc/${PF}
+		$(use_with X x)
+		$(use_with X gtk2)
+		$(use_with X gtkmm)
+		$(use_with icu)
+		$(use_with pam)
+		$(use_with pic)
+		$(use_enable xinerama multimon)
+	)
+
+	econf "${myeconfargs[@]}"
+
+	# Bugs 260878, 326761
+	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
+}
+
+src_install() {
+	default
+
+	rm "${D}"/etc/pam.d/vmtoolsd
+	pamd_mimic_system vmtoolsd auth account
+
+	rm "${D}"/usr/$(get_libdir)/*.la
+	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
+
+	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
+	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
+	systemd_dounit "${FILESDIR}"/vmtoolsd.service
+
+	exeinto /etc/vmware-tools/scripts/vmware/
+	doexe "${FILESDIR}"/network
+
+	if use X;
+	then
+		fperms 4755 "/usr/bin/vmware-user-suid-wrapper"
+
+		dobin "${S}"/scripts/common/vmware-xdg-detect-de
+
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}/open-vm-tools.desktop"
+
+		elog "To be able to use the drag'n'drop feature of VMware for file"
+		elog "exchange, please add the users to the 'vmware' group."
+	fi
+	elog "Add 'vmware-tools' service to the default runlevel."
+}

app-emulation/qemu/Manifest

@@ -1,11 +1,7 @@
 DIST qemu-1.4.2-6b5934f9.tar.xz 3132 SHA256 76af332ea3a731d04d5d2d909c4372250a156993ca56046dc607a7d43caa747e SHA512 c74cc6c3485cc19809676e7dc796d9f1d5b3d12decf1f0c61a948504471ac85f8b488c1acd0400b02827b1ad6b9745a6b47317c284365122ca772a842852f27e WHIRLPOOL 50dd6e7eed3902547dfae6c6cd73505232ed8abafc523c7df7e65a02cf9b29b3e7a29f4ce286b157c027f82e198ef23dd44a83c6925204317c7bb4d6e350617b
 DIST qemu-1.4.2.tar.bz2 10416877 SHA256 acae6c92b740ff89c0e31eca23338d4abd733432e51b081017757579b30ecf90 SHA512 aa296b3d06321c81b32fdd2fdcdf07f3c377123f18eadca977335592b64a4f2417eea421fe417b57e468741f707bda31ba907364d762983393272997fdef8999 WHIRLPOOL 782f3c6d8776210450a0c0ac24942d8e1c41995aeb8e910add704f8f6d95ae3392ee942c6b661d4674367d0e443453c7f29356b2b4c71be4ffed54436f90de8a
-DIST qemu-1.5.2-e26b4ba6.tar.xz 21348 SHA256 877cc321b3bd5e30aaa7a481b359e16845ad731927a49df1fb2d5b0cfbfd0ad6 SHA512 1f015c5d9ca37475bddf9d474255b10ae3f03d01280270211deb1195a2ef288e6a1bbff9490cb4173a7af4b02787469278816fd5dee69d8e11d601b5a46b0e53 WHIRLPOOL 86a249c1339bb241a1534e5047bab696b8c26ad491eda073ee57ce1f9104df54ab7e251cd5ad9568a1381307b118029b7619bf689dec36f454d3f77f2f2f402a
-DIST qemu-1.5.2-fd9f079c.tar.xz 34768 SHA256 d4772e9ece1e4a633d122df622a7cb21b7b3765f23140bee17a0091438cee82b SHA512 5b490a43b34aaf8b61eb3b7def642b2c28884bcc543a3ad60ebc54c809f5cef23c74e92c95a35221268faea1408b10dbbac6f9dace52c0fe09a729e450ccb96b WHIRLPOOL 729ed05a6aadd2dce1d63ceef2331334c62440d62ee6920622ebf25cf691f02bdfba3a547596f744522040bd5fa3e3b5c42f318a5fe26fe36863e797764e6b98
-DIST qemu-1.5.2.tar.bz2 11932902 SHA256 f661147d190ab8432045058a660d810f13dc528fe7017ce578e9f2da2997a250 SHA512 cae47d34b99d3d3ded688b5a434ba69a377a838dddd367d10e4a71cd697305870c9671e4291490c0028b8143870b0998469e508cd28922fbebd8ea5f86f591b9 WHIRLPOOL bd5e8063c40e3e2fc43934e3649562f594f249002209bf09e05fda06155d423587d714862c8b55f9b2621f3ce20154f4e81b5c73df65ef2513ae824ae5bbcee9
 DIST qemu-1.5.3-25d93791.tar.xz 3136 SHA256 311bf6db68e37080a7cb3ea9bd573420b783dd2484ce62a936abba39e3b58446 SHA512 023df394a5dd76e7a0363b0cf994a41f18eac0b1e15ba5aca025dd73456d05535eef729ed6febec245c2f51aa10611366ee68175d80057ce6ab92a3a1c79a191 WHIRLPOOL e8e090eb5f425ba07de3bad58155558bf8aed5db3715e4a9dc8b0b3f0913c1fcbc6e727704e66f3979f57b86b0563efdd0462069ea3f0f7b37c001c564ec3d4f
 DIST qemu-1.5.3.tar.bz2 11932631 SHA256 39364ccbe82434c4eb8c25813896a1dce2db1977080d06ce13f96aa24ee2a601 SHA512 a14c7ec22cbf94fcc53ae5bc4d663dbcb1e29e14aac7bb2bd03f7ae1afdcf528c4198856db7aba32f0c84b5b9f583137fa4c0cf386a12c8f74c9c8d7825f1c52 WHIRLPOOL b793744e935922e58ff2528ed77ad416cbef086b259dec974f9b0c9aba08949cbe958e468d67ce4606baa66e236902e186f9679e27041fbddef506267d792b15
-DIST qemu-1.6.0-49bdd50f.tar.xz 3132 SHA256 b722c117c3998b90d63a01558ab009a40df6e5d7fc184b650cb581ae45594c17 SHA512 c3403958c6f4412f7656a161b1e065966893a4426f582fedf5350acb466b590349fbba3dcc5f52a3df023c7894ca7ee0bd5a3c41df7dc515c08d3dfbb838668d WHIRLPOOL fb99c0faac3052dd42f9f3d5bb87520974277831f41bb965a7dabb8ce7be83ea387522a44cbc8013f3d875d67d0ee7e86067887a341f8d7acb01efd6d47c63f0
 DIST qemu-1.6.0-4c9bed9d.tar.xz 25752 SHA256 c642e8574b43094c6a0be12617514709ca446f08f546a6528ca433af06748bd7 SHA512 6ea00f51c3f35d27050026d5e4418b15ac624c9e58eb35cff252c31d273a6159a299472c8662c50a28cdc3aaa5b4b5028369303a776353822904f72c1300377a WHIRLPOOL 056d10c2b33f416cb2077b94fd1904b708631c7e3885943a41adff26e773905d6df3a81acbe991fc6170456f2a8eabcd2abbc3ccd682dcb9cc055f6d21ac4b00
 DIST qemu-1.6.0.tar.bz2 12040196 SHA256 3132e58ada26d43b6924e8c2f07db80aa1e5022f3dcf03dee7d8bb9194b2cb48 SHA512 18dfc35eeb6fa48c9e73483c905885ae98191cf76acc00c568d57c6973d912f8bea4de24e85f55308d22e74028b809349b00d7c531c3b2dd5c837cd213a8faac WHIRLPOOL bdf7611557876cf86e207153c6793132511f555940f9e5ad671e4294c3a738a85e9c84c678a7daf73b863a15c7223ba7e7f4fd36c68ee3d59b3beabd7d17930a
 DIST qemu-1.6.1-452f0d87.tar.xz 8884 SHA256 278e0bf4189949a5d31cc9ac549e286b657247284e5241c06146bf0629e45a1d SHA512 2b40f42b51e338f6d773d215b88626876213daa35c75201e027caa18cd5883826b42ba4c99c685ce57716ab8530aa0fa068cc53e372b6105aa6aba05f705efd4 WHIRLPOOL f062bfa28adbeea95ea4fb09fc4772d801a652766843aff3ab09113e20fe1fe507bbea11e910bf1828339e851b0e85e64ff6934605d0a6c12b275230759ec838

app-emulation/qemu/qemu-1.5.2-r1.ebuild

@@ -1,546 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2-r1.ebuild,v 1.4 2013/09/05 18:20:53 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo
-
-BACKPORTS=e26b4ba6
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug fdt glusterfs \
-gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
-static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_user_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] <sys-apps/dtc-1.4.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	accessibility? ( app-accessibility/brltty )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.90
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	spice? ( >=app-emulation/spice-protocol-0.12.3 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.6 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-
-	python_export_best
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	epatch "${FILESDIR}"/qemu-9999-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --libdir=/usr/$(get_libdir)"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=${PYTHON}"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-blobs"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-curses"
-		conf_opts+=" --disable-kvm"
-		conf_opts+=" --disable-libiscsi"
-		conf_opts+=" --disable-glusterfs"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" --disable-sdl"
-		conf_opts+=" --disable-smartcard-nss"
-		conf_opts+=" --disable-tools"
-		conf_opts+=" --disable-vde"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --with-system-pixman"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable gtk)"
-		use gtk && conf_opts+=" --with-gtkabi=3.0"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable accessibility brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable glusterfs)"
-		conf_opts+=" $(use_enable iscsi libiscsi)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable kernel_linux nptl)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl glx)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable tls vnc-ws)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-		conf_opts+=" --enable-migration-from-qemu-kvm"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" --enable-docs"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use ${static_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_configure() {
-	softmmu_targets=
-	user_targets=
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets},${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets},${target}-linux-user"
-	done
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_test() {
-	cd "${S}/softmmu-build"
-	emake -j1 check
-	emake -j1 check-report.html
-}
-
-qemu_python_install() {
-	python_domodule "${S}/QMP/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/kvm_stat"
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/QMP/qmp-shell"
-	python_doscript "${S}/QMP/qemu-ga-client"
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use test; then
-			dohtml check-report.html
-		fi
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm script."
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-
-	qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local virtfs_caps=
-
-	if qemu_support_kvm; then
-		readme.gentoo_print_elog
-		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
-		ewarn "save states will be removed in the next release (1.6.x)"
-		ewarn
-		ewarn "It is recommended that you migrate any VMs that may be running"
-		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
-		ewarn "any saved states with a newer qemu."
-		ewarn
-		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-	fi
-
-	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
-	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}

app-emulation/qemu/qemu-1.5.2-r2.ebuild

@@ -1,546 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.5.2-r2.ebuild,v 1.4 2013/09/05 18:20:53 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo
-
-BACKPORTS=fd9f079c
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug fdt glusterfs \
-gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
-static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_user_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.2.0[static-libs(+)] <sys-apps/dtc-1.4.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.2.2
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	accessibility? ( app-accessibility/brltty )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.90
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	spice? ( >=app-emulation/spice-protocol-0.12.3 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.6 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-
-	python_export_best
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	epatch "${FILESDIR}"/qemu-9999-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --libdir=/usr/$(get_libdir)"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=${PYTHON}"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-blobs"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-curses"
-		conf_opts+=" --disable-kvm"
-		conf_opts+=" --disable-libiscsi"
-		conf_opts+=" --disable-glusterfs"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" --disable-sdl"
-		conf_opts+=" --disable-smartcard-nss"
-		conf_opts+=" --disable-tools"
-		conf_opts+=" --disable-vde"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --with-system-pixman"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable gtk)"
-		use gtk && conf_opts+=" --with-gtkabi=3.0"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable accessibility brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable glusterfs)"
-		conf_opts+=" $(use_enable iscsi libiscsi)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable kernel_linux nptl)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl glx)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable tls vnc-ws)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-		conf_opts+=" --enable-migration-from-qemu-kvm"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" --enable-docs"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use ${static_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_configure() {
-	softmmu_targets=
-	user_targets=
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets},${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets},${target}-linux-user"
-	done
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_test() {
-	cd "${S}/softmmu-build"
-	emake -j1 check
-	emake -j1 check-report.html
-}
-
-qemu_python_install() {
-	python_domodule "${S}/QMP/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/kvm_stat"
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/QMP/qmp-shell"
-	python_doscript "${S}/QMP/qemu-ga-client"
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use test; then
-			dohtml check-report.html
-		fi
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm script."
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-
-	qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local virtfs_caps=
-
-	if qemu_support_kvm; then
-		readme.gentoo_print_elog
-		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
-		ewarn "save states will be removed in the next release (1.6.x)"
-		ewarn
-		ewarn "It is recommended that you migrate any VMs that may be running"
-		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
-		ewarn "any saved states with a newer qemu."
-		ewarn
-		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-	fi
-
-	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
-	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}

app-emulation/qemu/qemu-1.6.0.ebuild

@@ -1,549 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.6.0.ebuild,v 1.4 2013/09/06 15:27:14 cardoe Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ncurses,readline"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
-	user udev fcaps readme.gentoo
-
-BACKPORTS=49bdd50f
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://git.qemu.org/qemu.git"
-	inherit git-2
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
-	${BACKPORTS:+
-		http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
-gtk iscsi +jpeg \
-kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
-rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
-static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
-virtfs +vnc xattr xen xfs"
-
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
-
-# Setup the default SoftMMU targets, while using the loops
-# below to setup the other targets.
-REQUIRED_USE="|| ("
-
-for target in ${IUSE_SOFTMMU_TARGETS}; do
-	IUSE="${IUSE} qemu_softmmu_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
-done
-
-for target in ${IUSE_USER_TARGETS}; do
-	IUSE="${IUSE} qemu_user_targets_${target}"
-	REQUIRED_USE="${REQUIRED_USE} qemu_user_targets_${target}"
-done
-REQUIRED_USE="${REQUIRED_USE} )"
-
-# Block USE flag configurations known to not work
-REQUIRED_USE="${REQUIRED_USE}
-	python? ( ${PYTHON_REQUIRED_USE} )
-	qemu_softmmu_targets_arm? ( fdt )
-	qemu_softmmu_targets_microblaze? ( fdt )
-	qemu_softmmu_targets_ppc? ( fdt )
-	qemu_softmmu_targets_ppc64? ( fdt )
-	static? ( static-softmmu static-user )
-	static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
-	virtfs? ( xattr )"
-
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
-	sys-apps/pciutils[static-libs(+)]
-	sys-libs/zlib[static-libs(+)]
-	>=x11-libs/pixman-0.28.0[static-libs(+)]
-	aio? ( dev-libs/libaio[static-libs(+)] )
-	caps? ( sys-libs/libcap-ng[static-libs(+)] )
-	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
-	fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
-	jpeg? ( virtual/jpeg[static-libs(+)] )
-	ncurses? ( sys-libs/ncurses[static-libs(+)] )
-	png? ( media-libs/libpng[static-libs(+)] )
-	rbd? ( sys-cluster/ceph[static-libs(+)] )
-	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
-	sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
-	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
-	tls? ( net-libs/gnutls[static-libs(+)] )
-	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
-	vde? ( net-misc/vde[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
-	qemu_softmmu_targets_i386? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.3
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	qemu_softmmu_targets_x86_64? (
-		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.3
-		~sys-firmware/sgabios-0.1_pre8
-		~sys-firmware/vgabios-0.7a
-	)
-	accessibility? ( app-accessibility/brltty )
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )
-	bluetooth? ( net-wireless/bluez )
-	gtk? (
-		x11-libs/gtk+:3
-		x11-libs/vte:2.90
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? ( virtual/opengl )
-	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	sdl? ( media-libs/libsdl[X] )
-	selinux? ( sec-policy/selinux-qemu )
-	smartcard? ( dev-libs/nss !app-emulation/libcacard )
-	spice? ( >=app-emulation/spice-protocol-0.12.3 )
-	systemtap? ( dev-util/systemtap )
-	usbredir? ( >=sys-apps/usbredir-0.6 )
-	virtfs? ( sys-libs/libcap )
-	xen? ( app-emulation/xen-tools )"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	=dev-lang/python-2*
-	sys-apps/texinfo
-	virtual/pkgconfig
-	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
-	static-softmmu? ( ${LIB_DEPEND} )
-	test? (
-		dev-libs/glib[utils]
-		sys-devel/bc
-	)"
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
-	usr/share/qemu/openbios-ppc
-	usr/share/qemu/openbios-sparc64
-	usr/share/qemu/openbios-sparc32
-	usr/share/qemu/palcode-clipper
-	usr/share/qemu/s390-ccw.img"
-
-QA_WX_LOAD="usr/bin/qemu-i386
-	usr/bin/qemu-x86_64
-	usr/bin/qemu-alpha
-	usr/bin/qemu-arm
-	usr/bin/qemu-cris
-	usr/bin/qemu-m68k
-	usr/bin/qemu-microblaze
-	usr/bin/qemu-microblazeel
-	usr/bin/qemu-mips
-	usr/bin/qemu-mipsel
-	usr/bin/qemu-or32
-	usr/bin/qemu-ppc
-	usr/bin/qemu-ppc64
-	usr/bin/qemu-ppc64abi32
-	usr/bin/qemu-sh4
-	usr/bin/qemu-sh4eb
-	usr/bin/qemu-sparc
-	usr/bin/qemu-sparc64
-	usr/bin/qemu-armeb
-	usr/bin/qemu-sparc32plus
-	usr/bin/qemu-s390x
-	usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
-you have the kernel module loaded before running kvm. The easiest way to
-ensure that the kernel module is loaded is to load it on boot.\n
-For AMD CPUs the module is called 'kvm-amd'\n
-For Intel CPUs the module is called 'kvm-intel'\n
-Please review /etc/conf.d/modules for how to load these\n\n
-Make sure your user is in the 'kvm' group\n
-Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
-
-qemu_support_kvm() {
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
-		use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
-		use qemu_softmmu_targets_s390x; then
-		return 0
-	fi
-
-	return 1
-}
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
-	elif use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for KVM support"
-		else
-			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
-			ERROR_KVM="You must enable KVM in your kernel to continue"
-			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
-			ERROR_KVM_AMD+=" your kernel configuration."
-			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
-			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
-			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
-			ERROR_TUN+=" into your kernel or loaded as a module to use the"
-			ERROR_TUN+=" virtual network device if using -net tap."
-			ERROR_BRIDGE="You will also need support for 802.1d"
-			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
-			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
-			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
-			ERROR_VHOST_NET+=" support"
-
-			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
-				CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
-			fi
-
-			use python && CONFIG_CHECK+=" ~DEBUG_FS"
-			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
-			# Now do the actual checks setup above
-			check_extra_config
-		fi
-	fi
-}
-
-pkg_setup() {
-	enewgroup kvm 78
-
-	python_export_best
-}
-
-src_prepare() {
-	# Alter target makefiles to accept CFLAGS set via flag-o
-	sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
-		Makefile Makefile.target || die
-
-	epatch "${FILESDIR}"/qemu-9999-cflags.patch
-	[[ -n ${BACKPORTS} ]] && \
-		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
-			epatch
-
-	# Fix ld and objcopy being called directly
-	tc-export LD OBJCOPY
-
-	# Verbose builds
-	MAKEOPTS+=" V=1"
-
-	epatch_user
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
-	debug-print-function $FUNCNAME "$@"
-
-	local buildtype=$1
-	local builddir=$2
-	local conf_opts audio_opts
-	local static_flag="static-${buildtype}"
-
-	conf_opts="--prefix=/usr"
-	conf_opts+=" --sysconfdir=/etc"
-	conf_opts+=" --libdir=/usr/$(get_libdir)"
-	conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
-	conf_opts+=" --disable-bsd-user"
-	conf_opts+=" --disable-guest-agent"
-	conf_opts+=" --disable-strip"
-	conf_opts+=" --disable-werror"
-	conf_opts+=" --python=${PYTHON}"
-
-	# audio options
-	audio_opts="oss"
-	use alsa && audio_opts="alsa,${audio_opts}"
-	use sdl && audio_opts="sdl,${audio_opts}"
-	use pulseaudio && audio_opts="pa,${audio_opts}"
-
-	if [[ ${buildtype} == "user" ]]; then
-		conf_opts+=" --enable-linux-user"
-		conf_opts+=" --disable-system"
-		conf_opts+=" --target-list=${user_targets}"
-		conf_opts+=" --disable-blobs"
-		conf_opts+=" --disable-bluez"
-		conf_opts+=" --disable-curses"
-		conf_opts+=" --disable-kvm"
-		conf_opts+=" --disable-libiscsi"
-		conf_opts+=" --disable-glusterfs"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" --disable-sdl"
-		conf_opts+=" --disable-smartcard-nss"
-		conf_opts+=" --disable-tools"
-		conf_opts+=" --disable-vde"
-	fi
-
-	if [[ ${buildtype} == "softmmu" ]]; then
-		conf_opts+=" --disable-linux-user"
-		conf_opts+=" --enable-system"
-		conf_opts+=" --with-system-pixman"
-		conf_opts+=" --target-list=${softmmu_targets}"
-		conf_opts+=" $(use_enable bluetooth bluez)"
-		conf_opts+=" $(use_enable gtk)"
-		use gtk && conf_opts+=" --with-gtkabi=3.0"
-		conf_opts+=" $(use_enable sdl)"
-		conf_opts+=" $(use_enable aio linux-aio)"
-		conf_opts+=" $(use_enable accessibility brlapi)"
-		conf_opts+=" $(use_enable caps cap-ng)"
-		conf_opts+=" $(use_enable curl)"
-		conf_opts+=" $(use_enable fdt)"
-		conf_opts+=" $(use_enable glusterfs)"
-		conf_opts+=" $(use_enable iscsi libiscsi)"
-		conf_opts+=" $(use_enable jpeg vnc-jpeg)"
-		conf_opts+=" $(use_enable kernel_linux kvm)"
-		conf_opts+=" $(use_enable ncurses curses)"
-		conf_opts+=" $(use_enable opengl glx)"
-		conf_opts+=" $(use_enable png vnc-png)"
-		conf_opts+=" $(use_enable rbd)"
-		conf_opts+=" $(use_enable sasl vnc-sasl)"
-		conf_opts+=" $(use_enable seccomp)"
-		conf_opts+=" $(use_enable smartcard smartcard-nss)"
-		conf_opts+=" $(use_enable spice)"
-		conf_opts+=" $(use_enable tls vnc-tls)"
-		conf_opts+=" $(use_enable tls vnc-ws)"
-		conf_opts+=" $(use_enable usbredir usb-redir)"
-		conf_opts+=" $(use_enable uuid)"
-		conf_opts+=" $(use_enable vde)"
-		conf_opts+=" $(use_enable vhost-net)"
-		conf_opts+=" $(use_enable virtfs)"
-		conf_opts+=" $(use_enable vnc)"
-		conf_opts+=" $(use_enable xattr attr)"
-		conf_opts+=" $(use_enable xen)"
-		conf_opts+=" $(use_enable xen xen-pci-passthrough)"
-		conf_opts+=" $(use_enable xfs xfsctl)"
-		use mixemu && conf_opts+=" --enable-mixemu"
-		conf_opts+=" --audio-drv-list=${audio_opts}"
-		conf_opts+=" --enable-migration-from-qemu-kvm"
-	fi
-
-	conf_opts+=" $(use_enable debug debug-info)"
-	conf_opts+=" $(use_enable debug debug-tcg)"
-	conf_opts+=" --enable-docs"
-	conf_opts+=" $(use_enable tci tcg-interpreter)"
-
-	# Add support for SystemTAP
-	use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
-
-	# Add support for static builds
-	use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
-
-	# We always want to attempt to build with PIE support as it results
-	# in a more secure binary. But it doesn't work with static or if
-	# the current GCC doesn't have PIE support.
-	if ! use ${static_flag} && gcc-specs-pie; then
-		conf_opts="${conf_opts} --enable-pie"
-	fi
-
-	einfo "./configure ${conf_opts}"
-	cd ${builddir}
-	../configure \
-		--cc="$(tc-getCC)" \
-		--host-cc="$(tc-getBUILD_CC)" \
-		${conf_opts} \
-		|| die "configure failed"
-
-		# FreeBSD's kernel does not support QEMU assigning/grabbing
-		# host USB devices yet
-		use kernel_FreeBSD && \
-			sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
-}
-
-src_configure() {
-	softmmu_targets=
-	user_targets=
-
-	for target in ${IUSE_SOFTMMU_TARGETS} ; do
-		use "qemu_softmmu_targets_${target}" && \
-		softmmu_targets="${softmmu_targets},${target}-softmmu"
-	done
-
-	for target in ${IUSE_USER_TARGETS} ; do
-		use "qemu_user_targets_${target}" && \
-		user_targets="${user_targets},${target}-linux-user"
-	done
-
-	[[ -n ${softmmu_targets} ]] && \
-		einfo "Building the following softmmu targets: ${softmmu_targets}"
-
-	[[ -n ${user_targets} ]] && \
-		einfo "Building the following user targets: ${user_targets}"
-
-	if [[ -n ${softmmu_targets} ]]; then
-		mkdir "${S}/softmmu-build"
-		qemu_src_configure "softmmu" "${S}/softmmu-build"
-	fi
-
-	if [[ -n ${user_targets} ]]; then
-		mkdir "${S}/user-build"
-		qemu_src_configure "user" "${S}/user-build"
-	fi
-}
-
-src_compile() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		default
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		default
-	fi
-}
-
-src_test() {
-	cd "${S}/softmmu-build"
-	emake -j1 check
-	emake -j1 check-report.html
-}
-
-qemu_python_install() {
-	python_domodule "${S}/QMP/qmp.py"
-
-	python_doscript "${S}/scripts/kvm/kvm_stat"
-	python_doscript "${S}/scripts/kvm/vmxcap"
-	python_doscript "${S}/QMP/qmp-shell"
-	python_doscript "${S}/QMP/qemu-ga-client"
-}
-
-src_install() {
-	if [[ -n ${user_targets} ]]; then
-		cd "${S}/user-build"
-		emake DESTDIR="${ED}" install
-
-		# Install binfmt handler init script for user targets
-		newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
-	fi
-
-	if [[ -n ${softmmu_targets} ]]; then
-		cd "${S}/softmmu-build"
-		emake DESTDIR="${ED}" install
-
-		if use test; then
-			dohtml check-report.html
-		fi
-
-		if use kernel_linux; then
-			udev_dorules "${FILESDIR}"/65-kvm.rules
-		fi
-
-		if use qemu_softmmu_targets_x86_64 ; then
-			newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
-			ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
-			ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
-			ewarn "your libvirt configs or other wrappers for ${PN}"
-		elif use x86 || use amd64; then
-			elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
-			elog "of the /usr/bin/qemu-kvm script."
-		fi
-
-		if use python; then
-			python_foreach_impl qemu_python_install
-		fi
-	fi
-
-	# Install config file example for qemu-bridge-helper
-	insinto "/etc/qemu"
-	doins "${FILESDIR}/bridge.conf"
-
-	# Remove the docdir placed qmp-commands.txt
-	mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
-
-	cd "${S}"
-	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
-	newdoc pc-bios/README README.pc-bios
-	dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
-
-	# Remove SeaBIOS since we're using the SeaBIOS packaged one
-	rm "${ED}/usr/share/qemu/bios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
-	fi
-
-	# Remove vgabios since we're using the vgabios packaged one
-	rm "${ED}/usr/share/qemu/vgabios.bin"
-	rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
-	rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
-	rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
-	rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
-		dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
-		dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
-		dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
-		dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
-	fi
-
-	# Remove sgabios since we're using the sgabios packaged one
-	rm "${ED}/usr/share/qemu/sgabios.bin"
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
-	fi
-
-	# Remove iPXE since we're using the iPXE packaged one
-	rm "${ED}"/usr/share/qemu/pxe-*.rom
-	if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
-		dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
-		dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
-		dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
-		dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
-		dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
-		dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
-	fi
-
-	qemu_support_kvm && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local virtfs_caps=
-
-	if qemu_support_kvm; then
-		readme.gentoo_print_elog
-		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
-		ewarn "save states will be removed in the next release (1.7.x)"
-		ewarn
-		ewarn "It is recommended that you migrate any VMs that may be running"
-		ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
-		ewarn "any saved states with a newer qemu."
-		ewarn
-		ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
-	fi
-
-	virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
-	virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
-
-	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-	use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
-}
-
-pkg_info() {
-	echo "Using:"
-	echo "  $(best_version app-emulation/spice-protocol)"
-	echo "  $(best_version sys-firmware/ipxe)"
-	echo "  $(best_version sys-firmware/seabios)"
-	if has_version sys-firmware/seabios[binary]; then
-		echo "    USE=binary"
-	else
-		echo "    USE=''"
-	fi
-	echo "  $(best_version sys-firmware/vgabios)"
-}

app-emulation/qemu/qemu-1.7.0.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.7.0.ebuild,v 1.1 2013/12/19 08:49:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-1.7.0.ebuild,v 1.2 2014/01/19 23:04:58 cardoe Exp $
 
 EAPI=5
 
@@ -97,13 +97,13 @@ RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
 	qemu_softmmu_targets_i386? (
 		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.3
+		~sys-firmware/seabios-1.7.3.2
 		~sys-firmware/sgabios-0.1_pre8
 		~sys-firmware/vgabios-0.7a
 	)
 	qemu_softmmu_targets_x86_64? (
 		>=sys-firmware/ipxe-1.0.0_p20130624
-		~sys-firmware/seabios-1.7.3
+		~sys-firmware/seabios-1.7.3.2
 		~sys-firmware/sgabios-0.1_pre8
 		~sys-firmware/vgabios-0.7a
 	)

app-misc/gentoo/Manifest

@@ -1,4 +1 @@
-DIST gentoo-0.19.13.tar.gz 1541738 SHA256 6afafeacd54a18d97e217ad10df1b555274ac856f050e10888109d405ebdc092 SHA512 51bffcc73a1c81697bed975169286afefc46f02b956da17985a5a4082188ffe155f0943d4cf0718c1097823e4f7d41399efda8309a5ecc6e2c02bd80adee4bac WHIRLPOOL be4d1fa32c814ecbfc2dc149931104c9c9d93b3e9491c4de5630ae737cc5f01f6b389e9a7a435b4423e9fc714aaa526782624b2739d8f80304618f05d1de1936
-DIST gentoo-0.20.1.tar.gz 1552672 SHA256 3f7a57681a2bade54a0096bdcaad1ff776bca51486fd42cb7518d33e29b3835f SHA512 30a7adf6c8987cb9b158545cc11f8b87691f4b85056d1b2653143055b53232a9a6bc2995b7f0d9c1f2b79350a03d57470c6b0656ab07ed72bcda29a7a86ca507 WHIRLPOOL a531a7b2c2d005be4157c3a7c0756b1dbb09e9a7416752a7156d35ffb03d5bb6a6e282daa5a456d078a6d4b9430945090288c9b4d4d4f06677f89a9df085131e
-DIST gentoo-0.20.3.tar.gz 1554789 SHA256 0d3f8cb103916ae3e86e5f01379634ab21568a312f77ba3f90cd3ce876170fb0 SHA512 d237a0ecb9d4efd8506518c3fa6b388509dcf890d742d539978f1e724e34efa71e77b2e0e117494832fe2c98052401540abf98311a7d30e2f573f07d5f41c1ba WHIRLPOOL 62daadb711b2506a0c200389a1ddc6ebc6e1e93b7880d1ef00f5c3995a00bb5e9509ccacc02c1ef0e232a2fb293566bedf45688123adb690bcd406eb539ca854
 DIST gentoo-0.20.4.tar.gz 1559764 SHA256 2993ceb7509c45db10e7f3d515389ede978b24d6cb9932a59588fd7c9923bc80 SHA512 841726987cbbd81a48dac9195ae41557c4af54fba0bad99c1346a52b6cc25129b245b431ea8b42b8e47d30ee783928857fc772acf6228809bdb86b7eb74eda31 WHIRLPOOL aaff175847753c2f712e044278ad6fd2e092e62ca7cdcfc41751adeaf31e8e9873ad469e8e9df2008ff857673ffe6db0d7cce6e4192d2679a392226801f44535

app-misc/gentoo/gentoo-0.19.13.ebuild

@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.19.13.ebuild,v 1.8 2013/12/17 16:06:38 jer Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A modern GTK+ based filemanager for any WM"
-HOMEPAGE="http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-libs/gtk+-2.24:2
-	>=dev-libs/glib-2
-	x11-libs/gdk-pixbuf
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-DOCS=(
-	AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
-)
-
-src_prepare() {
-	sed -i \
-		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
-		gentoorc.in || die
-	sed -i \
-		-e '/GTK_DISABLE_DEPRECATED/ d' \
-		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die #357343
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gentoo \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	dohtml -r docs/{images,config,*.{html,css}}
-	newman docs/gentoo.1x gentoo.1
-	docinto scratch
-	dodoc docs/scratch/*
-
-	make_desktop_entry ${PN} Gentoo \
-		/usr/share/${PN}/icons/${PN}.png \
-		"System;FileTools;FileManager"
-}

app-misc/gentoo/gentoo-0.20.1.ebuild

@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.1.ebuild,v 1.10 2013/12/17 16:06:38 jer Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A modern GTK+ based filemanager for any WM"
-HOMEPAGE="http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=(
-	AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
-)
-
-src_prepare() {
-	sed -i \
-		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
-		gentoorc.in || die
-	sed -i \
-		-e '/GTK_DISABLE_DEPRECATED/ d' \
-		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die #357343
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gentoo \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	dohtml -r docs/{images,config,*.{html,css}}
-	newman docs/gentoo.1x gentoo.1
-	docinto scratch
-	dodoc docs/scratch/*
-
-	make_desktop_entry ${PN} Gentoo \
-		/usr/share/${PN}/icons/${PN}.png \
-		"System;FileTools;FileManager"
-}

app-misc/gentoo/gentoo-0.20.3.ebuild

@@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.3.ebuild,v 1.6 2013/12/21 16:36:56 ago Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A modern GTK+ based filemanager for any WM"
-HOMEPAGE="http://www.obsession.se/gentoo/ http://gentoo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/pango
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=(
-	AUTHORS BUGS CONFIG-CHANGES CREDITS NEWS README TODO docs/{FAQ,menus.txt}
-)
-
-src_prepare() {
-	sed -i \
-		-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
-		gentoorc.in || die
-	sed -i \
-		-e '/GTK_DISABLE_DEPRECATED/d' \
-		-e '/^GENTOO_CFLAGS=/s|".*"|"${CFLAGS}"|g' \
-		-e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \
-		configure.in || die #357343
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/gentoo \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	dohtml -r docs/{images,config,*.{html,css}}
-	newman docs/gentoo.1x gentoo.1
-	docinto scratch
-	dodoc docs/scratch/*
-
-	make_desktop_entry ${PN} Gentoo \
-		/usr/share/${PN}/icons/${PN}.png \
-		"System;FileTools;FileManager"
-}

app-misc/smtm/Manifest

@@ -1,2 +1 @@
 DIST smtm_1.6.10.tar.gz 54033 SHA256 bad7fe5ebdf93db5e63855abe05cda739882f2d455aac4d25a5519e87935c825 SHA512 0cacafb8cfe1411b6b5db677bf15ad731b2e2181ee14ff8374e1fa01ad931e8f92efff29774e84950178f20805b18518067643e3c98d7990e1d1b93b7dd347d9 WHIRLPOOL 9c7b5254351adc44f994a07245056b88336b0ce08a4b35c7455794a7ff034314d45d24e6816d737ecf2152321c1ebfd347d6a69ef7604f39ebdb1c8fb6ec4a97
-DIST smtm_1.6.6.tar.gz 44325 SHA256 436c29508f12ac7190f5bb4a0a194853185eb8332230ac15f75f7bda88954ac3 SHA512 5bb18f449b3461c1b4f2ea2709963c697e2870a1d36aa1728fa2854f96e9213d67731aafeaaa79cff6ebb57ea468fd0bb31ba3f0f01dec512df7731fc20c27d7 WHIRLPOOL fd4226da373ffd879d4dcc971cae4c0445143012af36453335c7c3d1d60e28a308b7a539c5b8db2479053d9eafb438a4effd15c56d6e930a68a2c67bb66e1157

app-misc/smtm/smtm-1.6.10-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.6.10-r1.ebuild,v 1.2 2014/01/18 19:01:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.6.10-r1.ebuild,v 1.4 2014/01/19 12:25:02 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 # This warrants USE examples
 IUSE=""
 

app-misc/smtm/smtm-1.6.6.ebuild

@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/smtm/smtm-1.6.6.ebuild,v 1.7 2012/03/18 15:36:02 armin76 Exp $
-
-inherit perl-app
-
-DESCRIPTION="Stock ticker, profit/loss calculator and chart tool"
-HOMEPAGE="http://eddelbuettel.com/dirk/code/smtm.html"
-SRC_URI="http://eddelbuettel.com/dirk/code/smtm/smtm_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5
-	dev-perl/perl-tk
-	dev-perl/DateManip
-	dev-perl/HTML-Parser
-	dev-perl/Finance-YahooQuote
-	dev-perl/libwww-perl"
-
-mydoc="BUGS THANKS TODO examples/*"

app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild,v 1.1 2013/11/30 23:42:34 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra-l10n/calligra-l10n-2.7.5.ebuild,v 1.2 2014/01/19 11:03:23 pacho Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 DEPEND="sys-devel/gettext"
 RDEPEND="!app-office/koffice-l10n"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="doc"
 
 MY_LANGS="bs ca ca@valencia cs da de el es et fi fr gl hu ia it kk nb nds nl pl

app-office/calligra/calligra-2.6.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.4.ebuild,v 1.6 2013/08/28 16:03:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.6.4.ebuild,v 1.7 2014/01/20 10:20:58 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -86,7 +86,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2 )

app-office/calligra/calligra-2.7.5.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.7.5.ebuild,v 1.3 2013/12/31 08:46:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.7.5.ebuild,v 1.5 2014/01/20 10:20:58 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -40,7 +40,7 @@ SLOT="4"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == *9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +jpeg jpeg2k +kdcraw kde kdepim +lcms marble mysql +okular opengtl openexr
@@ -87,7 +87,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2:= )

app-office/calligra/calligra-9999.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.42 2013/12/20 12:33:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.43 2014/01/20 10:20:58 kensington Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -87,7 +87,7 @@ RDEPEND="
 	sys-libs/zlib
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
-	attica? ( dev-libs/libattica )
+	attica? ( dev-libs/libattica[qt4] )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2:= )

app-office/orage/orage-4.10.0.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.10.0.ebuild,v 1.3 2013/12/31 08:52:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/orage/orage-4.10.0.ebuild,v 1.4 2014/01/19 19:00:29 pacho Exp $
 
 EAPI=5
 inherit multilib xfconf
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="berkdb dbus debug libnotify +xfce_plugins_clock"
 
 RDEPEND=">=dev-libs/libical-0.48:=

app-office/skrooge/skrooge-1.8.0.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.8.0.ebuild,v 1.3 2013/12/24 12:46:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.8.0.ebuild,v 1.4 2014/01/19 11:09:14 pacho Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="

app-portage/metagen/metagen-0.6.2-r1.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-0.6.2-r1.ebuild,v 1.1 2014/01/20 03:46:53 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary"
+SRC_URI="http://dev.gentoo.org/~neurogeek/metagen_releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+
+IUSE=""
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript metagen/main.py metagen
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}

app-portage/metagen/metagen-9999.ebuild

@@ -1,13 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-9999.ebuild,v 1.4 2011/09/25 14:31:01 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/metagen/metagen-9999.ebuild,v 1.5 2014/01/20 03:46:53 floppym Exp $
 
-EAPI="3"
+EAPI="5"
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils git-2
+inherit distutils-r1 git-r3
 
 DESCRIPTION="metadata.xml generator for ebuilds"
 HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/metagen.git;a=summary"
@@ -19,30 +17,20 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE=""
-DEPEND=">=dev-python/jaxml-3.01
+DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-		>=sys-apps/portage-2.1.9.42"
+	>=sys-apps/portage-2.1.9.42[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
-src_install() {
+python_install() {
-	distutils_src_install
+	distutils-r1_python_install
-
+	python_newscript metagen/main.py metagen
-	metagen_install() {
-		local METAGEN_MOD="$(python_get_sitedir)/${PN}/main.py"
-		fperms 755 ${METAGEN_MOD}
-		dosym  "${D}"${METAGEN_MOD} "/usr/bin/${PN}-${PYTHON_ABI}"
-	}
-	python_execute_function metagen_install
-
-	python_generate_wrapper_scripts "${ED}usr/bin/${PN}"
-
-	doman "docs/metagen.1"
 }
 
-src_test() {
+python_install_all() {
-	einfo "Starting tests..."
+	distutils-r1_python_install_all
-	testing() {
+	doman docs/metagen.1
-		$(PYTHON) -c "from metagen import metagenerator; metagenerator.do_tests()"
+}
-	}
+
-	python_execute_function testing
+python_test() {
-	einfo "Tests completed."
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
 }

app-shells/bash-completion/bash-completion-1.3-r2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.3-r2.ebuild,v 1.14 2013/08/28 08:38:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-1.3-r2.ebuild,v 1.15 2014/01/19 10:12:43 vapier Exp $
 
 EAPI=3
 inherit prefix
@@ -11,7 +11,7 @@ SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 DEPEND=""

app-shells/bash-completion/bash-completion-2.1-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r1.ebuild,v 1.6 2013/08/25 17:05:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1-r1.ebuild,v 1.7 2014/01/19 10:12:43 vapier Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="|| ( >=app-shells/bash-4.1 app-shells/zsh )

app-shells/bash-completion/bash-completion-2.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1.ebuild,v 1.5 2013/08/28 08:38:08 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1.ebuild,v 1.6 2014/01/19 10:12:43 vapier Exp $
 
 EAPI=5
 inherit prefix
@@ -11,7 +11,7 @@ SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="|| ( app-admin/eselect-bashcomp <app-admin/eselect-1.3.7 )

app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild,v 1.10 2013/09/05 06:01:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20121024.ebuild,v 1.11 2014/01/19 10:12:40 vapier Exp $
 
 EAPI=4
 inherit eutils prefix
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash-completion"

app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild,v 1.3 2013/08/14 17:45:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20130804.ebuild,v 1.4 2014/01/19 10:12:40 vapier Exp $
 
 EAPI="5"
 inherit bash-completion-r1 eutils prefix
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}-r1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND=">=app-shells/bash-completion-2.1-r1"

app-shells/push/push-1.6.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/push/push-1.6.ebuild,v 1.8 2014/01/18 20:07:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/push/push-1.6.ebuild,v 1.9 2014/01/19 10:18:22 ago Exp $
 
 EAPI="4"
 inherit vcs-snapshot
@@ -11,7 +11,7 @@ SRC_URI="http://github.com/vaeth/${PN}/tarball/${PV} -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {

app-shells/tcsh/tcsh-6.18.01-r2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r2.ebuild,v 1.8 2014/01/18 20:07:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r2.ebuild,v 1.9 2014/01/19 10:18:36 ago Exp $
 
 EAPI="3"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"
 

app-text/discount/discount-2.1.6-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/discount/discount-2.1.6-r1.ebuild,v 1.8 2013/11/24 19:00:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/discount/discount-2.1.6-r1.ebuild,v 1.9 2014/01/19 20:05:54 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
 IUSE="minimal"
 
 src_prepare() {

app-text/highlight/highlight-3.16.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.16.ebuild,v 1.8 2014/01/18 20:08:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.16.ebuild,v 1.9 2014/01/19 10:18:51 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt4"
 
 RDEPEND="dev-lang/lua

app-text/llpp/llpp-15.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.10 2013/08/29 05:54:07 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-15.ebuild,v 1.11 2014/01/19 08:51:00 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND="~app-text/mupdf-1.2:=[static-libs]

app-text/mupdf/mupdf-1.2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.10 2013/07/17 15:53:24 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.2.ebuild,v 1.11 2014/01/19 08:44:23 pacho Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}-source.zip"
 
 LICENSE="AGPL-3"
 SLOT="0/1.2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla static static-libs"
 
 LIB_DEPEND="media-libs/freetype:2[static-libs?]

app-text/tofrodos/tofrodos-1.7.12a.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tofrodos/tofrodos-1.7.12a.ebuild,v 1.1 2013/04/19 03:32:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tofrodos/tofrodos-1.7.12a.ebuild,v 1.2 2014/01/20 07:57:31 heroxbd Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://tofrodos.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
 IUSE=""
 
 DEPEND=""

dev-db/lmdb/lmdb-0.9.11.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.1 2014/01/18 14:09:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.2 2014/01/19 11:46:29 jer Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="https://gitorious.org/mdb/mdb/archive/aa3463ec7c5e979420b13c8f37caa377e
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="static-libs"
 
 DEPEND=""

dev-db/pygresql/pygresql-4.1.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-4.1.1.ebuild,v 1.5 2014/01/17 20:40:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-4.1.1.ebuild,v 1.6 2014/01/19 13:47:56 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/P/PyGreSQL/${MY_P}.tgz"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND="|| (

dev-db/sqlite/sqlite-3.8.2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.2.ebuild,v 1.8 2014/01/18 20:19:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.2.ebuild,v 1.10 2014/01/19 10:33:27 ago Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ SRC_URI="doc? ( http://sqlite.org/2013/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test"
 
 RDEPEND="icu? ( dev-libs/icu:= )

dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild,v 1.6 2012/05/04 03:56:55 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gnome-keyring-sharp/gnome-keyring-sharp-1.0.2.ebuild,v 1.7 2014/01/19 20:58:53 moult Exp $
 
 EAPI="2"
 
@@ -17,8 +17,7 @@ IUSE="doc"
 
 RDEPEND=">=dev-lang/mono-2.0
 	>=gnome-base/libgnome-keyring-2.30.0
-	dev-dotnet/glib-sharp
+	dev-dotnet/glib-sharp"
-	doc? ( virtual/monodoc )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 

dev-haskell/alex/alex-3.1.2.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-3.1.2.ebuild,v 1.5 2014/01/15 09:22:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/alex/alex-3.1.2.ebuild,v 1.6 2014/01/19 10:19:07 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND=""

dev-haskell/cairo/cairo-0.12.4-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.4 2013/12/12 05:59:00 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:44:02 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="+svg"
 
 RDEPEND="dev-haskell/mtl:=[profile?]

dev-haskell/cereal/cereal-0.3.5.2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cereal/cereal-0.3.5.2.ebuild,v 1.8 2013/11/24 19:36:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cereal/cereal-0.3.5.2.ebuild,v 1.10 2014/01/19 10:44:15 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="

dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild,v 1.5 2014/01/15 09:23:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cmdlib/cmdlib-0.3.5-r1.ebuild,v 1.6 2014/01/19 10:19:24 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/mtl-2:=[profile?]

dev-haskell/dbus/dbus-0.10.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dbus/dbus-0.10.4.ebuild,v 1.8 2013/12/07 19:31:05 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dbus/dbus-0.10.4.ebuild,v 1.10 2014/01/19 10:44:11 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cereal-0.3.4:=[profile?]

dev-haskell/deepseq/deepseq-1.3.0.1.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild,v 1.7 2014/01/15 09:23:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild,v 1.8 2014/01/19 10:19:39 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:="

dev-haskell/gio/gio-0.12.4-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.12.4-r1.ebuild,v 1.4 2013/12/12 05:59:55 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:43:59 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/glib-0.12.0:0=[profile?]

dev-haskell/glib/glib-0.12.4-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.4-r1.ebuild,v 1.4 2013/12/12 06:03:43 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:43:56 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=

dev-haskell/gtk/gtk-0.12.4-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.4-r1.ebuild,v 1.4 2013/12/12 05:57:51 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:43:52 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="${GTK_MAJ_VER}/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="+gio"
 
 RDEPEND=">=dev-haskell/cairo-0.12.0:0=[profile?]

dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild,v 1.4 2013/12/12 06:05:04 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild,v 1.6 2014/01/19 10:43:45 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""

dev-haskell/hashtables/hashtables-1.1.2.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild,v 1.3 2013/12/07 19:27:45 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashtables/hashtables-1.1.2.1.ebuild,v 1.5 2014/01/19 10:43:41 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="bounds-checking debug portable sse4_1 +unsafe-tricks"
 
 RDEPEND="dev-haskell/primitive:=[profile?]

dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild,v 1.3 2013/12/07 19:30:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/libxml-sax/libxml-sax-0.7.4.ebuild,v 1.5 2014/01/19 10:44:08 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/text-0.7:=[profile?]

dev-haskell/pango/pango-0.12.4-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.4-r1.ebuild,v 1.4 2013/12/12 06:06:19 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.4-r1.ebuild,v 1.6 2014/01/19 10:43:48 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/cairo-0.12.0:0=[profile?]

dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild,v 1.8 2013/12/07 19:26:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pcap/pcap-0.4.5.2-r1.ebuild,v 1.10 2014/01/19 10:43:38 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-haskell/network:=[profile?]

dev-haskell/primitive/primitive-0.5.1.0.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.5.1.0.ebuild,v 1.2 2014/01/18 18:54:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.5.1.0.ebuild,v 1.3 2014/01/19 10:19:54 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.4:=

dev-haskell/vector/vector-0.10.0.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.4 2013/09/07 20:13:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.0.1.ebuild,v 1.6 2014/01/19 09:39:57 slyfox Exp $
 
 EAPI=5
 
@@ -18,8 +18,22 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?]
+RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?]
-		<dev-haskell/primitive-0.6:=[profile?]
+		>=dev-lang/ghc-6.12.3:=
-		>=dev-lang/ghc-6.12.3:="
+		ppc? ( >=dev-lang/ghc-7.6.1 )
+"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2.3"
+
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}

dev-haskell/vector/vector-0.10.9.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.9.1.ebuild,v 1.1 2013/10/19 12:53:20 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.10.9.1.ebuild,v 1.3 2014/01/19 09:39:57 slyfox Exp $
 
 EAPI=5
 
@@ -21,11 +21,25 @@ IUSE="+boundschecks internalchecks unsafechecks"
 RDEPEND=">=dev-haskell/deepseq-1.1:=[profile?] <dev-haskell/deepseq-1.4:=[profile?]
 	>=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.6:=[profile?]
 	>=dev-lang/ghc-6.10.4:=
+	ppc? ( >=dev-lang/ghc-7.6.1 )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6.0.3
 "
 
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag boundschecks boundschecks) \

dev-haskell/vector/vector-0.9.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.8 2012/12/10 21:53:14 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/vector/vector-0.9.1.ebuild,v 1.9 2014/01/19 08:26:34 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -22,3 +22,16 @@ RDEPEND="=dev-haskell/primitive-0.4*[profile?]
 		>=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2.3"
+
+src_prepare() {
+	local can_spec_const="yes"
+
+	ghc-supports-interpreter || can_spec_const="no"
+
+	# ghci-less GHC can't do ANN #482960
+	if [[ ${can_spec_const} == "no" ]]; then
+		einfo "Disabling 'ForceSpecConstr' due to bug #482960"
+		sed -e 's/{-# ANN type SPEC ForceSpecConstr #-}/{- # ANN type SPEC ForceSpecConstr #-}/' \
+			-i Data/Vector/Fusion/Stream/Monadic.hs || die
+	fi
+}

dev-haskell/xml-types/xml-types-0.3.4.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml-types/xml-types-0.3.4.ebuild,v 1.3 2013/12/07 19:29:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml-types/xml-types-0.3.4.ebuild,v 1.5 2014/01/19 10:44:05 ago Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/deepseq-1.1.0.0:=[profile?]

dev-java/asm/asm-3.3.1.ebuild

@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-3.3.1.ebuild,v 1.6 2013/12/24 12:55:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/asm/asm-3.3.1.ebuild,v 1.7 2014/01/19 10:16:22 ago Exp $
 
 WANT_ANT_TASKS="ant-owanttask"
 JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="3"
 IUSE=""
-KEYWORDS="amd64 ~ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris ~x86-solaris"
 
 DEPEND=">=virtual/jdk-1.5"
 RDEPEND=">=virtual/jre-1.5"

dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild

@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild,v 1.2 2014/01/18 18:56:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild,v 1.3 2014/01/19 10:13:03 ago Exp $
 
 EAPI="5"
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://jdbc.postgresql.org/"
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE="test"
 
 DEPEND="