diff --git a/app-admin/eselect/eselect-1.4.5.ebuild b/app-admin/eselect/eselect-1.4.5.ebuild
index 767e2861ecd0..a3f3ad10c8a0 100644
--- a/app-admin/eselect/eselect-1.4.5.ebuild
+++ b/app-admin/eselect/eselect-1.4.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/logrotate/logrotate-3.9.2.ebuild b/app-admin/logrotate/logrotate-3.9.2.ebuild
index 962e6932b64d..b97c5a3b7c91 100644
--- a/app-admin/logrotate/logrotate-3.9.2.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/logrotate/logrotate/archive/${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acl +cron selinux"
CDEPEND="
diff --git a/app-admin/mcollective/mcollective-2.8.0.ebuild b/app-admin/mcollective/mcollective-2.8.0.ebuild
index 9c400cd87f20..3a4a9bc976d2 100644
--- a/app-admin/mcollective/mcollective-2.8.0.ebuild
+++ b/app-admin/mcollective/mcollective-2.8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
inherit ruby-ng
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index e5ae1da3bfd5..88cfda8e437c 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,4 +1,2 @@
-DIST webmin-1.770-minimal.tar.gz 2612198 SHA256 e976091dcf0a68dfb02d5633d09da2ce9dc69d8ea2bde95c3cc57a0a25384488 SHA512 3661e37bbeb9f814862ff208d32ec4bfa15e8e826c15833e47c3a39cb0bb47d1f227c0c942f72aed4f3e9344556cc0ef8de42a5961c6795ef01986abafe9949b WHIRLPOOL 92a89623da8ba09d921ffec38c45c2c4bf04c8249178d9d13d34339ecc902d8d7184396ce29c04bfb6e9eba463c2942dc5d9d10d05af463b4dbf9337891bcc02
-DIST webmin-1.770.tar.gz 28441983 SHA256 eb84f1adbb099d0a2e633fbc4ea4838d1ddbcc84135d6a897803fbd0284719ba SHA512 460d9e06379df8d950874906589938077fd0fc70ed12948a685c1386c9995538d92387e252373398319469406b8ef0daab67dabe8c71b2f1961a5d5cb6848a7f WHIRLPOOL 4556f51001d010b66c6af265904b3f634f7bccf1afeb74be6de0824fefb2a5b2a5508d751bfa4abcfd0cb8b670659474ecf4e564505e446ed36a737e4f100dc0
-DIST webmin-1.780-minimal.tar.gz 2624841 SHA256 d4f51fcc448a881d568a32dce1712f4feb1d15bccb05005117179b8a6488e403 SHA512 a0fc61c202d94419f52572a95df23f4dd54c3b0552ce96df356b13b529988cb4be02e5f1165fbd5fbe30921697baac8b229d8d587860e3adabcbe2a4bfb11806 WHIRLPOOL f8b94e16b041cef115cfa7a49fbb34d432f9f96b28959e3f161df9de5805d4a38d7a019479e96ee886dd6f4c21e5884864a69b923ec3b0ac92422c530a95249c
-DIST webmin-1.780.tar.gz 28578888 SHA256 eb2613a4f4525cbbd04435580a843cb2a454bcf2712301105657cc114beda40e SHA512 1d5552fc09e0a42218881d2d028b8e73deadfca36022a6212e540e8dbbd2ff5fe23883fc4d3b4d63abee0a2aee570ce9710e4e1b75c2cc28f70724502d6680d7 WHIRLPOOL 7ef76b9e3f64d01978aa281d7e57db37078bab4ec101faa115f51ebf43bc0823d8a8bfa925dff5d1a39b0b9aabdada2218d543b14d3961b1346de05c46137d4b
+DIST webmin-1.791-minimal.tar.gz 2635024 SHA256 d269fcccf0034edff44654fb40b83f63e3274f722a8f0d5b14f1fa9f74f49b00 SHA512 e8e7b43865399e918ef017d4d710b21cc7ce2f6566056faa82d756be29f038e07a20055978531f8785639c78339970fbfeabd4a4aa1fa4b331f3a344a78954d2 WHIRLPOOL e8380478edf6b994e03623a9a6b84f736a6c5efd1dbe0aac3905f85457d172a783af0231d4b3606d69c63129c4c4d3d80fa10608dd47374a01f45be7fd53b281
+DIST webmin-1.791.tar.gz 28800013 SHA256 e62148a2263c016a66e7c825c5cb124614268c1da1e0f0bee75cd060c3acfa9c SHA512 4ba19f057ee70bc0a283753a6c190bbae15f0e2af1650ef1656c7b94e07a6750203ef3b7190f7abd544b25988446df6b174bf06191426893bd4224e54451e771 WHIRLPOOL 2d739e1c3ba06b04086b7d20eb646f950aa8776b4fc41bc975cb160733e70a5c7a4de6f331c294bf168e3f8fd5009c72d617eab662078f6d901087b3cfc2db36
diff --git a/app-admin/webmin/files/gentoo-setup b/app-admin/webmin/files/gentoo-setup-1.791
similarity index 97%
rename from app-admin/webmin/files/gentoo-setup
rename to app-admin/webmin/files/gentoo-setup-1.791
index 47d6127a56cf..680dfbb5303b 100644
--- a/app-admin/webmin/files/gentoo-setup
+++ b/app-admin/webmin/files/gentoo-setup-1.791
@@ -94,12 +94,13 @@ if [ "$upgrading" = 1 ]; then
real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
- # Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, no_tls1, no_tls1_1 and keyfile
+ # Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, ssl_honorcipherorder, no_tls1, no_tls1_1 and keyfile
port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
no_ssl2=`grep "^no_ssl2=" $config_dir/miniserv.conf | sed -e 's/no_ssl2=//g'`
no_ssl3=`grep "^no_ssl3=" $config_dir/miniserv.conf | sed -e 's/no_ssl3=//g'`
ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'`
+ ssl_honorcipherorder=`grep "^ssl_honorcipherorder=" $config_dir/miniserv.conf | sed -e 's/ssl_honorcipherorder=//g'`
no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'`
no_tls1=`grep "^no_tls1=" $config_dir/miniserv.conf | sed -e 's/no_tls1=//g'`
no_tls1_1=`grep "^no_tls1_1=" $config_dir/miniserv.conf | sed -e 's/no_tls1_1=//g'`
@@ -146,6 +147,7 @@ else
echo "no_ssl2=$no_ssl2" >> $cfile
echo "no_ssl3=$no_ssl3" >> $cfile
echo "ssl_redirect=$ssl_redirect" >> $cfile
+ echo "ssl_honorcipherorder=$ssl_honorcipherorder" >> $cfile
echo "no_sslcompression=$no_sslcompression" >> $cfile
echo "no_tls1=$no_tls1" >> $cfile
echo "no_tls1_1=$no_tls1_1" >> $cfile
@@ -307,6 +309,11 @@ if [ "$?" != "0" ]; then
echo passwd_mode=0 >> $config_dir/miniserv.conf
fi
+grep ssl_honorcipherorder= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo ssl_honorcipherorder=1 >> $config_dir/miniserv.conf
+fi
+
# Disable SSL compression to defeat BEAST attack
grep no_sslcompression= $config_dir/miniserv.conf >/dev/null
if [ "$?" != "0" ]; then
diff --git a/app-admin/webmin/webmin-1.780.ebuild b/app-admin/webmin/webmin-1.780.ebuild
deleted file mode 100644
index eb7f7a9fb001..000000000000
--- a/app-admin/webmin/webmin-1.780.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils pam ssl-cert systemd
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
- !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-MIME-Base64
- virtual/perl-Socket
- virtual/perl-Sys-Syslog
- virtual/perl-Time-HiRes
- virtual/perl-Time-Local
- dev-perl/Authen-Libwrap
- dev-perl/IO-Tty
- dev-perl/MD5
- dev-perl/Net-SSLeay
- dev-perl/Authen-PAM
- dev-perl/Sys-Hostname-Long
- >=net-dns/dnssec-tools-1.13
- !minimal? (
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- ldap? ( dev-perl/perl-ldap )
- dev-perl/XML-Generator
- dev-perl/XML-Parser
- )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local perl="$( which perl )"
-
- # Remove the unnecessary and incompatible files
- rm -rf acl/Authen-SolarisRBAC-0.1*
- if ! use minimal ; then
- rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
- rm -f mount/{free,net,open}bsd-mounts*
- rm -f mount/macos-mounts*
- fi
-
- # For security reasons remove the SSL certificate that comes with Webmin
- # We will create our own later
- rm -f miniserv.pem
-
- # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
- # We will use our own later
- rm -f setup.{sh,pl}
-
- # Set the installation type/mode to Gentoo
- echo "gentoo" > install-type
-
- # Fix the permissions of the install files
- chmod -R og-w "${S}"
-
- # Since we should not modify any files after install
- # we set the perl path in all cgi and pl files here using Webmin's routines
- # The pl file is Prefix safe and works only on provided input, no other filesystem files
- ebegin "Fixing perl path in source files"
- (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
- eend $?
-}
-
-src_install() {
- # Create config dir and keep
- diropts -m0755
- dodir /etc/webmin
- keepdir /etc/webmin
-
- # Create install dir
- # Third party modules installed through Webmin go here too, so keep
- dodir /usr/libexec/webmin
- keepdir /usr/libexec/webmin
-
- # Copy our own setup script to installation folder
- insinto /usr/libexec/webmin
- newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
- fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
- # This is here if we ever want in future ebuilds to add some specific
- # config values in the /etc/webmin/miniserv.conf
- # The format of this file should be the same as the one of miniserv.conf:
- # var=value
- #
- # Uncomment it if you use such file. Before that check if upstream
- # has this file in root dir too.
- #newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
- # Create the log dir and keep
- diropts -m0700
- dodir /var/log/webmin
- keepdir /var/log/webmin
-
- # Create the init.d file and put the neccessary variables there
- newinitd "${FILESDIR}"/init.d.webmin webmin
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%config%:${EROOT}etc/webmin/config:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}etc/init.d/webmin" \
- || die "Failed to patch the webmin init file"
-
- # Create the systemd service file and put the neccessary variables there
- systemd_newunit "${FILESDIR}"/webmin.service webmin.service
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%config%:${EROOT}etc/webmin/config:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}$(_systemd_get_systemunitdir)/webmin.service" \
- || die "Failed to patch the webmin systemd service file"
-
- # Setup pam
- pamd_mimic system-auth webmin auth account session
-
- # Copy files to installation folder
- ebegin "Copying install files to destination"
- cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
- eend $?
-}
-
-pkg_preinst() {
- # First stop service if running so Webmin to not messup our config
- ebegin "Stopping any running Webmin instance prior merging"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-}
-
-pkg_postinst() {
- # Run pkg_config phase first - non interactively
- export INTERACTIVE="no"
- pkg_config
- # Every next time pkg_config should be interactive
- INTERACTIVE="yes"
-
- ewarn
- ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
- ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
- ewarn "To avoid problems, please before using any module, look at its configuration options first."
- ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
- ewarn
- if systemd_is_booted ; then
- elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
- else
- elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
- fi
- elog "- The default URL to connect to Webmin is: https://localhost:10000"
- elog "- The default user that can login is: root"
- elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
- # First stop service if running - we do not want Webmin to mess up config
- ebegin "Stopping any running Webmin instance prior unmerging"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-}
-
-pkg_postrm() {
- # If removing webmin completely, remind the user for the Webmin's own cron jobs.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- ewarn
- ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
- ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
- ewarn "To fix this just disable them if you intend to use Webmin again,"
- ewarn "OR delete them if not."
- ewarn
- fi
-}
-
-pkg_config(){
- # First stop service if running
- ebegin "Stopping any running Webmin instance"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-
- # Next set the default reset variable to 'none'
- # reset/_reset can be:
- # 'none' - does not reset anything, just upgrades if a conf is present
- # OR installs new conf if a conf is missing
- # 'soft' - deletes only $config_dir/config file and thus resetting most
- # conf values to their defaults. Keeps the specific Webmin cron jobs
- # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
- # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
- local _reset="none"
-
- # If in interactive mode ask user what should we do
- if [[ "${INTERACTIVE}" = "yes" ]]; then
- einfo
- einfo "Please enter the number of the action you would like to perform?"
- einfo
- einfo "1. Update configuration"
- einfo " (keeps old config options and adds the new ones)"
- einfo "2. Soft reset configuration"
- einfo " (keeps some old config options, the other options are set to default)"
- ewarn " All Webmin users will be reset"
- einfo "3. Hard reset configuration"
- einfo " (all options including module options are set to default)"
- ewarn " You will lose all Webmin configuration options you have done till now"
- einfo "4. Exit this configuration utility (default)"
- while [ "$correct" != "true" ] ; do
- read answer
- if [[ "$answer" = "1" ]] ; then
- _reset="none"
- correct="true"
- elif [[ "$answer" = "2" ]] ; then
- _reset="soft"
- correct="true"
- elif [[ "$answer" = "3" ]] ; then
- _reset="hard"
- correct="true"
- elif [ "$answer" = "4" -o "$answer" = "" ] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter a number from 1 to 4"
- fi
- done
-
- if [[ "$_reset" = "hard" ]]; then
- while [ "$sure" != "true" ] ; do
- ewarn "You will lose all Webmin configuration options you have done till now."
- ewarn "Are you sure you want to do this? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- sure="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter 'y' or 'n'"
- fi
- done
- fi
- fi
-
- export reset=$_reset
-
- # Create ssl certificate for Webmin if there is not one in the proper place
- if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
- SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
- install_cert "${EROOT}/etc/ssl/webmin/server"
- fi
-
- # Ensure all paths passed to the setup script use EROOT
- export wadir="${EROOT}usr/libexec/webmin"
- export config_dir="${EROOT}etc/webmin"
- export var_dir="${EROOT}var/log/webmin"
- export tempdir="${T}"
- export pidfile="${EROOT}var/run/webmin.pid"
- export perl="$( which perl )"
- export os_type='gentoo-linux'
- export os_version='*'
- export real_os_type='Gentoo Linux'
- export real_os_version='Any version'
- # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
- # 'no_tls1' and 'no_tls1_1' for tightening security
- export ssl=1
- export no_ssl2=1
- export no_ssl3=1
- export ssl_redirect=1
- export no_sslcompression=1
- export no_tls1=1
- export no_tls1_1=1
- export keyfile="${EROOT}etc/ssl/webmin/server.pem"
- export port=10000
-
- export atboot=0
-
- einfo "Executing Webmin's configure script"
- $wadir/gentoo-setup.sh
-
- einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/webmin/webmin-1.770.ebuild b/app-admin/webmin/webmin-1.791.ebuild
similarity index 97%
rename from app-admin/webmin/webmin-1.770.ebuild
rename to app-admin/webmin/webmin-1.791.ebuild
index eb7f7a9fb001..8e25d1b8e6c7 100644
--- a/app-admin/webmin/webmin-1.770.ebuild
+++ b/app-admin/webmin/webmin-1.791.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,6 +19,7 @@ KEYWORDS="~amd64 ~x86"
# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
# because openssl is forced by dev-perl/Net-SSLeay
IUSE="minimal +ssl mysql postgres ldap"
+REQUIRED_USE="minimal? ( !mysql !postgres !ldap )"
# All the required perl modules can be found easily using (in Webmin's root src dir):
# find . -name cpan_modules.pl -exec grep "::" {} \;
@@ -93,7 +94,7 @@ src_install() {
# Copy our own setup script to installation folder
insinto /usr/libexec/webmin
- newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
+ newins "${FILESDIR}"/gentoo-setup-${PV} gentoo-setup.sh
fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
# This is here if we ever want in future ebuilds to add some specific
@@ -287,11 +288,12 @@ pkg_config(){
export real_os_type='Gentoo Linux'
export real_os_version='Any version'
# Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
- # 'no_tls1' and 'no_tls1_1' for tightening security
+ # 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security
export ssl=1
export no_ssl2=1
export no_ssl3=1
export ssl_redirect=1
+ export ssl_honorcipherorder=1
export no_sslcompression=1
export no_tls1=1
export no_tls1_1=1
diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild
index 68006d2f6c35..bb2c6d8a1917 100644
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
src_prepare() {
diff --git a/app-arch/unrar/unrar-5.3.11.ebuild b/app-arch/unrar/unrar-5.3.11.ebuild
index 421be0dae40f..0165d18a72f3 100644
--- a/app-arch/unrar/unrar-5.3.11.ebuild
+++ b/app-arch/unrar/unrar-5.3.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
LICENSE="unRAR"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
index 0567cbbe4ed3..358098a8e7f5 100644
--- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
S=${WORKDIR}/${MY_P}
EXTRA_DEPEND=
fi
diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest
new file mode 100644
index 000000000000..71527d575171
--- /dev/null
+++ b/app-backup/borgbackup/Manifest
@@ -0,0 +1 @@
+DIST borgbackup-1.0.0.tar.gz 424089 SHA256 500b9e311331aa88ec07df94d9f3280a79ca207bf1a997b92dd1e6a1f1664671 SHA512 5a94f1b0dfe17d383bcc917db69ed272b9b752b96912a21ac62886972cdbd718b58fe3f9529af455ab325ba418cfc05b89985e32a23fed5e946c5f7e53e6e3b1 WHIRLPOOL c0a5c40aff70c9872e62861a0e971f659191f3a99112dfe940db2440666def3a04af284f5f31ccaef410c7028a49377df96fb38fd462917ad11cd095e33b12e9
diff --git a/app-backup/borgbackup/borgbackup-1.0.0.ebuild b/app-backup/borgbackup/borgbackup-1.0.0.ebuild
new file mode 100644
index 000000000000..5267b911de82
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-1.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/borgbackup/borg.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/b/borgbackup/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption."
+HOMEPAGE="https://borgbackup.github.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl +fuse"
+
+RDEPEND="
+ app-arch/lz4
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ fuse? ( dev-python/llfuse[${PYTHON_USEDEP}] )
+"
+
+DEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ ${RDEPEND}
+"
diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild
new file mode 100644
index 000000000000..5267b911de82
--- /dev/null
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_4 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/borgbackup/borg.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/b/borgbackup/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Deduplicating backup program with compression and authenticated encryption."
+HOMEPAGE="https://borgbackup.github.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="libressl +fuse"
+
+RDEPEND="
+ app-arch/lz4
+ dev-python/msgpack[${PYTHON_USEDEP}]
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ fuse? ( dev-python/llfuse[${PYTHON_USEDEP}] )
+"
+
+DEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ ${RDEPEND}
+"
diff --git a/app-backup/borgbackup/metadata.xml b/app-backup/borgbackup/metadata.xml
new file mode 100644
index 000000000000..520d60139017
--- /dev/null
+++ b/app-backup/borgbackup/metadata.xml
@@ -0,0 +1,14 @@
+
+
+
+
+ blueness@gentoo.org
+ Anthony G. Basile
+
+
+
+ borgbackup/borg
+
+
diff --git a/app-backup/dirvish/dirvish-1.2.1.ebuild b/app-backup/dirvish/dirvish-1.2.1.ebuild
index b9b053177ff7..02af1882673d 100644
--- a/app-backup/dirvish/dirvish-1.2.1.ebuild
+++ b/app-backup/dirvish/dirvish-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ IUSE=""
DEPEND="app-arch/tar"
RDEPEND="dev-perl/Time-modules
- dev-perl/Period
+ dev-perl/Time-Period
>=net-misc/rsync-2.5.7"
src_compile() {
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
index bfb5436c157e..c224b6ea9598 100644
--- a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug"
S="${WORKDIR}/${P}.1"
diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.ebuild
deleted file mode 100644
index 66c735bc2f43..000000000000
--- a/app-benchmarks/bonnie++/bonnie++-1.97.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Hard drive bottleneck testing benchmark suite"
-HOMEPAGE="http://www.coker.com.au/bonnie++/"
-SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-DEPEND=""
-RDEPEND=""
-
-# hmm?
-S="${WORKDIR}/${P}.1"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.96-compile-flags.patch"
-}
-
-src_configure() {
- econf \
- $(use_with debug) \
- --disable-stripping \
- || die
-}
-
-src_compile() {
- emake || die "emake failed"
- emake zcav || die "emake zcav failed" # see #9073
-}
-
-src_install() {
- dosbin bonnie++ zcav || die
- dobin bon_csv2html bon_csv2txt || die
- doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
- dohtml readme.html
- dodoc changelog.txt credits.txt
-}
diff --git a/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild b/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild
new file mode 100644
index 000000000000..f3ba307cd34a
--- /dev/null
+++ b/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Filebench - A Model Based File System Workload Generator"
+HOMEPAGE="http://sourceforge.net/projects/filebench/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="auto-completion"
+
+RDEPEND="
+ auto-completion? ( dev-libs/libtecla )
+"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ sys-devel/bison
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-fix-automagic-libtecla-dependency.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with auto-completion libtecla)
+}
diff --git a/app-benchmarks/filebench/filebench-1.4.9.1.ebuild b/app-benchmarks/filebench/filebench-1.4.9.1.ebuild
deleted file mode 100644
index bc981643acde..000000000000
--- a/app-benchmarks/filebench/filebench-1.4.9.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils autotools
-
-DESCRIPTION="Filebench - A Model Based File System Workload Generator"
-HOMEPAGE="http://sourceforge.net/projects/filebench/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio
- sys-devel/flex
- sys-devel/bison"
-RDEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- #epatch "${FILESDIR}/linux-port.patch"
- eautoreconf
-}
-
-src_compile() {
- econf
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Install failed"
-
- dodoc README AUTHORS
-}
diff --git a/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch b/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch
new file mode 100644
index 000000000000..8d24a62a89d6
--- /dev/null
+++ b/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch
@@ -0,0 +1,22 @@
+From: Göktürk Yüksek
+Subject: [PATCH] Fix automagic dependency on libtecla
+
+Replace the unconditional AC_CHECK_LIB logic with AC_ARG_WITH to
+eliminate the automagic dependency on libtecla.
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -164,8 +164,11 @@
+ AC_CHECK_LIB([kstat], [kstat_open])
+ # Use libtecla for autocompletion if it is available. If it
+ # is, then conditionally compile auto_comp.c (see Makefile.am)
+-AC_CHECK_LIB([tecla], [cpl_add_completion])
+-AM_CONDITIONAL(AUTOCOMP_LIBTECLA, test "$ac_cv_lib_tecla_cpl_add_completion" = yes)
++AC_ARG_WITH([libtecla], AS_HELP_STRING([--with-libtecla], [Build with libtecla for autocompletion support (default: test)]))
++AS_IF([test "x$with_libtecla" != "xno"], [
++ AC_CHECK_LIB([tecla], [cpl_add_completion])
++])
++AM_CONDITIONAL([AUTOCOMP_LIBTECLA], [test "x$ac_cv_lib_tecla_cpl_add_completion" = "xyes"])
+ # Check that librt is installed and supports async IO. First line
+ # allows to add librt to the linkers path, second one checks
+ # if aio_wait() is in it, third one checks if aio_waitn() is there (usually
diff --git a/app-benchmarks/filebench/files/linux-port.patch b/app-benchmarks/filebench/files/linux-port.patch
deleted file mode 100644
index c0608128d558..000000000000
--- a/app-benchmarks/filebench/files/linux-port.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-Index: filebench-1.2.4/filebench/flowop_library.c
-===================================================================
---- filebench-1.2.4.orig/filebench/flowop_library.c
-+++ filebench-1.2.4/filebench/flowop_library.c
-@@ -789,6 +789,7 @@ flowoplib_aiowait(threadflow_t *threadfl
- for (ncompleted = 0, inprogress = 0,
- aio = flowop->fo_thread->tf_aiolist;
- ncompleted < todo, aio != NULL; aio = aio->al_next) {
-+ int result;
-
- result = aio_error64(&aio->al_aiocb);
-
-Index: filebench-1.2.4/filebench/fileset.c
-===================================================================
---- filebench-1.2.4.orig/filebench/fileset.c
-+++ filebench-1.2.4/filebench/fileset.c
-@@ -32,8 +32,9 @@
- #include
- #include
- #include
--#include "fileset.h"
-+
- #include "filebench.h"
-+#include "fileset.h"
- #include "gamma_dist.h"
-
- /*
-@@ -631,9 +632,9 @@ fileset_create(fileset_t *fileset)
- /* we are re-using */
- reusing = 1;
- filebench_log(LOG_VERBOSE,
-- "Re-using %s %s on %s file system.",
-+ "Re-using %s %s.",
- fileset_entity_name(fileset),
-- fileset_name, sb.st_fstype);
-+ fileset_name);
- }
- }
- (void) mkdir(path, 0755);
-Index: filebench-1.2.4/filebench/filebench.h
-===================================================================
---- filebench-1.2.4.orig/filebench/filebench.h
-+++ filebench-1.2.4/filebench/filebench.h
-@@ -32,6 +32,15 @@
-
- #include
- #include
-+#include
-+
-+#ifndef HAVE_BOOLEAN_T
-+typedef enum { B_FALSE, B_TRUE } boolean_t;
-+#endif
-+
-+#ifndef HAVE_U_LONGLONG_T
-+typedef unsigned long long u_longlong_t;
-+#endif
-
- #include "vars.h"
- #include "misc.h"
-Index: filebench-1.2.4/filebench/eventgen.c
-===================================================================
---- filebench-1.2.4.orig/filebench/eventgen.c
-+++ filebench-1.2.4/filebench/eventgen.c
-@@ -40,9 +40,10 @@
- */
-
- #include
-+
-+#include "filebench.h"
- #include "vars.h"
- #include "eventgen.h"
--#include "filebench.h"
- #include "flowop.h"
- #include "ipc.h"
-
-Index: filebench-1.2.4/filebench/procflow.c
-===================================================================
---- filebench-1.2.4.orig/filebench/procflow.c
-+++ filebench-1.2.4/filebench/procflow.c
-@@ -30,8 +30,8 @@
- #include
- #include
-
--#include "procflow.h"
- #include "filebench.h"
-+#include "procflow.h"
- #include "flowop.h"
- #include "ipc.h"
-
-@@ -162,7 +162,7 @@ procflow_createproc(procflow_t *procflow
- }
-
- #else
-- if (execl(execname, procname, "-a", procname, "-i",
-+ if (execlp(execname, procname, "-a", procname, "-i",
- instance, "-s", shmaddr, "-m", shmpath, NULL) < 0) {
- filebench_log(LOG_ERROR,
- "procflow exec proc failed: %s",
-Index: filebench-1.2.4/filebench/threadflow.c
-===================================================================
---- filebench-1.2.4.orig/filebench/threadflow.c
-+++ filebench-1.2.4/filebench/threadflow.c
-@@ -31,8 +31,9 @@
- #include
- #endif
- #include
--#include "threadflow.h"
-+
- #include "filebench.h"
-+#include "threadflow.h"
- #include "flowop.h"
- #include "ipc.h"
-
-Index: filebench-1.2.4/filebench/utils.c
-===================================================================
---- filebench-1.2.4.orig/filebench/utils.c
-+++ filebench-1.2.4/filebench/utils.c
-@@ -34,6 +34,8 @@
- #ifdef HAVE_STDINT_H
- #include
- #endif
-+
-+#include "filebench.h"
- #include "utils.h"
- #include "parsertypes.h"
-
-Index: filebench-1.2.4/filebench/vars.c
-===================================================================
---- filebench-1.2.4.orig/filebench/vars.c
-+++ filebench-1.2.4/filebench/vars.c
-@@ -30,12 +30,12 @@
- #include
- #include
-
-+#include "filebench.h"
- #include "vars.h"
- #include "misc.h"
- #include "utils.h"
- #include "stats.h"
- #include "eventgen.h"
--#include "filebench.h"
- #include "fb_random.h"
-
- static var_t *var_find_dynamic(char *name);
-Index: filebench-1.2.4/filebench/parser_gram.y
-===================================================================
---- filebench-1.2.4.orig/filebench/parser_gram.y
-+++ filebench-1.2.4/filebench/parser_gram.y
-@@ -46,8 +46,9 @@
- #ifdef HAVE_LIBTECLA
- #include
- #endif
--#include "parsertypes.h"
-+
- #include "filebench.h"
-+#include "parsertypes.h"
- #include "utils.h"
- #include "stats.h"
- #include "vars.h"
-@@ -2642,7 +2643,7 @@ parser_help(cmd_t *cmd)
- } else {
- filebench_log(LOG_INFO,
- "load (ls "
-- "/usr/benchmarks/filebench/workloads for list)");
-+ FILEBENCHDIR "/workloads for list)");
- }
- }
-
-Index: filebench-1.2.4/filebench/parser_lex.l
-===================================================================
---- filebench-1.2.4.orig/filebench/parser_lex.l
-+++ filebench-1.2.4/filebench/parser_lex.l
-@@ -38,9 +38,10 @@
- #ifdef HAVE_STDINT_H
- #include
- #endif
-+
-+#include "filebench.h"
- #include "parsertypes.h"
- #include "utils.h"
--#include "filebench.h"
-
- #include "parser_gram.h"
-
-Index: filebench-1.2.4/filebench/Makefile.am
-===================================================================
---- filebench-1.2.4.orig/filebench/Makefile.am
-+++ filebench-1.2.4/filebench/Makefile.am
-@@ -7,19 +7,19 @@
- #
-
- bin_PROGRAMS = go_filebench
--filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \
-+go_filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \
- utils.c flowop.c flowop_library.c ipc.c \
- vars.c stats.c eventgen.c fileset.c fb_random.c \
- parser_gram.y parser_lex.l
--filebenchdir = $(datadir)/filebench
--INCLUDES = -I../intl -DFILEBENCHDIR=\"$(prefix)/filebench\"
-+INCLUDES = -I../intl -DFILEBENCHDIR=\"$(FILEBENCHDIR)\"
-
- MV=@MV@
- LEX=@LEX@
- YACC=@YACC@
--LFLAGS = @LFLAGS@
--YFLAGS = @YFLAGS@
-+AM_LFLAGS = @LFLAGS@
-+AM_YFLAGS = @YFLAGS@
- DEFS = -D_REENTRANT @DEFINES@
-+LIBS = @LDLIBS@
- BUILD = @BUILD@
-
- parser_lex.c: parser_lex.l parser_gram.h Makefile
-Index: filebench-1.2.4/configure.in
-===================================================================
---- filebench-1.2.4.orig/configure.in
-+++ filebench-1.2.4/configure.in
-@@ -73,8 +73,8 @@ case "$host_os$host_cpu" in
- YFLAGS="-d"
- AC_DEFINE(HAVE_OFF64_T, 1,
- [ Define if we can use 64 bit files ])
-- FILEBENCHDIR=${prefix}/filebench
-- FILEBENCHBIN=${prefix}/bin
-+ FILEBENCHDIR=${datadir}/filebench
-+ FILEBENCHBIN=${bindir}
- ;;
- esac
-
-@@ -324,6 +324,6 @@ AC_SUBST(SRCDIR)
- AC_SUBST(FILEBENCHDIR)
- AC_SUBST(FILEBENCHBIN)
-
--AC_CONFIG_FILES([Makefile filebench/Makefile fastsu/Makefile workloads/Makefile workloads/build/Makefile scripts/Makefile benchpoint/Makefile benchpoint/bin/Makefile benchpoint/config/Makefile benchpoint/functions/Makefile benchpoint/profiles/Makefile])
-+AC_CONFIG_FILES([Makefile filebench/Makefile fastsu/Makefile workloads/Makefile workloads/build/Makefile scripts/Makefile benchpoint/Makefile benchpoint/bin/Makefile benchpoint/config/Makefile benchpoint/functions/Makefile benchpoint/profiles/Makefile bin/Makefile])
-
- AC_OUTPUT
-Index: filebench-1.2.4/fastsu/fastsu.c
-===================================================================
---- filebench-1.2.4.orig/fastsu/fastsu.c
-+++ filebench-1.2.4/fastsu/fastsu.c
-@@ -1,23 +1,26 @@
- #include
- #include
- #include
--#include
-+#include
-
--void
-+int
- main(int argc, char *argv[], char *envp[])
- {
- char *shell;
- char cmd[2048];
-
-- *cmd = NULL;
-+ *cmd = '\0';
- shell=getenv("SHELL");
-- *(argv++);
-+ argv++;
- argc--;
- while(argc-- != 0) {
- (void) strcat(cmd,*argv);
- (void) strcat(cmd," ");
-- *(argv++);
-+ argv++;
- }
-
- execlp(shell, shell, "-c", cmd, (char *) 0);
-+
-+ /* control should not reach here */
-+ return -1;
- }
-Index: filebench-1.2.4/benchpoint/config/Makefile.am
-===================================================================
---- filebench-1.2.4.orig/benchpoint/config/Makefile.am
-+++ filebench-1.2.4/benchpoint/config/Makefile.am
-@@ -6,8 +6,7 @@
- # See the file LICENSING in this distribution for details.
- #
-
--filebenchdir = $(prefix)/filebench
--configdir = $(filebenchdir)/config
-+configdir = ${FILEBENCHDIR}/config
-
- config_DATA = *.conf
-
-Index: filebench-1.2.4/benchpoint/profiles/Makefile.am
-===================================================================
---- filebench-1.2.4.orig/benchpoint/profiles/Makefile.am
-+++ filebench-1.2.4/benchpoint/profiles/Makefile.am
-@@ -6,8 +6,7 @@
- # See the file LICENSING in this distribution for details.
- #
-
--filebenchdir = $(prefix)/filebench
--configdir = $(filebenchdir)/config
-+configdir = ${FILEBENCHDIR}/config
-
- config_DATA = *.prof
-
-Index: filebench-1.2.4/bin/Makefile.am
-===================================================================
---- filebench-1.2.4.orig/bin/Makefile.am
-+++ filebench-1.2.4/bin/Makefile.am
-@@ -6,8 +6,5 @@
- # See the file LICENSING in this distribution for details.
- #
-
--filebenchdir = $(prefix)/filebench
--scriptsdir = $(filebenchdir)/bin
--
--scripts_SCRIPTS = filebench
-+bin_SCRIPTS = filebench
-
-Index: filebench-1.2.4/benchpoint/functions/Makefile.am
-===================================================================
---- filebench-1.2.4.orig/benchpoint/functions/Makefile.am
-+++ filebench-1.2.4/benchpoint/functions/Makefile.am
-@@ -6,8 +6,7 @@
- # See the file LICENSING in this distribution for details.
- #
-
--filebenchdir = $(prefix)/filebench
--configdir = $(filebenchdir)/config
-+configdir = ${FILEBENCHDIR}/config
-
- config_SCRIPTS = *.func
-
-Index: filebench-1.2.4/scripts/Makefile.am
-===================================================================
---- filebench-1.2.4.orig/scripts/Makefile.am
-+++ filebench-1.2.4/scripts/Makefile.am
-@@ -6,8 +6,7 @@
- # See the file LICENSING in this distribution for details.
- #
-
--filebenchdir = $(prefix)/filebench
--scriptsdir = $(filebenchdir)/scripts
-+scriptsdir = ${FILEBENCHDIR}/scripts
-
- scripts_SCRIPTS = filebench_compare filebench_summary filebench_plot fs_flush
-
-Index: filebench-1.2.4/workloads/Makefile.am
-===================================================================
---- filebench-1.2.4.orig/workloads/Makefile.am
-+++ filebench-1.2.4/workloads/Makefile.am
-@@ -6,8 +6,6 @@
- # See the file LICENSING in this distribution for details.
- #
-
--filebenchdir = $(datadir)/filebench
--
- SUBDIRS = build
-
- pkg: filebench
-Index: filebench-1.2.4/workloads/build/Makefile.am
-===================================================================
---- filebench-1.2.4.orig/workloads/build/Makefile.am
-+++ filebench-1.2.4/workloads/build/Makefile.am
-@@ -6,8 +6,7 @@
- # See the file LICENSING in this distribution for details.
- #
-
--filebenchdir = $(prefix)/filebench
--workloadsdir = $(filebenchdir)/workloads
-+workloadsdir = ${FILEBENCHDIR}/workloads
-
- workloads_DATA = BUILD \
- bringover.f \
diff --git a/app-benchmarks/filebench/metadata.xml b/app-benchmarks/filebench/metadata.xml
index 5d5529c3de77..3b9298e7df62 100644
--- a/app-benchmarks/filebench/metadata.xml
+++ b/app-benchmarks/filebench/metadata.xml
@@ -16,6 +16,12 @@
Proxy Maintainers
please CC on bugs
+
filebench
diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
index b6ff4023a515..bc1dea6197ee 100644
--- a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
+++ b/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html"
SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE=""
SLOT="0"
diff --git a/app-cdr/disc-cover/disc-cover-1.5.6.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6.ebuild
deleted file mode 100644
index b572b4ed184d..000000000000
--- a/app-cdr/disc-cover/disc-cover-1.5.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file"
-HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html"
-SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="cdrom"
-
-SLOT="0"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
- virtual/latex-base
- cdrom? ( dev-perl/Audio-CD-disc-cover )"
-
-src_compile() {
- pod2man disc-cover > disc-cover.1 || die
-}
-
-src_install() {
- dobin disc-cover
- dodoc AUTHORS CHANGELOG TODO
- doman disc-cover.1
- insinto /usr/share/${PN}/templates
- doins templates/*
-}
diff --git a/app-cdr/disc-cover/metadata.xml b/app-cdr/disc-cover/metadata.xml
index 3542a2056624..2eadb7c03808 100644
--- a/app-cdr/disc-cover/metadata.xml
+++ b/app-cdr/disc-cover/metadata.xml
@@ -8,8 +8,4 @@
bound by the fact that they come from the same source package.
That's why the web application ebuild is manually slotted to 0.
-
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index c44af1ad8bee..d02c45be5951 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,4 +1,2 @@
-DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22
-DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867
DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398
DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9
diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild
deleted file mode 100644
index 300793e737b6..000000000000
--- a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
- ESVN_REPO_URI="https://eid-mw.googlecode.com/svn/trunk/"
- inherit subversion autotools
- SRC_URI=""
-else
- MY_P="${PN}-${PV/_p/-}"
- SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-250016.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~x86 ~amd64"
- S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
- >=sys-apps/pcsc-lite-1.2.9
- xpi? ( || ( >=www-client/firefox-bin-3.6.24
- >=www-client/firefox-3.6.20 ) )
- !app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]]; then
- src_prepare() {
- eautoreconf
- }
-else
- src_prepare() {
- epatch "${FILESDIR}"/fix-nodialog-bug.patch
- }
-fi
-
-src_configure() {
- econf $(use_enable gtk dialogs) --disable-static
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- if use xpi; then
- declare MOZILLA_FIVE_HOME
- if has_version '>=www-client/firefox-3.6.20'; then
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
- fi
- if has_version '>=www-client/firefox-bin-3.6.24'; then
- MOZILLA_FIVE_HOME="/opt/firefox"
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
- fi
- fi
- rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
-}
diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
deleted file mode 100644
index 9ef575a906b3..000000000000
--- a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator mozextension multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://github.com/Fedict/${PN}.git
- https://github.com/Fedict/${PN}.git"
- inherit git-2 autotools
- SRC_URI=""
-else
- MY_P="${PN}-${PV/_p/-}"
- SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~x86 ~amd64"
- S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)"
-fi
-
-SLOT="0"
-LICENSE="LGPL-3"
-DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government"
-
-HOMEPAGE="http://eid.belgium.be"
-
-IUSE="+gtk +xpi"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
- >=sys-apps/pcsc-lite-1.2.9
- xpi? ( || ( >=www-client/firefox-bin-3.6.24
- >=www-client/firefox-3.6.20 ) )
- !app-misc/beid-runtime"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]]; then
- src_prepare() {
- eautoreconf
- }
-fi
-
-src_configure() {
- econf $(use_enable gtk dialogs) --disable-static
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- if use xpi; then
- declare MOZILLA_FIVE_HOME
- if has_version '>=www-client/firefox-3.6.20'; then
- MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
- fi
- if has_version '>=www-client/firefox-bin-3.6.24'; then
- MOZILLA_FIVE_HOME="/opt/firefox"
- xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be"
- fi
- fi
- rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la
-}
diff --git a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
deleted file mode 100644
index 1f70c781dd95..000000000000
--- a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: eid-mw-4.0.2/common/src/socket/socket.cpp
-===================================================================
---- eid-mw-4.0.2.orig/common/src/socket/socket.cpp
-+++ eid-mw-4.0.2/common/src/socket/socket.cpp
-@@ -21,6 +21,8 @@
- #include "../eiderrors.h"
- #include
-
-+#include
-+
- namespace eIDMW
- {
-
-Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp
-===================================================================
---- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp
-+++ eid-mw-4.0.2/common/src/socket/socketserver.cpp
-@@ -26,6 +26,7 @@
- #include
- #include
- #include
-+#include
- #ifndef SOCKET_ERROR
- #define SOCKET_ERROR -1
- #endif
-Index: eid-mw-4.0.2/common/src/util.cpp
-===================================================================
---- eid-mw-4.0.2.orig/common/src/util.cpp
-+++ eid-mw-4.0.2/common/src/util.cpp
-@@ -27,6 +27,8 @@
-
- #include
-
-+#include
-+
- #ifdef WIN32
- #include
- #endif
diff --git a/app-crypt/eid-mw/files/fix-nodialog-bug.patch b/app-crypt/eid-mw/files/fix-nodialog-bug.patch
deleted file mode 100644
index 5ea003216241..000000000000
--- a/app-crypt/eid-mw/files/fix-nodialog-bug.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: cardlayer/src/pinpadlib.h
-===================================================================
---- cardlayer/src/pinpadlib.h (revision 1501)
-+++ cardlayer/src/pinpadlib.h (revision 1502)
-@@ -43,13 +43,14 @@
- #endif
- #ifndef NO_DIALOGS
- #include "../dialogs/src/dialogs.h"
-+#endif
- #ifdef __APPLE__
- typedef void* BEID_DIALOGHANDLE;
- #else
- typedef unsigned long BEID_DIALOGHANDLE;
- #endif
--#endif
-
-+
- namespace eIDMW
- {
- #ifdef EIDMW_PF_EXPORT
diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index ef3c5ce86aae..e8a1ec5b8c32 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,2 +1,3 @@
DIST libu2f-host-1.0.0.tar.xz 454376 SHA256 18c56b9b5cfea2566925bba45b25a4e20b3ef8696905d8f2a06116316e164374 SHA512 ef953ffd8179e5ed4bcd1e02ccc82e671a7979b03a61ac73098be6509ab9d6badd6bb4e3e805de4ddbddbae3e8be71b091344f4230657464f6ba4ac3af171387 WHIRLPOOL cc76b778bcf20ef696900dd0ea65c0925052360a22e505a34ecb8738289d7bbaa88b31f2b25b91b6a1a22a240d01784bc6ef1cb9774c818fa0570328e9f13183
DIST libu2f-host-1.1.0.tar.xz 455424 SHA256 441bb832ee42acf3a5e5a229444c610218da381eb7daaf2aa750c004dc756d86 SHA512 3861ea748ff6ae0bae756182c6c4bd9a25dafc6e28eec3d6aad0eb700dcddc56ba61ed0c6a60395b8a296764c83b3fadb6954f9001cfb880e93758aaeecf34df WHIRLPOOL b6a91afd99a70db8c78a2a72950f210bbcbea0322780b768611aa528ad0159647bdc7446e1dffd91f8d9b6bcbd8105b8b38c9eb5d9eb2db9ef7d193c97096f3e
+DIST libu2f-host-1.1.1.tar.xz 455652 SHA256 e14d06196aba1fcf80498929e6460370e58b96e8298c57e4660030c045000e3c SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693 WHIRLPOOL 46fc4e087e2679bf8c07922fbd31200d702c5c88838812618c763615f24f7c0ecdc71ed4bd436fde1a9526eea23820bd6f2448040ce711f7fd87ca5c96281efd
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
new file mode 100644
index 000000000000..f3567fab1bf9
--- /dev/null
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils linux-info udev user
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-host/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="kernel_linux static-libs systemd"
+
+RDEPEND="
+ dev-libs/hidapi
+ dev-libs/json-c"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ systemd? ( sys-apps/systemd[acl] )"
+
+CONFIG_CHECK="~HIDRAW"
+
+pkg_setup() {
+ # The U2F device node will be owned by group 'plugdev'
+ # in non-systemd configurations
+ if ! use systemd; then
+ enewgroup plugdev
+ fi
+}
+
+src_prepare() {
+ autotools-utils_src_prepare
+
+ sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \
+ 70-u2f.rules > 70-u2f-udev.rules || die
+}
+
+src_configure() {
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ if use kernel_linux; then
+ if use systemd; then
+ udev_dorules 70-u2f.rules
+ else
+ udev_newrules 70-u2f-udev.rules 70-u2f.rules
+ fi
+ fi
+}
+
+pkg_postinst() {
+ if ! use systemd; then
+ elog "Users must be a member of the 'plugdev' group"
+ elog "to be able to access U2F devices"
+ fi
+}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild
index 24184e5aafc2..32e0a0a1f6c3 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd"
CDEPEND="
diff --git a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
index a43710f82a21..be92c2652abe 100644
--- a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
+++ b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
@@ -44,7 +44,7 @@ SRC_URI="
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
src_prepare() {
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index b99b34acab99..ec86873ba990 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,8 +1,6 @@
DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
-DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
DIST emacs-18.59-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f
DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
-DIST emacs-23.4-patches-17.tar.xz 16164 SHA256 bc9d4a36239f2749e218d903b67102e211a3a62ef162f5ab2801865dab77b752 SHA512 ceccd559b4f53328d75016b64d246ecf6fca7edebd080ce3bbba5f4d000bec38be5da91f3195c972ede0710da14b3be0545891321259b0a0b2963981c8fd62de WHIRLPOOL 4b70ce4d876e92a006e3dc0a31301f604aa8fa53a198515d1cbb3517a94933b1d7a11636494c1bd28ad1049a5a233d4ec13213e74e1eaff1cf96bb1fd095c345
DIST emacs-23.4-patches-19.tar.xz 17684 SHA256 078f5e103af9b9950afefcb8575eefd7b07eb0a241ab67ddb3b8b6d31f657abb SHA512 118d58cd5c8a74b39642bf45920fed25687af2e4a076affe985bf359862950eeba4f2ca99c6482c17c311466fbfaab3f4d583466821da4917fae9bec6e95940a WHIRLPOOL f6fe96f5cb0c2de2a48e6eda2cd26c9c724cd2da661ef4d3e4e4dd14382299615aac4b95bd4e7a21caae74b7630a70d160d65e89f6ac5fa91ad8d9bedaddded4
DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc
diff --git a/app-editors/emacs/emacs-18.59-r10.ebuild b/app-editors/emacs/emacs-18.59-r10.ebuild
deleted file mode 100644
index c2bd1754d9a8..000000000000
--- a/app-editors/emacs/emacs-18.59-r10.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
- ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
- https://dev.gentoo.org/~ulm/emacs/${P}-patches-8.tar.bz2"
-
-LICENSE="GPL-1+ GPL-2+ BSD" #HPND
-SLOT="18"
-KEYWORDS="amd64 x86"
-IUSE="abi_x86_x32"
-
-RDEPEND=">=app-eselect/eselect-emacs-1.16
- sys-libs/ncurses:0
- amd64? (
- abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_x32(-)?] )
- !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)] )
- )"
-# X? ( x11-libs/libX11[-xcb] )
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
- EPATCH_SUFFIX=patch epatch
- epatch_user
-}
-
-src_configure() {
- # autoconf? What's autoconf? We are living in 1992. ;-)
- local arch
- case ${ARCH} in
- amd64)
- if use abi_x86_x32; then
- arch=x86-x32
- multilib_toolchain_setup x32
- else
- arch=intel386
- multilib_toolchain_setup x86
- fi
- ;;
- x86) arch=intel386 ;;
- *) die "Architecture ${ARCH} not yet supported" ;;
- esac
- local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
- #use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
- sed -e "${cmd}" src/config.h-dist >src/config.h || die
-
- cat <<-END >src/paths.h
- #define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
- #define PATH_EXEC "/usr/share/emacs/${PV}/etc"
- #define PATH_LOCK "/var/lib/emacs/lock/"
- #define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
- END
-
- sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
- -e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
- src/s-linux.h || die
-
- # -O3 and -finline-functions cause segmentation faults at run time.
- filter-flags -finline-functions
- replace-flags -O[3-9] -O2
- strip-flags
-}
-
-src_compile() {
- # Do not use the sandbox, or the dumped Emacs will be twice as large
- export SANDBOX_ON=0
- emake --jobs=1 \
- CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
- LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- local basedir="/usr/share/emacs/${PV}" i
-
- dodir ${basedir}
- dodir /usr/share/man/man1
- emake --jobs=1 \
- LIBDIR="${D}"${basedir} \
- BINDIR="${D}"/usr/bin \
- MANDIR="${D}"/usr/share/man/man1 \
- install
-
- rmdir "${D}"${basedir}/lock || die
- find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
- -o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
- fperms -R go-w ${basedir}
-
- # remove duplicate DOC file
- rm "${D}"${basedir}/etc/DOC || die
-
- # move executables to the correct place
- mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
- for i in etags ctags emacsclient; do
- mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
- rm "${D}"${basedir}/etc/${i} || die
- done
-
- dodir /usr/libexec/emacs/${PV}
- for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
- yow env server
- do
- mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
- dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
- done
- for i in test-distrib make-docfile; do
- rm "${D}"${basedir}/etc/${i} || die
- done
-
- # move man page
- mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
-
- # move Info files
- dodir /usr/share/info
- mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
- dosym ../../info/emacs-${SLOT} "${basedir}"/info
- docompress -x /usr/share/info
-
- # move Info dir to avoid collisions with the dir file generated by portage
- mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
- touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-
- dodir /var/lib/emacs
- diropts -m0777
- keepdir /var/lib/emacs/lock
-
- dodoc README PROBLEMS
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- if [[ -d "${D}"/usr/share/info ]]; then
- mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
- fi
-}
-
-pkg_postinst() {
- eselect emacs update ifunset
-}
-
-pkg_postrm() {
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-23.4-r13.ebuild b/app-editors/emacs/emacs-23.4-r13.ebuild
deleted file mode 100644
index 5f90aee5e4c8..000000000000
--- a/app-editors/emacs/emacs-23.4-r13.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
- https://dev.gentoo.org/~ulm/emacs/${P}-patches-17.tar.xz"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-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 ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses:0
- >=app-eselect/eselect-emacs-1.16
- >=app-emacs/emacs-common-gentoo-1.5[games?,X?]
- net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
- alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
- dbus? ( sys-apps/dbus )
- X? (
- x11-libs/libXmu
- x11-libs/libXt
- x11-misc/xbitmaps
- gconf? ( >=gnome-base/gconf-2.26.2 )
- gif? ( media-libs/giflib )
- jpeg? ( virtual/jpeg:0= )
- png? ( >=media-libs/libpng-1.4:0= )
- svg? ( >=gnome-base/librsvg-2.0 )
- tiff? ( media-libs/tiff:0 )
- xpm? ( x11-libs/libXpm )
- xft? (
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libXft
- m17n-lib? (
- >=dev-libs/libotf-0.9.4
- >=dev-libs/m17n-lib-1.5.1
- )
- )
- gtk? ( x11-libs/gtk+:2 )
- !gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
- !motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
- )
- )
- )"
-
-DEPEND="${RDEPEND}
- alsa? ( virtual/pkgconfig )
- dbus? ( virtual/pkgconfig )
- X? ( virtual/pkgconfig )
- gzip-el? ( app-arch/gzip )
- pax_kernel? (
- sys-apps/attr
- sys-apps/paxctl
- )"
-
-RDEPEND="${RDEPEND}
- !/site-lisp dir
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
- # remove COPYING file (except for etc/COPYING used by describe-copying)
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
-
- local cdir
- if use source; then
- cdir="/usr/share/emacs/${FULL_VERSION}/src"
- insinto "${cdir}"
- # This is not meant to install all the source -- just the
- # C source you might find via find-function
- doins src/*.{c,h,m}
- doins -r src/{m,s}
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
- elif has installsources ${FEATURES}; then
- cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
- fi
-
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
- X
- ;;; ${PN}-${SLOT} site-lisp configuration
- X
- (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
- Y (setq find-function-C-source-directory
- Y "${EPREFIX}${cdir}")
- X (let ((path (getenv "INFOPATH"))
- X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
- X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
- X (and path
- X ;; move Emacs Info dir before anything else in /usr/share/info
- X (let* ((p (cons nil (split-string path ":" t))) (q p))
- X (while (and (cdr q) (not (string-match re (cadr q))))
- X (setq q (cdr q)))
- X (setcdr q (cons dir (delete dir (cdr q))))
- X (setq Info-directory-list (prune-directory-list (cdr p)))))))
- EOF
- elisp-site-file-install "${T}/${SITEFILE}" || die
-
- dodoc README BUGS
-
- if use aqua; then
- dodir /Applications/Gentoo
- rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
- mv nextstep/Emacs.app \
- "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
- fi
-
- DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
- through the Emacs eselect module, which also redirects man and info
- pages. Therefore, several Emacs versions can be installed at the
- same time. \"man emacs.eselect\" for details.
- \\n\\nIf you upgrade from a previous major version of Emacs, then
- it is strongly recommended that you use app-admin/emacs-updater
- to rebuild all byte-compiled elisp files of the installed Emacs
- packages."
- use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's
- machine would satisfy basic Emacs requirements under X11.
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
- for how to enable anti-aliased fonts."
- use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
- it into /Applications by yourself."
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # move Info dir file to correct name
- local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [[ -f ${ED}${infodir}/dir.orig ]]; then
- mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- elif [[ -d "${ED}"${infodir} ]]; then
- # this should not happen in EAPI 4
- ewarn "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ED}"${infodir}/dir{,.*}
- for f in "${ED}"${infodir}/*; do
- if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
- install-info --info-dir="${ED}"${infodir} "${f}" \
- || die "install-info failed"
- fi
- done
- fi
-}
-
-pkg_postinst() {
- elisp-site-regen
- readme.gentoo_print_elog
-
- if use livecd; then
- # force an update of the emacs symlink for the livecd/dvd,
- # because some microemacs packages set it with USE=livecd
- eselect emacs update
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
- # refresh symlinks in case any installed files have changed
- eselect emacs set ${EMACS_SUFFIX}
- else
- eselect emacs update ifunset
- fi
-}
-
-pkg_postrm() {
- elisp-site-regen
- eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-23.4-r14.ebuild b/app-editors/emacs/emacs-23.4-r14.ebuild
index 2b66a66a0220..4e4b97dea0d7 100644
--- a/app-editors/emacs/emacs-23.4-r14.ebuild
+++ b/app-editors/emacs/emacs-23.4-r14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="23"
-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 ~x86-macos"
+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 ~x86-macos"
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-editors/emacs/emacs-24.5-r1.ebuild b/app-editors/emacs/emacs-24.5-r1.ebuild
index dbd74c3ad9d2..60a85a10f477 100644
--- a/app-editors/emacs/emacs-24.5-r1.ebuild
+++ b/app-editors/emacs/emacs-24.5-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
-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"
+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"
IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest
index 488a7f479738..342b7029ebb0 100644
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@@ -1,3 +1,3 @@
-DIST docker-compose-1.4.0.tar.gz 79532 SHA256 2748cc8dd0829b44f0f686e36683cab58e1a4bc869442a04508504d2f62d0337 SHA512 470442aa78ddb24e8b9287953031e17a96a89780edd3a85955c923ffe00f4bfe655412dc15422437121593d7e2899f0847813d3716fc9ed576f93e6455cb868b WHIRLPOOL 9dc6731dad3df6422ec1e1b66049c8e9f04068b2fc2c8180da44220c1fbedc4919dfe17475cd539c3f33a079f3d04f875baaf769a7bc0875de48cf622670dc4b
DIST docker-compose-1.5.1.tar.gz 104331 SHA256 df5e885fd758a2b5983574d6718b5a07f92c7166c5706dc6ff88687d27bfaf55 SHA512 be6678c27b73516e14bf80255e52bde72517bd65a91f1be2393a15f0f0b87ff9ddd785e22016a9a5e1a68d5e6b9be395a96d60b7bc862f24647adf81752b9baa WHIRLPOOL 0b1312cb0d99a7cf02d8a88a7b00f3105f497c1cfa0ac3b32b369cd3984f2b1eaa8ea2c9e2e5a70ada3a371fb8a774245b75eaf5a7665170398df5f703793311
DIST docker-compose-1.5.2.tar.gz 106583 SHA256 79aa7e2e6ef9ab1936f8777476ffd4bb329875ec3d3664d239896d2f2a3c4f4f SHA512 be671503bbb91fdb5fdf9ff593f28d290d1c65738d055629d8252cf4c4eea7f5931a1e1d6d7a0b27640166671ecb095b413cb694b768437be3ec207e059f4ccc WHIRLPOOL bb12df93739329b9577db41a317a22976dc97ca1d1d3dd72e2ff4b8c245caf106f1aab466d42ffa7b9e6a7bf6f628f8977d2700460591051dade074535f0175e
+DIST docker-compose-1.6.2.tar.gz 128730 SHA256 264e2cbdd3fa314ba75f2681d10b0cff8d989a62979c1ba42d15a6d4c4002482 SHA512 7254a7e88b9030eeac87c1c6abfeea12e978519cc4e0236e37537c3143198d448e504107b1599b355a3c75e03e0acbd6fe552d0ff482cd3e91772d759a85544a WHIRLPOOL 3755ef9c189bd08f5bb810bf527041393ab788dcd302e6f1553989de73375ba34e062d2b21c10b144132ce9eb3997310b683b1b5b46aaf992fedfaa652deb6b2
diff --git a/app-emulation/docker-compose/docker-compose-1.4.0.ebuild b/app-emulation/docker-compose/docker-compose-1.6.2.ebuild
similarity index 57%
rename from app-emulation/docker-compose/docker-compose-1.4.0.ebuild
rename to app-emulation/docker-compose/docker-compose-1.6.2.ebuild
index c8cc56aee9ee..f5ca9b96b7c4 100644
--- a/app-emulation/docker-compose/docker-compose-1.4.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_4 )
inherit bash-completion-r1 distutils-r1
@@ -18,41 +18,40 @@ IUSE="test"
CDEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/dockerpty-0.3.4[${PYTHON_USEDEP}]
- =dev-python/docker-py-1.3.1[${PYTHON_USEDEP}]
- =dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+ =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ =dev-python/docker-py-1.7.0[${PYTHON_USEDEP}]
+ =dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ =dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
=dev-python/requests-2.6.1[${PYTHON_USEDEP}]
+ =dev-python/six-1.3.0[${PYTHON_USEDEP}]
=dev-python/texttable-0.8.1[${PYTHON_USEDEP}]
=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' )
+ $(python_gen_cond_dep 'd_op &&
+ actualDentry->d_op->d_revalidate) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)
++ return actualDentry->d_op->d_revalidate(actualDentry, flags);
++#else
+ return actualDentry->d_op->d_revalidate(actualDentry, nd);
++#endif
+ }
+
+ if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
diff --git a/app-emulation/vmware-modules/files/308-3.10-01-inode.patch b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch
new file mode 100644
index 000000000000..e12d84d10e7b
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch
@@ -0,0 +1,94 @@
+Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
+Properly initializes UID/GID with repsect to namespaces
+Some changes the readlink/setlink APIs
+--- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300
+@@ -35,9 +35,15 @@
+
+
+ /* Inode operations */
+-static struct dentry *InodeOpLookup(struct inode *dir,
+- struct dentry *dentry, struct nameidata *nd);
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
++static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen);
++#else
++static struct dentry *InodeOpLookup(struct inode *, struct dentry *, unsigned int);
++static int InodeOpReadlink(struct dentry *, char __user *, int);
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+ #else
+@@ -49,12 +55,15 @@
+ .lookup = InodeOpLookup,
+ };
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
+ static struct inode_operations LinkInodeOps = {
++#else
++struct inode_operations LinkInodeOps = {
++#endif
+ .readlink = InodeOpReadlink,
+ .follow_link = InodeOpFollowlink,
+ };
+
+-
+ /*
+ *----------------------------------------------------------------------------
+ *
+@@ -75,7 +84,11 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir, // IN: parent directory's inode
+ struct dentry *dentry, // IN: dentry to lookup
+- struct nameidata *nd) // IN: lookup intent and information
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
++ struct nameidata *nd) // IN: lookup intent and information
++#else
++ unsigned int flags)
++#endif
+ {
+ char *filename;
+ struct inode *inode;
+@@ -135,7 +148,12 @@
+ inode->i_size = INODE_TO_IINFO(inode)->nameLen;
+ inode->i_version = 1;
+ inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ inode->i_uid = inode->i_gid = 0;
++#else
++ inode->i_gid = make_kgid(current_user_ns(), 0);
++ inode->i_uid = make_kuid(current_user_ns(), 0);
++#endif
+ inode->i_op = &LinkInodeOps;
+
+ d_add(dentry, inode);
+@@ -177,7 +195,12 @@
+ return -EINVAL;
+ }
+
+- return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99)
++ return vfs_readlink(dentry, buffer, buflen, iinfo->name);
++#else
++ return readlink_copy(buffer, buflen, iinfo->name);
++#endif
++
+ }
+
+
+@@ -221,7 +244,7 @@
+ goto out;
+ }
+
+- ret = vfs_follow_link(nd, iinfo->name);
++ nd_set_link(nd, iinfo->name);
+
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+@@ -230,3 +253,4 @@
+ return ret;
+ #endif
+ }
++
diff --git a/app-emulation/vmware-modules/files/308-3.10-02-control.patch b/app-emulation/vmware-modules/files/308-3.10-02-control.patch
new file mode 100644
index 000000000000..928835337511
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.10-02-control.patch
@@ -0,0 +1,57 @@
+The API to create proc entries now takes the file ops structure directly, instead of being set after the fact
+Using new __getname/__putname API
+--- a/vmblock-only/linux/control.c 2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300
+@@ -208,9 +208,11 @@
+ VMBlockSetProcEntryOwner(controlProcMountpoint);
+
+ /* Create /proc/fs/vmblock/dev */
+- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
+- VMBLOCK_CONTROL_MODE,
+- controlProcDirEntry);
++ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
++ VMBLOCK_CONTROL_MODE,
++ controlProcDirEntry,
++ &ControlFileOps);
++
+ if (!controlProcEntry) {
+ Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
+ remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
+@@ -218,7 +220,10 @@
+ return -EINVAL;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
+ controlProcEntry->proc_fops = &ControlFileOps;
++#endif
++
+ return 0;
+ }
+
+@@ -287,18 +287,24 @@ ExecuteBlockOp(const char __user *buf,
+ int i;
+ int retval;
+
+- name = getname(buf);
++ name = __getname();
+ if (IS_ERR(name)) {
+ return PTR_ERR(name);
+ }
+
++ i = strncpy_from_user(name, buf, PATH_MAX);
++ if (i < 0 || i == PATH_MAX) {
++ __putname(name);
++ return -EINVAL;
++ }
++
+ for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) {
+ name[i] = '\0';
+ }
+
+ retval = i < 0 ? -EINVAL : blockOp(name, blocker);
+
+- putname(name);
++ __putname(name);
+
+ return retval;
+ }
diff --git a/app-emulation/vmware-modules/files/308-3.10-03-inline.patch b/app-emulation/vmware-modules/files/308-3.10-03-inline.patch
new file mode 100644
index 000000000000..fa8f36a35c29
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.10-03-inline.patch
@@ -0,0 +1,14 @@
+Hushes a warning
+--- a/vmmon-only/linux/driver.c 2015-02-07 03:54:16.000000000 +0300
++++ c/vmmon-only/linux/driver.c 2015-02-24 03:58:06.042605293 +0300
+@@ -1328,7 +1328,9 @@
+ *-----------------------------------------------------------------------------
+ */
+
+-__attribute__((always_inline)) static Bool
++#include
++
++__always_inline static Bool
+ LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min
+ {
+ TSCDelta tscDelta;
diff --git a/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch
new file mode 100644
index 000000000000..b2f76d3e2b30
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch
@@ -0,0 +1,41 @@
+replaces usage of vfs_readdir with iterate_dir. origionally found here:
+https://bugs.gentoo.org/show_bug.cgi?id=508204
+
+diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/file.c 2014-04-26 10:58:03.062635343 -0400
+@@ -166,11 +166,9 @@
+
+ static int
+ FileOpReaddir(struct file *file, // IN
+- void *dirent, // IN
+- filldir_t filldir) // IN
++ struct dir_context *ctx)
+ {
+ int ret;
+- FilldirInfo info;
+ struct file *actualFile;
+
+ if (!file) {
+@@ -184,11 +182,8 @@
+ return -EINVAL;
+ }
+
+- info.filldir = filldir;
+- info.dirent = dirent;
+-
+ actualFile->f_pos = file->f_pos;
+- ret = vfs_readdir(actualFile, Filldir, &info);
++ ret = iterate_dir(actualFile, ctx);
+ file->f_pos = actualFile->f_pos;
+
+ return ret;
+@@ -237,7 +232,7 @@
+
+
+ struct file_operations RootFileOps = {
+- .readdir = FileOpReaddir,
++ .iterate = FileOpReaddir,
+ .open = FileOpOpen,
+ .release = FileOpRelease,
+ };
diff --git a/app-emulation/vmware-modules/files/308-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/308-3.11-01-filldir.patch
new file mode 100644
index 000000000000..2eec99b7c1f8
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.11-01-filldir.patch
@@ -0,0 +1,53 @@
+simply remove the code for Filldir since it is no longer used with the new
+iterate_dir API
+
+diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
+--- vmblock-only/linux/file.c 2014-10-07 23:22:46.832469618 -0400
++++ vmblock-only.new/linux/file.c 2014-10-07 23:24:35.276472720 -0400
+@@ -38,46 +38,6 @@ typedef u64 inode_num_t;
+ typedef ino_t inode_num_t;
+ #endif
+
+-/* Specifically for our filldir_t callback */
+-typedef struct FilldirInfo {
+- filldir_t filldir;
+- void *dirent;
+-} FilldirInfo;
+-
+-
+-/*
+- *----------------------------------------------------------------------------
+- *
+- * Filldir --
+- *
+- * Callback function for readdir that we use in place of the one provided.
+- * This allows us to specify that each dentry is a symlink, but pass through
+- * everything else to the original filldir function.
+- *
+- * Results:
+- * Original filldir's return value.
+- *
+- * Side effects:
+- * Directory information gets copied to user's buffer.
+- *
+- *----------------------------------------------------------------------------
+- */
+-
+-static int
+-Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir
+- const char *name, // IN: Dirent name
+- int namelen, // IN: len of dirent's name
+- loff_t offset, // IN: Offset
+- inode_num_t ino, // IN: Inode number of dirent
+- unsigned int d_type) // IN: Type of file
+-{
+- FilldirInfo *info = buf;
+-
+- /* Specify DT_LNK regardless */
+- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK);
+-}
+-
+-
+ /* File operations */
+
+ /*
diff --git a/app-emulation/vmware-modules/files/308-3.15-00-vsock.patch b/app-emulation/vmware-modules/files/308-3.15-00-vsock.patch
new file mode 100644
index 000000000000..9e8d9d1a32f7
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.15-00-vsock.patch
@@ -0,0 +1,46 @@
+removing the no longer existing second parameter to sk_data_ready
+doesn't seem it ever served a purpose.
+
+diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
+--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400
+@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk,
+ vsk = vsock_sk(sk);
+ PKT_FIELD(vsk, sentWaitingRead) = FALSE;
+ #endif
+-
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++ sk->sk_data_ready(sk);
++#else
+ sk->sk_data_ready(sk, 0);
++#endif
+ }
+
+
+diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c
+--- vsock-only/linux/notifyQState.c 2013-11-05 23:33:27.000000000 -0500
++++ vsock-only.new/linux/notifyQState.c 2014-10-05 23:46:33.231303931 -0400
+@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk,
+ struct sockaddr_vm *dst, // IN: unused
+ struct sockaddr_vm *src) // IN: unused
+ {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++ sk->sk_data_ready(sk);
++#else
+ sk->sk_data_ready(sk, 0);
++#endif
+ }
+
+
+@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct
+ }
+
+ /* See the comment in VSockVmciNotifyPktSendPostEnqueue */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
++ sk->sk_data_ready(sk);
++#else
+ sk->sk_data_ready(sk, 0);
++#endif
+ }
+
+ return err;
diff --git a/app-emulation/vmware-modules/files/308-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/308-3.18-00-version-redefined.patch
new file mode 100644
index 000000000000..22d6325c9a90
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.18-00-version-redefined.patch
@@ -0,0 +1,25 @@
+Hushes some (but not all warnings) relating to redefinitions of this define
+--- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.000000000 +0300
++++ c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 +0300
+@@ -53,7 +53,9 @@
+ * VMware HD Audio codec
+ * VMware HD Audio controller
+ */
++#ifndef PCI_VENDOR_ID_VMWARE
+ #define PCI_VENDOR_ID_VMWARE 0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA 0x0711
+--- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.000000000 +0300
++++ c/vmnet-only/vm_device_version.h 2015-02-24 03:58:06.044604981 +0300
+@@ -53,7 +53,9 @@
+ * VMware HD Audio codec
+ * VMware HD Audio controller
+ */
++#ifndef PCI_VENDOR_ID_VMWARE
+ #define PCI_VENDOR_ID_VMWARE 0x15AD
++#endif
+ #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405
+ #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710
+ #define PCI_DEVICE_ID_VMWARE_VGA 0x0711
diff --git a/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch
new file mode 100644
index 000000000000..0182077254a1
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch
@@ -0,0 +1,24 @@
+A copy of this since it is no longer exported by the kernel headers
+--- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.000000000 +0300
++++ c/vmblock-only/shared/compat_namei.h 2015-02-24 03:51:25.235286047 +0300
+@@ -21,6 +21,20 @@
+
+ #include
+
++/* Copy-n-paste from kernel's source/fs/namei.c */
++struct nameidata {
++ struct path path;
++ struct qstr last;
++ struct path root;
++ struct inode *inode; /* path.dentry.d_inode */
++ unsigned int flags;
++ unsigned seq, m_seq;
++ int last_type;
++ unsigned depth;
++ struct file *base;
++ char *saved_names[MAX_NESTED_LINKS + 1];
++};
++
+ /*
+ * In 2.6.25-rc2, dentry and mount objects were removed from the nameidata
+ * struct. They were both replaced with a struct path.
diff --git a/app-emulation/vmware-modules/files/308-3.19-02-vmblock-path.patch b/app-emulation/vmware-modules/files/308-3.19-02-vmblock-path.patch
new file mode 100644
index 000000000000..178d1478ae59
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.19-02-vmblock-path.patch
@@ -0,0 +1,67 @@
+Sources:
+https://531682.bugs.gentoo.org/attachment.cgi?id=396484
+https://531682.bugs.gentoo.org/attachment.cgi?id=396482
+diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.000000000 -0500
++++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -0500
+@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry
+ unsigned int flags) // IN: lookup flags & intent
+ {
+ VMBlockInodeInfo *iinfo;
+- struct nameidata actualNd;
++ struct path actualNd;
+ struct dentry *actualDentry;
+ int ret;
+
+diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c
+--- vmblock-only.orig/linux/filesystem.c 2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -0500
+@@ -322,7 +322,7 @@ Iget(struct super_block *sb, // IN: f
+ {
+ VMBlockInodeInfo *iinfo;
+ struct inode *inode;
+- struct nameidata actualNd;
++ struct path actualNd;
+
+ ASSERT(sb);
+
+diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h
+--- vmblock-only.orig/shared/compat_namei.h 2014-11-20 19:29:15.000000000 -0500
++++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -0500
+@@ -26,21 +26,21 @@
+ * struct. They were both replaced with a struct path.
+ */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry
++#define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #else
+ #define compat_vmw_nd_to_dentry(nd) (nd).dentry
+ #endif
+
+ /* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25)
+-#define compat_path_release(nd) path_put(&(nd)->path)
++#define compat_path_release(nd) path_put(nd)
+ #else
+ #define compat_path_release(nd) path_release(nd)
+ #endif
+
+ /* path_lookup was removed in 2.6.39 merge window VFS merge */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
+-#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path))
++#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd)
+ #else
+ #define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)
+ #endif
+diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500
++++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -0500
+@@ -92,7 +92,7 @@
+ * and that would try to acquire the inode's semaphore; if the two inodes
+ * are the same we'll deadlock.
+ */
+- if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
++ if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
+ Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
+ if (filp_close(actualFile, current->files) < 0) {
+ Warning("FileOpOpen: unable to close opened file.\n");
diff --git a/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch
new file mode 100644
index 000000000000..83f0cc8fcbbf
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch
@@ -0,0 +1,59 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
+--- a/vmci-only/linux/vmciKernelIf.c 2015-02-07 03:11:55.000000000 +0300
++++ c/vmci-only/linux/vmciKernelIf.c 2015-02-24 03:58:06.041605450 +0300
+@@ -40,6 +40,7 @@
+ #include /* For memcpy_{to,from}iovec(). */
+ #include
+ #include
++#include
+
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+@@ -1196,21 +1197,21 @@
+ } else {
+ toCopy = size - bytesCopied;
+ }
+-
++ /* Code cloned from kernels drivers/misc/vmw_vmci/vmci_queue_pair.c */
+ if (isIovec) {
+- struct iovec *iov = (struct iovec *)src;
+- int err;
++ struct msghdr *msg = (struct msghdr *)src;
++ int err;
+
+- /* The iovec will track bytesCopied internally. */
+- err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy);
+- if (err != 0) {
+- if (kernelIf->host) {
+- kunmap(kernelIf->u.h.page[pageIndex]);
++ /* The iovec will track bytes_copied internally. */
++ err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy);
++ if (err != 0) {
++ if (kernelIf->host)
++ kunmap(kernelIf->u.h.page[pageIndex]);
++ return VMCI_ERROR_INVALID_ARGS;
+ }
+- return VMCI_ERROR_INVALID_ARGS;
+- }
+- } else {
+- memcpy((uint8 *)va + pageOffset, (uint8 *)src + bytesCopied, toCopy);
++ } else {
++ memcpy((u8 *)va + pageOffset,
++ (u8 *)src + bytesCopied, toCopy);
+ }
+
+ bytesCopied += toCopy;
+@@ -1273,11 +1274,11 @@
+ }
+
+ if (isIovec) {
+- struct iovec *iov = (struct iovec *)dest;
++ struct msghdr *msg = (struct msghdr *)dest;
+ int err;
+
+ /* The iovec will track bytesCopied internally. */
+- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy);
++ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy);
+ if (err != 0) {
+ if (kernelIf->host) {
+ kunmap(kernelIf->u.h.page[pageIndex]);
diff --git a/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch
new file mode 100644
index 000000000000..4dec3c468206
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch
@@ -0,0 +1,25 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
+diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
+--- vsock-only.old/linux/af_vsock.c 2015-05-06 20:41:47.684046762 -0400
++++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
+@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio
+ * able to send.
+ */
+
+- written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov,
++ written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov,
+ len - totalWritten, 0);
+ if (written < 0) {
+ err = -ENOMEM;
+@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio
+ }
+
+ if (flags & MSG_PEEK) {
+- read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0);
++ read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+ } else {
+- read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0);
++ read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0);
+ }
+
+ if (read < 0) {
diff --git a/app-emulation/vmware-modules/files/308-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/308-3.19-06-vsock.patch
new file mode 100644
index 000000000000..9a2096e679a4
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.19-06-vsock.patch
@@ -0,0 +1,16 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400
++++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400
+@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc
+ }
+
+ /* Place the datagram payload in the user's iovec. */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
+ err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen);
++#else
++ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen);
++#endif
+ if (err) {
+ goto out;
+ }
diff --git a/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch
new file mode 100644
index 000000000000..6aec2cd3d7b5
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch
@@ -0,0 +1,13 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
+diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
+--- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400
++++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400
+@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc
+ goto out;
+ }
+
+- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len);
++ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+
+ dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port);
+ dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port);
diff --git a/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch b/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch
new file mode 100644
index 000000000000..5735cd50650e
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch
@@ -0,0 +1,61 @@
+--- vsock-only/linux/af_vsock.c 2015-05-03 00:55:58.955156116 +0200
++++ vsock-only/linux/af_vsock.c.new 2015-05-03 01:01:14.305173750 +0200
+@@ -233,14 +233,10 @@
+ static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
+ char __user *optval, int __user * optlen);
+
+-static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
+- struct socket *sock, struct msghdr *msg, size_t len);
+-static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
+- struct msghdr *msg, size_t len, int flags);
+-static int VSockVmciStreamSendmsg(struct kiocb *kiocb,
+- struct socket *sock, struct msghdr *msg, size_t len);
+-static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
+- struct msghdr *msg, size_t len, int flags);
++static int VSockVmciDgramSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
++static int VSockVmciDgramRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);
++static int VSockVmciStreamSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
++static int VSockVmciStreamRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags);
+
+ static int VSockVmciCreate(
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)
+@@ -4211,8 +4207,7 @@
+ */
+
+ static int
+-VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED
+- struct socket *sock, // IN: socket to send on
++VSockVmciDgramSendmsg(struct socket *sock, // IN: socket to send on
+ struct msghdr *msg, // IN: message to send
+ size_t len) // IN: length of message
+ {
+@@ -4541,8 +4536,7 @@
+ */
+
+ static int
+-VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
+- struct socket *sock, // IN: socket to send on
++VSockVmciStreamSendmsg(struct socket *sock, // IN: socket to send on
+ struct msghdr *msg, // IN: message to send
+ size_t len) // IN: length of message
+ {
+@@ -4710,8 +4704,7 @@
+ */
+
+ static int
+-VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED
+- struct socket *sock, // IN: socket to receive from
++VSockVmciDgramRecvmsg(struct socket *sock, // IN: socket to receive from
+ struct msghdr *msg, // IN/OUT: message to receive into
+ size_t len, // IN: length of receive buffer
+ int flags) // IN: receive flags
+@@ -4803,8 +4796,7 @@
+ */
+
+ static int
+-VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
+- struct socket *sock, // IN: socket to receive from
++VSockVmciStreamRecvmsg(struct socket *sock, // IN: socket to receive from
+ struct msghdr *msg, // IN/OUT: message to receive into
+ size_t len, // IN: length of receive buffer
+ int flags) // IN: receive flags
diff --git a/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch b/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch
new file mode 100644
index 000000000000..66609bff6308
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch
@@ -0,0 +1,56 @@
+--- vmci-only/linux/driver.c 2015-02-07 01:11:55.000000000 +0100
++++ vmci-only/linux/driver.c.new 2015-07-23 00:28:25.713804866 +0200
+@@ -37,6 +37,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "compat_highmem.h"
+ #include "compat_interrupt.h"
+--- vmblock-only/linux/inode.c 2015-08-23 00:34:11.959377109 +0200
++++ vmblock-only/linux/inode.c.new 2015-08-23 00:37:49.839389292 +0200
+@@ -38,7 +38,9 @@
+ static int InodeOpReadlink(struct dentry *, char __user *, int);
+ #endif
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+ #else
+ static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -203,13 +205,19 @@
+ *----------------------------------------------------------------------------
+ */
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++static const char *
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *
+ #else
+ static int
+ #endif
+ InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++ void **cookie) // OUT: stores opaque pointer
++#else
+ struct nameidata *nd) // OUT: stores result
++#endif
+ {
+ int ret;
+ VMBlockInodeInfo *iinfo;
+@@ -226,7 +234,11 @@
+ goto out;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++ return *cookie = iinfo->name;
++#else
+ nd_set_link(nd, iinfo->name);
++#endif
+
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
diff --git a/app-emulation/vmware-modules/files/308-4.02-01-sk_alloc.patch b/app-emulation/vmware-modules/files/308-4.02-01-sk_alloc.patch
new file mode 100644
index 000000000000..6437d6022a36
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.02-01-sk_alloc.patch
@@ -0,0 +1,22 @@
+--- vmnet-only/vmnetInt.h 2015-05-28 01:46:53.023206897 +0200
++++ vmnet-only/vmnetInt.h.new 2015-05-28 01:47:07.911207730 +0200
+@@ -79,7 +79,7 @@
+ extern struct proto vmnet_proto;
+ #ifdef VMW_NETDEV_HAS_NET
+ # define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \
+- PF_NETLINK, _pri, &vmnet_proto)
++ PF_NETLINK, _pri, &vmnet_proto, 0)
+ #else
+ # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1)
+ #endif
+--- vsock-only/linux/af_vsock.c 2015-05-28 01:50:03.553217551 +0200
++++ vsock-only/linux/af_vsock.c.new 2015-05-28 01:54:55.248233862 +0200
+@@ -2829,7 +2829,7 @@
+ #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
+ sk = sk_alloc(vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1);
+ #else
+- sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto);
++ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 0);
+ #endif
+ if (!sk) {
+ return NULL;
diff --git a/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch b/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch
new file mode 100644
index 000000000000..b2d93a66db84
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch
@@ -0,0 +1,27 @@
+diff -ru work.old/vmci-only/linux/driver.c work/vmci-only/linux/driver.c
+--- work.old/vmci-only/linux/driver.c 2015-09-14 21:07:49.751696932 +0200
++++ work/vmci-only/linux/driver.c 2015-09-14 22:10:48.015908198 +0200
+@@ -2467,8 +2467,6 @@
+ static void __exit
+ vmci_exit(void)
+ {
+- int retval;
+-
+ if (guestDeviceInit) {
+ pci_unregister_driver(&vmci_driver);
+ vfree(data_buffer);
+@@ -2480,12 +2478,8 @@
+
+ VMCI_HostCleanup();
+
+- retval = misc_deregister(&linuxState.misc);
+- if (retval) {
+- Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME);
+- } else {
+- Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
+- }
++ misc_deregister(&linuxState.misc);
++ Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME);
+
+ hostDeviceInit = FALSE;
+ }
diff --git a/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch b/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch
new file mode 100644
index 000000000000..9f0df66faa22
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch
@@ -0,0 +1,14 @@
+diff -ru work.old/vmmon-only/linux/driver.c work/vmmon-only/linux/driver.c
+--- work.old/vmmon-only/linux/driver.c 2015-08-14 22:39:49.000000000 +0200
++++ work/vmmon-only/linux/driver.c 2015-09-14 22:11:06.807909249 +0200
+@@ -387,9 +387,7 @@
+ #ifdef VMX86_DEVEL
+ unregister_chrdev(linuxState.major, linuxState.deviceName);
+ #else
+- if (misc_deregister(&linuxState.misc)) {
+- Warning("Module %s: error unregistering\n", linuxState.deviceName);
+- }
++ misc_deregister(&linuxState.misc);
+ #endif
+
+ Log("Module %s: unloaded\n", linuxState.deviceName);
diff --git a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
new file mode 100644
index 000000000000..c13929243275
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
@@ -0,0 +1,56 @@
+--- vmblock-only/linux/inode.c 2016-01-30 19:13:04.019947435 +0100
++++ vmblock-only/linux/inode.c.new 2016-01-30 19:13:56.226950354 +0100
+@@ -44,7 +44,9 @@
+ static int InodeOpReadlink(struct dentry *, char __user *, int);
+ #endif
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
++static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, void **cookie);
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
+ static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -63,7 +65,11 @@
+ struct inode_operations LinkInodeOps = {
+ #endif
+ .readlink = InodeOpReadlink,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
++ .get_link = InodeOpFollowlink,
++#else
+ .follow_link = InodeOpFollowlink,
++#endif
+ };
+
+ /*
+@@ -231,6 +237,9 @@
+ static int
+ #endif
+ InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
++ struct inode *inode,
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
+ void **cookie) // OUT: stores opaque pointer
+ #else
+@@ -241,12 +250,20 @@
+ VMBlockInodeInfo *iinfo;
+
+ if (!dentry) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
++ ret = -ECHILD;
++#else
+ Warning("InodeOpReadlink: invalid args from kernel\n");
+ ret = -EINVAL;
++#endif
+ goto out;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
++ iinfo = INODE_TO_IINFO(inode);
++#else
+ iinfo = INODE_TO_IINFO(dentry->d_inode);
++#endif
+ if (!iinfo) {
+ ret = -EINVAL;
+ goto out;
diff --git a/app-emulation/vmware-modules/files/308-apic.patch b/app-emulation/vmware-modules/files/308-apic.patch
new file mode 100644
index 000000000000..66cd45933246
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-apic.patch
@@ -0,0 +1,12 @@
+diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c
+index f1f4b10..c43242f 100644
+--- a/vmmon-only/linux/hostif.c
++++ b/vmmon-only/linux/hostif.c
+@@ -55,6 +55,7 @@
+ #include
+ #include
+
++#include
+
+ #include "vmware.h"
+ #include "x86apic.h"
diff --git a/app-emulation/vmware-modules/files/308-hardened.patch b/app-emulation/vmware-modules/files/308-hardened.patch
new file mode 100644
index 000000000000..31d5917c37ce
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-hardened.patch
@@ -0,0 +1,89 @@
+diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
+index b21dd44..960c2aa 100644
+--- a/vmmon-only/linux/driver.c
++++ b/vmmon-only/linux/driver.c
+@@ -178,7 +178,16 @@ static struct vm_operations_struct vmuser_mops = {
+ #endif
+ };
+
+-static struct file_operations vmuser_fops;
++static struct file_operations vmuser_fops = {
++ .owner = THIS_MODULE,
++ .poll = LinuxDriverPoll,
++ .unlocked_ioctl = LinuxDriver_Ioctl,
++ .compat_ioctl = LinuxDriver_Ioctl,
++ .open = LinuxDriver_Open,
++ .release = LinuxDriver_Close,
++ .mmap = LinuxDriverMmap
++};
++
+ static struct timer_list tscTimer;
+ static Atomic_uint32 tsckHz;
+ static VmTimeStart tsckHzStartTime;
+@@ -357,21 +372,6 @@ init_module(void)
+ linuxState.fastClockPriority = -20;
+ linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE;
+
+- /*
+- * Initialize the file_operations structure. Because this code is always
+- * compiled as a module, this is fine to do it here and not in a static
+- * initializer.
+- */
+-
+- memset(&vmuser_fops, 0, sizeof vmuser_fops);
+- vmuser_fops.owner = THIS_MODULE;
+- vmuser_fops.poll = LinuxDriverPoll;
+- vmuser_fops.unlocked_ioctl = LinuxDriver_Ioctl;
+- vmuser_fops.compat_ioctl = LinuxDriver_Ioctl;
+- vmuser_fops.open = LinuxDriver_Open;
+- vmuser_fops.release = LinuxDriver_Close;
+- vmuser_fops.mmap = LinuxDriverMmap;
+-
+ #ifdef VMX86_DEVEL
+ devel_init_module();
+ linuxState.minor = 0;
+diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
+index b12b982..40bd4cf 100644
+--- a/vmnet-only/driver.c
++++ b/vmnet-only/driver.c
+@@ -165,7 +165,16 @@ static long VNetFileOpUnlockedIoctl(struct file * filp,
+ unsigned int iocmd, unsigned long ioarg);
+ #endif
+
+-static struct file_operations vnetFileOps;
++static struct file_operations vnetFileOps = {
++ .owner = THIS_MODULE,
++ .read = VNetFileOpRead,
++ .write = VNetFileOpWrite,
++ .poll = VNetFileOpPoll,
++ .unlocked_ioctl = VNetFileOpUnlockedIoctl,
++ .compat_ioctl = VNetFileOpUnlockedIoctl,
++ .open = VNetFileOpOpen,
++ .release = VNetFileOpClose
++};
+
+ /*
+ * Utility functions
+@@ -476,22 +491,6 @@ init_module(void)
+ goto err_proto;
+ }
+
+- /*
+- * Initialize the file_operations structure. Because this code is always
+- * compiled as a module, this is fine to do it here and not in a static
+- * initializer.
+- */
+-
+- memset(&vnetFileOps, 0, sizeof vnetFileOps);
+- vnetFileOps.owner = THIS_MODULE;
+- vnetFileOps.read = VNetFileOpRead;
+- vnetFileOps.write = VNetFileOpWrite;
+- vnetFileOps.poll = VNetFileOpPoll;
+- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
+- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
+- vnetFileOps.open = VNetFileOpOpen;
+- vnetFileOps.release = VNetFileOpClose;
+-
+ retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps);
+ if (retval) {
+ LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n",
diff --git a/app-emulation/vmware-modules/files/308-makefile-include.patch b/app-emulation/vmware-modules/files/308-makefile-include.patch
new file mode 100644
index 000000000000..39c300030805
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-makefile-include.patch
@@ -0,0 +1,65 @@
+diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel
+index ab7a727..e3ec9d2 100644
+--- a/vmblock-only/Makefile.kernel
++++ b/vmblock-only/Makefile.kernel
+@@ -19,7 +19,7 @@
+
+ INCLUDE += -I$(SRCROOT)/include
+
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, )
+diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel
+index ba343ee..861ea83 100644
+--- a/vmci-only/Makefile.kernel
++++ b/vmci-only/Makefile.kernel
+@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI
+
+ INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux
+
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+
+ obj-m += $(DRIVER).o
+
+diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel
+index 8770d1d..c4746c3 100644
+--- a/vmmon-only/Makefile.kernel
++++ b/vmmon-only/Makefile.kernel
+@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE
+ INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \
+ -I$(SRCROOT)/vmcore
+
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, )
+
+diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel
+index d1e3133..665d428 100644
+--- a/vmnet-only/Makefile.kernel
++++ b/vmnet-only/Makefile.kernel
+@@ -19,7 +19,7 @@
+
+ INCLUDE := -I$(SRCROOT)
+
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, )
+ EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, )
+diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel
+index b4629ee..264b8cb 100644
+--- a/vsock-only/Makefile.kernel
++++ b/vsock-only/Makefile.kernel
+@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include
+ INCLUDE += -I$(SRCROOT)/linux
+ INCLUDE += -I$(SRCROOT)/common
+
+-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE)
++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE)
+ EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, )
+
+
diff --git a/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch
new file mode 100644
index 000000000000..1a647a3302d8
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch
@@ -0,0 +1,85 @@
+diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
+index 2b81323..746c8b8 100644
+--- a/vmblock-only/Makefile
++++ b/vmblock-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+
+ DRIVER := vmblock
+ PRODUCT := ws
+diff --git a/vmci-only/Makefile b/vmci-only/Makefile
+index 8e9c5be..6ec828b 100644
+--- a/vmci-only/Makefile
++++ b/vmci-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+
+ DRIVER := vmci
+ PRODUCT := ws
+diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
+index 5bd867b..91a83d4 100644
+--- a/vmmon-only/Makefile
++++ b/vmmon-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+
+ DRIVER := vmmon
+ PRODUCT := @@PRODUCT@@
+diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
+index d4eb73c..c7c6d38 100644
+--- a/vmnet-only/Makefile
++++ b/vmnet-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+
+ DRIVER := vmnet
+ PRODUCT := @@PRODUCT@@
+diff --git a/vsock-only/Makefile b/vsock-only/Makefile
+index 93dd61d..9765696 100644
+--- a/vsock-only/Makefile
++++ b/vsock-only/Makefile
+@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r)
+ ifdef LINUXINCLUDE
+ HEADER_DIR = $(LINUXINCLUDE)
+ else
+-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
++HEADER_DIR = $(KERNEL_DIR)
+ endif
+
+-BUILD_DIR = $(HEADER_DIR)/..
++BUILD_DIR = $(KBUILD_OUTPUT)
+
+ DRIVER := vsock
+ PRODUCT := ws
diff --git a/app-emulation/vmware-modules/files/308-netdevice.patch b/app-emulation/vmware-modules/files/308-netdevice.patch
new file mode 100644
index 000000000000..35231a3205e3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/308-netdevice.patch
@@ -0,0 +1,24 @@
+diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h
+index 7a56304..9ff4548 100644
+--- a/vmnet-only/compat_netdevice.h
++++ b/vmnet-only/compat_netdevice.h
+@@ -47,6 +47,19 @@
+ # define net_device device
+ #endif
+
++/* it looks like these have been removed from the kernel 3.1
++ * probably because the "transition" is considered complete.
++ * so to keep this source compatible we just redefine them like they were
++ * previously
++ */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0)
++#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev
++ functions are available. */
++#define HAVE_FREE_NETDEV /* free_netdev() */
++#define HAVE_NETDEV_PRIV /* netdev_priv() */
++#define HAVE_NETIF_QUEUE
++#define HAVE_NET_DEVICE_OPS
++#endif
+
+ /*
+ * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting
diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
new file mode 100644
index 000000000000..98a4bd439ae4
--- /dev/null
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
+
+PV_MAJOR=$(get_major_version)
+PV_MINOR=$(get_version_component_range 2-3)
+
+DESCRIPTION="VMware kernel modules"
+HOMEPAGE="http://www.vmware.com/"
+
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pax_kernel +vmci +vsock"
+REQUIRED_USE="!vsock? ( !vmci )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ || ( =app-emulation/vmware-player-12.${PV_MINOR}*
+ =app-emulation/vmware-workstation-12.${PV_MINOR}* )"
+
+S=${WORKDIR}
+
+pkg_setup() {
+ CONFIG_CHECK="~HIGH_RES_TIMERS"
+ if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then
+ CONFIG_CHECK="${CONFIG_CHECK} BKL"
+ fi
+ if use vmci ; then
+ CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI"
+ else
+ CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI"
+ fi
+ if use vsock ; then
+ CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS"
+ else
+ CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS"
+ fi
+
+ linux-info_pkg_setup
+
+ linux-mod_pkg_setup
+
+ VMWARE_GROUP=${VMWARE_GROUP:-vmware}
+
+ VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock"
+ VMWARE_MODULE_LIST="vmblock vmmon vmnet"
+ use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci"
+ use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock"
+
+ VMWARE_MOD_DIR="${PN}-${PVR}"
+
+ BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}"
+
+ enewgroup "${VMWARE_GROUP}"
+
+ filter-flags -mfpmath=sse -mavx -mpclmul -maes
+ append-cflags -mno-sse # Found a problem similar to bug #492964
+
+ for mod in ${VMWARE_MODULE_LIST}; do
+ MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)"
+ done
+}
+
+src_unpack() {
+ cd "${S}"
+ for mod in ${VMWARE_MODULE_LIST_ALL}; do
+ tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar
+ done
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch"
+ epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch"
+ epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch"
+ use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch"
+ epatch "${FILESDIR}/${PV_MAJOR}-apic.patch"
+
+ kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch"
+ kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch"
+ kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch"
+ kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch"
+ kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch"
+ kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch"
+ kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch"
+ kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch"
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch"
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch"
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch"
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch"
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch"
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch"
+ kernel_is ge 4 01 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch"
+ kernel_is ge 4 02 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch"
+ kernel_is ge 4 02 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch"
+ kernel_is ge 4 03 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch"
+
+ # Allow user patches so they can support RC kernels and whatever else
+ epatch_user
+}
+
+src_install() {
+ linux-mod_src_install
+ local udevrules="${T}/60-vmware.rules"
+ cat > "${udevrules}" <<-EOF
+ KERNEL=="vmci", GROUP="vmware", MODE="660"
+ KERNEL=="vmw_vmci", GROUP="vmware", MODE="660"
+ KERNEL=="vmmon", GROUP="vmware", MODE="660"
+ KERNEL=="vsock", GROUP="vmware", MODE="660"
+ EOF
+ udev_dorules "${udevrules}"
+
+ if ! use vmci ; then
+ dodir /etc/modprobe.d/
+
+ cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF
+ # Support for vmware vmci in kernel module
+ alias vmci vmw_vmci
+ EOF
+
+ export installed_modprobe_conf=1
+ fi
+ if ! use vsock ; then
+ dodir /etc/modprobe.d/
+ cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF
+ # Support for vmware vsock in kernel module
+ alias vsock vmw_vsock_vmci_transport
+ EOF
+
+ export installed_modprobe_conf=1
+ fi
+}
+
+pkg_postinst() {
+ linux-mod_pkg_postinst
+ if [ "${installed_modprobe_conf}"x == "x" ] ; then
+ if [ -f "${ROOT}/etc/modprobe.d/vmware.conf" ] ; then
+ ewarn "Please check the /etc/modprobe.d/vmware.conf file and"
+ ewarn "possible conflicts when using vmci and/or vsock modules built"
+ ewarn "out of kernel"
+ fi
+ fi
+}
diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest
index 90b62101a8fa..998ca15fcc3c 100644
--- a/app-emulation/vmware-player/Manifest
+++ b/app-emulation/vmware-player/Manifest
@@ -1,3 +1,3 @@
-DIST VMware-Player-6.0.6-2700073.i386.bundle.tar 230184960 SHA256 f62c97771b9f9b3d62204cb72472bd3b4cf856f5bdc3fd7ea68f786127b4f98e SHA512 91ce0861eab7a122d9bca8f8899f18ed7f59effffb20ae2b6a4d1a021aa57cc179e0f8b7aebeeea857c10a8b31deffcb1649cb79e64a927bb80905746dbaaefd WHIRLPOOL 90c51b72ecdf1b1fa9575e74d196e5d3e25cc4433fc74df283ad57e5953d7671c848d2e816cd19ca7216c2af9065c092c29a66c3d42247cb952a1890d99458bf
-DIST VMware-Player-6.0.6-2700073.x86_64.bundle.tar 198164480 SHA256 090f93c404d01475b4fc55db529f14e88457bde40b20140b5133a43e391dd866 SHA512 abdb5a6e6162ec297bdea4616f40ff734967fb04838ed75103ad7051a6120e4d4510f9fc192bd874382885e48444af4b00fc2dcd5f6d05929c615e5c379ae212 WHIRLPOOL 386b3a2b928ddf4ce149c1738412c46e0292648e54537b1164197d89b5dd5d86448fbe659141c2ca8d6f55ccd709e629d60b20311c69333bd2b33162a59f3a88
+DIST VMware-Player-12.1.0-3272444.x86_64.bundle.tar 138854400 SHA256 ae124888e3cef2cb8d687d0029b32ddf56dca8314d125cad66539c16501a1787 SHA512 0766ff543c4d61ff842ee8aa7b7ef7ed13c1a8adaadef2872cdd47b8029fb0b794588d9d49e4ad8cd5919793663e465439d2b7d8782f72f28461f8a008141151 WHIRLPOOL d972d76ba01295ece11cfee89a138ecea00b512de93f1a279a4ef8444333e672e094216ccaa59a4a8b78432d8b49998addb0b0a0b1abc566f8ccaa7724f7f580
DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0
+DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6
diff --git a/app-emulation/vmware-player/files/vmware-10.0.rc b/app-emulation/vmware-player/files/vmware-12.1.rc
similarity index 69%
rename from app-emulation/vmware-player/files/vmware-10.0.rc
rename to app-emulation/vmware-player/files/vmware-12.1.rc
index 85ae7cdb0e76..2a827bc1ae31 100644
--- a/app-emulation/vmware-player/files/vmware-10.0.rc
+++ b/app-emulation/vmware-player/files/vmware-12.1.rc
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
+# $Header: $
depend() {
need localmount
@@ -14,9 +14,14 @@ start() {
@@BINDIR@@/vmware-usbarbitrator
eend $?
ebegin Starting VMware services
- modprobe -v vmci || modprobe -v vmw_vmci
+
+ # quiet for vmci because it may not be there
+ modprobe -vq vmci || modprobe -v vmw_vmci
eend $?
- modprobe -av vmmon vmci vsock vmblock vmnet
+
+ # vmci or vmw_vmci was loaded by the previous modprobe
+ # no need to do it here
+ modprobe -av vmmon vsock vmblock vmnet
eend $?
@@BINDIR@@/vmware-networks --start
eend $?
@@ -32,6 +37,8 @@ stop() {
ebegin Stopping VMware services
modprobe -rv vsock vmmon vmblock vmnet
eend $?
- modprobe -rv vmci || modprobe -rv vmw_vmci
+
+ # quiet for vmci because it may not be there
+ modprobe -rvq vmci || modprobe -rv vmw_vmci
eend $?
}
diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml
index 611b1a298386..734b5607fc74 100644
--- a/app-emulation/vmware-player/metadata.xml
+++ b/app-emulation/vmware-player/metadata.xml
@@ -6,6 +6,7 @@
Gentoo VMware Project
diff --git a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild
new file mode 100644
index 000000000000..90577d8377cf
--- /dev/null
+++ b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pax-utils systemd vmware-bundle
+
+MY_PN="VMware-Player"
+MY_PV=$(get_version_component_range 1-3)
+PV_MODULES="308.$(get_version_component_range 2-3)"
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-02"
+
+DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/player/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+ ${BASE_URI}${MY_P}.x86_64.bundle.tar
+ https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
+"
+
+LICENSE="vmware GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libs cups doc ovftool +vmware-tools"
+RESTRICT="mirror strip preserve-libs"
+
+BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
+
+BUNDLED_LIBS="
+ libXau.so.6
+ libXcomposite.so.1
+ libXcursor.so.1
+ libXdamage.so.1
+ libXdmcp.so.6
+ libXfixes.so.3
+ libXft.so.2
+ libXinerama.so.1
+ libXrandr.so.2
+ libXrender.so.1
+ libaio.so.1
+ libatk-1.0.so.0
+ libatkmm-1.6.so.1
+ libatspi.so.0
+ libcairo.so.2
+ libcairomm-1.0.so.1
+ libcrypto.so.1.0.1
+ libcurl.so.4
+ libdbus-1.so.3
+ libfontconfig.so.1
+ libfreetype.so.6
+ libfuse.so.2
+ libgailutil.so.18
+ libgcc_s.so.1
+ libgcrypt.so.11
+ libgdk-x11-2.0.so.0
+ libgdk_pixbuf-2.0.so.0
+ libgdkmm-2.4.so.1
+ libgio-2.0.so.0
+ libgiomm-2.4.so.1
+ libglib-2.0.so.0
+ libglibmm-2.4.so.1
+ libglibmm_generate_extra_defs-2.4.so.1
+ libgmodule-2.0.so.0
+ libgobject-2.0.so.0
+ libgpg-error.so.0
+ libgthread-2.0.so.0
+ libgtk-x11-2.0.so.0
+ libgtkmm-2.4.so.1
+ libpango-1.0.so.0
+ libpangocairo-1.0.so.0
+ libpangoft2-1.0.so.0
+ libpangomm-1.4.so.1
+ libpangox-1.0.so.0
+ libpangoxft-1.0.so.0
+ libpcsclite.so.1
+ libpixman-1.so.0
+ libpng12.so.0
+ librsvg-2.so.2
+ libsigc-2.0.so.0
+ libssl.so.1.0.1
+ libstdc++.so.6
+ libxml2.so.2
+ libz.so.1
+"
+
+BUNDLED_LIB_DEPENDS="
+ app-accessibility/at-spi2-core
+ dev-cpp/atkmm
+ dev-cpp/cairomm
+ dev-cpp/glibmm:2
+ dev-cpp/gtkmm:2.4
+ dev-cpp/pangomm
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/libaio
+ dev-libs/libgcrypt:11/11
+ dev-libs/libgpg-error
+ dev-libs/libsigc++:2
+ dev-libs/libxml2
+ dev-libs/openssl:0
+ gnome-base/librsvg:2
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libpng:1.2
+ net-misc/curl
+ sys-apps/dbus
+ sys-apps/pcsc-lite
+ sys-fs/fuse
+ sys-libs/zlib
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/libXau
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXfixes
+ x11-libs/libXft
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/pango
+ x11-libs/pangox-compat
+ x11-libs/pixman
+"
+
+# vmware should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/dbus-glib
+ dev-libs/expat
+ dev-libs/gmp:0
+ dev-libs/icu
+ dev-libs/json-c
+ dev-libs/libcroco
+ dev-libs/libffi
+ dev-libs/libgcrypt:0/20
+ dev-libs/libtasn1:0/6
+ dev-libs/nettle:0/6
+ gnome-base/gconf
+ gnome-base/libgnome-keyring
+ media-gfx/graphite2
+ media-libs/alsa-lib
+ media-libs/harfbuzz:0/0.9.18
+ media-libs/libart_lgpl
+ media-libs/libpng:0
+ media-libs/libvorbis
+ media-libs/mesa
+ net-dns/libidn
+ net-libs/gnutls
+ net-print/cups
+ sys-apps/tcp-wrappers
+ sys-apps/util-linux
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXtst
+ x11-libs/libXxf86vm
+ x11-libs/libdrm
+ x11-libs/libxcb
+ x11-libs/libxshmfence
+ x11-libs/startup-notification
+ x11-libs/xcb-util
+ x11-themes/hicolor-icon-theme
+ bundled-libs? (
+ media-libs/jbigkit:0/2.1
+ media-libs/tiff:3
+ virtual/jpeg:62
+ )
+ !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
+ !app-emulation/vmware-workstation
+"
+PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
+ vmware-tools? ( app-emulation/vmware-tools )"
+DEPEND=">=dev-util/patchelf-0.9"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+
+QA_PREBUILT="/opt/*"
+
+QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
+
+src_unpack() {
+ default
+ local bundle=${MY_P}.x86_64.bundle
+
+ local component; for component in \
+ vmware-player \
+ vmware-player-app \
+ vmware-player-setup \
+ vmware-vmx \
+ vmware-network-editor \
+ vmware-usbarbitrator
+ do
+ vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+ done
+
+ if use ovftool; then
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+ fi
+}
+
+clean_bundled_libs() {
+ einfo "Removing bundled libraries"
+ for libname in ${BUNDLED_LIBS} ; do
+ rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
+ done
+
+ rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
+
+ # Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
+ # (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
+ # Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
+ # in libcds.so to be able to use system libs.
+ pushd >/dev/null .
+ cd "${S}"/lib/lib/libcds.so
+ einfo "Patching libcds.so"
+ patchelf --replace-needed libssl.so.1.0.{1,0} \
+ --replace-needed libcrypto.so.1.0.{1,0} \
+ libcds.so
+ popd >/dev/null
+
+ # vmware-player seems to use a custom version of libgksu2.so, for this reason
+ # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
+ # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
+ # preserve-libs mechanism to be triggered when a system lib is available (but not required)
+ pushd >/dev/null .
+ cd "${S}"/lib/lib/libvmware-gksu.so
+ einfo "Patching libvmware-gksu.so"
+ patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
+ libvmware-gksu.so
+ popd >/dev/null
+}
+
+src_prepare() {
+ rm -f bin/vmware-modconfig
+ rm -rf lib/modules/binary
+ # Bug 459566
+ mv lib/libvmware-netcfg.so lib/lib/
+
+ if ! use bundled-libs ; then
+ clean_bundled_libs
+ fi
+
+ DOC_CONTENTS="
+/etc/env.d is updated during ${PN} installation. Please run:\n
+env-update && source /etc/profile\n
+Before you can use ${PN}, you must configure a default network setup.
+You can do this by running 'emerge --config ${PN}'.\n
+To be able to run ${PN} your user must be in the vmware group.\n
+You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
+"
+}
+
+src_install() {
+ local major_minor=$(get_version_component_range 1-2 "${PV}")
+
+ # revdep-rebuild entry
+ insinto /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+ doins "${T}"/10${PN}
+
+ # install the binaries
+ into "${VM_INSTALL_DIR}"
+ dobin bin/*
+
+ # install the libraries
+ insinto "${VM_INSTALL_DIR}"/lib/vmware
+ doins -r lib/*
+
+ # workaround for hardcoded search paths needed during shared objects loading
+ if ! use bundled-libs ; then
+ dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
+ # Bug 432918
+ dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
+ dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
+ fi
+
+ # install the ancillaries
+ insinto /usr
+ doins -r share
+
+ if use cups; then
+ exeinto $(cups-config --serverbin)/filter
+ doexe extras/thnucups
+
+ insinto /etc/cups
+ doins -r etc/cups/*
+ fi
+
+ if use doc; then
+ dodoc doc/*
+ fi
+
+ exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+ doexe vmware-config
+
+ # install ovftool
+ if use ovftool; then
+ cd "${S}"
+
+ insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+ doins -r vmware-ovftool/*
+
+ chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+ dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+ fi
+
+ # create symlinks for the various tools
+ local tool ; for tool in thnuclnt vmplayer{,-daemon} \
+ vmware-{acetool,modconfig{,-console},gksu,fuseUI} ; do
+ dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+ done
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+ # fix permissions
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
+ fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+
+ pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
+
+ # create the environment
+ local envd="${T}/90vmware"
+ cat > "${envd}" <<-EOF
+ PATH='${VM_INSTALL_DIR}/bin'
+ ROOTPATH='${VM_INSTALL_DIR}/bin'
+ EOF
+
+ use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
+
+ doenvd "${envd}"
+
+ # create the configuration
+ dodir /etc/vmware
+
+ cat > "${D}"/etc/vmware/bootstrap <<-EOF
+ BINDIR='${VM_INSTALL_DIR}/bin'
+ LIBDIR='${VM_INSTALL_DIR}/lib'
+ EOF
+
+ cat > "${D}"/etc/vmware/config <<-EOF
+ bindir = "${VM_INSTALL_DIR}/bin"
+ libdir = "${VM_INSTALL_DIR}/lib/vmware"
+ initscriptdir = "/etc/init.d"
+ authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+ gksu.rootMethod = "su"
+ VMCI_CONFED = "yes"
+ VMBLOCK_CONFED = "yes"
+ VSOCK_CONFED = "yes"
+ NETWORKING = "yes"
+ player.product.version = "${MY_PV}"
+ product.buildNumber = "${PV_BUILD}"
+ EOF
+
+ # install the init.d script
+ local initscript="${T}/vmware.rc"
+ sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+ "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
+ newinitd "${initscript}" vmware
+
+ # fill in variable placeholders
+ if use bundled-libs ; then
+ sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+ -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
+ fi
+ sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+ -e "/^Encoding/d" \
+ -i "${D}/usr/share/applications/vmware-player.desktop" || die
+
+ # install systemd unit files
+ systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+
+ readme.gentoo_create_doc
+}
+
+pkg_config() {
+ "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ readme.gentoo_print_elog
+
+ ewarn "${P} is using an old version of libgcrypt library which"
+ ewarn "is going to be soon removed from portage due to security reasons"
+ ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
+ ewarn "Until vmware is fixed upstream you're exposed to security issues!"
+}
+
+pkg_prerm() {
+ einfo "Stopping ${PN} for safe unmerge"
+ /etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild b/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild
deleted file mode 100644
index 2419f68fb029..000000000000
--- a/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/player/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
- x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar )
- amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
- "
-
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cups doc +vmware-tools"
-RESTRICT="strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
- dev-cpp/glibmm:2
- dev-cpp/gtkmm:2.4
- dev-cpp/libgnomecanvasmm:2.6
- dev-cpp/pangomm:1.4
- dev-libs/atk
- dev-libs/glib:2
- dev-libs/libaio
- dev-libs/libsigc++
- dev-libs/libxml2
- =dev-libs/openssl-0.9.8*
- dev-libs/xmlrpc-c
- gnome-base/libgnomecanvas
- gnome-base/libgtop:2
- gnome-base/librsvg:2
- gnome-base/orbit
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libart_lgpl
- =media-libs/libpng-1.2*
- net-misc/curl
- cups? ( net-print/cups )
- sys-devel/gcc
- sys-fs/fuse
- sys-libs/glibc
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libgksu
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango
- x11-libs/startup-notification
- !app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR}
- vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-src_unpack() {
- default
- local bundle=${A%.tar}
-
- local component ; for component in \
- vmware-player \
- vmware-player-app \
- vmware-vmx \
- vmware-usbarbitrator \
- vmware-network-editor \
- vmware-player-setup
- #vmware-ovftool
- do
- vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
- done
-}
-
-src_prepare() {
- rm -f bin/vmware-modconfig
- rm -rf lib/modules/binary
- # Bug 459566
- mv lib/libvmware-netcfg.so lib/lib/
-}
-
-clean_bundled_libs() {
- ebegin 'Removing superfluous libraries'
- # exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
- # see http://forums.gentoo.org/viewtopic-t-835867.html
- # must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
- ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
-libssl.so.0.9.8
-libgcr.so.0' | while read -r libname libpath ; do
- dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
- done
- eend
-}
-
-src_install() {
- # install the binaries
- into "${VM_INSTALL_DIR}"
- dobin bin/* || die "failed to install bin"
-
- # install the libraries
- insinto "${VM_INSTALL_DIR}"/lib/vmware
- doins -r lib/*
-
- # Bug 432918
- dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
- "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
- dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
- "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
- # install the ancillaries
- insinto /usr
- doins -r share
-
- if use cups; then
- exeinto $(cups-config --serverbin)/filter
- doexe extras/thnucups
-
- insinto /etc/cups
- doins -r etc/cups/*
- fi
-
- # install documentation
- if use doc; then
- dodoc doc/*
- fi
-
- exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
- doexe vmware-config
-
- # create symlinks for the various tools
- local tool ; for tool in thnuclnt vmplayer{,-daemon} \
- vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
- dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
- done
- dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
- dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
- # fix permissions
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
- fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-
- pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
-
- # create the environment
- local envd="${T}/90vmware"
- cat > "${envd}" <<-EOF
- PATH='${VM_INSTALL_DIR}/bin'
- ROOTPATH='${VM_INSTALL_DIR}/bin'
- EOF
- doenvd "${envd}" || die
-
- # create the configuration
- dodir /etc/vmware || die
-
- cat > "${D}"/etc/vmware/bootstrap <<-EOF
- BINDIR='${VM_INSTALL_DIR}/bin'
- LIBDIR='${VM_INSTALL_DIR}/lib'
- EOF
-
- cat > "${D}"/etc/vmware/config <<-EOF
- bindir = "${VM_INSTALL_DIR}/bin"
- libdir = "${VM_INSTALL_DIR}/lib/vmware"
- initscriptdir = "/etc/init.d"
- authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
- gksu.rootMethod = "su"
- VMCI_CONFED = "yes"
- VMBLOCK_CONFED = "yes"
- VSOCK_CONFED = "yes"
- NETWORKING = "yes"
- player.product.version = "${MY_PV}"
- product.buildNumber = "${PV_BUILD}"
- EOF
-
- # install the init.d script
- local initscript="${T}/vmware.rc"
-
- sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
- "${FILESDIR}/vmware-10.0.rc" > "${initscript}" || die
- newinitd "${initscript}" vmware || die
-
- # fill in variable placeholders
- sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
- -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
- -e "/^Encoding/d" \
- -i "${D}/usr/share/applications/${PN}.desktop" || die
-}
-
-pkg_config() {
- "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-
- ewarn "/etc/env.d was updated. Please run:"
- ewarn "env-update && source /etc/profile"
- ewarn ""
- ewarn "Before you can use vmware-player, you must configure a default network setup."
- ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
- einfo "Stopping ${PN} for safe unmerge"
- /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild
deleted file mode 100644
index 112860289931..000000000000
--- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils versionator fdo-mime gnome2-utils pax-utils systemd vmware-bundle
-
-MY_PN="VMware-Player"
-MY_PV=$(get_version_component_range 1-3)
-PV_MINOR=$(get_version_component_range 3)
-PV_BUILD=$(get_version_component_range 4)
-MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
-
-DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
-HOMEPAGE="http://www.vmware.com/products/player/"
-BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/"
-SRC_URI="
- amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
- "
-
-LICENSE="vmware GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="cups doc ovftool +vmware-tools"
-RESTRICT="strip"
-
-# vmware-workstation should not use virtual/libc as this is a
-# precompiled binary package thats linked to glibc.
-RDEPEND="dev-cpp/cairomm
- dev-cpp/glibmm:2
- dev-cpp/gtkmm:2.4
- dev-cpp/libgnomecanvasmm:2.6
- dev-cpp/pangomm:1.4
- dev-libs/atk
- dev-libs/glib:2
- dev-libs/libaio
- dev-libs/libsigc++
- dev-libs/libxml2
- =dev-libs/openssl-0.9.8*
- dev-libs/xmlrpc-c
- gnome-base/libgnomecanvas
- gnome-base/libgtop:2
- gnome-base/librsvg:2
- gnome-base/orbit
- media-libs/fontconfig
- media-libs/freetype
- media-libs/libart_lgpl
- =media-libs/libpng-1.2*
- net-misc/curl
- cups? ( net-print/cups )
- sys-devel/gcc
- sys-fs/fuse
- sys-libs/glibc
- sys-libs/zlib
- x11-libs/cairo
- x11-libs/gtk+:2
- x11-libs/libgksu
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango
- x11-libs/startup-notification
- !app-emulation/vmware-workstation"
-PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR}
- vmware-tools? ( app-emulation/vmware-tools )"
-
-S=${WORKDIR}
-VM_INSTALL_DIR="/opt/vmware"
-
-src_unpack() {
- default
- local bundle=${A%.tar}
-
- local component ; for component in \
- vmware-player \
- vmware-player-app \
- vmware-vmx \
- vmware-usbarbitrator \
- vmware-network-editor \
- vmware-player-setup
- do
- vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
- done
-
- use ovftool && \
- vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
-}
-
-src_prepare() {
- rm -f bin/vmware-modconfig
- rm -rf lib/modules/binary
- # Bug 459566
- mv lib/libvmware-netcfg.so lib/lib/
-}
-
-clean_bundled_libs() {
- ebegin 'Removing superfluous libraries'
- # exclude OpenSSL from unbundling until the AES-NI patch gets into the tree
- # see http://forums.gentoo.org/viewtopic-t-835867.html
- # must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new"
- ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8
-libssl.so.0.9.8
-libgcr.so.0' | while read -r libname libpath ; do
- dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}"
- done
- eend
-}
-
-src_install() {
- # install the binaries
- into "${VM_INSTALL_DIR}"
- dobin bin/* || die "failed to install bin"
-
- # install the libraries
- insinto "${VM_INSTALL_DIR}"/lib/vmware
- doins -r lib/*
-
- # Bug 432918
- dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \
- "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8
- dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \
- "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8
-
- # https://github.com/gentoo/vmware/issues/7
- dosym "${VM_INSTALL_DIR}"/lib/vmware/ /usr/$(get_libdir)/vmware
-
- # install the ancillaries
- insinto /usr
- doins -r share
-
- if use cups; then
- exeinto $(cups-config --serverbin)/filter
- doexe extras/thnucups
-
- insinto /etc/cups
- doins -r etc/cups/*
- fi
-
- # install documentation
- if use doc; then
- dodoc doc/*
- fi
-
- exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
- doexe vmware-config
-
- # install ovftool
- if use ovftool; then
- cd "${S}"
-
- insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
- doins -r vmware-ovftool/*
-
- chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
- dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
- fi
-
- # create symlinks for the various tools
- local tool ; for tool in thnuclnt vmplayer{,-daemon} \
- vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do
- dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
- done
- dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
- dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
-
- # fix permissions
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
- fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
- fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
-
- pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx
-
- # create the environment
- local envd="${T}/90vmware"
- cat > "${envd}" <<-EOF
- PATH='${VM_INSTALL_DIR}/bin'
- ROOTPATH='${VM_INSTALL_DIR}/bin'
- EOF
- doenvd "${envd}" || die
-
- # create the configuration
- dodir /etc/vmware || die
-
- cat > "${D}"/etc/vmware/bootstrap <<-EOF
- BINDIR='${VM_INSTALL_DIR}/bin'
- LIBDIR='${VM_INSTALL_DIR}/lib'
- EOF
-
- cat > "${D}"/etc/vmware/config <<-EOF
- bindir = "${VM_INSTALL_DIR}/bin"
- libdir = "${VM_INSTALL_DIR}/lib/vmware"
- initscriptdir = "/etc/init.d"
- authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
- gksu.rootMethod = "su"
- VMCI_CONFED = "yes"
- VMBLOCK_CONFED = "yes"
- VSOCK_CONFED = "yes"
- NETWORKING = "yes"
- player.product.version = "${MY_PV}"
- product.buildNumber = "${PV_BUILD}"
- EOF
-
- # install the init.d script
- local initscript="${T}/vmware.rc"
-
- sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
- "${FILESDIR}/vmware-11.${PV_MINOR}.rc" > "${initscript}" || die
- newinitd "${initscript}" vmware || die
-
- systemd_dounit "${FILESDIR}/vmware-usbarbitrator.service"
- systemd_dounit "${FILESDIR}/vmware-network.service"
-
- # fill in variable placeholders
- sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
- -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
- sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
- -e "/^Encoding/d" \
- -i "${D}/usr/share/applications/${PN}.desktop" || die
-}
-
-pkg_config() {
- "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-
- ewarn "/etc/env.d was updated. Please run:"
- ewarn "env-update && source /etc/profile"
- ewarn ""
- ewarn "Before you can use vmware-player, you must configure a default network setup."
- ewarn "You can do this by running 'emerge --config ${PN}'."
-}
-
-pkg_prerm() {
- einfo "Stopping ${PN} for safe unmerge"
- /etc/init.d/vmware stop
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index a9285ddbc7cd..84c6065fb659 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -2,7 +2,9 @@ DIST VMware-Workstation-10.0.6-2700073.i386.bundle.tar 281272320 SHA256 02b6c26b
DIST VMware-Workstation-10.0.6-2700073.x86_64.bundle.tar 252610560 SHA256 e29edcb0638f32bff81d372c9eaf54e663e3376cd1d89dbd4cfe4cab533398b2 SHA512 072de1da92cbef890707a6c4e3d5223fdc60e50a5166bb72b1ebc098d28c1a75b83ed65a29fdf1311e119e590560546e376909e1384f1eab05918500ec80ede4 WHIRLPOOL 3f4252abb6c87424b88fa34adc29e1927d1e6458beca65d9b290ff0c8ad4ccaf2945e2209670f8f8d4e84548d806c18fb23dc8380ec65452841e2c0bbcce89aa
DIST VMware-Workstation-11.1.2-2780323.x86_64.bundle.tar 259133440 SHA256 085b50175b253647d8b2cb188286d3cf9265ed246cc0deb3b142b0438ef5725f SHA512 1c43ebaa4f8b228ec00f24a263eddcbbad5c0c940cd67040e6e2275c3a4aab6c9e2e5ee96996ca4f007ff786ece978c5789214ad92479720182fc3153d7edbde WHIRLPOOL 60e359a1dcfe1178652d8c6be705dda4f2f31b109bf01d5b5b16dc03e26a649e8f1af2ffa03d68e9108646c98e9cad41c10a9452ea14950883f9162e57ac20ca
DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094
+DIST VMware-Workstation-12.1.0-3272444.x86_64.bundle.tar 170639360 SHA256 b15d2ae889465e6e080b84474ca49ebd6c21a0bce701a0f74d34b6e930869043 SHA512 bd64fe19ebb96b06cd34795dab46490cb0e1fe4822dbce4678185fb2cba3e921170feac7904771c14ece3450ddb0e86f5f4d03081551367b8c70afe77df3fab7 WHIRLPOOL 7d72352e272358c25fe49b05c4cdc5653bffef9e20cc2151a2f032fecb98eb7831a922d8dca0ce509d8944abeaff951e9ece8b11dac6782facc762e3b54c2aac
DIST VMware-Workstation-9.0.3-1410761.i386.bundle.tar 264908800 SHA256 dfe9aaa75987793eac096c0fbdb364f94e354ab668213774ea3e90d5ddcecdc0 SHA512 5d0943400cb1fefca20f1a81d3989bf5cdda5e123d1a70b09ebc20a56498d36f597ed7a0730d2f6f752c3c4baad2c86d5ef7691e8d245147d944c6f7e4e708b0 WHIRLPOOL 14a950f2deb03c3b7a088d4fb50378c7109330d89903965c28ead0be1e2223dbce05a628b1ea859215d31a8978f497bd8f807652cf266667d67893eaf2d7372b
DIST VMware-Workstation-9.0.3-1410761.x86_64.bundle.tar 232724480 SHA256 2612f8a523c9f23164d7557c105520bc6e010af82b3e6d4a3ada04d8ff03cbf0 SHA512 07923231e481550cb0348e40ef341c2d0682ac0daf6c8e0ada130c03113f43a37bf322e64fb9dc73511dea0fd2851f3cb4f5e755bbad4beba9e3cc4e69566070 WHIRLPOOL d979f2d9ef8888be89d5747c16e0db7ca45609cd9d77d84baf8485b4956f9e9f99bf46c33a2690b7b1fea851c0495ed0a06b36e3e69b51abfc11604d9a62fe4d
DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
DIST vmware-systemd-gentoo-01.tgz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513
+DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6
diff --git a/app-emulation/vmware-player/files/vmware-11.1.rc b/app-emulation/vmware-workstation/files/vmware-12.1.rc
similarity index 100%
rename from app-emulation/vmware-player/files/vmware-11.1.rc
rename to app-emulation/vmware-workstation/files/vmware-12.1.rc
diff --git a/app-emulation/vmware-workstation/files/vmware-server-12.1.rc b/app-emulation/vmware-workstation/files/vmware-server-12.1.rc
new file mode 100644
index 000000000000..a82b9009c109
--- /dev/null
+++ b/app-emulation/vmware-workstation/files/vmware-server-12.1.rc
@@ -0,0 +1,55 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ need localmount vmware
+ use net
+}
+
+checkconfig() {
+ # Check if certificates exist. If not, we need to generate them, ala sshd.
+ if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
+ mkdir -p @@ETCDIR@@/ssl
+ openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
+ chmod -R 600 @@ETCDIR@@/ssl
+ fi
+}
+
+start() {
+ checkconfig
+
+ ebegin Starting VMware Authentication Daemon
+ start-stop-daemon --start \
+ --exec @@PREFIX@@/sbin/vmware-authdlauncher
+ eend $?
+ ebegin Starting VMware Workstation Server
+ start-stop-daemon --start \
+ --pidfile /var/run/vmware/vmware-hostd.PID \
+ --exec @@BINDIR@@/vmware-hostd \
+ -- -a -d @@ETCDIR@@/hostd/config.xml
+
+ eend $?
+}
+
+stop() {
+ ebegin "Shutdown VMs in the AutoStart Sequence"
+ local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
+
+ if [ "x" != "x${HOHO_ADMIN}" ]; then
+ @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
+ fi
+ eend $?
+
+ ebegin Stopping VMware Workstation Server
+ start-stop-daemon --stop \
+ --pidfile /var/run/vmware/vmware-hostd.PID \
+ --exec @@BINDIR@@/vmware-hostd
+ eend $?
+ ebegin Stopping VMware Authentication Daemon
+ #start-stop-daemon --stop \
+ # --exec @@PREFIX@@/sbin/vmware-authdlauncher
+ killall @@PREFIX@@/sbin/vmware-authdlauncher
+ eend $?
+}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild
similarity index 99%
rename from app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild
rename to app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild
index 730645e8b42d..454367851d97 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="dev-cpp/cairomm
dev-libs/icu
dev-libs/expat
dev-libs/libaio
- =dev-libs/libgcrypt-1.5*
+ || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 )
dev-libs/libsigc++
dev-libs/libxml2
dev-libs/openssl:0.9.8
diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild
similarity index 99%
rename from app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r2.ebuild
rename to app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild
index 530e270810dc..5ef6f109e6a2 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild
@@ -25,7 +25,7 @@ LICENSE="vmware GPL-2"
SLOT="0"
KEYWORDS="-* ~amd64"
IUSE="cups bundled-libs doc ovftool server vix vmware-tools"
-RESTRICT="mirror strip preserve-libs"
+RESTRICT="mirror strip"
BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
@@ -82,7 +82,7 @@ BUNDLED_LIB_DEPENDS="
media-libs/freetype
sys-fs/fuse
x11-libs/gtk+:2
- =dev-libs/libgcrypt-1.5*
+ || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 )
x11-libs/gdk-pixbuf:2
dev-cpp/gtkmm:2.4
dev-libs/glib:2
diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild
new file mode 100644
index 000000000000..4f488fdc0745
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild
@@ -0,0 +1,549 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pam vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MINOR=$(get_version_component_range 3)
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-01"
+
+DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+ amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+ https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
+ "
+LICENSE="vmware GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="cups bundled-libs doc ovftool server vix vmware-tools"
+RESTRICT="mirror strip"
+
+BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
+
+BUNDLED_LIBS="
+ libXau.so.6
+ libXcomposite.so.1
+ libXcursor.so.1
+ libXdamage.so.1
+ libXdmcp.so.6
+ libXfixes.so.3
+ libXft.so.2
+ libXinerama.so.1
+ libXrandr.so.2
+ libXrender.so.1
+ libaio.so.1
+ libatk-1.0.so.0
+ libatkmm-1.6.so.1
+ libatspi.so.0
+ libcairo.so.2
+ libcairomm-1.0.so.1
+ libcurl.so.4
+ libdbus-1.so.3
+ libfontconfig.so.1
+ libfreetype.so.6
+ libfuse.so.2
+ libgailutil.so.18
+ libgdk-x11-2.0.so.0
+ libgcrypt.so.11
+ libgdk_pixbuf-2.0.so.0
+ libgdkmm-2.4.so.1
+ libgio-2.0.so.0
+ libgiomm-2.4.so.1
+"
+
+BUNDLED_LIB_DEPENDS="
+ x11-libs/libXau
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXfixes
+ x11-libs/libXft
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ dev-libs/libaio
+ dev-libs/atk
+ dev-cpp/atkmm
+ app-accessibility/at-spi2-core
+ x11-libs/cairo
+ dev-cpp/cairomm
+ net-misc/curl
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-fs/fuse
+ x11-libs/gtk+:2
+ || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 )
+ x11-libs/gdk-pixbuf:2
+ dev-cpp/gtkmm:2.4
+ dev-libs/glib:2
+ dev-cpp/glibmm:2
+"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="
+ dev-cpp/libgnomecanvasmm
+ dev-cpp/pangomm
+ dev-libs/icu
+ dev-libs/expat
+ dev-libs/libsigc++:2
+ dev-libs/libxml2
+ dev-libs/openssl:0
+ dev-libs/xmlrpc-c
+ gnome-base/libgnomecanvas
+ gnome-base/libgtop:2
+ gnome-base/librsvg:2
+ gnome-base/orbit
+ media-libs/libart_lgpl
+ media-libs/libpng:1.2
+ media-libs/libpng
+ media-libs/tiff:3
+ cups? ( net-print/cups )
+ sys-devel/gcc
+ sys-libs/glibc
+ sys-libs/zlib
+ x11-libs/libgksu
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXtst
+ x11-libs/pango
+ x11-libs/pangox-compat
+ x11-libs/startup-notification
+ x11-themes/hicolor-icon-theme
+ !app-emulation/vmware-player
+ !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
+ sys-apps/dbus
+"
+PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR}
+ vmware-tools? ( app-emulation/vmware-tools )"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+QA_PREBUILT="/opt/*"
+
+QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 /opt/vmware/lib/vmware/bin/vmware-vmx-stats /opt/vmware/lib/vmware/bin/vmware-vmx-debug /opt/vmware/lib/vmware/bin/vmware-vmx"
+
+src_unpack() {
+ default
+ local bundle
+ use amd64 && bundle=${MY_P}.x86_64.bundle
+ local component; for component in \
+ vmware-vmx \
+ vmware-player-app \
+ vmware-player-setup \
+ vmware-workstation \
+ vmware-network-editor \
+ vmware-network-editor-ui \
+ vmware-usbarbitrator \
+ vmware-vprobe
+ do
+ vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+ done
+
+ if use server; then
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+ fi
+
+ if use vix; then
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix
+ fi
+ if use ovftool; then
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+ fi
+}
+
+clean_bundled_libs() {
+ einfo Removing bundled libraries
+ for libname in ${BUNDLED_LIBS} ; do
+ rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
+ done
+}
+
+src_prepare() {
+ rm -f bin/vmware-modconfig
+ rm -rf lib/modules/binary
+ # Bug 459566
+ mv lib/libvmware-netcfg.so lib/lib/
+
+ if use server; then
+ rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+ fi
+
+ find "${S}" -name '*.a' -delete
+
+ if ! use bundled-libs ; then
+ clean_bundled_libs
+ fi
+
+ DOC_CONTENTS="
+/etc/env.d is updated during ${PN} installation. Please run:\n
+env-update && source /etc/profile\n
+Before you can use vmware workstation, you must configure a default network setup.
+You can do this by running 'emerge --config ${PN}'.\n
+To be able to run ${PN} your user must be in the vmware group.\n
+You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
+"
+}
+
+src_install() {
+ local major_minor=$(get_version_component_range 1-2 "${PV}")
+ local major_minor_revision=$(get_version_component_range 1-3 "${PV}")
+ local build=$(get_version_component_range 4 "${PV}")
+
+ # revdep-rebuild entry
+ insinto /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+ doins "${T}"/10${PN}
+
+ # install the binaries
+ into "${VM_INSTALL_DIR}"
+ dobin bin/*
+
+ # install the libraries
+ insinto "${VM_INSTALL_DIR}"/lib/vmware
+ doins -r lib/*
+
+ # Bug 432918
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 \
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.1.0.1
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 \
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.1.0.1
+
+ # install the ancillaries
+ insinto /usr
+ doins -r share
+
+ if use cups; then
+ exeinto $(cups-config --serverbin)/filter
+ doexe extras/thnucups
+
+ insinto /etc/cups
+ doins -r etc/cups/*
+ fi
+
+ insinto /etc/xdg
+ doins -r etc/xdg/*
+
+ # install documentation
+ doman man/man1/vmware.1.gz
+
+ if use doc; then
+ dodoc doc/*
+ fi
+
+ insinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+ doins vmware-config
+
+ # install vmware workstation server
+ if use server; then
+ dosbin sbin/*
+
+ cd "${S}"/vmware-workstation-server
+
+ # install binaries
+ into "${VM_INSTALL_DIR}"/lib/vmware
+ dobin bin/*
+
+ dobin "${FILESDIR}"/configure-hostd.sh
+
+ dobin "${FILESDIR}"/configure-hostd.sh
+
+ # install the libraries
+ insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+ doins -r lib/*
+
+ into "${VM_INSTALL_DIR}"
+ for tool in vmware-{hostd,wssc-adminTool} ; do
+ cat > "${T}/${tool}" <<-EOF
+ #!/usr/bin/env bash
+ set -e
+
+ . /etc/vmware/bootstrap
+
+ exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+ "${VM_INSTALL_DIR}/lib/vmware/lib" \\
+ "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+ "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+ EOF
+ dobin "${T}/${tool}"
+ done
+
+ insinto "${VM_INSTALL_DIR}"/lib/vmware
+ doins -r hostd
+
+ # create the configuration
+ insinto /etc/vmware/hostd
+ doins -r config/etc/vmware/hostd/*
+ doins -r etc/vmware/hostd/*
+
+ insinto /etc/vmware/ssl
+ doins etc/vmware/ssl/*
+
+ # pam
+ pamd_mimic_system vmware-authd auth account
+
+ # create directory for shared virtual machines.
+ keepdir "${VM_DATA_STORE_DIR}"
+ keepdir /var/log/vmware
+ fi
+
+ # install vmware-vix
+ if use vix; then
+ cd "${S}"/vmware-vix
+
+ # install the binary
+ into "${VM_INSTALL_DIR}"
+ dobin bin/*
+
+ # install the libraries
+ insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
+ doins -r lib/*
+
+ dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
+
+ # install headers
+ insinto /usr/include/vmware-vix
+ doins include/*
+
+ if use doc; then
+ dohtml -r doc/*
+ fi
+ fi
+
+ # install ovftool
+ if use ovftool; then
+ cd "${S}"
+
+ insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+ doins -r vmware-ovftool/*
+
+ chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+ dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+ fi
+
+ # create symlinks for the various tools
+ local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
+ vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do
+ dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+ done
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+ # fix permissions
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper}
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+ fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+ fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+ if use server; then
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool}
+ fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+ fperms 1777 "${VM_DATA_STORE_DIR}"
+ fi
+ if use vix; then
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+ fi
+
+ # create the environment
+ local envd="${T}/90vmware"
+ cat > "${envd}" <<-EOF
+ PATH='${VM_INSTALL_DIR}/bin'
+ ROOTPATH='${VM_INSTALL_DIR}/bin'
+ EOF
+
+ use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
+
+ doenvd "${envd}"
+
+ # create the configuration
+ dodir /etc/vmware
+
+ cat > "${D}"/etc/vmware/bootstrap <<-EOF
+ BINDIR='${VM_INSTALL_DIR}/bin'
+ LIBDIR='${VM_INSTALL_DIR}/lib'
+ EOF
+
+ cat > "${D}"/etc/vmware/config <<-EOF
+ bindir = "${VM_INSTALL_DIR}/bin"
+ libdir = "${VM_INSTALL_DIR}/lib/vmware"
+ initscriptdir = "/etc/init.d"
+ authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+ gksu.rootMethod = "su"
+ VMCI_CONFED = "yes"
+ VMBLOCK_CONFED = "yes"
+ VSOCK_CONFED = "yes"
+ NETWORKING = "yes"
+ player.product.version = "${major_minor_revision}"
+ product.version = "${major_minor_revision}"
+ product.buildNumber = "${build}"
+ product.name = "VMware Workstation"
+ workstation.product.version = "${major_minor_revision}"
+ EOF
+
+ if use vix; then
+ cat >> "${D}"/etc/vmware/config <<-EOF
+ vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
+ vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+ vix.config.version = "1"
+ EOF
+ fi
+
+ if use server; then
+ cat >> "${D}"/etc/vmware/config <<-EOF
+ authd.client.port = "902"
+ authd.proxy.nfc = "vmware-hostd:ha-nfc"
+ authd.soapserver = "TRUE"
+ EOF
+ fi
+
+ # install the init.d script
+ local initscript="${T}/vmware.rc"
+ sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+ "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript}
+ newinitd "${initscript}" vmware
+
+ if use server; then
+ # install the init.d script
+ local initscript="${T}/vmware-workstation-server.rc"
+ sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+ -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+ -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+ -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+ "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript}
+ newinitd "${initscript}" vmware-workstation-server
+ fi
+
+ # fill in variable placeholders
+ sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+ -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}}
+ sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+ -e "/^Encoding/d" \
+ -i "${D}/usr/share/applications/${PN}.desktop"
+ sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+ -e "/^Encoding/d" \
+ -i "${D}/usr/share/applications/vmware-player.desktop"
+ sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+ -e "/^Encoding/d" \
+ -i "${D}/usr/share/applications/vmware-netcfg.desktop"
+
+ if use server; then
+ # Configuration for vmware-workstation-server
+ local hostdUser="${VM_HOSTD_USER:-root}"
+ sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+ -i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+ # Shared VMs Path: [standard].
+ sed -e "s:##{DS_NAME}##:standard:g" \
+ -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+ -i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+ sed -e "s:##{HTTP_PORT}##:-1:g" \
+ -e "s:##{HTTPS_PORT}##:443:g" \
+ -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+ -i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+ # See vmware-workstation-server.py for more details.
+ sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+ -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+ -e "s:##{CFGDIR}##:/etc/vmware/:g" \
+ -e "s:##{ENABLE_AUTH}##:true:g" \
+ -e "s:##{HOSTDMODE}##:ws:g" \
+ -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+ -e "s:##{HOSTD_MOCKUP}##:false:g" \
+ -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+ -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+ -e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+ -e "s:##{LOGLEVEL}##:verbose:g" \
+ -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+ -e "s:##{PLUGINDIR}##:./:g" \
+ -e "s:##{SHLIB_PREFIX}##:lib:g" \
+ -e "s:##{SHLIB_SUFFIX}##:.so:g" \
+ -e "s:##{USE_BLKLISTSVC}##:false:g" \
+ -e "s:##{USE_CBRCSVC}##:false:g" \
+ -e "s:##{USE_CIMSVC}##:false:g" \
+ -e "s:##{USE_DIRECTORYSVC}##:false:g" \
+ -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+ -e "s:##{USE_DYNAMO}##:false:g" \
+ -e "s:##{USE_DYNSVC}##:false:g" \
+ -e "s:##{USE_GUESTSVC}##:false:g" \
+ -e "s:##{USE_HBRSVC}##:false:g" \
+ -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_HTTPNFCSVC}##:false:g" \
+ -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_NFCSVC}##:true:g" \
+ -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_OVFMGRSVC}##:true:g" \
+ -e "s:##{USE_PARTITIONSVC}##:false:g" \
+ -e "s:##{USE_SECURESOAP}##:false:g" \
+ -e "s:##{USE_SNMPSVC}##:false:g" \
+ -e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+ -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_VDISKSVC}##:false:g" \
+ -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+ -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+ -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+ -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+ -e "s:##{WORKINGDIR}##:./:g" \
+ -i "${D}/etc/vmware/hostd/config.xml" || die
+
+ sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+ -i "${D}/etc/vmware/hostd/environments.xml" || die
+
+ # @@VICLIENT_URL@@=XXX
+ sed -e "s:@@AUTHD_PORT@@:902:g" \
+ -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+ fi
+
+ # install systemd unit files
+ systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+
+ readme.gentoo_create_doc
+}
+
+pkg_config() {
+ "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ readme.gentoo_pkg_postinst
+}
+
+pkg_prerm() {
+ einfo "Stopping ${PN} for safe unmerge"
+ /etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
new file mode 100644
index 000000000000..d698aa8c0937
--- /dev/null
+++ b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
@@ -0,0 +1,628 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd vmware-bundle
+
+MY_PN="VMware-Workstation"
+MY_PV=$(get_version_component_range 1-3)
+PV_MODULES="308.$(get_version_component_range 2-3)"
+PV_BUILD=$(get_version_component_range 4)
+MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}"
+
+SYSTEMD_UNITS_TAG="gentoo-02"
+
+DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators"
+HOMEPAGE="http://www.vmware.com/products/workstation/"
+BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/"
+SRC_URI="
+ amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar )
+ https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz
+ "
+
+LICENSE="vmware GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="bundled-libs cups doc ovftool server vix +vmware-tools"
+RESTRICT="mirror strip"
+
+BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib
+
+BUNDLED_LIBS="
+ libXau.so.6
+ libXcomposite.so.1
+ libXcursor.so.1
+ libXdamage.so.1
+ libXdmcp.so.6
+ libXfixes.so.3
+ libXft.so.2
+ libXinerama.so.1
+ libXrandr.so.2
+ libXrender.so.1
+ libaio.so.1
+ libatk-1.0.so.0
+ libatkmm-1.6.so.1
+ libatspi.so.0
+ libcairo.so.2
+ libcairomm-1.0.so.1
+ libcrypto.so.1.0.1
+ libcurl.so.4
+ libdbus-1.so.3
+ libfontconfig.so.1
+ libfreetype.so.6
+ libfuse.so.2
+ libgailutil.so.18
+ libgcc_s.so.1
+ libgcrypt.so.11
+ libgdk-x11-2.0.so.0
+ libgdk_pixbuf-2.0.so.0
+ libgdkmm-2.4.so.1
+ libgio-2.0.so.0
+ libgiomm-2.4.so.1
+ libglib-2.0.so.0
+ libglibmm-2.4.so.1
+ libglibmm_generate_extra_defs-2.4.so.1
+ libgmodule-2.0.so.0
+ libgobject-2.0.so.0
+ libgpg-error.so.0
+ libgthread-2.0.so.0
+ libgtk-x11-2.0.so.0
+ libgtkmm-2.4.so.1
+ libpango-1.0.so.0
+ libpangocairo-1.0.so.0
+ libpangoft2-1.0.so.0
+ libpangomm-1.4.so.1
+ libpangox-1.0.so.0
+ libpangoxft-1.0.so.0
+ libpcsclite.so.1
+ libpixman-1.so.0
+ libpng12.so.0
+ librsvg-2.so.2
+ libsigc-2.0.so.0
+ libssl.so.1.0.1
+ libstdc++.so.6
+ libxml2.so.2
+ libz.so.1
+"
+
+BUNDLED_LIB_DEPENDS="
+ app-accessibility/at-spi2-core
+ dev-cpp/atkmm
+ dev-cpp/cairomm
+ dev-cpp/glibmm:2
+ dev-cpp/gtkmm:2.4
+ dev-cpp/pangomm
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/libaio
+ dev-libs/libgcrypt:11/11
+ dev-libs/libgpg-error
+ dev-libs/libsigc++:2
+ dev-libs/libxml2
+ dev-libs/openssl:0
+ gnome-base/librsvg:2
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libpng:1.2
+ net-misc/curl
+ sys-apps/dbus
+ sys-apps/pcsc-lite
+ sys-fs/fuse
+ sys-libs/zlib
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/libXau
+ x11-libs/libXcomposite
+ x11-libs/libXcursor
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXfixes
+ x11-libs/libXft
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/pango
+ x11-libs/pangox-compat
+ x11-libs/pixman
+"
+
+# vmware should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/dbus-glib
+ dev-libs/expat
+ dev-libs/gmp:0
+ dev-libs/icu
+ dev-libs/json-c
+ dev-libs/libcroco
+ dev-libs/libffi
+ dev-libs/libgcrypt:0/20
+ dev-libs/libtasn1:0/6
+ dev-libs/nettle:0/6
+ gnome-base/gconf
+ gnome-base/libgnome-keyring
+ media-gfx/graphite2
+ media-libs/alsa-lib
+ media-libs/harfbuzz:0/0.9.18
+ media-libs/libart_lgpl
+ media-libs/libpng:0
+ media-libs/libvorbis
+ media-libs/mesa
+ net-dns/libidn
+ net-libs/gnutls
+ net-print/cups
+ sys-apps/tcp-wrappers
+ sys-apps/util-linux
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXtst
+ x11-libs/libXxf86vm
+ x11-libs/libdrm
+ x11-libs/libxcb
+ x11-libs/libxshmfence
+ x11-libs/startup-notification
+ x11-libs/xcb-util
+ x11-themes/hicolor-icon-theme
+ bundled-libs? (
+ media-libs/jbigkit:0/2.1
+ media-libs/tiff:3
+ virtual/jpeg:62
+ )
+ !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} )
+ !app-emulation/vmware-player
+"
+PDEPEND="~app-emulation/vmware-modules-${PV_MODULES}
+ vmware-tools? ( app-emulation/vmware-tools )"
+DEPEND=">=dev-util/patchelf-0.9"
+
+S=${WORKDIR}
+VM_INSTALL_DIR="/opt/vmware"
+VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs"
+VM_HOSTD_USER="root"
+
+QA_PREBUILT="/opt/*"
+
+QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx"
+
+src_unpack() {
+ default
+ local bundle=${MY_P}.x86_64.bundle
+
+ local component; for component in \
+ vmware-workstation \
+ vmware-player-app \
+ vmware-player-setup \
+ vmware-vmx \
+ vmware-network-editor \
+ vmware-network-editor-ui \
+ vmware-usbarbitrator \
+ vmware-vprobe
+ do
+ vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}"
+ done
+
+ if use ovftool; then
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool
+ fi
+
+ if use server; then
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}"
+ fi
+
+ if use vix; then
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix
+ vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1200 vmware-vix
+ fi
+}
+
+clean_bundled_libs() {
+ einfo "Removing bundled libraries"
+ for libname in ${BUNDLED_LIBS} ; do
+ rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}"
+ done
+
+ rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs"
+
+ # Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1
+ # (needed by libcds.so) which seem to be compiled from openssl-1.0.1h.
+ # Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link
+ # in libcds.so to be able to use system libs.
+ pushd >/dev/null .
+ einfo "Patching libcds.so"
+ cd "${S}"/lib/lib/libcds.so || die
+ patchelf --replace-needed libssl.so.1.0.{1,0} \
+ --replace-needed libcrypto.so.1.0.{1,0} \
+ libcds.so || die
+ popd >/dev/null
+
+ # vmware-workstation seems to use a custom version of libgksu2.so, for this reason
+ # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED
+ # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage
+ # preserve-libs mechanism to be triggered when a system lib is available (but not required)
+ pushd >/dev/null .
+ einfo "Patching libvmware-gksu.so"
+ cd "${S}"/lib/lib/libvmware-gksu.so || die
+ patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \
+ libvmware-gksu.so || die
+ popd >/dev/null
+}
+
+src_prepare() {
+ rm -f bin/vmware-modconfig
+ rm -rf lib/modules/binary
+ # Bug 459566
+ mv lib/libvmware-netcfg.so lib/lib/
+
+ if use server; then
+ rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh}
+ fi
+
+ if ! use bundled-libs ; then
+ clean_bundled_libs
+ fi
+
+ DOC_CONTENTS="
+/etc/env.d is updated during ${PN} installation. Please run:\n
+env-update && source /etc/profile\n
+Before you can use ${PN}, you must configure a default network setup.
+You can do this by running 'emerge --config ${PN}'.\n
+To be able to run ${PN} your user must be in the vmware group.\n
+You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start.
+"
+}
+
+src_install() {
+ local major_minor=$(get_version_component_range 1-2 "${PV}")
+
+ # revdep-rebuild entry
+ insinto /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN}
+ doins "${T}"/10${PN}
+
+ # install the binaries
+ into "${VM_INSTALL_DIR}"
+ dobin bin/*
+
+ # install the libraries
+ insinto "${VM_INSTALL_DIR}"/lib/vmware
+ doins -r lib/*
+
+ # workaround for hardcoded search paths needed during shared objects loading
+ if ! use bundled-libs ; then
+ dosym /usr/$(get_libdir)/libglib-2.0.so.0 \
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0
+ # Bug 432918
+ dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1
+ dosym /usr/$(get_libdir)/libssl.so.1.0.0 \
+ "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1
+ fi
+
+ # install the ancillaries
+ insinto /usr
+ doins -r share
+
+ if use cups; then
+ exeinto $(cups-config --serverbin)/filter
+ doexe extras/thnucups
+
+ insinto /etc/cups
+ doins -r etc/cups/*
+ fi
+
+ if use doc; then
+ dodoc doc/*
+ fi
+
+ exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup
+ doexe vmware-config
+
+ # install vmware workstation server
+ if use server; then
+ dosbin sbin/*
+
+ cd "${S}"/vmware-workstation-server
+
+ # install binaries
+ into "${VM_INSTALL_DIR}"/lib/vmware
+ dobin bin/*
+
+ dobin "${FILESDIR}"/configure-hostd.sh
+
+ dobin "${FILESDIR}"/configure-hostd.sh
+
+ # install the libraries
+ insinto "${VM_INSTALL_DIR}"/lib/vmware/lib
+ doins -r lib/*
+
+ into "${VM_INSTALL_DIR}"
+ for tool in vmware-hostd wssc-adminTool ; do
+ cat > "${T}/${tool}" <<-EOF
+ #!/usr/bin/env bash
+ set -e
+
+ . /etc/vmware/bootstrap
+
+ exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\
+ "${VM_INSTALL_DIR}/lib/vmware/lib" \\
+ "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\
+ "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@"
+ EOF
+ dobin "${T}/${tool}"
+ done
+
+ insinto "${VM_INSTALL_DIR}"/lib/vmware
+ doins -r hostd
+
+ # create the configuration
+ insinto /etc/vmware/hostd
+ doins -r config/etc/vmware/hostd/*
+ doins -r etc/vmware/hostd/*
+
+ insinto /etc/vmware/ssl
+ doins etc/vmware/ssl/*
+
+ # pam
+ pamd_mimic_system vmware-authd auth account
+
+ # create directory for shared virtual machines.
+ keepdir "${VM_DATA_STORE_DIR}"
+ keepdir /var/log/vmware
+ fi
+
+ # install vmware-vix
+ if use vix; then
+ cd "${S}"/vmware-vix
+
+ # install the binary
+ into "${VM_INSTALL_DIR}"
+ dobin bin/*
+
+ # install the libraries
+ insinto "${VM_INSTALL_DIR}"/lib/vmware-vix
+ doins -r lib/*
+
+ dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so
+
+ # install headers
+ insinto /usr/include/vmware-vix
+ doins include/*
+
+ if use doc; then
+ dohtml -r doc/*
+ fi
+ fi
+
+ # install ovftool
+ if use ovftool; then
+ cd "${S}"
+
+ insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool
+ doins -r vmware-ovftool/*
+
+ chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin}
+ dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool
+ fi
+
+ # create symlinks for the various tools
+ local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \
+ vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity} ; do
+ dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}"
+ done
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware
+ dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu
+
+ # fix permissions
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks}
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config
+ fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount
+ fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats}
+ if use server; then
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool}
+ fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd
+ fperms 1777 "${VM_DATA_STORE_DIR}"
+ fi
+ if use vix; then
+ fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config
+ fi
+
+ # create the environment
+ local envd="${T}/90vmware"
+ cat > "${envd}" <<-EOF
+ PATH='${VM_INSTALL_DIR}/bin'
+ ROOTPATH='${VM_INSTALL_DIR}/bin'
+ EOF
+ use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}"
+
+ doenvd "${envd}"
+
+ # create the configuration
+ dodir /etc/vmware
+
+ cat > "${D}"/etc/vmware/bootstrap <<-EOF
+ BINDIR='${VM_INSTALL_DIR}/bin'
+ LIBDIR='${VM_INSTALL_DIR}/lib'
+ EOF
+
+ cat > "${D}"/etc/vmware/config <<-EOF
+ bindir = "${VM_INSTALL_DIR}/bin"
+ libdir = "${VM_INSTALL_DIR}/lib/vmware"
+ initscriptdir = "/etc/init.d"
+ authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd"
+ gksu.rootMethod = "su"
+ VMCI_CONFED = "yes"
+ VMBLOCK_CONFED = "yes"
+ VSOCK_CONFED = "yes"
+ NETWORKING = "yes"
+ player.product.version = "${MY_PV}"
+ product.buildNumber = "${PV_BUILD}"
+ product.version = "${MY_PV}"
+ product.name = "VMware Workstation"
+ workstation.product.version = "${MY_PV}"
+ EOF
+
+ if use vix; then
+ cat >> "${D}"/etc/vmware/config <<-EOF
+ vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware"
+ vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix"
+ vix.config.version = "1"
+ EOF
+ fi
+
+ if use server; then
+ cat >> "${D}"/etc/vmware/config <<-EOF
+ authd.client.port = "902"
+ authd.proxy.nfc = "vmware-hostd:ha-nfc"
+ authd.soapserver = "TRUE"
+ EOF
+ fi
+
+ # install the init.d script
+ local initscript="${T}/vmware.rc"
+ sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+ "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die
+ newinitd "${initscript}" vmware
+
+ if use server; then
+ # install the init.d script
+ local initscript="${T}/vmware-workstation-server.rc"
+ sed -e "s:@@ETCDIR@@:/etc/vmware:g" \
+ -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \
+ -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \
+ -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \
+ "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} || die
+ newinitd "${initscript}" vmware-workstation-server
+ fi
+
+ # fill in variable placeholders
+ if use bundled-libs ; then
+ sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \
+ -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die
+ fi
+ sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \
+ -e "/^Encoding/d" \
+ -i "${D}/usr/share/applications/vmware-player.desktop" || die
+ sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \
+ -e "/^Encoding/d" \
+ -i "${D}/usr/share/applications/vmware-workstation.desktop" || die
+ sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \
+ -e "/^Encoding/d" \
+ -i "${D}/usr/share/applications/vmware-netcfg.desktop" || die
+
+ if use server; then
+ # Configuration for vmware-workstation-server
+ local hostdUser="${VM_HOSTD_USER:-root}"
+ sed -e "/ACEDataUser/s:root:${hostdUser}:g" \
+ -i "${D}/etc/vmware/hostd/authorization.xml" || die
+
+ # Shared VMs Path: [standard].
+ sed -e "s:##{DS_NAME}##:standard:g" \
+ -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \
+ -i "${D}/etc/vmware/hostd/datastores.xml" || die
+
+ sed -e "s:##{HTTP_PORT}##:-1:g" \
+ -e "s:##{HTTPS_PORT}##:443:g" \
+ -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \
+ -i "${D}/etc/vmware/hostd/proxy.xml" || die
+
+ # See vmware-workstation-server.py for more details.
+ sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \
+ -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \
+ -e "s:##{CFGDIR}##:/etc/vmware/:g" \
+ -e "s:##{ENABLE_AUTH}##:true:g" \
+ -e "s:##{HOSTDMODE}##:ws:g" \
+ -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \
+ -e "s:##{HOSTD_MOCKUP}##:false:g" \
+ -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \
+ -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \
+ -e "s:##{LOGDIR}##:/var/log/vmware/:g" \
+ -e "s:##{LOGLEVEL}##:verbose:g" \
+ -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \
+ -e "s:##{PLUGINDIR}##:./:g" \
+ -e "s:##{SHLIB_PREFIX}##:lib:g" \
+ -e "s:##{SHLIB_SUFFIX}##:.so:g" \
+ -e "s:##{USE_BLKLISTSVC}##:false:g" \
+ -e "s:##{USE_CBRCSVC}##:false:g" \
+ -e "s:##{USE_CIMSVC}##:false:g" \
+ -e "s:##{USE_DIRECTORYSVC}##:false:g" \
+ -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \
+ -e "s:##{USE_DYNAMO}##:false:g" \
+ -e "s:##{USE_DYNSVC}##:false:g" \
+ -e "s:##{USE_GUESTSVC}##:false:g" \
+ -e "s:##{USE_HBRSVC}##:false:g" \
+ -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_HTTPNFCSVC}##:false:g" \
+ -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_NFCSVC}##:true:g" \
+ -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_OVFMGRSVC}##:true:g" \
+ -e "s:##{USE_PARTITIONSVC}##:false:g" \
+ -e "s:##{USE_SECURESOAP}##:false:g" \
+ -e "s:##{USE_SNMPSVC}##:false:g" \
+ -e "s:##{USE_SOLO_MOCKUP}##:false:g" \
+ -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_VDISKSVC}##:false:g" \
+ -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \
+ -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \
+ -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \
+ -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \
+ -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \
+ -e "s:##{WORKINGDIR}##:./:g" \
+ -i "${D}/etc/vmware/hostd/config.xml" || die
+
+ sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \
+ -i "${D}/etc/vmware/hostd/environments.xml" || die
+
+ # @@VICLIENT_URL@@=XXX
+ sed -e "s:@@AUTHD_PORT@@:902:g" \
+ -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die
+ fi
+
+ # install systemd unit files
+ systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target}
+
+ readme.gentoo_create_doc
+}
+
+pkg_config() {
+ "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ readme.gentoo_print_elog
+
+ ewarn "${P} is using an old version of libgcrypt library which"
+ ewarn "is going to be soon removed from portage due to security reasons"
+ ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)."
+ ewarn "Until vmware is fixed upstream you're exposed to security issues!"
+}
+
+pkg_prerm() {
+ einfo "Stopping ${PN} for safe unmerge"
+ /etc/init.d/vmware stop
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
index f1286411285e..92bea1d0e073 100644
--- a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
+++ b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="fpm apache2"
# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index f31dde2fbb05..8484380fe968 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1 +1,2 @@
+DIST openssl-1.0.2g-8.tar.gz 21497 SHA256 69e153c62a9a583a097c713be78fb19a7c494b248f1f502f7d47309109a2e105 SHA512 1b8c0cf8d21f2c9f2f32b4442e02a0832ab9cf9d4ec9943b20ec8363df916bfb218da26b9cbc79783090dea01a9b04accd797c3dada893ac767565ab32047eeb WHIRLPOOL 21e4f5ca6d38b31962d55f8e85d3f9e21615aa9f701567058d5638e0422f072cde4ea4227d3a426b20b4434392d2e3cfe85420c94d7d4d8de69639adcb00065e
DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1
diff --git a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
new file mode 100644
index 000000000000..b15751df985b
--- /dev/null
+++ b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_P="openssl-${PV/_p/-}"
+
+DESCRIPTION="c_rehash script written in POSIX shell for OpenSSL"
+HOMEPAGE="https://www.openssl.org/ https://github.com/pld-linux/openssl/"
+SRC_URI="https://github.com/pld-linux/openssl/archive/auto/th/${MY_P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="libressl"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:0 )
+"
+
+S="${WORKDIR}/openssl-auto-th-${MY_P}"
+
+src_prepare() {
+ SSL_CNF_DIR="/etc/ssl"
+ sed -i \
+ -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \
+ -e '1iOPENSSL=openssl' \
+ openssl-c_rehash.sh || die #416717
+}
+
+src_install() {
+ newbin openssl-c_rehash.sh c_rehash
+}
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index ba808a21b30f..d684d14707ef 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,11 +1,5 @@
-DIST ca-certificates_20140927.tar.xz 288824 SHA256 e582724ebb9d5d6fe02d02db1773c9ca76d3aaab4b15375a0d72e9abf88a65c5 SHA512 3cd08559c52aeba763a8ecc0333c7c20838db0111e52d9adf65719f14f858611271d61801a60fb3aea4e74be4a7903c1b462bf889172f5afb774280bb615b98b WHIRLPOOL e32e54b21109b7c44266480a6a5d78693b5ef7ffae1df595c4edfe2cce85d1cd29664e6d916c5bfffb965e4bb01fce6a8327a2ead5bb0ca7cdd8afd04346a270
-DIST ca-certificates_20141019.tar.xz 289092 SHA256 684902d3f4e9ad27829f4af0d9d2d588afed03667997579b9c2be86fcd1eb73a SHA512 5b0e8fb917f5642a5a2b4fde46a706db0c652ff3fb31a5053d9123a5b670b50c6e3cf2496915cc01c613dcbe964d6432f393c12d8a697baedfad58f9d13e568b WHIRLPOOL 6d3c0ccfbd4b1598ed529cb07390baaf741e24c8fd4762aa1786ada7188ec0c4e327513047bca2b93a488681e80b5a8fabc37b98b7f6e5e92cba62580c4cf74f
-DIST ca-certificates_20150426.tar.xz 303256 SHA256 37dbaa93ed64cc4ae93ac295f9248fbc741bd51376438cfb1257f17efab5494f SHA512 920dfc512c018c5338bf07b6a6afcb664d9bfba659d4233ca9e87471d5e0ed05de054c96f3d7e6091549aa6deb46106a79f7f982696081f9b2164e18133eb34d WHIRLPOOL 6d068fa13ffdb1b232b1cdb99063e52e52ee9f4cd44917f4eca263f36b5d4fa3c261b45bbf51143fc08965937adc477afd88c9a909300b619d42ae72b4c4acd9
DIST ca-certificates_20151214.tar.xz 293672 SHA256 59286e6403f482a24c672e09b810c7d089a73153d4772ff4a66e86053a920525 SHA512 acee5565aa7d1f0cc120a6abb6503e0ac4b4e12f5fd1cb12442ec1374ae1570ec6dc3a8f3a247fad6835a29d96e856f12c664f466e92344db3aa1ae6292a27ac WHIRLPOOL c03d214fb15a791c14f235c58296fb06f1408c98bb78049f58b3ebf7bc1c1cea4662f90a031d86de2548267feacf6a9e3fef957aa44a19e29e9a6ba803aaa3fa
DIST ca-certificates_20160104.tar.xz 293632 SHA256 09eb770122e23260316120c0cbbddc8a1d33e7147210ce44e146084d5d5abcdd SHA512 4291ba58057b66d56853162b71862832135eab6f444a5e2cf3dd1089495d44624246dc0c540871851fe9aaceb42054516309402525c8f16a88911d3af9c3518a WHIRLPOOL 8a45acdf2c0673156bc546808df5160ebbfc3a85d775cefa8918c5b64ea6ba905e89017689a407a20444f3e550133c2af228f4d4a878670af50d88fc4739edeb
DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
-DIST nss-3.17.2.tar.gz 6927414 SHA256 134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b SHA512 a3d165bb2c578e7b5d90349729e85a2fce09260d069093080c76cce3b8a996c6489232324fd6a0c69b959321bcdf5f1806054f165cd6ce851fe4ffeb2883ae7f WHIRLPOOL 01b3cc546aa2dd0974caa2267aa9874b01cf6096f307a114393ba5a98adc216e0f2b217631b89b20752be5881f70fc1a7e94e0e90618707d5f9b9d18fd55d859
-DIST nss-3.17.4.tar.gz 6924699 SHA256 1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79 SHA512 dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89 WHIRLPOOL bb6e1027c5237d12fe58b4c520536022d8d4e83183a78c3421fd46bf9c3503b1f0ca4644240e383f216ec1e5174c0ae4148372db68fb9f1c10275954559d5bbf
-DIST nss-3.19.tar.gz 6951461 SHA256 989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b SHA512 e428d206a4fd30087f275a33771a1d7e753b000e8fc3e7c746972a89d1b32300d3619f430ea15e870d82b3af52785d4dd36ae89c9c496f014f9f323ea373da14 WHIRLPOOL 3a8b58a8a28e31f65f40cfa6a9bd9ca2177a17552082d8de2189da6c92ff7ba9c90be13793666558a2bff609da738cb1f4313968077e1041b8f283d36005e76c
-DIST nss-3.20.tar.gz 6955552 SHA256 5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c SHA512 50f666209cadd4e463f98643ec67e35f4d1b88381e17db9eed7c67559b19799fcc27e49d72536f546d4c45bca2afa4664e5590f868775a4397a77111d68fc366 WHIRLPOOL 84f20e6764b3621762fcfcb9223a3861e1f5ff02078b19b7df2eb58430a5f96943d962dca2d3366b18cd434acf3d3be746242c5064497167d5671c50233834de
DIST nss-3.21.tar.gz 6978112 SHA256 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 SHA512 0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53 WHIRLPOOL 7504d83de606d61840e06cb855ea688eb022d5eef062bcb7ac4d1064db96b96e35ae4ce0aff9d389a2140a7c3b974aaa9a86ada52af1199d462fdb48b11b42e4
+DIST nss-3.23.tar.gz 7467001 SHA256 94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf SHA512 f3e388a415493685faa6df932e9e968af41ea2e8e4cba3fbd539c60177443e4042e8d2e2bfe74183552e14522d49048be2f80fbe038bdbd499971e82abf2cc32 WHIRLPOOL 77e22bd7a525c5b10723e1d5fb6db1e9d2efebfcdf9828aa79296f71c441c065201ecda56291f37790333d9b1d1e38fef1391a033382a885b83da31a646d6243
diff --git a/app-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild b/app-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild
deleted file mode 100644
index d5538e517c5d..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result. The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-# Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI="4"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
- # Compile from source ourselves.
- PRECOMPILED=false
- inherit versionator
-
- DEB_VER=$(get_version_component_range 1)
- NSS_VER=$(get_version_component_range 2-)
- RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
- # Debian precompiled version.
- PRECOMPILED=true
- inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
- ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
- cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" +cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
- # platforms like AIX don't have a good ar
- DEPEND+="
- kernel_AIX? ( app-arch/deb2targz )
- !/dev/null
- epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch
- popd >/dev/null
- fi
- fi
-
- epatch "${FILESDIR}"/${PN}-20110502-root.patch
- local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
- sed -i \
- -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
- -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
- usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- python_setup
- local d="${S}/${PN}/mozilla"
- # Grab the database from the nss sources.
- cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
- emake -C "${d}"
-
- # Now move the files to the same places that the precompiled would.
- mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla
- if use cacert ; then
- mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org}
- mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die
- mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die
- fi
- mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die
- else
- mv usr/share/doc/{ca-certificates,${PF}} || die
- fi
-
- (
- echo "# Automatically generated by ${CATEGORY}/${PF}"
- echo "# $(date -u)"
- echo "# Do not edit."
- cd usr/share/ca-certificates
- find * -name '*.crt' | LC_ALL=C sort
- ) > etc/ca-certificates.conf
-
- sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
- cp -pPR image/* "${D}"/ || die
- if ! ${PRECOMPILED} ; then
- cd ca-certificates
- doman sbin/*.8
- dodoc debian/README.* examples/ca-certificates-local/README
- fi
-
- echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
- doenvd 98ca-certificates
-}
-
-pkg_postinst() {
- if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
- # if the user has local certs, we need to rebuild again
- # to include their stuff in the db.
- # However it's too overzealous when the user has custom certs in place.
- # --fresh is to clean up dangling symlinks
- "${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}"
- fi
-
- local c badcerts=0
- for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
- ewarn "Broken symlink for a certificate at $c"
- badcerts=1
- done
- if [ $badcerts -eq 1 ]; then
- ewarn "Removing the following broken symlinks:"
- ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
- fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild b/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild
deleted file mode 100644
index 89bc13ec6d43..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result. The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-# Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI="4"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
- # Compile from source ourselves.
- PRECOMPILED=false
- inherit versionator
-
- DEB_VER=$(get_version_component_range 1)
- NSS_VER=$(get_version_component_range 2-)
- RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
- # Debian precompiled version.
- PRECOMPILED=true
- inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
- ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
- cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" +cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
- # platforms like AIX don't have a good ar
- DEPEND+="
- kernel_AIX? ( app-arch/deb2targz )
- !=dev-libs/openssl-1.0.1o
- sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
- DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
- # For the conversion to having it in CONFIG_PROTECT_MASK,
- # we need to tell users about it once manually first.
- [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
- || ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
- ${PRECOMPILED} || default
-
- mv ${PN}-*/ ${PN} || die
-
- # Do all the work in the image subdir to avoid conflicting with source
- # dirs in $WORKDIR. Need to perform everything in the offset #381937
- mkdir -p "image/${EPREFIX}"
- cd "image/${EPREFIX}" || die
-
- ${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- mkdir -p usr/sbin
- cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
- if use cacert ; then
- pushd "${S}"/nss-${NSS_VER} >/dev/null
- epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch
- popd >/dev/null
- fi
- fi
-
- epatch "${FILESDIR}"/${PN}-20141019-root.patch
- local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
- sed -i \
- -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
- -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
- usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- python_setup
- local d="${S}/${PN}/mozilla"
- # Grab the database from the nss sources.
- cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
- emake -C "${d}"
-
- # Now move the files to the same places that the precompiled would.
- mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla
- if use cacert ; then
- mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org}
- mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die
- mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die
- fi
- mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die
- else
- mv usr/share/doc/{ca-certificates,${PF}} || die
- fi
-
- (
- echo "# Automatically generated by ${CATEGORY}/${PF}"
- echo "# $(date -u)"
- echo "# Do not edit."
- cd usr/share/ca-certificates
- find * -name '*.crt' | LC_ALL=C sort
- ) > etc/ca-certificates.conf
-
- sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
- cp -pPR image/* "${D}"/ || die
- if ! ${PRECOMPILED} ; then
- cd ca-certificates
- doman sbin/*.8
- dodoc debian/README.* examples/ca-certificates-local/README
- fi
-
- echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
- doenvd 98ca-certificates
-}
-
-pkg_postinst() {
- if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
- # if the user has local certs, we need to rebuild again
- # to include their stuff in the db.
- # However it's too overzealous when the user has custom certs in place.
- # --fresh is to clean up dangling symlinks
- "${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}"
- fi
-
- local c badcerts=0
- for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
- ewarn "Broken symlink for a certificate at $c"
- badcerts=1
- done
- if [ $badcerts -eq 1 ]; then
- ewarn "Removing the following broken symlinks:"
- ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
- fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20141019.3.19-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20141019.3.19-r1.ebuild
deleted file mode 100644
index 309784df958d..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20141019.3.19-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result. The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-# Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI="4"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
- # Compile from source ourselves.
- PRECOMPILED=false
- inherit versionator
-
- DEB_VER=$(get_version_component_range 1)
- NSS_VER=$(get_version_component_range 2-)
- RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
- # Debian precompiled version.
- PRECOMPILED=true
- inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
- ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
- cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="libressl"
-${PRECOMPILED} || IUSE+=" +cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
- # platforms like AIX don't have a good ar
- DEPEND+="
- kernel_AIX? ( app-arch/deb2targz )
- !=dev-libs/openssl-1.0.1o:0 )
- libressl? (
- app-misc/c_rehash
- dev-libs/libressl
- )
- sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
- DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
- # For the conversion to having it in CONFIG_PROTECT_MASK,
- # we need to tell users about it once manually first.
- [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
- || ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
- ${PRECOMPILED} || default
-
- mv ${PN}-*/ ${PN} || die
-
- # Do all the work in the image subdir to avoid conflicting with source
- # dirs in $WORKDIR. Need to perform everything in the offset #381937
- mkdir -p "image/${EPREFIX}"
- cd "image/${EPREFIX}" || die
-
- ${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- mkdir -p usr/sbin
- cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
- if use cacert ; then
- pushd "${S}"/nss-${NSS_VER} >/dev/null
- epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch
- popd >/dev/null
- fi
- fi
-
- epatch "${FILESDIR}"/${PN}-20141019-root.patch
- local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
- sed -i \
- -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
- -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
- usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- python_setup
- local d="${S}/${PN}/mozilla"
- # Grab the database from the nss sources.
- cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
- emake -C "${d}"
-
- # Now move the files to the same places that the precompiled would.
- mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla
- if use cacert ; then
- mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org}
- mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die
- mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die
- fi
- mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die
- else
- mv usr/share/doc/{ca-certificates,${PF}} || die
- fi
-
- (
- echo "# Automatically generated by ${CATEGORY}/${PF}"
- echo "# $(date -u)"
- echo "# Do not edit."
- cd usr/share/ca-certificates
- find * -name '*.crt' | LC_ALL=C sort
- ) > etc/ca-certificates.conf
-
- sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
- cp -pPR image/* "${D}"/ || die
- if ! ${PRECOMPILED} ; then
- cd ca-certificates
- doman sbin/*.8
- dodoc debian/README.* examples/ca-certificates-local/README
- fi
-
- echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
- doenvd 98ca-certificates
-}
-
-pkg_postinst() {
- if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
- # if the user has local certs, we need to rebuild again
- # to include their stuff in the db.
- # However it's too overzealous when the user has custom certs in place.
- # --fresh is to clean up dangling symlinks
- "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
- fi
-
- local c badcerts=0
- for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
- ewarn "Broken symlink for a certificate at $c"
- badcerts=1
- done
- if [ $badcerts -eq 1 ]; then
- ewarn "Removing the following broken symlinks:"
- ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
- fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild b/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild
deleted file mode 100644
index 4551747385ca..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result. The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-# Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI="4"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
- # Compile from source ourselves.
- PRECOMPILED=false
- inherit versionator
-
- DEB_VER=$(get_version_component_range 1)
- NSS_VER=$(get_version_component_range 2-)
- RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
- # Debian precompiled version.
- PRECOMPILED=true
- inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
- ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
- cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" +cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
- # platforms like AIX don't have a good ar
- DEPEND+="
- kernel_AIX? ( app-arch/deb2targz )
- !=dev-libs/openssl-1.0.1o
- sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
- DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
- # For the conversion to having it in CONFIG_PROTECT_MASK,
- # we need to tell users about it once manually first.
- [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
- || ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
- ${PRECOMPILED} || default
-
- mv ${PN}-*/ ${PN} || die
-
- # Do all the work in the image subdir to avoid conflicting with source
- # dirs in $WORKDIR. Need to perform everything in the offset #381937
- mkdir -p "image/${EPREFIX}"
- cd "image/${EPREFIX}" || die
-
- ${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- mkdir -p usr/sbin
- cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
- if use cacert ; then
- pushd "${S}"/nss-${NSS_VER} >/dev/null
- epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch
- popd >/dev/null
- fi
- fi
-
- epatch "${FILESDIR}"/${PN}-20141019-root.patch
- local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
- sed -i \
- -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
- -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
- usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- python_setup
- local d="${S}/${PN}/mozilla"
- # Grab the database from the nss sources.
- cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
- emake -C "${d}"
-
- # Now move the files to the same places that the precompiled would.
- mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla
- if use cacert ; then
- mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org}
- mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die
- mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die
- fi
- mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die
- else
- mv usr/share/doc/{ca-certificates,${PF}} || die
- fi
-
- (
- echo "# Automatically generated by ${CATEGORY}/${PF}"
- echo "# $(date -u)"
- echo "# Do not edit."
- cd usr/share/ca-certificates
- find * -name '*.crt' | LC_ALL=C sort
- ) > etc/ca-certificates.conf
-
- sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
- cp -pPR image/* "${D}"/ || die
- if ! ${PRECOMPILED} ; then
- cd ca-certificates
- doman sbin/*.8
- dodoc debian/README.* examples/ca-certificates-local/README
- fi
-
- echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
- doenvd 98ca-certificates
-}
-
-pkg_postinst() {
- if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
- # if the user has local certs, we need to rebuild again
- # to include their stuff in the db.
- # However it's too overzealous when the user has custom certs in place.
- # --fresh is to clean up dangling symlinks
- "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
- fi
-
- local c badcerts=0
- for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
- ewarn "Broken symlink for a certificate at $c"
- badcerts=1
- done
- if [ $badcerts -eq 1 ]; then
- ewarn "Removing the following broken symlinks:"
- ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
- fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20150426.3.20.ebuild b/app-misc/ca-certificates/ca-certificates-20150426.3.20.ebuild
deleted file mode 100644
index c37ecde622b3..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20150426.3.20.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result. The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-# Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI="4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
- # Compile from source ourselves.
- PRECOMPILED=false
- inherit versionator
-
- DEB_VER=$(get_version_component_range 1)
- NSS_VER=$(get_version_component_range 2-)
- RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
- # Debian precompiled version.
- PRECOMPILED=true
- inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
- SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
- ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
- cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="libressl"
-${PRECOMPILED} || IUSE+=" +cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
- # platforms like AIX don't have a good ar
- DEPEND+="
- kernel_AIX? ( app-arch/deb2targz )
- !=dev-libs/openssl-1.0.1o:0 )
- libressl? (
- app-misc/c_rehash
- dev-libs/libressl
- )
- sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
- DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
- # For the conversion to having it in CONFIG_PROTECT_MASK,
- # we need to tell users about it once manually first.
- [[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
- || ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
- ${PRECOMPILED} || default
-
- mv ${PN}-*/ ${PN} || die
-
- # Do all the work in the image subdir to avoid conflicting with source
- # dirs in $WORKDIR. Need to perform everything in the offset #381937
- mkdir -p "image/${EPREFIX}"
- cd "image/${EPREFIX}" || die
-
- ${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- mkdir -p usr/sbin
- cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
- if use cacert ; then
- pushd "${S}"/nss-${NSS_VER} >/dev/null
- epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch
- popd >/dev/null
- fi
- fi
-
- epatch "${FILESDIR}"/${PN}-20150426-root.patch
- local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
- sed -i \
- -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \
- -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
- usr/sbin/update-ca-certificates || die
-
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-20150426-nss-certdata2pem-py3.patch #548374
-}
-
-src_compile() {
- cd "image/${EPREFIX}" || die
- if ! ${PRECOMPILED} ; then
- python_setup
- local d="${S}/${PN}/mozilla"
- # Grab the database from the nss sources.
- cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
- emake -C "${d}"
-
- # Now move the files to the same places that the precompiled would.
- mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla
- if use cacert ; then
- mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org}
- mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die
- mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die
- fi
- mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die
- else
- mv usr/share/doc/{ca-certificates,${PF}} || die
- fi
-
- (
- echo "# Automatically generated by ${CATEGORY}/${PF}"
- echo "# $(date -u)"
- echo "# Do not edit."
- cd usr/share/ca-certificates
- find * -name '*.crt' | LC_ALL=C sort
- ) > etc/ca-certificates.conf
-
- sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
- cp -pPR image/* "${D}"/ || die
- if ! ${PRECOMPILED} ; then
- cd ca-certificates
- doman sbin/*.8
- dodoc debian/README.* examples/ca-certificates-local/README
- fi
-
- echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
- doenvd 98ca-certificates
-}
-
-pkg_postinst() {
- if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
- # if the user has local certs, we need to rebuild again
- # to include their stuff in the db.
- # However it's too overzealous when the user has custom certs in place.
- # --fresh is to clean up dangling symlinks
- "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
- fi
-
- local c badcerts=0
- for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do
- ewarn "Broken symlink for a certificate at $c"
- badcerts=1
- done
- if [ $badcerts -eq 1 ]; then
- ewarn "Removing the following broken symlinks:"
- ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
- fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
index 440abcb6a3e3..b75b17428172 100644
--- a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild
@@ -57,16 +57,13 @@ fi
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
${PRECOMPILED} || IUSE+=" +cacert"
DEPEND=""
if ${PRECOMPILED} ; then
- # platforms like AIX don't have a good ar
- DEPEND+="
- kernel_AIX? ( app-arch/deb2targz )
- ! %l\n' -delete)"
fi
diff --git a/app-misc/ca-certificates/files/ca-certificates-20110502-root.patch b/app-misc/ca-certificates/files/ca-certificates-20110502-root.patch
deleted file mode 100644
index f3fcf5d593d4..000000000000
--- a/app-misc/ca-certificates/files/ca-certificates-20110502-root.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/usr/sbin/update-ca-certificates
-+++ b/usr/sbin/update-ca-certificates
-@@ -23,6 +23,8 @@
-
- verbose=0
- fresh=0
-+ROOT=""
-+RELPATH=""
- while [ $# -gt 0 ];
- do
- case $1 in
-@@ -30,6 +31,11 @@
- verbose=1;;
- --fresh|-f)
- fresh=1;;
-+ --root|-r)
-+ ROOT=$(readlink -f "$2")
-+ # needed as c_rehash wants to read the files directly
-+ RELPATH="../../.."
-+ shift;;
- --help|-h|*)
-- echo "$0: [--verbose] [--fresh]"
-+ echo "$0: [--verbose] [--fresh] [--root ]"
- exit;;
-@@ -37,11 +41,11 @@
- shift
- done
-
--CERTSCONF=/etc/ca-certificates.conf
--CERTSDIR=/usr/share/ca-certificates
--LOCALCERTSDIR=/usr/local/share/ca-certificates
-+CERTSCONF="$ROOT/etc/ca-certificates.conf"
-+CERTSDIR="$ROOT/usr/share/ca-certificates"
-+LOCALCERTSDIR="$ROOT/usr/local/share/ca-certificates"
- CERTBUNDLE=ca-certificates.crt
--ETCCERTSDIR=/etc/ssl/certs
-+ETCCERTSDIR="$ROOT/etc/ssl/certs"
-
- cleanup() {
- rm -f "$TEMPBUNDLE"
-@@ -66,7 +70,7 @@
- -e 's/,/_/g').pem"
- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
- then
-- ln -sf "$CERT" "$PEM"
-+ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM"
- echo +$PEM >> "$ADDED"
- fi
- cat "$CERT" >> "$TEMPBUNDLE"
-@@ -78,22 +82,22 @@
- if test -L "$PEM"
- then
- rm -f "$PEM"
-- echo -$PEM >> "$REMOVED"
-+ echo "-$PEM" >> "$REMOVED"
- fi
- }
-
--cd $ETCCERTSDIR
-+cd "$ETCCERTSDIR"
- if [ "$fresh" = 1 ]; then
- echo -n "Clearing symlinks in $ETCCERTSDIR..."
- find . -type l -print | while read symlink
- do
-- case $(readlink $symlink) in
-- $CERTSDIR*) rm -f $symlink;;
-+ case $(readlink "$symlink") in
-+ "$CERTSDIR"*) rm -f "$symlink";;
- esac
- done
- find . -type l -print | while read symlink
- do
-- test -f $symlink || rm -f $symlink
-+ test -f "$symlink" || rm -f "$symlink"
- done
- echo "done."
- fi
-@@ -102,12 +106,12 @@
-
- # Handle certificates that should be removed. This is an explicit act
- # by prefixing lines in the configuration files with exclamation marks (!).
--sed -n -e '/^$/d' -e 's/^!//p' $CERTSCONF | while read crt
-+sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read crt
- do
- remove "$CERTSDIR/$crt"
- done
-
--sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt
-+sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt
- do
- if ! test -f "$CERTSDIR/$crt"
- then
-@@ -146,14 +150,14 @@
-
- echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
-
--HOOKSDIR=/etc/ca-certificates/update.d
-+HOOKSDIR="$ROOT/etc/ca-certificates/update.d"
- echo -n "Running hooks in $HOOKSDIR...."
- VERBOSE_ARG=
- [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
--eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook
-+eval run-parts $VERBOSE_ARG --test -- \""$HOOKSDIR"\" | while read hook
- do
- ( cat $ADDED
-- cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
-+ cat $REMOVED ) | "$hook" || echo E: "$hook" exited with code $?.
- done
- echo "done."
-
diff --git a/app-misc/ca-certificates/files/ca-certificates-20141019-root.patch b/app-misc/ca-certificates/files/ca-certificates-20141019-root.patch
deleted file mode 100644
index 2b2a42c58ec5..000000000000
--- a/app-misc/ca-certificates/files/ca-certificates-20141019-root.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-add a --root option so we can generate with DESTDIR installs
-
---- a/usr/sbin/update-ca-certificates
-+++ b/usr/sbin/update-ca-certificates
-@@ -23,6 +23,8 @@
-
- verbose=0
- fresh=0
-+ROOT=""
-+RELPATH=""
- while [ $# -gt 0 ];
- do
- case $1 in
-@@ -30,18 +32,23 @@ do
- verbose=1;;
- --fresh|-f)
- fresh=1;;
-+ --root|-r)
-+ ROOT=$(readlink -f "$2")
-+ # needed as c_rehash wants to read the files directly
-+ RELPATH="../../.."
-+ shift;;
- --help|-h|*)
-- echo "$0: [--verbose] [--fresh]"
-+ echo "$0: [--verbose] [--fresh] [--root ]"
- exit;;
- esac
- shift
- done
-
--CERTSCONF=/etc/ca-certificates.conf
--CERTSDIR=/usr/share/ca-certificates
--LOCALCERTSDIR=/usr/local/share/ca-certificates
-+CERTSCONF="$ROOT/etc/ca-certificates.conf"
-+CERTSDIR="$ROOT/usr/share/ca-certificates"
-+LOCALCERTSDIR="$ROOT/usr/local/share/ca-certificates"
- CERTBUNDLE=ca-certificates.crt
--ETCCERTSDIR=/etc/ssl/certs
-+ETCCERTSDIR="$ROOT/etc/ssl/certs"
-
- cleanup() {
- rm -f "$TEMPBUNDLE"
-@@ -66,7 +73,7 @@ add() {
- -e 's/,/_/g').pem"
- if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ]
- then
-- ln -sf "$CERT" "$PEM"
-+ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM"
- echo +$PEM >> "$ADDED"
- fi
- # Add trailing newline to certificate, if it is missing (#635570)
-@@ -79,36 +86,36 @@ remove() {
- if test -L "$PEM"
- then
- rm -f "$PEM"
-- echo -$PEM >> "$REMOVED"
-+ echo "-$PEM" >> "$REMOVED"
- fi
- }
-
--cd $ETCCERTSDIR
-+cd "$ETCCERTSDIR"
- if [ "$fresh" = 1 ]; then
-- echo -n "Clearing symlinks in $ETCCERTSDIR..."
-+ printf "Clearing symlinks in $ETCCERTSDIR..."
- find . -type l -print | while read symlink
- do
-- case $(readlink $symlink) in
-- $CERTSDIR*) rm -f $symlink;;
-+ case $(readlink "$symlink") in
-+ "$CERTSDIR"*) rm -f "$symlink";;
- esac
- done
- find . -type l -print | while read symlink
- do
-- test -f $symlink || rm -f $symlink
-+ test -f "$symlink" || rm -f "$symlink"
- done
- echo "done."
- fi
-
--echo -n "Updating certificates in $ETCCERTSDIR... "
-+printf "Updating certificates in $ETCCERTSDIR... "
-
- # Handle certificates that should be removed. This is an explicit act
- # by prefixing lines in the configuration files with exclamation marks (!).
--sed -n -e '/^$/d' -e 's/^!//p' $CERTSCONF | while read crt
-+sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read crt
- do
- remove "$CERTSDIR/$crt"
- done
-
--sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt
-+sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt
- do
- if ! test -f "$CERTSDIR/$crt"
- then
-@@ -151,14 +158,14 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE"
-
- echo "$ADDED_CNT added, $REMOVED_CNT removed; done."
-
--HOOKSDIR=/etc/ca-certificates/update.d
--echo -n "Running hooks in $HOOKSDIR...."
-+HOOKSDIR="$ROOT/etc/ca-certificates/update.d"
-+printf "Running hooks in $HOOKSDIR...."
- VERBOSE_ARG=
- [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose
--eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook
-+eval run-parts $VERBOSE_ARG --test -- \""$HOOKSDIR"\" | while read hook
- do
- ( cat $ADDED
-- cat $REMOVED ) | $hook || echo E: $hook exited with code $?.
-+ cat $REMOVED ) | "$hook" || echo E: "$hook" exited with code $?.
- done
- echo "done."
-
diff --git a/app-misc/ca-certificates/files/ca-certificates-20150426-nss-certdata2pem-py3.patch b/app-misc/ca-certificates/files/ca-certificates-20150426-nss-certdata2pem-py3.patch
deleted file mode 100644
index d639aefb4c09..000000000000
--- a/app-misc/ca-certificates/files/ca-certificates-20150426-nss-certdata2pem-py3.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-https://bugs.debian.org/789753
-https://bugs.gentoo.org/548374
-
---- a/ca-certificates/mozilla/certdata2pem.py
-+++ b/ca-certificates/mozilla/certdata2pem.py
-@@ -31,7 +31,11 @@ objects = []
- # Dirty file parser.
- in_data, in_multiline, in_obj = False, False, False
- field, type, value, obj = None, None, None, dict()
--for line in open('certdata.txt', 'r'):
-+try:
-+ f = open('certdata.txt', 'r', encoding='utf-8')
-+except TypeError:
-+ f = open('certdata.txt', 'r')
-+for line in f:
- # Ignore the file header.
- if not in_data:
- if line.startswith('BEGINDATA'):
-@@ -53,7 +53,7 @@ for line in open('certdata.txt', 'r'):
- if type == 'MULTILINE_OCTAL':
- line = line.strip()
- for i in re.finditer(r'\\([0-3][0-7][0-7])', line):
-- value += chr(int(i.group(1), 8))
-+ value.append(int(i.group(1), 8))
- else:
- value += line
- continue
-@@ -70,13 +70,13 @@ for line in open('certdata.txt', 'r'):
- field, type = line_parts
- value = None
- else:
-- raise NotImplementedError, 'line_parts < 2 not supported.'
-+ raise NotImplementedError('line_parts < 2 not supported.')
- if type == 'MULTILINE_OCTAL':
- in_multiline = True
-- value = ""
-+ value = bytearray()
- continue
- obj[field] = value
--if len(obj.items()) > 0:
-+if len(obj) > 0:
- objects.append(obj)
-
- # Read blacklist.
-@@ -95,7 +95,7 @@ for obj in objects:
- if obj['CKA_CLASS'] not in ('CKO_NETSCAPE_TRUST', 'CKO_NSS_TRUST'):
- continue
- if obj['CKA_LABEL'] in blacklist:
-- print "Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']
-+ print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'])
- elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_TRUSTED_DELEGATOR',
- 'CKT_NSS_TRUSTED_DELEGATOR'):
- trust[obj['CKA_LABEL']] = True
-@@ -104,13 +104,13 @@ for obj in objects:
- trust[obj['CKA_LABEL']] = True
- elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_UNTRUSTED',
- 'CKT_NSS_NOT_TRUSTED'):
-- print '!'*74
-- print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']
-- print '!'*74
-+ print('!'*74)
-+ print("UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL'])
-+ print('!'*74)
- else:
-- print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
-+ print("Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \
- (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'],
-- obj['CKA_TRUST_EMAIL_PROTECTION'])
-+ obj['CKA_TRUST_EMAIL_PROTECTION']))
-
- for obj in objects:
- if obj['CKA_CLASS'] == 'CKO_CERTIFICATE':
-@@ -121,13 +121,19 @@ for obj in objects:
- .replace('(', '=')\
- .replace(')', '=')\
- .replace(',', '_')
-- bname = bname.decode('string_escape')
-- fname = bname + '.crt'
-+
-+ # this is the only way to decode the way NSS stores multi-byte UTF-8
-+ if bytes != str:
-+ bname = bname.encode('utf-8')
-+ bname = bname.decode('unicode_escape').encode('latin-1').decode('utf-8')
-+ fname = (bname + '.crt').encode('utf-8')
-+
- if os.path.exists(fname):
-- print "Found duplicate certificate name %s, renaming." % bname
-- fname = bname + '_2.crt'
-+ print("Found duplicate certificate name %s, renaming." % fname)
-+ fname = (bname + '_2.crt').encode('utf-8')
- f = open(fname, 'w')
- f.write("-----BEGIN CERTIFICATE-----\n")
-- f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64)))
-+ encoded = base64.b64encode(obj['CKA_VALUE']).decode('utf-8')
-+ f.write("\n".join(textwrap.wrap(encoded, 64)))
- f.write("\n-----END CERTIFICATE-----\n")
-
diff --git a/app-misc/mc/mc-4.8.15.ebuild b/app-misc/mc/mc-4.8.15.ebuild
index 6b004f738338..eca1a2171138 100644
--- a/app-misc/mc/mc-4.8.15.ebuild
+++ b/app-misc/mc/mc-4.8.15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml
index 767bb489283e..6fcce0a560fe 100644
--- a/app-misc/pwsafe/metadata.xml
+++ b/app-misc/pwsafe/metadata.xml
@@ -22,5 +22,6 @@
Nicolas Dade
pwsafe
+ nsd20463/pwsafe
diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r3.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r3.ebuild
new file mode 100644
index 000000000000..441d09f84ae3
--- /dev/null
+++ b/app-misc/pwsafe/pwsafe-0.2.0-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A Password Safe compatible command-line password manager"
+HOMEPAGE="http://nsd.dyndns.org/pwsafe/"
+SRC_URI="http://nsd.dyndns.org/pwsafe/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X readline"
+
+DEPEND="sys-libs/ncurses:0=
+ dev-libs/openssl:0=
+ readline? ( sys-libs/readline:0= )
+ X? ( x11-libs/libSM
+ x11-libs/libICE
+ x11-libs/libXmu
+ x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eapply -p0 "${FILESDIR}/${P}-cvs-1.57.patch"
+ eapply -p0 "${FILESDIR}/${P}-printf.patch"
+ eapply -p0 "${FILESDIR}/${P}-fake-readline.patch"
+ eapply -p0 "${FILESDIR}/${P}-man-page-option-syntax.patch"
+ eapply -p0 "${FILESDIR}/${P}-XChangeProperty.patch"
+ eapply_user
+}
+
+src_configure() {
+ econf $(use_with X x) $(use_with readline)
+}
+
+src_install() {
+ doman pwsafe.1
+ dobin pwsafe
+ dodoc README NEWS
+}
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index ba5576cb5085..8bd45b6b0b5a 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1 +1,2 @@
DIST qlcplus_4.10.2b.tar.gz 9711691 SHA256 1bcd2eef3e327714b3a83d0f0ff4695caa81bc1336f35abce29a047232b1a780 SHA512 d9716bcdd7289a0d5b94482ae3a7a4a047dc548c0a0b0b488c1f5af50280921a6769fe6479810862291d08508884a1403327be7722681a3a367ee3f77b895eab WHIRLPOOL 5b08afb4cac96926220140dba7283666829dc46e0fdcc517f28442c0b311febce81d0127adc3eaeb7bb3b7a570662558daa98a661acecd9b889e3669d8105ef8
+DIST qlcplus_4.10.3.tar.gz 9786835 SHA256 eb2de10c2f7200522188f879aa6a98ac6eeedf50e0cc888fb418e9b736a630d7 SHA512 32d951e465fd9dccbc28b9798dc1416e2dfa7741225cc535288fac0e2e0724568fbaf2345946b907af6696c430f2b58ca7d8640254cdc34ff0d1a20ef28d5292 WHIRLPOOL 08580bc6b81a603b2a8c14b086eacf2e63982b0684040ce9f39c8cfff05597c9367866d3f933f5f17e774ce99621f4c9ae30a6d831e06ec7d7a3502dc62b95bc
diff --git a/app-misc/qlcplus/qlcplus-4.10.3.ebuild b/app-misc/qlcplus/qlcplus-4.10.3.ebuild
new file mode 100644
index 000000000000..53690a723f06
--- /dev/null
+++ b/app-misc/qlcplus/qlcplus-4.10.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils qt4-r2 eutils virtualx
+
+DESCRIPTION="QLC+ - Q Light Controller Plus to control DMX interfaces"
+HOMEPAGE="http://www.qlcplus.org/"
+SRC_URI="http://www.${PN}.org/downloads/${PV}/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="dev-libs/glib:2
+ virtual/libusb:0
+ virtual/libusb:1
+ media-libs/alsa-lib
+ media-libs/libmad
+ media-libs/libsndfile
+ sci-libs/fftw:3.0
+ virtual/udev
+ || ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 )
+ qt4? ( dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtscript:4
+ dev-qt/qttest:4 )
+ qt5? ( dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5[widgets]
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5 )"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/b/}
+
+src_prepare() {
+ sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \
+ plugins/hid/hid.pro \
+ plugins/udmx/src/src.pro \
+ plugins/dmxusb/src/src.pro \
+ plugins/spi/spi.pro \
+ plugins/peperoni/unix/unix.pro || die
+}
+
+src_configure() {
+ use qt5 && eqmake5
+ use qt4 && eqmake4
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index e3ec0aa60b26..21c6e1321c94 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -334,3 +334,171 @@ DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_xh.tar.gz 504507 SHA256 9461e123
DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 575837 SHA256 80baa0e0c65810d037ec6def3737180e3089602edee768b19ffea45c1e3b1b3f SHA512 90bad9060f3105f770cd79bcf40b54ed59c3d120948572999549e97548c408a3a3b88aaa3f543b0b0b58e83c4dec7e26d20fe712f5bd55d47dc9a5784ae4f96f WHIRLPOOL 7aecfe70f811499f65bc9e79d5880b2af1e05a7b8e1a1ecdb1f5b2f2972b9474a994e30898ef8751ae4cad25656979d16d6713c32a537c52df57777a849021b4
DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 574284 SHA256 b13dcb164621479acecfa50dadcadd9df4738b959a11f097eda7589e7a5ec630 SHA512 e02eaae2039e5cc7576b674902cc90e28b488ffb27f84c83a03880cc79b950073e488577f2b45e56b87e737bf7714ce225531a4a542fd51d7feabff1264c2efc WHIRLPOOL b162a2259b92e73f44ad7a3723e75b89dd23cbdd7b550f96fd92719c84c69b05a67eb20cda40e6d7135ce8864bb3dad3b3245c91ae09310b0141c4bb0c04ac42
DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zu.tar.gz 505667 SHA256 f645c133a2076739388323481bb5ff7bf7a2fa34be9822d92b36c74cefdbe245 SHA512 accb79bf0b890d879966bc5f7c252bd876956ba7851d64e8fdc6546b8ffb5bbf5effa942c8988316d4d61e9d71b555ac7d2ac6c0d9934c638f38ee899efef91f WHIRLPOOL fe56e5a8298610036fb7a57c1736f2b6643328657ec86898fa20017027588848b5ed18d6660363cab6aa27ab3db5588bbf8ee344cdfde5d47d372b04104efd97
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_am.tar.gz 7607867 SHA256 125121749eb496a2311ba33e7cb5235d0cb84fe66b6d5b830039543321941036 SHA512 9bd9f7f1e2f690415f38666c53086c091580cb6132aef315276b73c80ec26146c8cc77902bc5aa0da9e50659916f93cb5f26408b7bd2afead060bcc42b202b08 WHIRLPOOL 6c9a70515e5ade56d8bdd4e8b7d05ea50fd33b8465ecb418f40a2cba51be5e9a3ba2ab8fc84631f8ecbb64056b9003b110ebad1135374433597a1b7baa5e252c
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ast.tar.gz 8093321 SHA256 d54b19fdfd05a4375fd3603e089d6c411a98e3049740a6d2055ec389c96b8335 SHA512 c3a90f8bc52cdb53bb23d2760f1fcaa486f29bad558aba72cd439ea8ef10f9d835eefba6b9ff58017ad777bd5131748bed8c17721f73a906deec34d42f32b95a WHIRLPOOL a1204639e6f3d7ff4282db4d7929a864cb158dff80b31a1c333603a514bcfca7c881afed7a8d0a9eafca6360f989172888a6125aa11fea0aac4df2a0e70489f4
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bg.tar.gz 8326106 SHA256 73a12f347da989e7cf46c54fe8eb53630d8b7311f3fbaf111715c30a0f080e72 SHA512 7bb5d98b1af8e2a96fb2fa9d2bdd996bf4a74c50b740ef0d5454a0bbbdf21a1af888193d8c0431710b7e11c62fcef71647fe002b529f3ea6c1bf0bee901039c1 WHIRLPOOL 91c558a4ede5c60e1be02d4925ada0bff1f9548ffb8aba544029850ddce5ecb194f629c70df96dad6ced5b58f7b54730041fa653233b13cebc7d6de6182819db
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn-IN.tar.gz 9832234 SHA256 2ab8b5d8c5e6cb61f2fb949d181ab06f5b6aa7d0a5edb33601952fe5ccc8bcb2 SHA512 f926d73e1c984c50d2e77e20d8c3849e8e101246bcefb69d079031565e60d43fd0561fc3b1620d81442d421af531300ceaf0834897067a6713e9ea69ec6ac846 WHIRLPOOL 652e0f4e8c484e78715d720165b98c368e4a31586534271d0f5c336d0cc9ab1b303adb3e705be75f9a4610fedea38a8d1629d7d2102c870f60c74c18ceffc70c
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn.tar.gz 9832584 SHA256 31bb5d697729bf7c1b06601f800d17c018fea40571b6e179d00decc2ee335817 SHA512 845e885b469fe49cb35219eba37860cb1323ea794cd1fef5bdb8db2c667255520d24a2ff9904bd1bd1f16f096c801e02e2d371d73fce9e507a591c7caf1b5c26 WHIRLPOOL 13a0fa5c5eb947e3fee94e6893273840d0cdb70808075d5e4186e180c9b9051b3cefa8c805d585828bc02e40173ca7312da0e88feafbf5dcbf4211c9c2645144
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bo.tar.gz 9494664 SHA256 21a56d05e4cc75b74f51c576fa7803bdb9912d6b039bd47f7f554369f2d0380b SHA512 c03cccc8c6bc10259dd4ca5187884a63a2747c504ed0cc532b937faa268ca44f1bdcc74a880b86c5df127d5b539f6f7da6608133e6aac7253767eeedca81414e WHIRLPOOL ddc861f2e4a272e0e95b355c08ac671bb045cbb7d0a0873d2c178a0b06ef6e9a351f137b75559a5572c5cfc0c9b16dd5ab31886ea25748f958bec19250af9622
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bs.tar.gz 7132765 SHA256 625ceb3d265bd5b461748bd8f4ba835d30a497d2c75a784c85e7e00bb6869731 SHA512 062672babaf1de1e89e57df89cf8956488cec880f31c63a86bcdc6b60e173e8fb096623103ce43e15fd9a36cfb1060851a1699ddf0c66d1b3e3932f9498c4ffd WHIRLPOOL fe786186e58c5ce9aa9edfdbfadb62e93d88243ff6655bf8c6bec7aff2ad8f6ade91046a9a10ee4df02928daa195a0fca08055c650fe6bcfb5d9d0885511467b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7965699 SHA256 fe587fde1e3d14f9bf0eba2f36b68af7156281fbdfe0382178ba1547ed787ea6 SHA512 79b88b5d65694198645b7f2577288fa732b603bd7af2bc187f60570796004b6ce1747b7d0e8cf7d06abac78209012e222423b86779e0d5f74905827344520ebf WHIRLPOOL a8bda959b6bb4674bf4313d7a055d707a31d14569d4749e36dbbd011eda0786ac59e12bc8d8d869e2f3b7ffbbab1f4703d0612c873dfd12f1ff4403c214e1987
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca.tar.gz 7953432 SHA256 eefa700b5088a02c873dddd81292b970e8014a8466a2f96d07f6ee700d0d8195 SHA512 5189b5269f1795694f1bc55fd1f997d7b6c5bf7e7f513bad82f0ac16dc0748af7156788af6e31007a599d8867860b4e4368389bdc82a6f24e9062a46798b65e4 WHIRLPOOL d64bd2e3df4e3717dba82d6d0ff530cd0b09c4950079daf6c656cd955f4ab3ca4fb3c5b10ffd74632570497619e9057dc4cfd8a51ef1f8f8414c9bf6b6c5c654
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_cs.tar.gz 7583110 SHA256 fec1b70012c11aa07edd824a8448504c47a92341f4d6f62f7ae9fe56eea6fdd8 SHA512 cac380e296c0a7ccd5d68af598a08026bbc95b002113a3aef5fed7ec9473cc650a3a072c8a2e064a320e7b0cdd59a30f168986f7f02fd04c9ac3e304f4b64541 WHIRLPOOL 94cc498fbab2b550d1a894cb12c465c1db5dacc012d159ea954ef7cfbef0970a64bc898bf0c45d1b4db588ad9402ec7681cac93ed6d942ae644be35c54b2ca5a
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_da.tar.gz 7585638 SHA256 986e344d6f9b8b51a8bd93d44dc854508fb5946bb27ce213bfcc489df3cbdb1c SHA512 c169a847067ec307a3a1b7fc9015079754983d5fd38f41845f831143462c6fd838340e0980177c17e83c54aad063d522c259b8cd5fd3cf693e1e7e7ab10d2c4e WHIRLPOOL 839e68befaebbc9c88ca122464f0a9a631a1b21d02671d2d0046ad67a614e0a388461e635181ee72f413f128ab6c250fafd194669301eaf168caefcc51fceea9
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_de.tar.gz 8143595 SHA256 1601c98b948d43e65db54b3a262155e39d3d72bdbb0556cd9658594f8207a245 SHA512 0dbf7c11fb722d167de124fe34b9432c99972eb919e03bb8663fd582bb54c566db9d3e0f113770906e1bf1ea6277dc0fb5c68392096f35a6a700b511ecfce9f5 WHIRLPOOL 45f66ed4b804cc20b4bea495dba96b5bc1e6006a908920b88919c3bd7b62196e9d38ffbcce1cf741dfd20a6527924ab6f084617f2f3deba37e31019b10802a91
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_dz.tar.gz 10386387 SHA256 fa8a03664b0d59cd85698d24bf48cc50e780b6de4d9644058cc98180c0de4798 SHA512 050e8a16dc9889da6dd5a8ac27741f166e08642776ee9fd2c6b3926ff627a64383caebef5a6129137eb6ca459766c751367debca7e93220e1bfee56d8d0dfd55 WHIRLPOOL defce13491ab39ba3e1f2c97d46c2b59d822afe94e21594d4d4313346814e6e54e4b9f0767d1baf47b5233024967a2bf74ec0170c71153122ce57b5fbda417c3
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_el.tar.gz 8975332 SHA256 180e8d9b63c3cc4470714fc22c9fcf9bb2d4851855478cf78b5be81db7adf152 SHA512 d50e149233fe2525481e67046e704eaa61af7a81969f7d4799ec963ed42f4c1497e4830b8eafdb32ff79dd9ed7b0392da888055534275d7fe3729f058db37a2e WHIRLPOOL d655cd8add1bc8e938d561496b31393b3ec101db60b47de8f88cb3d16864475656b33555a3a5f95f671a84ec9afaade18bf39cc2950188da882fd6469c3a1a12
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-GB.tar.gz 6443077 SHA256 c8455ce396f6796bf9db1c2c58a25aa795cc289afb553a13e80bd2f0d9652685 SHA512 c5877c3086933e1acfc5431c9aa1d6700b4e7435023518905a228cdd3c4d01bf685d37d5dd9c520fbc4c5541eb15f074d02af37f1d3aced59f2c26d960911bf7 WHIRLPOOL 253d7d1bb12534ab94aaf1732f27a95e0a3f7018a6df226335370420f86cdc3ad3043c6074e6658bb341c4ec8d32e935e5cf888f45e0bff83959164d1558e4d2
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-US.tar.gz 6487145 SHA256 edb6122e2fba4a2ee936c5f3e8a36f656791e27232fec2406b9da318dc3f03f4 SHA512 7b034701fc963f32c60e3abf110da310e5bb7dfccfbe3d74b1ca1cfd5f6d1a5c99dccb29fcde22d1c9d9d1de248e675c8424783a3239e57e264ea32d282a1307 WHIRLPOOL 0f48988f278bd32595057142ad92b9057ad9af4fd63dce7c2a374a0aa86d41d9f8642b8124d5e91ec9460aa00e6b952f05cdb2f285bce911159acc0c0ceb37c1
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-ZA.tar.gz 6432513 SHA256 ef78d7e7d67e445855cc2fe42d374a989ab0aac995babfa14db87c509b0467c2 SHA512 1596ab9bc496d24b42856728c51697e29b4f223f2ef79ac29c561ac66cf1990981560597833a50b30df92b29bd8b92911f56ff2df636b2ef1463cd512db2129a WHIRLPOOL 614b0c666a9d6de399b0b907c72f16cedcfce6428d5ad61cb262406a8d0fccb8cce4f1af8547be26685c4e6baed4fc76f586fe3efe65176a302e4a65881393db
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eo.tar.gz 7014360 SHA256 ab00bb010ed020b811a863c85c886c2048564b125e128f371e678b8436598b1b SHA512 69f87b25cfdf9467299300545f45260b6eece8005f40d7932845924b19bc0c608fa391e8cfd39d35eb4c8db73eb66782d7ee30f3ea74c7fae44cd1ffdefa7894 WHIRLPOOL 64b05da37a9adccaccaaee6d2b0b149fa7d5bdd1f2f25a6dcd6fab04cc9c4e910c116831d3ecb209116b03deb9233e41468f21c154cc1c6802beacf2f25323f1
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_es.tar.gz 7998096 SHA256 863e5b2d9eeb96648a0f51ad58593c0a3f1a36afd437338481d973bf4cb1a62c SHA512 05c074a580d0f1720cbfcf09153732a6d4a31702d9643e98b4b283fa75a5c540aad7b39c6d86b42cd63fb9868d7c07388a7db2b118a7035d8da0c89b797a907d WHIRLPOOL 2a109f6c0609177455265d17e58d088da8fd051a75534dab02439210d1e2eb8ff96fde1d7e385d4844273b79cee3e8f3ca2b191ca9fa9a592695c09ad5be77b2
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_et.tar.gz 7514720 SHA256 2d2892192da0c843e124a8e99fa8d7dc39c92e13c15e50dc0d91672a2865461e SHA512 dce7db9d41006f243a384eac1f0b6663e9304d064ffdcd8c93782f6193a04f5c68f8bbfde3bd4fe32d5e83a7ce760e2a12d13b90c929a343270dd183f06409ed WHIRLPOOL b6291bce316dc9728e3de8c2de4c98f5e2f03785bdac38bafa28dc19ec65602353203243156fd2f15f77b17d0b8b537dae77c9cf44983a95a8e2a361e76bb13a
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eu.tar.gz 7658863 SHA256 ec97e110c44abc3faede1d1efe71c549f65e59a118da601777a83627b855ac89 SHA512 9b5ce375d2ddf261858cebd9d92c9bee4f0ee7c7d6ff0df2bba843f2e9f486e2e757d22a296fe8244e74c58247c7bb5bbaaacf9afae640b335abeb0e70a4787a WHIRLPOOL 5c804477489d4071ff1f4259cf4d1269ec25d92bbc74c8fc34a70f570dd6fafa47725ce4945799724deeaed5caec265e2f11f72ee75063b05e823a4201371600
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fi.tar.gz 7796724 SHA256 a370ef15288a3bd094e85ecaedeae09657551b3a0e03be8fe3a88e4b1dc46366 SHA512 7969c1faefdf78744cb38359e4ad92c7d0face00db80c74eeef0defe5a1e35a9c1fdab47154a4f1e3304f800ac2f9f427f8ef1ec2f4b53ff06f74a7bbdbd743e WHIRLPOOL d881c3bc063b81264aeb33c5bc4a26860fdb3f8b982c06b4236ca264d01b5ee4615fe4207c4b4b7fce331a74077c25b1ea86214e6f600bbdf53dc1a0d9f72b97
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fr.tar.gz 8182528 SHA256 5dd4e9909dc6b05a10554af6999651e980b18160fd287e98f87bc040504d8e8d SHA512 2ee299530a072e43b49e40f83a1ddced132d3e341c8181573abf487d367d8dffda39bf026fa09c3bfe19f479f93f27a8527ced5c5c2a29d85475777a0b16b15e WHIRLPOOL 4227abc7c70039219851c3596cdd890a2b146fdbe80f00d5de056bc2f404358d4cba6bf7fc136ac0ffec3b2ca84f5e7b9b947aca26a2f4b1ecb8442041b4acc5
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gl.tar.gz 7733160 SHA256 f603b1e597a380548a71ae1a01259e244479913bc70ae0b5c831df507738cce1 SHA512 f8d236b967cdfb92e0e23488094996bb775fadee1e3418eded99ce63ef72e7c05da9f9be0665c1c2f276344296fedebfb07caa78f2e819e8bcaa14eee019c7b8 WHIRLPOOL 7e906c56082cc11ca97157210ea2089fc57c41d3b4da47806a84a7bd6a9ead5f93185bab019896776190eb16633b3dd91292517fd2c94ce0e7a50c7fcb4425d2
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gu.tar.gz 6654863 SHA256 7153c816db7e43f858258ef7d83681ccf16c0e4786dc58116e2c2a73cc60cef2 SHA512 4be092bbc8bf4481a69248687a20870e4ba632f061c50e8763c5ef1e1e81a530055457535f81107b49628eafe0595c68482be10fd7dfd7c1343fa1d94eac52f1 WHIRLPOOL 95b6ff163eea8a201157b287640a1d38ae2552a792855e59c59fb6ab4d671020fd2cacd39efdae56e8cad5bb4bf43a59f3eb0033895e76ab5a3d74caa675c992
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_he.tar.gz 6270536 SHA256 1b72aaf46277fd169b83df703f49d8fccb4089b28b6a915e9c80d5300d79a388 SHA512 c2d6b4dec7955c431dac0594409652b3ecac8f59440b7c0446e71e10af90c4398dc081796e089cab8a908d1473b86403405cc9ccc10d5df6895c477576fe6418 WHIRLPOOL 5a280e9a7ca4fd80ab24af57867f17c46f29619e1c88ecedf6920e471ac5eb92527d3493319bc9f898638e5b4a12503ce0f16270dc2919c3725ba3d169fcad18
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hi.tar.gz 7334900 SHA256 9b2d9d3ae05d06fc0dc4edb3741b346eb750f51c35a6198da8397c3a90186166 SHA512 0e4666d70599d0bab4b34044120260f13e300412f7a925b35fc4fc2ae7185dcca57a401aa4c74e84df522fb48e4acb66aa14d7fcc49d2ed72a073910085b0911 WHIRLPOOL 132defb8782b0393bdfa7e7917b104877c360c85db81b34bb2092fabc995f4198fee5b7da9e6f367dd82fa116d687d6ebe8262cf4e09d2b90178d65dbbbc6e18
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hr.tar.gz 6818979 SHA256 ffc062b67d98069ca63c208632ae44f844e98180d2e211ba21d321bf97cd0e12 SHA512 5a60a28c163a275ebd80f6cbcfff6910a6babf9a6aaf5e4af7d9b0d0f27bf93721dc70a5a910a4ddfa66f83415ed9b4337ad941b0f992a298d5005772575c6bc WHIRLPOOL 7ac786140b0375e3d2b3cb8b61613af68393d055510187fdc00a71efe263ac7b9740aa3d0a6ffa66d92016f8d6fcfd4e33148b5468c74f176aa92af2cf061aa4
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hu.tar.gz 8010379 SHA256 7f0498ef23702874b35f1e55a9c6e4f42be41afb787447b3d943c5b73ecb4793 SHA512 248fffc4bb890089dc843e62716801010b8406055d68b8405b014790c37ab7dbe5308f82bb7836bbfee22668bb094e1fe33f830d0d9efd33825e24d274d5278b WHIRLPOOL d59249b7d9f0d9eacb8b76471b88b86154e7a0743d5f21e43e18d39bd448ceef39a7dfe837724e3514a05010a4633198def9b6ab2fd9e2a94baed84065ce1d37
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_id.tar.gz 6814747 SHA256 6d0946a6f78d3478dfe69e1981e306eb055d4e24b11af59d2b512adc52dbf2aa SHA512 771ab909e2abb38466f34874bca77a7789b011ed3251d90583ba76e85723ce2dc046348fe56aeb35868e0dacab5501f1503aa293748ea8016980edcbce5eea85 WHIRLPOOL e8120ababd7394cb8b6ed4d702378588133e8fa0497f9ffe8eaa922b87e4af06ccd0fafd95904201f1d04a9ace3e3b1f263e6e21fdf3990fac9cbf3ce7b1dfc0
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_is.tar.gz 6923495 SHA256 ca0b414025408430efdf82661a04f916915d82347fbda2f58aa2cd6b313f9e60 SHA512 273f2240163f4437a11e8202d1770f3dbbf00f10329eeef9efead92d6d32892c8df0a0412d382cf580d5f2cdddea2030c5e51045cc4bc2f6f7169837d4609523 WHIRLPOOL deb0b09438b5ac804e1b648aa4349a5d7636d5c98acf718fb28c5760b6e1578f49a0f0a3060a38600f6d20580ba0e67c4ebc2f747f98919cf44eaff08570215f
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_it.tar.gz 7938048 SHA256 cd7d56624ba5874e9d873a48faedf6a4757d598ff69a3c5ee587c69948c99b63 SHA512 5a7e139f5eb82de4c9f78b354c6186d7ccb7534c2409cb43cbb2894dc18d48f030a41e5236c775128bef4b91ae1bd5752d8604a0c9e1fdc272c36bbf4930ef97 WHIRLPOOL 70d6ccaf11858b8d0721be32ab69dbef0f2e4fae8521826fd707abbc1999ed5c3067aa37c108bdc48bd689dc41a152fa92a8ddd1f76502553d6c86af2ac8d5e3
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ja.tar.gz 13446138 SHA256 3daaba0cdf3b5f2946737a05b5b897d339bac663d9c5467742f26649158c6b7d SHA512 45536559159336160e037d606a7031b1c76c0814fed7b6f4f614ceeaea131b2a2c861a1f13fe596003094c35a17afb232958a9bf48e9cd704fef72665f3cd68d WHIRLPOOL 9caa481397e4ee16212861244799f41d0528a7b50dd7d03478979fd7249d69cad2b12de95bacf9e323d8c8d48a48726935811d3bf1a0931c3771302fe459730e
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ka.tar.gz 7123839 SHA256 ae16bcd872c47e1fd0ffe99e7b0bda0175b00c3c457294b45e6ef0e5464f9bbd SHA512 70608c76d991f42171a2614772536a68116242f985637e4fea902a9fbecd801bc51f60a9b32e6aebd285ac063b600a8250900e4629cb7d63b6381c1e1b6ef688 WHIRLPOOL 97ecbd985f3acbddc7a8a47626385214c13d084b047da31dd88ab79cd992ca84b4a4b039f34e4690c013fda4564c2bf4b6ca212b33e015196abadec0c588125d
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_km.tar.gz 10373625 SHA256 19e38ff260b9c1a39489042475e13c7dd5bc8dfc30f78b79d8da4d8f7ac5eee3 SHA512 c1aee6bf0245c06359ce90b92df3fb9bea206897ae262a327486b61c7ebee7e7a2c39f266e83407b3773c851a1cc379e9cadd0a2593b40579f554f86d5016486 WHIRLPOOL 0d5b60a9927ce86d0d73ac4e20a781167b96e7060fe647c03152631a0272636e5b1f0dfe488ef8f5dba4661540732197107d98373a6752e9096753aecb24a051
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ko.tar.gz 9380890 SHA256 63bba3ba51673ba683d2728f99c1498ecbecf2966f0e7897fde782379730f2d2 SHA512 6d7fac669b52afb1033509667b369030e43d465bad3c12cba3a96ab0d32676ea1bb3a205ee02832a21e28655e74d201dd1377883ea48572d6be6d291d65cf0c2 WHIRLPOOL b4c15501a602106a6affcc827aa0ae1d805e424f8c87994260aecffdeb34afcffc5fb87f8498ce1805732b9de6d26eb3d8c0f81d542de688888cd9586bc14e18
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_mk.tar.gz 7359144 SHA256 5218dae68122e72da70b1a236420a848f0eaaef9c4a162861d71254278b232ee SHA512 e76f35d0377eb9afac543dfd3df3fdc3389b8d248c09b32cd33b37d3207a7f119e4522561343f387c12afa52963e6abdab3767c9215644c3fbc2886f27e1fb57 WHIRLPOOL df8effa752faaed3b4204cfe050d4afdd2890268b96f59a993756a59e8475f525f397b2b16ce2133769a0abf96182aa723efd619dc711225d2a1853782545104
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nb.tar.gz 7671657 SHA256 cf4c04220302d6e837db79805424d0ec0e5b10d34324190a1fc69d95427ab9f1 SHA512 892418f81d6c77202cfffdcc935fb4c04d60434f136d75f35e2cc99040d5fdb374b31b3a476e945436e02eaeb8dee22857a7861c376ce53397a4f4246a885a39 WHIRLPOOL 6009bd9516f82c248589f6db03ac32b78b1fd03ab70c1c1852229925ba0c6e2fa1798cb4b96e7e04cf66ea77baee9c4af152c8a97c93e0c74f5a819ce7943ea5
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ne.tar.gz 9859732 SHA256 292882efbc40e117b411ca33406f171594a840bd9ba70a43de4d3535bae8ad61 SHA512 428232843cdb19fa09fc5be0f2ad077f06e20bc2ca4577ea32c6d21303e4e232be4085713ecafdb67d240259ac50b77183a6cda587ae363929eb424e5874ade8 WHIRLPOOL be80c24ebc0fe9ca1ea3d20af81851011fa5bf817d6ef77f0bfa4ac4b18dc4adf4c33a09b3817e22bd42f39d5c09531e27e00fd65a3a1c158e24009aa15bbc9e
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nl.tar.gz 7753046 SHA256 68dec80d9ef18f03c770a34a4856bb3b2acea9d69c8f10826b237f414b8fed32 SHA512 a13f653ef46ec8e1592276e92ffca5d08f30915ad08861c7b79318920387aa3fe365dd5a76313d95d5d7ca731e9a8f435037340bb1e8da0b33bdc166966e6f51 WHIRLPOOL 46a40cd0dd2ee6480672af1685da1ee236cad7e3911e20f5b10e3cabc53a972bec8a078a797d6cd5962856f4958ee30e1cc1d7f6d9781e113e8713a2a34460c3
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nn.tar.gz 7627791 SHA256 83d1da834a89f13a19de1f77e60e5ef3b67a054e4cdddc707317e48e1d7eeb49 SHA512 0f19117b08ca28ccb9844fb3cf16d825f9645271207066cdca5e67e1714a7b442175696a91fe9a20ae1582101ae5eb2541ce9343bdd8f2ad61270026054f6348 WHIRLPOOL da7d780ac73c01a2cebd76d108533783cc17e9d8b4045ed50f5c28db6e64aa30af9949a8dae99884ab26b816b00bea0210d82911f3ec3555564cf22f973b9eee
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_om.tar.gz 8003660 SHA256 0afebc26bdbfee965655eb115a8eb25d21b9e280a2db672fe12eacda4b37ba34 SHA512 2d879326bcd5400bab5ebc2d81d6f638376f2ba78e2345e3b93a1b29178a9d651a07f0b2561de08de84f5c1657600d0e1b3cbbbecdba478990039689a94bf280 WHIRLPOOL 18f3160b20163d265eec93b3531f28082e682ab668e4ecd519eafc118c03980407add3dbe472a47e3c6404da1b7c1b9c73add7e3c6f81371929b58ad420743c7
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pl.tar.gz 8047295 SHA256 afb920edeff46c05ec206e123b3306565de788f931180b31f22cb735480648c5 SHA512 56aaaf2f8812342097fc7405fe53dd3fa74b339df210ec76bbc0ff7f4696e104c2cf125c1783d99adc8bfe39bb486899cd273f2ae29e926663c49bed9f4287a1 WHIRLPOOL a999f2da5a228a65fe8881f269819f16d3c71365a08da985ed9d3f3b1b4c6564ca1e7ec45b8452e687bd038c13fbf8405cbaeb028c9daadf79de2eb2a4d753c0
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt-BR.tar.gz 7760637 SHA256 137fba73d5f06df9dc6f707891cbe813f61af01e41031992d37e6f39462e6bc3 SHA512 68db118ae0fed81daf02b7004d1cea293baeac6d729607629e5c9e17c2176293f34c104925510f8959187c1489c62a1f4223901a12306467bb5933a014b4c542 WHIRLPOOL c9030b4cb53405ddd7f62afe75d069b815546ca4187e8d050bf50a6fd4dfc841bfb3ee49de4c9be5f0436dc87b1b6dcba3a654cbf923abdceb78152cc51275a8
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt.tar.gz 7688731 SHA256 1f40da8692d4e66ba58ce9b3d1e45ee24c5f19746a8b7eb10daef5be646dc320 SHA512 c4a1fe17146b4f2146fd4b8ab0614f4403ae940b5f9c6a275c8107316d34c6eb79da4ecd9d3de7e20376b8f8bce31e445b1cd985e77eec2cd5521ffc7d2e2a27 WHIRLPOOL 8a77ac3d0e95eca77a2d0eec693896867760d3dc86fdc4639cabce02ecad0efa3dbeca72efa33a5a004c203e1029f7a4777ca858937573439e8cf04043f3d9f2
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ru.tar.gz 8429840 SHA256 d187069df0164012d1810d0e75097785051273dfd0c4e02133624653bf6dd4e7 SHA512 ff3c988dd481a16db1851e3a420e86a16b241e7bd04203a22bab5d47bfac6d8b451b3eab00d68af5cb98d4e9190641c04f3a74558bea4cab369be1a96dfabe0f WHIRLPOOL d916013490e8e9e9eaecbbdb09d82b535a973e344700fdf20d8626513d838558e6cf0fe329186a1708039650ad04c690ea72b1a64838d0613b940a5e8f1b0dbf
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_si.tar.gz 7210936 SHA256 90145e7bb50deaf0fa1fa0ed64564cee7655c1a2047c6c5b0b721fc991409750 SHA512 574060bf2ac77d4e0114e57394ce18ce2bdc16eda7d2e1e51349a11295a0f06682c2092319dc506cae71bd64f3998bdcccd6f2bb731f509ff699469964a3777e WHIRLPOOL 98f6d7495690a877196806b0d834bc43ff7fc234a57c531a110622414085cd8b23f28e0622e41bb25e89cd1842b64b19e53efac1d0e37b85a2b1a4de791545f7
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sk.tar.gz 7513562 SHA256 879f630eb4dd8efabfa0088ff15208a3af87d7439932c911d6a6177cc44bcee5 SHA512 dc076683012b507eeafb77fc280f2e4416bbae3ff3634666fcab9a466f5c4c0e9154239bf2847545bce4b3625b6a1f8b617c3eec9878cc64d0ef3c4edf10970d WHIRLPOOL 2c458128ea1ec2a78620185d1a9ddd1773a76e69c7d24b9c25a7db6602ea7413e2ee4bbe7626ee026a02a6ce1e174cc2affd1a23cb5122a47963017957bbafd3
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sl.tar.gz 7756946 SHA256 162cfc84efa02a9ef26122affb56a1c77c63c5d9fffa0f5581011c742ccc4f1c SHA512 d95d78a7a678addf477e098288ff13f55d252569440582dc3d7751d5f6b53f84072362ef80f331730c72ee12fc4e9642705cea9179c801e699ebe6be62aad33b WHIRLPOOL 0fa6227d36af521e5d537e0d896ebd561fd7b2d946b27fbf8ff0280f62136ed34a6f3b2d4e28dc8f7e9e350959e3b2f62f378828714a1bc4b4ec7ed81d47d48b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sq.tar.gz 6858816 SHA256 0aa8cf10d15cacb747f7592a01acee9cd2510833dfa516483fe310adcea7cf24 SHA512 42beefd0762e95d3d7b29ae083ba21ffd7ef4c3f07006cf9527392d7a2c0786c44222618d0424a21fe072b7b02297b63f4f99e75612a3c538e5c2e869cf35434 WHIRLPOOL 4a4d11f2f06c5fe6db5324a0bf424a79f00a8cd0ace7ab78a8880a611a65477c9eb4f981616c61c023899c8981b7f7bc0342e341fe5fc3dc8cc941d529923ecb
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sv.tar.gz 7691732 SHA256 baa2851dc3298fbf28fb3d2d578cfdfd3c51971f646a39a3af79b2bb954414b3 SHA512 4762c9b7e4ef2819dc3f857a242a63e96c50f7355d6e6c499011c799ffa838b5f4abeafe940970e6baefedff1b763ef182c19975d0555244da9758774e9afbfe WHIRLPOOL a76d8917b001a06ca72bd36facd8ff109278a219d02968a96edca722deeea7f593b12a8a392b92f8366d918819607a8636f56ca63bf43e41fb2998dead11b860
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tg.tar.gz 7193274 SHA256 55ecee864fc207927e1ad9b7694e24987e07ff96c873de2e067ed595cdad4c30 SHA512 f7bb96dd1fb66a616edbc85f0b27ee261dfaaccd6cdee7b3cb87972819fd1068392aaf66409ebd74d588c04c8cf76c318ea3b22776398eb2ac2623edf61fd655 WHIRLPOOL 78253046b6cb97f261ee33868ee20e8c58e793d3ac63f8a02d2fd90d7226b635a437de0774a50abccd324f4b2de24c1ce2ba411c9bb0fd84ac4e505975b74843
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tr.tar.gz 7944236 SHA256 af80c7c930c5ce7d9c1989470d15a0ce98f4f66430889f4d207bed5e8065a39f SHA512 28dc250e86966e99af473e9140413752fa2a188807cc8c5929f834ec749f91936db81545ef500ad6912c7d5eef9b83374c1ebe773c7fee46ae909b29b694ac65 WHIRLPOOL 2f50acf02fe08e200ff1fa17d08b8074d3417e8667a0811cc2a1288038c3c624a416de074ea245e841cdb145f852a90a03879c5deb98c64bb2c3a549e3a48839
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ug.tar.gz 6847673 SHA256 9f9808057276cb080af3b08294a7c285a6d882fef21fedae1c5f99d89d14612a SHA512 f03307bfd5b8130dc71969fa33be68928d3caa0e2dd48a34b893b78bf46e3ff3b2ea2c8ca8d60ab032ac0ff8a5dafececbf73ee7dfb4bfd777fed0a887b85948 WHIRLPOOL 389a2c6271f8d1abfed28b4fe168891f6cd074f073fe5d1a8095ec43dcf86bf08e9e2dedb50a5ef6d6f5ac9ffedaae3a717bc889daab1d43b5310244dc6b01a6
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_uk.tar.gz 7336125 SHA256 bc27e18c1cac5f1657e4823dfb16aff53bbb0f69b1de9caf73a4f2dfe5c0c0ff SHA512 d9bb7e3b235c4d7322e2f7a4078a08e3c191c33cd5f9568e5b093a4a4818ea53ab2e97a5a6ac9191610b239135c5a836264ec1b32e5271e9afed6485aed2777a WHIRLPOOL 70c3752406dff24e0b2d3e339bd9b9097a9fc9eb802b11bd40b49b99fa865c9c41ada39cb2322673b27fdfd6c0f77922677ecf4de7186f73c3c8636c449305f0
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_vi.tar.gz 8159252 SHA256 1f6fe0bed021862b68e39d07aa2c4c2da7bd35fd7e5cb81adf144d1cb56adaa2 SHA512 a3e0a2634559ea3567bef9a3a4ad32113950d1218b2e7585f26f1dc8c81a8ba020ceced65cbc829753b7e45862a20af566b12f64cdfb9b402d814ea7f199016c WHIRLPOOL 509d18959a8c7811c9087e424b72af23ef4da838359f3622e3d24120359c9602a320b1542b868f7131780afef3336e99183af565e61159642fe2b54fd2a64c0e
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-CN.tar.gz 10724937 SHA256 674118574e28499c55d96c0b8fb56ad9964ed8a594dfb3f356df2c60bc69082d SHA512 276cbb36e2b482de9a872132418dba71ab31bcaf5959d0ad8fad80fe8c726835ed4fd9c7f8e92ec3b4c50415bddfef7afce3f62e62f3567567e3a802708e9a40 WHIRLPOOL 1d70ba2f5b0325b97dd6b47152cfa8d869be3cda13e94c0eb5e121f00444125101d8f6d763072209832c214ac0c8986100f694c226e5c641d7576f0fe68b4d1b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-TW.tar.gz 10763558 SHA256 2ab720b698f42533ab5f1e5fcee811bbf7fa068fcc3c680aed9ba52ba3d5f3c7 SHA512 75e35286e896f604dc108a0b5f816d2d7e0e4871c9860700c042c44d7bba3df023d62cd2a0d7449a9992b8e70a36c5068543f6741e6c3dac48667d4f0838a57e WHIRLPOOL 1789be7bcbaf777c2a0e5390c47d6cd0cd4d67092bf7c673a07ddce3fff89a3af35393cc9b60874b57a16fa5f45486bb6666fcb4d8dbb90bf9284a990791b04a
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_af.tar.gz 1116713 SHA256 75f7fb07ca3d1d74efc534d6a98207bf37fd9353d7fa6042581fb9a53befd5bb SHA512 48148d9fb4791238241b96c63e51ed012fdd55d141a7fba6a3c8d4b42a0b46956482fe2a2138272de67cc272fb334eec08f2bfd3aad0f2c214b3ff07c32e2c28 WHIRLPOOL 435f2444c3ead36ebe27a29e456517485b7fa462aa49db046c2a888835f58919f8bf26107d624097d649d6be9fd77c596d5a51e5cc5f2fe0d80419a798ca7389
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_am.tar.gz 523275 SHA256 5a2cacf4d62a2296d6db3d0cf428f35f4ac8037ebd67bde8e2b6a6a673303167 SHA512 c8d5695518d339a657796c6dea3e65bd60765c9018d7489341f9b95e93e1e9c8ed91ff76cb8b26c911a20f1904b0a7b799522f63dee7e866ae489315f4c8323d WHIRLPOOL 94a696c7713be1f295f16346737f7052ee282f0cba1f88e858c0e2a97eee824dea2cb8101263fbffc1f1c577cdc303c44ce8e50e7187bf4e0650dbb5e08d2258
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ar.tar.gz 2264871 SHA256 d51fc43976f5a409c547f69d4418a35129462036af30d27789915785641a0e95 SHA512 75d53be7e3b1946b02ef64c41cd6c4048bdc5a398f61cfd50b3735b3bf140edd80ce7b109c05e2f16d69511085d143c34a15357005d739633c748adf7139eb77 WHIRLPOOL 893ee0b60825128bbc29e8c41b52c3cceef3c9200e3f9893ee7ac3106710322e5d4a4a669853422ca35733edefbaa2cc538be02c6aca9a6afb5ef8be2bcde71f
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_as.tar.gz 549242 SHA256 26495bff8ee06b10dc825f0b24a071b598db4e32bbe9061aa6995addec59711b SHA512 d4e1a08467ac9caf216c7677d9fe7ff080ae2f51ff3798e45b6fb671008c01632c599fc2018ca9571187b4a93cf7008a033d9e078866f83e2b5cc57429f806f4 WHIRLPOOL f7366f5e3cfaf9d6f7c9e9801704f8e65fb1222d7c04f775a4fd7031ad8aa78969fa84657cef61fe00ead03277882e3849c544e1ae3781a9e83eae317ef4ce91
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ast.tar.gz 505692 SHA256 06f8e386fb9add6c1a016216d35da90cd3e7614c8fa8010225b6d0be379f19ad SHA512 78f178c1f3090c70b29280981bd97f2adbc886dd68d77213fecfb0cc99784992172a9f5daa6bed18a2605512cfae0b2816088ec846ee430bad36ecdc6cf38175 WHIRLPOOL 3dcaf6b2693b1993724ccc4ad81a000ddb562c8699bac50120ecd85570f9dc4c4f1501b7d5f8b43c9a5534a160e3c5a24cc2d0f9649a01578dc29ed7cbb56e87
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_be.tar.gz 884898 SHA256 f043ae8e3927a3b5c72e5a585d998f0ec868d56c8f895547be61982fa53e9310 SHA512 7930c8797e0615cc33018dc54e29a58972a9a850d025edb6e3221c5b57266d17d0a097438f1fc770577903c5b085e5a938b2188be439df8cf6e5ed4d3df524d5 WHIRLPOOL cec83806e445a32d2e860c8e1aee1a6476c1ee1709b455be3b67a3320f9b6a66e02d5c79328e599d2b4045f8ea8eb441a40bcb7d5fbc9ac28367f36c0e217afe
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bg.tar.gz 1965860 SHA256 e55d0bd76b6f52d086b52b078e6d6f615e3e6f5b81ddfbe7724bc1a42c48ad13 SHA512 c85a6fea6fed3f6b6b3c69ce2bee5171b503461de282c3146632f7de9dfd8097b5eabb8718576729a3d8a52b44f5b6765ed8dcf759a12c2cae33524a4b2814e6 WHIRLPOOL 508e9907af2603057bb070937db79a22466adb53ec8f3b00c7495fa7c729b1f912cf14f125f4701558dbcac70d82daf267221d4791f61b085c6c7895de1e99de
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn-IN.tar.gz 556939 SHA256 d9f1c4d3b2f01fabe9513dfe3d7f1feda010e2aee326fae4a0e108faf836530e SHA512 45d537a04dd1400cc524c12def8ef6df03398079334c961800ef56f93a6e45717275ab03a8877cd5d4ceb23fdcc6ca89f911ac4db542184c558e566ea738b085 WHIRLPOOL fcb654e9115f8d26cb0aa2d22264fbe5e3f89c40c27b5ab02bebf5608215a9ee81eb3bbfb6617bd68fbc7771b02ea2dd86fcd0cd50ff7176125a694932a2978c
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn.tar.gz 903996 SHA256 0ca63dc29e1a60f18f74cd102a370d83f50ff2f5009ee7d01963cfba917d6cf6 SHA512 b0a4f6745d3381411f5b16404fe7519843dea3e23e68af5286890c516e648c5416faaac30df2a326b47cb859ed6fe2e108ba61d91f9b04ea167f5b77b8d624eb WHIRLPOOL daeffff1dc11f8007a79e9f0b6629601bf650f304b50bbbd065dce52887b566573c2c5b336e3870dadfdd2a05fc3f3f5060ab0eb6829ac0237248d76e0cca71f
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bo.tar.gz 539887 SHA256 2bc63ba16170ff451ba768f7e9467be43e3477af166506f86bc76b5e76e4ebd8 SHA512 22ca93f37fbbf822fc5f1b4b3f34fad5c63e0cdc4e05c7f1454113bb9588ecce3d61c6d3ed30a0e666eea901b94195ab895dbfa39552e15a71c8a9cdc7547822 WHIRLPOOL a757ce2c93c5fcdb63e1489dd7e3e009758591dca7ba03b568d9e8971689a9bb30591bd90d846e1699db97d00294d3901912e919b3cf73ba6cdf4d3e5b6e041d
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_br.tar.gz 1720753 SHA256 64d653d4acbc0ed01cd7283c74d0e4c07ea3686fd7910cb012a3a4e71c4616ea SHA512 4d2d7f87115dc3302d5c907f59acec652057f08bbb7685204cd6bb02d11f395b1ef75bf0bc6f4b7d6e392fb49de522a7a4d92657e086f1d17107f3d52fce5c0a WHIRLPOOL 0ae1f92b2f218e8012f00d982986f546675360192b5a4eb44fae33e9ede17a66c8a681779520705f5105f92e9536179164cd52583217a623f060edfc4614a4f2
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_brx.tar.gz 517685 SHA256 3bb1e955812c47cc337d06d8afaecace854cf0dbb4a78930e369af9f9c76294b SHA512 9532cf25b9b771e32297af35210a3219cb98ba4be7cec521efcf0baf03332be1927279b2f7aa958b96e4b30ea190be276a0114074525b87dadd9f78eb9c108e7 WHIRLPOOL f1a5525ce27e2ead7fc31c9cb1c405e504e2d421927c3496d87cd07419d3977fa7d468d4806c684365f3aa40de1b0370ee54213dbfecb42f784a125fb4be1b6b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bs.tar.gz 619419 SHA256 9cfd4ddfaed65d9dd4546f0b68cc9635774432d9f4817c8141af7a244d5a71d1 SHA512 7254eb1acce5da2a80eaa176e0543f3db416384345b4aaba6b2d96034191bd1fe84abf2eecae6e64c8b9068b8b3a7de2eb8f02f127b1f4b351e8c1d52206dd19 WHIRLPOOL e355210a0912e7c974d45e626ec212c4bc25a5c97491a5b79af536afc531a44c8ca8ca024ed84c2e2c3d8f3953cb8401541adc57349e3be12a224b69c1d21955
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1774220 SHA256 327a7c34e22eb07f4e8ee38b851274aaf2696b63587c93a841ff3da18c30841a SHA512 c921655b32dcfc03feb745c18e93cf394c6cfd9458a9ef02623ece6df868b993caa133d54751bc4909fdfd3101c7c414a636b46927ddbe59e3256bf4618db6af WHIRLPOOL 80f95676bc322833c248955fd29fce3f2d7202670c941a56b5af171f1e43bb274e2c7315ce65af8cd3e3691c56e5fcf251e96b754f60f029c910f9936735cb05
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca.tar.gz 1776339 SHA256 abed4d9c01b2df8d1063846b3d93eecb2a07d8f24929de9c24b7dbc5123575d2 SHA512 f2a2063a57c4b04fe1c8b12ff86ff259680ea8fdf33fe23e9b3d7b828e458285557a7f2f67d2a3638f1f5149bafb5789d1b50e7b037c6a6d5bdc645296c71b56 WHIRLPOOL e03c12999359a6666e3f010724c6afce46c2fae330179dce0312456afcdfc2f89e816e09fb8b35afd90262cfb915b53d06af03ec425b20c0b8bd2aa99cecf972
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cs.tar.gz 1238416 SHA256 b6ae652bb17d5c086cad2c1571f6db80c337b05a42e3bc9875d1772848054297 SHA512 22f98f9fb22f53bc68fc1de345dc5033c49501ae443f972af0d76f4e1898487342c38450bbee188fe6633de42ed7ab4090b1f50d0a2cf555b370bb626ca77e7e WHIRLPOOL bfe362a3c64a18c532bfe2e58c91323ace06e0e3a769a7e4c557b24abed9ea712be4cb73c226097c58a2cab6d2ff1c4dac0d51344ecc9f7aebbdd95791e91c8b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cy.tar.gz 484556 SHA256 0fa497b44574e04fd375ed2adbcae4dbbf4f89ad4b6f11d1002b1328fdf3c13b SHA512 cb6cb465fecddedfabaa158cfb862ebd8d116cbb758d4e40d3a68672b82a7bee4179af8fb68686363f4bd852d19b177334179bbe1858ae399e302a471aede68c WHIRLPOOL 77363c888784706302c6fb91e8511daa11d1012d71484979144144abd0b8887f7dfccc35b2493b688970de4daa2c0d2e1ae832c9a44d3e3be7d89686aa3be787
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_da.tar.gz 2388676 SHA256 ac82496f294b4fc80a7c82c25249656634893c21dfdc90f2c1a30b04c928355d SHA512 158ab667a6923d7975a1f804b7d31fc16f36908f49ebc206f7a9ab57d938e739607e3e00e5204c57f447a6c5e47c53392f33956b848bb00490b695a2eb99aaa4 WHIRLPOOL d78be2d3f629f6711348d7dd02e7727346e923bf7b5b6970e68cbe0b0ee732779843f9eb6b24042d823e09ce2828cad980b8235bbb664a53fb08a25c70095e1a
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_de.tar.gz 18842891 SHA256 9f76916891eefa4eabb70aa349674a98386678a75de8c7037a59c648f8adddd3 SHA512 6e3feed6fb9ac9b279adb455d3db2570d341cb69836199359214c2e4b85974f05f81dc39ed3d9b90f3139ca85a7cb2b1a0cf50a118ddff86703c944b97de72f3 WHIRLPOOL 2e21f37249d3ad789877f3910a52f712792edf0140fee1fb5bfd623c3a0b3578e147274eb249789b1518e5849559bf4ddaf9e8701073cb855325b4a2d14ce7fd
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dgo.tar.gz 548628 SHA256 c151056ea8b852b977a4150875116af0b7e18b3ad235b43343e849a9d4e39552 SHA512 84e73e468e0e6b1281f546b39065c99c217332292bcb35bed6e103588dd23685c57c5fc8b9bc842e2421ec7599ec26bcbf22f5d7c37e295325c35235d1a06714 WHIRLPOOL 98d48abe679a31dcf1b7c470800fc106e547a0b2a2df0db3dd3098fee401e1bb1fa2c24510d1b74f6065363ec351ff7956879a8f143ddf0a201a3ac7016741e2
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dz.tar.gz 544408 SHA256 f5ab40b85d2bdbab1fcfa01799ab139fe3061c6490b5057a4e418b6735f390c9 SHA512 fa127fdd5fc2d274c493120915d88091a9db957f04167934d1abc642845017a03a94693ca7fae461dae7063247d839e4016f67b4aa348feaf2c346b8fad915fa WHIRLPOOL 08dde67db15ca564b26605c71d9473c3e0be80a756ce6d3bed2aa445611532a1a240cf0254f7bb75829be61f1ff99edd28b952fabbf3a3c5ef22a567c3779dbc
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_el.tar.gz 2583019 SHA256 be6c02f3ee755502e5b0b62da0175bdbbb5fd72fdd4e1d957f71647a91e21815 SHA512 383a9d8f94ce42154c5be4f5d7e9462ba464625213a90bfb917ec3d500650e60b9c1f2371342b610c30d96d11699ad013c6e661abdd3ce3144fd5ccede0093a6 WHIRLPOOL bebfba5ef021ededb233b68f21fb050e3081453f2f3db26b0580d17b41b6ff8cbcae27f3bec33027a28387ba948f2616928f3e243941579d5a46a549ec5de6b6
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-GB.tar.gz 7122489 SHA256 7803b290743ca7ffccbbb5db9b5b8c5b9ca7cf88d57d2cca2b09b53a9abcfeef SHA512 24b8b777684ec978823719b1e194d1c69917883224f2cd7c1bd693666674e02a8aa81ab6916f2d7871ddd9e1b902da3d06b54b7dd76fcfbe2d51d012fcccc7ab WHIRLPOOL a0d26b3c3b3c5b5d5e43a66bbba4151d44244bdde89eada67238d39ccde5650298dcd3c5adf404f8c30992efef101eab52a48b4d11dfde3052a880ea7e4d53f4
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-ZA.tar.gz 7039487 SHA256 b21733c5bf9d7e6a2fe226746052fddddb124b0a96b24102215bd2a1442f462c SHA512 5c3e9813eef4ba9a7a31a8e0b10a5b00422c703751df316b4f1913058f763e9979034a25421fd89afd40842b66aa8242dbb08c0f5ddaaab996fd8b9d3d9e15fc WHIRLPOOL 87d57efd80761a671355f5277bd61759fa4836fac89f430bed8f8979f57072cb2690cad53e6abf3c22a57a51fa7d494b6fc9a9844fd215bd3b75036e46726151
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eo.tar.gz 481662 SHA256 fa5be6b105636db32fcb336f114b26a92b923ed2a7e7417ee1f07fb4547ada77 SHA512 ff1193b9ab1d63bbd213721acb27062a6a838cd946b797397ce13c41f309870ec076106721151460955b45fcbc056fa9d3783bb7cc7c6310b48859429ef52fb8 WHIRLPOOL f29df45a2866db420da68d10c0d4f8e6ec6268a7b5f2db50cc9d24f1f8da4da110eb5b3591b4fec211993fcb84843b9503a812eee9348cba2ffff81c70eb6636
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_es.tar.gz 2027809 SHA256 03a4090fcdd344a860b751cd26ad67ec0555fe4988db12bd1dd188c872b03ba0 SHA512 c6068a90ea9b9964b5a8ceb5941c91b06679746684f1ae1d68aa3bdb7924cd688ec3ffb6c6ebf86def905f5132c3753c968ced950693436ba3550aa7c06ec96a WHIRLPOOL 1d7cfd2dfbd783a5801ce0b8d014a44305dc51646f3ec3529028ea875c8ef87448ee34bc92c177211a6cceec498e0ffdcd67adf9180bee9c3d29357764980046
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_et.tar.gz 1390866 SHA256 c04705d6f410e5966e536c3f4e0c00db667a5cb85c470f9571c67d66254b1aeb SHA512 88a672a6cb3330f5522b5c774a3329361e7ca318bd24a1a0eda613d56d4990c2d39ee7cab05d9411826dd48494d62234b03778f3e13a028521b09f7450b43c98 WHIRLPOOL a14fa643993be7c0194686305eb35435d9744438ad25b2fbdd2cc12d780c26ecd95f2e0d1d23526ed81422c178c6e6d0b825f0a4d935462d9ac1251e76b4f0d3
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eu.tar.gz 489377 SHA256 16023593962dd371a1fb0cd246713cf708e778f339e74bdcb684239a2e407f61 SHA512 2aaf922ceac6e2479e91b3fac5cac0011c47d4d37d9c8b97258ac9b2042146daac58e5b328b9a5d9a8c255cc262083c8a495332b4f954f5050c19a9a0237d312 WHIRLPOOL 0f2f2128811098a789c3ebf6edf1591365a999272d8a41448748eed1097301aaf376c84ad9417471bec96ed379e7d7c38657c1b124ccf59e0d250b561177acaf
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fa.tar.gz 512676 SHA256 8e29023c1834d09348eef336aa0ca26d11552eaaee646880457d22b40d72cab9 SHA512 14a132f05150a80c445ece3d2fd5472703a357c238e7738a7a011984dfc25ea61fbc037023fb2d52f7eacc2fdcf298a14f6cad222d7dd92858acad09e4d61599 WHIRLPOOL f642dc6e5c0cfd7203883839fd70e782c8369b94ea60c4b29463ea6a5979b30959ec32307c9f746c99339e2c6b4331d6eb9a1025d8aed72d80849b14fd039635
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fi.tar.gz 497318 SHA256 aa9ff65726b7e85b02ff3e5fdf13f8c3fbc3dc6c9e9258d9f19a22dccf6804f2 SHA512 4250f0904a3101e2a96ca826d8fad4944d6f525688210a304e01f5b0666db933af0b3a067f831dfbf241ecd477061fd4df38eb0486377700ec6c85f500a62ec3 WHIRLPOOL 124fdb2752c5e5a95afe1ab89d036274aed9054a8b6f54434f5cf20c144eb3ea73ff0c176f13a95eabe6902a6393b0107e8aa1b4e66431b930904ca208ef8009
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fr.tar.gz 2821358 SHA256 531a8f6f16787c0a9ea97329554a158b3ee7dea8f8ba348e9884a523f8bf7e36 SHA512 410a5dea0b8d48f082c978dcbf40e8d90b9a49a9c6db66524d2f1f990711ee327f02469d0d67b6952f090564605a590312386ebf398cdad9f09e05f970203848 WHIRLPOOL 30ec9c8a274aaad1b2dd79787659fa10428f98388ad15ef06dcd7810887c9dbcba2d2b0f7d2bbdc7534db7e4111449db33afb0385903baea195094ca7d8328d6
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ga.tar.gz 506997 SHA256 ec1fcf57effd0f107d7718384e0ecab62c24ee682ea55a2be3de8a307a75db03 SHA512 9fbd56b782d0022bc67da0eae0015f063aaa89f312c620cc2f4735dbf2c3304cde815f0de5a1a741ef232a2a6a21e625e9199bed73e80d6985a33445ee27c837 WHIRLPOOL 3c63d2a0b8c8ab398639825410778fc3378dcf193eef59a58839ae47e047a7288d027cf3a351c46b6be6e224f7fa1f656c7e727e0bce9727d43d0b7f260594dc
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gd.tar.gz 1086536 SHA256 a164ac036c25352259328f5f441efded27f491520daa34c1724c24b021877739 SHA512 b42f0971c2545de2ebf221d58b3e6448ab020df6c51a286baadc0196289a2623abfb1de63eb7d78a5b39f9643d28a6d16c68daeb82b5a22b05c29f655d1f66a7 WHIRLPOOL c93ec60e6736e9a274f335effa3b5eae5b5207a758f477192e04e2d4f77433571369f8d94f5960efb25f3afa8b08de83e7477d02b4cf00f7b789c5d3269a611f
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gl.tar.gz 1055767 SHA256 66a617221311ca2d3bf80db3fc90eb48f7e3ed01454b75d1768adc75b880f62c SHA512 c57e68b41c47c272b08b22b76ee7d0f8ebce06b0df786a38f1338f73bdef54017cd9b906c827df481236740d67ca670d7cdde7be16b2121c10cef32a6f4be530 WHIRLPOOL 492920b012eeff16c4f7eee1e5d1113b94204a4007ee838219bf353b4db179afdd5df7480905d58e6adffce26a77a9e6be024b956759d3a470dd69a9204ee29d
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gu.tar.gz 1193592 SHA256 b444ab513bf42da37b70a72660c5f889c48a913c5cfa95a551c7b9b4cda77c2f SHA512 63249a1dc7ffec54eaee64b9c310c753daee4ffbd39adf7084c703ec0b664b2fbb9860d4d07db91a9af57d54d8ef751ae727d1326f580e92df3579f2b61d60b8 WHIRLPOOL fca557f7c9820e905d4c68e929eb54f950bbf1bea2200254e2b1f5cfc31bebd742519e6cce6165b85c3d4c8afa16fc0f92f444f859b368d58dfab32fa9a0910f
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gug.tar.gz 503818 SHA256 10d2c68d10b54d8b820e7c9227c8872868aaf718890be91b0327aa7a016285d8 SHA512 92d4ba4c520c6769622067298b57537b510eeab9944a7c063038be256462cc3c77b21a175d132b6013273c5bdd3dffdd2f7c7265c91418007a6e6a5069487626 WHIRLPOOL 754df0699cf0cf4a4b349a8da5549f0604ff2930ee34358eadabd36db198f8281907a3e9f3162c7cfd6cc436e5d9e44284d6e1f92b50e604c89caf852f4965ef
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_he.tar.gz 1584411 SHA256 f850a6f79b6dcee69609a75f7c03adb2211304f257609d34c05c21a1cad662ab SHA512 0b8531f98cf194267814c871f5a4e3221501c451c109294d7e229a73f0518b89faa83f24aeb83558f18498e01317aad4b282dbe1970ac485a0ed692e9602fb28 WHIRLPOOL deed62486c10c53a211326913e251bea35c47e0d7033379d30b49604cc70daba612c9a06e358b6a3c6ee648031d2107bf033c9599c02e4d5785e0115675df18f
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hi.tar.gz 613687 SHA256 be80e7d82c0e4503790a921cb0d24abafe4b1ae0b0c4fc98aa93ea7b51a9e5fe SHA512 cfba2f2c1bcc455c451a43f735d0692729f93a5cdfee34706a5f58dc585498a63b1fcfc98759208debf1ffd1e10a2650df7089b1fad865e352890ccfd9f8437b WHIRLPOOL f351a1cd8545b87b8cef875ef73c2933727f7ab69075df3b422e2f540327110dbddec8af7881203707b93cbd31fddeff1a5929abc18029b985390d00a8d27156
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hr.tar.gz 1258975 SHA256 84296c3c8acec5660618cc03f1ec528b582b20a6c3fe18a109ac912ea1ff3ae2 SHA512 8c937fb551a845ebfcaaad8ddc34a4e0d59085656d5b6f345f69ed26820b11f7bfe5c3ae5c34ade63f33f08c5707ccd8145afd623cc49ca85c30166e1d7abd06 WHIRLPOOL 0b593a122b8dfa9bd9f56e629a86b66a1099e3656499a2b3e9c63bcb55f7dc96b369b598be60ebbbd0f7a8cf703112881d87398fd95cfe6a7b837f22db77ff00
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hu.tar.gz 2718810 SHA256 f4bde6df6505ba52563d13c7cf5b93c8ddc87676d8f1a6f47f26d3b3d7f102e4 SHA512 820132b7cf3e63b55001f49f6a92e9d1f7e238f58477f45ec718091ebc66425199439448883c070b2bf2b23ac71907ef88e4489a6004c1f2f41753e1c2282b18 WHIRLPOOL b20e97207a33b96334d7dd1ad284e37358bde871367bf6587df237f957bf366f626c50e885d69a5db84c6f3acd5afe5f304d2929366c5864c2683fefc193147c
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_id.tar.gz 483543 SHA256 f96db79b76182bd90bfe9e3da919bc5431a484bc2dd34f282635c93ab50d816c SHA512 b6bb1a245a663ad6eb7a14ad2238ee983d3cc8b99bb7ebc6c92a0cd24313ebbd74158059820b64f4b90d9788c061c65be31699465553563443f9306d26276353 WHIRLPOOL d244ba80565899bbe056a9af77e32c57b9c63a6b02dfb1a9dc99084a357e68b844068ce6c0d55792f29a0e80fcdb6628bb7d6ac4900cecd43e8eba37ed41227f
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_is.tar.gz 1224728 SHA256 a8c647167af6f371f97268bcc9c6faf1f7f716424bf067123db311f5a440e49e SHA512 e46cb453f6dedf4e877af8ae8b2d03cdaae84ef24e0e0630ff2a593f37534ffcca89ddeb3c2c4c30c30f16ecf7ee13ffe60b087d4ea77d69c0fec444724e2312 WHIRLPOOL c7a63d36c625ca7563a971c18292af3b10b17942f5e1fdca74f009381268aea39dc186bbf5b7cc2dd5bad7df34afa781914d1b3dcf9aa1b431db7fb490321f20
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_it.tar.gz 1828660 SHA256 093357081d71618a7524dcda9ab36228cfff780700c3285f5f2c80565a492cf8 SHA512 5e1ae08f594622a4e43668a6d8079b6692665949ca6adda64cbd0d10acc74c7753dfcd14438b39e8e1b8cee5add31e9e70197169259a77faab9bc54e5d4dc370 WHIRLPOOL 45bd89a350a24db62b17b4b95f61c1203cd78d2495a53a375afb159812b668d72596c15cfbe7d889997a825fd82bbeb6c3554153c4b996a74b325c3bec0fffc9
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ja.tar.gz 592080 SHA256 3811b5a06b350b6afcd332685b98e1a1d3cc7d4d4985fb6f815fc3822bc8b1ec SHA512 706e6ed934af87276f4bc1d4c620fac76cdea8c018c1dc2569d8fad0dc5d211ba31ebd8159389e4426aeeb2a2439ba3fd1e4458f0842f9e19e5f7e31f561e8cd WHIRLPOOL 39f3a4efee8c470ce5d7d8a100f7aa981c4dcf2fc2e7d78a92f0e64d46fe4b2257843e3ac80bb0847928c2a1a2bcc08617f54d8928cc0e6d67492ee3a3ec3dae
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ka.tar.gz 526878 SHA256 302533f6fdfdbe83725aaeff253c1e9c10073a561cfda544aac785196331b3e1 SHA512 21548e344afa5fb10a28bbae8b2f304f7681b9fb713a6ca0040ecf07c39858abd0cb34ecc83ff8fc3af9b62eec6c86e187409d2fb35acd2f62e37b7f4e8fec55 WHIRLPOOL 116573f5deb82a3a2d91ba576fa4e960a6633cddc81b6efa9634035e1eb41850b51fa25341b9f9e4e93a4e5b218a22ddf6cbe621bd5fb6beb8f3fd61286bad3e
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kk.tar.gz 538732 SHA256 c7243bb433ff3d0c3b4c7464e19f0d3dc3b06003c363bf31c7277d9bd9fc6916 SHA512 b1bdec2afee78f1a0ae69b4ad9b8da908589d3925b53c2f8ee05cf3227a5346d842de8c4b544f1424bd683b56f76c0336030ba5d12dbf5b531d86583f0e4b34a WHIRLPOOL d8ca5451934baa22f079421831d44dbc1f04e18a4442f724db09a96685cee16293681f180566b9fe62235b28d591c59752a2a4d23c0b8c380f1419700b2db72a
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_km.tar.gz 645400 SHA256 74117b35c868586bb8b2f18a31eef2b991c3ab75f65cf02cec6f821b798eedd5 SHA512 8fab5efb7cbd8e767f8b8829bbd6672aab502762aa1214a2802470f9a7dc5c039d91b74be585a90c3a9c4c235417681603972c582bfa000207c47c7b8af8228e WHIRLPOOL 4a137d9b7cf12804b20a73ed94ea81b8ca407f76281a17a0435d5d6fcc09e490a0f9b630cbf4201b131ccbc8a3edde8f6d19660e44b94b80b7df86b40a05530b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 500298 SHA256 ad42c4f7e7e47bf041c34b3d2debf529a7c510be85cea4796f23e58a73433e53 SHA512 681717e9fa555b6488d13b3f7303f38a97a8142235af23abc6f1846cb988f718da762f064d585c0098f47cda2be4b25003ac801c0672c17a85b99450eb414f28 WHIRLPOOL ff94d91e57f49b53045ce44162baad2934a087e824dab0a17af73ff536310649b7912831438df4cc4637fdd986c46ebf018425d8e131fb0e515d259f34e0f48e
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kn.tar.gz 557640 SHA256 6e98a1ad25857bd60c3086596fbf1f08cb2d3f7394d25ca74076e5b7e00ae50c SHA512 1af5bec2029fd666b3af31f5af7480d58816bfc3122bdd1533ea7cc53ce461654f1093d943145d2d06d96ba4ec60f7f3d0a76cca5a2fe96e62e07d69133aa9b0 WHIRLPOOL fd62258c12d8d25715e5940fdcdcbde710f07128c27d0548bb1e487c087c8420f8da62602c30e020377069c1246485a2e517b5a4ce43f6dd3ae6762b13bbdd45
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ko.tar.gz 584356 SHA256 b5f544e771d29388169b11b8f2dd070a2de298f5160b754019c3cee891269e45 SHA512 801d11adcfc9d8ca3723798daaa06f1a019bb46c87a75a8300f6fed0462e75593c9196d210b4c3a610222c1332ae54612f53e47d6fd02e2e1f24e695bbd71b12 WHIRLPOOL ff1fc4b5e595b01f83bb94c87b1202ceb4263f65f99b1c79148a9650d94ab88b248bf292cc040cefa98f820d7a7319dc491f5d575048e18e7497b4d1d59d0b6f
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kok.tar.gz 541535 SHA256 7fdfa61846e4df6664a1edd178c1582b866415e5059f981ee0f6b24de4dc2a4e SHA512 7ae36192cd99cbf9f2197d538803ede85ab24664bb75eb5f11351f38194dcbccee9f0e1491ec5b946c2aaa133207e7c24732a3c3a08a6340e3e915484fabbb8b WHIRLPOOL c36b4daf981d069a38051414f6b48df1c86e1fe3c64a5fe66788f0eb3dddb43ab38f7a79ba08e9567a27365eab8333566b78ba448578c9bb50d281bf30bac0fd
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ks.tar.gz 520141 SHA256 ef5562fe5c6731945bd22c5312203ac99c178e1379422c481d7525a3466a7b72 SHA512 17f4e332638221c5bd49585be85a5a67a9f5134e562cf1096e741a4699ecaf5eee635706e62f94c34a653111036ddcb77c25ad432d22b64467dec7ff2c9f18cd WHIRLPOOL aeccf9c08a6e0edc0cca9a30298fc4b7e9742b9fb1fba3cd69e0d4bf43fa754bdc0916e4f2b47cf5fb54ae51574a3b1a6e2e976a0133dd4669f0ff8c415f44a3
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lb.tar.gz 469948 SHA256 7ade5d839b5535134aa198647f60b1716947c96fdf7608218a98e90323fa8977 SHA512 1256bdace1a6cf435ce3bf41bcb4a2b34e163d0b1f03aa85541e3e3db4582c0295796cb2d492d22931efee87c71ea1cd010a2411fc355894d4072460a5dcf637 WHIRLPOOL 039d0588aede9519f35acf2014fb8f65a808765af1ade6ee733bad22a2e5a881fab808d0cc3e15984a4324148753de7ffd1b75136978bc2f22cc84eead7d51f7
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lo.tar.gz 562714 SHA256 d0e4056b239d53c7c1167c50c92134d7d2aa390d378d2d7dc63a829dca69d5ec SHA512 b3eadf07d488d96e3ef120ef6b59adb24cadf77f6d088f76e52bfda9cff39906b6b6bf12217d694c4365b2e4f7a5dbf128fb28adda25ee561be98c0541e39b17 WHIRLPOOL 379bd65a8f3103c3397b8a8fdee26ab0218c8dabbd8e796ea2df32498e9efe090061cae2ed9550dd635b3db83428107da6ea6042696ee35c6de1cb28550727c8
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lt.tar.gz 838444 SHA256 bb74c95f560fde614922ba07c432dac2ebaa1fb4be51086cda06ce82be889686 SHA512 d3cdba5c35633630deb2f30fe0a6dc57bbda017b417f51e060cbf611ecbe5c7b5f230aefe0a9a46045789f0db302fe1e5e26828805c21227dfd71373c1083e83 WHIRLPOOL 690342e4ea099693dc3925cfb5f5e30fbc8fa84778d28fca3ed20960fb1239301f2199efe248bf993ef2b361192ea6538706e702546b3caafe803fb3a2d84ac5
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lv.tar.gz 1253848 SHA256 083ec96c6079d055affd3301b741414db3186f7c3b0a26b5705379392baf9d0c SHA512 d2ad3915b91fa94692a32d4251933a4bc173e51bed4f74f8f36ea1234ad84bf571e9e98e6d3a8ed8b1037809822a183cca8d50c4e2cb78d313031ff96a91f02d WHIRLPOOL 0f691cf7a5e5da07fc66d76b8e1c71c4fa3ea7d6232ec6cbebae4e4aee927cf652b06de4a2be7733bc6338a5ffb3839b1a91192f04427489d8ee8157ae6a9779
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mai.tar.gz 523193 SHA256 f1998ce07ab814dabb36a9cbf053c07c5f7b5a75d36d9f49460078f9ba0ba430 SHA512 7546f7fd8071af4ee4c8359c0912b5292c772351007fe8fde04e91291a54e05f3c9fa36e90360d100ed5c5075b02c008653009fed3a479bdb7fb9e2c430b0474 WHIRLPOOL 0b81c5f903df9ac26ee986b2c67931a2d539757a01951456728bb54df4445194b4c02b8c7d38757f72b58319506f2a2d3014b0e8bd2da5b70ff3398959692eba
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mk.tar.gz 521419 SHA256 b3d305f9ef6439b33736eb92792da4741fc64f50abbbbe0a874dee01017b0c27 SHA512 16afdb37f51ae43245f4c1aeced46d2370857c78ec8e44dbb24fd9b301a0e48c812c273bace3e6421f88a4db3a13d104ec5d128847bee15d1219cc010520386c WHIRLPOOL 3d0b33051429b5958aa275539853ef0765201fd1fda397965fe7ffc78c4bfd61599e6de793fbbc58e80964b09323e91d8a733de7058c2fb9693310c206bf18fe
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ml.tar.gz 564134 SHA256 e9d88f6c72806fef775e66a9a2576bc965384f6ba2923bcda9c46dea6f6c0dd2 SHA512 71b64ed70b2ebe7ae1185a39f598d9b196b4c9f174eadd16a871f2e3bbe7cd7c365f9c6e7ac3be336cf00be29c6d7dce93dee74ed8bfb37c74a1bdaca5a214ad WHIRLPOOL bc3ec3cc4d6f87600d6b7b35de287b1ba9d48dea0b32042a0ecb81dcf41f3614b4cd6c08ca2acc9b2072fbaaf988058b5cad9f87c5d39d9351f6a6af70ec9ba8
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mn.tar.gz 610738 SHA256 c9260efca0eab884b9737c1cd04621f7a53ee3cfef6adea9642a61da83f3b82f SHA512 1afe1ba10cad41cbb30f26b6e79d93283bd3a9ba0f1da4b85d47a5d8235e45fccc1a8fa69d898636cb84d37ea284d48a9b9d58b1f5aba3e3f8b1945b6ebacf18 WHIRLPOOL f9e9b4a1e53137668b33644daa06f8e90ee29d8e4a9bba4d38ab41ef6cb3d19fd8a16adc9897b99157fef40e37a0da11467960152a4d666c60a17d8f2fbafb2d
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mni.tar.gz 534278 SHA256 b88bdde76dede107561b2bee2da332026ffa730a85a4ebadd214ff983cb4b697 SHA512 ffe7af779281928f14e07b58d5eda23d7c20e99ff920be2c4c1374c2f1a72bcf377eaac768109fdf76b4f14775af0aac45e266c6202f5887d909bd7d94837de6 WHIRLPOOL 850407d24da44494d6b9c439f738eb12b2933dc111012df89b723f4654090fbb1a38255f9508b98cda9e5416a88bb34627bd5471660574765ad826550f21c4e0
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mr.tar.gz 557093 SHA256 bf3630e6dcd0d058bed16c208bc98812899cfd2d22aaa17adbfa28be9b21cf7c SHA512 a4243b0737eae1ef7b18d9335b6255e1a768402469fac7026b64a109381674dc96b184a0e9b32676a0bf328808452430df855f2b17dcb0bdeb756c141a80669d WHIRLPOOL 0556a97dd2296230fb263ea1c478023280293f7024f13bbc9542ed5397d539c1cb6308beb941ed6e3fa77ef715b8cf962c071b47da902ed7a9be3021a520fe10
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_my.tar.gz 555062 SHA256 7554a8e7fda5e12aadbaf84f65a3ceef9aaaf88a9269ad1cb3c717930722effc SHA512 181835918f7c93783dea406bcdd5803f34402e34a1c7e61e8377792b08d2702ce69388ce390d3e8b0a2fa45cb89008485f01761bd4dabf0e23a8d784c2654f2d WHIRLPOOL 07bbb4feb3517bf945af91c9a2c86d1c68f181b2c49a630092588c93e9564597645dccbd8f52775f2b09fad81a0cd8fb1c35629de155e0348952b8f477c7709d
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nb.tar.gz 3488676 SHA256 ab716c613914bba643aa6a75ea43b89ef2a658c7a78d66f15f665dc6b4462892 SHA512 e9980126f73df9a0334f8c6c3982379feb63f2a3672a27b482d5f20d9cec3a845eabac4ec0731bd0d150240229aba124d4fced9c0d1c4b59155c2deb8572fb6e WHIRLPOOL 9efef7b55ea4d9774a04774c8dd2a3eed9acc08aa002a37228f2d22dadb6136c15e3c00018badd9d65f53c6eb0e0af283a45d0cf073b226b0522ae7a6a3b4cfd
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ne.tar.gz 923157 SHA256 403f6fb98a57ab9b8c96b922f556be618f0bc84ace48d3850dc6abd2495f7ed5 SHA512 a64c1190f7312664a4aff44356668012c4827a192c9ca285a566b41d8d24810f551df01b41b4f1c502f6e84d9b7ee5f6098a0a3a9cbc4cdcbd441e3107261c54 WHIRLPOOL 53c2a787c8f7763bf1fe1059bdcd62aaa98e9c189ebd4ece14eba39885fa9831b09158c5b685feb3b11367dfb456bde6eff0aaf1bdff58e729ae2ff1dbba6c35
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nl.tar.gz 1285652 SHA256 18311df69f0d93b25d537b3705bf149ca257220f36ad2a5ad2f26f05094c0e73 SHA512 63a71adeab3030a26426db9c8644aa58e178b66523d43d08ad34517a6d6be917530dfaaf633a585d6d8497063f4cee34b4a5ecd0773fe9d38d84df8fd86345ca WHIRLPOOL 1402d610832dd9d42f826fe331851d8a1418ad95fff63755888388fabf49f3ee1108fc666154736ec64cf9d8397c10c46c883ae396de8df30676278b699d3f75
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nn.tar.gz 3484722 SHA256 8a31eb2d4fa2c351497ff046a6d1e1bcd801cd5c9aa417e473d07f4bb1587081 SHA512 38894bd7adf6b1a56f3886ea55b92cdfca064fd20d636c4d52039a0958dc5e8eb53927905bfe81044480ed87b9c4f535df349610cccb23326fa39d7995262608 WHIRLPOOL 56a526ede8eddb27bcd649538a6c54ef19ddefd403b620e842210a7b1479d2b1508c77afdcf298d3fc68e585077ac380dee76764088f9f9f3897b28d3f532958
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nr.tar.gz 498886 SHA256 5347d5c3e3e55b2a52d9d6207c700ba2f7a3ef83b0acab24749b29c3809bfa79 SHA512 4f911a8dfe1293ceaf59e61cfaf3a0b51a9b6d4b2c39948a7ab2f28e8c70ac4ee9533469ab8ea5cf87e8f4c6f7f8bf8559cdcf33a9763b44cde3ebd06f0dfdb4 WHIRLPOOL 107bf199588abf19f538cf98955e5c861977935138f08cf37aaa2ce67ea88eb0981c3ef1ba326b5aff4b4359d698830bb7250699d64a453d42033a90a5979d52
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nso.tar.gz 496117 SHA256 ab89cea04a5b408bbef6974b60127b6d53603b5ef98603331f5f35810801489a SHA512 80aaa284585fe7474501a4a65894d40abd5b4026585e66c6ba167731f7bb719cd65b68acc930359b64ba2b7a5acceee2d3affb4def291f931e871b67a05053bc WHIRLPOOL 047e6a8762f7a902aa2ccdc62f188f960bb23485d123abc840e8522700f5651ae6cfe6876022f69f823b3aa64b5de5a5354ba5157a0eb885fee10531ea7ffef3
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_oc.tar.gz 698666 SHA256 8f42d9f8f99bc6060f299aba9576e338c227a0be7dde4148ae4456120db159e1 SHA512 414db01ed14ba1d2d10e9213d81b08eb326024a6935cd7f48e9ed2c32d1776874dafd5a2eb00f7ebaf9370c19ec54b144e296f23265c60967ae6dcece6fb9806 WHIRLPOOL d649d612dc3f88497d13fca059a6c30ce13bde08b80fa715e1bf84d0c1ca9eea596b4b6d144f68bba0e3626246738cf87a837f59a145176a9042f8c0157c50a7
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_om.tar.gz 488145 SHA256 586b189591d9baa69ac7418103b39037bb15e87a239b85410092f523f888c17f SHA512 bbe4ed94eca0303bf07e9f6b5dfe9229fe9d5c13bad07208d8a625efc535ffffe72072e945af71ba231b04dd750e6ef55be0b772c3706bca082f40cf3f930158 WHIRLPOOL 18ef88b4ddf17b47719884918ed78d26d0303ab2ac74b374bc04b21d24a188c85210406937e73a60719ef29d045728f81c94323439afe394bdb1be5f66e1b8c0
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_or.tar.gz 556825 SHA256 0bf8d6dad3c195d6913777392ed7816ee4bdfe344471f0da3a1c1f9006dc8535 SHA512 4f20c94771a9ae17703ad43ec85b260edf6943ca1cfe248c16eab5cda7a8650f1c4900f8a70619e5c1b016624eb7cc244b3a8c2ee8431db9874314b55f157e91 WHIRLPOOL 25a5b6900c02084eb1b6a8de4d8a4c68a292bbba33d01821373bba41a98dd9a89b1537edaa0b96c7600376ad2cce383b633c22bdb44c9bcc204fcdc2f9e332e6
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pa-IN.tar.gz 526743 SHA256 ed363f559c960a4b7c6123fc84634c90f7819db7b8de32582ef3163d8ed219ed SHA512 36a8ce65eb4e205806fd49a70294ffc2aec599a314490f068254b55178a892627260b1f8c16bb2e2411e2e1cf44fb0317af1ac1917bc0cbaa56cc87b3c8fc142 WHIRLPOOL 7d1d7abad271e4a8b7eef1d48ee31aa1e28db89ada306f165d6e9c7dec43a4febfc4b65e6dfb2d8f93352c88cb48475e710aa82b960aea466fec69c4f22bad9e
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pl.tar.gz 3279959 SHA256 f907a63cd62c513ae2264a7557026787ef16bb3e42085b1b27d54adedee1c213 SHA512 64afa320d960a3b3270fd479e6a46ca59c88364cb784f8b5fe8279cf38b69e6680ee287bbec098a5481ed98b401bb1186171cff327bb03bf6a8376fbbf0c2db0 WHIRLPOOL 323e254103b877166d1f2dd04fa3cc89e2e95cea53eb4c1a5250c50abbf9b5c7c96bd3f9ccc1e80368c663c65fa1de4912e9e75f4a3ef32107f1d64dcac1fef1
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt-BR.tar.gz 2578269 SHA256 0a6376081a40fe3da05ed579a3e4082bdca7418be275ceaa4252e406f3f8d9f2 SHA512 b4ecf21591b9a24723e8aa76ea91a27ef3300bbedd81829fd593654b3caa9e997cbb2e91744ba85c27365af11615d2098a38b2c641258f2f785dee12a1a95d2c WHIRLPOOL cf541a81ce8576cbec3125d0e71c0070164ec31494c131af738a20c3b574187bc8d7bea7b2f206b76c95e2fe56d5c571b1b00a63704c89a78daa8d305214507b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt.tar.gz 1131175 SHA256 385f06ca4160961c82573867bda9a9d129c3714447cd7c699d952081e77e3842 SHA512 8edc633f1ca1fa099d919dd4a784227da7119e72a79e5bb8ce8b17801e57751648ad58c15a12b1a2b1868e4d7acf319662cc331d92820a81b79e94c395c7c541 WHIRLPOOL 81a24a6b9be4845ef3b23f235db0e8b79bf8f4d3195616fb4d970b128cd1166f3a99c6820adad86cb6738d462171ffb97005bc9c27f7d981d545c06e2a99e5f0
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ro.tar.gz 2365168 SHA256 84fa05a1234c2509b1a41276106555ab15a88d3d65f21cdd687321114b7453c2 SHA512 02ebda48a77cd48371a5c83d9b6d28f4a0b661e99a75509f4ca5741bdff9617f8f6d4fcd2c7e211697919ad0ab638225dd881a7b108ad4e138ca59c9e3051f2a WHIRLPOOL c8ff15fadefb73aa2a05bf2be90fe9bcc12f265ff648f9a0afcaecc068349c1c142c4db6d3b9f633f9b6deb70a071fade137ff2557fb390774c508f1e53cfd3b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ru.tar.gz 1653921 SHA256 dace8c3104f78aaed69d08b86cd18b03b400d909aa2fe86fc4faf2b4c8cf5495 SHA512 eeb0d54dc22aa7a7d6e342d1875608595dc9c3cfca6be779fbfc1e2cc6e848d6e44f74d806e49ee1afa971c7ab3d380b90df4f97a720d114342a28a5e6e16796 WHIRLPOOL ecfab408f4a0e8472227077bdcbea2f843820772430b993b19cfa1418265464868b2de770ad3084c4a73d55e18b40a5a7b5350ae3c1edcba9d4905d3d828b4db
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_rw.tar.gz 491579 SHA256 dec102a84b934ed7ff46fda872ca84a81641fa0768452bb1d511ed70e02dfc5c SHA512 2b964c6465d0aa940a710720481cc07c442016e0cef71e60450f3e03a59e8a7dd1e614931171172bfeaaac99e6e1c4bce5c727c6058d8813b6cc0740e4cab1ea WHIRLPOOL da3db1cbedcdd4c55c04a2621988feebb585d14c80eca7aff62e4deeaa947eac69b254bb8d874dcc15be7f50518b190f3ab265920381615a2cff9f2cb4f25441
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sa-IN.tar.gz 542701 SHA256 184557215db5f58cd12f61da183e31ab4f2f3763cab4293ce4c8da5120d13486 SHA512 35ef6c48289f42c2cbd0fda0596fa584e4436a0a1c1375dc560236f39abba5da4966f0618ede3fde5158f0865c895cc4ea96e0307440e246469386cff4ae1c13 WHIRLPOOL f1792245e583a2bc95fa7e91133609329d0480a1042c93b6fe2e0658e01dcd523f5e67b1d80fc5f5fc378f74ba63a5a6362a0b6ec1d2761386153b0c82f73bbd
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sat.tar.gz 583603 SHA256 cfc8c0a00a83d23ab7e55e543828cfc4e969e2f78cc3180992dad1a9aa313c23 SHA512 0030938094cbedf7e0b806afb4da08e01edde85b5b2da6fb6f1203bec1a2baaf8153c63668d2d27d35909716e864652aca2171776afb6911756cf1f457eda0fc WHIRLPOOL c84d4cfb160c1e34ef6bc4c025f14207b4870aa1c17a1e1aef068acba1b50efe50533a5fc605e1798c28b22796c81c38377553ecbb9174a8fd14fe9ea2b858ec
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sd.tar.gz 534415 SHA256 f702e094f147df234c7c8bb3fabffb446176698f848121c8699d01974aafe890 SHA512 5574b764c3ef7ac9c676308161bce38963d62e1edc9e8d8d01d2e336c7486b8510d6e47563e815241d0d01ef40565de9abadfbca4cc2a55042498115d97b1852 WHIRLPOOL b908447a14e2ef660fcadcb997084136efc13ee9f525acd31e38be3bf489d6d5503f7d947c9f659ec1f00f9553df8f5145e5d1fb927fa16d4487f9af485c3d3a
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_si.tar.gz 825088 SHA256 831530e9a1b61c6e56fe1934b4c4d955da6d6b2a1771beb947272cddfe720738 SHA512 ed17d0ed6446e4a10bf4cce4d24178ca68a35489587c44b851a21db53de897a1834a1b8e4083bde1dc732a17c6dcc8e17e3587d6414cae53abde5ff98c601981 WHIRLPOOL a4b182d1b9b4e12890c3c050ef0977fc84d35ca16d1a9939a500485a217ab1de2e0f0a93538d48809175f9d2699298a30f761a67ff26e6f02927dd835bd36916
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sid.tar.gz 495466 SHA256 2b04a70fa81f752126b0983a31e9617396ee31cf72abc3994b400a968959f29d SHA512 4b28d2d7830b9d0a880ad0a3b2fd98fde722fee0a07277d97c4ef358e54f0a2e4b0c9f3aa0a066960fb1a6d308e8d42d11119dc1e2034fa163d7efde0dd93f34 WHIRLPOOL b2a7472427d1339ee7e6441c8ab6896c281e5d1504602a3230de0919f2b0893950a711e47e3093284ded1039321ddd2abd5767b8f456f89030ad9a6bffce327e
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sk.tar.gz 1785397 SHA256 59df1ee412349ec08eb5028e17122a21529e9c4e066e94475d486d39196eab62 SHA512 b5e8a88a0c56df7c468ff9b0baac68bf3b72c34f0e3f8782d48ceb9c787249f6aac31397a8fba02dcf2f534427e27624fd4045b0ed4eea9ce86ffd5bffaa2538 WHIRLPOOL 2721a2c660597fb41e66569df5e861ccb4a5ca1070a73daee95538f3266dcbf94134a41731c80937789bc122f69b2cdcee8767008ef02b6e98f78e0e11f7b47e
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sl.tar.gz 2164238 SHA256 2a96515ec51a5d2bc673ba054d84ba57f4f4826a4a6fffad0fea5cf62b64f692 SHA512 79168347e98d1eb739cc4a17a8b22e5cbfa5e50cd59db923d90ef4a8d415b9fe497728b789cf45fa41cd8619ce0af354beaa28ebf1f427fa29ed652a5417975b WHIRLPOOL 8c5459bafa30337caba17a93dcf6d9f1711a644369f335e4946d80a5898d95581d78dfccee281dfe1acb6b674cf5f2be9cf543d0f234e65c49b603f922232607
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sq.tar.gz 510434 SHA256 493697c793e1c3a06b413d3521f4dd39d0411ab3ad8ae65ff512a5bd9a0d44ae SHA512 ae31726ebe1c099339a2be31e2ff6c89762083998eae77e1d8bf698c5b9f37420aeda6ce09d824680c8079b7e659cf5ecdde385765205651a3549bd11c95e9bc WHIRLPOOL a754402d6905e9423903cb5599ab6c2aa45f37ae9c240049648eae42d2fbac0258a90a85ec6d060fdfd5383fd81b6ee8d6851255205a0528126bdf413d6165bb
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1686972 SHA256 9463b7f5a742aa4773281028a878c800402c234ad9da8546ee29f7c0f58c5362 SHA512 c393345665560aa88440a4eee774aef2586218bbbd011dd3a002be60edfdd86c76828f73a16cf63848c9e10b9ac8cfd9af3b9aead82a01f141831edb3e457394 WHIRLPOOL 93916055ba456d3e9c51f0db5b8e5f3da8726b5b3e0fe4a960e168501dae3575f4f6d3454c263ae2cfb8e9f90a353cea21348edfb53922aa0326d8ed915bbd22
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr.tar.gz 1714813 SHA256 6e9fb46bdeb6cf4ccf8564c1458106ed00fa476607b546252ec9825ffc0ffebb SHA512 08e1688d5f110f21d387481662c091496cb3e6d4cc75e29c3430e71ed1b621698f542d80cacd867526a124ebe1edc1fe95d52c3c515fa1468b73acab64c59078 WHIRLPOOL a28c44de575e4bdcf944b1d1a53632abeb06f5e2b772884d70508a0be577e58dc6d11536a325c8f708d36710466740452b7bd142bac1767cc9fe62670c3c1e4d
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ss.tar.gz 496288 SHA256 d7739fc2110e3bc90ce4bc201c3d5bb48e905facb6df0bd60867b92798b58870 SHA512 46d2f8ddbb6ef96e51cb2b8e8a1a326a996adc9d8e4b8e991f4926cc8cb0e332689280f312e360a293c6c26f13c7645b41087ce75b92a99fb34563356711ec7b WHIRLPOOL 04f59e3bb8d18b0645b9f593f7defd1eaf630f6f5b77d3ee094c203a6b3920d5358f1bc6b96cdeecb735ba60381b385393f668423ac771a8a9b7e2c939b8de6d
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_st.tar.gz 494970 SHA256 25619f7c096b8165cc505d6eac9df03bb23375e70d99a60f18bafa10070ff2b1 SHA512 dfde10db36f5e506c26dbe28471a544b2b0bdb48d9d36f4b698b827334ded5640c2d59ff679d1a7ca877d2f57fca957b20a5ea8186b659983e9ddc1396a95fdf WHIRLPOOL 51d86c30e7c3d07f0a49344b5e7261e286c7f90b3796534002c0c83b2ce5e13887f8fcea706e8cb34b7d6d4756e3f6cd8c07b02fcf27895ae80f754972eca712
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sv.tar.gz 2367055 SHA256 572c0c7ff726c621d6128cb0d5d8d681b9bce4ffe7325d6e0aed26e6f2845b95 SHA512 ac647a19d9ebbed394dffd3529064210adc1513fc33577ea9f8c3b5a357a8b59d1d29478c3598c03cba4207e2bca2c6febd2387d45ba106488a8801ce4124ecf WHIRLPOOL 6ca4e7badf956694b5d48da3473beac1fd06247398d2de74c3e0d28caf293615d0c21e839ec591de8b44d5891182724297e4d72104e5ebfbbb245078907183ed
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz 482977 SHA256 c267696a5521781fc8612ac36f63723023ddc07c4740f2f5c08e2784fb7c265d SHA512 4b1c80434a4b5042bd00af5a1716fd0604e360563638affac6d3835837c12dd531f190e041d01471e62348bd8312a0a2916ee7a2d0fdf27e87fe05f71b091f2b WHIRLPOOL 0f733fdbbd7d7b2192ccec896115b0c593921305ff3e7b99785225b68f3fa99a04f3837251432f4de572976e37259c3d2c363fee952acb09e55bd9f2b1bce785
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ta.tar.gz 550867 SHA256 7097d1e86d66ab84575bdef0cdf7463bacb938b7df1853850f7c7e22f3c34f44 SHA512 9066b37f016947b015a4f67ca67e165870a286fe3a43d79d9c6d2105c79a1336d351001f6b860f00c16461d741d766d32b69202d6aca0f386cebf19bfe639c21 WHIRLPOOL d243ef4f9e7cb2751b61d8ff7ad554ba1b89ba45ff7da2033fa4081ee0eb87deaf2a50b7eb88dc77044e10bda114173649626c716452637223dedbe225b2c557
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_te.tar.gz 1108686 SHA256 56c6d0900dfb2d660bfbe5e65d992e4cb4fc1813c0828f3d5fbe9304cb9bd971 SHA512 66aa1a13ee63d6a127d286fc671739998504592976252b43ad85573536267d4ea831252432cb0af06f927b7a8fcb19c2c0e98c72dbe3ca00c9886546c20d80fd WHIRLPOOL 3b509fbe8d38826f57a188a8025898c6312abe685bab26b112821ea6e9eb50a4ec007642e1d0b1ba9c2fd99f7822814e4274fbffa8d6f0ebb7ea3d5c61df95c2
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tg.tar.gz 513738 SHA256 83bf798d510b569492d24f62ec74d9c2981d0aa7b278f8e150002682e97d5d1b SHA512 41129a9dafc9a2a6d79d9a49d86cc78bddfd480bf6e4391ea70449610d79a8dcc950c66c1d167f7fffd9ffd9cc744d16a54b8c4f6260538778cbcafe8100b34a WHIRLPOOL 4961b486ccbd7b966651ace65263bb98f0fd3d6e17758653c353388852904809ecaad920a672c8b87177075facd80de18c9b17029f29c5110dbcdb018d88c864
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_th.tar.gz 694236 SHA256 2d1a67065ad2650ce3de9068b61f4d3fc63d6089c20f63272ae3d15511d4c82c SHA512 5f613de5c281abeea4caefc3c5b8537dc18efe1ba1eba3cb5dd9d915a71c13e56d2322025c3506da4906f8db3f3f8a21a504d6e162008c17ca13d7680fc40c7c WHIRLPOOL 9be9220f6f2c9a56398d5cf8ddb14fa490988f5efeb72ebe221a151645cf5268c36d4ebcd21cc5464d046501b36b2a06372e6cd2c4f2c58fa792b51c3f376338
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tn.tar.gz 487358 SHA256 30da2da6118ff962d730269bfd70a2c5bab1ee5b388977b8ca9be9e1338b0619 SHA512 f74188912b43d67b81a78dd533f48432d3b044bfae73fc1000d84d19af8d0f903bf8e656b39e07a0ebec6bb2a3058114d74ae5c1f603fd1ff4976d4dc2f3e680 WHIRLPOOL 03699c4bf8f0c025a267a5b45e9813ac602d34adff9a73c5c13a64357c4edc14b7d24d67f78a8e65e361c3fc4c71c6809c425d284db5ca7087ce8f5817d4acfd
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tr.tar.gz 536244 SHA256 d8ec55a7a2c1a2d44fe95e85fd33f6825606b8115da139c414b23c29f0debc42 SHA512 9c0b5444848f925722c8547196a12da764bd8a6232af151ed70696c7b323e702acc1b16083b68dea09f22ffab2034d46653dad55645b03688b90179154515a8a WHIRLPOOL adeaa5903e99602525ab7f412bba6e972a67fb951316a59e003c197833f6c5bf373670a4a16a23a53fe5a0ce391d17ba56f9c924a1a48a4586e75646837a05c4
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ts.tar.gz 497443 SHA256 be05666c9c1259a38f9dd86eb7e6b6d72738899dae47084df4cd0e5cfee44d89 SHA512 d4d296841ea80b1d24c1b20a0351e3124ac2e603bb7bb518553eee5d74b461077d44aca673b31548d81a136bcd7694f3b9b2a6257c404c128d891b2b4350ea6a WHIRLPOOL f81e507ce2ab03783eccbb3bf9c0f6e38b7863124e405d9c84bab935f7d2595cfbf43c41036170a60188bbe2b1655decdc73cf2be8417c4df9a6c8fe1987168c
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tt.tar.gz 487962 SHA256 89a0659793f49d011ddbcc69ee50408a21967e2a2ab5594f9ae419c7ca4236bb SHA512 c810df70155caceae411940c9895a8035c9b8f414137b2090746773a7328953e0d749e02d9534da33a3e8f9bfc2003f8be2ac715db35aff7d5b85a90b26d0d02 WHIRLPOOL b992e4c707586740018c59a3969b187eec0b69cc2e787efa6dc46670437f8f4baffbea860cd89c4a1678213c8779b2f8c8aaeb168667fd9d9ad94e1ed0325e8a
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ug.tar.gz 526902 SHA256 799b05e5cf3ba4ea8914340ab87b46a70e376160832b9baac45d663039591631 SHA512 abf5ee5a02e82c19850e84eca47cea9835b25a60d660711728fa4e91726bea84f485e8a54d04a50f52f41d614da1af738dc206e5a9bc7b71466296c324f5c133 WHIRLPOOL 478766319751965bd8c70f5eb3ab93856c77849f03c578c9b8d70c7bde05e4531a76b2b1ef532b2bd175ebcbc59cfdc93c0e747e4534261dd9c8b8d78cbc21cd
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uk.tar.gz 1376217 SHA256 4a78877ef18fbb3b704e35bdc972204e4d33264bb823daced0552fd40e373d12 SHA512 54c24f2d80050db823da5b167c3096967cddf02c98bc70df90ac69208c32fab1392a4481b50f7271fd23e89cb80e5f601d06f8f20248efd04c315692b7e06982 WHIRLPOOL 349e9c28e22b7612b7e1deb018f03fda9da328d60bf86566cb379b76c5f4c8f782dc0bd1ac34e8386f1c34fcfe0954bfb713276055aae5d74e2a228b03c2f9b2
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uz.tar.gz 488003 SHA256 07251f7bfb90c67a6dd338989c7d2956cc81a830e2a04a19e15a4c0bdbc43f8e SHA512 9e25644dd8f436a2d4f5edbe1c099c664fa9dedc888c9d8bdce1f4470666a6bc25cf33000b89817d8c642d88d2d35726e477aa54321ec88be9f6415af1cab86a WHIRLPOOL 9ce80ba2590b7420e0355b9d1e5aa4e67198170a4e5c0f94f18f4d1fb2f2c6dfaf3e14219128d2fb4121de1ac547756a15532b190d50dc073ea2b93a39fb028a
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ve.tar.gz 498431 SHA256 ad25d8cc8b3b4d5e91754892ea0a3672e2c0e7bc45bbab069522a2fbbdfba078 SHA512 0404ed3894c0a42aebc665ea6a747bfb13e1443149beec9d0ed34bb12c6eec514673b4a326f2e5422c3c93c7c40c9c8b81de21508c5d495be67f4845cf4e7437 WHIRLPOOL 706bdcab2b66155e761cba93285766626834df9563929257dca19999591fc66b3a006f50e2f16aeac0f4713311b75323422108b3c8762af381bbdc229b3e4a14
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_vi.tar.gz 527431 SHA256 7d5ddef3d8a50df34ab2efff4cafd66d7b56cd9307f2b7ac95cb6b635eb54f9b SHA512 65c49f7f08d7b1770c14345f186cd0e3e97425c4aa2b6393d660e7bb289d7b2de9f3aaeb2402d54c448e4c6989dbcec8cde8880cf40bf5f1446afa58c6ab00b6 WHIRLPOOL 6ffd90d85204231440d06cd1620b5cb281b36865f408396febc4cc008b647baecd52605a746691294b06da6d90f4eef3edacaf48054e1341f1ac32863b73f945
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_xh.tar.gz 504315 SHA256 a14952cbe44b23ef03859321e043f13183f2298b1688328c22bd0d7f15f85e09 SHA512 bb968471aaf21835a1f84086df84247fc18fa905b76c7b89a85b4072c53974f1b116cd4dbcfd53dc2be6824940dd5e23f7097bfe10fea614b4288bcfd916236b WHIRLPOOL 73289aeccabd9a2e646cfa27099785700ba1989a4c63ce161a0370702d4d865676d1dcaff8a6ee0caa9c0e6258e80ea42ef013470c72d25e3b4691873fab9b5b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 575863 SHA256 ed83f26fd4264a8a7f6b9ad5200a80df1a35c0022840b881906a20febc1466e7 SHA512 b988069435bd06bb7b85e09de2771ee50a35033873f30ca881a462d339821164db6c33e04d3389cd3a7ab7fe9d2568e49fa013af3791fb9edb163fd465bf21e5 WHIRLPOOL 762f7b429dc9709b63e3b92268b5ee1f2c6a456499a899789eb09cba9a930cdfaa75d90df45eafb3d4bb23256988ba333a8764a826a3260d1ad75267edfb017b
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 572775 SHA256 0ccea824f91b2f70b9337eb5b8ab2fcc5264b987f31381a05ac6f1d197693ae2 SHA512 51894f8326e2d21f36c56254c13e007e6e6949f1e7c68b3b71572a5813f8252c1e15721b706ab20a6c0c42d7d913b9e623498eb1c5b7033951dd4be2709c5f71 WHIRLPOOL 3c0b18e0527f1c750ad1befe0a9f3010ebd31aec13390648c7b95ed3abbeb9428316e1393c491182422712afb28085b4be13fedaea8dbe7741269ca82b600b78
+DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zu.tar.gz 506160 SHA256 b5cbe78cf50776b6e6115b15d1f25f367d49a58b24b077364006089962d182a0 SHA512 e85cc67ca98e537bdae684d19bbfc70d7dda75ba602f57c983aa4ff5e8e39e5c5d9d24cd8f04e7ee07e10b757e74af6db158bcff19b79fab5825ee2c53f4c1c7 WHIRLPOOL 4eedf72373e098d1276382ca9cd2ef18debad2e97faca18de5b4514f4d3c4dda8e3e43d2bd8958dd646f2d36b13bb983cc6b87185b7ad64622cdf30a08b0fb21
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild
new file mode 100644
index 000000000000..875cd6b0ad72
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit rpm eutils multilib versionator
+
+MY_PV=$(get_version_component_range 1-3)
+
+DESCRIPTION="Translations for the Libreoffice suite"
+HOMEPAGE="http://www.libreoffice.org"
+BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm"
+BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+#
+# when changing the language lists, please be careful to preserve the spaces (bug 491728)
+#
+LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
+
+for lang in ${LANGUAGES_HELP}; do
+ helppack=""
+ [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+ helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
+ SRC_URI+=" linguas_${lang}? ( ${helppack} )"
+done
+for lang in ${LANGUAGES}; do
+ langpack=""
+ [[ ${lang} == en ]] \
+ || langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
+ [[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
+ IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+RDEPEND+="app-text/hunspell"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ default
+
+ local lang dir rpmdir
+
+ # First remove dictionaries, we want to use system ones.
+ find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"
+
+ for lang in ${LANGUAGES}; do
+ # break away if not enabled; paludis support
+ use_if_iuse linguas_${lang} || continue
+
+ dir=${lang/_/-}
+
+ # for english we provide just helppack, as translation is always there
+ if [[ ${lang} != en ]]; then
+ rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+ rpm_unpack ./${rpmdir}/*.rpm
+ fi
+ if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
+ [[ ${lang} == en ]] && dir="en-US"
+ rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
+ [[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"
+ rpm_unpack ./${rpmdir}/*.rpm
+ fi
+ done
+}
+
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+ local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
+ # Condition required for people that do not install anything eg no linguas
+ # or just english with no offlinehelp.
+ if [[ -d "${dir}" ]] ; then
+ insinto /usr/$(get_libdir)/${PN/-l10n/}/
+ doins -r "${dir}"/*
+ fi
+ # remove extensions that are in the l10n for some weird reason
+ rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \
+ die "Failed to remove extensions"
+}
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 9e10669e35f6..b46329cc0eea 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,4 +1,5 @@
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
+DIST 17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz 1803092 SHA256 f62df3315b87d61544d7733e99ceccece046c813b60b898109d98808ca8bd88c SHA512 95a7e4b958ae3a4bdb5118d0ca530dacbd371f408657289f23e5e9995ac6032b9b015fae78b2ee746c4cbad3edba8f8be812457a67ec7cabf3b13fac16db4898 WHIRLPOOL 1784d2526587564fbf3bd564ef801c1c0173ee1533fa5ed3406b41e764f256fa36f6ffc3834a1c748fafe4b0fa3bd909ae18befe5b82f409bc358237de82106c
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
deleted file mode 100644
index 370b4aaa4e7a..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001
-From: "Andreas K. Huettel (dilfridge)"
-Date: Sun, 4 Jan 2015 15:33:35 +0100
-Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for
- sh=dash users
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Original patch by Rémi Cardona
-
-Change-Id: I815567df8a868c3997e8ac357b8529fded28c950
-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454
-Reviewed-on: https://gerrit.libreoffice.org/13731
-Reviewed-by: Caolán McNamara
-Tested-by: Caolán McNamara
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8aa33d0..5dbe640 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11483,9 +11483,8 @@ test_font_map()
- FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')"
-
- TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'"
-- while true ; do
-+ while test "$#" -ge 1 ; do
- MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift
-- test -n "$MAPPING" || break
- TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'"
- done
- if test $TESTEXPR
---
-2.3.0
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
deleted file mode 100644
index 2833385a1adf..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001
-From: David Tardon
-Date: Sun, 11 Jan 2015 13:08:37 +0100
-Subject: OSL_ENSURE was not declared in this scope
-
-Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99
-
-diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
-index 86986fc..df4a63f 100644
---- a/tubes/source/conference.cxx
-+++ b/tubes/source/conference.cxx
-@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject *
-
- void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel )
- {
-- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel");
-+ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel");
- if (mpChannel)
- g_object_unref( mpChannel);
- if (mpAccount)
-@@ -297,7 +297,7 @@ bool TeleConference::offerTube()
- {
- INFO_LOGGER( "TeleConference::offerTube");
-
-- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel");
-+ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel");
- if (!mpChannel)
- return false;
-
-@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube)
- {
- INFO_LOGGER( "TeleConference::setTube");
-
-- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed");
-+ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed");
-
- pImpl->mpTube = pTube;
-
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
deleted file mode 100644
index d4c4d28bbca1..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski
-Date: Wed, 26 Nov 2014 13:35:42 +0100
-Subject: Add kde4-open-url script
-
-Adds a KDE4 specific URL processing script.
-
-Change-Id: I0116fa95f076a5772e88c616e93de542fe4fe4e4
-
-diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk
-index c5e4978..162bcc5 100644
---- a/shell/Package_scripts_kde.mk
-+++ b/shell/Package_scripts_kde.mk
-@@ -9,6 +9,12 @@
-
- $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc))
-
-+ifeq ($(ENABLE_KDE),TRUE)
- $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh))
-+endif
-+
-+ifeq ($(ENABLE_KDE4),TRUE)
-+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh))
-+endif
-
- # vim: set shiftwidth=4 tabstop=4 noexpandtab:
-diff --git a/shell/source/unix/misc/kde4-open-url.sh b/shell/source/unix/misc/kde4-open-url.sh
-new file mode 100755
-index 0000000..e5b8125
---- /dev/null
-+++ b/shell/source/unix/misc/kde4-open-url.sh
-@@ -0,0 +1,22 @@
-+#!/bin/sh
-+#
-+# This file is part of the LibreOffice project.
-+#
-+# This Source Code Form is subject to the terms of the Mozilla Public
-+# License, v. 2.0. If a copy of the MPL was not distributed with this
-+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+#
-+# This file incorporates work covered by the following license notice:
-+#
-+# Licensed to the Apache Software Foundation (ASF) under one or more
-+# contributor license agreements. See the NOTICE file distributed
-+# with this work for additional information regarding copyright
-+# ownership. The ASF licenses this file to you under the Apache
-+# License, Version 2.0 (the "License"); you may not use this file
-+# except in compliance with the License. You may obtain a copy of
-+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-+#
-+
-+# use kde-open or xdg-open if available, falling back to our own open-url
-+kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null
-+exit 0
---
-cgit v0.10.2
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
deleted file mode 100644
index 7cb33b98fd32..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-Merged upstream commits:
-
-88e16529fc7b0e312b68e38295348c93b437aad8 "tdf#92110 KDE4: cleanup IsNativeControlSupported"
-57792314c7b05f71c66834ee47bfaa09003df765 "tdf#92115 KDE4: better listbox theming"
-
-
-diff -u b/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
---- b/vcl/unx/kde4/KDESalGraphics.cxx
-+++ b/vcl/unx/kde4/KDESalGraphics.cxx
-@@ -85,47 +85,43 @@
-
- bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part )
- {
-- if (type == CTRL_PUSHBUTTON) return true;
--
-- if (type == CTRL_MENUBAR) return true;
--
-- if (type == CTRL_MENU_POPUP) return true;
--
-- if (type == CTRL_EDITBOX) return true;
--
-- if (type == CTRL_COMBOBOX) return true;
--
-- if (type == CTRL_TOOLBAR) return true;
--
-- if (type == CTRL_CHECKBOX) return true;
--
-- if (type == CTRL_LISTBOX) return true;
--
-- if (type == CTRL_LISTNODE) return true;
--
-- if (type == CTRL_FRAME) return true;
--
-- if (type == CTRL_SCROLLBAR) return true;
--
-- if (type == CTRL_WINDOW_BACKGROUND) return true;
--
-- if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true;
--
-- // no spinbuttons for KDE, paint spinbox complete
-- //if (type == CTRL_SPINBUTTONS) return true;
--
-- if (type == CTRL_GROUPBOX) return true;
--
-- if (type == CTRL_FIXEDLINE) return true;
--
-- if (type == CTRL_TOOLTIP) return true;
-+ switch (type)
-+ {
-+ case CTRL_PUSHBUTTON:
-+ case CTRL_RADIOBUTTON:
-+ case CTRL_CHECKBOX:
-+ case CTRL_TOOLTIP:
-+ case CTRL_PROGRESS:
-+ case CTRL_LISTNODE:
-+ return (part == PART_ENTIRE_CONTROL);
-+
-+ case CTRL_MENUBAR:
-+ case CTRL_MENU_POPUP:
-+ case CTRL_EDITBOX:
-+ case CTRL_COMBOBOX:
-+ case CTRL_TOOLBAR:
-+ case CTRL_FRAME:
-+ case CTRL_SCROLLBAR:
-+ case CTRL_WINDOW_BACKGROUND:
-+ case CTRL_GROUPBOX:
-+ case CTRL_FIXEDLINE:
-+ return true;
-+
-+ case CTRL_LISTBOX:
-+ return (part == PART_ENTIRE_CONTROL
-+ || part == PART_SUB_EDIT
-+ || part == PART_WINDOW
-+ || part == PART_BUTTON_DOWN);
-
-- if (type == CTRL_RADIOBUTTON) return true;
-+ case CTRL_SPINBOX:
-+ return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
-
-- if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA) )
-- return true;
-+ case CTRL_SLIDER:
-+ return (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA);
-
-- if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true;
-+ default:
-+ break;
-+ }
-
- return false;
- }
-@@ -221,15 +217,15 @@
- const ImplControlValue& value,
- const OUString& )
- {
-- if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))
-- lastPopupRect = QRect();
--
-- // put not implemented types here
-- if (type == CTRL_SPINBUTTONS)
-- {
-+ bool nativeSupport = IsNativeControlSupported( type, part );
-+ if( ! nativeSupport ) {
-+ assert( ! nativeSupport && "drawNativeControl called without native support!" );
- return false;
- }
-
-+ if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM ))
-+ lastPopupRect = QRect();
-+
- bool returnVal = true;
-
- QRect widgetRect = region2QRect(rControlRegion);
-@@ -414,24 +410,26 @@
- }
- else if (type == CTRL_LISTBOX)
- {
-- if( part == PART_WINDOW )
-- {
-- lcl_drawFrame( QStyle::PE_Frame, m_image,
-- vclStateValue2StateFlag(nControlState, value) );
-- }
-- else
-- {
-- QStyleOptionComboBox option;
-- if (part == PART_SUB_EDIT)
-- {
-+ QStyleOptionComboBox option;
-+ switch (part) {
-+ case PART_WINDOW:
-+ lcl_drawFrame( QStyle::PE_Frame, m_image,
-+ vclStateValue2StateFlag(nControlState, value) );
-+ break;
-+ case PART_SUB_EDIT:
- draw( QStyle::CE_ComboBoxLabel, &option, m_image,
- vclStateValue2StateFlag(nControlState, value) );
-- }
-- else
-- {
-+ break;
-+ case PART_ENTIRE_CONTROL:
-+ draw( QStyle::CC_ComboBox, &option, m_image,
-+ vclStateValue2StateFlag(nControlState, value) );
-+ break;
-+ case PART_BUTTON_DOWN:
-+ m_image->fill( Qt::transparent );
-+ option.subControls = QStyle::SC_ComboBoxArrow;
- draw( QStyle::CC_ComboBox, &option, m_image,
- vclStateValue2StateFlag(nControlState, value) );
-- }
-+ break;
- }
- }
- else if (type == CTRL_LISTNODE)
-@@ -652,6 +650,12 @@
- const OUString&,
- Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
- {
-+ bool nativeSupport = IsNativeControlSupported( type, part );
-+ if( ! nativeSupport ) {
-+ assert( ! nativeSupport && "drawNativeControl called without native support!" );
-+ return false;
-+ }
-+
- bool retVal = false;
-
- QRect boundingRect = region2QRect( controlRegion );
-@@ -733,8 +737,6 @@
- {
- case PART_ENTIRE_CONTROL:
- {
-- int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
--
- // find out the minimum size that should be used
- // assume contents is a text ling
- int nHeight = QApplication::fontMetrics().height();
-@@ -747,8 +749,10 @@
- // FIXME: why this difference between comboboxes and listboxes ?
- // because a combobox has a sub edit and that is positioned
- // inside the outer bordered control ?
-- if( type == CTRL_COMBOBOX )
-+ if( type == CTRL_COMBOBOX ) {
-+ int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
- contentRect.adjust(-size,-size,size,size);
-+ }
- retVal = true;
- break;
- }
-@@ -761,13 +765,22 @@
- retVal = true;
- break;
- case PART_SUB_EDIT:
-+ {
- contentRect = QApplication::style()->subControlRect(
- QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxEditField );
-
-- contentRect.translate( boundingRect.left(), boundingRect.top() );
-+ int hmargin = QApplication::style()->pixelMetric(
-+ QStyle::PM_FocusFrameHMargin, &styleOption);
-+ int vmargin = QApplication::style()->pixelMetric(
-+ QStyle::PM_FocusFrameVMargin, &styleOption);
-+
-+ contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );
-+ contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
-+ boundingRect = contentRect;
-
- retVal = true;
- break;
-+ }
- case PART_WINDOW:
- retVal = true;
- break;
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
deleted file mode 100644
index 2247781443bd..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From e7352d5ada69f212dc813c4cbd257d036e7a27c8 Mon Sep 17 00:00:00 2001
-From: Juergen Funk
-Date: Fri, 3 Jul 2015 08:33:03 +0200
-Subject: tdf#92517 KDE4-FileDialog: "Save as" has wrong Filter
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixing follow
- - The order of calling: first should be set the filter, after
- that can be set the current filter
- - change the function from "setCurrentFilter" to "setCurrentItem"
- When you set the filter over "setCurrentFilter" you need the full
- search string "extention|description" e.g. "*.docx|Microsoft Word.."
- - Not need the escape of slash (with that can not find
- "Microsoft Word 2007/2010 XML (.docx))"
-
-Change-Id: Ie4f7d6fd619b391487ee944c3e745c855600ee54
-Reviewed-on: https://gerrit.libreoffice.org/16721
-Tested-by: Jenkins
-Reviewed-by: Katarina Behrens
-(cherry picked from commit a93cfd5afb9072de00fc4b2a070f23ebdad6e4fe)
-Reviewed-on: https://gerrit.libreoffice.org/16890
-Reviewed-by: Caolán McNamara
-Tested-by: Caolán McNamara
-
-diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
-index 4615bd4..a638955 100644
---- a/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -250,6 +250,10 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
-
- _dialog->clearFilter();
- _dialog->setFilter(_filter);
-+
-+ if(!_currentFilter.isNull())
-+ _dialog->filterWidget()->setCurrentItem(_currentFilter);
-+
- _dialog->filterWidget()->setEditable(false);
-
- VCLKDEApplication::preDialogSetup();
-@@ -384,9 +388,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
- return Q_EMIT setCurrentFilterSignal( title );
- }
-
-- QString t = toQString(title);
-- t.replace("/", "\\/");
-- _dialog->filterWidget()->setCurrentFilter(t);
-+ _currentFilter = toQString(title);
- }
-
- OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
-@@ -633,6 +635,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence &args )
- }
-
- _filter.clear();
-+ _currentFilter.clear();
-
- // parameter checking
- uno::Any arg;
-diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
-index 98e9af6..ff3a8602 100644
---- a/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -66,6 +66,8 @@ protected:
-
- //running filter string to add to dialog
- QString _filter;
-+ // string to set the current filter
-+ QString _currentFilter;
-
- //mapping of SAL control ID's to created custom controls
- QHash _customWidgets;
---
-cgit v0.10.2
-
diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
deleted file mode 100644
index d0350e489697..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-Merged upstream commits:
-
-6fc55b9abd783b624241d56e34751ea495adbd7d "KDE4: actually apply file dialog operation mode"
-b613270a730ace29dd1b16b29be2222b34f34a5d "KDE4: improve default load and save dialog titles"
-2b999dd6da5a90db66afe852a007fab8c62ffaec "vcl: kde4: loplugin:staticmethods"
-3e8c14df67a43d3088ed7df0a2b0d96a4bc42d57 "tdf#92353 FileSave: Not confirmed for overwrite a file (unix)"
-
-
-diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
---- b/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -58,6 +58,8 @@
-
- #include "generic/geninst.h"
-
-+#include "svids.hrc"
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::ui::dialogs;
- using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-@@ -109,7 +111,6 @@
-
- KDE4FilePicker::KDE4FilePicker( const uno::Reference& )
- : KDE4FilePicker_Base(_helperMutex)
-- , _resMgr( ResMgr::CreateResMgr("fps_office") )
- , allowRemoteUrls( false )
- {
- _extraControls = new QWidget();
-@@ -128,8 +129,6 @@
- #endif
-
- setMultiSelectionMode( false );
-- //default mode
-- _dialog->setOperationMode(KFileDialog::Opening);
-
- // XExecutableDialog functions
- connect( this, SIGNAL( setTitleSignal( const OUString & ) ),
-@@ -202,7 +201,6 @@
- SalYieldMutexReleaser aReleaser;
- return Q_EMIT cleanupProxySignal();
- }
-- delete _resMgr;
- delete _dialog;
- }
-
-@@ -524,6 +522,24 @@
- return toOUString(label);
- }
-
-+QString KDE4FilePicker::getResString( sal_Int16 aRedId )
-+{
-+ QString aResString;
-+
-+ if( aRedId < 0 )
-+ return aResString;
-+
-+ try
-+ {
-+ aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString());
-+ }
-+ catch(...)
-+ {
-+ }
-+
-+ return aResString.replace('~', '&');
-+}
-+
- void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
- {
- QWidget* widget = 0;
-@@ -532,37 +548,37 @@
- switch (controlId)
- {
- case CHECKBOX_AUTOEXTENSION:
-- resId = STR_SVT_FILEPICKER_AUTO_EXTENSION;
-+ resId = STR_FPICKER_AUTO_EXTENSION;
- break;
- case CHECKBOX_PASSWORD:
-- resId = STR_SVT_FILEPICKER_PASSWORD;
-+ resId = STR_FPICKER_PASSWORD;
- break;
- case CHECKBOX_FILTEROPTIONS:
-- resId = STR_SVT_FILEPICKER_FILTER_OPTIONS;
-+ resId = STR_FPICKER_FILTER_OPTIONS;
- break;
- case CHECKBOX_READONLY:
-- resId = STR_SVT_FILEPICKER_READONLY;
-+ resId = STR_FPICKER_READONLY;
- break;
- case CHECKBOX_LINK:
-- resId = STR_SVT_FILEPICKER_INSERT_AS_LINK;
-+ resId = STR_FPICKER_INSERT_AS_LINK;
- break;
- case CHECKBOX_PREVIEW:
-- resId = STR_SVT_FILEPICKER_SHOW_PREVIEW;
-+ resId = STR_FPICKER_SHOW_PREVIEW;
- break;
- case CHECKBOX_SELECTION:
-- resId = STR_SVT_FILEPICKER_SELECTION;
-+ resId = STR_FPICKER_SELECTION;
- break;
- case PUSHBUTTON_PLAY:
-- resId = STR_SVT_FILEPICKER_PLAY;
-+ resId = STR_FPICKER_PLAY;
- break;
- case LISTBOX_VERSION:
-- resId = STR_SVT_FILEPICKER_VERSION;
-+ resId = STR_FPICKER_VERSION;
- break;
- case LISTBOX_TEMPLATE:
-- resId = STR_SVT_FILEPICKER_TEMPLATES;
-+ resId = STR_FPICKER_TEMPLATES;
- break;
- case LISTBOX_IMAGE_TEMPLATE:
-- resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE;
-+ resId = STR_FPICKER_IMAGE_TEMPLATE;
- break;
- case LISTBOX_VERSION_LABEL:
- case LISTBOX_TEMPLATE_LABEL:
-@@ -581,16 +597,7 @@
- case CHECKBOX_PREVIEW:
- case CHECKBOX_SELECTION:
- {
-- QString label;
--
-- if (_resMgr && resId != -1)
-- {
-- OUString s(ResId(resId, *_resMgr).toString());
-- label = toQString(s);
-- label.replace("~", "&");
-- }
--
-- widget = new QCheckBox(label, _extraControls);
-+ widget = new QCheckBox(getResString(resId), _extraControls);
-
- // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify
- // code, but the checkbox is hidden and ignored
-@@ -719,8 +726,23 @@
- 1 );
- }
-
-- _dialog->setOperationMode(operationMode);
-- _dialog->setConfirmOverwrite(true);
-+ _dialog->setOperationMode( operationMode );
-+
-+ sal_Int16 resId = -1;
-+ switch (_dialog->operationMode())
-+ {
-+ case KFileDialog::Opening:
-+ resId = STR_FPICKER_OPEN;
-+ break;
-+ case KFileDialog::Saving:
-+ resId = STR_FPICKER_SAVE;
-+ _dialog->setConfirmOverwrite( true );
-+ break;
-+ default:
-+ break;
-+ }
-+
-+ _dialog->setCaption(getResString(resId));
- }
-
- void SAL_CALL KDE4FilePicker::cancel()
-diff -u b/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
---- b/vcl/unx/kde4/KDE4FilePicker.hxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
-@@ -41,8 +41,6 @@
- class QWidget;
- class QLayout;
-
--class ResMgr;
--
- typedef ::cppu::WeakComponentImplHelper5
- < ::com::sun::star::ui::dialogs::XFilePicker2
- , ::com::sun::star::ui::dialogs::XFilePicker3
-@@ -61,8 +59,6 @@
-
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener;
-
-- ResMgr *_resMgr;
--
- //the dialog to display
- KFileDialog* _dialog;
-
-@@ -225,6 +221,8 @@
- //add a custom control widget to the file dialog
- void addCustomControl(sal_Int16 controlId);
-
-+ static QString getResString( sal_Int16 aRedId );
-+
- private Q_SLOTS:
- void cleanupProxy();
- void checkProtocol();
diff --git a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch b/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch
deleted file mode 100644
index f4ee9859c2b3..000000000000
--- a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From ef126328c3ad35d51395abc461c3d64429f91c26 Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski
-Date: Thu, 30 Jul 2015 18:10:03 +0200
-Subject: tdf#92903 KDE4: fix listbox regression from 92115
-
-So at least in case of the CTRL_LISTBOX, getNativeControlRegion is
-called for a type and part unsupported by IsNativeControlSupported.
-
-For whatever reason, this results in broken listboxes drawn in
-Base's "Table Design" dialog, when selecting "field type", which
-draws the listbox on top of the cell.
-
-To make it worse, it seems the listbox is actually drawn to a
-smaller space then the actual requirement. Appearently it seems to
-use the content rect, instead of the bounding rect.
-
-So in addition to fixing the drawing, this patch increases the
-listbox bounding rect, which looks too large in normal dialogs, but
-makes the Base's listbox better readable.
-
-Change-Id: I112ec038fd20ad33facd260d16b5d68b508d2bd0
-Reviewed-on: https://gerrit.libreoffice.org/17438
-Reviewed-by: Katarina Behrens
-Tested-by: Katarina Behrens
-
-diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
-index 3e79e1e..eeb741f 100644
---- a/vcl/unx/kde4/KDESalGraphics.cxx
-+++ b/vcl/unx/kde4/KDESalGraphics.cxx
-@@ -108,10 +108,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par
- return true;
-
- case CTRL_LISTBOX:
-- return (part == PART_ENTIRE_CONTROL
-- || part == PART_SUB_EDIT
-- || part == PART_WINDOW
-- || part == PART_BUTTON_DOWN);
-+ return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
-
- case CTRL_SPINBOX:
- return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE);
-@@ -650,12 +647,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
- const OUString&,
- Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion )
- {
-- bool nativeSupport = IsNativeControlSupported( type, part );
-- if( ! nativeSupport ) {
-- assert( ! nativeSupport && "drawNativeControl called without native support!" );
-- return false;
-- }
--
- bool retVal = false;
-
- QRect boundingRect = region2QRect( controlRegion );
-@@ -753,6 +744,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
- int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2;
- contentRect.adjust(-size,-size,size,size);
- }
-+ else {
-+ int hmargin = QApplication::style()->pixelMetric(
-+ QStyle::PM_FocusFrameHMargin, &styleOption);
-+ int vmargin = QApplication::style()->pixelMetric(
-+ QStyle::PM_FocusFrameVMargin, &styleOption);
-+ boundingRect.translate( -hmargin, -vmargin );
-+ boundingRect.adjust( -hmargin, -vmargin, 2 * hmargin, 2 * vmargin );
-+ }
- retVal = true;
- break;
- }
-@@ -776,7 +775,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part,
-
- contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin );
- contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin );
-- boundingRect = contentRect;
-
- retVal = true;
- break;
---
-cgit v0.10.2
-
diff --git a/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch
new file mode 100644
index 000000000000..539ef7e1f3fe
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch
@@ -0,0 +1,30 @@
+From e451b03e8c21ad23cb1abfd6dd68b6d1e8188121 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?=
+Date: Mon, 7 Mar 2016 13:19:55 +0000
+Subject: gtktiledviewer needs gtk3 not gtk2
+
+Change-Id: Iede2008139cb570ff65202762e92f6694548a065
+
+diff --git a/Repository.mk b/Repository.mk
+index e9cd89a..423d58b 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -68,13 +68,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \
+ svptest \
+ svpclient \
+ pixelctl ) \
+- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
++ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \
+ $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \
+ outdevgrind) \
+ vcldemo \
+ tiledrendering \
+ mtfdemo \
+- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
++ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
+ ))
+
+ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
+--
+cgit v0.10.2
+
diff --git a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
index 903ff349d6fb..56ec41944e48 100644
--- a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild
@@ -96,8 +96,7 @@ unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
@@ -259,6 +258,9 @@ PATCHES=(
# submitted upstream
"${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
+ # taken from 5.1 branch
+ "${FILESDIR}/${PN}-5.1.1.3-gtk3.patch" # Gentoo bug 575732
+
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 9593c326797c..4686600c380e 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -59,7 +59,7 @@ unset DEV_URI
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
- "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ "${ADDONS_URI}/17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
@@ -122,7 +122,7 @@ COMMON_DEPEND="
dev-libs/expat
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.8.1.1:=
- >=dev-libs/liborcus-0.9.0
+ >=dev-libs/liborcus-0.11.1
>=dev-libs/librevenge-0.0.1
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
@@ -529,11 +529,10 @@ src_install() {
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
- newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
+ newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
- rm -rf "${ED}"etc/ || die
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild
index 7a48874d4177..c8c4b3fb4f50 100644
--- a/app-portage/gentoopm/gentoopm-9999.ebuild
+++ b/app-portage/gentoopm/gentoopm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -8,9 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
inherit distutils-r1
#if LIVE
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
- https://anongit.gentoo.org/git/proj/${PN}.git
- https://bitbucket.org/mgorny/${PN}.git"
+EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
inherit git-r3
#endif
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
index 479205d49599..a52e99262ff7 100644
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE=""
DEPEND=""
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 7bb337be4d1f..6cb9ef3193b5 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,5 +1,4 @@
DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22
DIST poppler-0.38.0.tar.xz 1637772 SHA256 6f0c0d49c8346d7c0cfe6348124e7f19cc901b5d35c9cd89944aac6e454e8a8b SHA512 1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9 WHIRLPOOL 05a75ca4ed3741273eefe003026caa1f9bb1e3d9f08d1e3885d2fddd7704349434b6deb1f9e755312d7a5b040e85435b0baa92f4934c4d220b1ea8625ebff4f5
-DIST poppler-0.40.0.tar.xz 1642708 SHA256 bc0da278d6038ffc9cd2b8c1bba530a6ec7c072a593219a48f0a52a600ee6ead SHA512 0f26f342a4f70ebc65848c61e5eb1a182d539a8e4cdc5fa499c52765d15867e13ee7c595773d2e8d6f2eb3e83e1c19f35cc6bb47f8aeb87a8ad92e45ecff50cd WHIRLPOOL 00d887401f8438718fcee34e326c7a71970ce7e1c3071a142cef365bdd77301d77b1c9488fa80a58a0baca8fb0c8a2fb0a327867b8b8381b8eecb5f14609bec2
DIST poppler-0.41.0.tar.xz 1655448 SHA256 420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b SHA512 b2b99ac056efaae26f0bffc20756f17524011b7718a554ff48901422e7ab8caa4f879b800eacce1af5ae468346fa0beb569a4378f028a7d7cf0c9cc45f0d2402 WHIRLPOOL 565bc504b5b02ac612b267bb5d5746dc9d90b2c7f8959e2fecc58bdcc4c588f8f234d4bc9cc8086846c23643fa0abc8dba352c8a083056b95d58056281a5bc7a
DIST poppler-0.42.0.tar.xz 1674024 SHA256 9fef076ffe2a4f18a4e0da547d814ef5c5e6f8a283afe3387504a0bb1a418010 SHA512 ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19 WHIRLPOOL 095986b44875847d471ecda35194eeb894051b689a754dc8ae55caa04100b4e2ebd57fe868008972502d27346eeb98699fa9660b414ececef4d0eafe53265736
diff --git a/app-text/poppler/poppler-0.40.0-r1.ebuild b/app-text/poppler/poppler-0.40.0-r1.ebuild
deleted file mode 100644
index 0346703d54ab..000000000000
--- a/app-text/poppler/poppler-0.40.0-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-if [[ "${PV}" == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
- SLOT="0/9999"
-else
- SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/58" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="http://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
- >=media-libs/fontconfig-2.6.0
- >=media-libs/freetype-2.3.9
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- >=x11-libs/cairo-1.10.0
- introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2 )
- png? ( media-libs/libpng:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
- )
- tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- cjk? ( >=app-text/poppler-data-0.4.4 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
- "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
- "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
- "${FILESDIR}/${PN}-0.40-FindQt4.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Clang doesn't grok this flag, the configure nicely tests that, but
- # cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
- sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT4_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_XPDF_HEADERS=ON
- $(cmake-utils_use_enable curl LIBCURL)
- $(cmake-utils_use_enable cxx CPP)
- $(cmake-utils_use_enable utils)
- $(cmake-utils_use_with cairo)
- $(cmake-utils_use_with introspection GObjectIntrospection)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4)
- $(cmake-utils_use_find_package qt5 Qt5Core)
- $(cmake-utils_use_with tiff)
- )
- if use jpeg2k; then
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
- else
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
- fi
- if use lcms; then
- mycmakeargs+=(-DENABLE_CMS=lcms2)
- else
- mycmakeargs+=(-DENABLE_CMS=)
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != 9999 ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index b10c1df28bc2..d7c5ef7461db 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -2,8 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
+CMAKE_WARN_UNUSED_CLI=1
inherit cmake-utils toolchain-funcs xdg-utils
if [[ "${PV}" == "9999" ]] ; then
@@ -13,14 +14,14 @@ if [[ "${PV}" == "9999" ]] ; then
else
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/52" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+ SLOT="0/59" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
HOMEPAGE="http://poppler.freedesktop.org/"
LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
# No test data provided
RESTRICT="test"
@@ -38,6 +39,7 @@ COMMON_DEPEND="
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:2= )
lcms? ( media-libs/lcms:2 )
+ nss? ( >=dev-libs/nss-3.19:0 )
png? ( media-libs/libpng:0= )
qt4? (
dev-qt/qtcore:4
@@ -86,17 +88,22 @@ src_configure() {
-DBUILD_CPP_TESTS=OFF
-DENABLE_SPLASH=ON
-DENABLE_ZLIB=ON
+ -DENABLE_ZLIB_UNCOMPRESS=OFF
-DENABLE_XPDF_HEADERS=ON
- $(cmake-utils_use_enable curl LIBCURL)
- $(cmake-utils_use_enable cxx CPP)
- $(cmake-utils_use_enable utils)
- $(cmake-utils_use_with cairo)
- $(cmake-utils_use_with introspection GObjectIntrospection)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with png)
- $(cmake-utils_use_with qt4)
+ -DENABLE_LIBCURL="$(usex curl)"
+ -DENABLE_CPP="$(usex cxx)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DSPLASH_CMYK=OFF
+ -DUSE_FIXEDPOINT=OFF
+ -DUSE_FLOAT=OFF
+ -DWITH_Cairo="$(usex cairo)"
+ -DWITH_GObjectIntrospection="$(usex introspection)"
+ -DWITH_JPEG="$(usex jpeg)"
+ -DWITH_NSS3="$(usex nss)"
+ -DWITH_PNG="$(usex png)"
+ -DWITH_Qt4="$(usex qt4)"
$(cmake-utils_use_find_package qt5 Qt5Core)
- $(cmake-utils_use_with tiff)
+ -DWITH_TIFF="$(usex tiff)"
)
if use jpeg2k; then
mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
diff --git a/app-text/webgen/webgen-1.3.0.ebuild b/app-text/webgen/webgen-1.3.0.ebuild
index 32408b27e5a5..5d53e473db55 100644
--- a/app-text/webgen/webgen-1.3.0.ebuild
+++ b/app-text/webgen/webgen-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
diff --git a/app-text/writerperfect/Manifest b/app-text/writerperfect/Manifest
index 83e67dae1ef6..ac68767147d5 100644
--- a/app-text/writerperfect/Manifest
+++ b/app-text/writerperfect/Manifest
@@ -1,5 +1,5 @@
DIST writerperfect-0.8.1.tar.xz 249728 SHA256 87a4d6a0bf1743557336969c87c1955c7532b6e2fe4cc925653d7e16bae8e327 SHA512 a2df89ffdad454a800b1df28442403802ba67b1a76b5bfacc809f4798501988a1aecf63eccf10d395019021008fa0aad82fba090be06b99c52e5bfa0df21cccc WHIRLPOOL ffaae317a0fcf89f68f9bfce823cbfa4bd70e8426f81a228a129bccd234666eba435be598fc3559bfe303e3473891998fbebfe8d437709ad462b5e2ce5f2129b
DIST writerperfect-0.8.2.tar.xz 261984 SHA256 12291dd0c7a77b16544905846ce8d6eb328e728bd5153dbdb6ad3003beb49dbc SHA512 4432e9a7cb78d687fd7b1cf287a88bc752d29b0364f8c2615b2a8b3ca8376437ff44800013646af7d4c8904810145752e9eddc8e01f036041ff4de192348ce0b WHIRLPOOL fa529da7535cd6ec7744137af16fdc9166b9b270af5c75b1a13538f3345c61256035272b310e484ed5070677e28ad8b7871d9eb7f1d0d92d5b2943063f7723c7
DIST writerperfect-0.9.2.tar.xz 274760 SHA256 e4040ec20436d5a763632243787bbb86cffd82ddf0da6aa674827e0401c2b601 SHA512 07679176c9c3f159c177cae65d499550f5cf86b34af26d32fb1d445176a3a8ff773c48b677cbbaa3514b81f5c5e83a358f8ba1ab0b567e182aeb05d8a4fc8bcb WHIRLPOOL 5bee7d9ac16ff74e2c70093a629ae0d417e7e3cd71b7a78bbdb5f62c1d9a7ea46962ba0816742b38937d3b2907d9b7a6f888c95e4da20e7bc4f736702a844dcf
-DIST writerperfect-0.9.3.tar.xz 297192 SHA256 1dceacd627459b6375d956a10b3c8ac4c3a8e8f68d36ebc968d26af83d824883 SHA512 2f60ba509e983a79a4c8450bcbffaa93ef59b9f890aa772cc70ce57ccf976b50551c354bab647c5fec11798864d88f12a62fc28e5d109cd9738c4369060e742c WHIRLPOOL edc21b8b281d34116a6b694875034e654c0c187db4c7731a878a8b2c9f383a987d14e4d61ae353b2f82261eb76888deebfa3290bdfeb04a996f02f4eb55a4ced
DIST writerperfect-0.9.4.tar.xz 288092 SHA256 6714bf945a657550eb84bd2f1f0b78b894f59536d8302942810134426f7a23ea SHA512 9bb180e9b681687145a129c0abab41d1cbd7db874d393fff2ed3a65f64b94cc3a104c32889fcab2739aaaad791d7f109a48e4b1e7ae0b5577505df7069cefc64 WHIRLPOOL bc56d1a28e2589426fb439feeebf2667b1839fcabf1094ca0dbe5913bd1db80c51f205152151dcf1866a11b3478478b7fabbef10136447126d995222d4019b6b
+DIST writerperfect-0.9.5.tar.xz 302176 SHA256 aa01122659482627f9adcff91bb242c37092c7f8537bfa5dc44e1a3c89aad9e2 SHA512 7467a798da362883101780b598e9a673c10f86f29c01ece1438ea524a0413a00928274f87895f3a8ae26f6784cdcc34e0e84039ca591dc3f75b2e25c53744ccc WHIRLPOOL 9034673daad0929348f71fde157245126e73caf46db8279bfddd2b01e4ab5a72e67eb9a6dd34fa13c9f9848a693f2440d33852d51126204c5e8c1fa8dd760031
diff --git a/app-text/writerperfect/writerperfect-0.9.4.ebuild b/app-text/writerperfect/writerperfect-0.9.4.ebuild
index 3d748f6a2d13..0c09b53c711e 100644
--- a/app-text/writerperfect/writerperfect-0.9.4.ebuild
+++ b/app-text/writerperfect/writerperfect-0.9.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
-# KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris"
IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps"
# FIXME: libepubgen, libeot, librvngabw
diff --git a/app-text/writerperfect/writerperfect-0.9.3.ebuild b/app-text/writerperfect/writerperfect-0.9.5.ebuild
similarity index 93%
rename from app-text/writerperfect/writerperfect-0.9.3.ebuild
rename to app-text/writerperfect/writerperfect-0.9.5.ebuild
index 3d748f6a2d13..de596c43e51f 100644
--- a/app-text/writerperfect/writerperfect-0.9.3.ebuild
+++ b/app-text/writerperfect/writerperfect-0.9.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
DESCRIPTION="Various formats to Open document format converter"
HOMEPAGE="http://libwpd.sf.net"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
SLOT="0"
-# KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris"
IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps"
# FIXME: libepubgen, libeot, librvngabw
diff --git a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
index f8f3c617d6df..cd732a4e360f 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
IUSE=""
DEPEND="dev-libs/xapian:0/1.2.22
diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest
index cb665989b82d..52162669e9e4 100644
--- a/dev-cpp/libcmis/Manifest
+++ b/dev-cpp/libcmis/Manifest
@@ -1,2 +1,3 @@
DIST libcmis-0.5.0-gcc5.patch.gz 12452 SHA256 523763acda1de64bb40761fae1ce1b089756fba1bb0390587d6491b75ffafbea SHA512 75423caf195d9b6f2c0752f08fd9950ff1dac67884f7445da2389fb24ad13c2c29fbf73f29f6f60b1b440ad261c32697edf3a2ee9aba779630d40afdbf5d5495 WHIRLPOOL 5cbc92051da8dc99b6d575f13c6d3c853668dd1ce169e0f215f2d20cbaf1d77408d9af0844be5e04c1308e840110a0e5dd49ee86f0207bbead7361962c830cdb
DIST libcmis-0.5.0.tar.gz 738119 SHA256 a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6 SHA512 abfdf5654ef8763c9744587ba831acea93cc0ba7deaa8d807eed2e9077be848db0334430f7c2d6eecefeb90f520abbe81364a86790c0aa4363724816aec4793b WHIRLPOOL 03041a0eb4af8fb515082731c4737f7c153756073464785994c431f54b27130b8407459efb5bcb4a26689a0baa1f5014e48cfa334948fb7d90fe646d5f8f0a02
+DIST libcmis-0.5.1.tar.gz 281863 SHA256 b88851b5e7dfa65b840d403231b38868ba77dae1e7abf2628d7a0dc3cd5a1409 SHA512 fb934c416b8a41714a5424375de507698992a0b014aa52a82a07dde07cba2ffe68a45ed97cfd0aa72b4a28f3697252ea1570a80ef9fa1b2a34af0a9ed865a752 WHIRLPOOL 4e154a417e98bd7e36fa5a4ad65b969e7c6661b6fbd33dc642a5430bda02e218e985b0b50d67f8fd811896c1a40fd4d3b78ae793d6620d8d5f4e92dd013d70d2
diff --git a/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch b/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch
deleted file mode 100644
index 0a4741400f6c..000000000000
--- a/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN libcmis-0.2.3.old//Makefile.am libcmis-0.2.3/Makefile.am
---- libcmis-0.2.3.old//Makefile.am 2012-08-09 10:18:22.559384031 +0200
-+++ libcmis-0.2.3/Makefile.am 2012-08-09 10:18:44.797384029 +0200
-@@ -12,11 +12,11 @@
- cmis-client.1: doc/cmis-client.xml
- $(DOCBOOK2X) $<
-
--install-data-am: cmis-client.1
-+install-data-local: cmis-client.1
- mkdir -p $(DESTDIR)$(mandir)/man1/
- $(INSTALL_DATA) cmis-client.1 $(DESTDIR)$(mandir)/man1/
-
--uninstall-am:
-+uninstall-local:
- -rm -rf $(DESTDIR)$(mandir)/man1/
- endif
-
diff --git a/dev-cpp/libcmis/libcmis-0.5.0.ebuild b/dev-cpp/libcmis/libcmis-0.5.1.ebuild
similarity index 75%
rename from dev-cpp/libcmis/libcmis-0.5.0.ebuild
rename to dev-cpp/libcmis/libcmis-0.5.1.ebuild
index d3f9f0342742..854d1a07f7f8 100644
--- a/dev-cpp/libcmis/libcmis-0.5.0.ebuild
+++ b/dev-cpp/libcmis/libcmis-0.5.1.ebuild
@@ -1,37 +1,33 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code"
+EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
[[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
inherit eutils alternatives autotools ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="C++ client library for the CMIS interface"
-HOMEPAGE="https://sourceforge.net/projects/libcmis/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/tdf/libcmis"
+[[ ${PV} == 9999 ]] || SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
SLOT="0.5"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="static-libs man test"
-RDEPEND="
- !dev-cpp/libcmis:0
- !dev-cpp/libcmis:0.2
- !dev-cpp/libcmis:0.3
- !dev-cpp/libcmis:0.4
+COMMON_DEPEND="
dev-libs/boost:=
dev-libs/libxml2
net-misc/curl
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
man? (
app-text/docbook2X
@@ -42,9 +38,16 @@ DEPEND="${RDEPEND}
dev-util/cppunit
)
"
+RDEPEND="${COMMON_DEPEND}
+ !dev-cpp/libcmis:0
+ !dev-cpp/libcmis:0.2
+ !dev-cpp/libcmis:0.3
+ !dev-cpp/libcmis:0.4
+"
src_prepare() {
- [[ ${PV} == 9999 ]] && eautoreconf
+ eapply_user
+ eautoreconf
}
src_configure() {
diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild
index c2086115172d..cf54088f06bc 100644
--- a/dev-cpp/libcmis/libcmis-9999.ebuild
+++ b/dev-cpp/libcmis/libcmis-9999.ebuild
@@ -4,14 +4,14 @@
EAPI=6
-EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code"
+EGIT_REPO_URI="https://github.com/tdf/libcmis.git"
[[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3"
inherit eutils alternatives autotools ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="C++ client library for the CMIS interface"
-HOMEPAGE="https://sourceforge.net/projects/libcmis/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/tdf/libcmis"
+[[ ${PV} == 9999 ]] || SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )"
SLOT="0.5"
diff --git a/dev-cpp/libcmis/metadata.xml b/dev-cpp/libcmis/metadata.xml
index d2e051d9e747..afb9c075be7a 100644
--- a/dev-cpp/libcmis/metadata.xml
+++ b/dev-cpp/libcmis/metadata.xml
@@ -9,6 +9,6 @@
Build and install man pages.
- libcmis
+ tdf/libcmis
diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild
index 1eac2cf43eeb..f376006359c9 100644
--- a/dev-db/cdb/cdb-0.75-r4.ebuild
+++ b/dev-db/cdb/cdb-0.75-r4.ebuild
@@ -5,7 +5,7 @@
EAPI=5
inherit eutils multilib toolchain-funcs
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases"
HOMEPAGE="http://cr.yp.to/cdb.html"
diff --git a/dev-db/lmdb/lmdb-0.9.18.ebuild b/dev-db/lmdb/lmdb-0.9.18.ebuild
index 5859cd31cae8..8c73c79d04d6 100644
--- a/dev-db/lmdb/lmdb-0.9.18.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index abd735b5fe8a..0e4119a3ca38 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,14 +1,10 @@
-DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d
DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e
DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d
-DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5
DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a
DIST mariadb-5.5.48.tar.gz 45727158 SHA256 50f753e003af6bd9c50b6257cca9d0cced5c877690824eac05f8d54fb9f6b421 SHA512 e4485a17589aad77e8d375d1c72065ea0d84da5954af029099dab19ffa852b4e3541ad13a77179e5c4722afc0574f2998a4f854b2b08a0689bb1428deb7de171 WHIRLPOOL d9c15aae23d2104eb15a8003810b2e11618ee159cda923bf5e521eace635c6a2731ccb292d73425f0346fd88ff382c6dbfb686996118f84fccdcfb89504e729b
-DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
-DIST mysql-extras-20151123-1643Z.tar.bz2 294038 SHA256 0d923d56370a883c74dcb29638827b938ac10bc10030b3e15e7e9d7947b6a1f4 SHA512 9346f32c1ea8f8e675da2551141cb8c88cd90c735a0895bf0029220b8b96a753d4954be549383ef8050f37b15ab51788885c7334d0851658d6ae620c9bf45392 WHIRLPOOL 83a31f48c671cd4e7907d6c3eb79e2f7b1aab1554e92adb843db0cdcc9f8e4891f5be5c570939de59677bab0456415ab0920d1d12f7b1ef30731d3775d1b84de
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb
DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe
diff --git a/dev-db/mariadb/mariadb-10.0.22.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild
deleted file mode 100644
index 8b6b1d6c5138..000000000000
--- a/dev-db/mariadb/mariadb-10.0.22.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
-SUBSLOT="18"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='embedded extraengine perl openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if ! use "minimal" ; then
-
- if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # Enable parallel testing, auto will try to detect number of cores
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might right out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # These are failing in MariaDB 10.0 for now and are believed to be
- # false positives:
- #
- # main.information_schema, binlog.binlog_statement_insert_delayed,
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
- #
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
- # fails due to bad cleanup of previous tests when run in parallel
- # The tool is deprecated anyway
- # Bug 532288
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help main.bootstrap \
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-
- else
-
- einfo "Skipping server tests due to minimal build."
- fi
-}
diff --git a/dev-db/mariadb/mariadb-10.0.23.ebuild b/dev-db/mariadb/mariadb-10.0.23.ebuild
index 2a58dacc46e1..eb8f60531a2f 100644
--- a/dev-db/mariadb/mariadb-10.0.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.23.ebuild
@@ -20,7 +20,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE='20004_all_mariadb-filter-tokudb-flags-10.0.7.patch'
diff --git a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
deleted file mode 100644
index 5a4832254570..000000000000
--- a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20151123-1643Z"
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
-WSREP_REVISION="25"
-SUBSLOT="18"
-MYSQL_PV_MAJOR="5.6"
-
-inherit toolchain-funcs mysql-multilib-r1
-
-HOMEPAGE="http://mariadb.org/"
-DESCRIPTION="An enhanced, drop-in replacement for MySQL"
-
-IUSE="bindist cracklib galera innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-#EPATCH_EXCLUDE=''
-
-COMMON_DEPEND="
- mroonga? ( app-text/groonga-normalizer-mysql )
- systemd? ( sys-apps/systemd:= )
- !bindist? ( >=sys-libs/readline-4.1:0= )
- server? (
- cracklib? ( sys-libs/cracklib:0= )
- extraengine? (
- odbc? ( dev-db/unixODBC:0= )
- xml? ( dev-libs/libxml2:2= )
- )
- innodb-lz4? ( app-arch/lz4 )
- innodb-lzo? ( dev-libs/lzo )
- innodb-snappy? ( app-arch/snappy )
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
- pam? ( virtual/pam:0= )
- )
- >=dev-libs/libpcre-8.35:3=
-"
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- ${COMMON_DEPEND}"
-RDEPEND="${RDEPEND} ${COMMON_DEPEND}
- galera? (
- sys-apps/iproute2
- =sys-cluster/galera-${WSREP_REVISION}*
- sst-rsync? ( sys-process/lsof )
- sst-xtrabackup? ( net-misc/socat[ssl] )
- )
- perl? ( !dev-db/mytop
- virtual/perl-Getopt-Long
- dev-perl/TermReadKey
- virtual/perl-Term-ANSIColor
- virtual/perl-Time-HiRes )
-"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
-
-src_configure(){
- # bug 508724 mariadb cannot use ld.gold
- tc-ld-disable-gold
- local MYSQL_CMAKE_NATIVE_DEFINES=(
- -DWITH_JEMALLOC=$(usex jemalloc system)
- -DWITH_PCRE=system
- )
- if use server ; then
- # Federated{,X} must be treated special otherwise they will not be built as plugins
- if ! use extraengine ; then
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_FEDERATED=NO
- -DPLUGIN_FEDERATEDX=NO )
- fi
-
- MYSQL_CMAKE_NATIVE_DEFINES+=(
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO)
- -DPLUGIN_SPHINX=$(usex sphinx YES NO)
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO)
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO)
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO)
- -DPLUGIN_CASSANDRA=NO
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO)
- -DPLUGIN_SPIDER=$(usex extraengine YES NO)
- -DPLUGIN_CONNECT=$(usex extraengine YES NO)
- -DCONNECT_WITH_MYSQL=1
- -DCONNECT_WITH_LIBXML2=$(usex xml)
- -DCONNECT_WITH_ODBC=$(usex odbc)
- -DWITH_WSREP=$(usex galera)
- -DWITH_INNODB_LZ4=$(usex innodb-lz4)
- -DWITH_INNODB_LZO=$(usex innodb-lzo)
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy)
- )
-
- use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_MROONGA=1 )
- fi
- mysql-multilib-r1_src_configure
-}
-
-# Official test instructions:
-# USE='embedded extraengine perl server openssl static-libs' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- if use server ; then
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # Enable parallel testing, auto will try to detect number of cores
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # These are failing in MariaDB 10.0 for now and are believed to be
- # false positives:
- #
- # main.information_schema, binlog.binlog_statement_insert_delayed,
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}" || die
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd || die
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-
- else
- einfo "Skipping server tests due to minimal build."
- fi
-}
diff --git a/dev-db/mariadb/mariadb-10.1.9.ebuild b/dev-db/mariadb/mariadb-10.1.9.ebuild
deleted file mode 100644
index e4562b09c527..000000000000
--- a/dev-db/mariadb/mariadb-10.1.9.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-MY_EXTRAS_VER="20151123-1643Z"
-WSREP_REVISION="25"
-SUBSLOT="18"
-HAS_TOOLS_PATCH="yes"
-
-inherit toolchain-funcs mysql-multilib
-# only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE mroonga systemd"
-
-# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-# When MY_EXTRAS is bumped, the index should be revised to exclude these.
-#EPATCH_EXCLUDE=''
-
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
- mroonga? ( app-text/groonga-normalizer-mysql )
- systemd? ( sys-apps/systemd:= )"
-RDEPEND="${RDEPEND}"
-
-# Official test instructions:
-# USE='client-libs embedded extraengine perl server openssl static-libs tools' \
-# FEATURES='test userpriv -usersandbox' \
-# ebuild mariadb-X.X.XX.ebuild \
-# digest clean package
-multilib_src_test() {
-
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
-
- local TESTDIR="${BUILD_DIR}/mysql-test"
- local retstatus_unit
- local retstatus_tests
-
- if use server ; then
-
- # Bug #213475 - MySQL _will_ object strenously if your machine is named
- # localhost. Also causes weird failures.
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
-
- if [[ $UID -eq 0 ]]; then
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
- fi
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
- addpredict /this-dir-does-not-exist/t9.MYI
-
- # Run CTest (test-units)
- cmake-utils_src_test
- retstatus_unit=$?
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
-
- # Create a symlink to provided binaries so the tests can find them when client-libs is off
- if ! use client-libs ; then
- ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die
- ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die
- mysql-multilib_disable_test main.perror "String mismatch due to not building local perror"
- fi
-
- # Ensure that parallel runs don't die
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
- # Enable parallel testing, auto will try to detect number of cores
- # You may set this by hand.
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
-
- # create directories because mysqladmin might run out of order
- mkdir -p "${T}"/var-tests{,/log}
-
- # These are failing in MariaDB 10.0 for now and are believed to be
- # false positives:
- #
- # main.information_schema, binlog.binlog_statement_insert_delayed,
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql main.bootstrap
- # fails due to USE=-latin1 / utf8 default
- #
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
- # segfaults at random under Portage only, suspect resource limits.
- #
- # plugins.cracklib_password_check
- # Can randomly fail due to cracklib return message
-
- for t in main.mysql_client_test main.mysql_client_test_nonblock \
- main.mysql_client_test_comp main.bootstrap \
- binlog.binlog_statement_insert_delayed main.information_schema \
- main.mysqld--help plugins.cracklib_password_check \
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False positives in Gentoo"
- done
-
- # Run mysql tests
- pushd "${TESTDIR}"
-
- # run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
-
- retstatus_tests=$?
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- popd
-
- # Cleanup is important for these testcases.
- pkill -9 -f "${S}/ndb" 2>/dev/null
- pkill -9 -f "${S}/sql" 2>/dev/null
-
- failures=""
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
-
- [[ -z "$failures" ]] || die "Test failures: $failures"
- einfo "Tests successfully completed"
-
- else
- einfo "Skipping server tests due to minimal build."
- fi
-}
diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 2d40f48dbbd9..7a49be6c7383 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -15,7 +15,6 @@ dev-db/mysql
dev-db/mariadb
-->