Sync with portage [Fri Aug 14 09:38:54 MSK 2015].

app-admin/augeas/augeas-0.10.0-r1.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://augeas.net/download/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="static-libs test"
-
-RDEPEND="
-	dev-libs/libxml2
-	sys-libs/readline"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gets.patch
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-test2.patch
-	"${FILESDIR}"/${P}-libxml2-pkgconfig.patch
-	)
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# Needs to implemented
-	local myeconfargs=( --without-selinux )
-	autotools-utils_src_configure
-}
-
-AUTOTOOLS_IN_SOURCE_BUILD=1

app-admin/augeas/augeas-0.10.0.ebuild

@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="A library for changing configuration files"
-HOMEPAGE="http://augeas.net/"
-SRC_URI="http://augeas.net/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
-IUSE="static-libs test"
-
-RDEPEND="sys-libs/readline
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=app-doc/NaturalDocs-1.40
-	test? ( dev-lang/ruby )"
-
-src_prepare() {
-	if [ -f /usr/share/NaturalDocs/Config/Languages.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Languages.txt
-	fi
-	if [ -f /usr/share/NaturalDocs/Config/Topics.txt ] ; then
-		addwrite /usr/share/NaturalDocs/Config/Topics.txt
-	fi
-}
-
-src_configure() {
-	econf $(use_enable static-libs static) || die
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-
-	dodoc AUTHORS ChangeLog README NEWS
-}

app-admin/glance/files/cve-2015-5163-stable-kilo.patch

@@ -0,0 +1,260 @@
+From eb99e45829a1b4c93db5692bdbf636a86faa56c4 Mon Sep 17 00:00:00 2001
+From: Flavio Percoco <flaper87@gmail.com>
+Date: Thu, 9 Jul 2015 14:44:04 +0200
+Subject: Don't import files with backed files
+
+There's a security issue where it'd be possible to import images with
+backed files using the task engine and then use/convert those to access
+system files or any other file in the system. An example of an attack
+would be to import an image with a backing file pointing to
+`/etc/passwd`, then convert it to raw and download the generated image.
+
+This patch forbids importing files with baking files entirely. It does
+that in the `_ImportToFS` task, which is the one that imports the image
+locally to then execute other tasks on it. It's not necessary for the
+`_ImportToStore` task because other tasks won't be executed when the
+image is imported in the final store.
+
+Change-Id: I35f43c3b3f326942fb53b7dadb94700ac4513494
+Closes-bug: #1471912
+(cherry picked from commit d529863a1e8d2307526bdb395b4aebe97f81603d)
+
+diff --git a/glance/async/flows/base_import.py b/glance/async/flows/base_import.py
+index 7656bde..d216aa8 100644
+--- a/glance/async/flows/base_import.py
++++ b/glance/async/flows/base_import.py
+@@ -13,12 +13,15 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
++import json
+ import logging
+ import os
+ 
+ import glance_store as store_api
+ from glance_store import backend
++from oslo_concurrency import processutils as putils
+ from oslo_config import cfg
++from oslo_utils import excutils
+ import six
+ from stevedore import named
+ from taskflow.patterns import linear_flow as lf
+@@ -146,6 +149,29 @@ class _ImportToFS(task.Task):
+         data = script_utils.get_image_data_iter(self.uri)
+ 
+         path = self.store.add(image_id, data, 0, context=None)[0]
++
++        try:
++            # NOTE(flaper87): Consider moving this code to a common
++            # place that other tasks can consume as well.
++            stdout, stderr = putils.trycmd('qemu-img', 'info',
++                                           '--output=json', path,
++                                           log_errors=putils.LOG_ALL_ERRORS)
++        except OSError as exc:
++            with excutils.save_and_reraise_exception():
++                msg = (_LE('Failed to execute security checks on the image '
++                           '%(task_id)s: %(exc)s') %
++                       {'task_id': self.task_id, 'exc': exc.message})
++                LOG.error(msg)
++
++        metadata = json.loads(stdout)
++
++        backing_file = metadata.get('backing-filename')
++        if backing_file is not None:
++            msg = _("File %(path)s has invalid backing file "
++                    "%(bfile)s, aborting.") % {'path': path,
++                                               'bfile': backing_file}
++            raise RuntimeError(msg)
++
+         return path
+ 
+     def revert(self, image_id, result=None, **kwargs):
+diff --git a/glance/tests/unit/async/flows/test_import.py b/glance/tests/unit/async/flows/test_import.py
+index 70f790c..4cf3d13 100644
+--- a/glance/tests/unit/async/flows/test_import.py
++++ b/glance/tests/unit/async/flows/test_import.py
+@@ -13,14 +13,17 @@
+ #    License for the specific language governing permissions and limitations
+ #    under the License.
+ 
++import json
+ import mock
+ import os
+ import urllib2
+ 
+ import glance_store
++from oslo_concurrency import processutils as putils
+ from oslo_config import cfg
+ from six.moves import cStringIO
+ from taskflow import task
++from taskflow.types import failure
+ 
+ import glance.async.flows.base_import as import_flow
+ from glance.async import taskflow_executor
+@@ -106,16 +109,23 @@ class TestImportTask(test_utils.BaseTestCase):
+ 
+         with mock.patch.object(script_utils, 'get_image_data_iter') as dmock:
+             dmock.return_value = cStringIO("TEST_IMAGE")
+-            executor.begin_processing(self.task.task_id)
+-            image_path = os.path.join(self.test_dir, self.image.image_id)
+-            tmp_image_path = os.path.join(self.work_dir,
+-                                          "%s.tasks_import" % image_path)
+-            self.assertFalse(os.path.exists(tmp_image_path))
+-            self.assertTrue(os.path.exists(image_path))
+-            self.assertEqual(1, len(list(self.image.locations)))
+-            self.assertEqual("file://%s/%s" % (self.test_dir,
+-                                               self.image.image_id),
+-                             self.image.locations[0]['url'])
++
++            with mock.patch.object(putils, 'trycmd') as tmock:
++                tmock.return_value = (json.dumps({
++                    'format': 'qcow2',
++                }), None)
++
++                executor.begin_processing(self.task.task_id)
++                image_path = os.path.join(self.test_dir, self.image.image_id)
++                tmp_image_path = os.path.join(self.work_dir,
++                                              "%s.tasks_import" % image_path)
++
++                self.assertFalse(os.path.exists(tmp_image_path))
++                self.assertTrue(os.path.exists(image_path))
++                self.assertEqual(1, len(list(self.image.locations)))
++                self.assertEqual("file://%s/%s" % (self.test_dir,
++                                                   self.image.image_id),
++                                 self.image.locations[0]['url'])
+ 
+     def test_import_flow_missing_work_dir(self):
+         self.config(engine_mode='serial', group='taskflow_executor')
+@@ -151,6 +161,54 @@ class TestImportTask(test_utils.BaseTestCase):
+                 self.assertFalse(os.path.exists(tmp_image_path))
+                 self.assertTrue(os.path.exists(image_path))
+ 
++    def test_import_flow_backed_file_import_to_fs(self):
++        self.config(engine_mode='serial', group='taskflow_executor')
++
++        img_factory = mock.MagicMock()
++
++        executor = taskflow_executor.TaskExecutor(
++            self.context,
++            self.task_repo,
++            self.img_repo,
++            img_factory)
++
++        self.task_repo.get.return_value = self.task
++
++        def create_image(*args, **kwargs):
++            kwargs['image_id'] = UUID1
++            return self.img_factory.new_image(*args, **kwargs)
++
++        self.img_repo.get.return_value = self.image
++        img_factory.new_image.side_effect = create_image
++
++        with mock.patch.object(script_utils, 'get_image_data_iter') as dmock:
++            dmock.return_value = cStringIO("TEST_IMAGE")
++
++            with mock.patch.object(putils, 'trycmd') as tmock:
++                tmock.return_value = (json.dumps({
++                    'backing-filename': '/etc/password'
++                }), None)
++
++                with mock.patch.object(import_flow._ImportToFS,
++                                       'revert') as rmock:
++                    self.assertRaises(RuntimeError,
++                                      executor.begin_processing,
++                                      self.task.task_id)
++                    self.assertTrue(rmock.called)
++                    self.assertIsInstance(rmock.call_args[1]['result'],
++                                          failure.Failure)
++
++                    image_path = os.path.join(self.test_dir,
++                                              self.image.image_id)
++
++                    fname = "%s.tasks_import" % image_path
++                    tmp_image_path = os.path.join(self.work_dir, fname)
++
++                    self.assertFalse(os.path.exists(tmp_image_path))
++                    # Note(sabari): The image should not have been uploaded to
++                    # the store as the flow failed before ImportToStore Task.
++                    self.assertFalse(os.path.exists(image_path))
++
+     def test_import_flow_revert(self):
+         self.config(engine_mode='serial',
+                     group='taskflow_executor')
+@@ -175,20 +233,31 @@ class TestImportTask(test_utils.BaseTestCase):
+         with mock.patch.object(script_utils, 'get_image_data_iter') as dmock:
+             dmock.return_value = cStringIO("TEST_IMAGE")
+ 
+-            with mock.patch.object(import_flow, "_get_import_flows") as imock:
+-                imock.return_value = (x for x in [_ErrorTask()])
+-                self.assertRaises(RuntimeError,
+-                                  executor.begin_processing, self.task.task_id)
+-                image_path = os.path.join(self.test_dir, self.image.image_id)
+-                tmp_image_path = os.path.join(self.work_dir,
+-                                              "%s.tasks_import" % image_path)
+-                self.assertFalse(os.path.exists(tmp_image_path))
+-
+-                # NOTE(flaper87): Eventually, we want this to be assertTrue.
+-                # The current issue is there's no way to tell taskflow to
+-                # continue on failures. That is, revert the subflow but keep
+-                # executing the parent flow. Under discussion/development.
+-                self.assertFalse(os.path.exists(image_path))
++            with mock.patch.object(putils, 'trycmd') as tmock:
++                tmock.return_value = (json.dumps({
++                    'format': 'qcow2',
++                }), None)
++
++                with mock.patch.object(import_flow,
++                                       "_get_import_flows") as imock:
++                    imock.return_value = (x for x in [_ErrorTask()])
++                    self.assertRaises(RuntimeError,
++                                      executor.begin_processing,
++                                      self.task.task_id)
++
++                    image_path = os.path.join(self.test_dir,
++                                              self.image.image_id)
++                    tmp_image_path = os.path.join(self.work_dir,
++                                                  ("%s.tasks_import" %
++                                                   image_path))
++                    self.assertFalse(os.path.exists(tmp_image_path))
++
++                    # NOTE(flaper87): Eventually, we want this to be assertTrue
++                    # The current issue is there's no way to tell taskflow to
++                    # continue on failures. That is, revert the subflow but
++                    # keep executing the parent flow. Under
++                    # discussion/development.
++                    self.assertFalse(os.path.exists(image_path))
+ 
+     def test_import_flow_no_import_flows(self):
+         self.config(engine_mode='serial',
+@@ -271,15 +340,20 @@ class TestImportTask(test_utils.BaseTestCase):
+         with mock.patch.object(script_utils, 'get_image_data_iter') as dmock:
+             dmock.return_value = "test"
+ 
+-            image_id = UUID1
+-            path = import_fs.execute(image_id)
+-            reader, size = glance_store.get_from_backend(path)
+-            self.assertEqual(4, size)
+-            self.assertEqual(dmock.return_value, "".join(reader))
++            with mock.patch.object(putils, 'trycmd') as tmock:
++                tmock.return_value = (json.dumps({
++                    'format': 'qcow2',
++                }), None)
++
++                image_id = UUID1
++                path = import_fs.execute(image_id)
++                reader, size = glance_store.get_from_backend(path)
++                self.assertEqual(4, size)
++                self.assertEqual(dmock.return_value, "".join(reader))
+ 
+-            image_path = os.path.join(self.work_dir, image_id)
+-            tmp_image_path = os.path.join(self.work_dir, image_path)
+-            self.assertTrue(os.path.exists(tmp_image_path))
++                image_path = os.path.join(self.work_dir, image_id)
++                tmp_image_path = os.path.join(self.work_dir, image_path)
++                self.assertTrue(os.path.exists(tmp_image_path))
+ 
+     def test_delete_from_fs(self):
+         delete_fs = import_flow._DeleteFromFS(self.task.task_id,
+-- 
+cgit v0.10.2
+

app-admin/glance/glance-2015.1.1-r1.ebuild

@@ -137,6 +137,7 @@ RDEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}/cve-2015-5163-stable-kilo.patch"
 )
 
 pkg_setup() {

app-crypt/gnupg/Manifest

@@ -3,3 +3,4 @@ DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea
 DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
 DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
 DIST gnupg-2.1.6.tar.bz2 4917722 SHA256 5e599ad542199f3bd733eed2b88a539d1b4c3beda2dbab0ff69f1896f52e92fd SHA512 ae8aafe770336c83badf5610fe37f4ddc488786e3604780627893b636161d8407f3fd782538799e2b2a02e31c97468464372017fa52b5d9ed1bd31c85d9b3763 WHIRLPOOL 2136c526242a4e741c0cbc9aec102ba634234efd679d62db9aae3b2ab8fe9f8ad9b8fdb7d1f2d43982e6a072d5f5072d0744d8bb434d61f49ff24e868c902f80
+DIST gnupg-2.1.7.tar.bz2 4918583 SHA256 c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e SHA512 7c3efb9bd5d1509a9b2a6264293542b3d5db979bf443754f96d77322a96e18cba2ac6142665459d161eb7222fae44ce5b89eff88dca1c7abf47449fcafd3eb00 WHIRLPOOL da7ef3a02b186736c8d105ca627d2c889781465ecfdb4c4861f8af748a7d68a7c05a106c73bdfe44e7037807deb822c231d615cc1e1fcdd9b01e7632945ac094

app-crypt/gnupg/gnupg-2.1.7.ebuild

@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="http://www.gnupg.org/"
+MY_P="${P/_/-}"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
+
+COMMON_DEPEND_LIBS="
+	dev-libs/npth
+	>=dev-libs/libassuan-2
+	>=dev-libs/libgcrypt-1.6.2
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libksba-1.0.7
+	>=net-misc/curl-7.10
+	gnutls? ( >=net-libs/gnutls-3.0 )
+	sys-libs/zlib
+	ldap? ( net-nds/openldap )
+	bzip2? ( app-arch/bzip2 )
+	readline? ( sys-libs/readline:= )
+	smartcard? ( usb? ( virtual/libusb:0 ) )
+	"
+COMMON_DEPEND_BINS="app-crypt/pinentry
+		   !app-crypt/dirmngr"
+
+# Existence of executables is checked during configuration.
+DEPEND="${COMMON_DEPEND_LIBS}
+	${COMMON_DEPEND_BINS}
+	static? (
+		>=dev-libs/libassuan-2[static-libs]
+		>=dev-libs/libgcrypt-1.6.2[static-libs]
+		>=dev-libs/libgpg-error-1.17[static-libs]
+		>=dev-libs/libksba-1.0.7[static-libs]
+		dev-libs/npth[static-libs]
+		>=net-misc/curl-7.10[static-libs]
+		sys-libs/zlib[static-libs]
+		bzip2? ( app-arch/bzip2[static-libs] )
+	)
+	nls? ( sys-devel/gettext )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
+	${COMMON_DEPEND_BINS}
+	selinux? ( sec-policy/selinux-gpg )
+	nls? ( virtual/libintl )"
+
+REQUIRED_USE="smartcard? ( !static )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# 'USE=static' support was requested:
+	# gnupg1: bug #29299
+	# gnupg2: bug #159623
+	use static && append-ldflags -static
+
+	if use smartcard; then
+		myconf+=(
+			--enable-scdaemon
+			$(use_enable usb ccid-driver)
+		)
+	else
+		myconf+=( --disable-scdaemon )
+	fi
+
+	if use elibc_SunOS || use elibc_AIX; then
+		myconf+=( --disable-symcryptrun )
+	else
+		myconf+=( --enable-symcryptrun )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-gpg \
+		--enable-gpgsm \
+		--enable-large-secmem \
+		--without-adns \
+		"${myconf[@]}" \
+		$(use_enable bzip2) \
+		$(use_enable gnutls) \
+		$(use_with ldap) \
+		$(use_enable nls) \
+		$(use_with readline) \
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd doc
+		emake html
+	fi
+}
+
+src_install() {
+	default
+
+	use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
+		tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
+
+	emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
+	rm "${ED}"/usr/share/gnupg/help* || die
+
+	dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
+		doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
+
+	dosym gpg2 /usr/bin/gpg
+	dosym gpgv2 /usr/bin/gpgv
+	echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
+	echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
+
+	if use doc; then
+		dohtml doc/gnupg.html/* doc/*.png
+	fi
+}
+
+pkg_postinst() {
+	elog "If you wish to view images emerge:"
+	elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
+	elog "Remember to use photo-viewer option in configuration file to activate"
+	elog "the right viewer."
+	elog
+
+	if use smartcard; then
+		elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
+		use usb && elog " - a CCID-compatible reader, used directly through libusb;"
+		elog " - sys-apps/pcsc-lite and a compatible reader device;"
+		elog " - dev-libs/openct and a compatible reader device;"
+		elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
+		elog ""
+		elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
+		elog "app-crypt/ccid first."
+	fi
+
+	ewarn "Please remember to restart gpg-agent if a different version"
+	ewarn "of the agent is currently used. If you are unsure of the gpg"
+	ewarn "agent you are using please run 'killall gpg-agent',"
+	ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog "If upgrading from a version prior than 2.1 you might have to re-import"
+		elog "secret keys after restarting the gpg-agent as the new version is using"
+		elog "a new storage mechanism."
+		elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
+	fi
+}

app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild

@@ -6,7 +6,7 @@
 
 EAPI="5"
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils autotools
 
 MY_P=${P/curses-}
 DESCRIPTION="full screen curses hex editor (with insert/delete support)"
@@ -23,9 +23,11 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ncurses-pkg-config.patch
+	eautoreconf
+}
+
 src_configure() {
-	# Package has an old configure script.
-	CONFIG_SHELL="/bin/bash"
-	tc-export CC
 	econf --program-prefix=curses-
 }

app-editors/curses-hexedit/files/curses-hexedit-0.9.7-ncurses-pkg-config.patch

@@ -0,0 +1,34 @@
+use pkg-config to locate ncurses rather than a library search
+
+--- a/configure.in
++++ b/configure.in
+@@ -19,14 +19,9 @@
+ AC_HEADER_STDC
+ AC_PROG_GCC_TRADITIONAL
+ 
+-AC_CHECK_HEADERS(ncurses.h)
+-if test "$ac_cv_header_ncurses_h" = "no"; then
+-  AC_CHECK_HEADERS(curses.h)
+-  if test "$ac_cv_header_curses_h" = "no"; then
+-    echo "*** Cannot find Curses headers, probably not installed"
+-    echo "*** Hexedit will not run without the curses library"
+-  fi
+-fi
++PKG_CHECK_MODULES(NCURSES, ncurses)
++CFLAGS="$CFLAGS $NCURSES_CFLAGS -DHAVE_NCURSES_H=1"
++LIBS="$LIBS $NCURSES_LIBS"
+ 
+ AC_CHECK_HEADERS(fcntl.h getopt.h limits.h sys/ioctl.h unistd.h)
+ AC_HEADER_DIRENT
+@@ -96,11 +91,4 @@ else
+   fi
+ fi
+ 
+-AC_CHECK_LIB(ncurses, newwin, ,
+-    AC_CHECK_LIB(curses, newwin), ,
+-    echo "Hexedit requires the curses library"
+-    echo "Ncurses is freely available: ftp://ftp.gnu.org/pub/gnu/"
+-    exit 1)
+-
+-
+ AC_OUTPUT(Makefile docs/Makefile gnu/Makefile src/Makefile)

app-emacs/vm/files/vm-8.1.2-texinfo-5.patch

@@ -0,0 +1,59 @@
+diff -up emacs-vm-8.1.2/info/vm.texinfo.texinfo5 emacs-vm-8.1.2/info/vm.texinfo
+--- emacs-vm-8.1.2/info/vm.texinfo.texinfo5	2012-03-05 18:43:21.000000000 +0100
++++ emacs-vm-8.1.2/info/vm.texinfo	2013-05-19 00:05:10.000000000 +0200
+@@ -783,7 +783,8 @@ following formats:
+ 
+ @example
+ ``pop:@var{HOST}:@var{PORT}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
+-``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''@end example
++``imap:@var{HOST}:@var{PORT}:@var{MAILBOX}:@var{AUTH}:@var{USER}:@var{PASSWORD}''
++@end example
+ 
+ @noindent Remote mailboxes accessed by VM in this fashion are referred
+ to as @dfn{server folders} (and @dfn{POP folders} or @dfn{IMAP
+@@ -996,8 +997,7 @@ The variable's value should be an associ
+  ((@var{IMAPDROP} @var{NAME}) ...)
+ @end example
+ 
+-@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop
+-  specification}). 
++@var{IMAPDROP} is an IMAP maildrop specification (@ref{maildrop specification}).
+ 
+ @var{NAME} is a string that should give a less cumbersome name that you
+ will use to refer to this maildrop when using @code{vm-visit-imap-folder}.
+@@ -2342,7 +2342,7 @@ MIME encode it as necessary.
+ * MIME preview::        Previewing a MIME message before sending.
+ @end menu
+ 
+-@node MIME attachments, MIME characters, MIME Composition, MIME Composition, 
++@node MIME attachments, MIME characters, MIME Composition, MIME Composition
+ @unnumberedsec MIME attachments
+ 
+ @kindex C-c C-a
+@@ -3328,13 +3328,15 @@ The fifth is `f' or ` ', for messages fi
+ The sixth is `w' or ` ', for messages written.
+ @*
+ The seventh is `e' or ` ', for messages that have been edited.
++@vindex vm-summary-attachment-indicator
+ @item P
+ indicator for a message with attachments.
+-The variable @vindex vm-summary-attachment-indicator
++The variable
+ @code{vm-summary-attachment-indicator} is the inserted string, by default a @code{$}.
++@vindex vm-summary-postponed-indicator
+ @item p
+ indicator for a postponed message. 
+-The variable @vindex vm-summary-postponed-indicator
++The variable
+ @code{vm-summary-postponed-indicator} is the inserted string, by default a @code{P}.
+ @item c
+ number of characters in message (ignoring headers)
+@@ -4588,7 +4590,7 @@ The project code base is maintained at t
+ @uref{http://launchpad.net/vm}.  The ``VM Development Team'' can be
+ reached here using the email address @code{vm@@launchpad.net}.
+ 
+-@unnumberedsubsec Savannah project site
++@unnumberedsec Savannah project site
+ 
+ The changes made in each of the releases is described in the @samp{NEWS}
+ file, which can be found in the source code repository.  The changes made

app-emacs/vm/vm-8.1.2.ebuild

@@ -30,6 +30,7 @@ src_prepare() {
 		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
 		epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
 	fi
+	epatch "${FILESDIR}/${P}-texinfo-5.patch"
 }
 
 src_configure() {

app-emulation/libvirt-glib/Manifest

@@ -1,2 +1,3 @@
 DIST libvirt-glib-0.2.0.tar.gz 836245 SHA256 30b7e0f224f9cdcf34c1b05b08803cb617d057613ee96395ae517f4ee6c44a0b SHA512 23b698fe297247dd5ce06d9e37eed2025064ab76a52f008cb89cd835364a52c8fe60ae535f68e67fb6c3454d41328dd77c392efd594a3fb1a237d1beb25d19ae WHIRLPOOL 6ef50cc740fa1b43dafc4666ac221bb57312dd937ee693bd12e582e3cec784a5c7a5d22e3c15cc369ac0a24ae26ce64edc69d2c4b55fc2ea83a8e350bc8003ab
 DIST libvirt-glib-0.2.1.tar.gz 844657 SHA256 d856d37b708bc8bf9e6ac294edca7a53f2baa6d857c6f5859be58517a714a2fb SHA512 bd38b5c415f65bd6e8824d419c787afdd43aa322f03045f517f9bae88575de1a0975f0340b24bf776421eeb54632227d798e801a1611ce932878ad7bace3adfb WHIRLPOOL 99408b22553d8b4bea5df75750aea2339800ad45b7497eae1afdc79e11be256f0e79d29fe879ef4bc8992817178850058ee361fa4ac5a4b2213f09a6fa825cb2
+DIST libvirt-glib-0.2.2.tar.gz 853052 SHA256 d7be16025231c91ccae43838b7cdb1d55d181856a2a50b0f7b1c5078ad202d9d SHA512 77adcf74dd057b8c5e3c21e1fbe0a99eedbe0005d0247c0173bce69e4e6209dbffe18c7a2f0de9a4c279f138ab5bcc360c14cc2335d0b2b55f22b5819c3e5b70 WHIRLPOOL 628d76cf20fe0b707a56688ad4f17c2c95b12b89fe89f4628e42cee2e8c5855aeac0e06ad45fe71fb63ae935b1ff7a17ee69f294b8358653f7cbcd03aea59876

app-emulation/libvirt-glib/libvirt-glib-0.2.2.ebuild

@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 vala
+
+DESCRIPTION="GLib and GObject mappings for libvirt"
+HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
+SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection python +vala"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	vala? ( introspection )
+"
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1093633
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	>=app-emulation/libvirt-1.2.6:=
+	>=dev-libs/glib-2.38.0:2
+	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-test-coverage \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		$(use_with python)
+}

app-emulation/libvirt/files/libvirt-1.2.17-fix_paths_for_apparmor.patch

@@ -145,12 +145,14 @@ diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.li
 index 5d606e6..ab2f1a9 100644
 --- a/examples/apparmor/usr.sbin.libvirtd
 +++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -58,8 +58,8 @@
+@@ -58,8 +58,10 @@
    audit deny /sys/kernel/security/apparmor/.* rwxl,
    /sys/kernel/security/apparmor/profiles r,
    /usr/{lib,lib64}/libvirt/* PUxr,
 -  /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
 -  /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
++  /usr/libexec/virt-aa-helper PUxr,
++  /usr/libexec/libvirt_lxc PUxr,
 +  /usr/libexec/libvirt_parthelper ix,
 +  /usr/libexec/libvirt_iohelper ix,
    /etc/libvirt/hooks/** rmix,

app-emulation/qemu/qemu-2.3.0-r4.ebuild

@@ -89,7 +89,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	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(+)] )
+	usb? ( >=virtual/libusb-1-r1[static-libs(+)] )
 	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"

app-emulation/qemu/qemu-2.3.0-r5.ebuild

@@ -89,7 +89,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	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(+)] )
+	usb? ( >=virtual/libusb-1-r1[static-libs(+)] )
 	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"

app-emulation/qemu/qemu-2.3.0-r6.ebuild

@@ -89,7 +89,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	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(+)] )
+	usb? ( >=virtual/libusb-1-r1[static-libs(+)] )
 	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"

app-emulation/qemu/qemu-2.3.1.ebuild

@@ -89,7 +89,7 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	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(+)] )
+	usb? ( >=virtual/libusb-1-r1[static-libs(+)] )
 	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"

app-emulation/qemu/qemu-2.4.0.ebuild

@@ -70,32 +70,65 @@ COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	xattr? ( sys-apps/attr[static-libs(+)] )"
 SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
 	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
 	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(+)] )
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.90 )
+		)
+	)
 	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
 	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(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[gles2]
+	)
 	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? (
-		!sdl2? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
+		!sdl2? (
-		sdl2? ( media-libs/libsdl2[static-libs(+)] )
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
 	)
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( dev-libs/nss !app-emulation/libcacard )
 	snappy? ( app-arch/snappy[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=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(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
 	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
 X86_FIRMWARE_DEPEND="
@@ -115,35 +148,8 @@ CDEPEND="
 	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
 	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? (
-		gtk2? (
-			x11-libs/gtk+:2
-			vte? ( x11-libs/vte:0 )
-		)
-		!gtk2? (
-			x11-libs/gtk+:3
-			vte? ( x11-libs/vte:2.90 )
-		)
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? (
-		virtual/opengl
-		media-libs/mesa[gles2]
-	)
-	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
-	sdl? (
-		!sdl2? ( media-libs/libsdl[X] )
-		sdl2? ( media-libs/libsdl2[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
@@ -298,12 +304,6 @@ qemu_src_configure() {
 
 	mkdir "${builddir}"
 
-	# 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
@@ -384,6 +384,12 @@ qemu_src_configure() {
 		)
 		;;
 	softmmu)
+		# 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}"
+
 		conf_opts+=(
 			--disable-linux-user
 			--enable-system

app-emulation/qemu/qemu-9999.ebuild

@@ -70,32 +70,65 @@ COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
 	xattr? ( sys-apps/attr[static-libs(+)] )"
 SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
+	accessibility? ( app-accessibility/brltty[static-libs(+)] )
 	aio? ( dev-libs/libaio[static-libs(+)] )
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bluetooth? ( net-wireless/bluez )
 	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(+)] )
+	gtk? (
+		gtk2? (
+			x11-libs/gtk+:2
+			vte? ( x11-libs/vte:0 )
+		)
+		!gtk2? (
+			x11-libs/gtk+:3
+			vte? ( x11-libs/vte:2.90 )
+		)
+	)
 	infiniband? ( sys-infiniband/librdmacm:=[static-libs(+)] )
+	iscsi? ( net-libs/libiscsi )
 	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(+)] )
+	opengl? (
+		virtual/opengl
+		media-libs/libepoxy[static-libs(+)]
+		media-libs/mesa[static-libs(+)]
+		media-libs/mesa[gles2]
+	)
 	png? ( media-libs/libpng:0=[static-libs(+)] )
+	pulseaudio? ( media-sound/pulseaudio )
 	rbd? ( sys-cluster/ceph[static-libs(+)] )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? (
-		!sdl2? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
+		!sdl2? (
-		sdl2? ( media-libs/libsdl2[static-libs(+)] )
+			media-libs/libsdl[X]
+			>=media-libs/libsdl-1.2.11[static-libs(+)]
+		)
+		sdl2? (
+			media-libs/libsdl2[X]
+			media-libs/libsdl2[static-libs(+)]
+		)
 	)
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
+	smartcard? ( dev-libs/nss !app-emulation/libcacard )
 	snappy? ( app-arch/snappy[static-libs(+)] )
-	spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
+	spice? (
+		>=app-emulation/spice-protocol-0.12.3
+		>=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(+)] )
+	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
+	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
 	uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
+	virtfs? ( sys-libs/libcap )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
 USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
 X86_FIRMWARE_DEPEND="
@@ -115,35 +148,8 @@ CDEPEND="
 	!static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
 	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? (
-		gtk2? (
-			x11-libs/gtk+:2
-			vte? ( x11-libs/vte:0 )
-		)
-		!gtk2? (
-			x11-libs/gtk+:3
-			vte? ( x11-libs/vte:2.90 )
-		)
-	)
-	iscsi? ( net-libs/libiscsi )
-	opengl? (
-		virtual/opengl
-		media-libs/mesa[gles2]
-	)
-	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
-	sdl? (
-		!sdl2? ( media-libs/libsdl[X] )
-		sdl2? ( media-libs/libsdl2[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
@@ -298,12 +304,6 @@ qemu_src_configure() {
 
 	mkdir "${builddir}"
 
-	# 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
@@ -384,6 +384,12 @@ qemu_src_configure() {
 		)
 		;;
 	softmmu)
+		# 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}"
+
 		conf_opts+=(
 			--disable-linux-user
 			--enable-system

app-emulation/spice-protocol/Manifest

@@ -1,4 +1,2 @@
 DIST spice-protocol-0.12.3.tar.bz2 69854 SHA256 dc8609efe23e6f9b78d56663aa9ca5e8cb10c2b8403b8fc02aa72ae7686cc037 SHA512 55423743cf195459125305c726803db491ebf16a5ef0cb821eed7e0d71ace9d581b9a6a60c11a03d6a17c0ecc31e2b4c649ed117857a050f409844686b7df3e0 WHIRLPOOL 308ced9222f8b43e2455733fc5d311912bc9d10fbf830d8d4eecd0e86bfd6dc6a0ae15c3d94dc5c3d73aa9635247023259642c570e31557e0ba9caf4bd2c7eb6
-DIST spice-protocol-0.12.5.tar.bz2 70068 SHA256 feacb14940cdcc10214ec8cdc2198d880e54eb206e6d65a9bddf8360b27f7bf9 SHA512 04c48a88b9ab3c094f44400bbcf8be7b2f32c8a38350e38237108a366b2b0d94cf4244b83de749b1bce5fc6f71c9111d5ae063c9cac43d29074fa1f372450ec6 WHIRLPOOL 1c40deed7a054ed8726628067a0a708cddd500245f278eca30c3b5e25adf4137c70faf0a08bbc3a414a257a3d9b8100d05680c40405ba410ecdad3fb870b4b08
+DIST spice-protocol-0.12.8.tar.bz2 71681 SHA256 116d57a1893c08f8f7801579dffb4c1568a4fb4566aa75c84a2685f150aae67c SHA512 68f11148f3df420dc86483171330e25966d51495313f9a871e473977e8dcd37ae0002f943e6f8d679ce82e1fd9f69625fe983426575ac9338b12a7dddd89597a WHIRLPOOL 6b15a634c1e6308b6521e6e1835dc292f92d0573aefea445d71cccce14f21424aaa01c60b907a4f7e341eee76b6c8ec399b49f0ff0bcb6bc6c54c5a1e8633eb1
-DIST spice-protocol-0.12.6.tar.bz2 70176 SHA256 9d4745602eb2ab1d1c1ab98b4babf587574870993b4faefe354ac57bb5e8259b SHA512 0c9a1dcc6c0afbfb7350b7003a261b692de4864afc8bd8f33e7a730753f43112977bfa5148e0b5af3231d43d9a057859f34f6dff0c738d9aaea07f70138e1f13 WHIRLPOOL 52331e2ebe3a54e02c1115459580ebe405304c3539f3534527cec9e1f72e606c2c8f6b4acf30fcc5df022489f146a0fb253bfa8849e9894f31fb8b2dc48ef706
-DIST spice-protocol-0.12.7.tar.bz2 71276 SHA256 96c6cb73361816ed19bfd8536f65d4547da35709aa00af1380e650c1174916c2 SHA512 48205ab8daba97f754ae1ac9bbb7071efb2f450c43620839ee70d7577eab2ef696151fcce8f6f5c95b2593c58b6a0d5779e36b6fc0b6d450872ac677ea525800 WHIRLPOOL fc990949806c4a27081f2156ff4c2c3388785f3f68e468b7f2c77852c874789fa391ce85fdbb78b30bbe3cd39b7e0615d7815405e3ced815376481e49202bf78

app-emulation/spice-protocol/spice-protocol-0.12.6.ebuild

@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""

app-emulation/spice-protocol/spice-protocol-0.12.7.ebuild

@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Headers defining the SPICE protocol"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""

app-emulation/spice-vdagent/Manifest

@@ -1,3 +1,2 @@
-DIST spice-vdagent-0.10.1.tar.bz2 107250 SHA256 cea0db6f2def79a96876d0921f2a6234875797c68a8143d24cf9af8cc01361db SHA512 b7a42af7fd1d15dcfd618be34b99c73fa2d07105e37236a5a8c2a0b70d7d112de9e99200257ae746f60de583735681ce7c1437445921f6b8a877c7a9b2083afe WHIRLPOOL 83f3f6b2501966a0a5b053547759fd8a131d3e6a795f008c21f0a11794fd6ae7e30800328189e4dead11c19ae2a0a08a35ff192011622ca2fa8eac204711d035
 DIST spice-vdagent-0.12.0.tar.bz2 114252 SHA256 e0bee1985c2c31ccc44043ed6735304078e09e14c4f805962cf8c288fa205659 SHA512 42c98a3cc3167884203d4d0a31562668be3df10c89eca2a9257c6de1f787b7db77f0648013f307554eb09c0bf3f0cddc8632f050c4018aef544b9c22a02b2dfe WHIRLPOOL 3e00f0ac9ca66a2c6fec4307d4b6eea51fc4a266e72e6d5764e8f3fb01ab407440cabe20ee1db4d9703e5bda5d66616f71a8baa1d8d6610b0e1c75a67b3affae
-DIST spice-vdagent-0.8.1.tar.bz2 98437 SHA256 99ec232805a6201da78d409e6f874ff0aa6bb25e7ffe623aa77752539ae7d7ff SHA512 45c2b94dc66dd2061b57cfe90d7b900fd095fa067c6bca560ecc300979953e8c37b63e8cbdb4683275a1cc084512aa97e1125bbb17e39a6966387e4f1be2c178 WHIRLPOOL 1cfeabc97f4c1fd9e42a9ad849916f04d9f4f640a586158c3d8b2ab3b9449f6e1cf8acba196a9e684a1499404747971fa82ad922bd50e87c257526d67468a85f
+DIST spice-vdagent-0.16.0.tar.bz2 128174 SHA256 5b951646e0bd996afda2d063e706fa2aad2655af5bdd1b6525260ab50be30f7d SHA512 033fe60f152daceb05b51963b78daf6f757d0ad26398f47479c957c5c0f1735e26019c05ef30e485317ba75dd1a57ee1bffbab20eb2c46614d88ed7401795a97 WHIRLPOOL b94a60e15eb0ea107e974ad68bd07296eec9e08840afb2e57da64b35f26a613637975791e1a615af260acf9345ec016564ab15d96a00443665b5d1880b267d71

app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild

@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit linux-info
 
@@ -13,15 +13,17 @@ SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit selinux"
+IUSE="+consolekit selinux systemd"
 
-CDEPEND="x11-libs/libXfixes
+CDEPEND="media-libs/alsa-lib
+	x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libX11
 	x11-libs/libXinerama
 	>=x11-libs/libpciaccess-0.10
-	>=app-emulation/spice-protocol-0.10.1
+	>=app-emulation/spice-protocol-0.12.8
-	consolekit? ( sys-auth/consolekit sys-apps/dbus )"
+	consolekit? ( sys-auth/consolekit sys-apps/dbus )
+	systemd? ( sys-apps/systemd )"
 DEPEND="virtual/pkgconfig
 	${CDEPEND}"
 RDEPEND="${CDEPEND}
@@ -32,8 +34,9 @@ ERROR_INPUT_UINPUT="User level input support is required"
 ERROR_VIRTIO_CONSOLE="VirtIO console/serial device support is required"
 
 src_configure() {
-	local opt=
+	local opt="--with-session-info=none --with-init-script=systemd"
 
+	use systemd && opt="--with-session-info=systemd"
 	use consolekit && opt="${opt} --with-session-info=console-kit"
 
 	econf \
@@ -46,7 +49,6 @@ src_install() {
 
 	rm -rf "${D}"/etc/{rc,tmpfiles}.d
 
-	keepdir /var/run/spice-vdagentd
 	keepdir /var/log/spice-vdagentd
 
 	newinitd "${FILESDIR}/${PN}.initd-2" "${PN}"

app-emulation/spice-vdagent/spice-vdagent-0.8.1-r1.ebuild

@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit linux-info
-
-DESCRIPTION="SPICE VD Linux Guest Agent"
-HOMEPAGE="http://spice-space.org/"
-SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+consolekit selinux"
-
-CDEPEND="x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libX11
-	>=app-emulation/spice-protocol-0.8.1
-	consolekit? ( sys-auth/consolekit sys-apps/dbus )"
-DEPEND="virtual/pkgconfig
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-vdagent )"
-
-CONFIG_CHECK="~INPUT_UINPUT"
-ERROR_INPUT_UINPUT="User level driver support is required to run the spice-vdagent daemon"
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable consolekit console-kit)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}"/etc/{rc,tmpfiles}.d
-
-	keepdir /var/run/spice-vdagentd
-	keepdir /var/log/spice-vdagentd
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-}
-
-pkg_postinst() {
-	elog "Make sure that the User level driver support kernel module 'uinput' is loaded"
-	elog "if built as a module before starting the vdagent daemon."
-}

app-misc/carbon-c-relay/Manifest

@@ -1,3 +1,3 @@
-DIST carbon-c-relay-0.39.tar.gz 55308 SHA256 694cfb291981fda58930af09bd1563a20ca8e40839d8bdbda5b8403774cf391d SHA512 b7797f969bf3431f883a5e8288b748494a9c9d8448c7bcde6642b538e20c6fe99acc296ba7bc940739c53619ee672a46ff787c66d75900f45a057f2660da0e5f WHIRLPOOL 8e1b8646b720f2db3f1a556f57975c9556e4a0d3b36479b6ad58607abe0d9f2629ef7275def4ef6a9dc4b73268376fa07c78b8dac3bd5b8bd90ff70dd706f4cf
 DIST carbon-c-relay-0.40.tar.gz 57697 SHA256 38e3b93f4a46e72f11c30f84bd0a0a77862d8d3cd1904447678eabfce89a0468 SHA512 6d77d521eba6dfa576810f3e850f091431a76282f5c7c85a72af300cff18b0dec8738dd00d9555933fbf486ce9656ea4f06332644bfccc634078c90937705aaa WHIRLPOOL ddaf8d02168a10f1e0e2dd8701cd430aefe7346164016a41e25850b2871d541f9002c93063d0836d40caf6db2ff380183d8a4e145df89324be33ef22386bec39
 DIST carbon-c-relay-0.43.tar.gz 63005 SHA256 de55c2af2392910f28a28dab96faa24a394bf1038f4cc045d4db5f8a0180603e SHA512 9c81011131c242b96c198a299fb26661cceb4a6b66c387f4201fe156cc025ec5ccc9962573eec11f3f98a808ba38638a18dd6b2c535dea61c9eec009e22c0e44 WHIRLPOOL 895b31b54a0b7d28c80cfbe16b0ae0012a87adea738f49f503966c159ea0c536aeb6a6cbf424ed325811b85b1fe376a0aab969abd66d08c553dd300c6707a02c
+DIST carbon-c-relay-0.44.tar.gz 54533 SHA256 424f5eebdfcd8cd42f07495b97c440e9133723966013d63fe3f6d8220bd031dc SHA512 ae0ded77d189c22bab0400922831211f411d47b92bde44f9a4c4208a094a57ac875a52e04ef6297238281bb44c8869f0510b3a3b6dc1c564e02e4f22bb69e268 WHIRLPOOL b7351576d7f1bdb5c0929967faacd6861a10f8d8d3bedebcc9bf7a3f15e0b9ea2d3475ecd8e700e3f2fb190698ea343fcb4530d10522591512f1de9d787a0ab2

app-misc/carbon-c-relay/carbon-c-relay-0.44.ebuild

@@ -15,9 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="dev-libs/openssl:0"
+RDEPEND=""
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
-	virtual/pkgconfig"
 
 pkg_preinst() {
 	enewgroup carbon
@@ -26,6 +25,7 @@ pkg_preinst() {
 
 src_prepare() {
 	tc-export CC
+	tc-has-openmp || export OPENMP_FLAGS=
 }
 
 src_install() {

app-portage/eclass-manpages/eclass-manpages-20150814.ebuild

@@ -30,9 +30,9 @@ src_compile() {
 	for o in ${PORTDIR_OVERLAY} ; do
 		e="${o}/eclass"
 		[[ -d ${e} ]] || continue
-		genit "${e}"
+		genit "${e}" || die
 	done
-	genit
+	genit || die
 }
 
 src_install() {

app-portage/eclass-manpages/files/eclass-to-manpage.awk

@@ -18,7 +18,7 @@
 # @BUGREPORTS:
 # <optional; description of how to report bugs;
 #  default: tell people to use bugs.gentoo.org>
-# @VCSURL: <optional; url to vcs for this eclass; default: http://sources.gentoo.org/eclass/@ECLASS@?view=log>
+# @VCSURL: <optional; url to vcs for this eclass; default: https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@>
 # @BLURB: <required; short description>
 # @DESCRIPTION:
 # <optional; long description>
@@ -79,6 +79,10 @@ function fail(text) {
 	_stderr_msg(text, "error")
 	exit(1)
 }
+function xfail(text) {
+	_stderr_msg(text, "error (ignoring)")
+	exit(77)
+}
 
 function eat_line() {
 	ret = $0
@@ -145,6 +149,10 @@ function handle_eclass() {
 	desc = ""
 	example = ""
 
+	# Sanity check the eclass name. #537392
+	if (eclass !~ /[.]eclass$/)
+		fail(eclass ": @ECLASS name is missing a '.eclass' suffix")
+
 	# first the man page header
 	print ".\\\" -*- coding: utf-8 -*-"
 	print ".\\\" ### DO NOT EDIT THIS FILE"
@@ -290,12 +298,12 @@ function _handle_variable() {
 	# first try var="val"
 	op = "="
 	regex = "^.*" var_name "=(.*)$"
-	val = gensub(regex, "\\1", "", $0)
+	val = gensub(regex, "\\1", 1, $0)
 	if (val == $0) {
 		# next try : ${var:=val}
 		op = "?="
 		regex = "^[[:space:]]*:[[:space:]]*[$]{" var_name ":?=(.*)}"
-		val = gensub(regex, "\\1", "", $0)
+		val = gensub(regex, "\\1", 1, $0)
 		if (val == $0) {
 			if (default_unset + required + internal == 0)
 				warn(var_name ": unable to extract default variable content: " $0)
@@ -363,7 +371,7 @@ function handle_footer() {
 	print ".BR " eclassdir "/" eclass
 	print ".SH \"SEE ALSO\""
 	print ".BR ebuild (5)"
-	print pre_text(gensub("@ECLASS@", eclass, "", vcs_url))
+	print pre_text(gensub("@ECLASS@", eclass, 1, vcs_url))
 }
 
 #
@@ -375,7 +383,7 @@ BEGIN {
 		PORTDIR = "/usr/portage"
 	eclassdir = PORTDIR "/eclass"
 	reporting_bugs = "Please report bugs via http://bugs.gentoo.org/"
-	vcs_url = "http://sources.gentoo.org/eclass/@ECLASS@?view=log"
+	vcs_url = "https://gitweb.gentoo.org/repo/gentoo.git/log/eclass/@ECLASS@"
 }
 
 #
@@ -388,8 +396,12 @@ BEGIN {
 			state = "funcvar"
 		} else if ($0 == "# @DEAD") {
 			eclass = "dead"
-			exit(10)
+			exit(77)
 		} else if ($0 == "# @eclass-begin") {
+			# White list old eclasses that haven't been updated so we can block
+			# new ones from being added to the tree.
+			if (eclass == "")
+				xfail("java documentation not supported")
 			fail("java documentation not supported")
 		} else if ($0 ~ /^# @/)
 			warn("Unexpected tag in \"" state "\" state: " $0)
@@ -410,7 +422,7 @@ BEGIN {
 #
 END {
 	if (eclass == "")
-		fail("eclass not documented yet (no @ECLASS found)")
+		xfail("eclass not documented yet (no @ECLASS found)")
 	else if (eclass != "dead")
 		handle_footer()
 }

app-portage/eclass-manpages/files/eclass-to-manpage.sh

@@ -22,6 +22,7 @@ fi
 
 [[ $# -eq 0 ]] && set -- "${ECLASSDIR}"/*.eclass
 
+ret=0
 for e in "$@" ; do
 	set -- \
 	${AWK} \
@@ -29,8 +30,17 @@ for e in "$@" ; do
 		-f "${FILESDIR}"/eclass-to-manpage.awk \
 		${e}
 	if [[ ${AWK} == "gawk" ]] ; then
-		"$@" > ${e##*/}.5 || rm -f ${e##*/}.5
+		"$@" > ${e##*/}.5
+		tret=$?
+		if [[ ${tret} -ne 0 ]] ; then
+			rm -f ${e##*/}.5
+			if [[ ${tret} -ne 77 ]] ; then
+				echo "FAIL: ${e}"
+				ret=1
+			fi
+		fi
 	else
 		"$@"
 	fi
 done
+exit ${ret}

app-portage/grs/grs-0.1.ebuild

@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"

app-shells/bash/bash-4.3_p39_pre0.ebuild

@@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+#KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 # Note: We export this because portage wants it enabled.
 IUSE="+readline"
 

app-text/tesseract/metadata.xml

@@ -24,6 +24,9 @@
     <flag name="linguas_jp"> Enable support for Japanese.</flag>
     <flag name="osd"> Enable support orientation and script
     detection.</flag>
-    <flag name="opencl">Enable opencl support for speedup using GPU computation.</flag>
+    <flag name="opencl">Enable opencl support for speedup using GPU
+    computation.</flag>
+    <flag name="training">Install training applications to add support
+    for new languages.</flag>
   </use>
 </pkgmetadata>

app-text/tesseract/tesseract-3.04.00-r2.ebuild

@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="tesseract-ocr"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${PV}/"
+
+inherit eutils autotools autotools-utils
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${URI_PREFIX}eng.traineddata -> eng.traineddata-${PV}
+	doc? ( http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
+	linguas_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${PV} )
+	linguas_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${PV} )
+	linguas_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${PV} )
+	linguas_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${PV} )
+	linguas_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${PV} )
+	linguas_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${PV}
+				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${PV} )
+	linguas_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${PV}
+				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${PV} )
+	linguas_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${PV} )
+	linguas_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${PV} )
+	linguas_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${PV} )
+	linguas_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${PV} )
+	linguas_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${PV} )
+	linguas_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${PV} )
+	linguas_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${PV} )
+	linguas_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${PV} )
+	linguas_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${PV} )
+	linguas_jp? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${PV} )
+	linguas_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${PV} )
+	linguas_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${PV} )
+	linguas_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${PV} )
+	linguas_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${PV} )
+	linguas_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${PV} )
+	linguas_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${PV} )
+	linguas_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${PV} )
+	linguas_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${PV} )
+	linguas_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${PV} )
+	linguas_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${PV}
+				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${PV} )
+	linguas_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${PV} )
+	linguas_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${PV} )
+	linguas_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${PV} )
+	linguas_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${PV} )
+	linguas_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${PV} )
+	linguas_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${PV} )
+	linguas_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${PV} )
+	linguas_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${PV} )
+	linguas_zh_CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${PV} )
+	linguas_zh_TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${PV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${PV} )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff training -webp linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW"
+
+# With opencl tiff is necessary regardless of leptonica status   <-- Check this
+DEPEND=">=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?]
+		opencl? ( virtual/opencl
+				  media-libs/tiff:0 )
+	training? (
+	  dev-libs/icu
+	  x11-libs/pango
+	  x11-libs/cairo
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
+
+PATCHES=(
+	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-fix-scrollview-disabled.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
+	find "${DISTDIR}/" -name "*traineddata-${PV}" \
+		 -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable opencl) \
+		$(use_enable scrollview graphics)
+		)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	default
+	if use training; then
+		emake training
+	fi
+	}
+
+src_install() {
+	autotools-utils_src_install
+
+	if use training; then
+		pushd "${BUILD_DIR}"
+		emake DESTDIR="${D}" training-install
+		popd
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins testing/eurotext.tif testing/phototest.tif
+	fi
+
+	if use doc; then
+		dohtml -r "${WORKDIR}"/"${MY_PN}"/doc/html/*
+	fi
+
+	# install language files
+	insinto /usr/share/tessdata
+	doins "${S}"/tessdata/*traineddata*
+}

dev-dotnet/gtk-sharp/Manifest

@@ -1,2 +1,3 @@
 DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1
+DIST gtk-sharp-2.12.21.tar.gz 2498480 SHA256 ea02da7000433115dcc008102e0c217479c06d74b2c3af5b76527784f933b088 SHA512 f7f575ec42e1a6d3bdbd9493b06d083d10687b6f5b41eebe1f1e03087c0e3cce79948aa19e9dd88972b023837d48bd02afee719a28b7015a78dccb96f2fee307 WHIRLPOOL e4c375ac3a246aed5412dbfd403f392abf4ad76450916ba11bd233d571de85f7a02d0854ad6387991f60758086a42a11db94604e4feafd0d433768adaf17d44f
 DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f43940536d812d4b68ffcf01559bd3dfb74

dev-java/browserlauncher2/browserlauncher2-1.3.ebuild

@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit versionator eutils java-pkg-2 java-ant-2
-
-MY_PV="$(replace_all_version_separators _)"
-MY_PN="BrowserLauncher2"
-
-DESCRIPTION="BrowserLauncher2 is a library that facilitates opening a browser from a Java application"
-HOMEPAGE="http://browserlaunch2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/browserlaunch2/${MY_PN}-all-${MY_PV}.jar"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	find . -name "*.class" -exec rm -v {} \;
-	# fixing build.xml
-	sed -i -e "s: includes=\"\*\*/\*\.class\"::g" "${S}/build.xml" || die
-}
-
-EANT_BUILD_TARGET="build"
-EANT_DOC_TARGET="api"
-
-src_install() {
-	java-pkg_newjar deployment/*.jar
-	java-pkg_dolauncher BrowserLauncherTestApp-${SLOT} \
-		--main "edu.stanford.ejalbert.testing.BrowserLauncherTestApp"
-
-	dodoc README* || die
-	use doc && java-pkg_dojavadoc api
-	use source && java-pkg_dosrc source
-}

dev-java/cal10n/cal10n-0.8.1.ebuild

@@ -14,7 +14,7 @@ SRC_URI="http://repo1.maven.org/maven2/ch/qos/${PN}/${PN}-api/${PV}/${PN}-api-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"

dev-java/exolabcore/Manifest

@@ -1 +0,0 @@
-DIST exolabcore-20050205.tar.bz2 118062 SHA256 43b7b62a7c1534fcc3a50ad7f1e745036989762435f307fcbca29940148f25ab SHA512 90919e8bbddc65cc19e8d22eef5872fd58dcae077798ce689f6ff7c5d02e9a675b42db94e4c92f4d4300210ae14e385b2619349eb0e7f3a16bc325ba3b502448 WHIRLPOOL 112c257aa9f33b171bcf621c853ff9183b458b1ebbc8352e9f6d8ce5ae48ec26466190a69524a81caf1f90f5f2ce4cebf1da872e69d9da466ea0d984427d502f

dev-java/exolabcore/exolabcore-0.3.7_p20050205-r2.ebuild

@@ -1,82 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=1
-WANT_ANT_TASKS="dev-java/exolabtools:0"
-JAVA_PKG_IUSE="doc source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_DATE="${PV##*_p}"
-MY_PV="${PV%%_p*}"
-MY_P="${PN}-${MY_DATE}"
-
-DESCRIPTION="Exolab Build Tools"
-HOMEPAGE="http://openjms.cvs.sourceforge.net/openjms/exolabcore/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="Exolab"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-COMMON_DEP="
-	dev-java/cdegroot-db
-	dev-java/commons-logging"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	java-virtuals/jdk-with-com-sun
-	${COMMON_DEP}
-	dev-java/exolabtools
-	test? (
-		dev-java/jakarta-oro:2.0
-		dev-java/commons-cli
-		dev-java/log4j
-		=dev-java/junit-3.8*
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}/src"
-	epatch "${FILESDIR}/${P}-buildfile.patch"
-	epatch "${FILESDIR}/0.3.7_p20050205-r1-tests-junit.patch"
-
-	cd "${S}/lib"
-	java-pkg_jar-from cdegroot-db-1
-	java-pkg_jar-from commons-logging
-}
-
-src_compile() {
-	cd "${S}/src"
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	cd "${S}/lib"
-	java-pkg_jar-from junit
-	java-pkg_jar-from commons-cli-1
-	java-pkg_jar-from log4j
-	java-pkg_jar-from jakarta-oro-2.0
-
-	cd "${S}/src"
-	eant tests
-	cd ..
-	local deps
-	deps="junit,commons-cli-1,log4j,cdegroot-db-1,commons-logging,jakarta-oro-2.0"
-	java -cp "build/classes:build/tests:$(java-pkg_getjars ${deps})" \
-		org.exolab.core.test.CoreTestSuite -execute || die "Tests failed"
-}
-
-src_install() {
-	java-pkg_newjar dist/${PN}-${MY_PV}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc build/doc/javadoc
-	use source && java-pkg_dosrc src/main/*
-}

dev-java/exolabcore/files/0.3.7_p20050205-r1-tests-junit.patch

@@ -1,12 +0,0 @@
-diff -ur src.old/tests/unit/org/exolab/core/test/CoreTestSuite.java src/tests/unit/org/exolab/core/test/CoreTestSuite.java
---- src.old/tests/unit/org/exolab/core/test/CoreTestSuite.java	2007-02-14 20:39:01.000000000 +0200
-+++ src/tests/unit/org/exolab/core/test/CoreTestSuite.java	2007-02-14 20:39:21.000000000 +0200
-@@ -177,7 +177,7 @@
-     
-                 // execute the test suite and print the results
-                 TestResult results = harness.execute(suite);
--                harness.getTestRunner().print(results);
-+                //harness.getTestRunner().print(results);
-             }
-         } else {
-             usage();

dev-java/exolabcore/files/exolabcore-0.3.7_p20050205-buildfile.patch

@@ -1,34 +0,0 @@
---- build.xml.orig	2005-02-05 23:16:58.615050576 +0100
-+++ build.xml	2005-02-05 23:28:15.778106144 +0100
-@@ -6,8 +6,6 @@
-   <!-- ==================================================================== -->
-   <!--                        Custom task defs                              -->
-   <!-- ==================================================================== -->
--  <taskdef name="increment" classname="org.exolab.tools.ant.Increment" />
--  <taskdef name="subst" classname="org.exolab.tools.ant.Substitute" />
- 
- 
-   <!-- ==================================================================== -->
-@@ -37,15 +35,14 @@
-   <!--                The classpath used to build the project               -->
-   <!-- ==================================================================== -->
-   <path id="project.class.path">
--    <pathelement path="${lib.dir}/${project.jar.jdbm}" />
--    <pathelement path="${lib.dir}/${project.jar.jnet}" />
--    <pathelement path="${lib.dir}/${project.jar.jsse}" />
--    <pathelement path="${lib.dir}/${project.jar.junit}" />
--    <pathelement path="${lib.dir}/${project.jar.log4j}" />
--    <pathelement path="${lib.dir}/${project.jar.logging}" />
--    <pathelement path="${lib.dir}/${project.jar.cli}" />
--    <pathelement path="${classes.dir}" />
-+  	<fileset dir="${lib.dir}">
-+  		<include name="**/*.jar" />
-+        </fileset>
-+    	<pathelement path="${classes.dir}" />
-   </path>
-+  
-+  <taskdef name="increment" classname="org.exolab.tools.ant.Increment" classpathref="project.class.path"/>
-+  <taskdef name="subst" classname="org.exolab.tools.ant.Substitute" classpathref="project.class.path" />
- 
- 
-   <!-- ==================================================================== -->

dev-java/exolabtools/Manifest

@@ -1 +0,0 @@
-DIST exolabtools-20050205.tar.bz2 13172 SHA256 a59b8345b7591c652f386ef5a02639b8b41a67e0f219774c3f271ce5821e5969 SHA512 9976b58db4a13efe64edd7d8b3ae897b4eeb6b939602fb9edd3dc913da587fca49864c346659976e8f7d18d5392a7977efed0a8b800b67b0483c67fac6e9bf53 WHIRLPOOL 8040df795253dc1931c44425135a984030b7bd974192e7cca9551d601c7f7464a3fba5f9a356db8920dc518c70ddac8197dee983acda22bf0d87e515e92a24ab

dev-java/exolabtools/exolabtools-1.0_p20050205-r1.ebuild

@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P=${P/-1.0_p/-}
-
-DESCRIPTION="Exolab Build Tools"
-HOMEPAGE="http://openjms.cvs.sourceforge.net/openjms/tools/src/main/org/exolab/tools/ant/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="Exolab"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc source"
-
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/jakarta-oro-2.0*
-	dev-java/ant-core"
-
-DEPEND=">=virtual/jdk-1.4
-	=dev-java/jakarta-oro-2.0*"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_unpack() {
-	unpack "${A}"
-
-	cd "${S}/src/etc"
-	mv JARS JARS.upstream || die
-	echo "project.jar.oro=jakarta-oro.jar" > JARS
-	echo "project.jar.ant=ant.jar" >> JARS
-
-	cd "${S}/lib"
-	java-pkg_jar-from jakarta-oro-2.0
-	java-pkg_jar-from ant-core
-}
-
-src_compile() {
-	cd src
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_newjar dist/${PN}-1.0.jar ${PN}.jar
-
-	dodoc src/etc/CHANGELOG src/etc/VERSION || die
-
-	use doc && java-pkg_dojavadoc build/doc
-	use source && java-pkg_dosrc src/main/*
-}

dev-java/javacsv/Manifest

@@ -0,0 +1 @@
+DIST javacsv2.1.zip 89333 SHA256 29dcf065be4e18111c45a3b020f191bf2447e52369723e881787c522a68e0aa3 SHA512 beefeae1306163a21d4237dc3cccde9ffba0435fa898d95a77f33ec45f383e81e7a804d33918ba2a47fb004ed6f8734b8567d11a3ad63d1be3f9d1fa53e153ee WHIRLPOOL 92b3b76542810cd8ee9f2c813b3451851376c3f8e5e341a1864dfa27e6e09acf1b974cac922c551c6c5fae9f8257d02726d207d3d0373ea4db07f37a280ef3d2

dev-java/javacsv/javacsv-2.1.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+RESTRICT="test"
+
+DESCRIPTION="Java library for reading and writing CSV and plain delimited text files"
+HOMEPAGE="http://www.csvreader.com/java_csv.php"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/}.zip"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	rm -rfv doc "${PN}".jar || die "error cleaning up"
+	mv -v src/AllTests.java . || die "error moving tests"
+}
+
+EANT_BUILD_TARGET="dist"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	java-pkg-2_src_compile
+	use doc && eant -f "${S}"/javadoc.xml
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	use doc && java-pkg_dojavadoc doc
+	use source && java-pkg_dosrc src
+}

dev-java/javacsv/metadata.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+	<maintainer>
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+</pkgmetadata>
+

dev-java/jflex/jflex-1.6.0-r1.ebuild

@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="dev-java/ant-core:0
+	>=dev-java/javacup-0.11b_beta20150326:0
+	dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+IUSE="${JAVA_PKG_IUSE} source vim-syntax"
+
+java_prepare() {
+	# use a more convenient version number
+	sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml
+	# fix bootstrapping
+	sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \
+		build.xml
+	# add javadoc capability to build.xml
+	sed -i s,"\(</project>\)",\
+"\n  <target depends=\"compile\" name=\"javadoc\">\n    <javadoc \
+packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\
+sources\" destdir=\"javadoc\" version=\"true\" />\n  </target>\n\1",g \
+		build.xml
+}
+
+# TODO: Try to avoid using bundled jar (See bug #498874)
+#
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to
+# avoid it would be to use a supplied pre-compiled .scanner file.
+
+EANT_GENTOO_CLASSPATH="ant-core"
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+WANT_ANT_TASKS="javacup"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# Compile another time, using our generated jar; for sanity.
+	cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+	java-pkg-2_src_compile
+}
+
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
+RESTRICT="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	java-pkg_dolauncher "${PN}" --main jflex.Main
+	java-pkg_register-ant-task
+
+	if use doc ; then
+		dodoc doc/manual.pdf changelog.md
+		dohtml -r doc/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/main
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/${PN}.vim"
+	fi
+}

dev-java/jflex/jflex-1.6.0-r2.ebuild

@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="JFlex is a lexical analyzer generator for Java"
+HOMEPAGE="http://www.jflex.de/"
+SRC_URI="http://${PN}.de/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="dev-java/ant-core:0
+	=dev-java/javacup-0.11a_beta20060608:0
+	dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}"
+
+IUSE="${JAVA_PKG_IUSE} source vim-syntax"
+
+java_prepare() {
+	# use a more convenient version number
+	sed -i s:"\(name=\"version\" value=\"\)[^\"]*\"":"\1${PV}\"":g build.xml
+	# fix bootstrapping
+	sed -i s:"\(name=\"bootstrap.version\" value=\"\)[^\"]*\"":"\1${PV}\"":g \
+		build.xml
+	# add javadoc capability to build.xml
+	sed -i s,"\(</project>\)",\
+"\n  <target depends=\"compile\" name=\"javadoc\">\n    <javadoc \
+packagenames=\"jflex\" sourcepath=\"src/main/java:build/generated-\
+sources\" destdir=\"javadoc\" version=\"true\" />\n  </target>\n\1",g \
+		build.xml
+}
+
+# TODO: Try to avoid using bundled jar (See bug #498874)
+#
+
+EANT_GENTOO_CLASSPATH_EXTRA="lib/${P}.jar"
+
+# Currently, this package uses an included JFlex.jar file to bootstrap.
+# Upstream was contacted and this bootstrap is really needed. The only way to
+# avoid it would be to use a supplied pre-compiled .scanner file.
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	javacup
+"
+WANT_ANT_TASKS="javacup"
+
+src_compile() {
+	java-pkg-2_src_compile
+
+	# Compile another time, using our generated jar; for sanity.
+	cp build/${P}.jar ${EANT_GENTOO_CLASSPATH_EXTRA}
+	java-pkg-2_src_compile
+}
+
+# EANT_TEST_GENTOO_CLASSPATH doesn't support EANT_GENTOO_CLASSPATH_EXTRA yet.
+RESTRICT="test"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar build/${P}.jar ${PN}.jar
+	java-pkg_dolauncher "${PN}" --main jflex.Main
+	java-pkg_register-ant-task
+
+	if use doc ; then
+		dodoc doc/manual.pdf changelog.md
+		dohtml -r doc/*
+		java-pkg_dojavadoc javadoc
+	fi
+
+	use examples && java-pkg_doexamples examples
+	use source && java-pkg_dosrc src/main
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}/lib/${PN}.vim"
+	fi
+}

dev-java/milton-mail-api/milton-mail-api-2.5.1.5-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,13 +21,17 @@ IUSE=""
 CDEPEND="
 	dev-java/milton-api:${SLOT}
 	dev-java/slf4j-api:0
-	java-virtuals/javamail:0
+	dev-java/oracle-javamail:0
 "
 
-RDEPEND="${CDEPEND}
+RDEPEND=">=virtual/jre-1.6
-	>=virtual/jre-1.5"
+	${CDEPEND}"
 
-DEPEND="${CDEPEND}
+DEPEND=">=virtual/jdk-1.6
-	>=virtual/jdk-1.5"
+	${CDEPEND}"
 
-JAVA_GENTOO_CLASSPATH="milton-api-${SLOT},javamail,slf4j-api"
+JAVA_GENTOO_CLASSPATH="
+	milton-api-${SLOT}
+	oracle-javamail
+	slf4j-api
+"

dev-java/qdox/qdox-1.12-r2.ebuild

@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Parser for extracting class/interface/method definitions"
+HOMEPAGE="https://github.com/codehaus/qdox"
+SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz  "
+
+LICENSE="Apache-2.0"
+SLOT="1.12"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${P}-SNAPSHOT"
+
+CDEPEND="dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip:0
+	dev-java/byaccj:0
+	dev-java/jflex:0
+	dev-java/jmock:1.0
+	test? ( dev-java/junit:0 )
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+java_prepare() {
+	if ! use test ; then
+		rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java
+		rm -rf src/java/com/thoughtworks/qdox/junit
+		rm -rf src/test
+	fi
+}
+
+src_compile() {
+	jflex \
+		src/grammar/lexer.flex \
+		--skel src/grammar/skeleton.inner \
+		-d src/java/com/thoughtworks/qdox/parser/impl/ || die
+	byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die
+	mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die
+
+	# create jar
+	mkdir -p build/classes || die
+
+	local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)"
+
+	if use test ; then
+		cp="${cp}:$(java-pkg_getjars --build-only junit)"
+	fi
+
+	ejavac -sourcepath . -d build/classes -classpath "${cp}" \
+		$(find . -name "*.java") || die "Cannot compile sources"
+
+	mkdir dist || die
+	cd build/classes || die
+	jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR"
+
+	# generate javadoc
+	if use doc ; then
+		cd "${S}"
+		mkdir javadoc || die
+		javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}"
+	fi
+}
+
+src_test() {
+	java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \
+		com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_register-ant-task
+
+	use source && java-pkg_dosrc src/java/com
+	use doc && java-pkg_dojavadoc javadoc
+}

dev-java/slf4j-ext/Manifest

@@ -1 +1,2 @@
 DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f

dev-java/slf4j-ext/files/1.7.7-build.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-ext" default="jar" basedir=".">
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="${ant.project.name}" />
+	<property name="maven.build.dir" value="target" />
+	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
+	<property name="maven.build.srcDir.0" value="src/main/java" />
+	<property name="maven.build.resourceDir.0" value="src/main/resources" />
+	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
+	<property name="maven.build.testDir.0" value="src/test/java" />
+	<property name="maven.build.testResourceDir.0" value="src/test/resources" />
+	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
+	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
+
+	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
+	<property name="maven.settings.offline" value="false" />
+	<property name="maven.settings.interactiveMode" value="true" />
+
+	<path id="build.classpath"/>
+	<path id="build.test.classpath" />
+
+	<target name="clean" description="Clean the output directory">
+		<delete dir="${maven.build.dir}" />
+	</target>
+
+	<target name="compile" description="Compile the code">
+		<mkdir dir="${maven.build.outputDir}" />
+		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="false" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
+			<src>
+				<pathelement location="${maven.build.srcDir.0}" />
+			</src>
+			<classpath refid="build.classpath" />
+		</javac>
+		<copy todir="${maven.build.outputDir}">
+			<fileset dir="${maven.build.resourceDir.0}" />
+		</copy>
+	</target>
+
+	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
+		<mkdir dir="${maven.build.testOutputDir}" />
+		<javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="false" optimize="true" deprecation="false" target="1.5" verbose="false" fork="false" source="1.5">
+			<src>
+				<pathelement location="${maven.build.testDir.0}" />
+			</src>
+			<classpath>
+				<path refid="build.test.classpath" />
+				<pathelement location="${maven.build.outputDir}" />
+			</classpath>
+		</javac>
+	</target>
+
+	<target name="test" depends="compile-tests" description="Run the test cases">
+		<mkdir dir="${maven.test.reports}" />
+		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+			<sysproperty key="basedir" value="." />
+			<formatter type="xml" />
+			<formatter type="plain" usefile="false" />
+			<classpath>
+				<path refid="build.test.classpath" />
+				<pathelement location="${maven.build.outputDir}" />
+				<pathelement location="${maven.build.testOutputDir}" />
+			</classpath>
+			<batchtest todir="${maven.test.reports}" unless="test">
+				<fileset dir="${maven.build.testDir.0}">
+					<include name="**/Test*.java" />
+					<include name="**/*Test.java" />
+					<include name="**/*TestCase.java" />
+					<exclude name="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+			<batchtest todir="${maven.test.reports}" if="test">
+				<fileset dir="${maven.build.testDir.0}">
+					<include name="**/${test}.java" />
+					<exclude name="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+
+
+	<target name="javadoc" description="Generates the Javadoc of the application">
+		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" linksource="false" breakiterator="false" />
+	</target>
+
+	<target name="jar" depends="compile" description="Package the application">
+		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
+	</target>
+</project>

dev-java/slf4j-ext/slf4j-ext-1.7.7.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple Logging Facade for Java"
+HOMEPAGE="http://www.slf4j.org/"
+SRC_URI="http://www.slf4j.org/dist/${P/-ext/}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/slf4j-api:0
+	dev-java/javassist:3
+	dev-java/cal10n:0
+	dev-java/commons-lang:2.1"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P/-ext/}/${PN}"
+
+RESTRICT="test" # causes loop with log4j:2
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="slf4j-api,javassist-3,cal10n,commons-lang-2.1"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/target/${PN}.jar
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+	use source && java-pkg_dosrc "${S}"/src/main/java/org
+}

dev-java/slf4j-nop/Manifest

@@ -1,3 +1 @@
-DIST slf4j-1.6.6.tar.gz 2703160 SHA256 d169a50fd535417bde88e342a21c1674fef0a560cbe249ff05e56b8178589b55 SHA512 bb22e3c38d451893b79f382d790eb1058465208a1ab462999894c12375ed6b38daced6389d2a8e6015cc718479bfbc50b2b58a354e99a2aadec7c9decd59423f WHIRLPOOL 1903a6513c1b7e133240c19bcf3e6c506ba3c080be66d000c7d3f382c750a8a4ad47faffe9352937bbf77e814152c58e1163b76b012d7d65ad4c3cc9bd9e290d
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
-DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
-DIST slf4j-nop-1.5.11-sources.jar 5372 SHA256 2cdf4de025c5e564de45599aeaf6c28ab0dfb77e8e9fd139f4fd070f1926a549 SHA512 012dac709c70c3bf514f767fd26efbf46d795440aea206353b8988112992a024b1a916a6c62d9a6b9cd8c75febf93b0dc5a0df0050b71bd038c1d50cba13217d WHIRLPOOL 70e32cc0f5d755ee5dad0cd654d37a990a9570a21ac6bc384dad8733f2cbd6a61bc6a46c5558ee103ff79428d4b881111382894cc785093fa481d9283c8b54b3

dev-java/slf4j-nop/files/1.6.6-build.xml

@@ -1,19 +0,0 @@
-<project name="slf4j-api" default="jar">
-	<target name="compile">
-		<mkdir dir="build"/>
-		<javac srcdir="slf4j-nop/src/main/java/" destdir="build" classpath="${gentoo.classpath}">
-		</javac>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="slf4j-nop.jar" basedir="build">
-			<exclude name="org/slf4j/impl/**"/>
-		</jar>
-	</target>
-
-	<target name="javadoc" depends="compile">
-		<mkdir dir="docs"/>
-		<javadoc sourcepath="slf4j-nop/src/main/java/" destdir="docs" classpath="${gentoo.classpath}"/>
-	</target>
-
-</project>

dev-java/slf4j-nop/files/build.xml

@@ -1,17 +0,0 @@
-<project name="slf4j-api" default="jar">
-	<target name="compile">
-		<mkdir dir="build"/>
-		<javac srcdir="." destdir="build" classpath="${gentoo.classpath}">
-		</javac>
-	</target>
-
-	<target name="jar" depends="compile">
-		<jar destfile="slf4j-nop.jar" basedir="build"/>
-	</target>
-
-	<target name="javadoc" depends="compile">
-		<mkdir dir="docs"/>
-		<javadoc sourcepath="." destdir="docs" classpath="${gentoo.classpath}"/>
-	</target>
-
-</project>

dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild

@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-# Get from http://www.slf4j.org/dist/${P/-nop/}.tar.gz
-SRC_URI="mirror://gentoo/${P}-sources.jar"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEP="~dev-java/slf4j-api-${PV}:0"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-EANT_GENTOO_CLASSPATH="slf4j-api"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/build.xml . || die
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc org
-}

dev-java/slf4j-nop/slf4j-nop-1.6.6.ebuild

@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/"
-SRC_URI="http://www.slf4j.org/dist/${P/-nop/}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEP="~dev-java/slf4j-api-${PV}:0"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${P/-api/}"
-
-EANT_GENTOO_CLASSPATH="slf4j-api"
-
-S="${WORKDIR}/${P/-nop/}"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
-
-	# for ecj-3.5
-	java-ant_rewrite-bootclasspath auto
-
-	cd "${S}"
-	rm *.jar integration/lib/*.jar
-}
-
-src_install() {
-	java-pkg_dojar ${PN}.jar
-	use doc && java-pkg_dojavadoc docs
-	use source && java-pkg_dosrc org
-}

dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,16 +14,19 @@ SRC_URI="http://www.slf4j.org/dist/${P/-nop/}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-COMMON_DEP="dev-java/slf4j-api:0"
+CDEPEND="dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
+	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip
-	${COMMON_DEP}
+	test? (
-	test? ( dev-java/junit:4 )"
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)
+	${CDEPEND}"
 
 S="${WORKDIR}/${P/-nop/}/${PN}"
 

dev-libs/angelscript/Manifest

@@ -1 +1,2 @@
 DIST angelscript_2.29.2.zip 1583192 SHA256 c5d549bcd2d04e0dbdfdeea1e1446a34bc9dc449efe0d6fb7fabfb98ee269a8b SHA512 76537a35bfa8f5f90d48a601f4cf1ff6cf8cd648c93b2ea17d3f0fbc7ccaa3d915bbe49d758916d0626a026ece8ecd1646bbb99db41d5a4c9f7c87d915c0d4ff WHIRLPOOL 1f24f56c7601b5f731a4e631f995668f268c26d57dce93944a758c5efd86ed651fd842b16419dad73eb8e7df641ccc5b4a226ccfc99fe1cc9a4c736e5d3076eb
+DIST angelscript_2.30.1.zip 1859238 SHA256 a492331d3ede33f96a3b882bb09fff0f71e6e9479f9b5d78fdcf08585038d583 SHA512 7669e6b9814e3fc913e84018786d5c142b5a60c5e3d5f4d01bfc2e794cf97e1fc347cb7258d7266a3b1d1f813fc6c1a2781680fbe1c1d2275e3fa1ed2a416e52 WHIRLPOOL fff8df92f53f18789d36f3023cdaeb91bbe804dd3e4f6e3ebb54f602a35b6421d0d400850d9bc4bb079cb2e1c25578e1443ecab524ba68b22af4c1f29f0a6429

dev-libs/angelscript/angelscript-2.30.1.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="A flexible, cross-platform scripting library"
+HOMEPAGE="http://www.angelcode.com/angelscript/"
+SRC_URI="http://www.angelcode.com/angelscript/sdk/files/angelscript_${PV}.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/sdk
+
+pkg_setup() {
+	tc-export CXX AR RANLIB
+}
+
+src_prepare() {
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	emake -C ${PN}/projects/gnuc
+}
+
+multilib_src_install() {
+	emake -C ${PN}/projects/gnuc LIBRARYDEST="${D}"/usr/$(get_libdir)/ INCLUDEDEST="${D}"/usr/include/ install
+	use static-libs || { rm "${D}"/usr/$(get_libdir)/libangelscript.a || die ; }
+}
+
+multilib_src_install_all() {
+	use doc && dohtml -r "${WORKDIR}"/sdk/docs/*
+}

dev-python/matplotlib/matplotlib-9999.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 PYTHON_REQ_USE='tk?'
 
-inherit distutils-r1 eutils flag-o-matic git-r3 virtualx
+inherit distutils-r1 eutils flag-o-matic git-r3 virtualx toolchain-funcs
 
 DESCRIPTION="Pure python plotting library with matlab like syntax"
 HOMEPAGE="http://matplotlib.org/"
@@ -65,8 +65,13 @@ DEPEND="${COMMON_DEPEND}
 		)"
 
 RDEPEND="${COMMON_DEPEND}
-	dev-python/pyparsing[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
-	cairo? ( dev-python/pycairo[${PYTHON_USEDEP}] )
+	cairo? (
+		|| (
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/cairocffi[${PYTHON_USEDEP}]
+			)
+		)
 	excel? ( dev-python/xlwt[${PY2_USEDEP}] )
 	fltk? ( dev-python/pyfltk[${PY2_USEDEP}] )
 	gtk3? (
@@ -83,7 +88,7 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
 	qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
-	qt5? ( dev-python/PyQt5[X,${PYTHON_USEDEP}] )
+	qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
 	"
 
 PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
@@ -94,7 +99,7 @@ REQUIRED_USE="
 	gtk? ( ${PY2_FLAGS} )
 	wxwidgets? ( ${PY2_FLAGS} )
 	test? (
-		cairo fltk latex pyside qt4 tk wxwidgets
+		cairo fltk latex pyside qt5 qt4 tk wxwidgets
 		|| ( gtk gtk3 )
 		)"
 
@@ -152,6 +157,7 @@ python_prepare_all() {
 python_configure_all() {
 	append-flags -fno-strict-aliasing
 	append-cppflags -DNDEBUG  # or get old trying to do triangulation
+	tc-export PKG_CONFIG
 }
 
 python_configure() {

dev-python/pbr/Manifest

@@ -6,3 +6,4 @@ DIST pbr-1.1.1.tar.gz 97607 SHA256 3d63cc8e145e5e20624859d6453d783ae1451704483ae
 DIST pbr-1.2.0.tar.gz 99092 SHA256 1543fc3e00261369c160fc8cf700717aad15fbc1f0ea0e8dc4f372cb91a655d0 SHA512 e5adc396596f4b42a8eb569c970a3cf571b119740b9ca221dc57c6f34c088df1dbfca3c704b7dd3b2d6676d48f9eba17ddb535e28ef6ab0572206620b894c5a2 WHIRLPOOL 6baaeecc6dc7c228d76f7a8f42af19cf179540483267ea863323e09654a3faac0cabbea6dc6d83b36e0c4496cd5872f05e1e9b7f5c5a36272fc746f84e2dd504
 DIST pbr-1.3.0.tar.gz 99701 SHA256 1a6f8d514fc11d2571c75c207d932c106f024f199b5f12d25f8ca022b026c59d SHA512 29f661a1d8bed6df5017bb342209e702f19e72c321952a9131d84222162599208bea67922485a87b6f3505e072d62cb13fdfcdd4fbb7c085b3476f6ff5a07df9 WHIRLPOOL 978d943efd2f582b8067a898f102005c749df8addee4ec3d6f4f4c4078e3190263ceba46409281e7bd38ab59ad12f45d3d208cfd6ba58ece72d973161dfd08e9
 DIST pbr-1.4.0.tar.gz 102181 SHA256 f080232fb6b208615b4c1854bf4277bb097d19c9ef89f94f203c1436fe600e92 SHA512 c6ccc8fd6598e089eb80342ce0d76f26dd1242eedb64aa7c0020be43ba74b1591cff52a5eec9d9c9b958315e7902b78bf120bf758aacc28fcec3f07ac5173150 WHIRLPOOL 9cee1204273256588982065c388c06e053253ebd2ae242a89b5f60a8052c1fe58e2136a30c289b8278131e9487a902ce8902e883cbd3b73c34f9fe87de1229c5
+DIST pbr-1.5.0.tar.gz 99436 SHA256 bd6db6ecddf5d8ab40d7d554508c29cfe0d150a1789f07d4dd32abe896068e7e SHA512 249f5db847199eca7d39ca7a80509a8b5b86c9163474463e00d1612905b84fab11208c79408154983269d9a096d3337e3ab44968e281989b0ebf7e81fd7ffde1 WHIRLPOOL d53637256da8e1e67aa2d1f921c006d94fa5c96b9844ab39a9991d6a764e344f305ad68aa8476497b817af7c53f7acaa354eecd1d85321daff636f5ac4c903a5

dev-python/pbr/pbr-1.4.0.ebuild

@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 DEPEND="

dev-python/pbr/pbr-1.5.0.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+RDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+
+# Requ'd for testsuite
+DISTUTILS_IN_SOURCE_BUILD=1
+
+# This normally actually belongs here.
+python_prepare_all() {
+	# This test passes when run within the source and doesn't represent a failure, but rather
+	# a gentoo sandbox constraint
+	# Rm tests that rely upon the package being already installed and fail
+	sed -e s':test_console_script_develop:_&:' \
+		-e s':test_console_script_install:_&:' \
+		-e s':test_sdist_extra_files:_&:' \
+		-e s':test_command_hooks:_&:' \
+		-e s':test_sdist_git_extra_files:_&:' \
+		-i pbr/tests/test_core.py || die
+	sed -e s':test_command_hooks:_&:' \
+		-e s':test_global_setup_hooks:_&:' \
+		-i pbr/tests/test_hooks.py || die
+	einfo "rogue tests disabled"
+
+	distutils-r1_python_prepare_all
+}
+
+PATCHES=(  )
+
+python_test() {
+	# Note; Tests, that have been removed, pass once package is emerged.
+	esetup.py testr
+}

dev-ruby/netrc/netrc-0.9.0-r1.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_EXTRADOC="changelog.txt Readme.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This library reads and writes .netrc files"
+HOMEPAGE="https://github.com/geemus/netrc"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e '/test_encrypted_roundtrip/a skip "depends on external gpg test keys"' -i test/test_netrc.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S testrb test/test_*.rb || die
+}

dev-ruby/omniauth/omniauth-1.2.2-r1.ebuild

@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
+HOMEPAGE="https://github.com/intridea/omniauth"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack dev-ruby/hashie"
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/rack-test )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' \
+		Rakefile ${PN}.gemspec || die "sed failed"
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die "sed failed"
+	# maruku fails, resorting to default markdown implementation
+	sed -i -e '/maruku/d' .yardopts || die "sed failed"
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die "yard failed"
+	fi
+}

dev-vcs/git-imerge/Manifest

@@ -0,0 +1 @@
+DIST git-imerge-0.7.0.tar.gz 52040 SHA256 0688fe4c13c65c6fa90989c57c04fafe34114889d2d100b6e62538e8f2b0dc02 SHA512 140fd1b056097ff59848c4312ca02a1bd9ff136b7680e25b8575d3824c9b189fb2f8de2b5100966f774f003bb538f1e649e758edf5ab4bd3b1f9b824645738c4 WHIRLPOOL ab8e412039b82d2d057cba7c4ffe3a392653e88cb2b0492cd7a1da57896e59115c5e4d737b6389ddcf177d0c30ef4d4dc0722d9dc16bd93f6647016ff488588f

dev-vcs/git-imerge/files/git-imerge.bashcomplete

@@ -0,0 +1,267 @@
+__git_imerge_branches () {
+	git for-each-ref --format='%(refname)' refs/heads/ refs/remotes/ 2>/dev/null |
+	sed -e 's!^refs/heads/!!' -e 's!^refs/remotes/!!'
+}
+
+__git_imerge_names () {
+	git for-each-ref --format='%(refname)' refs/imerge/ 2>/dev/null |
+	sed -e 's/^refs\/imerge\/\(.*\)\/.*/\1/' -e '/manual/d' -e '/auto/d'
+}
+
+__git_imerge_goals="\
+merge
+rebase
+rebase-with-history
+full
+"
+
+__git_imerge_commands="\
+start
+merge
+rebase
+continue
+finish
+diagram
+list
+init
+record
+autofill
+simplify
+remove
+reparent
+"
+
+__git_imerge_start_options="\
+--help
+--manual
+--name
+--branch
+--goal
+--first-parent
+"
+
+__git_imerge_init_options=$__git_imerge_start_options
+
+__git_imerge_continue_options="\
+--help
+--name
+--edit
+--no-edit
+"
+
+__git_imerge_finish_options="\
+--help
+--name
+--goal
+--branch
+--force
+"
+
+__git_imerge_simplify_options=$__git_imerge_finish_options
+
+__git_imerge_merge_options="\
+--help
+--name
+--goal
+--branch
+--manual
+"
+
+__git_imerge_list_options="\
+--help
+"
+
+__git_imerge_reparent_options=$__git_imerge_list_options
+
+__git_imerge_record_options="\
+--help
+--name
+--edit
+--no-edit
+"
+
+__git_imerge_autofill_options="\
+--help
+--name
+"
+
+__git_imerge_diagram_options="\
+--help
+--name
+--commits
+--frontier
+--html
+--color
+--no-color
+"
+
+__git_imerge_remove_options=$__git_imerge_autofill_options
+
+__git_imerge_rebase_options=$__git_imerge_merge_options
+
+__git-imerge_start_completion() {
+	case "$1_$cur" in
+	--help_|--branch_|_--branch=|--name_|_--name=)
+		return
+		;;
+	--goal_*|*_--goal=*)
+		__gitcomp "$__git_imerge_goals"  "" "${cur##--goal=}"
+		return
+		;;
+	*-|*_-*?)
+		__gitcomp "$__git_imerge_start_options"
+		return
+		;;
+	esac
+	__gitcomp "$(__git_imerge_branches)"
+}
+
+__git-imerge_init_completion() {
+	__git-imerge_start_completion $1
+}
+
+__git-imerge_continue_completion() {
+	case "$1_$cur" in
+	--help_)
+		return
+		;;
+	--name_*|*_--name=*)
+                __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+                return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_continue_options"
+}
+
+__git-imerge_finish_completion() {
+	case "$1_$cur" in
+	--help_)
+		return
+		;;
+	--goal_*|*_--goal=*)
+		__gitcomp "$__git_imerge_goals" "" "${cur##--goal=}"
+		return
+		;;
+	--branch_*|*_--branch=*)
+		__gitcomp "$(__git_imerge_branches)" "" "${cur##--branch=}"
+		return
+		;;
+	--name_*|*_--name=*)
+                __gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+                return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_finish_options"
+}
+
+__git-imerge_simplify_completion() {
+	__git-imerge_finish_completion $1
+}
+
+__git-imerge_merge_completion() {
+	case "$1_$cur" in
+	--help_|--branch_|_--branch=|--name_|_--name=)
+		return
+		;;
+	--goal_*|*_--goal=*)
+		__gitcomp "$__git_imerge_goals" "" "${cur##--goal=}"
+		return
+		;;
+	*-|*_-*?)
+		__gitcomp "$__git_imerge_merge_options"
+		return
+		;;
+	esac
+	__gitcomp "$(__git_imerge_branches)"
+}
+
+__git-imerge_rebase_completion() {
+	__git-imerge_merge_completion $1
+}
+
+__git-imerge_list_completion() {
+	case "$1" in
+	--help)
+		return
+		;;
+	esac
+	__gitcomp "$__git_imerge_list_options"
+}
+
+__git-imerge_reparent_completion() {
+	__git-imerge_list_completion $1
+}
+
+__git-imerge_record_completion() {
+	case "$1_$cur" in
+	--help_)
+		return
+		;;
+	--name_*|*_--name=*)
+		__gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+                return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_record_options"
+}
+
+__git-imerge_autofill_completion() {
+	case "$1_$cur" in
+	--help_)
+		return
+		;;
+	--name_*|*_--name=*)
+		__gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+                return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_autofill_options"
+}
+
+__git-imerge_remove_completion() {
+	__git-imerge_autofill_completion $1
+}
+
+__git-imerge_diagram_completion() {
+	case "$1_$cur" in
+	--help_|--html_|_--html=)
+		return
+		;;
+	--name_*|*_--name=*)
+		__gitcomp "$(__git_imerge_names)" "" "${cur##--name=}"
+		return
+                ;;
+	esac
+	__gitcomp "$__git_imerge_diagram_options"
+}
+
+_git_imerge () {
+	# Disable default filename completion.  Note that "compopt" is only
+	# available in Bash 4 and newer, so we check for existence before
+	# trying to use it.
+	type compopt >/dev/null 2>&1 && compopt +o default +o bashdefault
+
+	local i command cur_opt
+	for ((i=0; i <= ${cword}; i++)); do
+		if [ -n "$command" ] && [ "${words[i]}" != "$cur" ]; then
+			cur_opt="${words[i]}"
+		fi
+		if [ -z "$command" ] && \
+		   [ "$i" -lt "${cword}" ] && \
+		   [[ "${words[i-1]}" == *"imerge"* ]]
+		then
+			command="${words[i]}"
+		fi
+	done
+
+	if test -z "$command"; then
+		__gitcomp "$__git_imerge_commands"
+		return
+	fi
+
+	if [ -z `type -t __git-imerge_"$command"_completion "$cur_opt"` ]; then
+		return
+	fi
+
+	__git-imerge_"$command"_completion "$cur_opt"
+}

dev-vcs/git-imerge/git-imerge-0.7.0.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit bash-completion-r1 python-r1
+
+DESCRIPTION="Incremental merge for git"
+HOMEPAGE="https://github.com/mhagger/git-imerge"
+SRC_URI="https://github.com/mhagger/git-imerge/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="dev-python/docutils"
+
+src_compile() {
+	rst2html.py README.rst > README.html || die
+	rst2s5.py \
+		--theme=small-white \
+		--current-slide \
+		doc/presentations/GitMerge-2013/talk.rst doc/presentations/GitMerge-2013/talk.html || die
+}
+
+src_install() {
+	dobin ${PN}
+	python_replicate_script "${D}"/usr/bin/${PN}
+	newbashcomp "${FILESDIR}"/git-imerge.bashcomplete git-imerge
+	dodoc README.rst
+	dohtml README.html doc/presentations/GitMerge-2013/talk.html
+}

dev-vcs/git-imerge/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+</pkgmetadata>

eclass/cron.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: cron
+# @ECLASS: cron.eclass
 # @MAINTAINER:
 # cron-bugs@gentoo.org
 # @AUTHOR:

eclass/distutils-r1.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: distutils-r1
+# @ECLASS: distutils-r1.eclass
 # @MAINTAINER:
 # Python team <python@gentoo.org>
 # @AUTHOR:

eclass/dotnet.eclass

@@ -36,7 +36,8 @@ for x in ${USE_DOTNET}; do
 done
 
 # @FUNCTION: dotnet_pkg_setup
-# @DESCRIPTION:  This function set FRAMEWORK
+# @DESCRIPTION:
+# This function set FRAMEWORK.
 dotnet_pkg_setup() {
 	for x in ${USE_DOTNET} ; do
 		case ${x} in
@@ -79,14 +80,16 @@ export XDG_CONFIG_HOME="${T}"
 unset MONO_AOT_CACHE
 
 # @FUNCTION: exbuild
-# @DESCRIPTION: run xbuild with Release configuration and configurated FRAMEWORK
+# @DESCRIPTION:
+# Run xbuild with Release configuration and configurated FRAMEWORK.
 exbuild() {
 	elog "xbuild ""$@"" /p:Configuration=Release /tv:4.0 /p:TargetFrameworkVersion=v""${FRAMEWORK}"" || die"
 	xbuild "$@" /p:Configuration=Release /tv:4.0 /p:TargetFrameworkVersion=v"${FRAMEWORK}" || die
 }
 
 # @FUNCTION: egacinstall
-# @DESCRIPTION:  install package to GAC
+# @DESCRIPTION:
+# Install package to GAC.
 egacinstall() {
 	use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
 	gacutil -i "${1}" \
@@ -97,7 +100,8 @@ egacinstall() {
 }
 
 # @FUNCTION: dotnet_multilib_comply
-# @DESCRIPTION:  multilib comply
+# @DESCRIPTION:
+# multilib comply
 dotnet_multilib_comply() {
 	use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}"
 	local dir finddirs=() mv_command=${mv_command:-mv}

eclass/games.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: games
+# @ECLASS: games.eclass
 # @MAINTAINER:
 # Games team <games@gentoo.org>
 # @BLURB: Standardizing the install of games.

eclass/gnome-games.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: gnome-games
+# @ECLASS: gnome-games.eclass
 # @MAINTAINER:
 # Gnome team <gnome@gentoo.org>
 # @AUTHOR:
@@ -95,7 +95,7 @@ gnome-games_pkg_preinst() {
 	games_pkg_preinst
 }
 
-# @FUNCTION: gnome-games_pkg_preinst
+# @FUNCTION: gnome-games_pkg_postinst
 # @DESCRIPTION:
 # Set proper phase defaults
 gnome-games_pkg_postinst() {

eclass/gnome-python-common-r1.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: gnome-python-common-r1
+# @ECLASS: gnome-python-common-r1.eclass
 # @MAINTAINER:
 # GNOME team <gnome@gentoo.org>
 # @AUTHOR:

eclass/kde4-base.eclass

@@ -489,6 +489,11 @@ _calculate_live_repo() {
 				*)
 					# branch
 					branch_prefix="branches/KDE/$(get_kde_version)"
+
+					if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+						branch_prefix="branches/Applications/$(get_kde_version)"
+					fi
+
 					# @ECLASS-VARIABLE: ESVN_PROJECT_SUFFIX
 					# @DESCRIPTION
 					# Suffix appended to ESVN_PROJECT depending on fetched branch.
@@ -894,12 +899,10 @@ kde4-base_pkg_postinst() {
 		fi
 		# for all 3rd party soft tell user that he SHOULD install kdebase-startkde or kdebase-runtime-meta
 		if [[ ${KDEBASE} != kde-base ]] && \
-				! has_version 'kde-apps/kdebase-runtime-meta' && \
+				! has_version 'kde-apps/kdebase-runtime-meta'; then
-				! has_version 'kde-base/kdebase-startkde'; then
 			if [[ ${KDE_REQUIRED} == always ]] || ( [[ ${KDE_REQUIRED} == optional ]] && use kde ); then
 				echo
-				ewarn "WARNING! Your system configuration contains neither \"kde-base/kdebase-runtime-meta\""
+				ewarn "WARNING! Your system configuration does not contain \"kde-apps/kdebase-runtime-meta\"."
-				ewarn "nor \"kde-base/kdebase-startkde\". You need one of above."
 				ewarn "With this setting you are unsupported by KDE team."
 				ewarn "All missing features you report for misc packages will be probably ignored or closed as INVALID."
 			fi

eclass/kde5-functions.eclass

@@ -26,12 +26,12 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.11.0}
+: ${FRAMEWORKS_MINIMAL:=5.12.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.3.1}
+: ${PLASMA_MINIMAL:=5.3.2}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
@@ -188,7 +188,11 @@ add_kdeapps_dep() {
 		version=${PV}
 	elif [[ -z "${version}" ]] ; then
 		# In KDE applications world, 5.9999 > yy.mm.x
-		[[ ${PV} = 5.9999 ]] && version=5.9999 || version=${KDE_APPS_MINIMAL}
+		if [[ ${PV} = 5.9999 || ${PV} = 9999 ]]; then
+			version=5.9999
+		else
+			version=${KDE_APPS_MINIMAL}
+		fi
 	fi
 
 	_add_kdecategory_dep kde-apps "${1}" "${2}" "${version}"

eclass/kde5.eclass

@@ -77,6 +77,11 @@ fi
 # generate and install KDE handbook.
 : ${KDE_HANDBOOK:=false}
 
+# @ECLASS-VARIABLE: KDE_DOC_DIR
+# @DESCRIPTION:
+# Defaults to "doc". Otherwise, use alternative KDE handbook path.
+: ${KDE_DOC_DIR:=doc}
+
 # @ECLASS-VARIABLE: KDE_TEST
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -137,7 +142,6 @@ case ${KDE_AUTODEPS} in
 		if [[ ${CATEGORY} = kde-plasma ]]; then
 			RDEPEND+="
 				!kde-apps/kde4-l10n[-minimal(-)]
-				!kde-base/kde-l10n:4[-minimal(-)]
 			"
 		fi
 
@@ -272,13 +276,25 @@ _calculate_live_repo() {
 			# (anonsvn) with anything else you might want to use.
 			ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
 
-			local branch_prefix="KDE"
+			local branch_prefix="trunk/KDE"
+
+			if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then
+				branch_prefix="branches/Applications/$(get_version_component_range 1-2)"
+			fi
+
+			if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then
+				branch_prefix="branches/plasma/$(get_version_component_range 1-2)"
+			fi
+
+			local _kmname
 
 			if [[ -n ${KMNAME} ]]; then
-				branch_prefix="${KMNAME}"
+				_kmname=${KMNAME}
+			else
+				_kmname=${PN}
 			fi
 
-			ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${branch_prefix}/${PN}"
+			ESVN_REPO_URI="${ESVN_MIRROR}/${branch_prefix}/${_kmname}"
 			;;
 		git)
 			# @ECLASS-VARIABLE: EGIT_MIRROR
@@ -367,7 +383,7 @@ kde5_src_prepare() {
 
 	# only enable handbook when required
 	if ! use_if_iuse handbook ; then
-		comment_add_subdirectory doc
+		comment_add_subdirectory ${KDE_DOC_DIR}
 	fi
 
 	# enable only the requested translations
@@ -388,8 +404,8 @@ kde5_src_prepare() {
 			popd > /dev/null
 		fi
 
-		if [[ ${KDE_HANDBOOK} = true ]] ; then
+		if [[ ${KDE_HANDBOOK} = true && -d ${KDE_DOC_DIR} ]] ; then
-			pushd doc > /dev/null
+			pushd ${KDE_DOC_DIR} > /dev/null
 			for lang in *; do
 				if ! has ${lang} ${LINGUAS} ; then
 					comment_add_subdirectory ${lang}

eclass/mozcoreconf-v3.eclass

@@ -103,7 +103,7 @@ moz_pkgsetup() {
 }
 
 # @FUNCTION: mozconfig_init
-# @DESCRIPTION
+# @DESCRIPTION:
 # Initialize mozilla configuration and populate with core settings.
 # This should be called in src_configure before any other mozconfig_* functions.
 mozconfig_init() {

eclass/multibuild.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: multibuild
+# @ECLASS: multibuild.eclass
 # @MAINTAINER:
 # Michał Górny <mgorny@gentoo.org>
 # @AUTHOR:

eclass/mysql-multilib.eclass

@@ -291,13 +291,13 @@ if [[ ${HAS_TOOLS_PATCH} ]] ; then
 			ssl? ( >=dev-libs/openssl-1.0.0:0=[static-libs?] )
 			>=sys-libs/zlib-1.2.3:0=[static-libs?]
 		)
-		tools? ( sys-libs/ncurses ) embedded? ( sys-libs/ncurses )
+		tools? ( sys-libs/ncurses:= ) embedded? ( sys-libs/ncurses:= )
 	"
 else
 	DEPEND+="
 		ssl? ( >=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
 		>=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-		sys-libs/ncurses[${MULTILIB_USEDEP}]
+		sys-libs/ncurses:=[${MULTILIB_USEDEP}]
 	"
 fi
 

eclass/python-any-r1.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: python-any-r1
+# @ECLASS: python-any-r1.eclass
 # @MAINTAINER:
 # Python team <python@gentoo.org>
 # @AUTHOR:

eclass/python-r1.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: python-r1
+# @ECLASS: python-r1.eclass
 # @MAINTAINER:
 # Python team <python@gentoo.org>
 # @AUTHOR:

eclass/python-single-r1.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: python-single-r1
+# @ECLASS: python-single-r1.eclass
 # @MAINTAINER:
 # Python team <python@gentoo.org>
 # @AUTHOR:

eclass/python-utils-r1.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: python-utils-r1
+# @ECLASS: python-utils-r1.eclass
 # @MAINTAINER:
 # Python team <python@gentoo.org>
 # @AUTHOR:

eclass/readme.gentoo.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: readme.gentoo
+# @ECLASS: readme.gentoo.eclass
 # @MAINTAINER:
 # Pacho Ramos <pacho@gentoo.org>
 # @AUTHOR:

eclass/ruby-single.eclass

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS: ruby-single
+# @ECLASS: ruby-single.eclass
 # @MAINTAINER:
 # Ruby team <ruby@gentoo.org>
 # @AUTHOR:

eclass/wxwidgets.eclass

@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-# @ECLASS:			wxwidgets.eclass
+# @ECLASS: wxwidgets.eclass
 # @MAINTAINER:
-#  wxwidgets@gentoo.org
+# wxwidgets@gentoo.org
-# @BLURB:			Manages build configuration for wxGTK-using packages.
+# @BLURB: Manages build configuration for wxGTK-using packages.
 # @DESCRIPTION:
 #  This eclass gives ebuilds the ability to build against a specific wxGTK
 #  SLOT and profile without interfering with the system configuration.  Any

games-emulation/pcsx2/Manifest

@@ -0,0 +1 @@
+DIST pcsx2-1.3.1.tar.gz 20719203 SHA256 60ba9f7f85bf4337ca6962f9b437d549f16fc04ea0b6b261d7521e0416c2b8c9 SHA512 d09364841d8122abc33619b66c6a5bfac7c3979442a257fe6967e516289b6584546e5b512ab8987c04563beb68a587bd44ddc4fac122633598fe89447c4025c3 WHIRLPOOL ec97823c0642a5fa2e0829465b864c09c4596d0c8eebc477b4db463ff6a3af6493480fbce5586b0e085e7d96b6d2837a087f7ceea77b45ed5a2ddefa683c99ba

games-emulation/pcsx2/files/pcsx2-1.3.1-cflags.patch

@@ -0,0 +1,776 @@
+From 683b871c320ec14b777ec3937dc609b69b3cf5a5 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Sat, 8 Aug 2015 19:12:37 +0300
+Subject: [PATCH 3/3] Use global compiler optimization flags instead of
+ defining them for every plugin/binary
+
+---
+ cmake/BuildParameters.cmake                        | 35 ++++++++++-------
+ common/src/Utilities/CMakeLists.txt                | 45 +---------------------
+ common/src/x86emitter/CMakeLists.txt               | 45 +---------------------
+ pcsx2/CMakeLists.txt                               | 45 +---------------------
+ plugins/CDVDiso/src/CMakeLists.txt                 | 16 +-------
+ plugins/CDVDlinuz/Src/CMakeLists.txt               | 21 +---------
+ plugins/CDVDnull/CMakeLists.txt                    | 16 +-------
+ plugins/FWnull/CMakeLists.txt                      | 16 +-------
+ plugins/GSdx/CMakeLists.txt                        |  9 +----
+ plugins/GSnull/CMakeLists.txt                      | 16 +-------
+ plugins/PadNull/CMakeLists.txt                     | 16 +-------
+ plugins/SPU2null/CMakeLists.txt                    | 16 +-------
+ plugins/USBnull/CMakeLists.txt                     | 16 +-------
+ plugins/dev9null/CMakeLists.txt                    | 16 +-------
+ plugins/onepad/CMakeLists.txt                      | 16 +-------
+ plugins/spu2-x/src/CMakeLists.txt                  | 16 +-------
+ plugins/zerogs/opengl/CMakeLists.txt               |  8 +---
+ plugins/zerospu2/CMakeLists.txt                    | 16 +-------
+ plugins/zzogl-pg/opengl/CMakeLists.txt             |  8 +---
+ .../zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt   |  8 +---
+ tools/bin2cpp/CMakeLists.txt                       |  6 +--
+ 21 files changed, 51 insertions(+), 355 deletions(-)
+
+diff --git a/cmake/BuildParameters.cmake b/cmake/BuildParameters.cmake
+index 48b167c..82e4ded 100644
+--- a/cmake/BuildParameters.cmake
++++ b/cmake/BuildParameters.cmake
+@@ -117,14 +117,17 @@ if(${PCSX2_TARGET_ARCHITECTURES} MATCHES "i386")
+     #     - Only plugins. No package will link to them.
+     set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
+ 
+-    if (DISABLE_ADVANCE_SIMD)
+-        set(ARCH_FLAG "-msse -msse2 -march=i686")
+-    else()
+-        # AVX requires some fix of the ABI (mangling) (default 2)
+-        # Note: V6 requires GCC 4.7
+-        #set(ARCH_FLAG "-march=native -fabi-version=6")
+-        set(ARCH_FLAG "-march=native")
++    if(NOT DEFINED ARCH_FLAG)
++        if (DISABLE_ADVANCE_SIMD)
++            set(ARCH_FLAG "-msse -msse2 -march=i686")
++        else()
++            # AVX requires some fix of the ABI (mangling) (default 2)
++            # Note: V6 requires GCC 4.7
++            #set(ARCH_FLAG "-march=native -fabi-version=6")
++            set(ARCH_FLAG "-march=native")
++        endif()
+     endif()
++
+     add_definitions(-D_ARCH_32=1 -D_M_X86=1 -D_M_X86_32=1)
+     set(_ARCH_32 1)
+     set(_M_X86 1)
+@@ -136,11 +139,13 @@ elseif(${PCSX2_TARGET_ARCHITECTURES} MATCHES "x86_64")
+     # SuperVU will not be ported
+     set(DISABLE_SVU TRUE)
+ 
+-    if (DISABLE_ADVANCE_SIMD)
+-        set(ARCH_FLAG "-msse -msse2")
+-    else()
+-        #set(ARCH_FLAG "-march=native -fabi-version=6")
+-        set(ARCH_FLAG "-march=native")
++    if(NOT DEFINED ARCH_FLAG)
++        if (DISABLE_ADVANCE_SIMD)
++            set(ARCH_FLAG "-msse -msse2")
++        else()
++            #set(ARCH_FLAG "-march=native -fabi-version=6")
++            set(ARCH_FLAG "-march=native")
++        endif()
+     endif()
+     add_definitions(-D_ARCH_64=1 -D_M_X86=1 -D_M_X86_64=1)
+     set(_ARCH_64 1)
+@@ -256,8 +261,12 @@ else()
+     set(ASAN_FLAG "")
+ endif()
+ 
++if(NOT DEFINED OPTIMIZATION_FLAG)
++    set(OPTIMIZATION_FLAG -O2)
++endif()
++
+ # Note: -DGTK_DISABLE_DEPRECATED can be used to test a build without gtk deprecated feature. It could be useful to port to a newer API
+-set(DEFAULT_GCC_FLAG "${ARCH_FLAG} ${COMMON_FLAG} ${DEFAULT_WARNINGS} ${AGGRESSIVE_WARNING} ${HARDENING_FLAG} ${DEBUG_FLAG} ${ASAN_FLAG}")
++set(DEFAULT_GCC_FLAG "${ARCH_FLAG} ${COMMON_FLAG} ${DEFAULT_WARNINGS} ${AGGRESSIVE_WARNING} ${HARDENING_FLAG} ${DEBUG_FLAG} ${ASAN_FLAG} ${OPTIMIZATION_FLAG}")
+ # c++ only flags
+ set(DEFAULT_CPP_FLAG "${DEFAULT_GCC_FLAG} -Wno-invalid-offsetof")
+ 
+diff --git a/common/src/Utilities/CMakeLists.txt b/common/src/Utilities/CMakeLists.txt
+index 8f97604..f4b6e27 100644
+--- a/common/src/Utilities/CMakeLists.txt
++++ b/common/src/Utilities/CMakeLists.txt
+@@ -14,47 +14,6 @@ set(CommonFlags
+ 	-fno-strict-aliasing
+     )
+ 
+-# set optimization flags
+-set(OptimizationFlags
+-	-falign-functions
+-	-falign-jumps
+-	-falign-labels
+-	-falign-loops
+-	-fcaller-saves
+-	-fcprop-registers
+-	-fcrossjumping
+-	-fcse-follow-jumps
+-	-fcse-skip-blocks
+-	-fdefer-pop
+-	-fdelete-null-pointer-checks
+-	-fgcse
+-	-fgcse-lm
+-	-fif-conversion
+-	-fif-conversion2
+-	-fmerge-constants
+-	-foptimize-sibling-calls
+-	-fpeephole2
+-	-fregmove
+-	-freorder-blocks
+-	-freorder-functions 
+-	-frerun-cse-after-loop
+-	-fsched-interblock
+-	-fsched-spec
+-	-fstrict-overflow
+-	-fthread-jumps
+-	-ftree-ccp
+-	-ftree-ch
+-	-ftree-copyrename
+-	-ftree-dce
+-	-ftree-dominator-opts
+-	-ftree-fre
+-	-ftree-lrs
+-	-ftree-pre
+-	-ftree-sra
+-	-ftree-ter
+-	-ftree-vrp
+-	-funit-at-a-time)
+-
+ #Clang doesn't support a few common flags that GCC does.
+ if(NOT USE_CLANG)
+ 	set(UtilitiesFinalFlags
+@@ -79,7 +38,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 	# add defines
+ 	set(UtilitiesFinalFlags
+ 		${UtilitiesFinalFlags}
+-		${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD
++		${CommonFlags} -DPCSX2_DEVBUILD
+ 	)
+ endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 
+@@ -89,7 +48,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
+ 	# add defines
+ 	set(UtilitiesFinalFlags
+ 		${UtilitiesFinalFlags}
+-		${CommonFlags} ${OptimizationFlags}
++		${CommonFlags}
+ 	)
+ endif(CMAKE_BUILD_TYPE STREQUAL Release)
+ 
+diff --git a/common/src/x86emitter/CMakeLists.txt b/common/src/x86emitter/CMakeLists.txt
+index b37e22a..a8217fc 100644
+--- a/common/src/x86emitter/CMakeLists.txt
++++ b/common/src/x86emitter/CMakeLists.txt
+@@ -14,47 +14,6 @@ set(CommonFlags
+ 	-fno-strict-aliasing
+     )
+ 
+-# set optimization flags
+-set(OptimizationFlags
+-	-falign-functions
+-	-falign-jumps
+-	-falign-labels
+-	-falign-loops
+-	-fcaller-saves
+-	-fcprop-registers
+-	-fcrossjumping
+-	-fcse-follow-jumps
+-	-fcse-skip-blocks
+-	-fdefer-pop
+-	-fdelete-null-pointer-checks
+-	-fgcse
+-	-fgcse-lm
+-	-fif-conversion
+-	-fif-conversion2
+-	-fmerge-constants
+-	-foptimize-sibling-calls
+-	-fpeephole2
+-	-fregmove
+-	-freorder-blocks
+-	-freorder-functions 
+-	-frerun-cse-after-loop
+-	-fsched-interblock
+-	-fsched-spec
+-	-fstrict-overflow
+-	-fthread-jumps
+-	-ftree-ccp
+-	-ftree-ch
+-	-ftree-copyrename
+-	-ftree-dce
+-	-ftree-dominator-opts
+-	-ftree-fre
+-	-ftree-lrs
+-	-ftree-pre
+-	-ftree-sra
+-	-ftree-ter
+-	-ftree-vrp
+-	-funit-at-a-time)
+-
+ #Clang doesn't support a few common flags that GCC does.
+ if(NOT USE_CLANG)
+ 	set(x86emitterFinalFlags
+@@ -77,7 +36,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 	# add defines
+ 	set(x86emitterFinalFlags
+ 		${x86emitterFinalFlags}
+-		${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD
++		${CommonFlags} -DPCSX2_DEVBUILD
+ 	)
+ endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 
+@@ -87,7 +46,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
+ 	# add defines
+ 	set(x86emitterFinalFlags
+ 		${x86emitterFinalFlags}
+-		${CommonFlags} ${OptimizationFlags}
++		${CommonFlags}
+ 	)
+ endif(CMAKE_BUILD_TYPE STREQUAL Release)
+ 
+diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
+index 871713e..a98843d 100644
+--- a/pcsx2/CMakeLists.txt
++++ b/pcsx2/CMakeLists.txt
+@@ -27,47 +27,6 @@ set(CommonFlags
+     -DWX_PRECOMP
+ 	)
+ 
+-# set optimization flags
+-set(OptimizationFlags
+-	-falign-functions
+-	-falign-jumps
+-	-falign-labels
+-	-falign-loops
+-	-fcaller-saves
+-	-fcprop-registers
+-	-fcrossjumping
+-	-fcse-follow-jumps
+-	-fcse-skip-blocks
+-	-fdefer-pop
+-	-fdelete-null-pointer-checks
+-	-fgcse
+-	-fgcse-lm
+-	-fif-conversion
+-	-fif-conversion2
+-	-fmerge-constants
+-	-foptimize-sibling-calls
+-	-fpeephole2
+-	-fregmove
+-	-freorder-blocks
+-	-freorder-functions
+-	-frerun-cse-after-loop
+-	-fsched-interblock
+-	-fsched-spec
+-	-fstrict-overflow
+-	-fthread-jumps
+-	-ftree-ccp
+-	-ftree-ch
+-	-ftree-copyrename
+-	-ftree-dce
+-	-ftree-dominator-opts
+-	-ftree-fre
+-	-ftree-lrs
+-	-ftree-pre
+-	-ftree-sra
+-	-ftree-ter
+-	-ftree-vrp
+-	-funit-at-a-time)
+-
+ #Clang doesn't support a few common flags that GCC does.
+ if(NOT USE_CLANG)
+ 	set(pcsx2FinalFlags ${CommonFlags} -fno-guess-branch-probability -fno-dse -fno-tree-dse)
+@@ -80,11 +39,11 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
+ 
+ elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 	set(Output pcsx2-dev)
+-	set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD)
++	set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} -DPCSX2_DEVBUILD)
+ 
+ elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+ 	set(Output pcsx2)
+-	set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags} ${OptimizationFlags})
++	set(pcsx2FinalFlags ${pcsx2FinalFlags} ${CommonFlags})
+ 
+ endif()
+ 
+diff --git a/plugins/CDVDiso/src/CMakeLists.txt b/plugins/CDVDiso/src/CMakeLists.txt
+index 519c92a..97cb832 100644
+--- a/plugins/CDVDiso/src/CMakeLists.txt
++++ b/plugins/CDVDiso/src/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output CDVDiso)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(CDVDisoFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(CDVDisoFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(CDVDisoFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(CDVDisoFinalFlags "")
+ 
+ # CDVDiso sources
+ set(CDVDisoSources
+diff --git a/plugins/CDVDlinuz/Src/CMakeLists.txt b/plugins/CDVDlinuz/Src/CMakeLists.txt
+index 943780f..f02198d 100644
+--- a/plugins/CDVDlinuz/Src/CMakeLists.txt
++++ b/plugins/CDVDlinuz/Src/CMakeLists.txt
+@@ -2,26 +2,7 @@
+ 
+ # plugin name
+ set(Output CDVDlinuz)
+-
+-set(CommonFlags
+-    -D_LARGEFILE64_SOURCE
+-    )
+-
+-set(OptimizationFlags
+-    -O2
+-    -fomit-frame-pointer
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(CDVDlinuzFinalFlags ${CommonFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(CDVDlinuzFinalFlags ${CommonFlags} ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(CDVDlinuzFinalFlags ${CommonFlags} ${OptimizationFlags})
+-
+-endif()
++set(CDVDlinuzFinalFlags -D_LARGEFILE64_SOURCE)
+ 
+ # CDVDlinuz sources
+ set(CDVDlinuzSources
+diff --git a/plugins/CDVDnull/CMakeLists.txt b/plugins/CDVDnull/CMakeLists.txt
+index 4fde2f7..5c84959 100644
+--- a/plugins/CDVDnull/CMakeLists.txt
++++ b/plugins/CDVDnull/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output CDVDnull)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(CDVDnullFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(CDVDnullFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(CDVDnullFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(CDVDnullFinalFlags "")
+ 
+ # CDVDnull sources
+ set(CDVDnullSources
+diff --git a/plugins/FWnull/CMakeLists.txt b/plugins/FWnull/CMakeLists.txt
+index fd5a45e..aaf9e4e 100644
+--- a/plugins/FWnull/CMakeLists.txt
++++ b/plugins/FWnull/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output FWnull-0.7.0)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(FWnullFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(FWnullFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(FWnullFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(FWnullFinalFlags "")
+ 
+ # FWnull sources
+ set(FWnullSources
+diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
+index 13b30c7..6fd6253 100644
+--- a/plugins/GSdx/CMakeLists.txt
++++ b/plugins/GSdx/CMakeLists.txt
+@@ -18,19 +18,14 @@ set(CommonFlags
+     -Wunused-variable # __dummy variable need to be investigated
+     )
+ 
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-
+ if(CMAKE_BUILD_TYPE STREQUAL Debug)
+     set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -D_DEBUG)
+ 
+ elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-    set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -D_DEVEL)
++    set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -D_DEVEL)
+ 
+ elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-    set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} ${OptimizationFlags} -W)
++    set(GSdxFinalFlags ${GSdxFinalFlags} ${CommonFlags} -W)
+ 
+ endif()
+ 
+diff --git a/plugins/GSnull/CMakeLists.txt b/plugins/GSnull/CMakeLists.txt
+index 2216e17..3bde988 100644
+--- a/plugins/GSnull/CMakeLists.txt
++++ b/plugins/GSnull/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output GSnull)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(GSnullFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(GSnullFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(GSnullFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(GSnullFinalFlags "")
+ 
+ # GSnull sources
+ set(GSnullSources
+diff --git a/plugins/PadNull/CMakeLists.txt b/plugins/PadNull/CMakeLists.txt
+index acbe758..18b1b6c 100644
+--- a/plugins/PadNull/CMakeLists.txt
++++ b/plugins/PadNull/CMakeLists.txt
+@@ -7,21 +7,7 @@ endif()
+ 
+ # plugin name
+ set(Output PADnull)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(PadNullFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(PadNullFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(PadNullFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(PadNullFinalFlags "")
+ 
+ # PadNull sources
+ set(PadNullSources
+diff --git a/plugins/SPU2null/CMakeLists.txt b/plugins/SPU2null/CMakeLists.txt
+index 5409543..620a521 100644
+--- a/plugins/SPU2null/CMakeLists.txt
++++ b/plugins/SPU2null/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output SPU2null)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(SPU2nullFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(SPU2nullFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(SPU2nullFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(SPU2nullFinalFlags "")
+ 
+ # SPU2null sources
+ set(SPU2nullSources
+diff --git a/plugins/USBnull/CMakeLists.txt b/plugins/USBnull/CMakeLists.txt
+index c84890e..7892d03 100644
+--- a/plugins/USBnull/CMakeLists.txt
++++ b/plugins/USBnull/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output USBnull-0.7.0)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-	set(USBnullFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(USBnullFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(USBnullFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(USBnullFinalFlags "")
+ 
+ # USBnull sources
+ set(USBnullSources
+diff --git a/plugins/dev9null/CMakeLists.txt b/plugins/dev9null/CMakeLists.txt
+index 09d8bee..b819985 100644
+--- a/plugins/dev9null/CMakeLists.txt
++++ b/plugins/dev9null/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output dev9null-0.5.0)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(dev9nullFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(dev9nullFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(dev9nullFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(dev9nullFinalFlags "")
+ 
+ # dev9null sources
+ set(dev9nullSources
+diff --git a/plugins/onepad/CMakeLists.txt b/plugins/onepad/CMakeLists.txt
+index 6a12cd7..68ffb82 100644
+--- a/plugins/onepad/CMakeLists.txt
++++ b/plugins/onepad/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output onepad-1.1.0)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(onepadFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(onepadFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(onepadFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(onepadFinalFlags "")
+ 
+ # onepad sources
+ set(onepadSources
+diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt
+index 720c4ac..0180704 100644
+--- a/plugins/spu2-x/src/CMakeLists.txt
++++ b/plugins/spu2-x/src/CMakeLists.txt
+@@ -14,21 +14,7 @@ endif()
+ 
+ # plugin name
+ set(Output spu2x-2.0.0)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(spu2xFinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(spu2xFinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(spu2xFinalFlags ${OptimizationFlags})
+-
+-endif()
++set(spu2xFinalFlags "")
+ 
+ # spu2x sources
+ set(spu2xSources
+diff --git a/plugins/zerogs/opengl/CMakeLists.txt b/plugins/zerogs/opengl/CMakeLists.txt
+index fd33949..79716c6 100644
+--- a/plugins/zerogs/opengl/CMakeLists.txt
++++ b/plugins/zerogs/opengl/CMakeLists.txt
+@@ -7,10 +7,6 @@ set(CommonFlags
+     -Wall
+     )
+ 
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+ # Debug - Build
+ if(CMAKE_BUILD_TYPE STREQUAL Debug)
+ 	# add defines
+@@ -20,13 +16,13 @@ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+ # Devel - Build
+ if(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 	# add defines
+-	add_definitions(${CommonFlags} ${OptimizationFlags})
++	add_definitions(${CommonFlags})
+ endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 
+ # Release - Build
+ if(CMAKE_BUILD_TYPE STREQUAL Release)
+ 	# add defines
+-	add_definitions(${CommonFlags} ${OptimizationFlags})
++	add_definitions(${CommonFlags})
+ endif(CMAKE_BUILD_TYPE STREQUAL Release)
+ 
+ # zerogs sources
+diff --git a/plugins/zerospu2/CMakeLists.txt b/plugins/zerospu2/CMakeLists.txt
+index c3e3243..9291706 100644
+--- a/plugins/zerospu2/CMakeLists.txt
++++ b/plugins/zerospu2/CMakeLists.txt
+@@ -8,21 +8,7 @@ endif()
+ 
+ # plugin name
+ set(Output zerospu2)
+-
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+-    set(zerospu2FinalFlags "")
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+-	set(zerospu2FinalFlags ${OptimizationFlags})
+-
+-elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+-	set(zerospu2FinalFlags ${OptimizationFlags})
+-
+-endif(CMAKE_BUILD_TYPE STREQUAL Release)
++set(zerospu2FinalFlags "")
+ 
+ # zerospu2 sources
+ set(zerospu2Sources
+diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt
+index fe93246..4798097 100644
+--- a/plugins/zzogl-pg/opengl/CMakeLists.txt
++++ b/plugins/zzogl-pg/opengl/CMakeLists.txt
+@@ -26,10 +26,6 @@ set(CommonFlags
+     -Wunused-variable
+     )
+ 
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+ #Clang doesn't support a few common flags that GCC does.
+ if(NOT USE_CLANG)
+ 	set(zzoglFinalFlags
+@@ -46,12 +42,12 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
+ elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+     set(zzoglFinalFlags
+         ${zzoglFinalFlags}
+-        ${CommonFlags} ${OptimizationFlags} -g -W -DZEROGS_DEVBUILD
++        ${CommonFlags} -g -W -DZEROGS_DEVBUILD
+     )
+ elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+     set(zzoglFinalFlags
+         ${zzoglFinalFlags}
+-        ${CommonFlags} ${OptimizationFlags} -W
++        ${CommonFlags} -W
+     )
+ endif()
+ 
+diff --git a/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt b/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
+index 156189c..ad1eb49 100644
+--- a/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
++++ b/plugins/zzogl-pg/opengl/ZeroGSShaders/CMakeLists.txt
+@@ -17,21 +17,17 @@ set(CommonFlags
+     -DNVIDIA_CG_API
+     )
+ 
+-set(OptimizationFlags
+-    -O2
+-    )
+-
+ if(CMAKE_BUILD_TYPE STREQUAL Debug)
+     set(zerogsshadersFinalFlags
+         ${CommonFlags} -D_DEBUG
+     )
+ elseif(CMAKE_BUILD_TYPE STREQUAL Devel)
+     set(zerogsshadersFinalFlags
+-        ${CommonFlags} ${OptimizationFlags} -g -W -DZEROGS_DEVBUILD
++        ${CommonFlags} -g -W -DZEROGS_DEVBUILD
+     )
+ elseif(CMAKE_BUILD_TYPE STREQUAL Release)
+     set(zerogsshadersFinalFlags
+-        ${CommonFlags} ${OptimizationFlags} -W
++        ${CommonFlags} -W
+     )
+ endif(CMAKE_BUILD_TYPE STREQUAL Release)
+ 
+diff --git a/tools/bin2cpp/CMakeLists.txt b/tools/bin2cpp/CMakeLists.txt
+index 1689620..1e3e45c 100644
+--- a/tools/bin2cpp/CMakeLists.txt
++++ b/tools/bin2cpp/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(bin2cppName bin2cpp)
+ if(CMAKE_BUILD_TYPE STREQUAL Debug)
+ 	# add defines
+ 	set(bin2cppFinalFlags
+-		-O2 -s -Wall -fexceptions
++		-s -Wall -fexceptions
+ 	)
+ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+ 
+@@ -15,7 +15,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+ if(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 	# add defines
+ 	set(bin2cppFinalFlags
+-		-O2 -s -Wall -fexceptions
++		-s -Wall -fexceptions
+ 	)
+ endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+ 
+@@ -23,7 +23,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL Devel)
+ if(CMAKE_BUILD_TYPE STREQUAL Release)
+ 	# add defines
+ 	set(bin2cppFinalFlags
+-		-O2 -s -Wall -fexceptions
++		-s -Wall -fexceptions
+ 	)
+ endif(CMAKE_BUILD_TYPE STREQUAL Release)
+ 
+-- 
+2.4.6
+

games-emulation/pcsx2/files/pcsx2-1.3.1-egl-optional.patch

@@ -0,0 +1,169 @@
+From 9cd13ca5b5a6a90c21abf1f41725e52efe4774c0 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Mon, 10 Aug 2015 19:11:00 +0300
+Subject: [PATCH 1/3] gsdx-linux: Don't enable EGL by default
+
+I was hoping that EGL become a standard much more faster. Currently it is an useless dep
+so let's disable it by default.
+
+Only check for EGL if using EGL_API.
+---
+ cmake/SearchForStuff.cmake     |  5 +++--
+ cmake/SelectPcsx2Plugins.cmake |  2 +-
+ plugins/GSdx/CMakeLists.txt    | 27 ++++++++++-----------------
+ plugins/GSdx/GS.cpp            |  8 ++++----
+ plugins/GSdx/GSWndEGL.cpp      |  2 +-
+ plugins/GSdx/GSWndEGL.h        | 21 +--------------------
+ 6 files changed, 20 insertions(+), 45 deletions(-)
+
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 8c8918e..b43a547 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -69,8 +69,9 @@ include(CheckLib)
+ if(Linux)
+     check_lib(AIO aio libaio.h)
+ endif()
+-check_lib(EGL EGL EGL/egl.h)
+-check_lib(GLESV2 GLESv2 GLES3/gl3ext.h) # NOTE: looking for GLESv3, not GLESv2
++if(EGL_API)
++    check_lib(EGL EGL EGL/egl.h)
++endif()
+ check_lib(PORTAUDIO portaudio portaudio.h pa_linux_alsa.h)
+ check_lib(SOUNDTOUCH SoundTouch soundtouch/SoundTouch.h)
+ 
+diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
+index 726dc2d..ee8138b 100644
+--- a/cmake/SelectPcsx2Plugins.cmake
++++ b/cmake/SelectPcsx2Plugins.cmake
+@@ -144,7 +144,7 @@ endif()
+ # requires: -OpenGL
+ #			-X11
+ #---------------------------------------
+-if(OPENGL_FOUND AND X11_FOUND AND EGL_FOUND AND GTKn_FOUND)
++if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND (EGL_FOUND OR NOT EGL_API))
+     set(GSdx TRUE)
+ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx")
+ 	set(GSdx FALSE)
+diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
+index 8859044..13b30c7 100644
+--- a/plugins/GSdx/CMakeLists.txt
++++ b/plugins/GSdx/CMakeLists.txt
+@@ -38,8 +38,8 @@ if(XDG_STD)
+     set(GSdxFinalFlags ${GSdxFinalFlags} -DXDG_STD)
+ endif()
+ 
+-if(GLES_API AND GLESV2_FOUND)
+-    set(GSdxFinalFlags ${GSdxFinalFlags} -DENABLE_GLES)
++if(EGL_API AND EGL_FOUND)
++    set(GSdxFinalFlags ${GSdxFinalFlags} -DEGL_SUPPORTED)
+ endif()
+ 
+ #Clang doesn't support a few common flags that GCC does.
+@@ -198,25 +198,18 @@ set(GSdxFinalLibs
+     ${X11_LIBRARIES}
+ )
+ 
+-if(GLES_API AND GLESV2_FOUND)
+-    set(GSdxFinalLibs
+-        ${GSdxFinalLibs}
+-        ${GLESV2_LIBRARIES}
+-    )
+-else()
+-    set(GSdxFinalLibs
+-        ${GSdxFinalLibs}
+-        ${OPENGL_LIBRARIES}
+-    )
+-endif()
+-
+-set(GSdxFinalLibs
+-    ${GSdxFinalLibs}
+-    ${EGL_LIBRARIES}
++set(GSdxFinalLibs ${GSdxFinalLibs}
++	${OPENGL_LIBRARIES}
+     ${GTK2_LIBRARIES}
+     ${LIBC_LIBRARIES}
+ )
+ 
++if(EGL_API AND EGL_FOUND)
++    set(GSdxFinalLibs ${GSdxFinalLibs}
++        ${EGL_LIBRARIES}
++        )
++endif()
++
+ # Generate Glsl header file. Protect with REBUILD_SHADER to avoid build-dependency on PERL
+ if (REBUILD_SHADER)
+     add_custom_command(OUTPUT res/glsl_source.h COMMAND perl ${CMAKE_SOURCE_DIR}/linux_various/glsl2h.pl)
+diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp
+index 3ffb5e8..4836192 100644
+--- a/plugins/GSdx/GS.cpp
++++ b/plugins/GSdx/GS.cpp
+@@ -291,12 +291,12 @@ static int _GSopen(void** dsp, char* title, int renderer, int threads = -1)
+ 				break;
+ 			}
+ #else
+-#ifdef ENABLE_GLES
+-			wnd[0] = NULL;
+-#else
+ 			wnd[0] = new GSWndOGL();
+-#endif
++#ifdef EGL_SUPPORTED
+ 			wnd[1] = new GSWndEGL();
++#else
++			wnd[1] = NULL;
++#endif
+ #endif
+ 		}
+ 	}
+diff --git a/plugins/GSdx/GSWndEGL.cpp b/plugins/GSdx/GSWndEGL.cpp
+index 491f34f..f69ff0c 100644
+--- a/plugins/GSdx/GSWndEGL.cpp
++++ b/plugins/GSdx/GSWndEGL.cpp
+@@ -22,7 +22,7 @@
+ #include "stdafx.h"
+ #include "GSWndEGL.h"
+ 
+-#if defined(__linux__)
++#if defined(__linux__) && defined(EGL_SUPPORTED)
+ 
+ GSWndEGL::GSWndEGL()
+ 	: m_NativeWindow(0), m_NativeDisplay(NULL)
+diff --git a/plugins/GSdx/GSWndEGL.h b/plugins/GSdx/GSWndEGL.h
+index c5a2573..17804bb 100644
+--- a/plugins/GSdx/GSWndEGL.h
++++ b/plugins/GSdx/GSWndEGL.h
+@@ -21,30 +21,11 @@
+ 
+ #include "GSWnd.h"
+ 
+-#if defined(__linux__)
++#if defined(__linux__) && defined(EGL_SUPPORTED)
+ #include <X11/Xlib.h>
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
+ 
+-// Need at least MESA 9.0 (plan for october/november 2012)
+-// So force the destiny to at least check the compilation
+-#ifndef EGL_KHR_create_context
+-#define EGL_KHR_create_context 1
+-#define EGL_CONTEXT_MAJOR_VERSION_KHR			    EGL_CONTEXT_CLIENT_VERSION
+-#define EGL_CONTEXT_MINOR_VERSION_KHR			    0x30FB
+-#define EGL_CONTEXT_FLAGS_KHR				    0x30FC
+-#define EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR		    0x30FD
+-#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR  0x31BD
+-#define EGL_NO_RESET_NOTIFICATION_KHR			    0x31BE
+-#define EGL_LOSE_CONTEXT_ON_RESET_KHR			    0x31BF
+-#define EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR		    0x00000001
+-#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR	    0x00000002
+-#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR	    0x00000004
+-#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR		    0x00000001
+-#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR    0x00000002
+-#endif
+-
+-
+ class GSWndEGL : public GSWndGL
+ {
+ 	EGLNativeWindowType    m_NativeWindow;
+-- 
+2.4.6
+

games-emulation/pcsx2/files/pcsx2-1.3.1-packaging.patch

@@ -0,0 +1,148 @@
+From 8e625d61b0a895074d35d6d227008664360e8458 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Mon, 10 Aug 2015 19:15:40 +0300
+Subject: [PATCH 2/3] cmake: fatal error if miss dependencies in package mode
+ Moved zzogl to extra plugins
+
+---
+ cmake/SelectPcsx2Plugins.cmake | 56 +++++++++++++++++++++---------------------
+ 1 file changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
+index ee8138b..bb7307e 100644
+--- a/cmake/SelectPcsx2Plugins.cmake
++++ b/cmake/SelectPcsx2Plugins.cmake
+@@ -15,6 +15,14 @@ else(GLSL_API)
+ 	set(msg_dep_zzogl       "check these libraries -> glew (>=1.6), jpeg (>=6.2), opengl, X11, nvidia-cg-toolkit (>=2.1), pcsx2 common libs")
+ endif()
+ 
++macro(print_dep str dep)
++    if (PACKAGE_MODE)
++        message(FATAL_ERROR "${str}:${dep}")
++    else()
++        message(STATUS "${str}:${dep}")
++    endif()
++endmacro(print_dep)
++
+ #-------------------------------------------------------------------------------
+ #								Pcsx2 core & common libs
+ #-------------------------------------------------------------------------------
+@@ -43,8 +51,7 @@ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/common/src")
+     set(common_libs FALSE)
+ else()
+     set(common_libs FALSE)
+-    message(STATUS "Skip build of common libraries: miss some dependencies")
+-    message(STATUS "${msg_dep_common_libs}")
++    print_dep("Skip build of common libraries: miss some dependencies" "${msg_dep_common_libs}")
+ endif()
+ 
+ #---------------------------------------
+@@ -62,14 +69,12 @@ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/pcsx2")
+     set(pcsx2_core FALSE)
+ else()
+     set(pcsx2_core FALSE)
+-    message(STATUS "Skip build of pcsx2 core: miss some dependencies")
+-    message(STATUS "${msg_dep_pcsx2}")
++    print_dep("Skip build of pcsx2 core: miss some dependencies" "${msg_dep_pcsx2}")
+ endif()
+ # Linux need also gtk2
+ if(UNIX AND pcsx2_core AND NOT GTKn_FOUND)
+     set(pcsx2_core FALSE)
+-    message(STATUS "Skip build of pcsx2 core: miss some dependencies")
+-    message(STATUS "${msg_dep_pcsx2}")
++    print_dep("Skip build of pcsx2 core: miss some dependencies" "${msg_dep_pcsx2}")
+ endif()
+ 
+ 
+@@ -102,8 +107,7 @@ if(EXTRA_PLUGINS)
+         set(CDVDiso FALSE)
+     else()
+         set(CDVDiso FALSE)
+-        message(STATUS "Skip build of CDVDiso: miss some dependencies")
+-        message(STATUS "${msg_dep_cdvdiso}")
++        print_dep("Skip build of CDVDiso: miss some dependencies" "${msg_dep_cdvdiso}")
+     endif()
+ endif()
+ 
+@@ -147,11 +151,10 @@ endif()
+ if(OPENGL_FOUND AND X11_FOUND AND GTKn_FOUND AND (EGL_FOUND OR NOT EGL_API))
+     set(GSdx TRUE)
+ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/GSdx")
+-	set(GSdx FALSE)
++    set(GSdx FALSE)
+ else()
+-	set(GSdx FALSE)
+-    message(STATUS "Skip build of GSdx: miss some dependencies")
+-    message(STATUS "${msg_dep_gsdx}")
++    set(GSdx FALSE)
++    print_dep("Skip build of GSdx: miss some dependencies" "${msg_dep_gsdx}")
+ endif()
+ #---------------------------------------
+ 
+@@ -170,8 +173,7 @@ if(EXTRA_PLUGINS)
+         set(zerogs FALSE)
+     else()
+         set(zerogs FALSE)
+-        message(STATUS "Skip build of zerogs: miss some dependencies")
+-        message(STATUS "${msg_dep_zerogs}")
++        print_dep("Skip build of zerogs: miss some dependencies" "${msg_dep_zerogs}")
+     endif()
+ endif()
+ #---------------------------------------
+@@ -186,14 +188,15 @@ endif()
+ #			-JPEG
+ #           -common_libs
+ #---------------------------------------
+-if((GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND JPEG_FOUND AND common_libs AND GTKn_FOUND) AND (CG_FOUND OR GLSL_API))
+-	set(zzogl TRUE)
+-elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/zzogl-pg")
+-	set(zzogl FALSE)
+-else()
+-	set(zzogl FALSE)
+-    message(STATUS "Skip build of zzogl: miss some dependencies")
+-    message(STATUS "${msg_dep_zzogl}")
++if(EXTRA_PLUGINS)
++    if((GLEW_FOUND AND OPENGL_FOUND AND X11_FOUND AND JPEG_FOUND AND common_libs AND GTKn_FOUND) AND (CG_FOUND OR GLSL_API))
++        set(zzogl TRUE)
++    elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/zzogl-pg")
++        set(zzogl FALSE)
++    else()
++        set(zzogl FALSE)
++        print_dep("Skip build of zzogl: miss some dependencies" "${msg_dep_zzogl}")
++    endif()
+ endif()
+ #---------------------------------------
+ 
+@@ -216,8 +219,7 @@ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/onepad")
+ 	set(onepad FALSE)
+ else()
+ 	set(onepad FALSE)
+-    message(STATUS "Skip build of onepad: miss some dependencies")
+-    message(STATUS "${msg_dep_onepad}")
++    print_dep("Skip build of onepad: miss some dependencies" "${msg_dep_onepad}")
+ endif()
+ #---------------------------------------
+ 
+@@ -244,8 +246,7 @@ elseif(NOT EXISTS "${CMAKE_SOURCE_DIR}/plugins/spu2-x")
+ 	set(spu2-x FALSE)
+ else()
+ 	set(spu2-x FALSE)
+-    message(STATUS "Skip build of spu2-x: miss some dependencies")
+-    message(STATUS "${msg_dep_spu2x}")
++    print_dep("Skip build of spu2-x: miss some dependencies" "${msg_dep_spu2x}")
+ endif()
+ #---------------------------------------
+ 
+@@ -266,8 +267,7 @@ if(EXTRA_PLUGINS)
+         set(zerospu2 FALSE)
+     else()
+         set(zerospu2 FALSE)
+-        message(STATUS "Skip build of zerospu2: miss some dependencies")
+-        message(STATUS "${msg_dep_zerospu2}")
++        print_dep("Skip build of zerospu2: miss some dependencies" "${msg_dep_zerospu2}")
+     endif()
+ endif()
+ #---------------------------------------
+-- 
+2.4.6
+

games-emulation/pcsx2/metadata.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>ykonotopov@gmail.com</email>
+		<name>Yuri Konotopov</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
+		<remote-id type="github">PCSX2/pcsx2</remote-id>
+	</upstream>
+</pkgmetadata>

games-emulation/pcsx2/pcsx2-1.3.1.ebuild

@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
+
+inherit cmake-utils l10n multilib toolchain-funcs wxwidgets
+
+DESCRIPTION="A PlayStation 2 emulator"
+HOMEPAGE="http://www.pcsx2.net"
+SRC_URI="https://github.com/PCSX2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/bzip2[abi_x86_32(-)]
+	dev-libs/libaio[abi_x86_32(-)]
+	media-libs/alsa-lib[abi_x86_32(-)]
+	media-libs/libsdl[abi_x86_32(-),joystick,sound]
+	media-libs/portaudio[abi_x86_32(-)]
+	media-libs/libsoundtouch[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
+	virtual/jpeg:62[abi_x86_32(-)]
+	x11-libs/gtk+:2[abi_x86_32(-)]
+	x11-libs/libICE[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]
+	x11-libs/libXext[abi_x86_32(-)]
+	x11-libs/wxGTK:3.0[abi_x86_32(-),X]
+"
+# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
+DEPEND="${RDEPEND}
+	>=app-eselect/eselect-opengl-1.3.1
+	>=dev-cpp/sparsehash-1.5
+"
+
+PATCHES=(
+	"${FILESDIR}"/"${P}-egl-optional.patch"
+	"${FILESDIR}"/"${P}-packaging.patch"
+	"${FILESDIR}"/"${P}-cflags.patch"
+)
+
+clean_locale() {
+	rm -R "${S}"/locales/"${1}" || die
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
+		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then
+			die "${PN} does not compile with gcc less than 4.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	l10n_for_each_disabled_locale_do clean_locale
+}
+
+src_configure() {
+	multilib_toolchain_setup x86
+
+	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
+	# if it something other than "Devel|Debug|Release"
+	local CMAKE_BUILD_TYPE="Release"
+
+	if use amd64; then
+		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
+		# https://github.com/PCSX2/pcsx2/pull/422
+		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
+	fi
+
+	local mycmakeargs=(
+		-DARCH_FLAG=
+		-DEGL_API=FALSE
+		-DEXTRA_PLUGINS=FALSE
+		-DGLES_API=FALSE
+		-DGLSL_API=FALSE
+		-DGTK3_API=FALSE
+		-DPACKAGE_MODE=TRUE
+		-DOPTIMIZATION_FLAG=
+		-DXDG_STD=TRUE
+
+		-DCMAKE_INSTALL_PREFIX=/usr
+		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
+		-DDOC_DIR=/usr/share/doc/"${PF}"
+		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
+		# wxGTK must be built against same sdl version
+		-DSDL2_API=FALSE
+		-DWX28_API=FALSE
+	)
+
+	WX_GTK_VER="3.0" need-wxwidgets unicode
+	cmake-utils_src_configure
+}
+
+src_install() {
+	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
+	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
+
+	cmake-utils_src_install
+}