diff --git a/app-accessibility/festival/festival-2.1-r1.ebuild b/app-accessibility/festival/festival-2.1-r1.ebuild
index 66df6ef62864..a070bc204168 100644
--- a/app-accessibility/festival/festival-2.1-r1.ebuild
+++ b/app-accessibility/festival/festival-2.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.10 2015/05/13 11:21:03 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/festival/festival-2.1-r1.ebuild,v 1.11 2015/05/17 20:02:41 pacho Exp $
EAPI="2"
inherit eutils multilib toolchain-funcs user
@@ -24,7 +24,7 @@ SRC_URI="${SITE}/${MY_P}.tar.gz
LICENSE="FESTIVAL HPND BSD rc regexp-UofT free-noncomm"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
DEPEND="~app-accessibility/speech-tools-2.1
diff --git a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
index 12866c70b15d..1b0665369965 100644
--- a/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.12 2015/05/13 11:16:38 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.1-r2.ebuild,v 1.13 2015/05/17 20:03:01 pacho Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://www.festvox.org/packed/festival/${PV}/${MY_P}-release.tar.gz
LICENSE="FESTIVAL HPND BSD rc regexp-UofT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="nas X"
RDEPEND="
diff --git a/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
index a1f099dd98c2..45b669b6d99c 100644
--- a/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild,v 1.7 2015/05/15 11:57:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.3.5-r3.ebuild,v 1.8 2015/05/17 20:14:37 pacho Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://members.dslextreme.com/users/billw/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="gnutls hddtemp lm_sensors nls ntlm ssl kernel_FreeBSD X"
RDEPEND="
diff --git a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
index b17b36353575..8fae1a475c17 100644
--- a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild,v 1.1 2015/05/12 18:41:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild,v 1.2 2015/05/17 20:09:49 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/${MY_V}/${P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ppc64 ~sh ~sparc ~x86"
SLOT="0"
IUSE="doc gnome-keyring policykit"
diff --git a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
index cccadf10c144..366ba946d24c 100644
--- a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.53-r2.ebuild,v 1.5 2015/05/15 17:23:12 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.53-r2.ebuild,v 1.6 2015/05/17 20:10:45 pacho Exp $
EAPI="5"
@@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1
SRC_URI="http://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
DESCRIPTION="Gentoo's installer for web-based applications"
HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
diff --git a/app-backup/amanda/amanda-3.3.7.ebuild b/app-backup/amanda/amanda-3.3.7.ebuild
index 6be93b785d00..29eb25022f5a 100644
--- a/app-backup/amanda/amanda-3.3.7.ebuild
+++ b/app-backup/amanda/amanda-3.3.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.7.ebuild,v 1.1 2015/04/03 23:59:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.7.ebuild,v 1.2 2015/05/17 20:11:51 pacho Exp $
EAPI=5
inherit autotools eutils perl-module user systemd
@@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
SLOT="0"
IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
RDEPEND="sys-libs/readline
virtual/awk
app-arch/tar
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index 35dce1e42768..c9dbe1ef0363 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1 +1,2 @@
DIST xfburn-0.5.2.tar.bz2 760833 SHA256 63682aab3c30c77e464b2b3b84606d1e1dcefc98e7042072fa09b729d6f84412 SHA512 3c6f27e2c8e5200d620bf32f938a1fb044b371a9fe0b5474ba8c1a487c79a7761e144ec8490f04c2389c96bc980b9f2bdfebce9d24dea30c5caae451bb9dcf5e WHIRLPOOL a88f482d899ecaf89666f34b583b90b02f080ec2dc074f4809b98c8e65a824f3f229dd006c8ccbcd3c580e3c3885bea0a0c9fa04ef8871071b6bc9e237029164
+DIST xfburn-0.5.4.tar.bz2 773300 SHA256 9a0053ff106ae475871a2bed328d5d7c5a2fc4280a24e956ca85b6a13a9fc1f6 SHA512 66bd82aa80fcd53d5d505b01a33cdbffdcf547a05a11bdbe688387420ee682a28564397acaf85a52852625909648c01cc18f289736ac54d2806725f46c875481 WHIRLPOOL 06d77abf0b0cca28306a67dd0703557c38b40f57df8511a49be1850db0c3097ee8d47377f50d4a2cfbf3312873e93f147d70cdb43eab014f04f8412ed8ed747c
diff --git a/app-cdr/xfburn/xfburn-0.5.4.ebuild b/app-cdr/xfburn/xfburn-0.5.4.ebuild
new file mode 100644
index 000000000000..32d19041ecb1
--- /dev/null
+++ b/app-cdr/xfburn/xfburn-0.5.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xfburn/xfburn-0.5.4.ebuild,v 1.1 2015/05/17 15:19:45 mgorny Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="GTK+ based CD and DVD burning application"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfburn"
+SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug gstreamer +udev"
+
+RDEPEND=">=dev-libs/glib-2.32:=
+ >=dev-libs/libburn-0.4.2:=
+ >=dev-libs/libisofs-0.6.2:=
+ >=x11-libs/gtk+-2.24:2=
+ >=xfce-base/exo-0.6:=
+ >=xfce-base/libxfce4ui-4.10:=
+ gstreamer? (
+ media-libs/gstreamer:1.0=
+ media-libs/gst-plugins-base:1.0= )
+ udev? ( virtual/libgudev:= )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+pkg_setup() {
+ XFCONF=(
+ $(use_enable udev gudev)
+ $(use_enable gstreamer)
+ $(xfconf_use_debug)
+ )
+
+ DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
diff --git a/app-crypt/aespipe/Manifest b/app-crypt/aespipe/Manifest
index ad4fe84a76f3..8816155839ec 100644
--- a/app-crypt/aespipe/Manifest
+++ b/app-crypt/aespipe/Manifest
@@ -1,3 +1,2 @@
-DIST aespipe-v2.3b.tar.bz2 85567 SHA256 b746cffbfd663625faf2bf9ea31f1889e5071b20d0ebc02d2375d3219cd163bb SHA512 2c0686b98618fa3cf4415dcf6e9da0dcf77d0be3a3acedc17c4b3a80ed89de63e1d00a27e7f2fb9e7373b92069c11897d9ceb5d084e0662a2c6757a6afd8f300 WHIRLPOOL 33ce30c4727e05b9863e4cb0702426921d14e02fae2a43c5d4f35d259d9d343e20f9d0fa64c6f87583a6ff8a5bc0030df95d6c1f0fa8f92d088c781babe10aba
DIST aespipe-v2.3e.tar.bz2 91752 SHA256 4e63a5709fdd0bffdb555582f9fd7a0bd1842e429420159accaf7f60c5d3c70f SHA512 e62f1f7a8f595066142f626dfd928106b4057c3e5f129bb31057af4e4a9412b4def60afffac72083621334449d627424fb661ef11a426015b0b0c232aa3ce648 WHIRLPOOL 3564aedeeb7e16a9cf10ceb13d15aaf3350b39ff8eb771d23d59029c8676b27bccee4098644d7e3d457af6866e045bec1cdfdf16f3941a831c0ec0b90897d08a
DIST aespipe-v2.4c.tar.bz2 106608 SHA256 260190beea911190a839e711f610ec3454a9b13985d35479775b7e26ad4c845e SHA512 6738c019e4c1e5377650f9a982b328ce38e127ebe838cfe61c7d3fad878eaf0a4fd051d32897eb4c2ff33f94669203ccba25fc246405b50f9ac24fdf5d2831cf WHIRLPOOL a9c99f45313fa427e3a4227a3a8b8035c031937851e30fb5a31e8409bef25990497ce3f1b32e0e93c184a6d5549fa2a5e31185790a531350d6774df041c6f5e9
diff --git a/app-crypt/aespipe/aespipe-2.3b.ebuild b/app-crypt/aespipe/aespipe-2.3b.ebuild
deleted file mode 100644
index 2c975e54fb7e..000000000000
--- a/app-crypt/aespipe/aespipe-2.3b.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/aespipe/aespipe-2.3b.ebuild,v 1.14 2010/01/23 18:39:03 armin76 Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Encrypts data from stdin to stdout"
-HOMEPAGE="http://loop-aes.sourceforge.net"
-SRC_URI="http://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86"
-IUSE="static"
-DEPEND=""
-RDEPEND="app-arch/sharutils"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_compile() {
- use static && append-ldflags -static
- econf || die
- emake || die
-}
-
-src_install() {
- dobin aespipe bz2aespipe
- dodoc README
- doman aespipe.1
-}
diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest
index 894e98a03b30..41cc6c66ddf7 100644
--- a/app-crypt/coolkey/Manifest
+++ b/app-crypt/coolkey/Manifest
@@ -1,5 +1,2 @@
-DIST coolkey-1.1.0-patches-001.tar.gz 19336 SHA256 324977ba41f8eec4490aaeb22f91c74d207cf820deb3264f5cf0941aae65e88c SHA512 530a49094177fd598a104a341b837a377ec3559546a92ecc8602b8d8b92c52968d81039c7f87488852c8df70936c3fd42961b29c6ffb50bd3fc71017dd2eb22f WHIRLPOOL 0f5728191ee98044d593903b346929cdea9bbd4ff6dcefee6a6e2ac9020f94ae0da01eac49ae8ce8e6a58a1cfb154f54ff52d67d8909411faa3669cb5f508418
DIST coolkey-1.1.0-patches-002.tar.gz 20574 SHA256 42767673025f7410bc1169231f7759abe4de69d8fa204fc8acfbe228b543129a SHA512 94050979f04f24924331b8a7c38b60de207d32b964caa39714aefd9f616ab7dd4e58b51e2c49fdb63b4dec1acce0c7245ae0a025ef76d457162b7200193dc663 WHIRLPOOL 55fee8ff261b8b3b8e16af05c1a6e7b4acd8eacaa0c73f5dd7bdf4918929097918be0f1ec2feaa5385d991d2a472672c7306dee60f4d61d313b2c47ec691f66a
DIST coolkey-1.1.0.tar.gz 432808 SHA256 8448e3abb81bffc593c96b577dcfbc05b40e8684188456c31be15fae73d730f7 SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b WHIRLPOOL 60408f606a5cf5d9ec1ba3938a96a6f938c8d9f4b7ace2677ff35ce125104995675bf0decae92575e82dfc1a2eeaa26c4197ad174a4d3901250c43d906976c24
-DIST coolkey-patches-20110419.tar.gz 18966 SHA256 717827b73f704ae46b07e4835d0f1428b4d83efc5c35f501b495c00b0afe2627 SHA512 fa3ad205437a9a385141c2176efcf45079d711c6c2ebcdd3e336bcb45123e2628d8d9eef47769509241b22e7b8f73aad2181bd071ce80e99746a34ee4d90fb45 WHIRLPOOL 56721bf4ece4e527480edfde5a7b37ab82f0f7d39967522d6f8e3b63ebf525c22cfce1b569f7608a402dddfa8fb5d503f6d1e431f4219a227a143a8f42fce73b
-DIST coolkey-patches.tar.gz 19457 SHA256 441abc27412c41a3fd36a60569734b3aba4f35b3e9c85e34a93ec9acc62e98f4 SHA512 657867323eb6555da0a00f20bfadc4a07883bc748dfcdf82ee650ff0e9179a05ffd1297102741e87d328d1500dc7a6695e64451d6f33f6d95bb60277be6fa5a9 WHIRLPOOL cdf6f9de2ffda869fb2532ab679074f64566769607d05d0f9222b2edeab557192579763583c5f7d44e19066d0188acc616edc7027ccbd0f11f337247762513fb
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r2.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r2.ebuild
deleted file mode 100644
index 687b5d409ff4..000000000000
--- a/app-crypt/coolkey/coolkey-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r2.ebuild,v 1.2 2012/05/03 18:16:38 jdhore Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
-HOMEPAGE="http://directory.fedora.redhat.com/wiki/CoolKey"
-SRC_URI="http://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
- mirror://gentoo/${PN}-patches.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND="sys-apps/pcsc-lite
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-EPATCH_OPTS="-F3 -l"
-
-src_prepare() {
-# EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-patches/${PV}"
- epatch "${WORKDIR}/${PN}-patches/${PV}/01_${P}-cache-move.patch"
- epatch "${WORKDIR}/${PN}-patches/${PV}/02_${P}-gcc-4.3.patch"
- epatch "${WORKDIR}/${PN}-patches/${PV}/03_${P}-latest.patch"
- epatch "${WORKDIR}/${PN}-patches/${PV}/04_${P}-simple-bugs.patch"
- epatch "${WORKDIR}/${PN}-patches/${PV}/05_${P}-thread-fix.patch"
- epatch "${WORKDIR}/${PN}-patches/${PV}/06_${P}-CAC-update.patch"
- epatch "${WORKDIR}/${PN}-patches/${PV}/07_${P}-safe-open.patch"
- epatch "${WORKDIR}/${PN}-patches/${PV}/08_${P}-configure-fix.patch"
-}
-
-src_configure() {
- econf $(use_enable debug) || die "configure failed"
-}
-
-src_compile() {
- emake -j1 || die "make failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- diropts -m 1777
- keepdir /var/cache/coolkey
-}
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r4.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r4.ebuild
deleted file mode 100644
index 31a85120594b..000000000000
--- a/app-crypt/coolkey/coolkey-1.1.0-r4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r4.ebuild,v 1.3 2012/05/03 18:16:38 jdhore Exp $
-
-EAPI=3
-
-inherit eutils
-
-PDATE="20110419"
-
-DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
-HOMEPAGE="http://directory.fedora.redhat.com/wiki/CoolKey"
-SRC_URI="http://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
- mirror://gentoo/${PN}-patches-${PDATE}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
- dev-libs/nss[utils]
- sys-libs/zlib"
-
-DEPEND="${RDEPEND}
- >=app-crypt/ccid-1.4.0
- virtual/pkgconfig"
-
-pkg_setup() {
- pk="pk11install"
- dbdir="/etc/pki/nssdb"
- ck_mod_name="CoolKey PKCS #11 Module"
-
- if ! [[ -x $dbdir ]]; then
- ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
- ewarn "follow the suggested commands using the correct path."
- fi
-}
-
-src_prepare() {
- epatch "${WORKDIR}/${PN}-patches/01_${PN}-cache-dir-move.patch"
- epatch "${WORKDIR}/${PN}-patches/02_${P}-gcc43.patch"
- epatch "${WORKDIR}/${PN}-patches/03_${P}-latest.patch"
- epatch "${WORKDIR}/${PN}-patches/04_${P}-simple-bugs.patch"
- epatch "${WORKDIR}/${PN}-patches/05_${P}-thread-fix.patch"
- epatch "${WORKDIR}/${PN}-patches/06_${P}-cac.patch"
- epatch "${WORKDIR}/${PN}-patches/07_${PN}-cac-1.patch"
- epatch "${WORKDIR}/${PN}-patches/08_${PN}-pcsc-lite-fix.patch"
-}
-
-src_configure() {
- econf --enable-pk11install $(use_enable debug) \
- || die "configure failed"
-}
-
-src_compile() {
- emake CFLAGS+="-fno-strict-aliasing" -j1 || die "make failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- diropts -m 1777
- keepdir /var/cache/coolkey
-}
-
-pkg_postinst() {
- if [[ -x $dbdir ]]; then
- if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
- elog "You still need to install libcoolkey in your PKCS11 library:"
- elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
-
- fi
- else
- elog ""
- elog "You still need to setup your PKCS11 library, or at least"
- elog "find where it is (perhaps \$HOME/.pki/nssdb). Once you"
- elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
- elog "libcoolkeypk11.so, and if not found, add it using:"
- elog ""
- elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
- elog ""
- elog "where \$db is the full path to your pki/nssdb directory."
- elog ""
- fi
-}
-
-pkg_postrm() {
- if [[ -x $dbdir ]]; then
- if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
- elog "You should remove libcoolkey from your PKCS11 library."
- fi
- fi
-}
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild
deleted file mode 100644
index e67acc2f4ce0..000000000000
--- a/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/coolkey/coolkey-1.1.0-r5.ebuild,v 1.5 2013/02/02 22:21:12 ago Exp $
-
-EAPI=3
-
-inherit eutils
-
-PATCHVER="001"
-
-DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
-HOMEPAGE="http://directory.fedora.redhat.com/wiki/CoolKey"
-SRC_URI="http://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
- mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
- dev-libs/nss[utils]
- sys-libs/zlib"
-
-DEPEND="${RDEPEND}
- >=app-crypt/ccid-1.4.0
- virtual/pkgconfig"
-
-pkg_setup() {
- pk="pk11install"
- dbdir="/etc/pki/nssdb"
- ck_mod_name="CoolKey PKCS #11 Module"
-
- if ! [[ -x $dbdir ]]; then
- ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
- ewarn "follow the suggested commands using the correct path."
- fi
-}
-
-src_prepare() {
- epatch "${WORKDIR}/${PN}-patches"/*
-}
-
-src_configure() {
- econf --enable-pk11install $(use_enable debug) \
- || die "configure failed"
-}
-
-src_compile() {
- emake CFLAGS+="-fno-strict-aliasing" -j1 || die "make failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- diropts -m 1777
- keepdir /var/cache/coolkey
-}
-
-pkg_postinst() {
- if [[ -x $dbdir ]]; then
- if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
- elog "You still need to install libcoolkey in your PKCS11 library:"
- elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
-
- fi
- else
- elog ""
- elog "You still need to setup your PKCS11 library, or at least"
- elog "find where it is (perhaps \$HOME/.pki/nssdb). Once you"
- elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
- elog "libcoolkeypk11.so, and if not found, add it using:"
- elog ""
- elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
- elog ""
- elog "where \$db is the full path to your pki/nssdb directory."
- elog ""
- fi
-}
-
-pkg_postrm() {
- if [[ -x $dbdir ]]; then
- if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
- elog "You should remove libcoolkey from your PKCS11 library."
- fi
- fi
-}
diff --git a/app-crypt/dirmngr/Manifest b/app-crypt/dirmngr/Manifest
index f0aa8a42bcb0..6b6bad27ca15 100644
--- a/app-crypt/dirmngr/Manifest
+++ b/app-crypt/dirmngr/Manifest
@@ -1,2 +1 @@
-DIST dirmngr-1.1.0.tar.bz2 556406 SHA256 eb76d92749d8f9314094376dc3896871c441b0f34b57f25a446c6178a16c93cf SHA512 ef6a622d40468affd0d0c0e65aca1aff224b3957945ae966bbbc8128293f9cb429b4fc030572c1f0c99033abd5b2e0cad417b64a2c01830359c30adaf15e871b WHIRLPOOL 381da60167dd3bb728ce5a132921d385b2c1a580d28bc7bfd0b7d984b2f1557da2b428c3f0bb8cd371f877ffe883a0f39c0dec4bf16562b162cdb4adb295c4dd
DIST dirmngr-1.1.1.tar.bz2 566929 SHA256 d2280b8c314db80cdaf101211a47826734443436f5c3545cc1b614c50eaae6ff SHA512 922512f22853c49cf291207c81862c68ba51c89646036288592d6b2f57709d35ac53f9f550569986c04daec20403ab8ec85b08893443af417950916b869c8419 WHIRLPOOL 84a174d42418723e346c7af8d9bb9aa12e4602cbba9510f492ef10d29f4900768ede986d2c7c93cee129ce03e5aeca08357490ec050b54e1250e2e4b36150617
diff --git a/app-crypt/dirmngr/dirmngr-1.1.0.ebuild b/app-crypt/dirmngr/dirmngr-1.1.0.ebuild
deleted file mode 100644
index a57b9da82bc2..000000000000
--- a/app-crypt/dirmngr/dirmngr-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/dirmngr/dirmngr-1.1.0.ebuild,v 1.10 2014/03/01 22:20:16 mgorny Exp $
-
-EAPI="3"
-
-DESCRIPTION="DirMngr is a daemon to handle CRL and certificate requests for GnuPG"
-HOMEPAGE="http://www.gnupg.org/download/index.en.html#dirmngr"
-#SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-#SRC_URI="ftp://ftp.gnupg.org/gcrypt/alpha/${PN}/${P/_/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-RDEPEND=">=net-nds/openldap-2.1.26
- >=dev-libs/libgpg-error-1.4
- >=dev-libs/libgcrypt-1.4.0:0
- >=dev-libs/libksba-1.0.2
- >=dev-libs/pth-1.3.7
- nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
- >=dev-libs/libassuan-2
- nls? ( >=sys-devel/gettext-0.12.1 )"
-
-src_configure() {
- econf --docdir="/usr/share/doc/${PF}" $(use_enable nls) \
- LDAPLIBS="-lldap -llber"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/app-crypt/dirmngr/dirmngr-1.1.1.ebuild b/app-crypt/dirmngr/dirmngr-1.1.1.ebuild
deleted file mode 100644
index b8b90eb9ebef..000000000000
--- a/app-crypt/dirmngr/dirmngr-1.1.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/dirmngr/dirmngr-1.1.1.ebuild,v 1.2 2014/03/01 22:20:16 mgorny Exp $
-
-EAPI="5"
-
-DESCRIPTION="DirMngr is a daemon to handle CRL and certificate requests for GnuPG"
-HOMEPAGE="http://www.gnupg.org/download/index.en.html#dirmngr"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND=">=net-nds/openldap-2.1.26
- >=dev-libs/libgpg-error-1.4
- >=dev-libs/libgcrypt-1.4.0:0
- >=dev-libs/libksba-1.0.2
- >=dev-libs/pth-1.3.7
- nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
- >=dev-libs/libassuan-2
- nls? ( >=sys-devel/gettext-0.12.1 )"
-
-src_configure() {
- econf --docdir="/usr/share/doc/${PF}" $(use_enable nls) \
- LDAPLIBS="-lldap -llber"
-}
-
-src_install() {
- default
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/app-crypt/onak/Manifest b/app-crypt/onak/Manifest
index 1221d952072d..6aaef69d56bf 100644
--- a/app-crypt/onak/Manifest
+++ b/app-crypt/onak/Manifest
@@ -1,3 +1 @@
-DIST onak-0.3.3.tar.gz 235853 SHA256 eaa6710530b66ab57b7bc46e8e8d884b1091506e5ec97e7e202985c9bbcfdaa8 SHA512 6ece091a639d52791490346e4f9fdbfbc860722cfa89816f7c2c3c171505b60bcdb97c6d45dac0210ac484467115d092822e228b99a2110f2120b1f380df7b66 WHIRLPOOL 8c1fcb09dfe8ca881e1f3489ba33c10f50a09bb86a2fd43d985eb880c85fa9d5cf57daa286b4a6159c6f1fd52b5a799acd53d3a3c5a416bf2d6bf3220c9f9692
-DIST onak-0.3.7.tar.gz 239512 SHA256 e05f7e574ca7e5664ac38f278b1df96e3c76d029970c41edd99440f11cc84b82 SHA512 5be0f119a3c3c5a9e8ae173a7a6bfb65911bf035ceeac757fa6c7f9469bbf992c9ba3d746deba2aefbe43b0433dfa5829a54a6ce9e0edae2a69b4d508b66cc79 WHIRLPOOL c7a9b5bbb700623df4a28476095fc233e2a191ad3b928c88cd002ea85e9a5f5d2aa60ea095a4cfe41e3ad49ee731601c8a1fbf68b1f64597ad3dddb458781131
DIST onak-0.4.0.tar.gz 230996 SHA256 e402042d2cbcbe34cfac1d737a564054fea84ad5c00386ab0c877698c3076ecd SHA512 0cf8960652cda242fde2e834953581312431136fe380076bc3b76b42ef11ff1c83975d6d4fc8463466ce37b84c71c83fbbdfb08cd5eefb9928814b550c08ce67 WHIRLPOOL 7a56f17a856e297853e3872ac7b7f712c07e44d071d71f198785ddd5e61300b471e70b6829193ec0c01fb883f5668151f157f229d979df883ae9178cb3834177
diff --git a/app-crypt/onak/onak-0.3.3-r1.ebuild b/app-crypt/onak/onak-0.3.3-r1.ebuild
deleted file mode 100644
index d0aead69c07b..000000000000
--- a/app-crypt/onak/onak-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/onak-0.3.3-r1.ebuild,v 1.6 2014/12/28 14:44:04 titanofold Exp $
-
-EAPI=2
-
-DESCRIPTION="onak is an OpenPGP keyserver"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="berkdb postgres"
-RDEPEND="berkdb? ( =sys-libs/db-4* )
- postgres? ( dev-db/postgresql[server] )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- local backend="fs"
- use berkdb && backend="db4"
- use postgres && backend="pg"
- if use berkdb && use postgres; then
- ewarn "berkdb and postgres requested, postgres was preferred"
- fi
- econf \
- --enable-backend="${backend}" \
- || die "could not configure"
- emake || die "emake failed"
-}
-
-src_install() {
- keepdir /var/lib/onak
- dosbin onak maxpath sixdegrees onak-mail.pl
- dobin splitkeys stripkey
- doman *.[1-8]
- insinto /etc
- doins onak.conf
- dodir /var/lib/onak/doc
- insinto /var/lib/onak/doc
- doins apache2 README LICENSE onak.sql
- dodir /usr/lib/cgi-bin/pks
- insinto /usr/lib/cgi-bin/pks
- doins add gpgwww lookup
-
- sed -i \
- -e 's,^www_port 11371,www_port 0,g' \
- -e 's,^db_dir /var/lib/lib/onak,db_dir /var/lib/onak,g' \
- -e 's,^logfile /var/lib/log/onak.log,logfile /var/log/onak.log,g' \
- -e 's,^max_last 1,max_last 0,g' \
- "${D}"/etc/onak.conf
-}
diff --git a/app-crypt/onak/onak-0.3.7.ebuild b/app-crypt/onak/onak-0.3.7.ebuild
deleted file mode 100644
index 14316dcae701..000000000000
--- a/app-crypt/onak/onak-0.3.7.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/onak/onak-0.3.7.ebuild,v 1.5 2014/12/28 14:44:04 titanofold Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="onak is an OpenPGP keyserver"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb postgres"
-
-DEPEND="berkdb? ( >=sys-libs/db-4 )
- postgres? ( dev-db/postgresql[server] )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-berkdb-5.0.patch
- eautoreconf
-}
-
-src_configure() {
- local backend="fs"
- use berkdb && backend="db4"
- use postgres && backend="pg"
- if use berkdb && use postgres; then
- ewarn "berkdb and postgres requested, postgres was preferred"
- fi
- econf --enable-backend="${backend}"
-}
-
-src_install() {
- keepdir /var/lib/onak
- dosbin onak maxpath sixdegrees onak-mail.pl
- dobin splitkeys stripkey
- doman *.[1-8]
- insinto /etc
- doins onak.conf
- dodir /var/lib/onak/doc
- insinto /var/lib/onak/doc
- doins apache2 README LICENSE onak.sql
- dodir /usr/lib/cgi-bin/pks
- insinto /usr/lib/cgi-bin/pks
- doins add gpgwww lookup
-
- sed -i \
- -e 's,^www_port 11371,www_port 0,g' \
- -e 's,^db_dir /var/lib/lib/onak,db_dir /var/lib/onak,g' \
- -e 's,^logfile /var/lib/log/onak.log,logfile /var/log/onak.log,g' \
- -e 's,^max_last 1,max_last 0,g' \
- "${D}/etc/onak.conf"
-}
diff --git a/app-crypt/pdfcrack/Manifest b/app-crypt/pdfcrack/Manifest
index 6f401b437bca..6e46f19b199e 100644
--- a/app-crypt/pdfcrack/Manifest
+++ b/app-crypt/pdfcrack/Manifest
@@ -1,3 +1,2 @@
-DIST pdfcrack-0.11.tar.gz 29337 SHA256 e9a2ab832ceb1f071f2a2bec3c72bc28de78aa046e86eb8405a5aee6ae6dddd3 SHA512 a559590e2d9bc2011a0310a4fbe129f7dd021eee91449b6279f5d0bd90b5c22003def96aab5d6547d50b8f5279252d07b3c374d679c37c7ffe466ae8c89d71cc WHIRLPOOL ded4a6c7a19b11bff09837bdc0a5f238e0099c26802b0bba00a29dbcee725c46a0171424f11a172f7713f7a54b458569508ab3f5b384cbbb7174335660e06045
DIST pdfcrack-0.13.tar.gz 32359 SHA256 2afce56766bfbe869cb6d920ca0c9acf23d73872924bb62e2f4eb47bb43c96e8 SHA512 3ec993746649649ab5ddffdf6ae15d087ba6b52bbf3379bb022f33078968f1434788e5f3e6078a4342410094acfc022d5955faee0a35be878516908356513d35 WHIRLPOOL 0b98ec8ce74e2dbd6879c30f28bb79daa0f6e9f4254bdf291086ace9d65039ef9d3dc0c5304d0334aec7249476e4bf21365059999d7caac9e2f19929d0ab0be4
DIST pdfcrack-0.14.tar.gz 33387 SHA256 ac88eca576cebb40c4a63cd90542664de7d8f1b39885db5a7ac021d8b0c6a95c SHA512 2da2b7bc37db49f55c6cdd45f837bc509b217fcd36cd57212c2508618996038e21bf391a20f5adece312e9a5f7d892fe254dac8438222f158e4ce7019cbac3f2 WHIRLPOOL 4d8fd5052bc165e3f058856a814832b010d1b2ce7fc6c630b04e797bff5658a784e7fb096d68792ce54282d0a4ace9d03a6458b85820f92b8e88215d461393a4
diff --git a/app-crypt/pdfcrack/files/pdfcrack-0.10-build.patch b/app-crypt/pdfcrack/files/pdfcrack-0.10-build.patch
deleted file mode 100644
index 3f830a57c239..000000000000
--- a/app-crypt/pdfcrack/files/pdfcrack-0.10-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-just use implicit rules so correct variables get used
-
---- Makefile
-+++ Makefile
-@@ -1,20 +1,13 @@
--CFLAGS= -Wall -Wshadow -Wwrite-strings -Wsign-compare -Wfloat-equal \
-+CFLAGS+= -Wall -Wshadow -Wwrite-strings -Wsign-compare -Wfloat-equal \
- -Wmissing-noreturn -Wbad-function-cast \
-- -Wmissing-prototypes -Winline -Wredundant-decls -O3
-+ -Wmissing-prototypes -Winline -Wredundant-decls
-
- all: pdfcrack
-
- pdfcrack: main.o rc4.o md5.o pdfcrack.o pdfparser.o passwords.o common.o \
- benchmark.o
-- gcc $(CFLAGS) -o $@ $+
-- strip $@
-
- pdfreader: pdfparser.o pdfreader.o common.o
-- gcc $(CFLAGS) -o $@ $+
-- strip $@
-
- clean:
- rm -f pdfcrack pdfreader testreader *.o
--
--%.o: %.c
-- gcc $(CFLAGS) -c -o $@ $+
diff --git a/app-crypt/pdfcrack/pdfcrack-0.11.ebuild b/app-crypt/pdfcrack/pdfcrack-0.11.ebuild
deleted file mode 100644
index b717a2a14a48..000000000000
--- a/app-crypt/pdfcrack/pdfcrack-0.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pdfcrack/pdfcrack-0.11.ebuild,v 1.3 2009/04/05 18:26:36 arfrever Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool for recovering passwords and content from PDF-files"
-HOMEPAGE="http://pdfcrack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.10-build.patch
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
- dobin pdfcrack || die "dobin pdfcrack failed"
- dodoc changelog README TODO
-}
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index a351d33649c2..d795ac3117ec 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1,4 +1,3 @@
DIST pius-2.0.10.tar.bz2 30872 SHA256 ce4f7804af2806310d3be890361997fa110d94568a33e2a2413f04032639198e SHA512 5c8ed483e8abf70389eaa6c87ccfe4702c6eb31d6e4f5a84507cc4841857785019e4910baf1a7d85e65ed5192e6cec44eaf5681cd581d971dd2e747dd6ce15f5 WHIRLPOOL 1405e98e875be074c4e38c44d766c6626e69c9f2475b8075ff7ca5413dfb7567f5bebd266c714da69b1e589e822ab24d42587ce1220f05ca7a6ccbf2b9fc3dcf
DIST pius-2.0.11.tar.bz2 31351 SHA256 aeb8ef25fb59074532e380e70c71d1f5d6c9fcd13aa0cf040a7581693ef6ab5d SHA512 b7d4fd701b9629e8544221d4f2bbd73308bf3d7281104857dbfed37b8f35427df6dc08f4d8b000e3b3ed085088d989aeca34a1ce81b0eee2e8fee1134e5b47b7 WHIRLPOOL d9eb18a2a7db0cf241f97174217747e3c7100a0bb0176c1ff4dff50b4b0c80f351d88b6b5c0214d1d1546b1555937e8fe39416649a3071c4104e840937544f51
-DIST pius-2.0.8.tar.bz2 23780 SHA256 097ab2354ff39486408117cb10ef175b58b13b9d63dff2515ec8417320ab6f29 SHA512 6f4381f21ea1d2580da53ffe1de1a1d252c60613ae79e8f674b6a96905467e517492090df3b1f792bd1e0b9e40d9c6692ff426f1956cca2229fe402fe40f1bd3 WHIRLPOOL ad2ce05ebc09298dcb2efc9ff8a4a88519332f3b9d7311b04538df9c2539d064b0b769a3549056640c449cb3393ad2f7b8087acdde49e32cd7a78494744d8cc8
DIST pius-2.0.9.tar.bz2 30225 SHA256 6d2cd48207a76e530b0082bc1cd21ffb44c204f5cfcfe611347a12ca87a732bc SHA512 37deb8ec30d937cc8ac9600eeb4b8f1952628dbc4b2e5ba8ed1a875f3083a1dd456efd198ee5b256412a945d7424c0ff9d262b553fe23d39dc9fc0ed05f88981 WHIRLPOOL 2a5a0b7d7cd3eb19a46442ca6573117f4b7b83598f013d6bfff993045c61538ed9dbdc41f3e8d7057996090fe2b1c0d2dbe2d8cc6dcdbc73a200e2a98a6f7b83
diff --git a/app-crypt/pius/pius-2.0.8.ebuild b/app-crypt/pius/pius-2.0.8.ebuild
deleted file mode 100644
index 2c8b9ab57aa8..000000000000
--- a/app-crypt/pius/pius-2.0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pius/pius-2.0.8.ebuild,v 1.3 2014/08/10 02:26:59 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
-HOMEPAGE="http://www.phildev.net/pius/"
-SRC_URI="mirror://sourceforge/pgpius/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="app-crypt/gnupg"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- python_convert_shebangs 2 ${PN}
-}
-
-src_install() {
- dobin ${PN}
- dodoc Changelog README
-}
diff --git a/app-crypt/ssh-multiadd/Manifest b/app-crypt/ssh-multiadd/Manifest
index 56b840667046..91fb05466148 100644
--- a/app-crypt/ssh-multiadd/Manifest
+++ b/app-crypt/ssh-multiadd/Manifest
@@ -1,2 +1 @@
-DIST ssh-multiadd-1.3.1.tar.gz 13975 SHA256 e604d41025adc8b3781aa60b2fc520b9b84f721b5edf06e75433ccd8716b0b93 SHA512 e99ce579b874166610cc6f64ab6ee227bd5dafd3777d32f96db16d986d49ee755f380965d617d7a99d682a1891436f6fa315e74acb94ddc54d2228f2ee48902f WHIRLPOOL 233e97eb9031d0b59b9c1a9f55a0d5eb39bb3b1446247c9a5823ef3081a30f78d55512f1bff5bf943e68ed57ca8a266f6a54d486d9b168b348ce48e369ef53eb
DIST ssh-multiadd-1.3.2.tar.gz 14035 SHA256 5526a9682b5d5e5051f91cd64a3e472bc6311939ee412725bf94eabb8f2f94c8 SHA512 fd4f26bfa5e2f654fc650470353901c6f418685f971ec4b5834afd0136e77469523c49b7cacb1b9716ff6c8cbbe810a057b214927f0325524170db84aebacbb3 WHIRLPOOL 871af4cb49282fbf22c547b99a9c14d035fd8766ba29899add5e2522d1a648df3e9705837b99a5cbfbe87ad0f363fab262905fe104353123171bfcccbb5be52f
diff --git a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1-r1.ebuild b/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1-r1.ebuild
deleted file mode 100644
index de9829936355..000000000000
--- a/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ssh-multiadd/ssh-multiadd-1.3.1-r1.ebuild,v 1.4 2012/08/27 18:00:02 armin76 Exp $
-
-EAPI=2
-
-PYTHON_DEPEND="2"
-
-inherit python
-
-DESCRIPTION="Adds multiple ssh keys to the ssh authentication agent"
-HOMEPAGE="http://www.azstarnet.com/~donut/programs/index_s.html#ssh-multiadd"
-SRC_URI="http://www.azstarnet.com/~donut/programs/ssh-multiadd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="X"
-
-DEPEND=""
-RDEPEND="X? ( >=net-misc/x11-ssh-askpass-1.2.2 )"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- python_convert_shebangs -r 2 .
-}
-
-src_compile(){
- :
-}
-
-src_install() {
- dobin ssh-multiadd || die
- doman ssh-multiadd.1
- dodoc README todo
-}
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 7a30f035718a..91d8e0f0a252 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,2 +1 @@
-DIST tpm-tools-1.3.5.tar.gz 439922 SHA256 60717336302bffff5044ed945a79f07594962fa3b989cf37f6eb042874d8fc45 SHA512 f958d497da8c8b792710450b0ee193923d53ed09d2be49d88a9acfab1df37938a3501b57ee0092f0c2d7ef9f1a380159ede1875795b600be2e8d1ededa74f623 WHIRLPOOL be24cddfddbb58c45b2b3cd3925144984cb0f349665959ba8c5b8c41256a11902066e5cf2fff8de53934772152f5b642fbbcb15d01af0a41dbcc2fa79767bdb2
DIST tpm-tools-1.3.8.tar.gz 473339 SHA256 66eb4ff095542403db6b4bd4b574e8a5c08084fe4e9e5aa9a829ee84e20bea83 SHA512 727113625645b01f8e77817d7f1cc6a8bf814f96061754fdfefceb125da4eebbea54804d1fec9e36559ffd61801b318bbc327907a3bdd661f872c32f811c7e74 WHIRLPOOL 201677976c97961a20578f7ca1b4dd0a8a9b105a718c0c67c34b9f1de0c75332532c62389711f732c99edda8fe45639dd3c8293df0a62a11f88ed4c9dc987270
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild
deleted file mode 100644
index 294902c181b9..000000000000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild,v 1.5 2014/08/03 15:25:02 tgall Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="nls pkcs11 debug"
-
-COMMON_DEPEND="
- >=app-crypt/trousers-0.3.0
- dev-libs/openssl
- pkcs11? ( dev-libs/opencryptoki )
- "
-RDEPEND="${COMMON_DEPEND}
- nls? ( virtual/libintl )"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- sed -i -r \
- -e '/CFLAGS/s/ -(Werror|m64)//' \
- configure.in || die
- epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch
-
- eautoreconf
-}
-
-src_configure() {
- local myconf
- # don't use --enable-pkcs11-support, configure is a mess.
- use pkcs11 || myconf+=" --disable-pkcs11-support"
-
- append-flags $(usex debug -DDEBUG -DNDEBUG)
-
- econf \
- $(use_enable nls) \
- ${myconf}
-}
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild
deleted file mode 100644
index 1bec001c256b..000000000000
--- a/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5.ebuild,v 1.4 2011/03/31 22:19:40 flameeyes Exp $
-
-EAPI="2"
-inherit autotools
-
-DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
-HOMEPAGE="http://trousers.sourceforge.net"
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-COMMON_DEPEND=">=app-crypt/trousers-0.3.0"
-RDEPEND="${COMMON_DEPEND}
- nls? ( virtual/libintl )"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- sed -i -e "s/-Werror //" configure.in || die "Sed failed"
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable nls) \
- --disable-pkcs11-support
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README || die
-}
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 4b1989bfd4a3..4e5a0a2aba60 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,3 +1,3 @@
DIST VBoxGuestAdditions_4.3.18.iso 58298368 SHA256 e5b425ec4f6a62523855c3cbd3975d17f962f27df093d403eab27c0e7f71464a SHA512 ee65476dba01d63a3029715ed7daaca5671e8ae1b81be2ddf5becb7d8eaae2e908af4b06abcb0695405d4031299090fd1e00fcc48425278a1871afbe34c40e09 WHIRLPOOL f96de01b8ba5ccfeafd99eed4317e365d348c42b635d37235f302411ace893d1b102fe9c6837f929fd11b6fe3874525e8f354e048676eda3e3e585a653f3fdc7
-DIST VBoxGuestAdditions_4.3.24.iso 58109952 SHA256 df4385aaa80f322ee2acda0657a53d9ca5c489e695ee5f9776574b67c649c960 SHA512 0a7fe6821fdf2b38fd9905a1ff9145f77471ebcc59bdafa2127b187a4816985ddc1e540b7e49015aaf129721b7bb842760b97813baef6b66a3282fd97d83ff8d WHIRLPOOL fb84386df5387fcd33382f8ed6e7b85ad9914371ecfef58d8e9591614f44677888a60d35904be90f8b522e127c0f6ca317d0a5912640459ae8d82d47b3abe6ee
DIST VBoxGuestAdditions_4.3.26.iso 58120192 SHA256 c5e46533a6ff8df177ed5c9098624f6cec46ca392bab16de2017195580088670 SHA512 fc3bc2dd56668da77b7941b52205ffde4233af8e56a2059f2fbcff7dbd17b4d7370263d0ba5e1a63ebf07059fb3749e584f07a9712c66ba408267383bcc285c2 WHIRLPOOL e4b96e6e89632f29a883297df3b0fc9b2c1baf5481efda4294989238084ff927d1531183e8f726ae830594874f0df2ae425788aeab628be30d7ab50f79f227f5
+DIST VBoxGuestAdditions_4.3.28.iso 58241024 SHA256 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733 SHA512 78055f389dc1a7bd62577f1fa670b8f8899ab3a58a87953d30fcaea1cd0c77f8662e15fea932c434309747971a2a61b61854b6f087654d9d2fb2de07fb6f1b5c WHIRLPOOL 64275e44c01f4f260899a7c16aaeb494ebe81277e7cbdec87e487736833cc239338f3c32c00759244b3be55c5754788593b81d06dab7d9ab26991369fa9d65fd
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.24.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild
similarity index 90%
rename from app-emulation/virtualbox-additions/virtualbox-additions-4.3.24.ebuild
rename to app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild
index c16aed146fc5..64defc28c7fc 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.24.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.3.24.ebuild,v 1.1 2015/03/04 07:07:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild,v 1.1 2015/05/17 21:20:21 polynomial-c Exp $
EAPI=5
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 2a324f183336..5c3c35cc094c 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,12 +1,12 @@
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.18-96516.tar.gz 15793634 SHA256 9c98f8256935492e6e45f7998e1c0e2fd859d87b24123d35ea0065fd0fd62d60 SHA512 ae51c0663a3c4ad220a63988463f7b785bf759b886d297fb0aceefa80462b511447a7d2527d2f971fd9030dc252a3e6576910514e0e7c60b3eb7889d97fcd440 WHIRLPOOL 75c0d312d47715e4bdb16643b2700abe617195eb1feb3fde814111c2dc7d77d03017698e49d0c77a99bb2c95211d888f436a0ed6d58a914cd05456a6531d042c
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.24-98716.tar.gz 15946289 SHA256 c6b61774e323b70da0d4f5677ef56f1c53990eccef859d3c720d814f98a01f8d SHA512 9d30e850e33f3e247e6e1e14eb8636f78cb32a141b623d1168f4daf1141f8602a2dbdeebea91118ccaeafedbf710ed0f125a08752871e934371c7965082d1924 WHIRLPOOL e99699ea7cbcfa2f0c4dab9b63fab2981a5725041cbf4d9072aaabbbbbb9e4abafb8383374639b6992e5917c6df7b420a6cc0f92214bd1b9fa866978f05c4f64
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.26-98988.tar.gz 15945596 SHA256 4e39a6d0da23799a31c3f6a4022b144ef3ddfe30c523e51b21bf7d9ebade62ce SHA512 e521f2079fc2ee6d38a85f8f5dc294954bdd298473ef041a4f37b8ea537730257cf2562fcc9eb1676c6c51bcaf53c181fdd97c7713deb51940642fadeb0749b9 WHIRLPOOL b8bdd98f6e740048e2c9ab07004bb2b5df57b9da8dd02fad82a72c969cc0c8fc3e27fca42945faf3575b5ed3800dee8863112ae6e6dc0699a2c91e2f8362d4ec
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
DIST VirtualBox-4.3.18-96516-Linux_amd64.run 85554642 SHA256 d723dde34d88970f26da1fb95ecac2afb03bee48ced1df4891b47d655809fefc SHA512 90beaa08f1ddb5966cb9884cdcfffde2ceb695b22c93bb976dfd5da4a3121c25e5eb39a715fbbed98102f97ebb20f07381bce18663196b3aa854a76830a7d1bb WHIRLPOOL 39697f1ff5f4d97a51ab0442a3d23efd71522d184443c2e4b292b8e4a59d982066e1be15b73acf9d234a9b8b3a0c733afccc1a6feec17576f37ec7cb5bdba9b0
DIST VirtualBox-4.3.18-96516-Linux_x86.run 85134796 SHA256 128d5711b3074ad00bcb6fb9c610016b81213f3a2a1cf308b33a1d20fafa876f SHA512 625894c1d99c53bacb75f1061baa3957b5146b64f911d328d4a34e39a48ff95c0ce39f75ba7c6ad66ab41918bf2ad8789af5946f0036039af1c8d49784631b7d WHIRLPOOL 3ba2a10eb988027e408853b7f889f07f39e6b4717ba6f630fe3c8ccee05267ad39187bf7e658ad5bcc77212b7a2b445ab2db439b1dc880de7ac41e8b44bc2e11
-DIST VirtualBox-4.3.24-98716-Linux_amd64.run 85544401 SHA256 fa5d7e6c01e0fd27de3ded341a6bc708ecc65f98005d9d828e9005e33e6a4b27 SHA512 7cb6cab40a6c2fd2a74a52716af8fcc45d78314b56da79866c1d304e2f7a91b4dafbd6940897b18f85bde849a83d577fa529ceac103c603db201c4f376bd5fe1 WHIRLPOOL 72e7af7b22750deab9daed305c02c13b9f6ebff5f24dbb4c6a2189867073ba73ba5462edbb048814882b85cae0d09e549739fd00161bc0d31d0392ce00cb27df
-DIST VirtualBox-4.3.24-98716-Linux_x86.run 85032397 SHA256 bbebed09e101888b7f2cb4cb283a9973971d6358028d47cb4d23cdb6914ad592 SHA512 5a7432f854f5b60576f8dc1bdd9d9ee0105a5218f24ab82a39fd1e9d3f1fcf21f798342c113ff0dfa1ebc57e51a35dace01508d4c48b4e82b6108e57e47bbb46 WHIRLPOOL 0e1623ee43cb2bdbffb215042835d25c61fe854dd073e3315dd4bafa760b7491261fc811723cdb04c4980a38aaa4d37fd1f9aac017eb164aba0fe7f4232bb41b
DIST VirtualBox-4.3.26-98988-Linux_amd64.run 85523921 SHA256 0a1e4d6f53e41ca953cd54ebf0dc4d9fb31349e7558a4f2a3ddfab30fab2b4a3 SHA512 9debb583d8df63d0f52b751d5299ec4975189ef69c8a1f38837e11289e0c809df3ecce4d66724d9e602fc2b6945364d71040f54429dfc00c0d7a54fc6e06dad8 WHIRLPOOL ede59a021971146ec9feed544eefaf62ef267ad460634b12a10eed3963e8d5346cc0bc541a70976eedd511a50222c193056666226cf5ea864aacc1d6756eaae9
DIST VirtualBox-4.3.26-98988-Linux_x86.run 84991437 SHA256 41e9d81cd1dca80c2b60554a3e24b92c56a3b645ecd34027f949f91d388f0ebb SHA512 7691baa78bda2332db7f965c8d8564e171caab2cbf647b0ec55ca77ea9d0216bc741fb2c589184959d693a1aadb137c0f14623fb0b5cb6b01e43b2db5bd1b549 WHIRLPOOL 72378855aa9f26d4838779a9a81cdeed43b775aecd47e4358f76bfc8f3c00f54d6dc11424cf6fcc5e3a25eb51dbd350eddba5d249fd83149aa52af23a3003e5e
+DIST VirtualBox-4.3.28-100309-Linux_amd64.run 85677523 SHA256 8c862533f876dc32fbfae993597b1123e2feac81a302c60e73b7ee891e17a77f SHA512 75dc2cd257b187b0a497b87c2f1e576a57ceece290327a98804c903810522444b0a64a704bc51a25945dbaa5c0caf30898ba258829577e2f17f7c736fcf59bb0 WHIRLPOOL c8d5d885807ad633bf1c4c6f98cac8dddf4002dc2e21ed2d2fb2f0a859f447b7ce06d1c49c4daff4147b25ca4992da14b6b75b39f47075c861732e6ef00091d1
+DIST VirtualBox-4.3.28-100309-Linux_x86.run 85083598 SHA256 aeb224d7136314865db8175db665408a3dc08f50ed68fbd4bf1568b32b7ea2f6 SHA512 110e20a45657c7677fcab0158d31052c909893b8f618adad2a2c95ad119d47d7c35d4aedf3692dd650fda62ba0747acf202364c14034e5c10d17cd45a9918707 WHIRLPOOL 35c97248985d11c77194ac03448357331e08b7ef64a77ba416564b6051eaf74ffb5a0acdf835bfcf71657c5fdd58066947b0ba1c42e91d34dbf026434f662f67
DIST VirtualBoxSDK-4.3.18-96516.zip 11690531 SHA256 5e0c95b626625960aa686d754d7102697f60b37a477ff63c984dce8dcf943b19 SHA512 353d3ce8d8b1decc4b61e3fa0088a041a8f1f5a7042b71e808ab3fd41ef13a8c5ac1596bf7a0a3ddc4b6c1432aca815ded3085cce83552d472c4338c5e4d8661 WHIRLPOOL b3ffc353590fd34851a2f91a8f8a7f9484921c81dde7d87be11168ab2c8c6b2c30f006e5b531b3cde278d8e61c4a6f65739ca1ef0ce3e5cef02acdcac3a53e55
-DIST VirtualBoxSDK-4.3.24-98716.zip 11190104 SHA256 24c23aa2da2ba361dc94bd8d3d23b7951acaf0be98d68c13f8ca027c4358f09f SHA512 07c5258c8413a8409c52b005c03b57f643fd8178337228d2ca1c96105d44d4c8bd0c777ea90f7634228b52e56e2ad488059b21eff8d13f140f5afa3fdf664148 WHIRLPOOL 692524db2b8e76c387d6c6d78ab2cea8511d001a392041a052ba670a15ab2bc9ad898be7c83ae1099c38b068045a4b8482b336dabbdb0fa86761023eb3f44438
DIST VirtualBoxSDK-4.3.26-98988.zip 11696688 SHA256 c11315ff75c39dce00f76fd028a1c02495a25f1104d1ff3ceba7058a922faeac SHA512 191b96a39d041f4941a27d8c86dbbf1fffbadea53b5a0a2cc6deb7b9b919df4fa9ff94ef0a31d643875c887f3d87dc8a899bc256c7d00b7e23ba47e635afd6c4 WHIRLPOOL 0e4564ffa36b63ebfcdc6deadcd61b6b85f587c5712c1d517f5a92a8d6de620de1c8b9337e1d122627476a51545f61f937780df5fc481bd18dc643d2e119781b
+DIST VirtualBoxSDK-4.3.28-100309.zip 11698378 SHA256 fe0cc316cecb3dfe9bbb925e6c023620d4cfd8e137b2a9b9f40f22f527af16fa SHA512 6af7d2107cff080281a356cbf522961b2e9d1917e861e410b169ce5ca3cefe05cc87e4e01f78ae171f8716f7006c031f14fc01d8d282a872a4f619638049b11a WHIRLPOOL 23a77dbc410a28b2799264da88d79b2c4335c07da67dd8bf4be26cac271e3ed38a9bf4fb2966ec0a3c06fb869bb252f5fa6a34a9a9c62cbb9a2fb0ad76442f66
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.24.98716.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild
similarity index 94%
rename from app-emulation/virtualbox-bin/virtualbox-bin-4.3.24.98716.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild
index c11780ddfcf1..961c0c7ea81b 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.24.98716.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild
@@ -1,10 +1,12 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.3.24.98716.ebuild,v 1.1 2015/03/04 07:06:57 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild,v 1.1 2015/05/17 21:19:40 polynomial-c Exp $
EAPI=5
-inherit eutils fdo-mime gnome2 pax-utils udev unpacker versionator
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime gnome2 pax-utils python-r1 udev unpacker versionator
MAIN_PV="$(get_version_component_range 1-3)"
if [[ ${PV} = *_beta* ]] || [[ ${PV} = *_rc* ]] ; then
@@ -43,7 +45,8 @@ if [[ "${PV}" != *beta* ]] ; then
IUSE+=" sdk"
fi
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/unzip
+ ${PYTHON_DEPS}"
RDEPEND="!!app-emulation/virtualbox
!app-emulation/virtualbox-additions
@@ -72,8 +75,9 @@ RDEPEND="!!app-emulation/virtualbox
x11-libs/libSM
x11-libs/libICE
x11-libs/libXdmcp
- python? ( dev-lang/python:2.7 )"
+ python? ( ${PYTHON_DEPS} )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S=${WORKDIR}
QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
@@ -244,14 +248,10 @@ src_install() {
fperms 0750 /opt/VirtualBox/kchmviewer
fi
- if use python ; then
- local pyslot
- for pyslot in 2.7 ; do
- if has_version "dev-lang/python:${pyslot}" && [ -f "${S}/VBoxPython${pyslot/./_}.so" ] ; then
- doins VBoxPython${pyslot/./_}.so
- fi
- done
- fi
+ # This ebuild / package supports only py2.7. Where py3 comes is unknown.
+ # The compile phase makes VBoxPython2_[4-7].so.
+ # py3 support would presumably require a binary pre-compiled by py3.
+ use python && doins VBoxPython.so VBoxPython2_7.so
rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index 8a4ffd823dd3..d01ec4887319 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,3 +1,3 @@
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.18-96516.tar.gz 15793634 SHA256 9c98f8256935492e6e45f7998e1c0e2fd859d87b24123d35ea0065fd0fd62d60 SHA512 ae51c0663a3c4ad220a63988463f7b785bf759b886d297fb0aceefa80462b511447a7d2527d2f971fd9030dc252a3e6576910514e0e7c60b3eb7889d97fcd440 WHIRLPOOL 75c0d312d47715e4bdb16643b2700abe617195eb1feb3fde814111c2dc7d77d03017698e49d0c77a99bb2c95211d888f436a0ed6d58a914cd05456a6531d042c
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.24-98716.tar.gz 15946289 SHA256 c6b61774e323b70da0d4f5677ef56f1c53990eccef859d3c720d814f98a01f8d SHA512 9d30e850e33f3e247e6e1e14eb8636f78cb32a141b623d1168f4daf1141f8602a2dbdeebea91118ccaeafedbf710ed0f125a08752871e934371c7965082d1924 WHIRLPOOL e99699ea7cbcfa2f0c4dab9b63fab2981a5725041cbf4d9072aaabbbbbb9e4abafb8383374639b6992e5917c6df7b420a6cc0f92214bd1b9fa866978f05c4f64
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.26-98988.tar.gz 15945596 SHA256 4e39a6d0da23799a31c3f6a4022b144ef3ddfe30c523e51b21bf7d9ebade62ce SHA512 e521f2079fc2ee6d38a85f8f5dc294954bdd298473ef041a4f37b8ea537730257cf2562fcc9eb1676c6c51bcaf53c181fdd97c7713deb51940642fadeb0749b9 WHIRLPOOL b8bdd98f6e740048e2c9ab07004bb2b5df57b9da8dd02fad82a72c969cc0c8fc3e27fca42945faf3575b5ed3800dee8863112ae6e6dc0699a2c91e2f8362d4ec
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.24.98716.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild
similarity index 91%
rename from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.24.98716.ebuild
rename to app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild
index d7b5fce6676a..8db8840ac257 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.24.98716.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.24.98716.ebuild,v 1.1 2015/03/04 07:08:14 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild,v 1.1 2015/05/17 21:21:25 polynomial-c Exp $
EAPI=5
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index e87f5e33e57d..c884bb6a78b4 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,3 +1,3 @@
DIST VirtualBox-4.3.18.tar.bz2 98022191 SHA256 9798acbc78b2645f2a02446ef6be181ede1a377792007af2a3280c962edc24cb SHA512 d19933f9869b2fe6ed121896b49da0f82451954ff9ee3b53d6d3374a1bd178049d1528df78100187e2fc1d36518c924f19cf12bd3d1718c98a5771e2112ee5d3 WHIRLPOOL eeaf2f8d72e2d02792f5b58fa21297c80d58f5fd66801c04721bf24780600e5643b2446d6a6115625e8922565c8197b8b67e7384a2138509dddd7b2fa32a95be
-DIST VirtualBox-4.3.24.tar.bz2 102647661 SHA256 e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc SHA512 e9a5be9f95c83b832bdecf0f56c01e4e16574455b8583d20d2ce26bf771747d5139fec4117706316b89862771fbe3d21a3c124fcd7cc2d04338de1b08b2c34f0 WHIRLPOOL c7ca87f3b2dd0d44beb154ce9753620cc60ea5a10f9b2afa1dbc50cefa223f239d116977f08520e53d57a51e7e5d72de2db6589bd7548ad74b32bf8ba6b71e84
DIST VirtualBox-4.3.26.tar.bz2 102676804 SHA256 e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 SHA512 fb55169b7fc8d003746285d6008b70048e83c4245ba41ff7919956696846a8f566c71699c72bbe2c6650e608450fc39990442e0c69782e7dd265596c0efd8cfc WHIRLPOOL 53e175e5581b3a8af7f18ec5c5718789cabec4b6916acb439f5db211059755fcec08e8563ab3d6bcacc625d1c1ff4617f8a8cf83e263fa97ceb9d83cc51d4147
+DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.24.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild
similarity index 90%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.24.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild
index 577dff93016f..9e7b9c13f4f8 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.24.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.24.ebuild,v 1.1 2015/03/04 07:11:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild,v 1.1 2015/05/17 21:24:15 polynomial-c Exp $
EAPI=5
-inherit eutils linux-mod systemd user
+inherit eutils linux-mod systemd user toolchain-funcs
MY_PV="${PV/beta/BETA}"
MY_PV="${MY_PV/rc/RC}"
@@ -50,7 +50,7 @@ S="${WORKDIR}/${MY_P}"
pkg_setup() {
linux-mod_pkg_setup
- BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+ BUILD_PARAMS="KERN_DIR=${KV_OUT_DIR} KERNOUT=${KV_OUT_DIR}"
enewgroup vboxguest
enewuser vboxguest -1 /bin/sh /dev/null vboxguest
# automount Error: VBoxServiceAutoMountWorker: Group "vboxsf" does not exist
@@ -90,17 +90,26 @@ src_prepare() {
src_configure() {
# build the user-space tools, warnings are harmless
- ./configure --nofatal \
- --disable-xpcom \
- --disable-sdl-ttf \
- --disable-pulse \
- --disable-alsa \
- --build-headless || die "configure failed"
+ local cmd=(
+ ./configure
+ --nofatal
+ --disable-xpcom
+ --disable-sdl-ttf
+ --disable-pulse
+ --disable-alsa
+ --with-gcc="$(tc-getCC)"
+ --with-g++="$(tc-getCXX)"
+ --target-arch=${ARCH}
+ --with-linux="${KV_OUT_DIR}"
+ --build-headless
+ )
+ echo "${cmd[@]}"
+ "${cmd[@]}" || die "configure failed"
+ source ./env.sh
+ export VBOX_GCC_OPT="${CFLAGS} ${CPPFLAGS}"
}
src_compile() {
- source ./env.sh
-
for each in /src/VBox/{Runtime,Additions/common} \
/src/VBox/Additions/linux/sharedfolders ; do
cd "${S}"${each} || die
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index ccfcfa6623c2..03ce1f0428f2 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,3 +1,3 @@
DIST vbox-kernel-module-src-4.3.18.tar.xz 537128 SHA256 88a7b8f42385a2eefcc971a56a347786d046538262871cb7814c9449c03bd5aa SHA512 c02273f4350e3e4ab7c961ab9faef100a26361cb34948df8b2cb37b72c337e6b0c555bbce8051089b250bffb0a422d5dfc9cd801b8d33ea3b2481ce8375150de WHIRLPOOL 35522cee25fcc2e5c5cd74d8a715b0ccccc488e0ccf1a87082c7335fc2dacb02b93be218f38f693b8b3d1b5bfcca2dd1aa31b1a4a732a70df6c5479d5eb2bc30
-DIST vbox-kernel-module-src-4.3.24.tar.xz 538172 SHA256 c1009391ce89678c30fe40abf1b89743531e11c7567efdffadf992c5168d6287 SHA512 43964c403b6a392ef61a50c955eed0386d4d301293a1f03a8dd5ca6df77b6f6a192aafa03dc3630071f44dd5cd75ac7105d8a49e8befc8d75339f6c8eb83298e WHIRLPOOL 1712c6202324f6b96f8b925f50dcd1ffbb00ae3f4fb4486b867563e34a266de24339453f1afe69510a3dc4f361115f51cec825e9992ab2f224bc29de957d4f21
DIST vbox-kernel-module-src-4.3.26.tar.xz 539240 SHA256 d128ad9c306af8af43281c2925de582239a30ea183cb42b70ff29fd6a480103c SHA512 2f4cd00daa0ca31b336a147ed48d45b0c32f1346688a5f8b1802d7c430654c15559c0bd3e0c8f983a035ebce5e41d13cb78bc42be8e84837a934c8182fdb25db WHIRLPOOL 419778e2af595e315e65ffc80ea1d153e7d2b611b2ab409e18b739e910f8adcb892c5e2f711067e471463f339c942167ea04f2319e5f1e77d85884eb90dc4acd
+DIST vbox-kernel-module-src-4.3.28.tar.xz 539876 SHA256 fb052997ec4992b0ee102475051b5d7bd8485e17405c6b3dcc94e1fa4a53b761 SHA512 637149f8595cb023e75116f83237bb4cef1b05627f58d475fa952ac86a85aa3cbab5f0cec723d730979f831999c920f35248e5f8db8f6987fb4c15c4a29bd517 WHIRLPOOL ab1ed07ee148a1ef352c0fda3f09865405be4146b987a5dffcb753d7512a00aa88c2ba1f7184b56d694c88320b350c6ececd3bec5636dd1586fc14a6be8a874d
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.24.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
similarity index 95%
rename from app-emulation/virtualbox-modules/virtualbox-modules-4.3.24.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
index fc025cef2e2a..779298986f63 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.24.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.24.ebuild,v 1.1 2015/03/04 07:05:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild,v 1.1 2015/05/17 21:18:21 polynomial-c Exp $
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 92f3e465c96d..f5567219777d 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,4 +1,4 @@
DIST VirtualBox-4.3.18.tar.bz2 98022191 SHA256 9798acbc78b2645f2a02446ef6be181ede1a377792007af2a3280c962edc24cb SHA512 d19933f9869b2fe6ed121896b49da0f82451954ff9ee3b53d6d3374a1bd178049d1528df78100187e2fc1d36518c924f19cf12bd3d1718c98a5771e2112ee5d3 WHIRLPOOL eeaf2f8d72e2d02792f5b58fa21297c80d58f5fd66801c04721bf24780600e5643b2446d6a6115625e8922565c8197b8b67e7384a2138509dddd7b2fa32a95be
-DIST VirtualBox-4.3.24.tar.bz2 102647661 SHA256 e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc SHA512 e9a5be9f95c83b832bdecf0f56c01e4e16574455b8583d20d2ce26bf771747d5139fec4117706316b89862771fbe3d21a3c124fcd7cc2d04338de1b08b2c34f0 WHIRLPOOL c7ca87f3b2dd0d44beb154ce9753620cc60ea5a10f9b2afa1dbc50cefa223f239d116977f08520e53d57a51e7e5d72de2db6589bd7548ad74b32bf8ba6b71e84
DIST VirtualBox-4.3.26.tar.bz2 102676804 SHA256 e2949c250a1de30997e658de9e3d8545e71318a9844d80536137d76db4f08961 SHA512 fb55169b7fc8d003746285d6008b70048e83c4245ba41ff7919956696846a8f566c71699c72bbe2c6650e608450fc39990442e0c69782e7dd265596c0efd8cfc WHIRLPOOL 53e175e5581b3a8af7f18ec5c5718789cabec4b6916acb439f5db211059755fcec08e8563ab3d6bcacc625d1c1ff4617f8a8cf83e263fa97ceb9d83cc51d4147
+DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
diff --git a/app-emulation/virtualbox/virtualbox-4.3.24.ebuild b/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
similarity index 99%
rename from app-emulation/virtualbox/virtualbox-4.3.24.ebuild
rename to app-emulation/virtualbox/virtualbox-4.3.28.ebuild
index 1cb5c72065b7..d4f48a46bea7 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.24.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.24.ebuild,v 1.2 2015/03/29 20:58:20 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.3.28.ebuild,v 1.1 2015/05/17 21:22:47 polynomial-c Exp $
EAPI=5
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 2aa20c992460..b86cdc2004c7 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -24,6 +24,8 @@ DIST wine-1.7.39.tar.bz2 22122289 SHA256 6affb007fe772eb5588c584e3bdb62db96d8291
DIST wine-1.7.4.tar.bz2 21500746 SHA256 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969 SHA512 4267eb43311fe53537a1864a70e88e4bf444b8979dc858725a1170ed06af4e727604a22bafb3deb448eeb62c170ce67ce8eb8082bce040f5488b1a4c4bc6bb95 WHIRLPOOL 7bb14e0dfd4f9a7411e1d5484dba62f8584a0e03997cc3c6192893dccbc7de316eb79a1e5b0ccf96d20e74cf512ebc79e760076ff4882625bc81b410ad8be0bf
DIST wine-1.7.40.tar.bz2 22183479 SHA256 0d82e639a553765437f9a3f864f383e8e4e1eb0f1dd815263f9fda1c78d5cab6 SHA512 3d812b8eefa14f3fea908345b9a8950e9a409e5e45b38d73105c181bfc3fa5f9ef82a022cffcc2efd45f79220ab9ff139b3729410b7708ed6ff960647761dd61 WHIRLPOOL c9935e5daf077b3bb66209fe572b494ca8250c16f76a13122f61899112559a010344ff9e2046a9132d904b0396e519291eba641ebc8add364dda85becfd5d14b
DIST wine-1.7.41.tar.bz2 22237972 SHA256 6fa622b1dacb257fab671ddd689439daf6bb1cfb9e632c324db16a5db6372f97 SHA512 e5f040a07fdeea44a5a48630bfb70a81ce6cede462d40aaa55277481faa4176f1f0df290bf7afe7452a695b3457ebc43dde474feca74b48d041cb5bb0a5df85f WHIRLPOOL e8dff1a0543aab21802ce54e231c2be9c9e4aee0bf476db7615a519a7eab25c7f95da0fef4899cbd8c458366bd15ae340ebdd1025136dcc944cca4d1a2ba1e7b
+DIST wine-1.7.42.tar.bz2 22229770 SHA256 5a7f5c82b120bfe1eca572bd8d7a4ede7e6baf330ce3087199eb5cd175233ba2 SHA512 f290860614ad83f0fdf50d3b063f5edf8ea59449d30292ee837531b26a1b5ab871b2f70305c5a132d3727db7471ca67e2aa7356df8b35745bd38602b54a56781 WHIRLPOOL de7292e08201ed9bcab03da2490213abcaa39e44dcd156c19d154c3af9ce74f73ccf079fd2ca4578d0c91b046c21d24e38fe85f47135b6e4b311b8986975c241
+DIST wine-1.7.43.tar.bz2 22246396 SHA256 53d49b9affcb836443cf25111c2906dfcae9ff1fc8170dffbd81755405907822 SHA512 676f3eddff3004044e1ce8b1f9d3023e1a37f8e89db20724f71b18c789c856c7bb5cfc8ec4ea3f7b2ab215e19cd0073b51e14a93a748512b366d472f4da6fe01 WHIRLPOOL b000c218c45a86d995b06900691f2bce580658f8545600c734383032b47c980a1e0d3534ac4e72be786b4c00520e482e999059fbb8437cb704bb707f8d4aea7e
DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
DIST wine-compholio-1.7.22.tar.gz 888414 SHA256 110da63d7037bfbff1a1b64659b01161976e3e686961d8ed30218ff0d4bafac2 SHA512 a19fd6c82a7395a09cdbe29d013fe4667c169aba95995eb64eb4946768a35308950c420fe704a75cf4d7a4c5c9920c34d4928b5715948068f2e4eeb8a6b06a92 WHIRLPOOL 58de03bf7a07f44a2843277fdafd2104d40fb5a7ccbbcb8ea0c2048596d6a76036c15c48bc4332b2ee48c5432692115f0ad85176da3029ba7730f5bd48f2a11b
@@ -43,6 +45,8 @@ DIST wine-staging-1.7.38.tar.gz 9047747 SHA256 b77fc0913c972c0cb2b3fcc3d7627a838
DIST wine-staging-1.7.39.tar.gz 9096658 SHA256 b7b3ba39e2a8829a6fd6aef4b3701dd0009eebc85539ac946e31de6d7fe36649 SHA512 d14780c30303a17f575f22adeab5cc026c2f41520d47dbb7ec70b939252eae656070eb8532cf1a42cca2b1c9c589a44081d12b2647b0d97c3c90b896a7433d23 WHIRLPOOL 8d71a49c3172261e83193ccfe85dfbd94421ee20063f4127ecb328450916cddbea742c59c09c34e10035d9f2fa0df0ebd0d68bbc6e90b92c1aa1a1071a26b055
DIST wine-staging-1.7.40.tar.gz 9129843 SHA256 d2cafa5e847e1aecb82bb1dd42ea7729f749176c3ddc549c6b422c8ba74b89d5 SHA512 7688f9e2178335b8c1606673921368faa1532c766bf2a60c9be1d9640719acf024122270084afc892195878bfcadb6aea6cbf971a6bb2112260b3840d94ab994 WHIRLPOOL b58e5dcdbbb1632ed8d8bf98c34396c0a8e1d108d557d130ab9aceaa9efd9b9002eef38c7829196eae0736c1002a1e1c723bcdcf0a819e48a1394e615c997262
DIST wine-staging-1.7.41.tar.gz 9136024 SHA256 c34f773003e25195fd761bbaff517f31deaebb8d46fc94de14b9581728138174 SHA512 89d867b6c869221f441b7bd5cb473f4179c2fa5453ac86df8801838dc5eca64fd2d33c38a73b74972cc2fd97c1f762c1fd60f2857074c71942687cd027e08bdb WHIRLPOOL 91a17eb37ae65ca41e397935994b22b45e4d2eac3b3bbf3cffcfc400084fa83e43ee5e29248a028363430251b1485b499ae37fe2e0668df971d8eb77aa495257
+DIST wine-staging-1.7.42.tar.gz 9146373 SHA256 71dc4b0063446347769234075e7b76e5214a54eccee445a72cb7467bd0a85b3d SHA512 9d8a468e4eb74ec45ca2554d4d6c38e32e8bfdfcb768e4bbe484204fb884bd8194ffadc2fc4dcfa561492e5605667a6aac24704fbff17e2adbf9407dcbc7e3a9 WHIRLPOOL 3560c07b95b8555d81425fa42e689a0040cf62a1a17ec6c2d081c4d4b8acf53176c7041be0db94b438b91b3a20d4994ea127c66e287a75286b0d436cc6466d54
+DIST wine-staging-1.7.43.tar.gz 9181556 SHA256 bed2db992bf7926e8f2cf45c4cbfe37a15e13a10639cd69be290b658f5e5b9f5 SHA512 b2e0ae99acdc77717a00ba1c25274c0d0cc4ff6cfc3d794ed691c9ab5fa320c15f0e3bd793dfee3e9c86985e676608c7a6916eb4c47c94eae907e6c498fe80c8 WHIRLPOOL e010e9c59e7553219f2866884c37014fbb76556fe808aca9d00dcbdb8c0cb111ffccb07bd323ece84261e5cd50e32dedcba9ca4ae3c1d692e64e232e6d561829
DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512 f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898 WHIRLPOOL bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487
diff --git a/app-emulation/wine/wine-1.7.42.ebuild b/app-emulation/wine/wine-1.7.42.ebuild
new file mode 100644
index 000000000000..b1ac505a6a37
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.42.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.42.ebuild,v 1.1 2015/05/17 23:25:36 tetromino Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MY_P="${PN}-${PV/_/-}"
+ SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+ S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.36"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ gecko? (
+ abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+ abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ )
+ mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+ gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+ http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+ pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ test? ( abi_x86_32 )
+ elibc_glibc? ( threads )
+ mono? ( abi_x86_32 )
+ pipelight? ( staging )
+ s3tc? ( staging )
+ vaapi? ( staging )
+ osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+NATIVE_DEPEND="
+ truetype? ( >=media-libs/freetype-2.0.0 )
+ capi? ( net-dialup/capi4k-utils )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ udisks? ( sys-apps/dbus )
+ fontconfig? ( media-libs/fontconfig:= )
+ gphoto2? ( media-libs/libgphoto2:= )
+ openal? ( media-libs/openal:= )
+ gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ )
+ xinerama? ( x11-libs/libXinerama )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups:= )
+ opencl? ( virtual/opencl )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ gsm? ( media-sound/gsm:= )
+ jpeg? ( virtual/jpeg:0= )
+ ldap? ( net-nds/openldap:= )
+ lcms? ( media-libs/lcms:2= )
+ mp3? ( >=media-sound/mpg123-1.5.0 )
+ netapi? ( net-fs/samba[netapi(+)] )
+ nls? ( sys-devel/gettext )
+ odbc? ( dev-db/unixODBC:= )
+ osmesa? ( media-libs/mesa[osmesa] )
+ pcap? ( net-libs/libpcap )
+ staging? ( sys-apps/attr )
+ pulseaudio? ( media-sound/pulseaudio )
+ xml? ( dev-libs/libxml2 dev-libs/libxslt )
+ scanner? ( media-gfx/sane-backends:= )
+ ssl? ( net-libs/gnutls:= )
+ png? ( media-libs/libpng:0= )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( x11-libs/libva[X] )
+ xcomposite? ( x11-libs/libXcomposite )"
+
+COMMON_DEPEND="
+ !amd64? ( ${NATIVE_DEPEND} )
+ amd64? (
+ abi_x86_64? ( ${NATIVE_DEPEND} )
+ abi_x86_32? (
+ truetype? ( || (
+ >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+ >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+ ) )
+ ncurses? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+ ) )
+ udisks? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+ >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
+ ) )
+ fontconfig? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+ ) )
+ gphoto2? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
+ ) )
+ openal? ( || (
+ app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+ >=media-libs/openal-1.15.1[abi_x86_32(-)]
+ ) )
+ gstreamer? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ (
+ >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+ >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+ )
+ ) )
+ X? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ (
+ >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+ >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+ >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+ )
+ ) )
+ xinerama? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+ ) )
+ alsa? ( || (
+ app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+ >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+ ) )
+ cups? ( || (
+ app-emulation/emul-linux-x86-baselibs
+ >=net-print/cups-1.7.1-r1[abi_x86_32(-)]
+ ) )
+ opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
+ opengl? ( || (
+ app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
+ (
+ >=virtual/glu-9.0-r1[abi_x86_32(-)]
+ >=virtual/opengl-7.0-r1[abi_x86_32(-)]
+ )
+ ) )
+ gsm? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
+ ) )
+ jpeg? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+ ) )
+ ldap? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
+ ) )
+ lcms? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=media-libs/lcms-2.5:2[abi_x86_32(-)]
+ ) )
+ mp3? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/mpg123-1.15.4[abi_x86_32(-)]
+ ) )
+ netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
+ nls? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+ ) )
+ odbc? ( || (
+ app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+ >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
+ ) )
+ osmesa? ( || (
+ >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+ >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
+ ) )
+ pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+ pulseaudio? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/pulseaudio-5.0[abi_x86_32(-)]
+ ) )
+ staging? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
+ ) )
+ xml? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
+ (
+ >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+ >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+ )
+ ) )
+ scanner? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+ ) )
+ ssl? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+ ) )
+ png? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
+ ) )
+ v4l? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-libs/libv4l-0.9.5[abi_x86_32(-)]
+ ) )
+ vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
+ xcomposite? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
+ ) )
+ )
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ dos? ( games-emulation/dosbox )
+ perl? ( dev-lang/perl dev-perl/XML-Simple )
+ s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.0.25 )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )
+ pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
+ staging? ( dev-lang/perl dev-perl/XML-Simple )
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ prelink? ( sys-devel/prelink )
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # bug #549768
+ if [[ $(gcc-major-version) = 5 ]]; then
+ eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+
+ if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+ eerror "You need gcc-4.4+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+
+ if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ if use staging || use pulseaudio; then
+ EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+ unset ${PN}_LIVE_REPO;
+ EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+ fi
+ else
+ unpack ${MY_P}.tar.bz2
+ use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+ fi
+
+ unpack "${WINE_GENTOO}.tar.bz2"
+ use gstreamer && unpack "${GST_P}.patch.bz2"
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+ "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+ )
+ if use gstreamer; then
+ # See http://bugs.winehq.org/show_bug.cgi?id=30557
+ ewarn "Applying experimental patch to fix GStreamer support. Note that"
+ ewarn "this patch has been reported to cause crashes in certain games."
+
+ # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+ # during shutdown" patch and "Added patch to implement shared memory
+ # wineserver communication for various user32 functions" prevents the
+ # gstreamer patch from applying cleanly.
+ # So undo the staging patch, apply gstreamer, then re-apply rebased staging
+ # patch on top.
+ if use staging; then
+ PATCHES+=(
+ "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+ "${WORKDIR}/${GST_P}.patch"
+ "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+ else
+ PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+ fi
+ fi
+ if use staging; then
+ ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+ ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+ ewarn "unless you can reproduce them with USE=-staging"
+
+ local STAGING_EXCLUDE=""
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $?
+ elif use pulseaudio; then
+ PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
+ fi
+ autotools-utils_src_prepare
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+ fi
+
+ # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ if use pulseaudio || use staging; then
+ myconf+=( $(use_with pulseaudio pulse) )
+ fi
+ use staging && myconf+=(
+ --with-xattr
+ $(use_with vaapi va)
+ )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ local l
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+ if use gecko ; then
+ insinto /usr/share/wine/gecko
+ use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+ use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ fi
+ if use mono ; then
+ insinto /usr/share/wine/mono
+ doins "${DISTDIR}"/wine-mono-${MV}.msi
+ fi
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym /usr/bin/wine{64,} # 404331
+ dosym /usr/bin/wine{64,}-preloader
+ fi
+
+ # respect LINGUAS when installing man pages, #469418
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+ done
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-1.7.43.ebuild b/app-emulation/wine/wine-1.7.43.ebuild
new file mode 100644
index 000000000000..ccb52fddc1d1
--- /dev/null
+++ b/app-emulation/wine/wine-1.7.43.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.43.ebuild,v 1.1 2015/05/18 04:59:26 tetromino Exp $
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MY_P="${PN}-${PV/_/-}"
+ SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+ S=${WORKDIR}/${MY_P}
+fi
+
+GV="2.36"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+GST_P="wine-1.7.34-gstreamer-v5"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ gecko? (
+ abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
+ abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ )
+ mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+ gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
+ http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+ pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ test? ( abi_x86_32 )
+ elibc_glibc? ( threads )
+ mono? ( abi_x86_32 )
+ pipelight? ( staging )
+ s3tc? ( staging )
+ vaapi? ( staging )
+ osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+NATIVE_DEPEND="
+ truetype? ( >=media-libs/freetype-2.0.0 )
+ capi? ( net-dialup/capi4k-utils )
+ ncurses? ( >=sys-libs/ncurses-5.2:= )
+ udisks? ( sys-apps/dbus )
+ fontconfig? ( media-libs/fontconfig:= )
+ gphoto2? ( media-libs/libgphoto2:= )
+ openal? ( media-libs/openal:= )
+ gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXxf86vm
+ )
+ xinerama? ( x11-libs/libXinerama )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups:= )
+ opencl? ( virtual/opencl )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ gsm? ( media-sound/gsm:= )
+ jpeg? ( virtual/jpeg:0= )
+ ldap? ( net-nds/openldap:= )
+ lcms? ( media-libs/lcms:2= )
+ mp3? ( >=media-sound/mpg123-1.5.0 )
+ netapi? ( net-fs/samba[netapi(+)] )
+ nls? ( sys-devel/gettext )
+ odbc? ( dev-db/unixODBC:= )
+ osmesa? ( media-libs/mesa[osmesa] )
+ pcap? ( net-libs/libpcap )
+ staging? ( sys-apps/attr )
+ pulseaudio? ( media-sound/pulseaudio )
+ xml? ( dev-libs/libxml2 dev-libs/libxslt )
+ scanner? ( media-gfx/sane-backends:= )
+ ssl? ( net-libs/gnutls:= )
+ png? ( media-libs/libpng:0= )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( x11-libs/libva[X] )
+ xcomposite? ( x11-libs/libXcomposite )"
+
+COMMON_DEPEND="
+ !amd64? ( ${NATIVE_DEPEND} )
+ amd64? (
+ abi_x86_64? ( ${NATIVE_DEPEND} )
+ abi_x86_32? (
+ truetype? ( || (
+ >=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
+ >=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
+ ) )
+ ncurses? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
+ ) )
+ udisks? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
+ >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
+ ) )
+ fontconfig? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
+ ) )
+ gphoto2? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
+ ) )
+ openal? ( || (
+ app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
+ >=media-libs/openal-1.15.1[abi_x86_32(-)]
+ ) )
+ gstreamer? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ (
+ >=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
+ >=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
+ )
+ ) )
+ X? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ (
+ >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
+ >=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+ >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
+ >=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+ >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+ )
+ ) )
+ xinerama? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
+ ) )
+ alsa? ( || (
+ app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
+ >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
+ ) )
+ cups? ( || (
+ app-emulation/emul-linux-x86-baselibs
+ >=net-print/cups-1.7.1-r1[abi_x86_32(-)]
+ ) )
+ opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
+ opengl? ( || (
+ app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
+ (
+ >=virtual/glu-9.0-r1[abi_x86_32(-)]
+ >=virtual/opengl-7.0-r1[abi_x86_32(-)]
+ )
+ ) )
+ gsm? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
+ ) )
+ jpeg? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=virtual/jpeg-0-r2:0[abi_x86_32(-)]
+ ) )
+ ldap? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
+ ) )
+ lcms? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=media-libs/lcms-2.5:2[abi_x86_32(-)]
+ ) )
+ mp3? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/mpg123-1.15.4[abi_x86_32(-)]
+ ) )
+ netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
+ nls? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
+ ) )
+ odbc? ( || (
+ app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
+ >=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
+ ) )
+ osmesa? ( || (
+ >=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
+ >=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
+ ) )
+ pcap? ( net-libs/libpcap[abi_x86_32(-)] )
+ pulseaudio? ( || (
+ app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
+ >=media-sound/pulseaudio-5.0[abi_x86_32(-)]
+ ) )
+ staging? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
+ ) )
+ xml? ( || (
+ >=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
+ (
+ >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+ >=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
+ )
+ ) )
+ scanner? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
+ ) )
+ ssl? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
+ ) )
+ png? ( || (
+ app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
+ >=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
+ ) )
+ v4l? ( || (
+ app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
+ >=media-libs/libv4l-0.9.5[abi_x86_32(-)]
+ ) )
+ vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
+ xcomposite? ( || (
+ app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
+ >=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
+ ) )
+ )
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ dos? ( games-emulation/dosbox )
+ perl? ( dev-lang/perl dev-perl/XML-Simple )
+ s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.0.25 )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )
+ pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
+ staging? ( dev-lang/perl dev-perl/XML-Simple )
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ prelink? ( sys-devel/prelink )
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # bug #549768
+ if [[ $(gcc-major-version) = 5 ]]; then
+ eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+
+ if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+ eerror "You need gcc-4.4+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+
+ if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ if use staging || use pulseaudio; then
+ EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+ unset ${PN}_LIVE_REPO;
+ EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+ fi
+ else
+ unpack ${MY_P}.tar.bz2
+ use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
+ fi
+
+ unpack "${WINE_GENTOO}.tar.bz2"
+ use gstreamer && unpack "${GST_P}.patch.bz2"
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+ "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+ )
+ if use gstreamer; then
+ # See http://bugs.winehq.org/show_bug.cgi?id=30557
+ ewarn "Applying experimental patch to fix GStreamer support. Note that"
+ ewarn "this patch has been reported to cause crashes in certain games."
+
+ # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
+ # during shutdown" patch and "Added patch to implement shared memory
+ # wineserver communication for various user32 functions" prevents the
+ # gstreamer patch from applying cleanly.
+ # So undo the staging patch, apply gstreamer, then re-apply rebased staging
+ # patch on top.
+ if use staging; then
+ PATCHES+=(
+ "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-pre.patch"
+ "${WORKDIR}/${GST_P}.patch"
+ "${FILESDIR}/${PN}-1.7.39-gstreamer-v5-staging-post.patch" )
+ else
+ PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
+ fi
+ fi
+ if use staging; then
+ ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
+ ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
+ ewarn "unless you can reproduce them with USE=-staging"
+
+ local STAGING_EXCLUDE=""
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $?
+ elif use pulseaudio; then
+ PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
+ fi
+ autotools-utils_src_prepare
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+ fi
+
+ # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ if use pulseaudio || use staging; then
+ myconf+=( $(use_with pulseaudio pulse) )
+ fi
+ use staging && myconf+=(
+ --with-xattr
+ $(use_with vaapi va)
+ )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ local l
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+ if use gecko ; then
+ insinto /usr/share/wine/gecko
+ use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+ use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ fi
+ if use mono ; then
+ insinto /usr/share/wine/mono
+ doins "${DISTDIR}"/wine-mono-${MV}.msi
+ fi
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym /usr/bin/wine{64,} # 404331
+ dosym /usr/bin/wine{64,}-preloader
+ fi
+
+ # respect LINGUAS when installing man pages, #469418
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+ done
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 8f44a0f1aacf..f67903437ce7 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.176 2015/04/19 03:45:33 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.177 2015/05/17 23:25:36 tetromino Exp $
EAPI="5"
@@ -11,7 +11,7 @@ PLOCALE_BACKUP="en"
inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
@@ -282,6 +282,13 @@ usr/share/applications/wine-winecfg.desktop"
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
+ # bug #549768
+ if [[ $(gcc-major-version) = 5 ]]; then
+ eerror "You need gcc-4.x to build wine; see https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
eerror "You need gcc-4.4+ to build 64-bit wine"
eerror
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 4819fdb90075..42f54f28a417 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,2 +1 @@
-DIST mysql-connector-odbc-5.1.6.tar.gz 1041247 SHA256 1d53c3a20cf68b089535278d3e69c0e49f367a457640c5f8af25c1cbf4ffb02e SHA512 74fe41c09a6261e31475c17a6b96d3161737c792fec6b2774f51fa58adae592143e44d6a2bf5dc2ec445b5e19653aa6abc9e6d0d37cc478bb26137f2658766f9 WHIRLPOOL 573f942682581514adb94183c633eb38a0ab1c990ead1f7da1e90aedcff18da392480bfaa1216d3e9b0c8b261f963bd81c0ed5f7192c74a8294028783e6f85e9
DIST mysql-connector-odbc-5.2.7-src.tar.gz 606472 SHA256 0ad8fcccb4c41c7100fe02ec0aa87938d33329d23f7b68d1b9031c87750392c9 SHA512 f54ac8a23ade71da85e1335e95eccdccfd68a8687d17a584ced103812bdc5aee8014769a84eaa22724bb2cb23d34c7188c964d3283723defeaef5157a4b3c60f WHIRLPOOL 928808ac5b623ec345c8c1b8495ca1de7f10e65f0d14720e9bee6ab154ccf818ca690745a57fa7fa1c008ba57b24705657398cd9146fbf2e385c178deca0e499
diff --git a/dev-db/myodbc/files/5.2.7-cxxlinkage.patch b/dev-db/myodbc/files/5.2.7-cxxlinkage.patch
deleted file mode 100644
index a78c89ba4f56..000000000000
--- a/dev-db/myodbc/files/5.2.7-cxxlinkage.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uarN mysql-connector-odbc-5.3.4-src.orig/cmake/FindMySQL.cmake mysql-connector-odbc-5.3.4-src/cmake/FindMySQL.cmake
---- mysql-connector-odbc-5.3.4-src.orig/cmake/FindMySQL.cmake 2014-06-18 18:50:16.000000000 -0400
-+++ mysql-connector-odbc-5.3.4-src/cmake/FindMySQL.cmake 2014-08-20 10:05:00.191485304 -0400
-@@ -105,16 +105,16 @@
- # Finally remove the dot
- STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
-
-- IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+ IF(MYSQL_CXX_LINKAGE)
- EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
- OUTPUT_VARIABLE _mysql_config_output
- )
- SET(MYSQL_CXX_LINKAGE 1)
-- ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+ ELSE (MYSQL_CXX_LINKAGE)
- EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
- OUTPUT_VARIABLE _mysql_config_output
- )
-- ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
-+ ENDIF(MYSQL_CXX_LINKAGE)
-
- # Remove the stl4port dependency
- STRING(REGEX REPLACE "-library=stlport4" "" _mysql_config_output "${_mysql_config_output}")
diff --git a/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch b/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch
deleted file mode 100644
index a79ddc4fa201..000000000000
--- a/dev-db/myodbc/files/myodbc-5.1.6-qt4-includedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar mysql-connector-odbc-5.1.6.orig/qt.m4 mysql-connector-odbc-5.1.6/qt.m4
---- mysql-connector-odbc-5.1.6.orig/qt.m4 2009-11-05 13:34:53.000000000 -0800
-+++ mysql-connector-odbc-5.1.6/qt.m4 2010-01-30 22:12:02.105400463 -0800
-@@ -91,6 +91,10 @@
- AC_SUBST(QTVERSION)
- AC_SUBST(MOC)
- AC_SUBST(UIC)
-+ if expr "$QTVERSION" '>=' "040000" > /dev/null ; then
-+ QT_CXXFLAGS="-I$qt_includes -I$qt_includes/QtCore -I$qt_includes/QtGui"
-+ else
-+ QT_CXXFLAGS="-I$qt_includes"
-+ fi
-- QT_CXXFLAGS="-I$qt_includes"
- AC_SUBST(QT_CXXFLAGS)
- QT_LDFLAGS="-L$qt_libraries"
diff --git a/dev-db/myodbc/myodbc-5.1.6.ebuild b/dev-db/myodbc/myodbc-5.1.6.ebuild
deleted file mode 100644
index 694368427343..000000000000
--- a/dev-db/myodbc/myodbc-5.1.6.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.1.6.ebuild,v 1.8 2013/05/10 08:17:39 patrick Exp $
-
-EAPI=2
-inherit eutils versionator autotools
-
-MAJOR="$(get_version_component_range 1-2 $PV)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}"
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ppc x86"
-IUSE="debug doc static qt4"
-RDEPEND=">=virtual/mysql-4.0
- dev-db/unixODBC
- qt4? ( >=dev-qt/qtgui-4:4 )"
-# perl is required for building docs
-DEPEND="${RDEPEND}
- doc? ( dev-lang/perl )"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_prepare() {
- epatch "${FILESDIR}"/myodbc-5.1.6-qt4-includedir.patch
- eautoreconf
-}
-
-src_configure() {
- local myconf="--enable-static"
- use static \
- && myconf="${myconf} --disable-shared" \
- || myconf="${myconf} --enable-shared"
-
- myconf="${myconf} $(use_with doc docs) $(use_with debug)"
- #myconf="${myconf} --disable-gui"
- #TODO: the configure test against qt 4 enter in an endless loop
- myconf="${myconf}
- $(use_enable qt4 gui)
- $(use_with qt4 qt-libraries /usr/$(get_libdir)/qt4/)"
-
- econf \
- --libexecdir=/usr/sbin \
- --sysconfdir=/etc/myodbc \
- --localstatedir=/var/lib/myodbc \
- --with-mysql-libs=/usr/lib/mysql \
- --with-mysql-includes=/usr/include/mysql \
- --with-odbc-ini=/etc/unixODBC/odbc.ini \
- --with-unixODBC=/usr \
- --enable-myodbc3i \
- --enable-myodbc3m \
- --disable-test \
- --without-samples \
- ${myconf} \
- || die "econf failed"
-}
-
-src_compile() {
- emake \
- || die "emake failed"
-}
-
-src_install() {
- into /usr
- einstall \
- libexecdir="${D}"/usr/sbin \
- sysconfdir="${D}"/etc/myodbc \
- localstatedir="${D}"/var/lib/myodbc \
- pkgdatadir="${D}"/usr/share/doc/${PF}
- dodoc INSTALL README
- prepalldocs
- dodir /usr/share/${PN}-${SLOT}
- for i in odbc.ini odbcinst.ini; do
- einfo "Building $i"
- sed \
- -e "s,__PN__,${DRIVER_NAME},g" \
- -e "s,__PF__,${PF},g" \
- -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}.so,g" \
- >"${D}"/usr/share/${PN}-${SLOT}/${i} \
- <"${FILESDIR}"/${i}.m4 \
- || die "Failed to build $i"
- done;
-}
-
-pkg_config() {
- [ "${ROOT}" != "/" ] && \
- die 'Sorry, non-standard ROOT setting is not supported :-('
-
- local msg='MySQL ODBC driver'
- local drivers=$(/usr/bin/odbcinst -q -d)
- if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
- ebegin "Installing ${msg}"
- /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
- rc=$?
- eend $rc
- [ $rc -ne 0 ] && die
- else
- einfo "Skipping already installed ${msg}"
- fi
-
- local sources=$(/usr/bin/odbcinst -q -s)
- msg='sample MySQL ODBC DSN'
- if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
- ebegin "Installing ${msg}"
- /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
- rc=$?
- eend $rc
- [ $rc -ne 0 ] && die
- else
- einfo "Skipping already installed ${msg}"
- fi
-}
-
-pkg_postinst() {
- elog "If this is a new install, please run the following command"
- elog "to configure the MySQL ODBC drivers and sources:"
- elog "emerge --config =${CATEGORY}/${PF}"
- elog "Please note that the driver name used to form the DSN now includes the SLOT."
-}
diff --git a/dev-db/myodbc/myodbc-5.2.7.ebuild b/dev-db/myodbc/myodbc-5.2.7.ebuild
deleted file mode 100644
index 5d51d902d051..000000000000
--- a/dev-db/myodbc/myodbc-5.2.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-5.2.7.ebuild,v 1.3 2014/11/15 16:23:59 nimiux Exp $
-
-EAPI=5
-inherit cmake-utils eutils flag-o-matic versionator
-
-MAJOR="$(get_version_component_range 1-2 $PV)"
-MY_PN="mysql-connector-odbc"
-MY_P="${MY_PN}-${PV/_p/r}-src"
-
-DESCRIPTION="ODBC driver for MySQL"
-HOMEPAGE="http://www.mysql.com/products/myodbc/"
-SRC_URI="mirror://mysql/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
-RESTRICT="primaryuri"
-
-LICENSE="GPL-2"
-SLOT="${MAJOR}"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
- dev-db/unixODBC
- >=virtual/mysql-5.5
-"
-DEPEND="${DEPEND} ${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
-# Careful!
-DRIVER_NAME="${PN}-${SLOT}"
-
-src_prepare() {
- # Remove Tests
- sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
- "${S}/CMakeLists.txt"
-
- # Fix as-needed on the installer binary
- echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
-
- # Patch document path so it doesn't install files to /usr
- epatch "${FILESDIR}/cmake-doc-path.patch" \
- "${FILESDIR}/${PV}-cxxlinkage.patch" \
- "${FILESDIR}/${PV}-mariadb-dynamic-array.patch"
-}
-
-src_configure() {
- # The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
- # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
- mycmakeargs+=(
- -DMYSQL_CXX_LINKAGE=0
- -DWITH_UNIXODBC=1
- -DRPM_BUILD=1
- -DMYSQLCLIENT_LIB_NAME="libmysqlclient_r.so"
- -DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${P}
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- dodir /usr/share/${PN}-${SLOT}
- for i in odbc.ini odbcinst.ini; do
- einfo "Building $i"
- sed \
- -e "s,__PN__,${DRIVER_NAME},g" \
- -e "s,__PF__,${MAJOR},g" \
- -e "s,libmyodbc3.so,libmyodbc${SLOT:0:1}a.so,g" \
- >"${D}"/usr/share/${PN}-${SLOT}/${i} \
- <"${FILESDIR}"/${i}.m4 \
- || die "Failed to build $i"
- done;
- mv "${D}/usr/bin/myodbc-installer" \
- "${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
-}
-
-pkg_config() {
-
- [ "${ROOT}" != "/" ] && \
- die 'Sorry, non-standard ROOT setting is not supported :-('
-
- local msg='MySQL ODBC driver'
- local drivers=$(/usr/bin/odbcinst -q -d)
-
- if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
- ebegin "Installing ${msg}"
- /usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
- rc=$?
- eend $rc
- [ $rc -ne 0 ] && die
- else
- einfo "Skipping already installed ${msg}"
- fi
-
- local sources=$(/usr/bin/odbcinst -q -s)
- msg='sample MySQL ODBC DSN'
- if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
- ebegin "Installing ${msg}"
- /usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
- rc=$?
- eend $rc
- [ $rc -ne 0 ] && die
- else
- einfo "Skipping already installed ${msg}"
- fi
-}
-
-pkg_postinst() {
-
- elog "If this is a new install, please run the following command"
- elog "to configure the MySQL ODBC drivers and sources:"
- elog "emerge --config =${CATEGORY}/${PF}"
- elog "Please note that the driver name used to form the DSN now includes the SLOT."
- elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
-}
diff --git a/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild b/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild
index 966c6d01f587..040833a6f3a6 100644
--- a/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild,v 1.6 2015/03/02 09:32:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.3.2-r1.ebuild,v 1.7 2015/05/17 20:11:05 pacho Exp $
EAPI=5
inherit libtool autotools-multilib eutils
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+minimal odbcmanual static-libs unicode"
RDEPEND="|| (
diff --git a/dev-embedded/ftdi_eeprom/Manifest b/dev-embedded/ftdi_eeprom/Manifest
index f593f6c2926f..b890cbac0420 100644
--- a/dev-embedded/ftdi_eeprom/Manifest
+++ b/dev-embedded/ftdi_eeprom/Manifest
@@ -1,2 +1 @@
-DIST ftdi_eeprom-0.2.tar.gz 571464 SHA256 b3e0409d69783ecfa90c893c817bb584296b4c45d9f17b0f2fdd7c07ef411a3f SHA512 108e84cca16a24b0d66578b65d0450cea02faca3f1fec4938563ca99aa92b58e2b6c39fde92d3b729970b7a89b8ea505b27888287785ecc425ef521a779a1867 WHIRLPOOL a8ee4ad513bfacb6baf82aed0f42ff84990e49bd9d518f62334c6f03acffe458e8b133ed5933a002a870f099320a14c5c0d4f7435209c5db268e24b6d07e74e0
DIST ftdi_eeprom-0.3.tar.gz 103723 SHA256 7b40ec5abb2c93362b9636974e4e4715cb588121c1e1da09d7f499ac7f12d056 SHA512 292617434d618c1f47fd94922cff1c32da271a9262b70ee56a8931b7a07ec1ae2cfe92a0ddfe14d9516d295188dc0a750c0cf7f5a26bb4c3fd384f252aeda18d WHIRLPOOL ccc68295e4d1af063623f359f07918ff2bb916932b02333509ff9f5ea5d66ac4f435026ca9a1ed8942520dbd8956bac9adbc5163967429e96ccc14041c5a3c4a
diff --git a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild b/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild
deleted file mode 100644
index 218210cbe9cb..000000000000
--- a/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/ftdi_eeprom/ftdi_eeprom-0.2.ebuild,v 1.5 2012/06/17 23:46:33 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Utility to program external EEPROM for FTDI USB chips"
-HOMEPAGE="http://www.intra2net.com/opensource/ftdi/"
-SRC_URI="http://www.intra2net.com/opensource/ftdi/TGZ/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND="dev-embedded/libftdi
- dev-libs/confuse"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.2-chip-type.patch #390805
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ftdi_eeprom/example.conf
-}
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 677ef9a64555..78b421c5d7a4 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1,4 +1,3 @@
-DIST gputils-0.13.3.tar.gz 1604376 SHA256 e633a6db182f7deb8b4f218efc234b13a27230c1141f73af54416033f1930db4 SHA512 e73f3df3fe6fc6bc860d92208a903de11e43602d98c1728b95ae47b055f0710a38ba420c719915c0547c92eb248a83cb6f6fb63a20e29b17353a1e71767843ea WHIRLPOOL 0a0d3a0a0109c9e5abb0bc955fdf2a26a4c8da4ad7930c9b2be89a7008ae7326ec75408783c8e4a75e79b6550885ba9c3b0af445cbec4f94ac7e2214dbf1c184
DIST gputils-0.13.6.tar.gz 2042890 SHA256 e7bc35dcaddfefbc9bed0d4e4c09c6bcff1e3eab2c3d5dc555e08755ae877156 SHA512 e5227863c2f103db133102d526fd60d08f306f0ca8cf4b1f951616e8cf72264912394fa51375734c006d48bbe1adf8038347c35d8401f15ec5cfe906008f212d WHIRLPOOL 7bb3ac2425e406fe2e0af30c9134504eec29b29638c19713176a10f3abe0c179238364e14bd7b2a7b8daa9e7902b2477b96124f48df04ad052efe2b66c09fb8c
DIST gputils-0.13.7.tar.gz 2670129 SHA256 94dd5754393cc6391d609655a59200fa47e0c9435088990be0ed3116b5325c0f SHA512 4133a0281c125abb964d2451bfff422444f9816ebb4c17dcc8faa88829e7a84d6cb542cfb9acda397ef9f14a1979644fbcf29aa489cdf94fb6e26c99b2ee901b WHIRLPOOL 324d859335bc5653bea6db229d052f2ca10ea07f00bf7b6e42282ac810a1b450479e0a0c9c405d68dfc38b546627ccc81c323df946e8bfd8c94c023b8e1e1664
DIST gputils-0.14.0.tar.gz 2802791 SHA256 39de621e739c45775fb7f72282c1355208039600eadcd88875bfdfac9f0d75ad SHA512 ca50c95fc81043f8672db0d5101831de65a536ce8e5061aabedfa340f821bc7eb6db7bea6f8923b239167ed65a17b1fe7d32d40e10e69b92d351ba408535f1d4 WHIRLPOOL ce67a84a4e0bfcbbaf384130fbca53ce09e63d357314b1fb74972a1b2fe56fa33c576c1720a5aed3ff3362d1ddae57d7ad7350e937b6e08774f1ad1bd6f77825
diff --git a/dev-embedded/gputils/gputils-0.13.3-r1.ebuild b/dev-embedded/gputils/gputils-0.13.3-r1.ebuild
deleted file mode 100644
index b793ed77e823..000000000000
--- a/dev-embedded/gputils/gputils-0.13.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gputils/gputils-0.13.3-r1.ebuild,v 1.10 2014/08/10 20:03:32 slyfox Exp $
-
-DESCRIPTION="Collection of tools including assembler, linker and librarian for PIC microcontrollers"
-HOMEPAGE="http://gputils.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gputils/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
- emake DESTDIR=${D} install || die
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO doc/gputils.ps
- insinto /usr/share/doc/${PF}/
- doins doc/gputils.pdf
-}
diff --git a/dev-embedded/pista/Manifest b/dev-embedded/pista/Manifest
index 6ed5e2363da8..27c9fc4cc479 100644
--- a/dev-embedded/pista/Manifest
+++ b/dev-embedded/pista/Manifest
@@ -1,2 +1 @@
-DIST pista-0.62b.tar.gz 48503 SHA256 b1d62bd3dc1018d310b05d5eceaf4c94e388a717cdb4e83bbc870df55d843033 SHA512 f344e3ec90ff227d313c90fac1448cf5b0f0c6bbc005d51b9dc4cf2a4ca17c920692e05b2851e2867afa81deb8b6bb907d0ca6815ebbe5d60d2aa90f689ac70d WHIRLPOOL 20738206813f772306bda5c2f86553d16c460ea4728d7efbf5ef19c41603dcde49dc20c813ef430dae594f51a1de4fcfa380b3b250f5546d096a8e76f7d61a1a
DIST pista-0.70.tar.gz 50454 SHA256 18c880b67637fdfcc76eb9a7ac8547c9b30515c1cf1ae165b2c13cc4577efb33 SHA512 23125ffff317d7c0de16de76cc572bb4a0aba125dd3b9cd7adb5adb7efe09f7c694c81046fd9ced77e595e25d417044ab3b8a7371a28f7d04c9be794d0436a7c WHIRLPOOL 2a223c2464aa0e751402950a77b1e63c1480072eaf5bc00615c30c799e72c1ed2a7bdf6ec2f6d841857443a3339cce839e823b1883732b9a5c0a7329eb15db39
diff --git a/dev-embedded/pista/pista-0.62b.ebuild b/dev-embedded/pista/pista-0.62b.ebuild
deleted file mode 100644
index eea1bbbda9d2..000000000000
--- a/dev-embedded/pista/pista-0.62b.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/pista/pista-0.62b.ebuild,v 1.4 2007/07/15 03:57:21 mr_bones_ Exp $
-
-DESCRIPTION="Commandline-driven interface to PICSTART+ PIC programmer"
-HOMEPAGE="http://gatling.ikk.sztaki.hu/~kissg/pd/pista/pista.html"
-SRC_URI="ftp://gatling.ikk.sztaki.hu/pub/pic/pista/${P}.tar.gz
- http://pista.choup.net/pub/pic/pista/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-RDEPEND="dev-lang/perl
- dev-perl/TermReadKey"
-
-src_compile() {
- perl Makefile.PL PREFIX=/usr || die "Running Makefile.PL failed"
- emake || die "make failed"
-}
-
-src_install() {
- emake install DESTDIR=${D} || die
- dodoc Changes Copyright pista.html
-}
diff --git a/dev-embedded/urjtag/Manifest b/dev-embedded/urjtag/Manifest
index da36885238be..44d8a84cc6f6 100644
--- a/dev-embedded/urjtag/Manifest
+++ b/dev-embedded/urjtag/Manifest
@@ -1,2 +1 @@
DIST urjtag-0.10.tar.bz2 959834 SHA256 7b740416240923ce3610c5253112ee4eac890461b7af982859ff24d41c5778b7 SHA512 245fc276793dbc7791be0989b75beba7f16e8543f35403d645aadcee8d8d613261509392da7e5dd97e5a2de6e87b18276c394cc6353f01e5d1d4907ffb5811ff WHIRLPOOL 2bcda2ab3653ce507b352350007c9a0e774f77ca2ef3db98aeeff4a8f92a68c0c2376c5b5a2e1c3b85d8b366d0f72c5db1d7e8ca8372a083f5e763f38f0670e0
-DIST urjtag-0.9.tar.bz2 913406 SHA256 f72e9dc40575a33230b5215d093cd2510a66bdb7980231bd4e4bf3fb78d68690 SHA512 e2136a1257c02dbe03e285eef7d5d8e4cfa94a06fdf332f07620d906cc856d8fed2644147ab6f778ed7b7f40be703e2de321346f7433922f548e0de8c0e65772 WHIRLPOOL 146f149ba67deff975eadc8211f6ad936bd64cafae17e14122394672de1dbe0b3eed03a1e69cab1e98467dce4d1ee4cf11154c3d880ae12b1d8e21803db9e405
diff --git a/dev-embedded/urjtag/urjtag-0.9.ebuild b/dev-embedded/urjtag/urjtag-0.9.ebuild
deleted file mode 100644
index 5bff574da884..000000000000
--- a/dev-embedded/urjtag/urjtag-0.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/urjtag/urjtag-0.9.ebuild,v 1.4 2008/10/16 08:57:31 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="tool for communicating over JTAG with flash chips, CPUs, and many more (fork of openwince jtag)"
-HOMEPAGE="http://urjtag.sourceforge.net/"
-SRC_URI="mirror://sourceforge/urjtag/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="ftdi readline"
-
-DEPEND="!dev-embedded/jtag
- ftdi? ( dev-embedded/libftdi )
- readline? ( sys-libs/readline )"
-
-src_compile() {
- use readline || export vl_cv_lib_readline=no
- econf $(use_enable ftdi libftdi) || die
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "failed to install"
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
diff --git a/dev-go/go-net/Manifest b/dev-go/go-net/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dev-go/go-net/go-net-9999.ebuild b/dev-go/go-net/go-net-9999.ebuild
new file mode 100644
index 000000000000..dc2c167e58a9
--- /dev/null
+++ b/dev-go/go-net/go-net-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-net/go-net-9999.ebuild,v 1.1 2015/05/18 07:53:59 zmedico Exp $
+
+EAPI=5
+inherit git-r3
+
+KEYWORDS=""
+DESCRIPTION="Go supplementary network libraries"
+GO_PN=golang.org/x/${PN##*-}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_REPO_URI="https://go.googlesource.com/${PN##*-}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4
+ dev-go/go-text"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_compile() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}/src/${GO_PN}" \
+ "${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
+}
+
+src_install() {
+ insinto /usr/lib/go
+ find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-net/metadata.xml b/dev-go/go-net/metadata.xml
new file mode 100644
index 000000000000..059d713e41ed
--- /dev/null
+++ b/dev-go/go-net/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ zmedico@gentoo.org
+
+
diff --git a/dev-go/go-text/Manifest b/dev-go/go-text/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild
new file mode 100644
index 000000000000..3674dba9699f
--- /dev/null
+++ b/dev-go/go-text/go-text-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-9999.ebuild,v 1.1 2015/05/18 07:48:30 zmedico Exp $
+
+EAPI=5
+inherit git-r3
+
+KEYWORDS=""
+DESCRIPTION="Go text processing support"
+GO_PN=golang.org/x/${PN##*-}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_REPO_URI="https://go.googlesource.com/${PN##*-}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_compile() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}/src/${GO_PN}" \
+ "${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
+}
+
+src_install() {
+ exeinto /usr/lib/go/bin
+ doexe "${WORKDIR}"/bin/*
+ insinto /usr/lib/go
+ find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ doins -r "${WORKDIR}"/{pkg,src}
+}
diff --git a/dev-go/go-text/metadata.xml b/dev-go/go-text/metadata.xml
new file mode 100644
index 000000000000..059d713e41ed
--- /dev/null
+++ b/dev-go/go-text/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ zmedico@gentoo.org
+
+
diff --git a/dev-go/go-tools/Manifest b/dev-go/go-tools/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
new file mode 100644
index 000000000000..dbe88df47dde
--- /dev/null
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.1 2015/05/18 07:58:45 zmedico Exp $
+
+EAPI=5
+inherit git-r3
+
+KEYWORDS=""
+DESCRIPTION="Go Tools"
+GO_PN=golang.org/x/${PN##*-}
+HOMEPAGE="https://godoc.org/${GO_PN}"
+EGIT_REPO_URI="https://go.googlesource.com/${PN##*-}"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+DEPEND=">=dev-lang/go-1.4
+ dev-go/go-net"
+RDEPEND=""
+S="${WORKDIR}/src/${GO_PN}"
+EGIT_CHECKOUT_DIR="${S}"
+STRIP_MASK="*.a"
+
+src_compile() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}/src/${GO_PN}" \
+ "${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
+ GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
+}
+
+src_install() {
+ exeinto /usr/lib/go/bin
+ doexe "${WORKDIR}"/bin/*
+ insinto /usr/lib/go
+ find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
+ doins -r "${WORKDIR}"/{pkg,src}
+ exeinto /usr/lib/go/pkg/tool/linux_amd64
+ find "${GOROOT}/pkg/tool/linux_amd64" -type f -exec doexe {} \;
+}
diff --git a/dev-go/go-tools/metadata.xml b/dev-go/go-tools/metadata.xml
new file mode 100644
index 000000000000..059d713e41ed
--- /dev/null
+++ b/dev-go/go-tools/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ zmedico@gentoo.org
+
+
diff --git a/dev-go/metadata.xml b/dev-go/metadata.xml
new file mode 100644
index 000000000000..a764ff2b6271
--- /dev/null
+++ b/dev-go/metadata.xml
@@ -0,0 +1,39 @@
+
+
+
+
+ The dev-go category contains libraries and utilities relevant to the
+ Go programming language.
+
+
+ Die Kategorie dev-go enthält Bibliotheken und Werkzeuge für die
+ Programmiersprache Go.
+
+
+ La categoría dev-go contiene librerias y utilidades referentes al
+ lenguaje de programación Go.
+
+
+ dev-go カテゴリーにはGoプログラミング言語に関連したライブラリーと
+ ユーティリティが含まれます。
+
+
+ De dev-go categorie bevat bibliotheken en hulpmiddelen voor het gebruik van
+ de Go programmeertaal.
+
+
+ Nhóm dev-go chứa các thư viện và tiện ích liên quan
+ đến ngôn ngữ lập trình Go.
+
+
+ La categoria dev-go contiene librerie ed utilità per il linguaggio Go.
+
+
+ A categoria dev-go contém bibliotecas e utilitários relevantes
+ para a linguagem de programação Go.
+
+
+ Kategoria dev-go zawiera biblioteki i narzędzia związane z językiem
+ programowania Go.
+
+
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
index 8951ff1d2913..ab5e1faf0255 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild,v 1.5 2015/04/21 18:50:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild,v 1.6 2015/05/17 20:10:25 pacho Exp $
EAPI=4
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/"
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF/.0}/ecjsrc-${PV}.jar"
LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="3.7"
IUSE=""
diff --git a/dev-java/antlr/antlr-2.7.7-r5.ebuild b/dev-java/antlr/antlr-2.7.7-r5.ebuild
index 9ef67c1453d7..fe23a9c84a80 100644
--- a/dev-java/antlr/antlr-2.7.7-r5.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.12 2015/05/15 10:53:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r5.ebuild,v 1.13 2015/05/17 20:02:19 pacho Exp $
EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="http://www.antlr2.org/download/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc debug examples mono +cxx +java python script source static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-java/antlr/antlr-4.4.ebuild b/dev-java/antlr/antlr-4.4.ebuild
index 9d5d9122517c..5b3305c84e9c 100644
--- a/dev-java/antlr/antlr-4.4.ebuild
+++ b/dev-java/antlr/antlr-4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild,v 1.3 2015/04/09 17:18:48 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-4.4.ebuild,v 1.4 2015/05/17 20:08:28 pacho Exp $
EAPI="5"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.antlr.org/"
SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.zip"
LICENSE="BSD"
SLOT="4"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ppc64 ~x86 ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gunit"
CDEPEND="
diff --git a/dev-java/aopalliance/aopalliance-1.0-r1.ebuild b/dev-java/aopalliance/aopalliance-1.0-r1.ebuild
deleted file mode 100644
index 654f1a7515a8..000000000000
--- a/dev-java/aopalliance/aopalliance-1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/aopalliance-1.0-r1.ebuild,v 1.10 2007/11/10 19:00:40 nelchael Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Aspect-Oriented Programming (AOP) Alliance classes"
-SRC_URI="mirror://gentoo/${P}-gentoo.tar.bz2"
-#SRC_URI="mirror://gentoo/${P}.tar.bz2"
-# Tarball creation:
-# cvs -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance login
-# cvs -z3 -d:pserver:anonymous@aopalliance.cvs.sourceforge.net:/cvsroot/aopalliance export -r interception_1_0 aopalliance
-# tar cjvf aopalliance-1.0-gentoo.tar.bz2 aopalliance
-HOMEPAGE="http://aopalliance.sourceforge.net/"
-LICENSE="public-domain"
-SLOT="1"
-
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="doc source"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-src_install() {
-
- java-pkg_dojar build/${PN}.jar
- use doc && java-pkg_dojavadoc build/api
- use source && java-pkg_dosrc src/main
-
-}
diff --git a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
index efa9b04f462a..4a06c82e77a4 100644
--- a/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
+++ b/dev-java/aopalliance/aopalliance-1.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/aopalliance-1.0-r2.ebuild,v 1.5 2015/04/21 19:23:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/aopalliance/aopalliance-1.0-r2.ebuild,v 1.6 2015/05/17 20:19:15 pacho Exp $
EAPI=5
@@ -19,7 +19,7 @@ HOMEPAGE="http://aopalliance.sourceforge.net/"
LICENSE="public-domain"
SLOT="1"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
diff --git a/dev-java/bcmail/bcmail-1.50.ebuild b/dev-java/bcmail/bcmail-1.50.ebuild
index 31aadbf5dcb6..7afcf989c0c1 100644
--- a/dev-java/bcmail/bcmail-1.50.ebuild
+++ b/dev-java/bcmail/bcmail-1.50.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.50.ebuild,v 1.2 2015/05/16 11:18:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.50.ebuild,v 1.3 2015/05/17 20:18:38 pacho Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
COMMON_DEPEND=">=dev-java/bcprov-${PV}:0[test?]
~dev-java/bcpkix-${PV}:0[test?]
diff --git a/dev-java/bcpkix/bcpkix-1.50.ebuild b/dev-java/bcpkix/bcpkix-1.50.ebuild
index d88a22e51c78..911a380464e7 100644
--- a/dev-java/bcpkix/bcpkix-1.50.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.50.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.50.ebuild,v 1.2 2015/05/15 11:21:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcpkix/bcpkix-1.50.ebuild,v 1.3 2015/05/17 20:09:15 pacho Exp $
EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
# Tests are currently broken. Needs further investigation.
#
diff --git a/dev-java/bcprov/bcprov-1.50.ebuild b/dev-java/bcprov/bcprov-1.50.ebuild
index e00b89443fdb..cdb345fa95e4 100644
--- a/dev-java/bcprov/bcprov-1.50.ebuild
+++ b/dev-java/bcprov/bcprov-1.50.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.50.ebuild,v 1.2 2015/05/15 11:21:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcprov/bcprov-1.50.ebuild,v 1.3 2015/05/17 20:08:46 pacho Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos"
# Tests are currently broken. Needs further investigation.
# java.security.NoSuchAlgorithmException: Cannot find any provider supporting McElieceFujisakiWithSHA256
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
index f305408e1a9d..317217066014 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild,v 1.4 2015/04/21 19:23:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild,v 1.5 2015/05/17 20:19:49 pacho Exp $
EAPI=5
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/browserlaunch2/${MY_PN}-all-${MY_PV}.jar"
LICENSE="LGPL-2.1"
SLOT="1.0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
RDEPEND=">=virtual/jre-1.4"
diff --git a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
index a05e9919ba7f..da8dddff8357 100644
--- a/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
+++ b/dev-java/cldc-api/cldc-api-1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/cldc-api/cldc-api-1.1-r1.ebuild,v 1.4 2015/04/21 19:19:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cldc-api/cldc-api-1.1-r1.ebuild,v 1.5 2015/05/17 20:20:06 pacho Exp $
EAPI=5
@@ -21,7 +21,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
# move tarball to distdir, scp to d.g.o...
LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
SLOT="1.1"
IUSE=""
diff --git a/dev-java/colt/colt-1.2.0-r2.ebuild b/dev-java/colt/colt-1.2.0-r2.ebuild
index 184d18339cb1..88cb4bcc94d3 100644
--- a/dev-java/colt/colt-1.2.0-r2.ebuild
+++ b/dev-java/colt/colt-1.2.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/colt-1.2.0-r2.ebuild,v 1.2 2015/05/15 10:42:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/colt/colt-1.2.0-r2.ebuild,v 1.3 2015/05/17 20:01:57 pacho Exp $
EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www-itg.lbl.gov/~hoschek/colt/"
LICENSE="colt"
IUSE=""
SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~x86"
DEPEND=">=virtual/jdk-1.4
>=dev-java/concurrent-util-1.3.4:0"
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
index d11029923e46..da24d0842c72 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild,v 1.6 2015/04/21 18:47:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.7.2-r1.ebuild,v 1.7 2015/05/17 20:10:13 pacho Exp $
EAPI="4"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.eclipse.org/"
SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.jar"
LICENSE="EPL-1.0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
SLOT="3.7"
IUSE="+ant userland_GNU"
diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
index 64a578fad82a..407a142afd81 100644
--- a/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
+++ b/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild,v 1.4 2015/04/21 18:37:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.5.ebuild,v 1.5 2015/05/17 20:07:06 pacho Exp $
EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://jakarta.apache.org/"
SLOT="${PV}"
IUSE=""
LICENSE="Apache-1.1"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.5"
RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index 5856566cd8d0..767d68eac799 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-getopt/java-getopt-1.0.14.ebuild,v 1.4 2015/04/21 18:38:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-getopt/java-getopt-1.0.14.ebuild,v 1.5 2015/05/17 20:09:30 pacho Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://www.urbanophile.com/arenn/hacking/getopt/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.4"
diff --git a/dev-java/javacc/javacc-5.0-r1.ebuild b/dev-java/javacc/javacc-5.0-r1.ebuild
index 9cd9e20f2ff2..3c3e467873db 100644
--- a/dev-java/javacc/javacc-5.0-r1.ebuild
+++ b/dev-java/javacc/javacc-5.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0-r1.ebuild,v 1.4 2015/04/26 17:00:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javacc/javacc-5.0-r1.ebuild,v 1.5 2015/05/17 20:05:58 pacho Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="http://java.net/projects/${PN}/downloads/download/${P}src.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
COMMON_DEP="
dev-java/junit:0"
diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
index 57bb31c072f9..0209eae23e6c 100644
--- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.5 2015/05/15 12:46:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild,v 1.6 2015/05/17 20:03:57 pacho Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
python_prepare_all() {
diff --git a/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
new file mode 100644
index 000000000000..e8a3a50a41fd
--- /dev/null
+++ b/dev-java/jboss-logging/files/jboss-logging-3.1.4-MDC.patch
@@ -0,0 +1,152 @@
+--- jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java.orig 2015-05-17 20:55:35.000000000 +0000
++++ jboss-logging-3.1.4.GA/src/main/java/org/jboss/logging/AbstractMdcLoggerProvider.java 2015-05-17 20:58:00.000000000 +0000
+@@ -23,27 +23,27 @@
+
+ abstract class AbstractMdcLoggerProvider extends AbstractLoggerProvider {
+
+- private final ThreadLocal