Sync with portage [Mon Dec 15 11:02:10 MSK 2014].

10 years ago · 94c22db43f
parent 266e859c23
commit 94c22db43f
2836 changed files with 18287 additions and 8553 deletions
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@ -1 +1,2 @@
 DIST accerciser-3.12.0.tar.xz 3212432 SHA256 0d421a59cd294966441fb6591d34f28e4b60340815bdf91c9e8f39c2d826e96b SHA512 d15d301f7579a92e3b3aa65d22fd726d71bee8330b450c7ed232d4a8d7fc312402573073f67a490ab659122ad98651f8a073235770caa9eba8a4b6dc9d68e6d3 WHIRLPOOL 4b753de73afc1c8fda7d71a8b6f8007ebb4627985a6049be887d8e916f4e37c3a5484a481d8e516a1d4cc245e987ed29a2a87c2780b882bced032f5d2d14d5d6
+DIST accerciser-3.14.0.tar.xz 3213916 SHA256 f5a5915d475e9241396414ccd167724c88807e77e69151cf0b40b32bd57d0574 SHA512 bafc30e15fe0121f8abc64239e48834ab06a03fe64fc368a221d167a13079721962441e0343f17934dde57cd012c9132374739297c23c79c567fc36cc60fb07d WHIRLPOOL 4b9679145ad1ad7f8d059dfdfb12d372c1b27780532a7c19cc25b66bbe0a13db5b864548e332b74e0327eebb488622ae471514046737b738c15624969d8df7a8
--- a/app-accessibility/accerciser/accerciser-3.14.0.ebuild
+++ b/app-accessibility/accerciser/accerciser-3.14.0.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/accerciser/accerciser-3.14.0.ebuild,v 1.1 2014/12/14 22:10:54 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Interactive Python accessibility explorer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.5.2:2
+	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.1.13:3[introspection]
+
+	dev-libs/atk[introspection]
+	>=dev-libs/glib-2.28:2
+	dev-libs/gobject-introspection
+	>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
+	>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Leave shebang alone
+	sed 's:@PYTHON@:/usr/bin/python:' -i src/accerciser.in || die
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		ITSTOOL=$(type -P true)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		python_doscript src/accerciser
+	}
+	python_foreach_impl run_in_build_dir installing
+}
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@ -1,2 +1,3 @@
 DIST at-spi2-atk-2.10.2.tar.xz 271388 SHA256 e348a811c4830251f0c3018019072e7979ef35fb9b7f0b1b0a0dd1e66942d0f5 SHA512 9300150b42d6baf84fced4aec69f874abbd1a24b29a6f1cf62ad18d0a83f83fa00d711d65464eaef714bff69283e990e479774d26362093fe8f49b1cf7ef7239 WHIRLPOOL c84756683ab0dc07f3ee2e0efd7499a102e1c32e9fd0ea150a6c61d469452ec6d5bae14e7d80ac277351b39859a6d6b9f72079e809dde29f125a2e4d5f8cdaf1
 DIST at-spi2-atk-2.12.1.tar.xz 280568 SHA256 5fa9c527bdec028e06797563cd52d49bcf06f638549df983424d88db89bb1336 SHA512 a7fc3cbc3665741ea6cee716cc68467ed110c0f6425fe418ea0f1b702931e4a07306e48264e9cd160d98c5bf762f076cad66ff2e46690af226ce33146d11aee2 WHIRLPOOL dc84563059d24ae56029989853d9e5a9a8cca5eecbed1227c4e36cd760aed4035beefbb71668221646cbd03057f1e30e44128081e2a6b32cfe48baabf4a631e5
+DIST at-spi2-atk-2.14.1.tar.xz 280952 SHA256 058f34ea60edf0a5f831c9f2bdd280fe95c1bcafb76e466e44aa0fb356d17bcb SHA512 1daee942d3c477444aaa42fb6ede6d821ff9b613f0686dd4a545406c97ceb819a3544419e0cb5d2e661f3a1b6fc92af9394801f3c51377db0ab77620e5c3d437 WHIRLPOOL 75d7e4569eed83df842e363c6203571b7bc26dbfdd71555ead0c1656eb61923817673ce18f8042c4a989a45af956ad9fd85aee5386c8aafb121bf71de99c04c6
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-atk/at-spi2-atk-2.14.1.ebuild,v 1.2 2014/12/14 22:22:28 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.11.2[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.11.90[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/at-spi-1.32.0-r1
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure --enable-p2p
+}
+
+multilib_src_test() {
+	Xemake check
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@ -1,2 +1,3 @@
 DIST at-spi2-core-2.10.2.tar.xz 446272 SHA256 d3da58f84f4c8e4d5fe940ecb52fb27b4d9ea2b4dcdb3e1fae0f46b5eaa2dde1 SHA512 51b3ec2f77933622ad3aa52e2bd91cab3a7ffbc396e1ec01a52ea277e5cbc972ab0998d3a54deeaf18fc67c5767c1958d4a0ff6bdc77768ca3a51b567013d5da WHIRLPOOL 480ab9c3c037e53f220abc42be9f09ea179a19de62b640efe0697ced1c04122d387eff8fc3fe7e359ea853de4415a3eddc42aa3fa18a00ddb57a1fa426a030e6
 DIST at-spi2-core-2.12.0.tar.xz 454668 SHA256 db550edd98e53b4252521459c2dcaf0f3b060a9bad52489b9dbadbaedad3fb89 SHA512 955249568e28441201d0a079e26bd703e21716b9189e372bfa20cda70e1079bbb51f62246cdeb1b914953f448e0432b749d402d723710247f2a1b8b343b37ccc WHIRLPOOL 67870b40b3c0e343b3119bae93b23540f8ab2c71137d033c9b4ee000d28a4c66353dae8a72d815367ac8b291471dd3c21d985a0cdd4c6812e43f95ca1931010a
+DIST at-spi2-core-2.14.1.tar.xz 456272 SHA256 eef9660b14fdf0fb1f30d1be7c72d591fa7cbb87b00ca3a444425712f46ce657 SHA512 263f2353961787b510a22ede6243ebd6f9eba7fe00740b252ba372e78a2b4a20bd6ed1a9f509b2e33342fc5516d1e8b95f886573d51962755e51584771ac86b9 WHIRLPOOL 54d02cd41f1039c3b166c01215d983b768011c99b81831fc3256a4dde66b3a2fbff7b0fafa4958bbce367fee164c5f5c90531de11f57d65a1972af009b5afd62
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.14.1.ebuild,v 1.1 2014/12/14 22:17:37 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="D-Bus accessibility specifications and registration daemon"
+HOMEPAGE="http://live.gnome.org/Accessibility"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="+X +introspection"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+
+# x11-libs/libSM is needed until upstream #719808 is solved either
+# making the dep unneeded or fixing their configure
+# Only libX11 is optional right now
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXi[${MULTILIB_USEDEP}]
+	x11-libs/libXtst[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.9
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+src_prepare() {
+	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
+	epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	# xevie is deprecated/broken since xorg-1.6/1.7
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--disable-xevie \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable X x11)
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
+	fi
+}
+
+multilib_src_compile() { gnome2_src_compile; }
+multilib_src_install() { gnome2_src_install; }
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@ -1,2 +1,3 @@
 DIST orca-3.12.2.tar.xz 1918976 SHA256 4eb32f7e28c2509199166932e980aa93b7b01cf71a38f7f18e111980cdba52c6 SHA512 ecb142c12691de108721d22587ce8425d6b8a563b74820c23477df4faac83287baf5e496c19eb79ac1692a87a795af604fa7ac296db1ee21d4a7576a68d4b4cc WHIRLPOOL 874e4d43ebe244f5ee1bc9b869d74e0a1e424c63d96f46d92aa2786291540f74b9136243c68528a471d9bb77167b64c83a35ecc348d4c34a65ea33ec6949b0d3
 DIST orca-3.12.3.tar.xz 1918684 SHA256 11ab7ef7f4df5af6fe9e07936ae176e3f17577ef2e327203925a9ca3b258d5ce SHA512 48d06841e0dbbfb9de000bb1800ba40b83acb407ef48f042ebbd1db829bcb4e78caaea615cdbe5abff3f6abc14cd9ae2b5d380af07b50139f4ff0df3c63eebc9 WHIRLPOOL 503ecb56833aa031e74c76b2658e8c762401a66d3fcebc08621a677d0a5d82988230dcc772c76759527811c2fa6cbac5188a8af99ac32d9bb1366b21814cf058
+DIST orca-3.14.3.tar.xz 1998804 SHA256 8258dc3174572a4bf1a266ad36df46cf5f2c5a8dc5df1a071f49f812bec2a315 SHA512 579eb592ab99a98598ce7405e180b9e8657c5b418d792f1209684bca7b309bb8e0857fd2766a39fb53835ae44f12e3447dda08402b21113e16c92bb7f60e661d WHIRLPOOL 624fc3c89ad20e734ab61160839a4d469243c587ed8c72b413ee011275e27eff73ac8ffa82f03dfa69902450c0db970b402d4b371e647298ee4b193218851e64
--- a/app-accessibility/orca/orca-3.14.3.ebuild
+++ b/app-accessibility/orca/orca-3.14.3.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/orca/orca-3.14.3.ebuild,v 1.1 2014/12/14 22:25:46 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Extensible screen reader that provides access to the desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="+braille"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# liblouis is not in portage yet
+# it is used to provide contracted braille support
+# XXX: Check deps for correctness
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-atk-2.10:2
+	>=app-accessibility/at-spi2-core-2.10:2[introspection]
+	>=dev-libs/atk-2.10
+	>=dev-libs/glib-2.28:2
+	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
+	>=x11-libs/gtk+-3.6.2:3[introspection]
+	braille? (
+		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
+		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
+	dev-libs/atk[introspection]
+	dev-python/pyatspi[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	x11-libs/libwnck:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50
+	virtual/pkgconfig
+"
+#	app-text/yelp-tools
+
+src_prepare() {
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure \
+		ITSTOOL="$(type -P true)" \
+		$(use_with braille liblouis)
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+	installing() {
+		gnome2_src_install
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+			-i src/orca/orca || die
+		python_doscript src/orca/orca
+	}
+	python_foreach_impl run_in_build_dir installing
+}
--- a/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
+++ b/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/sphinx3-0.8-r1.ebuild,v 1.1 2014/12/14 22:30:18 mgorny Exp $
+
+EAPI=5
+
+# disable automatic phase exports and deps
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools-utils distutils-r1 prefix eutils
+
+DESCRIPTION="CMU Speech Recognition engine"
+HOMEPAGE="http://cmusphinx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc python static-libs"
+
+RDEPEND=">=app-accessibility/sphinxbase-0.7[static-libs?,python?,${PYTHON_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Due to generated Python setup.py.
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}_heap_fix.patch" \
+		"${FILESDIR}/${P}-libutil.patch"
+	eprefixify 'python/setup.py'
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use python; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	local DOCS=( AUTHORS ChangeLog NEWS README )
+	autotools-utils_src_install
+
+	if use doc; then
+		cd doc || die
+		dohtml -r -x CVS s3* s3 *.html
+	fi
+
+	if use python; then
+		unset DOCS
+
+		cd "${S}"/python || die
+		distutils-r1_src_install
+	fi
+}
--- a/app-admin/abrt/abrt-2.0.12-r2.ebuild
+++ b/app-admin/abrt/abrt-2.0.12-r2.ebuild
@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/abrt/abrt-2.0.12-r2.ebuild,v 1.1 2014/12/15 05:10:05 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+# Need gnome2-utils for gnome2_icon_cache_update
+inherit autotools eutils gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://fedorahosted.org/abrt/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/btparser-0.18
+	>=dev-libs/glib-2.21:2
+	>=dev-libs/libreport-2.0.11[${PYTHON_USEDEP}]
+	dev-libs/libxml2
+	dev-libs/nss
+	sys-apps/dbus
+	sys-auth/polkit
+	sys-fs/inotify-tools
+	x11-libs/gtk+:3
+	x11-libs/libnotify"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	dev-libs/elfutils
+	>=sys-devel/gdb-7"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	enewgroup abrt
+	enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+	# Disable redhat-specific code not usable in gentoo, or that requires
+	# bugs.gentoo.org infra support.
+	epatch "${FILESDIR}/${PN}-2.0.12-gentoo.patch"
+
+	# Using a server response as a format string is a bad idea
+	epatch "${FILESDIR}/${PN}-2.0.6-format-security.patch"
+
+	# pyhook test is sensitive to the format of python's error messages, and
+	# fails with certain python versions
+	sed -e '/pyhook.at/ d' \
+		-i tests/Makefile.* tests/testsuite.at || die "sed 2 failed"
+
+	# automake-1.12, #427926
+	epatch "${FILESDIR}/${PN}-2.0.12-automake-1.12.patch"
+
+	# Fix dbus timeout in gui; in next release
+	epatch "${FILESDIR}/${P}-dbus-fallback.patch"
+
+	eautoreconf
+
+	python_fix_shebang .
+}
+
+src_configure() {
+	myeconfargs=(
+		"--localstatedir=${EPREFIX}/var"
+		"$(systemd_with_unitdir)"
+	)
+	# --disable-debug enables debug!
+	use debug && myeconfargs=( "${myeconfargs[@]}" --enable-debug )
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/run/abrt
+	# /var/spool/abrt is created by dev-libs/libreport
+
+	diropts -m 700 -o abrt -g abrt
+	keepdir /var/spool/abrt-upload
+
+	diropts -m 775 -o abrt -g abrt
+	keepdir /var/cache/abrt-di
+
+	find "${D}" -name '*.la' -exec rm -f {} + || die
+
+	newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+	newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "To start the bug detection service on an openrc-based system, do"
+	elog "# /etc/init.d/abrt start"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild,v 1.1 2014/12/15 05:15:53 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ssl'
+
+inherit distutils-r1
+
+DESCRIPTION="Configuration management tool"
+HOMEPAGE="http://bcfg2.org"
+SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc cheetah genshi server"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="app-portage/gentoolkit[${PYTHON_USEDEP}]
+	cheetah? ( dev-python/cheetah[${PYTHON_USEDEP}] )
+	genshi? ( dev-python/genshi[${PYTHON_USEDEP}] )
+	server? (
+		dev-libs/libgamin[python,${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		virtual/fam )"
+
+python_compile_all() {
+	if use doc; then
+		einfo "Building Bcfg2 documentation"
+		sphinx-build doc doc_output || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install \
+		--record=PY_SERVER_LIBS
+
+	if ! use server; then
+		rm -f "${ED%/}"/usr/bin/bcfg2-* || die
+		rm -f "${D%/}$(python_get_scriptdir)"/bcfg2-* || die
+		rm -rf "${ED%/}"/usr/share/bcfg2 || die
+		rm -rf "${ED%/}"/usr/share/man/man8 || die
+	else
+		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
+	fi
+
+	insinto /etc
+	doins examples/bcfg2.conf
+
+	if use doc; then
+		cd doc_output || die
+		docinto html
+		dodoc -r [a-z]* _images _static
+	fi
+}
+
+pkg_postinst () {
+	if use server; then
+		einfo "If this is a new installation, you probably need to run:"
+		einfo "    bcfg2-admin init"
+	fi
+}
--- a/app-admin/checkrestart/checkrestart-0.47-r3.ebuild
+++ b/app-admin/checkrestart/checkrestart-0.47-r3.ebuild
@ -0,0 +1,38 @@
+# 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-r3.ebuild,v 1.1 2014/12/14 23:01:28 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="the sysadmin's rolling upgrade tool"
+HOMEPAGE="http://arcdraco.net/checkrestart"
+SRC_URI="http://arcdraco.net/~dragon/${P}-sep.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE=""
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/lsb-release
+	app-portage/portage-utils
+	sys-process/lsof
+"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-list-comprehension-fix.patch
+	python_fix_shebang ${PN}
+}
+
+src_install() {
+	dosbin ${PN}
+}
--- a/app-admin/chef/chef-10.24.0-r1.ebuild
+++ b/app-admin/chef/chef-10.24.0-r1.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/chef/chef-10.24.0-r1.ebuild,v 1.1 2014/12/14 10:29:27 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="spec"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC=${RUBY_FAKEGEM_NAME}.gemspec
+
+inherit ruby-fakegem user
+
+DESCRIPTION="Chef is a systems integration framework"
+HOMEPAGE="http://wiki.opscode.com/display/chef"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# specs have various indempotency issues which result in the global Chef::Config
+# object to be replaced and subsequently fails other specs. Revisit this later.
+RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/bunny-0.6.0
+	dev-ruby/erubis
+	>=dev-ruby/highline-1.6.9
+	>=dev-ruby/json-1.4.4
+	>=dev-ruby/mixlib-authentication-1.3.0
+	>=dev-ruby/mixlib-cli-1.1.0
+	>=dev-ruby/mixlib-config-1.1.2
+	>=dev-ruby/mixlib-log-1.3.0
+	dev-ruby/mixlib-shellout
+	<dev-ruby/moneta-0.7.0
+	>=dev-ruby/net-ssh-2.6
+	<dev-ruby/net-ssh-2.7
+	>=dev-ruby/net-ssh-multi-1.1
+	<dev-ruby/net-ssh-multi-1.2
+	>=dev-ruby/ohai-0.6.0
+	>=dev-ruby/rest-client-1.0.4
+	<dev-ruby/rest-client-1.7
+	dev-ruby/ruby-shadow
+	>=dev-ruby/treetop-1.4.9
+	<dev-ruby/treetop-1.5
+	dev-ruby/uuidtools
+	>=dev-ruby/yajl-ruby-1.1
+	<dev-ruby/yajl-ruby-2"
+
+each_ruby_prepare() {
+	ruby_fakegem_metadata_gemspec ../metadata ${RUBY_FAKEGEM_GEMSPEC}
+
+	# bunny, json
+	sed -i -e 's/"< 0.8.0", //' -e 's/<= 1.7.7/< 2/' ${RUBY_FAKEGEM_GEMSPEC} || die "Unable to fix up dependencies."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	keepdir /etc/chef /var/lib/chef /var/log/chef
+
+	doinitd "${FILESDIR}/initd/chef-client"
+	doconfd "${FILESDIR}/confd/chef-client"
+
+	insinto /etc/chef
+	doins "${FILESDIR}/client.rb"
+	doins "${FILESDIR}/solo.rb"
+
+	doman distro/common/man/man1/*.1
+	doman distro/common/man/man8/*.8
+}
+
+pkg_setup() {
+	enewgroup chef
+	enewuser chef -1 -1 /var/lib/chef chef
+}
+
+pkg_postinst() {
+	elog
+	elog "You should edit /etc/chef/client.rb before starting the service with"
+	elog "/etc/init.d/chef-client start"
+	elog
+}
--- a/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
+++ b/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild,v 1.1 2014/12/14 23:16:01 mgorny Exp $
+
+EAPI=5
+
+# upstream broke setup.py to install into /usr/share...
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Conky weather forecast script with support for language files"
+HOMEPAGE="https://launchpad.net/~conky-companions"
+SRC_URI="https://launchpad.net/~conky-companions/+archive/ppa/+files/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/conky"
+
+S=${WORKDIR}/src
+
+python_prepare_all() {
+	sed -i -e "s:pythoncmd=.*$:pythoncmd=${EPYTHON}:" conkyForecast* || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_optimize "${ED%/}"/usr/share/${PN}
+}
+
+pkg_postinst() {
+	elog "You have to define a partner id and registration code for "
+	elog "the weather.com xoap. You need to copy the template from"
+	elog "/usr/share/conkyforecast/conkyForecast.config into you account"
+	elog "as ~/.conkyForecast.config and edit the respective fields."
+	elog
+	elog "More details can be found in the README file."
+}
--- a/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
+++ b/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/kedpm/kedpm-0.4.0-r2.ebuild,v 1.1 2014/12/15 05:18:32 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Ked Password Manager helps to manage large amounts of passwords and related information"
+HOMEPAGE="http://kedpm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk"
+
+DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
+	gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS CHANGES NEWS )
+
+python_prepare_all() {
+	# We want documentation to install in /usr/share/doc/kedpm
+	# not in /usr/share/kedpm as in original setup.py.
+	local PATCHES=(
+		"${FILESDIR}/setup-doc.patch"
+	)
+
+	# If we don't compiling with GTK support, let's change default
+	# frontend for kedpm to CLI.
+	use gtk || sed -i -e 's/"gtk"  # default/"cli"  # default/' scripts/kedpm
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	"${PYTHON}" run_tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# menu item
+	domenu "${FILESDIR}/${PN}.desktop"
+}
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@ -1,2 +1,3 @@
 DIST perl-cleaner-2.16.tar.bz2 6069 SHA256 b54f7bd0dc8e60c08ac3de242cf157c21dbce1cfb8fc9c525b3d6cca88915ae3 SHA512 d2e03e473754b7730a6275cc743414fbb48a9fcb6a7a7dbef1fae73acb609b1b9f06eb33261505e1309fc79074303b7c29b6bd80b3bc79b40d27fc94d9b2cb09 WHIRLPOOL d240e0946a924a4d4984a2c7cc82e54de91e3c05ebf6a29fe154a557ff475da3503eb99a054f26ceda13ec61b87b8b2fe63c367c441b2b3cb6f7c34cf14f3165
 DIST perl-cleaner-2.17.tar.bz2 6549 SHA256 63c2058b2d5fd866fcbc84c3c47d3e0db53063fbc0ade296b34e9abe60a5bdf2 SHA512 de9737127a457651bb734a359fc288bf2c738eef011794f6c38b1122e6c9764ec735f229a3e687d4d5734ec72bc661e1f8c1f00dee4cba9e485644222794516f WHIRLPOOL 3d5d24cd4f872c259306e0af1fd377f66c7fc5535a25e0f2774641e4d75328e9e2adafbd40e8b646091dcb50db9bad4981041cf36fd7e8d614570d12ea43bf33
+DIST perl-cleaner-2.18.tar.bz2 6719 SHA256 43ee3b071f8f21410e8586500af90681363248695801c46ec37dfe3fbecc25d7 SHA512 d6216e4246a59a5d9c08bfec5763e4566736c1641f17ad45df84392169622b94edec242f3fc37b65ad767330fc0a64967c94fc520697da056f735909132e4ede WHIRLPOOL c77590201847002ce943caaa9c495eea9411586f541ed4607f229496f066cc63f40993e0a5aed89ed10b36b5d8e509943a9c89e953531c1854725eb260221243
--- a/app-admin/perl-cleaner/perl-cleaner-2.18.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.18.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.18.ebuild,v 1.1 2014/12/13 20:24:15 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="http://github.com/gentoo-perl/perl-cleaner.git"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+	|| ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
+	dev-lang/perl
+	|| (
+		( sys-apps/portage app-portage/portage-utils )
+		sys-apps/pkgcore
+		sys-apps/paludis
+	)
+"
+
+src_install() {
+	dosbin perl-cleaner
+	doman perl-cleaner.1
+}
--- a/app-admin/sulfur/sulfur-1.0_rc104-r1.ebuild
+++ b/app-admin/sulfur/sulfur-1.0_rc104-r1.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sulfur/sulfur-1.0_rc104-r1.ebuild,v 1.1 2014/12/15 05:22:07 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2-utils fdo-mime python-single-r1
+
+DESCRIPTION="Sulfur, the Entropy Package Manager Store"
+HOMEPAGE="http://www.sabayon.org"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+SRC_URI="mirror://sabayon/app-admin/sulfur-${PV}.tar.bz2"
+
+RDEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
+	>=sys-apps/entropy-${PV}[${PYTHON_USEDEP}]
+	sys-apps/file[python,${PYTHON_USEDEP}]
+	sys-devel/gettext
+	x11-libs/vte:0[python,${PYTHON_USEDEP}]
+	x11-misc/xdg-utils"
+DEPEND="sys-devel/gettext"
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed"
+	dodir /etc/gconf/schemas
+	insinto /etc/gconf/schemas
+	doins "${S}/misc/entropy-handler.schemas"
+
+	python_fix_shebang "${ED}"
+	python_optimize "${ED%/}"/usr/lib/entropy
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	gnome2_gconf_savelist
+	gnome2_gconf_install
+}
+
+pkg_postrm() {
+	gnome2_gconf_savelist
+	gnome2_gconf_uninstall
+}
--- a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild,v 1.1 2014/12/15 05:26:43 mgorny Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="Summarizes the contents of a syslog log file"
+HOMEPAGE="http://github.com/dpaleino/syslog-summary"
+SRC_URI="mirror://github/dpaleino/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	python_fix_shebang -f syslog-summary
+
+	# Sadly, the makefile is useless for us.
+	rm Makefile || die
+}
+
+src_install() {
+	dobin syslog-summary || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+	doman syslog-summary.1 || die
+
+	insinto /etc/syslog-summary
+	doins ignore.rules || die
+}
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@ -1,7 +1,3 @@
-DIST sysstat-10.2.0.tar.bz2 307186 SHA256 8e494c30a2e5c4f11d6398b39df297a732fa3d4e3f5d5aa086044fccfe77f6d2 SHA512 6bc8b1217402845a4236c5ffc18f024700fa08e179b558eb65e23a7b95e1d1f1c45c2da6c323e59e74c938903fa0a6820997091d4e84a811fad7cb715dc25320 WHIRLPOOL 61097f59757032c03445410985d8fc98f5feef83d417e8bf666c56728517796c8007869b6328feabcb9fff3024b990fff7fcb4f045215f4614584f08c0db006d
-DIST sysstat-10.2.1.tar.bz2 309194 SHA256 998f6e75aeb1b64d5ce6ccd3b398318c84a816a96ca3950d29aea8b38e414ea7 SHA512 6e57e4e923285a51367fa4d2ce673cf0a6999fd78c95dfb2f895f3dc36df34bf06a01a11832b31224b4d90461f3b819451ee17866d4ecf9c3b28abd683970162 WHIRLPOOL 274e849135a7f60439c6d4f834b5b3443c577deb5cc73010d3b799e17f6458ae646fec9c1985d0544bc2938919fd1942473a54a05a75c81c3cab27c4ddd1477e
-DIST sysstat-11.0.0.tar.bz2 325498 SHA256 30f3833e469f0d4fc29be8e515979361ca9410524f51e16b496e83d7dde69e19 SHA512 f98204ad5f2cb21b55d7dc5a582b2bc4a003ea95b3029c5259e4d7337c802df551df599748fbe622cf190b021769747981675cb8e0c8f58f6cc285192d68e6da WHIRLPOOL d8bfdea94fdb08d5da7052b37af5ff483de970b310cb0e8c91a0233d3c26d31b5c183423bf5e09cce83b9b2ecd26f523178bd3d1de76787b47662892f8816f40
-DIST sysstat-11.0.1.tar.xz 290576 SHA256 587d66763f8bc07d8220972d9da1955e806208af848c6c681c79caa377d78fb3 SHA512 441b5462158b5973a6c5328aea89fc018d201a6b56800573b5fc38ffec1ffa371a8a38eebe6f1c74bf3f45ea90c86992810a3bf874576ee23f6847f1076d1556 WHIRLPOOL 54feaf76149dd10be24621dcef65e2cd916b82d58349dcbbb6c9eb19ef634de3a254a36a440fe51c768349d7b2f1c4b32f1670ea95d6ee002e6b315535403c2f
 DIST sysstat-11.0.2.tar.xz 291256 SHA256 acd87fdfbe7c796480f14fc26119d8f785d26827d74a0f5bced6c492a91f1b96 SHA512 4bb5f2ee14346d83c59bd4da36ae8fc6c13197eabb808b1b5db84b593f07d8b366b1f6329abed8d43e2a8497a89de0f89a398b741d4ca23b4a3a95973b5f0f54 WHIRLPOOL 98daee288e22f803f19bbe423eb999f527e8997f2ffd3fe1fe784363260365ee833dd33b755f44d6bfcc685f70b47cb8fd70fdd9a3fa679829c1e608bd65f8e2
 DIST sysstat-11.1.1.tar.xz 295372 SHA256 36e86672c415027d633f6f036b88cde1f87b0fbf1d7743b2177e489b67f4d90a SHA512 2cc196cf6994b05085a9c412021ecfedb8b90bf8aede1b5b1f45d7d363cc56a3180a217a40ee6b5824b30e610c52b2b3b86eb34e1d20b3e3ef26a0a7fedf8d9c WHIRLPOOL 2603993b8072e9c1d55b42f91aa15d7142436633b01a73ce220391b8f7588684b9a2c29f2543235dec49392690b8c1aa0f2ddf573d3d09b306b054f24e4661f6
 DIST sysstat-11.1.2.tar.xz 302400 SHA256 6f3f6a24a7f0ce67de6b5c0e71631e45966f9fe25f3e2b3dc71a31759af32e66 SHA512 b1c53e3061f1506ab001efd078a0f642e76d2ab6d3557922626ba04846594db9798ebe839434cfc47ed50b02510b90afb353c6c5065c101dca7d9049b1742a9c WHIRLPOOL 08603d2f34a0f6b9d31597370e7f4af746447307c5b0891c1a8d7876b68574d53ecfa579e342e455ae00d57e54277d65471c453a0781c342e68a5d3a31900a25
--- a/app-admin/sysstat/files/sysstat-10.2.0-systemd.patch
+++ b/app-admin/sysstat/files/sysstat-10.2.0-systemd.patch
@ -1,16 +0,0 @@
--- a/Makefile.in
-+++ b/Makefile.in
-@@ -376,8 +376,8 @@ install_all: install_base cron/crontab sysstat \
- 	   su $(CRON_OWNER) -c "crontab cron/crontab"; \
- 	fi
- 	if [ -x $(SYSTEMCTL) -a -d "$(SYSTEMD_UNIT_DIR)" ]; then \
-	    $(INSTALL_DATA) sysstat.service $(SYSTEMD_UNIT_DIR); \
-	    $(SYSTEMCTL) enable sysstat.service; \
-+	    mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR); \
-+	    $(INSTALL_DATA) sysstat.service $(DESTDIR)$(SYSTEMD_UNIT_DIR); \
- 	elif [ -d $(DESTDIR)$(INIT_DIR) ]; then \
- 	   $(INSTALL_BIN) sysstat $(DESTDIR)$(INIT_DIR)/sysstat; \
- 	   if [ -x $(CHKCONFIG) ]; then \
-- 
-1.8.5.2
-
--- a/app-admin/sysstat/sysstat-10.2.0.ebuild
+++ b/app-admin/sysstat/sysstat-10.2.0.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.2.0.ebuild,v 1.10 2014/05/17 15:08:44 swift Exp $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86"
-IUSE="cron debug +doc isag nls lm_sensors selinux"
-
-RDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-	selinux? ( sec-policy/selinux-sysstat )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
-	epatch "${FILESDIR}"/${PN}-10.2.0-systemd.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			$(use_enable cron install-cron) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/sysstat.init.d sysstat
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-admin/sysstat/sysstat-10.2.1-r1.ebuild
+++ b/app-admin/sysstat/sysstat-10.2.1-r1.ebuild
@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.2.1-r1.ebuild,v 1.9 2014/08/01 11:33:31 armin76 Exp $
-
-EAPI=5
-inherit eutils multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
-IUSE="cron debug +doc isag nls lm_sensors selinux"
-
-RDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-	selinux? ( sec-policy/selinux-sysstat )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			--enable-copy-only \
-			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
-			$(use_enable cron install-cron) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-admin/sysstat/sysstat-11.0.0.ebuild
+++ b/app-admin/sysstat/sysstat-11.0.0.ebuild
@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.0.0.ebuild,v 1.8 2014/11/02 08:59:39 ago Exp $
-
-EAPI=5
-inherit eutils multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
-IUSE="cron debug +doc isag nls lm_sensors selinux"
-
-CDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			--enable-copy-only \
-			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
-			$(use_enable cron install-cron) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.{daily,hourly}
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-admin/sysstat/sysstat-11.0.1-r1.ebuild
+++ b/app-admin/sysstat/sysstat-11.0.1-r1.ebuild
@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.0.1-r1.ebuild,v 1.2 2014/11/02 07:50:36 swift Exp $
-
-EAPI=5
-inherit eutils multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cron debug +doc isag nls lm_sensors selinux"
-
-CDEPEND="
-	cron? ( sys-process/cronbase )
-	isag? (
-		dev-lang/tk
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			--enable-copy-only \
-			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
-			$(use_enable cron install-cron) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	use cron && dodir /etc/cron.d
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@ -1 +1,2 @@
 DIST file-roller-3.12.2.tar.xz 1396796 SHA256 0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf SHA512 8e47ca0b8ee619da161d55909647ac6aac5645e7120c5f71f34dd8911b6ca2b530031b8efaeab10d668e9a3428fc4e03159605dac626aa600026719d8741f22f WHIRLPOOL 61be4185d82adbd8dabc6fc9a007490596b373b249cebeb9c2a615fd6cdf6575a31c01196588ae3ab2e839dea2136a976bf03b40fce54ba0dba571e7f7972b5e
+DIST file-roller-3.14.2.tar.xz 1387784 SHA256 1815e736715afe8c0f3fbda41c76c07289220d4855345f779c632adf5e074e50 SHA512 92ff42e4fe06e3ea54e71806157fbb95f9e5f247142e9e857f61f61748fd0e1b99a73cfb35fd3ea890c3e19da0d2176af9a017a8eb918eff9ddc0371b09ed11d WHIRLPOOL db4e5519fe298759dbb0f048a597d4cd8ef6610b04eab9f77ee21905726f19e15312cdfc47aa80c2f55490ad4f400e7cac0664e24376b40a340d780e5f0809bf
--- a/app-arch/file-roller/file-roller-3.14.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.14.2.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.14.2.ebuild,v 1.1 2014/12/14 22:31:48 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 readme.gentoo
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="http://fileroller.sourceforge.net/ https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="nautilus packagekit"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/json-glib-0.14
+	>=x11-libs/gtk+-3.13.2:3
+	>=x11-libs/libnotify-0.4.3:=
+	sys-apps/file
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/pango
+	nautilus? ( >=gnome-base/nautilus-3 )
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${RDEPEND}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#	gnome-base/gnome-common
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+cpio    - app-arch/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# Use absolute path to GNU tar since star doesn't have the same
+	# options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
+	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
+
+	# File providing Gentoo package names for various archivers
+	cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
+	# --disable-debug because enabling it adds -O0 to CFLAGS
+	gnome2_src_configure \
+		--disable-run-in-place \
+		--disable-static \
+		--disable-debug \
+		--enable-magic \
+		--enable-libarchive \
+		--with-smclient=xsmp \
+		$(use_enable nautilus nautilus-actions) \
+		$(use_enable packagekit) \
+		ITSTOOL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
--- a/app-editors/gvim/gvim-7.4.273.ebuild
+++ b/app-editors/gvim/gvim-7.4.273.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/gvim/gvim-7.4.273.ebuild,v 1.10 2014/10/12 09:01:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.273.ebuild,v 1.11 2014/12/14 10:58:01 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -58,7 +58,7 @@ RDEPEND="
 		!luajit? ( dev-lang/lua[deprecated] )
 	)
 	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
--- a/app-editors/gvim/gvim-7.4.488.ebuild
+++ b/app-editors/gvim/gvim-7.4.488.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/gvim/gvim-7.4.488.ebuild,v 1.1 2014/10/26 17:52:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.488.ebuild,v 1.2 2014/12/14 10:58:01 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -58,7 +58,7 @@ RDEPEND="
 		!luajit? ( dev-lang/lua[deprecated] )
 	)
 	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
--- a/app-editors/gvim/gvim-7.4.527.ebuild
+++ b/app-editors/gvim/gvim-7.4.527.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/gvim/gvim-7.4.527.ebuild,v 1.1 2014/11/24 03:47:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.527.ebuild,v 1.2 2014/12/14 10:58:01 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -58,7 +58,7 @@ RDEPEND="
 		!luajit? ( dev-lang/lua[deprecated] )
 	)
 	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
--- a/app-editors/gvim/gvim-7.4.542.ebuild
+++ b/app-editors/gvim/gvim-7.4.542.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/gvim/gvim-7.4.542.ebuild,v 1.1 2014/12/08 05:41:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.542.ebuild,v 1.2 2014/12/14 10:58:01 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -58,7 +58,7 @@ RDEPEND="
 		!luajit? ( dev-lang/lua[deprecated] )
 	)
 	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-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-editors/gvim/gvim-9999.ebuild,v 1.20 2014/10/26 17:52:52 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.21 2014/12/14 10:58:01 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -58,7 +58,7 @@ RDEPEND="
 		!luajit? ( dev-lang/lua[deprecated] )
 	)
 	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
--- a/app-editors/vim/vim-7.4.273.ebuild
+++ b/app-editors/vim/vim-7.4.273.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/vim/vim-7.4.273.ebuild,v 1.11 2014/10/12 09:02:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.273.ebuild,v 1.12 2014/12/13 20:40:13 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -46,7 +46,7 @@ RDEPEND="
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
--- a/app-editors/vim/vim-7.4.488.ebuild
+++ b/app-editors/vim/vim-7.4.488.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/vim/vim-7.4.488.ebuild,v 1.1 2014/10/26 17:51:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.488.ebuild,v 1.2 2014/12/13 20:40:13 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -46,7 +46,7 @@ RDEPEND="
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
--- a/app-editors/vim/vim-7.4.527.ebuild
+++ b/app-editors/vim/vim-7.4.527.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/vim/vim-7.4.527.ebuild,v 1.1 2014/11/24 03:45:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.527.ebuild,v 1.2 2014/12/13 20:40:13 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -46,7 +46,7 @@ RDEPEND="
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
--- a/app-editors/vim/vim-7.4.542.ebuild
+++ b/app-editors/vim/vim-7.4.542.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/vim/vim-7.4.542.ebuild,v 1.1 2014/12/08 05:41:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.542.ebuild,v 1.2 2014/12/13 20:40:13 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -46,7 +46,7 @@ RDEPEND="
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-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-editors/vim/vim-9999.ebuild,v 1.17 2014/10/26 17:51:35 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.18 2014/12/13 20:40:13 dilfridge Exp $

 EAPI=5
 VIM_VERSION="7.4"
@ -46,7 +46,7 @@ RDEPEND="
 		~app-editors/vim-core-${PV}
 		dev-util/ctags
 	)
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	racket? ( dev-scheme/racket )
 	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@ -1 +1,3 @@
+DIST qemu-2.1.2-20141214.tar.xz 5580 SHA256 bbf0e23f03f7ec5582ae522a194c5908a1ed85d42bf859100c99280af1ff21d2 SHA512 ca9bb37400d59cedeb1a659cb445758138c18ceb28ae2de2beee50b7aba39b1edf8d7317d777aa44def7c96437b5d4c19874b52e48d0272cb7de1c5dcc77f6d7 WHIRLPOOL 6ea13fe7cfaaa103d6d6e43445bba97358fcb6b434bccb5018e48176f9d4b90ce2100ffb17cd555fc4b9ee3fe98c281a6702d5a875d8a04674e177fbe90acffa
 DIST qemu-2.1.2.tar.bz2 23563255 SHA256 fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885 SHA512 73ef758c82b23eec649c807bee8937d7fbf267278f7777adbdb22b738672543b826d211a4b523f38cee3e2b01f05ccf40a75756fc19c911362988d8e86d5cd58 WHIRLPOOL 5703d0aa8bb4366bb7aeb44fa4f3d1b54f188de42cd8c82e894584f627802b80a3dde1aa3b15fe8602a1891ec61ac66b3cd44ec031385cca88768f375c15b554
+DIST qemu-2.2.0.tar.bz2 24316697 SHA256 b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c SHA512 c1a42cc53a01175875411cad13defaab46f97740897b89f19fbf345106534f83fc707fae4a58d890f64eea475b940b934c7531a6ed04aa01f54cadb52b0b5909 WHIRLPOOL a9cb92406d4f2cfd6b7989c9876f7df4b305083241110e7b2bf16642cfd77531c48a48753745dfeb31b9aa7d71a2d4d3f8c5aba797918c9c60e920c79066ea2d
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qemu</herd>
-  <maintainer>
-  	<email>cardoe@gentoo.org</email>
+<herd>qemu</herd>
+<maintainer>
+	<email>cardoe@gentoo.org</email>
 	<name>Doug Goldstein</name>
-  </maintainer>
-  <use>
+</maintainer>
+<use>
 	<flag name='accessibility'>Adds support for braille displays using brltty</flag>
 	<flag name='aio'>Enables support for Linux's Async IO</flag>
 	<flag name='alsa'>Enable alsa output for sound emulation</flag>
@ -41,8 +41,7 @@
 	<flag name='jpeg'>Enable jpeg image support for the VNC console server</flag>
 	<flag name='png'>Enable png image support for the VNC console server</flag>
 	<flag name='usb'>Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
-	<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
-        	devices to another machine over TCP</flag>
+	<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag>
 	<flag name='uuid'>Enable UUID support in the vdi block driver</flag>
 	<flag name='vde'>Enable VDE-based networking</flag>
 	<flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
@ -53,5 +52,5 @@
 	<flag name='xen'>Enables support for Xen backends</flag>
 	<flag name='xfs'>Support xfsctl() notification and syncing for XFS backed
 		virtual disks.</flag>
-  </use>
+</use>
 </pkgmetadata>
--- a/app-emulation/qemu/qemu-2.1.2-r2.ebuild
+++ b/app-emulation/qemu/qemu-2.1.2-r2.ebuild
@ -0,0 +1,602 @@
+# 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-2.1.2-r2.ebuild,v 1.1 2014/12/14 22:45:07 tamiko 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 pax-utils
+
+BACKPORTS="20141214"
+
+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/~tamiko/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 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
+
+use_targets="
+	$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+	$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+"
+IUSE+=" ${use_targets}"
+
+# Require at least one softmmu or user target.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="|| ( ${use_targets} )
+	${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.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=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(+)] )
+	infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
+	jpeg? ( virtual/jpeg[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[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(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.7.5
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
+	!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	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] )
+	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="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
+	static-user? ( ${USER_LIB_DEPEND} )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+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
+	usr/share/qemu/u-boot.e500
+"
+
+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
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+src_prepare() {
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# Cheap hack to disable gettext .mo generation.
+	use nls || rm -f po/*.po
+
+	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+	epatch "${FILESDIR}"/${PN}-2.1.1-readlink-self.patch
+	epatch "${FILESDIR}"/${PN}-2.1.2-vnc-sanitize-bits.patch #527088
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
+			EPATCH_SOURCE="${WORKDIR}/patches" epatch
+
+	# Fix ld and objcopy being called directly
+	tc-export AR 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 static_flag="static-${buildtype}"
+
+	# audio options
+	local audio_opts="oss"
+	use alsa && audio_opts="alsa,${audio_opts}"
+	use sdl && audio_opts="sdl,${audio_opts}"
+	use pulseaudio && audio_opts="pa,${audio_opts}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl glx)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard smartcard-nss)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu tls quorum)
+		$(conf_softmmu tls vnc-tls)
+		$(conf_softmmu tls vnc-ws)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--target-list="${user_targets}"
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--target-list="${softmmu_targets}"
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=3.0 )
+		;;
+	esac
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# 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}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	einfo "./configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_export_best
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	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() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/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
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# 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}/docs/qmp/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp/*.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
+	if [[ -n ${softmmu_targets} ]]; then
+		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
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
+		ewarn "save states has been removed starting with the 1.6.2 release"
+		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"
+
+		if use x86 || use amd64; then
+			ewarn
+			ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
+			ewarn "installed.  In order to use kvm acceleration, pass the flag"
+			ewarn "-enable-kvm when running your system target."
+		fi
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	if use virtfs && [ -n "${softmmu_targets}" ]; then
+		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	fi
+}
+
+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)"
+}
--- a/app-emulation/qemu/qemu-2.2.0.ebuild
+++ b/app-emulation/qemu/qemu-2.2.0.ebuild
@ -0,0 +1,601 @@
+# 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-2.2.0.ebuild,v 1.1 2014/12/14 15:40:22 tamiko 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 pax-utils
+
+BACKPORTS=
+
+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 infiniband iscsi +jpeg \
+kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
+static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
+virtfs +vnc xattr xen xfs"
+
+COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
+mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
+x86_64"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
+
+use_targets="
+	$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+	$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+"
+IUSE+=" ${use_targets}"
+
+# Require at least one softmmu or user target.
+# Block USE flag configurations known to not work.
+REQUIRED_USE="|| ( ${use_targets} )
+	${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.
+#
+# The attr lib isn't always linked in (although the USE flag is always
+# respected).  This is because qemu supports using the C library's API
+# when available rather than always using the extranl library.
+COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
+	sys-libs/zlib[static-libs(+)]
+	xattr? ( sys-apps/attr[static-libs(+)] )"
+SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
+	>=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(+)] )
+	infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
+	jpeg? ( virtual/jpeg[static-libs(+)] )
+	lzo? ( dev-libs/lzo:2[static-libs(+)] )
+	ncurses? ( sys-libs/ncurses[static-libs(+)] )
+	nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
+	numa? ( sys-process/numactl[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(+)] )
+	snappy? ( app-arch/snappy[static-libs(+)] )
+	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
+	ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
+	tls? ( net-libs/gnutls[static-libs(+)] )
+	usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
+	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
+	vde? ( net-misc/vde[static-libs(+)] )
+	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
+USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
+X86_FIRMWARE_DEPEND="
+	>=sys-firmware/ipxe-1.0.0_p20130624
+	pin-upstream-blobs? (
+		~sys-firmware/seabios-1.7.5
+		~sys-firmware/sgabios-0.1_pre8
+		~sys-firmware/vgabios-0.7a
+	)
+	!pin-upstream-blobs? (
+		sys-firmware/seabios
+		sys-firmware/sgabios
+		sys-firmware/vgabios
+	)"
+CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
+	!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
+	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
+	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
+	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] )
+	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="${CDEPEND}
+	dev-lang/perl
+	=dev-lang/python-2*
+	sys-apps/texinfo
+	virtual/pkgconfig
+	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
+	gtk? ( nls? ( sys-devel/gettext ) )
+	static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
+	static-user? ( ${USER_LIB_DEPEND} )
+	test? (
+		dev-libs/glib[utils]
+		sys-devel/bc
+	)"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-qemu )
+"
+
+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
+	usr/share/qemu/u-boot.e500
+"
+
+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
+
+	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
+		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
+		eerror "instances are still pointing to it.  Please update your"
+		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
+		eerror "and the right system binary (e.g. qemu-system-x86_64)."
+		die "update your virt configs to not use qemu-kvm"
+	fi
+}
+
+pkg_setup() {
+	enewgroup kvm 78
+}
+
+src_prepare() {
+	# Alter target makefiles to accept CFLAGS set via flag-o
+	sed -i -r \
+		-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
+		Makefile Makefile.target || die
+
+	# Cheap hack to disable gettext .mo generation.
+	use nls || rm -f po/*.po
+
+	epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+			epatch
+
+	# Fix ld and objcopy being called directly
+	tc-export AR 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 static_flag="static-${buildtype}"
+
+	# audio options
+	local audio_opts="oss"
+	use alsa && audio_opts="alsa,${audio_opts}"
+	use sdl && audio_opts="sdl,${audio_opts}"
+	use pulseaudio && audio_opts="pa,${audio_opts}"
+
+	local conf_opts=(
+		--prefix=/usr
+		--sysconfdir=/etc
+		--libdir=/usr/$(get_libdir)
+		--docdir=/usr/share/doc/${PF}/html
+		--disable-bsd-user
+		--disable-guest-agent
+		--disable-strip
+		--disable-werror
+		--python="${PYTHON}"
+		--cc="$(tc-getCC)"
+		--cxx="$(tc-getCXX)"
+		--host-cc="$(tc-getBUILD_CC)"
+		$(use_enable debug debug-info)
+		$(use_enable debug debug-tcg)
+		--enable-docs
+		$(use_enable tci tcg-interpreter)
+		$(use_enable xattr attr)
+	)
+
+	# Disable options not used by user targets as the default configure
+	# options will autoprobe and try to link in a bunch of unused junk.
+	conf_softmmu() {
+		if [[ ${buildtype} == "user" ]] ; then
+			echo "--disable-${2:-$1}"
+		else
+			use_enable "$@"
+		fi
+	}
+	conf_opts+=(
+		$(conf_softmmu accessibility brlapi)
+		$(conf_softmmu aio linux-aio)
+		$(conf_softmmu bluetooth bluez)
+		$(conf_softmmu caps cap-ng)
+		$(conf_softmmu curl)
+		$(conf_softmmu fdt)
+		$(conf_softmmu glusterfs)
+		$(conf_softmmu gtk)
+		$(conf_softmmu infiniband rdma)
+		$(conf_softmmu iscsi libiscsi)
+		$(conf_softmmu jpeg vnc-jpeg)
+		$(conf_softmmu kernel_linux kvm)
+		$(conf_softmmu lzo)
+		$(conf_softmmu ncurses curses)
+		$(conf_softmmu nfs libnfs)
+		$(conf_softmmu numa)
+		$(conf_softmmu opengl glx)
+		$(conf_softmmu png vnc-png)
+		$(conf_softmmu rbd)
+		$(conf_softmmu sasl vnc-sasl)
+		$(conf_softmmu sdl)
+		$(conf_softmmu seccomp)
+		$(conf_softmmu smartcard smartcard-nss)
+		$(conf_softmmu snappy)
+		$(conf_softmmu spice)
+		$(conf_softmmu ssh libssh2)
+		$(conf_softmmu tls quorum)
+		$(conf_softmmu tls vnc-tls)
+		$(conf_softmmu tls vnc-ws)
+		$(conf_softmmu usb libusb)
+		$(conf_softmmu usbredir usb-redir)
+		$(conf_softmmu uuid)
+		$(conf_softmmu vde)
+		$(conf_softmmu vhost-net)
+		$(conf_softmmu virtfs)
+		$(conf_softmmu vnc)
+		$(conf_softmmu xen)
+		$(conf_softmmu xen xen-pci-passthrough)
+		$(conf_softmmu xfs xfsctl)
+	)
+
+	case ${buildtype} in
+	user)
+		conf_opts+=(
+			--enable-linux-user
+			--disable-system
+			--target-list="${user_targets}"
+			--disable-blobs
+			--disable-tools
+		)
+		;;
+	softmmu)
+		conf_opts+=(
+			--disable-linux-user
+			--enable-system
+			--target-list="${softmmu_targets}"
+			--with-system-pixman
+			--audio-drv-list="${audio_opts}"
+		)
+		use gtk && conf_opts+=( --with-gtkabi=3.0 )
+		;;
+	esac
+
+	# Add support for SystemTAP
+	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
+
+	# 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}; then
+		conf_opts+=( --static --disable-pie )
+	else
+		gcc-specs-pie && conf_opts+=( --enable-pie )
+	fi
+
+	einfo "./configure ${conf_opts[*]}"
+	cd "${builddir}"
+	../configure "${conf_opts[@]}" || die "configure failed"
+
+	# FreeBSD's kernel does not support QEMU assigning/grabbing
+	# host USB devices yet
+	use kernel_FreeBSD && \
+		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
+}
+
+src_configure() {
+	local target
+
+	python_export_best
+
+	softmmu_targets= softmmu_bins=()
+	user_targets= user_bins=()
+
+	for target in ${IUSE_SOFTMMU_TARGETS} ; do
+		if use "qemu_softmmu_targets_${target}"; then
+			softmmu_targets+=",${target}-softmmu"
+			softmmu_bins+=( "qemu-system-${target}" )
+		fi
+	done
+
+	for target in ${IUSE_USER_TARGETS} ; do
+		if use "qemu_user_targets_${target}"; then
+			user_targets+=",${target}-linux-user"
+			user_bins+=( "qemu-${target}" )
+		fi
+	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() {
+	if [[ -n ${softmmu_targets} ]]; then
+		cd "${S}/softmmu-build"
+		pax-mark m */qemu-system-* #515550
+		emake -j1 check
+		emake -j1 check-report.html
+	fi
+}
+
+qemu_python_install() {
+	python_domodule "${S}/scripts/qmp/qmp.py"
+
+	python_doscript "${S}/scripts/kvm/kvm_stat"
+	python_doscript "${S}/scripts/kvm/vmxcap"
+	python_doscript "${S}/scripts/qmp/qmp-shell"
+	python_doscript "${S}/scripts/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
+
+		# This might not exist if the test failed. #512010
+		[[ -e check-report.html ]] && dohtml check-report.html
+
+		if use kernel_linux; then
+			udev_dorules "${FILESDIR}"/65-kvm.rules
+		fi
+
+		if use python; then
+			python_foreach_impl qemu_python_install
+		fi
+	fi
+
+	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
+	pushd "${ED}"/usr/bin >/dev/null
+	pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
+	popd >/dev/null
+
+	# 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}/docs/qmp/"
+
+	cd "${S}"
+	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
+	newdoc pc-bios/README README.pc-bios
+	dodoc docs/qmp/*.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
+	if [[ -n ${softmmu_targets} ]]; then
+		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
+	fi
+
+	qemu_support_kvm && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	if qemu_support_kvm; then
+		readme.gentoo_print_elog
+		ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
+		ewarn "save states has been removed starting with the 1.6.2 release"
+		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"
+
+		if use x86 || use amd64; then
+			ewarn
+			ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
+			ewarn "installed.  In order to use kvm acceleration, pass the flag"
+			ewarn "-enable-kvm when running your system target."
+		fi
+	fi
+
+	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
+		udev_reload
+	fi
+
+	fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+	if use virtfs && [ -n "${softmmu_targets}" ]; then
+		local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
+		fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+	fi
+}
+
+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)"
+}
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
--- a/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.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/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild,v 1.4 2014/11/19 19:46:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/pilot-link/pilot-link-0.12.5-r1.ebuild,v 1.5 2014/12/13 20:59:54 dilfridge Exp $

 EAPI=5

@ -69,7 +69,7 @@ src_compile() {

 	if use perl; then
 		cd "${S}"/bindings/Perl
-		perl-module_src_prep
+		perl-module_src_configure
 		local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
 		perl-module_src_compile
 	fi
--- a/app-portage/g-cpan/g-cpan-9999.ebuild
+++ b/app-portage/g-cpan/g-cpan-9999.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/g-cpan/g-cpan-9999.ebuild,v 1.1 2014/12/14 00:33:42 dilfridge Exp $
+
+EAPI=5
+
+inherit perl-module
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/gentoo-perl/g-cpan.git"
+	inherit git-r3
+	SRC_URI=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.gz
+			 http://dev.gentoo.org/~chainsaw/distfiles/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="g-cpan: generate and install CPAN modules using portage"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/g-cpan.xml"
+
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/perl
+		>=dev-perl/yaml-0.60
+		dev-perl/Shell-EnvImporter
+		dev-perl/Log-Agent"
+RDEPEND="${DEPEND}"
+
+src_install() {
+		perl-module_src_install
+		diropts "-m0755"
+		dodir "/var/tmp/g-cpan"
+		keepdir "/var/tmp/g-cpan"
+		dodir "/var/log/g-cpan"
+		keepdir "/var/log/g-cpan"
+}
+
+pkg_postinst() {
+	elog "You may wish to adjust the permissions on /var/tmp/g-cpan"
+	elog "if you have users besides root expecting to use g-cpan."
+	elog "Please note that some CPAN packages need additional manual"
+	elog "parameters or tweaking, due to bugs in their build systems."
+}
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@ -1,4 +1,3 @@
-DIST genlop-0.30.5.tar.gz 19738 SHA256 fc30097324601ca72eb9d39bf5dc1c4d76b85d5facdb7a6f437d819a594061a1 SHA512 40e9b861de17040623aeb361aa4f080a0d166f943cb56a173693b30fe1cfba4f742f5162034b823916bd6ee97e733e7576d74e8b444ba08adad291a76c33a03e WHIRLPOOL 2d124c3ee1107c3d22eba2f8a8b5d54de296443b4d8550610bf58610a5e550b665821c39a9abe49a3f69ed52ad9a7efb6a8a3d83e9f920bbc0d38871382a50ec
-DIST genlop-0.30.7.tar.gz 20809 SHA256 3f88befc482e782b7b88c07be1a6fb61626adc49b02461a64480fb5e9d28a4cf SHA512 6f86a15688c14f31843857c6749d2e1804d044bb27122659cbece29e70baacdcaf30d6a870194ac35cf293a7395780f567fc62d97f7f48cacc1464b24c61bf83 WHIRLPOOL 2893f67d0df32576e5a9eef3f2b3f17e8e64bcd298d7f638c2ce231f448e64b84b97bd96ace3042f2b6752dc71949998dd3c753eddc187eaa89b471a12e1b8e5
+DIST genlop-0.30.10.tar.gz 20872 SHA256 690ef95d2ce715f2a1a3a2d380d74958cfdd3a28033625aec6e8d694f91dc4de SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593 WHIRLPOOL 378e2837929ae21417d3be0b840fb9635248b94cdefef9459455ce80236117c79a9a5f406d707d400e7887f38dbcd5004edd24caac6ebb207ab2f693d4f74bfa
 DIST genlop-0.30.8.tar.gz 21315 SHA256 944cdfcb9d633dacc4a196039d509e6dc9a22e4ec1715255733a75ca6a36a9e4 SHA512 71a5c0bb7767f2b078214c0bce87cbc4d3bf40e751f4ac023fb0c0a0817c5f8c75fffd06a8c27769a36e9e16c4ebef42b4770ee938c8fe3988446ebc869e8091 WHIRLPOOL b39c8761176fe51f6c339ca9154a0d8fc078897bea6cfc68b55c03db40be692855346ca0740525a5e5e7a6d3c2cf952fea95f3404af0a459f32a1a2a22c0633e
 DIST genlop-0.30.9.tar.gz 21160 SHA256 76aae7055c68bd1bd9f0e17d9e984c32b7e94d4824c9e433f45e3457916f1193 SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936 WHIRLPOOL fab528d251c57541c0cb5e5072d863abf6e776282a64ee3ecfcb88113bac3f1f0256825c0a19fdabbb8f671bc442703a12b28a9d1a4ab7b44c388367ea43dd2c
--- a/app-portage/genlop/genlop-0.30.10.ebuild
+++ b/app-portage/genlop/genlop-0.30.10.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/genlop/genlop-0.30.10.ebuild,v 1.1 2014/12/14 00:23:10 dilfridge Exp $
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="A nice emerge.log parser"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl"
+SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	 dev-perl/DateManip
+	 dev-perl/libwww-perl"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin genlop
+	dodoc README Changelog
+	doman genlop.1
+	newbashcomp genlop.bash-completion genlop
+}
--- a/app-portage/genlop/genlop-0.30.5.ebuild
+++ b/app-portage/genlop/genlop-0.30.5.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/genlop/genlop-0.30.5.ebuild,v 1.12 2010/10/19 11:47:35 leio Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="http://pollycoke.org/genlop.html"
-SRC_URI="http://gelo.dolcetta.net/software/${P}.tar.gz"
-
-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=">=dev-lang/perl-5.8.0-r12
-	 >=dev-perl/DateManip-5.40"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin genlop || die
-	dodoc README Changelog
-	doman genlop.1
-	dobashcompletion genlop.bash-completion genlop
-}
--- a/app-portage/genlop/genlop-0.30.7.ebuild
+++ b/app-portage/genlop/genlop-0.30.7.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/genlop/genlop-0.30.7.ebuild,v 1.12 2010/10/19 11:47:35 leio Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="http://www.gentoo.org/proj/en/perl"
-SRC_URI="mirror://gentoo//${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.0-r12
-	 >=dev-perl/DateManip-5.40
-	 dev-perl/libwww-perl"
-
-src_install() {
-	dobin genlop || die
-	dodoc README Changelog
-	doman genlop.1
-	dobashcompletion genlop.bash-completion genlop
-}
--- a/app-portage/genlop/genlop-0.30.8-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.8-r1.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/genlop/genlop-0.30.8-r1.ebuild,v 1.10 2010/10/19 11:47:35 leio Exp $
-
-inherit eutils bash-completion
-
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="http://www.gentoo.org/proj/en/perl"
-SRC_URI="mirror://gentoo//${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.0-r12
-	 >=dev-perl/DateManip-5.40
-	 dev-perl/libwww-perl"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-version.patch"
-}
-
-src_install() {
-	dobin genlop || die "failed to install genlop (via dobin)"
-	dodoc README Changelog
-	doman genlop.1
-	dobashcompletion genlop.bash-completion genlop
-}
--- a/app-portage/genlop/genlop-0.30.8.ebuild
+++ b/app-portage/genlop/genlop-0.30.8.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/genlop/genlop-0.30.8.ebuild,v 1.3 2009/03/26 12:33:09 armin76 Exp $
-
-inherit bash-completion
-
-DESCRIPTION="A nice emerge.log parser"
-HOMEPAGE="http://www.gentoo.org/proj/en/perl"
-SRC_URI="mirror://gentoo//${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.0-r12
-	 >=dev-perl/DateManip-5.40
-	 dev-perl/libwww-perl"
-
-src_install() {
-	dobin genlop || die "failed to install genlop (via dobin)"
-	dodoc README Changelog
-	doman genlop.1
-	dobashcompletion genlop.bash-completion genlop
-}
--- a/app-portage/genlop/genlop-9999.ebuild
+++ b/app-portage/genlop/genlop-9999.ebuild
@ -1,8 +1,8 @@
-# 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-portage/genlop/genlop-9999.ebuild,v 1.1 2013/01/07 19:28:30 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/genlop/genlop-9999.ebuild,v 1.2 2014/12/14 00:23:10 dilfridge Exp $

-EAPI="5"
+EAPI=5

 inherit git-2 bash-completion-r1

@ -22,7 +22,7 @@ DEPEND="dev-lang/perl
 RDEPEND="${DEPEND}"

 src_install() {
-	dobin genlop || die "failed to install genlop (via dobin)"
+	dobin genlop
 	dodoc README Changelog
 	doman genlop.1
 	newbashcomp genlop.bash-completion genlop
--- a/app-text/cpdf/cpdf-2.1.1-r1.ebuild
+++ b/app-text/cpdf/cpdf-2.1.1-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-text/cpdf/cpdf-2.1.1.ebuild,v 1.4 2014/12/12 02:58:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cpdf/cpdf-2.1.1-r1.ebuild,v 1.1 2014/12/14 00:58:00 radhermit Exp $

 EAPI=5

@ -16,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"

-RDEPEND="dev-lang/ocaml:=
-	~dev-ml/camlpdf-${PV}:="
+RDEPEND=">=dev-lang/ocaml-4:=
+	dev-ml/camlpdf:="
 DEPEND="${RDEPEND}"

 RESTRICT="mirror bindist"
--- a/app-text/hnb/files/hnb-1.9.18-flags.patch
+++ b/app-text/hnb/files/hnb-1.9.18-flags.patch
@ -1,5 +1,5 @@
--- ./hnb-1.9.18/Makefile.orig	2003-08-27 04:50:58.000000000 +0200
-+++ ./hnb-1.9.18/Makefile	2009-10-23 14:23:16.000000000 +0200
+--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
 
 src/hnb: src/*.c src/*.h src/*.inc src/hnbrc.inc
@ -24,43 +24,18 @@
 	echo -n "\"">src/hnbrc.inc
 	cat doc/hnbrc | util/asc2c >> src/hnbrc.inc
 	echo "\"">>src/hnbrc.inc
--- ./hnb-1.9.18/hnb-1.9.18/Makefile.orig	2003-08-27 04:50:58.000000000 +0200
-+++ ./hnb-1.9.18/hnb-1.9.18/Makefile	2009-10-23 14:23:16.000000000 +0200
-@@ -1,19 +1,19 @@
- 
- src/hnb: src/*.c src/*.h src/*.inc src/hnbrc.inc
-	(cd src;make)
-+	(cd src;$(MAKE))
- install: src/hnb
- 	install -D src/hnb /usr/local/bin/hnb
- 	install -D -m444 doc/hnb.1 /usr/local/man/man1/hnb.1
- clean:
-	(cd src;make clean)
-	(cd util;make clean)
-+	(cd src;$(MAKE) clean)
-+	(cd util;$(MAKE) clean)
- 	rm -f *~
- 
- rcupdate: updaterc
- updaterc: src/hnbrc.inc
- 
- src/hnbrc.inc: doc/hnbrc
-	(cd util;make)
-+	(cd util;$(MAKE))
- 	echo -n "\"">src/hnbrc.inc
- 	cat doc/hnbrc | util/asc2c >> src/hnbrc.inc
- 	echo "\"">>src/hnbrc.inc
--- ./hnb-1.9.18/src/Makefile.orig	2003-08-27 04:50:58.000000000 +0200
-+++ ./hnb-1.9.18/src/Makefile	2009-10-23 14:23:16.000000000 +0200
+--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,6 @@
- LIBS=-lncurses libcli/libcli.a
+-LIBS=-lncurses libcli/libcli.a
 -CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
+LIBS=$(shell ${PKG_CONFIG} --libs ncurses) libcli/libcli.a
 +CFLAGS+=-Wall -pedantic
 +CPPFLAGS+=-I.. -Ilibcli -DHAVE_CONFIG_H
 
 CFILES=$(wildcard *.c)
 OBJS=$(patsubst %.c,%.o,$(CFILES))
-@@ -8,12 +9,12 @@
+@@ -8,22 +9,22 @@
 	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
 
 hnb: libcli/libcli.a Makefile $(OBJS) init_subsystems.c *.h *.inc
@ -72,11 +47,16 @@
 +	(cd libcli;$(MAKE) libcli.a)
 libcli/libcli_p.a: libcli/*.c
 -	(cd libcli;make libcli_p.a)
+-init_subsystems.c: *.c
 +	(cd libcli;$(MAKE) libcli_p.a)
- init_subsystems.c: *.c
+init_subsystems.c: $(CFILES)
 	echo "/* this file is autogenerated, do not edit */">init_subsystems.c
- 	cat *.c | grep "^\!init_" | sort | sed -e "s/^\!/void /g">>init_subsystems.c
-@@ -23,7 +24,7 @@
+-	cat *.c | grep "^\!init_" | sort | sed -e "s/^\!/void /g">>init_subsystems.c
+	cat $(CFILES) | grep "^\!init_" | sort | sed -e "s/^\!/void /g">>init_subsystems.c
+ 	echo "">>init_subsystems.c
+ 	echo "void init_subsystems(){">>init_subsystems.c
+-	cat *.c | grep "^\!init_" | sort | sed -e "s/^\!/ /g">>init_subsystems.c
+	cat $(CFILES) | grep "^\!init_" | sort | sed -e "s/^\!/ /g">>init_subsystems.c
 	echo "}">>init_subsystems.c
 clean:
 	rm -f xml_debug hnb $(OBJS) *~ cli_*.inc
@ -85,22 +65,19 @@
 hnb_p: *.c libcli/libcli_p.a init_subsystems.c
 	$(CC) -o hnb_p *.c -pg -lncurses_p libcli/libcli_p.a -I.. -Ilibcli -DHAVE_CONFIG_H
 
--- ./hnb-1.9.18/src/libcli/Makefile.orig	2003-08-27 04:50:59.000000000 +0200
-+++ ./hnb-1.9.18/src/libcli/Makefile	2009-10-23 14:25:37.000000000 +0200
-@@ -1,5 +1,3 @@
-CFLAGS = -Wall
-
- OBJS = cli.o cli_history.o cli_tokenize.o
- 
- all: libcli.a libcli.so test-static test-shared 
-@@ -9,8 +7,8 @@
+--- a/src/libcli/Makefile
+++ b/src/libcli/Makefile
+@@ -7,11 +7,11 @@
+ clean:
+ 	rm -f *.o *.a *.so test-s* *~
 libcli.a: $(OBJS)
- 	ar rc libcli.a cli*.o
+-	ar rc libcli.a cli*.o
+	$(AR) rc libcli.a cli*.o
 libcli_p.a: 
-	$(CC) -pg -c cli.c
-	$(CC) -pg -c cli_history.c
-+	$(CC) -pg -c cli.c $(CFLAGS)
-+	$(CC) -pg -c cli_history.c $(CFLAGS)
- 	ar rcs libcli_p.a cli*.o
+ 	$(CC) -pg -c cli.c
+ 	$(CC) -pg -c cli_history.c
+-	ar rcs libcli_p.a cli*.o
+	$(AR) rcs libcli_p.a cli*.o
 libcli.so: $(OBJS)
 	$(CC) -shared cli*.o -o libcli.so $(CFLAGS) $(LIBS)
+ test-static: test.o libcli.a
--- a/app-text/hnb/files/hnb-1.9.18-include.patch
+++ b/app-text/hnb/files/hnb-1.9.18-include.patch
@ -1,5 +1,5 @@
--- hnb-1.9.18/src/expanded.c.orig	2003-08-27 04:50:59.000000000 +0200
-+++ hnb-1.9.18/src/expanded.c	2009-10-23 14:40:16.000000000 +0200
+--- a/src/expanded.c
+++ b/src/expanded.c
@@ -18,9 +18,9 @@
  * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
--- a/app-text/hnb/files/hnb-1.9.18-printf.patch
+++ b/app-text/hnb/files/hnb-1.9.18-printf.patch
@ -0,0 +1,11 @@
+--- a/src/libcli/cli.c
+++ b/src/libcli/cli.c
+@@ -57,7 +57,7 @@
+ 				wp=word;
+ 				*wp='\0';
+ 			} else {
+-				printf(tbuf);printf("\n");
+				printf("%s\n", tbuf);
+ 				bp=tbuf;
+ 				*bp='\0';
+ 				strcpy(bp,word);
--- a/app-text/hnb/hnb-1.9.18-r1.ebuild
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@ -1,30 +1,37 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/hnb-1.9.18-r1.ebuild,v 1.8 2014/08/10 18:23:24 slyfox Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/hnb-1.9.18-r1.ebuild,v 1.10 2014/12/14 13:25:17 jer Exp $

+EAPI=5
 inherit eutils toolchain-funcs

 DESCRIPTION="A program to organize many kinds of data in one place"
-SRC_URI="http://hnb.sourceforge.net/.files/${P}.tar.gz"
 HOMEPAGE="http://hnb.sourceforge.net/"
+SRC_URI="http://hnb.sourceforge.net/.files/${P}.tar.gz"

 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""

-DEPEND=""
 RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"

 src_prepare() {
-	epatch "${FILESDIR}/${P}-flags.patch" "${FILESDIR}/${P}-include.patch"
-}
+	rm -r ${P} || die
+	rm src/cli_history.o || die
+
+	epatch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-include.patch \
+		"${FILESDIR}"/${P}-printf.patch
+
+	tc-export AR CC PKG_CONFIG

-src_compile() {
-	tc-export CC
-	default_src_compile
+	# bug #532552
+	export LC_ALL=C
 }

 src_install() {
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@ -5,3 +5,4 @@ DIST pandoc-1.12.3.3.tar.gz 1071822 SHA256 ba08dbddac8b3c4e4786ac9213068a77aa5ee
 DIST pandoc-1.12.4.2.tar.gz 1048263 SHA256 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45 SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743 WHIRLPOOL 795a27f9106d9848abb1cf120cdfe92fdaf839e5097e5bb17533859f4b56f958d92b5027483cb08dd7a4d448e106487fd9d37f2a9d67ed4479647acca2ed77a1
 DIST pandoc-1.12.4.tar.gz 1046258 SHA256 3efb11b90a7af9c22b1e4b33252a6163c38d52142ee1a3cae5e7170586b9fb36 SHA512 5eb566723276a6196114f0416946488ca26d4077d57540cf1b6578d78f826ff97e7fa14bc21a640eccd014155efc5644d287247146e6cebdb8a6df1444cd70f7 WHIRLPOOL 994c3fc53478acd3c742e55a397bf44e3f0caad629e891a30277a2c81296f19eba3976b8af0fbab87c7e99670877baac623b152e027b9fd14ade9ea513b196c9
 DIST pandoc-1.12.tar.gz 1161163 SHA256 89781e9a4cb31eec368fd8520394c75ee616636513c6abf5fc0f9d95ab795612 SHA512 082f2c4e726bbe76796dafdbfee79ac4034a1595edabc2966f9f19ea7a1d54b385e403f87af6edfd60ecef9ae9dab6db3290e562e4b69c35b5da5e23a6787e69 WHIRLPOOL b4d9f48f72d6cc6615d0c733b73a9d72cc23694759188722d797018461eab6ebda18bad242c73edb536e5f533a1371e023de06edbc65c5f51b198756c6d4a886
+DIST pandoc-1.13.1.tar.gz 1823730 SHA256 7b1bb9b7d66edfbac33796a3f5d3218c2add786b95ea9dfbd497dc0e8ed27e6f SHA512 da699d56916da118159b10306c323f435db2fe0e13a988c319e2ee9faf0082c359b3c7efda03110c20007ae1d23693d0270af095bda90b60dc362f47bf377b8e WHIRLPOOL bcf3ec37e69a76f1bc5a93a34f0822a17516347ec983e3906edbe298cebf3bcfa8e3a1f6136878ca8c69645a7dbcd9122093a3add1911ba54ba03ff8d98497dd
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@ -18,5 +18,9 @@
  <use>
    <flag name="embed_data_files">Embed data files in binary for relocatable executable.</flag>
    <flag name="http-conduit">Enable downloading of resources over https.</flag>
+    <flag name="trypandoc">Build trypandoc cgi executable.</flag>
+    <flag name="https">Enable support for downloading of resources over https.</flag>
+    <flag name="make-pandoc-man-pages">Build program to regenerate pandoc man pages from README.</flag>
+    <flag name="network-uri">Get Network.URI from the network-uri package.</flag>
  </use>
 </pkgmetadata>
--- a/app-text/pandoc/pandoc-1.13.1-r3.ebuild
+++ b/app-text/pandoc/pandoc-1.13.1-r3.ebuild
@ -0,0 +1,88 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pandoc/pandoc-1.13.1-r3.ebuild,v 1.1 2014/12/13 22:40:52 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://johnmacfarlane.net/pandoc"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed_data_files +https make-pandoc-man-pages +network-uri trypandoc"
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.9:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
+	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.2:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.8.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
+	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.2:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/texmath-0.8:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
+			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?]
+			!https? ( dev-haskell/http-types:=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
+		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'text >= 0.11 && < 1.2' 'text >= 0.11' \
+		'random >= 1 && < 1.1' 'random >=1 && <1.2' \
+		'http-client >= 0.3.2 && < 0.4' 'http-client >= 0.3.2 && < 0.5'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag https https) \
+		$(cabal_flag make-pandoc-man-pages make-pandoc-man-pages) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag trypandoc trypandoc)
+}
--- a/app-vim/vcscommand/Manifest
+++ b/app-vim/vcscommand/Manifest
@ -1,3 +1 @@
-DIST vcscommand-1.99.45.tar.gz 33729 SHA256 9795f33ed1642cde107d5c825e04fc37d5c94161e71328f08cd5978db729daac SHA512 70361db670cdf37d7fdf8e12a2b46964157fc853aee4422540b6563b9353bfd28a74f256d048cf2880dcee1c396df1964e3d40e431466ed89ba466477a016089 WHIRLPOOL 524af20a1ac7c5c3898ab2fbdd2b0b1de7c7606a704cc6ec2b717f22f6adf0e212e5054dcef9a3fc270dc104c001e7b6c5bf53db03a02066a67c769ae69af3ef
-DIST vcscommand-1.99.46.tar.bz2 27316 SHA256 bb8d208b060a2bd30541ba45924b3c4f07a1faacdadcf7728f3ab43c9eaf947d SHA512 3ca212408d46bc80bb744122add95893aef66ae4d8eebf02a8f9297570f63348cbafbb383b889260ad10b410e6fa2ae217e0a7ff398ac1590851b7ddf32fe267 WHIRLPOOL 67a045ccd725a17cbcc3c26de10afc7fae9287c9a8feae571b1a8b3f8deb0ed92ab55ec238543370cfaeef86a1ad767cbacc38c7c2666f08d04af26b0be7dd37
 DIST vcscommand-1.99.47.tar.bz2 27281 SHA256 1e219f3e941e49086fb5083a1493c9563cffd004e8bae8a7f6ac65596adf3f56 SHA512 df9180cc3a87dc5fab52d149c1f87993822658edabd77965756fa8ba05ef6f1c5a4f336b54d0b18e3c2bba8f53324ca60526258953a85ce170ab065b5f2e11c7 WHIRLPOOL 9c056921e8757b234ce71a840a7fcebb507dfe7813f2034bdb360ac60038cbfc01fc333353ec8b24b8142236271fa1295d53d7c5650046cbbb61f5bc6a80d478
--- a/app-vim/vcscommand/vcscommand-1.99.45.ebuild
+++ b/app-vim/vcscommand/vcscommand-1.99.45.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vcscommand/vcscommand-1.99.45.ebuild,v 1.5 2012/02/01 20:58:30 ranger Exp $
-
-EAPI=4
-
-inherit vim-plugin
-
-MY_PN="${PN}.vim"
-DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=90"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
-LICENSE="MIT"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="!app-vim/cvscommand"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
-
-src_unpack() {
-	unpack ${A}
-	mv *-${MY_PN}-* "${S}"
-}
-
-src_prepare() {
-	rm README || die
-}
--- a/app-vim/vcscommand/vcscommand-1.99.46.ebuild
+++ b/app-vim/vcscommand/vcscommand-1.99.46.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-vim/vcscommand/vcscommand-1.99.46.ebuild,v 1.1 2012/08/06 05:40:47 radhermit Exp $
-
-EAPI=4
-
-inherit vim-plugin
-
-DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
-HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=90"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="!app-vim/cvscommand"
-
-VIM_PLUGIN_HELPFILES="${PN}.txt"
--- a/app-vim/vcscommand/vcscommand-1.99.47.ebuild
+++ b/app-vim/vcscommand/vcscommand-1.99.47.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-vim/vcscommand/vcscommand-1.99.47.ebuild,v 1.1 2013/06/01 22:23:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-vim/vcscommand/vcscommand-1.99.47.ebuild,v 1.2 2014/12/14 04:38:26 radhermit Exp $

 EAPI=5

@ -9,7 +9,7 @@ inherit vim-plugin
 DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
 HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=90"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"

 RDEPEND="!app-vim/cvscommand"

--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@ -2,3 +2,4 @@ DIST mariadb-10.0.15.tar.gz 55531927 SHA256 9154cb68504d469b1bac636b85e30b2b2da2
 DIST mariadb-5.5.40.tar.gz 44745240 SHA256 cbde17f4a31483143490def6fcce33310ebae49eafe92dc4ada0e7227202415a SHA512 178b77d95bcd72bd8ec7840e77a6c7156379d676ff65eeb9a9f58897c4476f2dcd8f390ddaf12471d836f0224d7dec3aebeaa6fd1589ffae071f1eba4ed60eac WHIRLPOOL 1c6462b73c9ed8a5c7a16d327e066c92280a61ccfe28e5b28ea274fa711df4ae5cc06d7dbab3fa1b225c255ddaa4bbb4dfe71906a6e5ac72de5d550581935213
 DIST mysql-extras-20141017-1419Z.tar.bz2 1494065 SHA256 b872d1d8b55d56dfd581b7ae416ed7d1f36c8f3cf28e817a3ff21b87d6627918 SHA512 b489f6c3bfc3a48156c8d1278e90e3077604a15a37335a84ebdd6f156a5c088fe0a2725a14431bd5dc07f8007fd80f0ec732c37b3d584373a2a12ba3ea9f999e WHIRLPOOL 35408618fe0d3f812564b0e78f813faa024fd7ff57bef50ef5511cced47047e15d038ea14aaf46cba6252932561f0200b49dd1dbe552b5d30eb1ab648a51a493
 DIST mysql-extras-20141125-1930Z.tar.bz2 1494197 SHA256 a150a5680bb505a4187c16bc5a5f3ac09c3a83f71bd66b6cbd6111b8f0d25f8f SHA512 9e3e0cc99a54f936282ab5f5857e4a6308509f8686595f4a248542f43ca661732e26fd4703365c09a276d079c374e7f63bcd0ee6332d2c1b86e80298ac82b296 WHIRLPOOL 90eff797b33c859a0d2ad5fef8c9756ae86130fe21a6414ab95de45a135068d1d327e5e302431e3b78b26629ce66312955da25a9b8250e8b2596ef2ff5d270ad
+DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
--- a/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.15-r1.ebuild
@ -0,0 +1,115 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.15-r1.ebuild,v 1.1 2014/12/15 03:10:25 grknight Exp $
+
+EAPI="5"
+MY_EXTRAS_VER="20141215-0144Z"
+
+inherit toolchain-funcs mysql-multilib
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+	if ! multilib_is_native_abi ; then
+		einfo "Server tests not available on non-native abi".
+		return 0;
+	fi
+
+	local TESTDIR="${BUILD_DIR}/mysql-test"
+	local retstatus_unit
+	local retstatus_tests
+
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+	if ! use "minimal" ; then
+
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Run CTest (test-units)
+		cmake-utils_src_test
+		retstatus_unit=$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+		# Enable parallel testing, auto will try to detect number of cores
+		# You may set this by hand.
+		# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+		export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+		# create directories because mysqladmin might right out of order
+		mkdir -p "${T}"/var-tests{,/log}
+
+		# These are failing in MariaDB 10.0 for now and are believed to be
+		# false positives:
+		#
+		# main.information_schema, binlog.binlog_statement_insert_delayed,
+		# main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+		# funcs_1.is_columns_mysql
+		# fails due to USE=-latin1 / utf8 default
+		#
+		# main.mysql_client_test, main.mysql_client_test_nonblock
+		# main.mysql_client_test_comp:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+
+		for t in main.mysql_client_test main.mysql_client_test_nonblock \
+			main.mysql_client_test_comp \
+			binlog.binlog_statement_insert_delayed main.information_schema \
+			main.mysqld--help \
+			funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+				mysql-multilib_disable_test  "$t" "False positives in Gentoo"
+		done
+
+		# Run mysql tests
+		pushd "${TESTDIR}"
+
+		# run mysql-test tests
+		perl mysql-test-run.pl --force --vardir="${T}/var-tests"
+
+		retstatus_tests=$?
+		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		popd
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+
+		failures=""
+		[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+		[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+
+	else
+
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
--- a/dev-haskell/aeson-pretty/Manifest
+++ b/dev-haskell/aeson-pretty/Manifest
@ -1,2 +1,3 @@
 DIST aeson-pretty-0.7.1.tar.gz 4811 SHA256 c68ff70d0149a6f1f38345393cc0493d5ce6bfb22fc8e89bf3ceaad5ea0cb53e SHA512 53522c5235b8252c0a293ebe6a988cfb7f61cc575df664a27851652a47b948acd322898e70e128c91d1aaf6b5bd27c8a1717edcc3ea423f34e7943791a301326 WHIRLPOOL c4a311a05ca7ef0613fc458140dbaf2a2dac00c27c1afcbd868b88fec68c7b9a3de309051a8f143ed8a499b286ac95680c41809eabccf6aeab9b08e81f2e993d
+DIST aeson-pretty-0.7.2.tar.gz 4838 SHA256 6408b8b2bcd12cf591e4b93b4d9f5143449b33a59fbd3653f328e2515040570d SHA512 beabdb13c1a7c5a8fa7acdfe0e0f7b6b00d901d6aada360c17e43704cddd92d6464901885dd529710cc090c9649aa63b7241a5155178f0ff27145ed1ef4f347b WHIRLPOOL 8bab7c7527312a3c61f0232482f7b2418ae13a7d16d6b586278795a38ea8703830da68d2582e0a0dfee404a3c457c36934de8adcde882111bdc96f3ce274e574
 DIST aeson-pretty-0.7.tar.gz 4805 SHA256 e79d5b16709f30088859c6f8a35399d3bdde0ed63a41818a041be44adcd0787e SHA512 97590dcdb044d1ecb6b8acf5dedc0aedcf98743ae2b54346f199ab5ce5a954d79913d9fdb3ce94ca20797219c647dccc150e5ca9e531fa173bcd96464b40950a WHIRLPOOL 16e13cf79925708141c4a8aa0aef0a3f3743953d40be00b1a0c62f6222098116990b5f63391cefcfacb35ebaf342b8d36370c46d22f05b166869e65f7617231e
--- a/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild
+++ b/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/aeson-pretty/aeson-pretty-0.7.2.ebuild,v 1.1 2014/12/14 04:42:37 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="JSON pretty-printing library and command-line tool"
+HOMEPAGE="http://github.com/informatikr/aeson-pretty"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="lib-only"
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	>=dev-haskell/unordered-containers-0.1.3.0:=[profile?]
+	>=dev-haskell/vector-0.9:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	!lib-only? ( >=dev-haskell/attoparsec-0.10:=[profile?]
+			>=dev-haskell/cmdargs-0.7:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag lib-only lib-only)
+}
--- a/dev-haskell/basic-prelude/Manifest
+++ b/dev-haskell/basic-prelude/Manifest
@ -1,3 +1,4 @@
+DIST basic-prelude-0.3.10.tar.gz 4943 SHA256 a94c0c94ece5b21bc6ca9a939a118185c5c1e9acdbf93cb46114df79a21d0180 SHA512 c570be987680b5d1b298d096150423bf3c373cac2a17656a6f2a2c68740d0f51b1df24bf952b4bab22d750ed6e55e7d055f082ef65a06e067f706b8476490980 WHIRLPOOL db35f565cfdef951ec15008f54224a462207a8756db69907683f61640fadef5f7ee2447dd383392fce05c247bacb6031a200b8341fbcb57ed0b886678a4b97fc
 DIST basic-prelude-0.3.5.0.tar.gz 4648 SHA256 5991c0011058257b42ca5446909aa1f5ac24a4be11962f45fe7f17b8f78a2edb SHA512 9ea898c280ef41874e8b280d70a445d1b19500356d80c1a81c1d8c6f3738452097f61de66704d5484b4b6d49ef5e5236647f850d019ca578516f3cbb1d4b2771 WHIRLPOOL 5cf7fa0ac244262da30907e17a7cf52e79194160f2a1652b0480dc7eb99fdb89496b68a3a3c2e8acaed41eaf47cfa79850af8677360c57b13f9466ce84c46e91
 DIST basic-prelude-0.3.6.0.tar.gz 4844 SHA256 629c391e1904f2505153da69c211036f5832c12a263d30c4c5706ea4764da8ea SHA512 b60781409eb4d140c135f7628c75ef6be623af25378a10c174b02b2e84b3c52d1de72f9b1caf746af53c7f82f52deba9a87a4b128e813033535def209ee34e40 WHIRLPOOL 988513f173308b1d7fa51f33136a4d6f9079ca0b46b194b49016e3790b740bca361ccd9ee0247b32172a363ac4bd12edfc63e661a9c44d164bd4d230ef66f7ec
 DIST basic-prelude-0.3.8.tar.gz 4887 SHA256 effa8e5982753ddace4ccfc6f387b81395ec7e14ec0e6d0cc93660a09bb6dc53 SHA512 4e9bf6f33750e64037e07ddadc241d596ae12e979bbb87eeff07d42c3805e997cc88b47aac25c5c3fb64aaa693c68dd2ce864b963150f542146926e85cfcd0ff WHIRLPOOL 9a9a10f9d0a251f44de1ac1d63f8314261a967d4e9240ac3469dd100cc9613f92e42527bd4c72e3bebe521e3a52386211ef9e764e38fa8b7dbbc2e7164fd0691
--- a/dev-haskell/basic-prelude/basic-prelude-0.3.10.ebuild
+++ b/dev-haskell/basic-prelude/basic-prelude-0.3.10.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/basic-prelude/basic-prelude-0.3.10.ebuild,v 1.1 2014/12/14 11:11:10 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="An enhanced core prelude; a common foundation for alternate preludes"
+HOMEPAGE="https://github.com/snoyberg/basic-prelude"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/hashable:=[profile?]
+	dev-haskell/lifted-base:=[profile?]
+	>=dev-haskell/readargs-1.2:=[profile?] <dev-haskell/readargs-1.3:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
--- a/dev-haskell/bifunctors/Manifest
+++ b/dev-haskell/bifunctors/Manifest
@ -2,3 +2,4 @@ DIST bifunctors-3.2.0.1.tar.gz 7332 SHA256 a6ce8c875b79d9d28d7a7ae1156aad3095e95
 DIST bifunctors-4.1.0.1.tar.gz 7627 SHA256 cf8b94e7c8822e4709dac592d7e72ed78938494a241e76659822dff288d9c1d5 SHA512 652aabf51b706d737a0df8da56d03d66ab79bcc88d677db188d86cdf5fc3e0260a1402ca84f537ee9f29660059a108ed03e5f5cbbd9eca8765177b0c0d16180f WHIRLPOOL e37d122aa5c1753ae8c7a4f6a9e58df02f522868495449281bc92cbe8ef4b304be9e8e268e9b7791637c7f68e2a1ae7a6bbb8b9892d5631aa7bdf8ff89a35071
 DIST bifunctors-4.1.1.1.tar.gz 10310 SHA256 115fd3a4b592ec6de09c6e2311d365968e0e6669745a96943352357bbdc1612c SHA512 9d572f47bd574e7f740b1c2f12ff2c76439ec3b34657f57efba9f23abb5b42e38fdb77b8bfe20e8896f5a8bb2465fee7c02a1adaf7e02ea822b2660d2e7de278 WHIRLPOOL 5530a2eea3c9a171917d39fd7add11a3fd09d87825fb63a4468543d96da7a5ceeba146e68df5e1217ba90beb77ed49d8a1e654aa769bb626a42bbe14f621700e
 DIST bifunctors-4.1.1.tar.gz 8022 SHA256 9cb033e7078be4bfeeeb5851587aecf781287c286cf9d2528abe0f8b1db4ed2a SHA512 d7e1aa46c19b33a85d43e4c8814c064678d4c72c129fb3edcaba4e28e552fef36cb36c636df81013b55ba10b16dac9158367ab6a46b86d2fd2d2158390163467 WHIRLPOOL eda9c50f64faa7f3851e55fc6de48d8b7d954dc4d288855e85963a43b542a28d562d7e5f03b48a0d77af90e52d72680c8c94834fdb29f05731d3ba6c25f3164b
+DIST bifunctors-4.2.tar.gz 11357 SHA256 c661f4fc9a9f868309d30ad51dc2c803655f46cf722d5761166f2bb0b110b23f SHA512 f34d002e40b62b993b5e53892d9d04b0ea9fdca92b5e34fde317eca21dd8f63d47495ee2d8afd0409e81b1fe276c74b10e94d56533fb942ad1060c54b40b6ff6 WHIRLPOOL ec0b8184131056af82874b734aea59672d01b9c4ab34ee2fcf18560a03ffbd5dc71310e85609515901bd3de39600cc8e18eaf2610f5720033443956772903898
--- a/dev-haskell/bifunctors/bifunctors-4.2.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-4.2.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/bifunctors/bifunctors-4.2.ebuild,v 1.1 2014/12/14 08:38:42 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Bifunctors"
+HOMEPAGE="http://github.com/ekmett/bifunctors/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-5:=[profile?]
+	>=dev-haskell/semigroups-0.8.3.1:=[profile?]
+	>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
--- a/dev-haskell/cgi/Manifest
+++ b/dev-haskell/cgi/Manifest
@ -1,3 +1,4 @@
 DIST cgi-3001.1.8.3.tar.gz 21319 SHA256 c4e92212f55c89d59e3319d5bc7011e715aef1695525b77b38f468d731d84cdd SHA512 421ed1a7c7548f1785a693074807fab91cdf4c86b9085a0520b0ffc6127cf53b095dfc07e6f9ed65d475445a28e485ec219d742de369e6271c0c6fe5e7599957 WHIRLPOOL 0634c08ae1fa409cde4c7e95a62d9fefe531e56061101e8ec256bc5a4d7d227a2fb1a14e3b234f97d8448b130674d66b29d48242533441e190b7c87cdbecfae8
 DIST cgi-3001.1.8.4.tar.gz 21421 SHA256 f6d11fc59d1d3651d628bdf2b36c1a735c08334956701dec2d0f05d572b61ec0 SHA512 0ccbad2b1393cf4149c84eaf9d5601ce976998554cf9240a61a72348eee917869c7b1e00286b22dcac3280c79c551e2947c1040ddeac3c1ec91483dbe2c18ed0 WHIRLPOOL bb51330b2d30ddf2c82d4dc87a568234e23abe785f9a33513cd359a6e28cdedc374fb33da131458ecd53d515833f2fd160a62de0afb1f2068692e8e634764826
 DIST cgi-3001.1.8.5.tar.gz 21423 SHA256 46cfb262f95348e88629fe30a9a8319aec510601be3a550cfb02fb1267b2db39 SHA512 e8409f6fe09d789538a025cff1aa594b5206c75cd16a7e399914d83e42a2d1c09d5c18083d037c7c3e061518f49447aa8eb41ae7adabbd0663d00af420b677a2 WHIRLPOOL a637446f02b032f2b98c06f1f3f813e2222e7db82fc3790bb542f9fdfd445ac1b8755128e426061c95c6b00749a68642850d9c7ca84fb2617550202c209b8a07
+DIST cgi-3001.2.2.0.tar.gz 17184 SHA256 a9cbace379f7946ce5c5aefddfa7d823fb2e5f566aaa5c07a5066a10c18a817e SHA512 b6f5a9703fd903142c8b0a4f9d3fe47e3faf0b74bf8b61328e468cc236c91e77f6dce4e0f08486a496b67bfc70402080c78f3b238d5badfa7c1cfbf4488706e3 WHIRLPOOL 964601ff6beae2b3762fd73ba40ad8eb708ddf2785f4fb26c41cdf0e4afaf140f628e0c40d4d692435f3c1099b8aa8d35c160a99bd536937881a44d756ee6c2f
--- a/dev-haskell/cgi/cgi-3001.2.2.0.ebuild
+++ b/dev-haskell/cgi/cgi-3001.2.2.0.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cgi/cgi-3001.2.2.0.ebuild,v 1.1 2014/12/14 11:21:22 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND="<dev-haskell/exceptions-0.7:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
--- a/dev-haskell/cgi/metadata.xml
+++ b/dev-haskell/cgi/metadata.xml
@ -9,4 +9,7 @@
 		<flag name='extensible-exceptions-in-base'>Required to be
                enabled for >=dev-lang/ghc-7.</flag>
        </use>
+	<use>
+		<flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+	</use>
 </pkgmetadata>
--- a/dev-haskell/chasingbottoms/Manifest
+++ b/dev-haskell/chasingbottoms/Manifest
@ -1,3 +1,4 @@
 DIST ChasingBottoms-1.3.0.5.tar.gz 31053 SHA256 c0f770e7b06c8ffcc3d6ceedd2db96f6fee3c0ffeab5de2deda0de8798286c3c SHA512 e1a69ded02716f53b4985511ec09bca42eac25be5e0ee03255f50f89a806c2beeac74872014498be3f72e547486ef454210832e8788907c740ae27c3f9f1be70 WHIRLPOOL af6d8fdaf8dfa98eeb38df3a0bd583c1180a96ec02a6e08581b5917ad25d3ad40a4bbf562755f40e2902fa95c7c721a1117f5b731830d0b68fc4dbe3cdca54ac
 DIST ChasingBottoms-1.3.0.6.tar.gz 31042 SHA256 a8bfa717ff0bebfe1f78f4ffc3ebfe69b88aa86c090354210577e54f7db080d0 SHA512 d69f8a9d42d7e9bbfbd5d4d8ab4a23e3f025dafc27a2483e007e5e3fe41314f2885ec3fbafded9b5c10de5c996f2d68c71de75436c8bc7a754568ba2d029d0e6 WHIRLPOOL 81e232c7ae48f4cfd31de35d25efe16b46de2330b81987bbf7f965d76dc335acfcdc262dc3a6930c2005a5e76d034aa64aa2335a3a4313364c7e3108a07771c9
 DIST ChasingBottoms-1.3.0.7.tar.gz 31043 SHA256 ea7a507c552fe028bd43c588e89f29d5a5f140f16bf74596c647c42a9ae92b3c SHA512 707e0d1fe7979b75547ec87ee105526524458e0267355c1b0e06a7a1c2af1d07b385045deceaf2b28262e4e6dc445f013d2472444198cef046f664642629c0bb WHIRLPOOL e564d73025691c13481b9dc5b9cb47111689448eb8ab0095497c520017874b2f1e145ef50a92dfbe5ad74aa604247e275454c0c3c0518d5a7095561fa90348a8
+DIST ChasingBottoms-1.3.0.8.tar.gz 31261 SHA256 bb05710630f876767d79b684fd5f3fe59ea39c63e7bef4193c7ee8132479d2b8 SHA512 216df0e1037b4d95d1bc82e808fc017424d5e9268f311026e07b1abadabdbdac01e85d9fbccf371371998cf237ac3d1846ed2dd619f719ad840d7ffb2e17c90e WHIRLPOOL fc0179f3324ae7914ae6a33cfb3110e79cdf637da47075a02fb573a59273640e95bd2ea58a43250a6ce9e7a6dbc2aa3c2700e16e55d1c3500938bbd08d6405d3
--- a/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.8-r1.ebuild
+++ b/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.8-r1.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/chasingbottoms/chasingbottoms-1.3.0.8-r1.ebuild,v 1.1 2014/12/14 11:37:01 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.2.9999
+#hackport: flags: -build-tests
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="ChasingBottoms"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="For testing partial and infinite values"
+HOMEPAGE="http://hackage.haskell.org/package/ChasingBottoms"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/quickcheck-2.1:2=[profile?] <dev-haskell/quickcheck-2.8:2=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/syb-0.1.0.2:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cabal_chdeps \
+		'random == 1.0.*' 'random >= 1.0 && < 1.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-build-tests
+}
--- a/dev-haskell/cipher-aes/Manifest
+++ b/dev-haskell/cipher-aes/Manifest
@ -2,3 +2,4 @@ DIST cipher-aes-0.1.8.tar.gz 27629 SHA256 ae87a9f7cd198745a931a8285a3681fdc42216
 DIST cipher-aes-0.2.5.tar.gz 29934 SHA256 631959ec33a333d6e8f9c346f1a58f8449c17fddd1df5652b9dd5a615dbbdeab SHA512 61a3ebcf02c9a6bb2a6ad0386414003922355bc76cdce7df915c2fe98fc1a647cf8a0a950155482564b8310c76b7b0612320e8c586c1dc08be27317dd80537e7 WHIRLPOOL e374607265a0731b0005ffe231b18c7f2410a6b5b521429172723036d06876ecaad311f1ceaad22f110ad2606f9235805c564a22f9115dd95debcbf09faf03fe
 DIST cipher-aes-0.2.6.tar.gz 30101 SHA256 7174d42e65fd4a12b4d4e7ff70ed664d8a455d809a7d9e263999f35b7850457b SHA512 31bac255b7f06b65d3351fcfb583d20cc7184aef307925617e2ce0671455d1a077f1373fa31193161dc394abbb8d3a1383ff9d74f980c34a521a6a7f60fa8a11 WHIRLPOOL 5169f9c74bf9ec9832e5d06af9e0bf2890dd43ad61a6b6786b7b39191bd15db8d8e57a44f0657ffd2bc69760f00cf30a5dd81eb2cab3e1018886dd57b8c2bbc1
 DIST cipher-aes-0.2.7.tar.gz 32376 SHA256 d72796322a4968a5efa3282db24bda8f0095d08ca2dd48ff87b8cdec848fbba8 SHA512 c3d360407090fc9bb1f50c52af0b080633248f992636f5395d9d6a3dc18f3bbfb4e048cf1535e1555b2974e3d55cfcf6861e2d0b01eb9a57783785605abfa75e WHIRLPOOL 958e2d65143aa46c230d5fbbb4c102203ef33eadfb4a0238e266d31e55fa1a3d63bba94946b67bf5f955d8140dbb6621e6860f589a72ef7f005d6d61721234c2
+DIST cipher-aes-0.2.9.tar.gz 33331 SHA256 985aadac75ef93b0762682a7ab20382c7108788b8e822fa1fb24c09c2b8279da SHA512 e3cc41cccdd2d7b1cef887f4a7abf4a00ffb4f4a7fc344e535349f524621b78680599a76b19098ef5963b4500564ce61416a4132551c26b944c20edc8c4525ff WHIRLPOOL c9136d67e5cc285dddd35b9d14f3124a63ee1b7ac315d9a38bffec2e23f3149cf7e29f6ab8c481b86d8a9581ba637f5689e79c240e4a6a1b7ca4361704fb623c
--- a/dev-haskell/cipher-aes/cipher-aes-0.2.9.ebuild
+++ b/dev-haskell/cipher-aes/cipher-aes-0.2.9.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cipher-aes/cipher-aes-0.2.9.ebuild,v 1.1 2014/12/14 04:41:48 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Fast AES cipher implementation with advanced mode of operations"
+HOMEPAGE="http://github.com/vincenthz/hs-cipher-aes"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+support_aesni"
+
+RDEPEND="dev-haskell/byteable:=[profile?]
+	>=dev-haskell/crypto-cipher-types-0.0.6:=[profile?] <dev-haskell/crypto-cipher-types-0.1:=[profile?]
+	>=dev-haskell/securemem-0.1.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/crypto-cipher-tests-0.0.8
+		>=dev-haskell/quickcheck-2
+		>=dev-haskell/test-framework-0.3.3
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag support_aesni support_aesni)
+}
--- a/dev-haskell/cipher-aes/metadata.xml
+++ b/dev-haskell/cipher-aes/metadata.xml
@ -5,4 +5,7 @@
 	<longdescription>
 		Fast AES cipher implementation with advanced mode of operations
 	</longdescription>
+	<use>
+		<flag name="support_aesni">allow compilation with AESNI on system and architecture that supports it.</flag>
+	</use>
 </pkgmetadata>
--- a/dev-haskell/classy-prelude/Manifest
+++ b/dev-haskell/classy-prelude/Manifest
@ -1,3 +1,4 @@
+DIST classy-prelude-0.10.2.tar.gz 9730 SHA256 f3341ddb9a469f612263d94274144510209f16ed4d9ec709ad622f3d5f36015f SHA512 dd75cdc4cfc522c3c86191ef7495bebebb4ac4a33c5100f723d1d8c789167ef670bb789e2fdfe7c3cb412f54cb61c9e53955e0c4f149272cf9a92f7d9095c9ab WHIRLPOOL 6aab1bc583181588fedf4b0495a8a0bff7470ee3e331afecbc79421f77008f43478787ca1d77d479a83faaf8ce6f83a9411f2807f5f1697784ecc6b05f03619b
 DIST classy-prelude-0.5.8.tar.gz 16700 SHA256 399e0271089451384172ed1aac1be8892618a1642abfd075cd57abe9eae802fb SHA512 27b23aeae6f53f2bbf4c310c9b6f89a5e150a172f03afbc11aa5f3d4a7d3ff1edaa125e7f191f0fe394f1e01b37337a32304ca8a6c7ef6403c095826556f0996 WHIRLPOOL 303c93c08ada93b2e4f77bc4a96126e05786b26940131e7cd020633bd1544661802e0bd02694a956253bbd662fa6d7afdc324618bf08a643fe2753c269d7e40c
 DIST classy-prelude-0.5.9.tar.gz 17632 SHA256 c1b05889b48a2e15d300331d8a1dabdeb32690d51c986a3da7bd61ebc78d15e3 SHA512 4938b83b77923eec8a52a14d253a21800afbf83bf9413e11bebf963beaca11a520a7f9cefeb7827590e65d050df772222cbb004fa70e1b08767c7f4658980ea6 WHIRLPOOL ecd3fdf17803f073f28f43b3ed2828f5ee939fd647e9a1dc414412dfa2ccca43afbb85fe97f283e09dc8a8beae711b829f33e457de2d5f0a396b018603c742b0
 DIST classy-prelude-0.6.0.tar.gz 9852 SHA256 4616ceabdeac5a2c9b96074faf32d282c0306380a061c0ef5b1502fa44aefe72 SHA512 2903147a27c34c1c72022e61a89b26e8a64a4247af1c1ad0120434766c6a186c8e743794ce954519c5a6d8fabf98dbb02a584cbdf9325666af8c7c45e7eef877 WHIRLPOOL 45d297b4d12fd185d7fa6576c561cbf5e7b0cebcd5fa9424dac8471b3bec5e2fcab11d5e4e45b499cebfaff5674d9a37fc3583f522de3d57a0dd2f074305dde4
--- a/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild
+++ b/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/classy-prelude/classy-prelude-0.10.2.ebuild,v 1.1 2014/12/14 11:10:10 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="A typeclass-based Prelude"
+HOMEPAGE="https://github.com/snoyberg/classy-prelude"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/basic-prelude-0.3.10:=[profile?] <dev-haskell/basic-prelude-0.4:=[profile?]
+	dev-haskell/bifunctors:=[profile?]
+	dev-haskell/chunked-data:=[profile?]
+	dev-haskell/enclosed-exceptions:=[profile?]
+	>=dev-haskell/exceptions-0.5:=[profile?]
+	dev-haskell/hashable:=[profile?]
+	>=dev-haskell/lifted-base-0.2:=[profile?]
+	>=dev-haskell/mono-traversable-0.6.2:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/primitive:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	dev-haskell/stm:=[profile?]
+	>=dev-haskell/system-filepath-0.4:=[profile?] <dev-haskell/system-filepath-0.5:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	dev-haskell/vector-instances:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/quickcheck )
+"
--- a/dev-haskell/clientsession/Manifest
+++ b/dev-haskell/clientsession/Manifest
@ -1,2 +1,3 @@
 DIST clientsession-0.9.0.2.tar.gz 6988 SHA256 d18e6dfd562899f3e5cb833b26d3d3eea1baade3a1293539ba5b4d162d08836e SHA512 b6642e6072f6d4a2dcfa2136655cce0c34c9cae8ed3240448db5b0086f3b6a589e330d137878969a9dbcc4bd7b903d20e7d16de244a3d7d51d0cb7f0a72d5cab WHIRLPOOL 405357f72e5b866605d93b0eeeb84288ba99b79021f3ba43653a4f8b265e19819ccb8e75ff8caa08699d8c0c3493e5e8ea3d9802950871981b518dfe14196388
 DIST clientsession-0.9.0.3.tar.gz 7056 SHA256 6125864915adb324af897eb92245dd249002283d365fccaa69a53fd4b29ff570 SHA512 385037d0ea7fae62954c54a388da92188ced071b4cd83342d9961483a9fdec7a23925001ad91d4fe5ff00ef16cd1a2a634422c84f04f511e0f3214e12cccf525 WHIRLPOOL 216223133a002f5269f47267c795ef907c513b3018d116247bd56b7a536c5deff4bfa756cab4c2021ea9b31455204dc00acfd6497cf20517379c0495902e63ca
+DIST clientsession-0.9.1.1.tar.gz 7928 SHA256 c9563c0bcda1a02cfea2fd39aecec5b9f419901587287f05afdec1e683210022 SHA512 dae2c63fe20bfaf3b6521dbfb48d6b79254d5365903766e75406dec94325572c22dbf85cdbf9dc6abe6c6a7dc496436a5d46a16826036de71b2a5f58eec53e62 WHIRLPOOL 5a9d6b8f15210278c2479c44feeef648c814b32cb8ed1f528818f5a82358d1b01de4b4ac9669f6552260026a87b8c46b9794989a6b48683a568c3fbc3303a849
--- a/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild
+++ b/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/clientsession/clientsession-0.9.1.1.ebuild,v 1.1 2014/12/14 10:49:44 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Securely store session data in a client-side cookie"
+HOMEPAGE="http://github.com/yesodweb/clientsession/tree/master"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-haskell/base64-bytestring-0.1.1.1:=[profile?]
+	>=dev-haskell/cereal-0.3:=[profile?]
+	>=dev-haskell/cipher-aes-0.1.7:=[profile?]
+	>=dev-haskell/cprng-aes-0.2:=[profile?]
+	>=dev-haskell/crypto-api-0.8:=[profile?]
+	dev-haskell/crypto-random:=[profile?]
+	>=dev-haskell/entropy-0.2.1:=[profile?]
+	dev-haskell/setenv:=[profile?]
+	>=dev-haskell/skein-1.0:=[profile?] <dev-haskell/skein-1.1:=[profile?]
+	>=dev-haskell/tagged-0.1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2
+		dev-haskell/transformers )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag test test)
+}
--- a/dev-haskell/cmdargs/Manifest
+++ b/dev-haskell/cmdargs/Manifest
@ -1,2 +1,3 @@
+DIST cmdargs-0.10.12.tar.gz 63723 SHA256 5e66581205cb76a2621a7bf5cb42411a8cc1d37fe3b8a266803266c2991fb62b SHA512 0936fea732dc8771a54e3dce75e9068ebfd3ca8791f1bec8e0ce564c55973d93b91d98505bca2c7e5a9984b166f472deda3c71beeef92ce800acec5ac1584319 WHIRLPOOL a8fc831dca830634454d6e15436b3912ee64395add7e514b4441942f5de431ce9f4f2e30aeb5c375adb0e1d7d7f648570a8fb2b2da52742703bf92b54443636d
 DIST cmdargs-0.10.5.tar.gz 61293 SHA256 30b1dedebbcf3659fcf269b092129b07d04784ab33ef0498916afe6e78496004 SHA512 55bf57c25f63b9a70a54e99d4f170b53b0525043966801eb44b7becc4b99cfbfef0dd4a690339797c57f7970e5ae88953742810eac622360b3d2e6363e473ece WHIRLPOOL 21c4e29f16a7186d93d5f174eae3b056ffc18f2285ba86e46df6ca5c4c24e9c203790b248b27f862ac41874e41239f83c4bcec83d95744ec39c1c5c36672ce1c
 DIST cmdargs-0.10.7.tar.gz 61526 SHA256 d4dd12902a89c1d505fd25f49834ce7ae681461eebb6d779bd345abf8f901a56 SHA512 b9091e4f708db1e7c8bac367c4faad5c311a3194aefbf2776316b4ecc559314f01ceb0102df007819996b00200c5300e5b56e1035d45561e924bbfc3b38b656a WHIRLPOOL 5624e9672d28a2ac1805d5b28aed63aaaac9a4f1f97527a0f324e55f72e3c0e4409dda7daa42bee9afde9aa4ac4e0f874d17bacb3c28de2918b1969673d41767
--- a/dev-haskell/cmdargs/cmdargs-0.10.12.ebuild
+++ b/dev-haskell/cmdargs/cmdargs-0.10.12.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cmdargs/cmdargs-0.10.12.ebuild,v 1.1 2014/12/14 11:32:08 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Command line argument processing"
+HOMEPAGE="http://community.haskell.org/~ndm/cmdargs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+quotation testprog"
+
+RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag quotation quotation) \
+		$(cabal_flag testprog testprog)
+}
--- a/dev-haskell/comonad/Manifest
+++ b/dev-haskell/comonad/Manifest
@ -1,3 +1,4 @@
 DIST comonad-3.1.tar.gz 7769 SHA256 dbb32d7fb84dcfa5091d1d1b1bc9be0570118a45ebec9eed6ef2f21ddc58896a SHA512 5e14dec1fc229ac5cc6a69a86277eb22e08fe4035159fc95273dd6addd5e0f8fc54526c98668b2d12242a043c7c67d7f83718c75a9d961e9e1496add8136bd2f WHIRLPOOL f522e390a02c6091db52f63c9649792217103bc4aabfd4b3876de998a278402b94a956d8bad2b4aef821666795acdfbf2a9869a5ef4a470a9b69ebd9dfe38118
 DIST comonad-4.0.tar.gz 15014 SHA256 0ac661b2e3a2f7641179f70ac66151a3489b2f1149ae7be34c45d1e03be6a7b8 SHA512 2311c6db59dcd7a20190f925ded477412fa093d5cc43adaa1a7d2ca8174c919c73f7b78d53616da13dbe272817337826e168873acb37ff0df8e36655fbb2b47a WHIRLPOOL 0822856cfb18ec50decb17bc01ff4a486ba52aaf83d5ef3d019579d68dd81edda90be48ad7e4f54df77acd3e26f1fd01e6b4fd1e723890ed1edfaa6318396d12
+DIST comonad-4.2.2.tar.gz 15726 SHA256 4822281f025267480e03da26f9dcfeebffeb85e759861596b44d731981674e08 SHA512 d2322a429203c6923f038076c2e8696c56048727f5ffd74e9a3fb026dc6b76297e8d60b562f1d3e157d0280327d7cae41c36498abeeda5c8cf26bd87439d99bf WHIRLPOOL ffebbca5e9e74217f34d2bf734cd7af42dde1d5010a2598c83ee04c5958499d889272acff36c9b2bb47439184d3bc67408f9791f8065a3caa27fb323106f09f8
 DIST comonad-4.2.tar.gz 15399 SHA256 27eb521590d65fcfb149b8e051f50fd6ee4696ffefcbe88dd40539e7647d2d98 SHA512 db1dd8966dfbc2d747646f54c206d8e450f8e5326c452e89710e18580c84a633a6d12eab1fb09bebb501c347b0e36b2962c6fc7ed61e564b3ff805803aa6ef1f WHIRLPOOL 309d6f806ad170786f2d34b1ce9c0dfcf63abbabb3b73c9ce0b6094270f90494adf4fb44c2f4348afaf3feab830d9488abd5a6659d3a3349fde32cf844d0e2ff
--- a/dev-haskell/comonad/comonad-4.2.2.ebuild
+++ b/dev-haskell/comonad/comonad-4.2.2.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/comonad/comonad-4.2.2.ebuild,v 1.1 2014/12/14 08:40:30 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Comonads"
+HOMEPAGE="http://github.com/ekmett/comonad/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+containers +contravariant +distributive +test-doctests"
+
+RDEPEND=">=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/tagged-0.1:=[profile?] <dev-haskell/tagged-1:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	contravariant? ( >=dev-haskell/contravariant-0.2.0.1:=[profile?] <dev-haskell/contravariant-2:=[profile?] )
+	distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( test-doctests? ( >=dev-haskell/doctest-0.9.10 ) )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag containers containers) \
+		$(cabal_flag contravariant contravariant) \
+		$(cabal_flag distributive distributive) \
+		$(cabal_flag test-doctests test-doctests)
+}
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@ -7,5 +7,16 @@
 	</longdescription>
 <use>
  <flag name='test-doctests'>Run the doctests test suite</flag>
+  <flag name='containers'>You can disable the use of the `containers` package
+  using `-f-containers`. Disabing this is an unsupported configuration, but it
+  may be useful for accelerating builds in sandboxes for expert users.</flag>
+  <flag name='contravariant'>You can disable the use of the `contravariant`
+  package using `-f-contravariant`. Disabling this is an unsupported
+  configuration, but it may be useful for accelerating builds in sandboxes for
+  expert users. If disabled we will not supply instances of `Contravariant`</flag>
+  <flag name='distributive'>You can disable the use of the `distributive`
+  package using `-f-distributive`. Disabling this is an unsupported
+  configuration, but it may be useful for accelerating builds in sandboxes for
+  expert users. If disabled we will not supply instances of `Distributive`</flag>
 </use>
 </pkgmetadata>
--- a/dev-haskell/concurrent-extra/Manifest
+++ b/dev-haskell/concurrent-extra/Manifest
@ -1,2 +1,3 @@
 DIST concurrent-extra-0.7.0.6.tar.gz 16447 SHA256 11a1b241b6be6502af86b30a060218fb6776d636dc11399bc742f837a141988b SHA512 77e01122b4659cb131af596da6b4638d34365f3be901b46adb1e7ffcb9d218727feead51b107df0418e1f929eced5aea0ce412ff59ffae3bb6b5d50215b277cf WHIRLPOOL d3f28b42dc115b5607b02b9235b8ec4221e59734a9cb6981fbd1fd662c72d70776df9e2cf4a533c373eeaa11b446c8c3e0111ede89ba6f241f9b056f13088016
 DIST concurrent-extra-0.7.0.8.tar.gz 16646 SHA256 78203bfb522583ebdc2ea6c8708049b83710935dbdfe916576dbeea9283fd660 SHA512 f34a7dddfdd282c72449ff53394977a118bb24b58c84d6e784f117037bce0d36c8fffd790abcece0976e0d29a8613fa85163ce2b740909aadf7afe04ce8fe734 WHIRLPOOL fe6689127705b77db2ad86ff4b85924890c3192743f74a5ac59ad6f0f5d71360fd45eb9d18b0c955af3994e7826b72922ac4fc4d37ac5b883b60f09917f15f76
+DIST concurrent-extra-0.7.0.9.tar.gz 16209 SHA256 5c8535c5155c747fdc04fcf731da3ccad6236e49295e6fcbad102e9b17a878a5 SHA512 2ccdb2ceaffed411b6e8b1723ff4c0d489425a83b9237b7397553e78bea6702cf2bf8b7d96d24c285337a8768b0859a7c45442cb55f3a3f59d4ecba228bead72 WHIRLPOOL f83640847825f779dafbe2459a6291e849f440d90b62437f43ccb105faf6af877b0b5ae7e02dd9007697c2d48a638b28c008ac08ff10f3047cbe76e53aae872b
--- a/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.9.ebuild
+++ b/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.9.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/concurrent-extra/concurrent-extra-0.7.0.9.ebuild,v 1.1 2014/12/14 08:42:49 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Extra concurrency primitives"
+HOMEPAGE="https://github.com/basvandijk/concurrent-extra"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.5:=[profile?]
+	>=dev-haskell/unbounded-delays-0.1:=[profile?] <dev-haskell/unbounded-delays-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/async-2.0 <dev-haskell/async-2.1
+		>=dev-haskell/hunit-1.2.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/random-1.0 <dev-haskell/random-1.2
+		>=dev-haskell/test-framework-0.2.4 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2.4 <dev-haskell/test-framework-hunit-0.4 )
+"
--- a/dev-haskell/configfile/Manifest
+++ b/dev-haskell/configfile/Manifest
@ -1,2 +1,3 @@
 DIST ConfigFile-1.1.1.tar.gz 28269 SHA256 55067e4b6d5f532d6e28c739869742a011490905e24894da9015368aed825e70 SHA512 2c8cb8fe633521999416946379c03b8e169d46cfe430701d5c723faa65917df47fd9753098e575157b036d208ca91b3eec8f4eeaeaaf4152dbebb9356ba8eb95 WHIRLPOOL 571a395902536064ed604da3cabf9d3d4d9e2aeb1cc3b5b25e2cc67170e9eb94c4efe6715ca527ea3f5f97cd108415a6d24e8dbffbc0bc89ce31abfead148069
 DIST ConfigFile-1.1.2.tar.gz 28947 SHA256 38f6df24926c4952af198cbc9e45e72a62af73adeef097767889e9321bca2d76 SHA512 4bfc196d1cf2083bcd6313828efee53a971b0a08e25f44efa1427a27890358916daa42ae2db9996e65c802119c99e60eafdc1ca0ebcf9fcfafd72d9aee065c55 WHIRLPOOL 1ff963f9139665a13d581824b274c6d329daddbdb3c39876a7aef26eefd99c27d80d204571eb00a4107faa2adcb81a785e7f649d21ac570643fbafbbbc000ec7
+DIST ConfigFile-1.1.4.tar.gz 28969 SHA256 ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514 SHA512 4455110c95172461b2d82ae88ba4f386d5e49ddd7f7def83714d2f6198090f0d121166eece3efa735341da9bbc0029e704be00d3e671d24ad27e838dfe913776 WHIRLPOOL 85c80d4dead287db46ca251cd4f49ad5bb3fa0df08d0ebee5f113aa8fa0f9a09f395a3b2c3a43a97517a3201df9c443f1f4cabf45f7e71b8c9f92db7fbbf3214
--- a/dev-haskell/configfile/configfile-1.1.4.ebuild
+++ b/dev-haskell/configfile/configfile-1.1.4.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/configfile/configfile-1.1.4.ebuild,v 1.1 2014/12/14 10:50:48 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="ConfigFile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Configuration file reading & writing"
+HOMEPAGE="http://software.complete.org/configfile"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="buildtests"
+
+RDEPEND=">=dev-haskell/missingh-1.0.0:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	buildtests? ( dev-haskell/hunit:=[profile?]
+			dev-haskell/testpack:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2.3
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag buildtests buildtests)
+}
--- a/dev-haskell/contravariant/Manifest
+++ b/dev-haskell/contravariant/Manifest
@ -1,2 +1,3 @@
 DIST contravariant-0.4.4.tar.gz 4901 SHA256 441f943f6339a44b2fc9fb04ddd5f4c5210014470ce57c3271797b76b91084ac SHA512 a54c37a371ce5347ae1df789e15a853e0da9e4e9a4006fe77f00f50cda5e92e72da7daf664be8a0a14422dbeb3e3849aae237b5dcd54904e4eee90086a81eaba WHIRLPOOL 13a277e9fe4979bcd59c4f65288d5e76defbedbdb2ed3e530b6c8b8f559303b3cc2c1ee8ed20f1fd311671404acb5492a5b133b31d6b891af765397dc5044b56
 DIST contravariant-0.6.tar.gz 5489 SHA256 3067376572f1f92fa4b660036eb6674b7618815fcfc105b0b845f00b85e5330c SHA512 f10e93fc69ef26dfde15ae39fe3ff7e466c2b67161604f134b9bede7d18f5032efc3df57c4e78bae3a444bdd19cc4518a987d108fc6a318e934939e15176a7aa WHIRLPOOL 2a6f95647dfb1aabc42a541154a44b5b666f47be347f85ebbd5e88eb8c407f5cdccbbc2bf84c442bf6cd2ab2c8fe875d37bb72f1701fc8b8f1ac4b6728f7990a
+DIST contravariant-1.2.tar.gz 6574 SHA256 0ed101054717ccc031337626317eb262f9f8e75103a5f4f19688bcd8c74af33f SHA512 3b7e34e3b62c761fd569bbfc7ef25cd879c22e5da39e7f21172ede15cd31676e63cb93b46c320dbcee5fa0145ffcd6829b4b9806831a78a5c090797718d2adb2 WHIRLPOOL 7a8cb9e8e8216a84d4ac730fb69bac68a2e06d8bdf76ae54bd1088b0f5cadaeb9eac0fd6de93321c70d21f385b50427729c9aa116b899409c7db896267295198
--- a/dev-haskell/contravariant/contravariant-1.2.ebuild
+++ b/dev-haskell/contravariant/contravariant-1.2.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/contravariant/contravariant-1.2.ebuild,v 1.1 2014/12/14 08:41:54 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Contravariant functors"
+HOMEPAGE="http://github.com/ekmett/contravariant/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	>=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
--- a/dev-haskell/criterion/Manifest
+++ b/dev-haskell/criterion/Manifest
@ -2,3 +2,4 @@ DIST criterion-0.6.2.1.tar.gz 153292 SHA256 e59732cd1401b0201c032adc9a67c96ae855
 DIST criterion-0.8.0.0.tar.gz 155065 SHA256 6e9d9aad623a3dbe72288027b31ce8e275e52ea3753329ea234db7b8397d6417 SHA512 ca9dd3458e54885b58f61227b1d93bad1dacafdd47ee87ad4c062f2a68f60fc8284ef335c829d21212fcd350fc675eb6e94d41496b1949914c262cd391914c8f WHIRLPOOL c8c82da0cd0a8c9182c13fc740ea6ed8f72919237f7f9cc78b96b6260c4eed26b3f865d814383ff7c8dfbfbbe0923047eb025d28d4b7e097b22725f4eb7b8bee
 DIST criterion-0.8.0.1.tar.gz 155060 SHA256 58973dffe9dd6a284573332961064d6ef64dce19a4bb27c3d1f303eca3d29cb8 SHA512 24faec32c99d14db317d8695d819d6bdc2cf52b60e9ab5d3553af663311570c6e053fabef1c5161342a367859bf40222d350e957a6270adf728681f73e87174a WHIRLPOOL 5384cee0ca45fb8188ec85e4880774856cf5ead36cb5d57d1f0c3baa7ed50ec16c0c8aa50f49d0886a633d0c31e7d603f853fc596a65263e2ae7454900a90fbd
 DIST criterion-0.8.1.0.tar.gz 155095 SHA256 ed8b5950afb9b4b73204226aea5659e1dbd7bd2682131fa56da4412e54b5f97b SHA512 96dd101dfcbb4cfea446235137d163e9bb806b8dbc6ca7cdb19f380dc8c6ad0169f22b08acb638c0e731be659b1f761cc4f3d33154c5cda3f44bf6f854b1b485 WHIRLPOOL c3ee52b6397eaef7126b96e47a56bdc80a0b56ad48f4c4f6780d9b958e56b2e84c6ea937fe61ee9b2c7d96579fc18be34a91fbbc7b0b2fde6540867bf22a1737
+DIST criterion-1.0.2.0.tar.gz 1003368 SHA256 1de2f6c9975135959fd8948ad2889310e5d19a736f9051a48c0fec081359ac0a SHA512 35063822e12bca0b8ad41d2e6fd2c6ddfd58432467d9fee7ca537e03fb0100dcf6c11565abd21c11c0736bc0e2c9977f248a559eec7c8b049c27ff54ea58f01a WHIRLPOOL e1496674e68972d973b192d2b2d050797f0afeefcca5c1e89699a9d0f6b934282f819fc084241ad8d7d9460ebdfca62d4f1a8deeded8ef3fb7040b59455a8836
--- a/dev-haskell/criterion/criterion-1.0.2.0.ebuild
+++ b/dev-haskell/criterion/criterion-1.0.2.0.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/criterion/criterion-1.0.2.0.ebuild,v 1.1 2014/12/14 09:35:32 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Robust, reliable performance measurement and analysis"
+HOMEPAGE="http://www.serpentine.com/criterion"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
+	dev-haskell/ansi-wl-pprint:=[profile?]
+	>=dev-haskell/binary-0.5.1.0:=[profile?]
+	>=dev-haskell/cassava-0.3.0.0:=[profile?]
+	dev-haskell/either:=[profile?]
+	>=dev-haskell/glob-0.7.2:=[profile?]
+	>=dev-haskell/hastache-0.6.0:=[profile?]
+	>=dev-haskell/mtl-2:=[profile?]
+	>=dev-haskell/mwc-random-0.8.0.3:=[profile?]
+	>=dev-haskell/optparse-applicative-0.11:=[profile?]
+	>=dev-haskell/parsec-3.1.0:=[profile?]
+	>=dev-haskell/statistics-0.13.2.1:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?]
+	dev-haskell/transformers:=[profile?]
+	>=dev-haskell/vector-0.7.1:=[profile?]
+	>=dev-haskell/vector-algorithms-0.4:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.4
+		>=dev-haskell/test-framework-0.4
+		dev-haskell/test-framework-hunit
+		>=dev-haskell/test-framework-quickcheck2-0.2 )
+"
--- a/dev-haskell/crypto-conduit/Manifest
+++ b/dev-haskell/crypto-conduit/Manifest
@ -2,3 +2,4 @@ DIST crypto-conduit-0.5.2.1.tar.gz 6807 SHA256 1751a87c9eb12e14c761849944c45492f
 DIST crypto-conduit-0.5.2.2.tar.gz 6826 SHA256 62c21d0026057d8772a7c9d73c375ba0b00bcbd6ccd92d514075a84fb497c9a4 SHA512 e6c74f6d786d9dc7788058716263dc5b1913fb904c98835e75277bbd87ba5b3e6858cd94abc7ec032c946daf8b245733b0f90937d02bd6192e2ac5b79c1af92f WHIRLPOOL 9fef13284fd5439dd54b5d7e834ce1216f27deb678526f41fd0ee77664dce5dd47ec3c13610dbb4468a76aa6ed4ce60bba3f59c833b51d0f9166188046eabd5b
 DIST crypto-conduit-0.5.2.tar.gz 6809 SHA256 7f4d22462f0444eb2eec61b5f284309d0ab35a592f698f0f36b4dba444e69859 SHA512 8c7ca90b230ceb394aa5a11f33089a65d59d8505159dfcd6e8cb62f43ebfa234b4851de46c9a8e4d2e51e09162d1c4362e599abadb3c31140b36557768b257ad WHIRLPOOL dfde6242f2f2937b063df52ba5b6a4976fd284ec0970ab0b5f3a1ca7b8c6940ab180e3129bd9c2e32d25f9ae0878fb7f7b35c65f6a01400edbc40f8a58792b82
 DIST crypto-conduit-0.5.3.tar.gz 6886 SHA256 f435037553dc06fe091387414c1053377cec60ac428b13be7f1467d2f87472f7 SHA512 a45c068f04205ae2a8aead2da22475c748a10faa98cb40c378e652dc879d29fb6a2352d7e5b5acc997e4f04118ac866b085f176b00bcff20da282743f8c06d6e WHIRLPOOL 470cffac7505b0c8d097221e8a303bfbca404d5272562c80c025f4106b6b4223f39d25d2345b066549eef82ae90a353c17063699274b6e96a216a943958a0580
+DIST crypto-conduit-0.5.5.tar.gz 6883 SHA256 ced360b56aba0d669e11af90fa603e68911e802f0e7d44750d5dcc3c64d5a47d SHA512 4fb9df7a5434af1c3bf48e5649b4dc56ee07d03f4f00647adfc61eaf1a0c54326f7374e27717b92106f34435c5ba38eeb7b23082e9095dfbaf131598a8791887 WHIRLPOOL e3d7d03b13e23cf7595ed9a4f2d9efab3c59296a9737ad25b92860894c54729cb1baf53a3ba56258e203309d8a2e6d4bcadaec6a72095fc43be91996ece12941
--- a/dev-haskell/crypto-conduit/crypto-conduit-0.5.5.ebuild
+++ b/dev-haskell/crypto-conduit/crypto-conduit-0.5.5.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/crypto-conduit/crypto-conduit-0.5.5.ebuild,v 1.1 2014/12/14 10:52:01 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+#hackport: flags: -old-crypto-api
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conduit interface for cryptographic operations (from crypto-api)"
+HOMEPAGE="https://github.com/prowdsponsor/crypto-conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+conduit11"
+
+RDEPEND=">=dev-haskell/cereal-0.3:=[profile?] <dev-haskell/cereal-0.5:=[profile?]
+	>=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+	>=dev-haskell/crypto-api-0.9:=[profile?] <dev-haskell/crypto-api-0.14:=[profile?]
+	dev-haskell/resourcet:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	conduit11? ( >=dev-haskell/conduit-extra-1.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/crypto-api-0.13
+		>=dev-haskell/cryptocipher-0.4
+		>=dev-haskell/cryptohash-cryptoapi-0.1
+		>=dev-haskell/hspec-1.3
+		>=dev-haskell/skein-0.1 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag conduit11 conduit11) \
+		--flag=-old-crypto-api
+}
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@ -3,3 +3,4 @@ DIST DAV-0.5.1.tar.gz 18657 SHA256 5253e1ba8a29ed3d7bbec7f33eb6d8e65b9056c217126
 DIST DAV-0.6.1.tar.gz 19610 SHA256 ff758b4af16dade33f7196a2d6ac9cb98848c17ec9688c03a196b3f4cb770249 SHA512 0cca59bc6607927e80554c3edab1759b98993658da41c1d213828b14cae389026349d07c72a9bc3d4808f76946631c37fe1af2ebe02194684117f2ba0c17810e WHIRLPOOL 27c7cbbf8d3c52c0ebfea69c446b6417b24aad83d19c9296ed9358748a9dbadd114b9d4e5a242b5f1a54c8a38d0aafcaf7fa77faa54a641c8650fddd60562bf0
 DIST DAV-0.6.2.tar.gz 19039 SHA256 345f868e9b1e17532be0dbf756ec10056996d15b2074258de4f36497419596aa SHA512 2342bd0d1bca3e0fcbe459ad1dda74265e728d2524781989165895ae49b610c5ce96576968555b5d9d049157553684539fc4cbfcf4527dd231bef13855d47ad3 WHIRLPOOL 49fc8158118b0246b58595592a1c5ea465b216ec060048aeeeda8e333ce568e043d2db37f16ae0ce7765dbb858b86a49b5dd481b8c3d287222a9693d3b5d1bc4
 DIST DAV-1.0.1.tar.gz 20133 SHA256 938cb0beeecc1eaf8a844ba7191e749b7664fdfb0415d5ccae71fa56223c1f49 SHA512 445db35ecf4b4b7f1c9641197203386f3b8e42568bb60ed215151abe7eed1ba4ce636d697265db32afc19dcf29008d62aa44a74f108446135a3c1cc3eb749661 WHIRLPOOL d43e9552466df093f74f3030b4a43872f4d4877c1965eedb094eec0721333a42c5aef24e238ab47d17d8f18168567e06e00af1423a54c0426c21a8b1c57cf5fa
+DIST DAV-1.0.3.tar.gz 20219 SHA256 cd2b2666cde0b9b33918dc3044432f5cd6500e44aadec049fc5969325b1e3af3 SHA512 64c2a64b57a5c3b2943c18bff755324a8c03320502f37eba5db1ef8e55f6fd26dd6792288268ae5d41787f435f42c566550078f388546ec7732630ac666da6f3 WHIRLPOOL 803734d02a096562e24d4f25d59a52f5470ce66393055e5ed268f4f7dd17e2a9bd6d55041f6823716c5c9d22b383aeb34cf6c095366294df2caaf84d4a05a40e
--- a/dev-haskell/dav/dav-1.0.3.ebuild
+++ b/dev-haskell/dav/dav-1.0.3.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dav/dav-1.0.3.ebuild,v 1.1 2014/12/14 11:06:47 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="DAV"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="RFC 4918 WebDAV support"
+HOMEPAGE="http://floss.scru.org/hDAV"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
+	dev-haskell/data-default:=[profile?]
+	>=dev-haskell/either-4.3:=[profile?]
+	dev-haskell/errors:=[profile?]
+	dev-haskell/exceptions:=[profile?]
+	>=dev-haskell/http-client-0.2:=[profile?]
+	>=dev-haskell/http-client-tls-0.2:=[profile?]
+	>=dev-haskell/http-types-0.7:=[profile?]
+	>=dev-haskell/lens-3.0:=[profile?]
+	>=dev-haskell/mtl-2.1:=[profile?]
+	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
+	>=dev-haskell/transformers-0.3:=[profile?]
+	dev-haskell/transformers-base:=[profile?]
+	dev-haskell/utf8-string:=[profile?]
+	>=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
+	>=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
--- a/Show More
+++ b/Show More