summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository QA checks <repo-qa-checks@gentoo.org>2017-09-24 20:31:12 +0000
committerRepository QA checks <repo-qa-checks@gentoo.org>2017-09-24 20:31:12 +0000
commit0216d69d16162aeb179b903740c4ce5232ad849f (patch)
tree6e209b0102f0175cc0531874fa778e60adab680f
parentMerge commit '3b79b6a947f513446f191b3c3d6adc118f5d9d59' (diff)
parentnet-libs/zeromq: Add "doc" USE flag (diff)
downloadgentoo-0216d69d16162aeb179b903740c4ce5232ad849f.tar.gz
gentoo-0216d69d16162aeb179b903740c4ce5232ad849f.tar.bz2
gentoo-0216d69d16162aeb179b903740c4ce5232ad849f.zip
Merge updates from master
-rw-r--r--app-admin/augeas/augeas-1.8.1.ebuild2
-rw-r--r--app-admin/collectd/collectd-5.6.2-r4.ebuild2
-rw-r--r--app-admin/collectd/collectd-5.7.1.ebuild2
-rw-r--r--app-admin/collectd/collectd-5.7.2.ebuild2
-rw-r--r--app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch23
-rw-r--r--app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild1
-rw-r--r--app-admin/rsyslog/rsyslog-8.28.0.ebuild2
-rw-r--r--app-admin/rsyslog/rsyslog-8.29.0.ebuild2
-rw-r--r--app-arch/unrar/unrar-5.5.8.ebuild2
-rw-r--r--app-editors/emacs/emacs-23.4-r16.ebuild2
-rw-r--r--app-editors/emacs/emacs-24.5-r4.ebuild2
-rw-r--r--app-editors/emacs/emacs-25.3.ebuild2
-rw-r--r--app-emulation/virt-what/virt-what-1.18.ebuild2
-rw-r--r--app-emulation/wine-any/Manifest3
-rw-r--r--app-emulation/wine-any/wine-any-2.13.ebuild4
-rw-r--r--app-emulation/wine-any/wine-any-2.14.ebuild4
-rw-r--r--app-emulation/wine-any/wine-any-2.15.ebuild4
-rw-r--r--app-emulation/wine-any/wine-any-2.16.ebuild4
-rw-r--r--app-emulation/wine-any/wine-any-2.17.ebuild617
-rw-r--r--app-emulation/wine-d3d9/Manifest2
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild4
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild4
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild4
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild4
-rw-r--r--app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild551
-rw-r--r--app-emulation/wine-staging/Manifest2
-rw-r--r--app-emulation/wine-staging/wine-staging-2.13.ebuild4
-rw-r--r--app-emulation/wine-staging/wine-staging-2.14.ebuild4
-rw-r--r--app-emulation/wine-staging/wine-staging-2.15.ebuild4
-rw-r--r--app-emulation/wine-staging/wine-staging-2.16.ebuild4
-rw-r--r--app-emulation/wine-staging/wine-staging-2.17.ebuild586
-rw-r--r--app-emulation/wine-vanilla/Manifest1
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild4
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild4
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild4
-rw-r--r--app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild509
-rw-r--r--app-forensics/chkrootkit/chkrootkit-0.51.ebuild2
-rw-r--r--app-forensics/dfxml/Manifest (renamed from dev-libs/dfxml/Manifest)0
-rw-r--r--app-forensics/dfxml/dfxml-20170921-r1.ebuild (renamed from dev-libs/dfxml/dfxml-20170921.ebuild)7
-rw-r--r--app-forensics/dfxml/dfxml-99999999.ebuild (renamed from dev-libs/dfxml/dfxml-99999999.ebuild)7
-rw-r--r--app-forensics/dfxml/metadata.xml (renamed from dev-libs/dfxml/metadata.xml)0
-rw-r--r--app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild2
-rw-r--r--app-i18n/opencc/opencc-1.0.5.ebuild2
-rw-r--r--app-portage/repoman/repoman-2.3.3.ebuild2
-rw-r--r--app-shells/zsh/zsh-5.3.1.ebuild2
-rw-r--r--dev-db/aerospike-server-community/Manifest10
-rw-r--r--dev-db/aerospike-server-community/aerospike-server-community-3.10.0.3.ebuild68
-rw-r--r--dev-db/aerospike-server-community/aerospike-server-community-3.11.0.2.ebuild68
-rw-r--r--dev-db/aerospike-server-community/aerospike-server-community-3.12.1.1.ebuild68
-rw-r--r--dev-db/aerospike-server-community/aerospike-server-community-3.12.1.ebuild68
-rw-r--r--dev-db/aerospike-server-community/aerospike-server-community-3.13.0.7.ebuild (renamed from dev-db/aerospike-server-community/aerospike-server-community-3.13.0.3.ebuild)5
-rw-r--r--dev-db/aerospike-server-community/aerospike-server-community-3.14.1.4.ebuild (renamed from dev-db/aerospike-server-community/aerospike-server-community-3.14.1.3.ebuild)5
-rw-r--r--dev-db/aerospike-server-community/aerospike-server-community-3.9.0.3.ebuild68
-rw-r--r--dev-db/aerospike-server-community/aerospike-server-community-3.9.1.1.ebuild68
-rw-r--r--dev-db/mariadb/mariadb-10.0.32.ebuild2
-rw-r--r--dev-db/mariadb/mariadb-10.1.26.ebuild2
-rw-r--r--dev-db/pgrouting/Manifest1
-rw-r--r--dev-db/pgrouting/pgrouting-2.5.0.ebuild95
-rw-r--r--dev-db/postgis/Manifest1
-rw-r--r--dev-db/postgis/postgis-2.4.0_rc2.ebuild117
-rw-r--r--dev-db/sqlite/sqlite-3.20.1.ebuild2
-rw-r--r--dev-lang/gnat-gpl/metadata.xml1
-rw-r--r--dev-lang/logtalk/Manifest3
-rw-r--r--dev-lang/logtalk/files/logtalk-3.11.2-portage.patch18
-rw-r--r--dev-lang/logtalk/logtalk-2.41.0.ebuild99
-rw-r--r--dev-lang/logtalk/logtalk-2.42.2.ebuild99
-rw-r--r--dev-lang/logtalk/logtalk-3.07.0.ebuild6
-rw-r--r--dev-lang/logtalk/logtalk-3.11.2.ebuild126
-rw-r--r--dev-lang/logtalk/metadata.xml5
-rw-r--r--dev-lang/ruby/ruby-2.2.7-r4.ebuild2
-rw-r--r--dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild2
-rw-r--r--dev-libs/libtasn1/libtasn1-4.12-r1.ebuild2
-rw-r--r--dev-libs/libzip/libzip-1.3.0.ebuild2
-rw-r--r--dev-python/automat/automat-0.5.0.ebuild2
-rw-r--r--dev-python/automat/automat-0.6.0.ebuild2
-rw-r--r--dev-python/awscli/Manifest1
-rw-r--r--dev-python/awscli/awscli-1.11.158.ebuild30
-rw-r--r--dev-python/futures/futures-3.1.1.ebuild2
-rw-r--r--dev-python/geopy/geopy-1.11.0.ebuild5
-rw-r--r--dev-python/hyperlink/hyperlink-17.1.1.ebuild2
-rw-r--r--dev-python/m2r/m2r-0.1.5.ebuild2
-rw-r--r--dev-python/m2r/m2r-0.1.6.ebuild2
-rw-r--r--dev-python/pexpect/pexpect-4.2.1.ebuild2
-rw-r--r--dev-python/pmw/pmw-2.0.1.ebuild2
-rw-r--r--dev-python/prometheus_client/Manifest1
-rw-r--r--dev-python/prometheus_client/prometheus_client-0.0.21.ebuild27
-rw-r--r--dev-python/ptyprocess/ptyprocess-0.5.1.ebuild2
-rw-r--r--dev-python/pycups/pycups-1.9.73-r1.ebuild2
-rw-r--r--dev-python/pydns/pydns-3.1.1.ebuild2
-rw-r--r--dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild2
-rw-r--r--dev-python/tlslite/tlslite-0.4.9-r2.ebuild2
-rw-r--r--dev-python/twisted/twisted-17.5.0-r1.ebuild2
-rw-r--r--dev-python/twython/twython-3.3.0.ebuild2
-rw-r--r--dev-ruby/json/json-1.8.6-r1.ebuild2
-rw-r--r--dev-ruby/json/json-1.8.6.ebuild2
-rw-r--r--dev-ruby/multi_json/multi_json-1.12.1.ebuild2
-rw-r--r--dev-ruby/rr/rr-1.2.1.ebuild2
-rw-r--r--dev-ruby/rubygems/rubygems-2.6.13.ebuild2
-rw-r--r--dev-ruby/session/session-3.2.0.ebuild2
-rw-r--r--dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild2
-rw-r--r--dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild2
-rw-r--r--dev-util/promu/Manifest2
-rw-r--r--dev-util/promu/promu-0.1.0.ebuild (renamed from dev-util/promu/promu-0.1.0_p20170607.ebuild)7
-rw-r--r--dev-vcs/cvs/cvs-1.12.12-r12.ebuild2
-rw-r--r--eclass/toolchain.eclass7
-rw-r--r--games-misc/lolcat/Manifest1
-rw-r--r--games-misc/lolcat/lolcat-90.8.8.ebuild23
-rw-r--r--kde-frameworks/kpackage/kpackage-5.38.0.ebuild3
-rw-r--r--kde-misc/plasma-applet-weather-widget/Manifest3
-rw-r--r--kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10.ebuild (renamed from kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.8.ebuild)0
-rw-r--r--kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.9.ebuild28
-rw-r--r--mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild2
-rw-r--r--mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild2
-rw-r--r--media-libs/libao/libao-1.2.2.ebuild2
-rw-r--r--media-libs/libraw/libraw-0.18.2.ebuild2
-rw-r--r--media-libs/libraw/libraw-0.18.4.ebuild2
-rw-r--r--media-libs/taglib/taglib-1.11.1-r1.ebuild2
-rw-r--r--media-sound/qsynth/qsynth-0.4.4.ebuild2
-rw-r--r--media-sound/qtractor/Manifest3
-rw-r--r--media-sound/qtractor/qtractor-0.8.0-r1.ebuild76
-rw-r--r--media-sound/qtractor/qtractor-0.8.1-r1.ebuild77
-rw-r--r--media-sound/qtractor/qtractor-0.8.2-r1.ebuild77
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.3.3.ebuild2
-rw-r--r--net-analyzer/nagios/nagios-4.3.3.ebuild2
-rw-r--r--net-analyzer/prometheus/Manifest1
-rw-r--r--net-analyzer/prometheus/prometheus-2.0.0_beta5.ebuild68
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.9.2.ebuild2
-rw-r--r--net-analyzer/tcpflow/Manifest3
-rw-r--r--net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch191
-rw-r--r--net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch13
-rw-r--r--net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild57
-rw-r--r--net-analyzer/tsung/Manifest1
-rw-r--r--net-analyzer/tsung/tsung-1.7.0.ebuild38
-rw-r--r--net-im/openmittsu/openmittsu-0.9.2.109.ebuild2
-rw-r--r--net-im/psi/Manifest2
-rw-r--r--net-im/psi/psi-1.2.ebuild13
-rw-r--r--net-im/psi/psi-1.3.ebuild125
-rw-r--r--net-im/psi/psi-9999.ebuild12
-rw-r--r--net-libs/axtls/axtls-2.1.3.ebuild2
-rw-r--r--net-libs/libsoup/libsoup-2.56.1.ebuild2
-rw-r--r--net-libs/zeromq/zeromq-4.2.2-r2.ebuild9
-rw-r--r--net-p2p/eiskaltdcpp/Manifest1
-rw-r--r--net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild146
-rw-r--r--net-p2p/eiskaltdcpp/metadata.xml37
-rw-r--r--net-print/hplip-plugin/Manifest2
-rw-r--r--net-print/hplip-plugin/hplip-plugin-3.17.7.ebuild70
-rw-r--r--net-print/hplip-plugin/hplip-plugin-3.17.9.ebuild70
-rw-r--r--net-print/hplip/Manifest1
-rw-r--r--net-print/hplip/hplip-3.17.9.ebuild254
-rw-r--r--net-vpn/strongswan/Manifest1
-rw-r--r--net-vpn/strongswan/strongswan-5.6.0.ebuild302
-rw-r--r--net-wireless/bluez/bluez-5.47-r1.ebuild2
-rw-r--r--profiles/arch/amd64/package.use.mask4
-rw-r--r--profiles/arch/base/package.use.mask5
-rw-r--r--profiles/arch/x86/package.use.mask4
-rw-r--r--profiles/updates/3Q-20171
-rw-r--r--sci-calculators/units/units-2.14-r1.ebuild2
-rw-r--r--sci-geosciences/gpsd/gpsd-3.16.ebuild2
-rw-r--r--sci-geosciences/gpsd/gpsd-3.17.ebuild2
-rw-r--r--sci-geosciences/gpsd/gpsd-9999.ebuild2
-rw-r--r--sci-geosciences/gpsd/metadata.xml12
-rw-r--r--sci-mathematics/flint/Manifest2
-rw-r--r--sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch17
-rw-r--r--sci-mathematics/flint/flint-2.3.ebuild32
-rw-r--r--sci-mathematics/flint/flint-2.4.3.ebuild61
-rw-r--r--sci-mathematics/flint/flint-2.4.4-r1.ebuild9
-rw-r--r--sci-mathematics/flint/flint-2.4.5.ebuild9
-rw-r--r--sci-mathematics/flint/flint-2.5.2.ebuild10
-rw-r--r--sys-apps/coreutils/coreutils-8.26.ebuild2
-rw-r--r--sys-apps/file/file-5.32.ebuild2
-rw-r--r--sys-apps/help2man/help2man-1.47.4.ebuild2
-rw-r--r--sys-apps/openrc/openrc-0.28.ebuild2
-rw-r--r--sys-apps/shadow/shadow-4.5.ebuild2
-rw-r--r--sys-boot/plymouth/plymouth-0.9.3-r1.ebuild2
-rw-r--r--sys-devel/gcc/metadata.xml1
-rw-r--r--sys-devel/qconf/qconf-2.3.ebuild2
-rw-r--r--www-client/chromium/Manifest1
-rw-r--r--www-client/chromium/chromium-61.0.3163.100.ebuild670
-rw-r--r--www-client/google-chrome/Manifest2
-rw-r--r--www-client/google-chrome/google-chrome-61.0.3163.100.ebuild (renamed from www-client/google-chrome/google-chrome-61.0.3163.91.ebuild)0
-rw-r--r--www-plugins/chrome-binary-plugins/Manifest2
-rw-r--r--www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.100.ebuild (renamed from www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.91.ebuild)0
-rw-r--r--x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild2
183 files changed, 4840 insertions, 1304 deletions
diff --git a/app-admin/augeas/augeas-1.8.1.ebuild b/app-admin/augeas/augeas-1.8.1.ebuild
index a199c09b74ba..ae967a8e7c3e 100644
--- a/app-admin/augeas/augeas-1.8.1.ebuild
+++ b/app-admin/augeas/augeas-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.augeas.net/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 ~sparc x86"
IUSE="static-libs test"
RDEPEND="
diff --git a/app-admin/collectd/collectd-5.6.2-r4.ebuild b/app-admin/collectd/collectd-5.6.2-r4.ebuild
index 598b6d4c9ea1..58308c78b1dd 100644
--- a/app-admin/collectd/collectd-5.6.2-r4.ebuild
+++ b/app-admin/collectd/collectd-5.6.2-r4.ebuild
@@ -87,7 +87,7 @@ COMMON_DEPEND="
collectd_plugins_dbi? ( dev-db/libdbi )
collectd_plugins_dns? ( net-libs/libpcap )
collectd_plugins_gmond? ( sys-cluster/ganglia )
- collectd_plugins_gps? ( sci-geosciences/gpsd )
+ collectd_plugins_gps? ( sci-geosciences/gpsd:= )
collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= )
collectd_plugins_log_logstash? ( dev-libs/yajl:= )
diff --git a/app-admin/collectd/collectd-5.7.1.ebuild b/app-admin/collectd/collectd-5.7.1.ebuild
index 28d98616e030..89191111c74e 100644
--- a/app-admin/collectd/collectd-5.7.1.ebuild
+++ b/app-admin/collectd/collectd-5.7.1.ebuild
@@ -90,7 +90,7 @@ COMMON_DEPEND="
collectd_plugins_dbi? ( dev-db/libdbi )
collectd_plugins_dns? ( net-libs/libpcap )
collectd_plugins_gmond? ( sys-cluster/ganglia )
- collectd_plugins_gps? ( sci-geosciences/gpsd )
+ collectd_plugins_gps? ( sci-geosciences/gpsd:= )
collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= )
collectd_plugins_log_logstash? ( dev-libs/yajl:= )
diff --git a/app-admin/collectd/collectd-5.7.2.ebuild b/app-admin/collectd/collectd-5.7.2.ebuild
index 95c6b9e022a7..f062bc9c363a 100644
--- a/app-admin/collectd/collectd-5.7.2.ebuild
+++ b/app-admin/collectd/collectd-5.7.2.ebuild
@@ -90,7 +90,7 @@ COMMON_DEPEND="
collectd_plugins_dbi? ( dev-db/libdbi )
collectd_plugins_dns? ( net-libs/libpcap )
collectd_plugins_gmond? ( sys-cluster/ganglia )
- collectd_plugins_gps? ( sci-geosciences/gpsd )
+ collectd_plugins_gps? ( sci-geosciences/gpsd:= )
collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 )
collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.13:0= )
collectd_plugins_log_logstash? ( dev-libs/yajl:= )
diff --git a/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
new file mode 100644
index 000000000000..6ef7e6426287
--- /dev/null
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.27.0-fix-mmnormalize-tests.patch
@@ -0,0 +1,23 @@
+https://github.com/rsyslog/rsyslog/pull/1791
+---
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -498,7 +498,6 @@ TESTS += msgvar-concurrency-array.sh \
+ mmnormalize_processing_test2.sh \
+ mmnormalize_processing_test3.sh \
+ mmnormalize_processing_test4.sh
+-endif
+
+ if ENABLE_IMPTCP
+ TESTS += \
+@@ -512,6 +511,7 @@ if LOGNORM_REGEX_SUPPORTED
+ TESTS += \
+ mmnormalize_regex.sh
+ endif
++endif
+
+ if ENABLE_MMJSONPARSE
+ TESTS += \
diff --git a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
index 14c282597e3f..129f495b9e7c 100644
--- a/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.27.0-r1.ebuild
@@ -51,6 +51,7 @@ else
"${FILESDIR}"/8-stable/${PN}-8.26.0-fix-zmq3-format-security.patch
"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-librdkafka-detection.patch
"${FILESDIR}"/8-stable/${PN}-8.27.0-fix-hostname-detection-when-getaddrinfo-fails.patch
+ "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch
)
fi
diff --git a/app-admin/rsyslog/rsyslog-8.28.0.ebuild b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
index 00aaa3c6d189..dc74da9df9b0 100644
--- a/app-admin/rsyslog/rsyslog-8.28.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.28.0.ebuild
@@ -46,6 +46,8 @@ else
http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
"
+
+ PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch )
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
diff --git a/app-admin/rsyslog/rsyslog-8.29.0.ebuild b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
index f3914443f422..d8b4b91b0336 100644
--- a/app-admin/rsyslog/rsyslog-8.29.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.29.0.ebuild
@@ -46,6 +46,8 @@ else
http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
"
+
+ PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.27.0-fix-mmnormalize-tests.patch )
fi
LICENSE="GPL-3 LGPL-3 Apache-2.0"
diff --git a/app-arch/unrar/unrar-5.5.8.ebuild b/app-arch/unrar/unrar-5.5.8.ebuild
index 36950849900d..309bb4d4bcb1 100644
--- a/app-arch/unrar/unrar-5.5.8.ebuild
+++ b/app-arch/unrar/unrar-5.5.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="unRAR"
# subslot = soname version
SLOT="0/5"
-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-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild
index 9cb17388d5ea..20e96bc4b628 100644
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r16.ebuild
@@ -13,7 +13,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 ~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 ~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-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild
index 4dcaf610088b..13146cb0888c 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r4.ebuild
@@ -12,7 +12,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 ~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 ~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-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index ec667f7ab0d9..69bb218fd30b 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="acl alsa aqua athena cairo dbus dynamic-loading 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 xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-emulation/virt-what/virt-what-1.18.ebuild b/app-emulation/virt-what/virt-what-1.18.ebuild
index 9c17d0462349..d9b7ebeefb60 100644
--- a/app-emulation/virt-what/virt-what-1.18.ebuild
+++ b/app-emulation/virt-what/virt-what-1.18.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://people.redhat.com/~rjones/virt-what/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~hppa ~ppc ppc64 ~sparc ~x86"
IUSE="dmi"
DEPEND="dev-lang/perl"
diff --git a/app-emulation/wine-any/Manifest b/app-emulation/wine-any/Manifest
index a5e3bc70c0a8..5b1bc0adc3ee 100644
--- a/app-emulation/wine-any/Manifest
+++ b/app-emulation/wine-any/Manifest
@@ -7,6 +7,7 @@ DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe
DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392
DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61
DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520
+DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16
DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
@@ -24,6 +25,7 @@ DIST wine-d3d9-2.13.tar.gz 48711 SHA256 738583d1ad80ddeff5d437ef07885e25a2bba7da
DIST wine-d3d9-2.14.tar.gz 48718 SHA256 71a3aff0b348f033d4ca610e34ce6faa02eb2b5c822fa2e00b372de66541ffd4 SHA512 77aa93ac9b1a81581c27e74641722666026e2e6e03def57955a05fc76c6c02730271a562130dc87ed1caefc9b00b3e0421b2640fa17165aef2f8be5da0cf07d3 WHIRLPOOL 1319fdfb4426a0a294702a5c43641008654a1352d91d23b9bd422d83fb5cd50053110052eef09ae128dfb570523d9208272abd21cb5975adff060fe7d31ac5ad
DIST wine-d3d9-2.15.tar.gz 48717 SHA256 c0aa58e7fa3b595c38cf06fe72b54a096e43e526142a7576f839ed8aaa85cabf SHA512 5298de273fc95f65ee481416f8ed16059f244e3781058cb76ee60b6a85aaf8d977a619c75cccd08aadeac9aae9ad2e08b49c5b52ab141cbff351a4b001e7c434 WHIRLPOOL 63337e2c86be5ff2fc16ff0817719ed668360ad2258b095e88b98b1f31e382593b14cabdcb8be58a6dc0cc047cd67a3eb1f14d3ecb806ba2ac9c6f7102368c94
DIST wine-d3d9-2.16.tar.gz 48728 SHA256 2a681d28a4e042437c32ecf3f92c7abaadc862feba6aacf0df76469acab98f3e SHA512 f3950d7e34ec537b95b963fb3b35ee3729c1b3f9d8c225e96ae9ab9cf8011571ba22105a17309c481f3a504a8aa4d5ae04270691c49098924aa2f72463b79e08 WHIRLPOOL c1f3cb0922cb381f6e2aa7fd54538b98dbd04daa7f36f66742af4c544c80e894e33ebf4866520af35faec27519f0015cd5cc1139fe191bb0b3192cb2134035c3
+DIST wine-d3d9-2.17.tar.gz 48722 SHA256 557ae75a68529f282f1f5e7e9991892d7d994f199060ced43db22291ec66fe71 SHA512 530d44a968a68e06449da2286b8c9740a80b681ff610f6ddc87e6fb569e6c29181341266a04238965a7bfc209e20c1521847b70daa8d3532c2a269db0d200154 WHIRLPOOL 0c70a88949eaa27ebbc28a6951651e4b55166c1d54a8db6d9fdfe3f516d2f4e24ba0f08defddf637b9c2ed0702b250af4d41146684b79e90d84aefe284351059
DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db49509e31771361a60fa3d17dd60 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 WHIRLPOOL f648a921cf4cd257a3a7dfbd3abf45d58c07782f329ec11c3a1eff3afe32e8040adb351d4a60e1b1f78c7cae0379f23468764ad162a101179d0f5b0e2c6d9413
DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa
@@ -42,6 +44,7 @@ DIST wine-staging-2.13.tar.gz 10137549 SHA256 0796440ebfa2aa651051e7081cc64f8377
DIST wine-staging-2.14.tar.gz 10179829 SHA256 cd4c8e400a808cbfa5c5cf088ea874c761d09db897f25bc33eab840101020b19 SHA512 1e794f77309e94612f822b72872ac2726e37d219a40c4a45feb2fb56f4413c34eae966a4ae8708d502c837cd47db22979e9a05cb73b681703cd729f701cdb210 WHIRLPOOL 63f9ff9cd4d54d6ff91997a904e7cd612bb8bca905399e9c6950b274cd8218c0c04a40dca9f4e12180e1080f1631bfec38e3633fcd457e688e8f8883661a4e59
DIST wine-staging-2.15.tar.gz 10190900 SHA256 f2b5c43fbc185a6fd6399f4c351b83a172737977b2ebb1cbdeddd1838d044bc2 SHA512 75d64d103839da2daed6e5b2400185c0a5274d0e50b675283bbadff70cafe712e573701207d80c8e8af7f68d1d273efec3c0d705dc982c74b8574929daadecfa WHIRLPOOL 13239aa636fc102fb374ab8724b7dbce8e9b95f16797a4f5faf8a5e7789d60e6b485c7495ccef4568edbbb0549d657a6758642de2e98b449b0ced2725136e444
DIST wine-staging-2.16.tar.gz 10220855 SHA256 da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e SHA512 96585caf77569a31f516aefe230a8907ef91db29759f75075593b751985f294bf292a1c146d287a3f0859a6b6273560670c4bc734ef0fbecb0809574eb3f09ba WHIRLPOOL 66128c8d59593243e95d6765b9fd8ace59e85e365a5e8a41eeb17d370464005aef060ddf3d862d0a3638048fd92189860e69a3cbf7d24d3ce1e420200d4b3cf5
+DIST wine-staging-2.17.tar.gz 10211107 SHA256 f511bf3438dc418b4f667513bf1ae419255e4ee62229e9205c0c64b047222183 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c WHIRLPOOL c45dc5fc91bc774f9f28bb06dff959391829fafac398bef198755395afe5a65bb2d32ba3ce157607a6040481955926866ed8f0760850bfca821be8599f4d7b64
DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303
DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1
DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf
diff --git a/app-emulation/wine-any/wine-any-2.13.ebuild b/app-emulation/wine-any/wine-any-2.13.ebuild
index 76f015333081..bb2c5ea4bf1c 100644
--- a/app-emulation/wine-any/wine-any-2.13.ebuild
+++ b/app-emulation/wine-any/wine-any-2.13.ebuild
@@ -541,8 +541,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-any/wine-any-2.14.ebuild b/app-emulation/wine-any/wine-any-2.14.ebuild
index 842b271f5c12..323eeca67775 100644
--- a/app-emulation/wine-any/wine-any-2.14.ebuild
+++ b/app-emulation/wine-any/wine-any-2.14.ebuild
@@ -541,8 +541,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-any/wine-any-2.15.ebuild b/app-emulation/wine-any/wine-any-2.15.ebuild
index 842b271f5c12..323eeca67775 100644
--- a/app-emulation/wine-any/wine-any-2.15.ebuild
+++ b/app-emulation/wine-any/wine-any-2.15.ebuild
@@ -541,8 +541,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-any/wine-any-2.16.ebuild b/app-emulation/wine-any/wine-any-2.16.ebuild
index 842b271f5c12..323eeca67775 100644
--- a/app-emulation/wine-any/wine-any-2.16.ebuild
+++ b/app-emulation/wine-any/wine-any-2.16.ebuild
@@ -541,8 +541,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-any/wine-any-2.17.ebuild b/app-emulation/wine-any/wine-any-2.17.ebuild
new file mode 100644
index 000000000000..323eeca67775
--- /dev/null
+++ b/app-emulation/wine-any/wine-any-2.17.ebuild
@@ -0,0 +1,617 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(get_version_component_range 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with optional external patchsets"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
+ D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
+ d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ pipelight? ( staging )
+ s3tc? ( staging )
+ test? ( abi_x86_32 )
+ themes? ( staging )
+ vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ d3d9? (
+ media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ themes? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xml? (
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-baselibs-20140508-r14
+ !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-db-20140508-r3
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-medialibs-20140508-r6
+ !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-opengl-20140508-r1
+ !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-sdl-20140508-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-soundlibs-20140508
+ !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-xlibs-20140508
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ app-emulation/wine-desktop-common
+ >app-eselect/eselect-wine-0.3
+ !app-emulation/wine:0
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:4.7.1 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ prelink? ( sys-devel/prelink )
+ staging? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # GCC-specific bugs
+ if tc-is-gcc; then
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ ebegin "Checking for gcc-5 ms_abi compiler bug"
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+ # bug #574044
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+ ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "Wine cannot be built with this version of gcc-5.3"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/574044"
+ eerror
+ return 1
+ fi
+ fi
+ fi
+
+ # Ensure compiler support
+ if use abi_x86_64; then
+ ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+ if ! eend $?; then
+ eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+ fi
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64; then
+ if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+ eerror "You need gcc-4.4+ to compile 64-bit wine"
+ die
+ elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+ eerror "You need clang-3.8+ to compile 64-bit wine"
+ die
+ fi
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+ ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+ ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+ ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+ if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+ ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
+ ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+ ewarn "See package.env in man 5 portage for more information on how to do this."
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+ fi
+ fi
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging || use d3d9; then
+ eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you may use the"
+ eerror "environmental variables WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT."
+ eerror
+ return 1
+ fi
+ fi
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ if use staging; then
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+ git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+ local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+ if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+ einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+ einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+ einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+ fi
+ fi
+ if use d3d9; then
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+ git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+ fi
+ fi
+
+ default
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+ "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+ "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+ )
+ if use staging; then
+ ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+ ewarn "Wine bugzilla should explicitly state that staging was used."
+
+ local STAGING_EXCLUDE=""
+ STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $? || die "Failed to apply Wine-Staging patches"
+ fi
+ if use d3d9; then
+ if use staging; then
+ PATCHES+=( "${D3D9_DIR}/staging-helper.patch" )
+ else
+ PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+ fi
+ PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+ fi
+
+ default
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with X xfixes)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ use staging && myconf+=(
+ --with-xattr
+ $(use_with themes gtk3)
+ $(use_with vaapi va)
+ )
+ use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ # Remove wineconsole if neither backend is installed #551124
+ if ! use X && ! use ncurses; then
+ rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+ rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+ rm_wineconsole() {
+ rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ multilib_foreach_abi rm_wineconsole
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+ fi
+
+ # Failglob for bin and man loops
+ local glob_state=$(shopt -p failglob)
+ shopt -s failglob
+
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+
+ # respect LINGUAS when installing man pages, #469418
+ local l
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+ done
+
+ eval "${glob_state}"
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ else
+ if use staging; then
+ eselect wine register --staging ${P} || die
+ fi
+ if use d3d9; then
+ eselect wine register --d3d9 ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ xdg_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ else
+ if use staging; then
+ eselect wine deregister --staging ${P} || die
+ fi
+ if use d3d9; then
+ eselect wine deregister --d3d9 ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-d3d9/Manifest b/app-emulation/wine-d3d9/Manifest
index 95095495754f..f6e6ee9fabb2 100644
--- a/app-emulation/wine-d3d9/Manifest
+++ b/app-emulation/wine-d3d9/Manifest
@@ -7,6 +7,7 @@ DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe
DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392
DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61
DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520
+DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16
DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
@@ -24,6 +25,7 @@ DIST wine-d3d9-2.13.tar.gz 48711 SHA256 738583d1ad80ddeff5d437ef07885e25a2bba7da
DIST wine-d3d9-2.14.tar.gz 48718 SHA256 71a3aff0b348f033d4ca610e34ce6faa02eb2b5c822fa2e00b372de66541ffd4 SHA512 77aa93ac9b1a81581c27e74641722666026e2e6e03def57955a05fc76c6c02730271a562130dc87ed1caefc9b00b3e0421b2640fa17165aef2f8be5da0cf07d3 WHIRLPOOL 1319fdfb4426a0a294702a5c43641008654a1352d91d23b9bd422d83fb5cd50053110052eef09ae128dfb570523d9208272abd21cb5975adff060fe7d31ac5ad
DIST wine-d3d9-2.15.tar.gz 48717 SHA256 c0aa58e7fa3b595c38cf06fe72b54a096e43e526142a7576f839ed8aaa85cabf SHA512 5298de273fc95f65ee481416f8ed16059f244e3781058cb76ee60b6a85aaf8d977a619c75cccd08aadeac9aae9ad2e08b49c5b52ab141cbff351a4b001e7c434 WHIRLPOOL 63337e2c86be5ff2fc16ff0817719ed668360ad2258b095e88b98b1f31e382593b14cabdcb8be58a6dc0cc047cd67a3eb1f14d3ecb806ba2ac9c6f7102368c94
DIST wine-d3d9-2.16.tar.gz 48728 SHA256 2a681d28a4e042437c32ecf3f92c7abaadc862feba6aacf0df76469acab98f3e SHA512 f3950d7e34ec537b95b963fb3b35ee3729c1b3f9d8c225e96ae9ab9cf8011571ba22105a17309c481f3a504a8aa4d5ae04270691c49098924aa2f72463b79e08 WHIRLPOOL c1f3cb0922cb381f6e2aa7fd54538b98dbd04daa7f36f66742af4c544c80e894e33ebf4866520af35faec27519f0015cd5cc1139fe191bb0b3192cb2134035c3
+DIST wine-d3d9-2.17.tar.gz 48722 SHA256 557ae75a68529f282f1f5e7e9991892d7d994f199060ced43db22291ec66fe71 SHA512 530d44a968a68e06449da2286b8c9740a80b681ff610f6ddc87e6fb569e6c29181341266a04238965a7bfc209e20c1521847b70daa8d3532c2a269db0d200154 WHIRLPOOL 0c70a88949eaa27ebbc28a6951651e4b55166c1d54a8db6d9fdfe3f516d2f4e24ba0f08defddf637b9c2ed0702b250af4d41146684b79e90d84aefe284351059
DIST wine-d3d9-2.2.tar.gz 48387 SHA256 203ed60980ec584c09b413266728e3a93e2d980dbff9b4f65375a4e9744b5042 SHA512 6e9e031b51afc8ec200bbd252ff0d768c29af23907f782409834de593f896afb128f86fe012c95dc18e5f3c7267f170eb343d2a2c53d639933a337f0c1e04fab WHIRLPOOL 6b32c0dfd3068e87d94bbcd83718dd75a14b36d69b151e9257e04793d2d3ae78ce7da10b80cbc824ccefb6c11666241593f91963ddee6a58301f95bbde35285d
DIST wine-d3d9-2.3.tar.gz 48510 SHA256 fc17488a782def19fc02bf967128ab43236db49509e31771361a60fa3d17dd60 SHA512 58449f6b7ed7fd8182e2cce92e1d1195bf64a567c1cc92fd3f46af195e7e4039c3b2a128be9d3572d9067be6c1bb020f417c6d558bb551c60096c107067177b8 WHIRLPOOL f648a921cf4cd257a3a7dfbd3abf45d58c07782f329ec11c3a1eff3afe32e8040adb351d4a60e1b1f78c7cae0379f23468764ad162a101179d0f5b0e2c6d9413
DIST wine-d3d9-2.4.tar.gz 48502 SHA256 4c7084e733d95545b894b152b2c6c9564dfb8df594cfeb1512dad80743b39ae0 SHA512 623b1720b8cd79ab6ad2a177b9beb174f31e6fc402d6885fa2006223c855919c6f5d4267c64212ecf8cf1746430c9715c506343fb740828fc99910f916b10ebe WHIRLPOOL 9c0ea34dedc2e39ce36f1539a6d761ba07429b316a1f7fad49067eec5c28a5c60b33b3d2473cbf66b009d9772c1fb123414bfa201eb8df3e61f8efc38aa1f3fa
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild
index 7f8950c5ddcb..19c89349e85b 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.13.ebuild
@@ -481,8 +481,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild
index d1afa76263db..97ddaf4c3b0e 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.14.ebuild
@@ -481,8 +481,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild
index d1afa76263db..97ddaf4c3b0e 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.15.ebuild
@@ -481,8 +481,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild
index d1afa76263db..97ddaf4c3b0e 100644
--- a/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.16.ebuild
@@ -481,8 +481,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild b/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild
new file mode 100644
index 000000000000..97ddaf4c3b0e
--- /dev/null
+++ b/app-emulation/wine-d3d9/wine-d3d9-2.17.ebuild
@@ -0,0 +1,551 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(get_version_component_range 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+D3D9_P="wine-d3d9-${PV}"
+D3D9_DIR="${WORKDIR}/wine-d3d9-patches-${D3D9_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Gallium Nine patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+ D3D9_EGIT_REPO_URI="https://github.com/sarnex/wine-d3d9-patches.git"
+else
+ SRC_URI="${SRC_URI}
+ d3d9? ( https://github.com/sarnex/wine-d3d9-patches/archive/${D3D9_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ d3d9? (
+ media-libs/mesa[d3d9,egl,${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libxcb[${MULTILIB_USEDEP}]
+ )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xml? (
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-baselibs-20140508-r14
+ !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-db-20140508-r3
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-medialibs-20140508-r6
+ !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-opengl-20140508-r1
+ !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-sdl-20140508-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-soundlibs-20140508
+ !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-xlibs-20140508
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ app-emulation/wine-desktop-common
+ >app-eselect/eselect-wine-0.3
+ !app-emulation/wine:0
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:4.7.1 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ prelink? ( sys-devel/prelink )
+ xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # GCC-specific bugs
+ if tc-is-gcc; then
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ ebegin "Checking for gcc-5 ms_abi compiler bug"
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+ # bug #574044
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+ ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "Wine cannot be built with this version of gcc-5.3"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/574044"
+ eerror
+ return 1
+ fi
+ fi
+ fi
+
+ # Ensure compiler support
+ if use abi_x86_64; then
+ ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+ if ! eend $?; then
+ eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+ fi
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64; then
+ if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+ eerror "You need gcc-4.4+ to compile 64-bit wine"
+ die
+ elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+ eerror "You need clang-3.8+ to compile 64-bit wine"
+ die
+ fi
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+ ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+ ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+ ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+ if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+ ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
+ ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+ ewarn "See package.env in man 5 portage for more information on how to do this."
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+ fi
+ fi
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use d3d9; then
+ eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you may use the"
+ eerror "environmental variables WINE_COMMIT, and D3D9_COMMIT."
+ eerror
+ return 1
+ fi
+ fi
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "WINE_COMMIT, and D3D9_COMMIT"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ if use d3d9; then
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}" "${D3D9_COMMIT}"
+ git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
+ fi
+ fi
+
+ default
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+ "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+ "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+ )
+ if use d3d9; then
+ PATCHES+=( "${D3D9_DIR}/d3d9-helper.patch" )
+ PATCHES+=( "${D3D9_DIR}/wine-d3d9.patch" )
+ fi
+
+ default
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with X xfixes)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ use d3d9 && myconf+=( $(use_with d3d9 d3d9-nine) )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ # Remove wineconsole if neither backend is installed #551124
+ if ! use X && ! use ncurses; then
+ rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+ rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+ rm_wineconsole() {
+ rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ multilib_foreach_abi rm_wineconsole
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+ fi
+
+ # Failglob for bin and man loops
+ local glob_state=$(shopt -p failglob)
+ shopt -s failglob
+
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+
+ # respect LINGUAS when installing man pages, #469418
+ local l
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+ done
+
+ eval "${glob_state}"
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ else
+ if use d3d9; then
+ eselect wine register --d3d9 ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ xdg_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ else
+ if use d3d9; then
+ eselect wine deregister --d3d9 ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 5df3d7637d1c..d90f5a268b79 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -7,6 +7,7 @@ DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe
DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392
DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61
DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520
+DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16
DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
@@ -25,6 +26,7 @@ DIST wine-staging-2.13.tar.gz 10137549 SHA256 0796440ebfa2aa651051e7081cc64f8377
DIST wine-staging-2.14.tar.gz 10179829 SHA256 cd4c8e400a808cbfa5c5cf088ea874c761d09db897f25bc33eab840101020b19 SHA512 1e794f77309e94612f822b72872ac2726e37d219a40c4a45feb2fb56f4413c34eae966a4ae8708d502c837cd47db22979e9a05cb73b681703cd729f701cdb210 WHIRLPOOL 63f9ff9cd4d54d6ff91997a904e7cd612bb8bca905399e9c6950b274cd8218c0c04a40dca9f4e12180e1080f1631bfec38e3633fcd457e688e8f8883661a4e59
DIST wine-staging-2.15.tar.gz 10190900 SHA256 f2b5c43fbc185a6fd6399f4c351b83a172737977b2ebb1cbdeddd1838d044bc2 SHA512 75d64d103839da2daed6e5b2400185c0a5274d0e50b675283bbadff70cafe712e573701207d80c8e8af7f68d1d273efec3c0d705dc982c74b8574929daadecfa WHIRLPOOL 13239aa636fc102fb374ab8724b7dbce8e9b95f16797a4f5faf8a5e7789d60e6b485c7495ccef4568edbbb0549d657a6758642de2e98b449b0ced2725136e444
DIST wine-staging-2.16.tar.gz 10220855 SHA256 da0ef4b0eafe9cd1b9cf26a5b950088adf1308e17a0d6f4ae62516b6ee64248e SHA512 96585caf77569a31f516aefe230a8907ef91db29759f75075593b751985f294bf292a1c146d287a3f0859a6b6273560670c4bc734ef0fbecb0809574eb3f09ba WHIRLPOOL 66128c8d59593243e95d6765b9fd8ace59e85e365a5e8a41eeb17d370464005aef060ddf3d862d0a3638048fd92189860e69a3cbf7d24d3ce1e420200d4b3cf5
+DIST wine-staging-2.17.tar.gz 10211107 SHA256 f511bf3438dc418b4f667513bf1ae419255e4ee62229e9205c0c64b047222183 SHA512 b652f6a852a1382c1b8275e172b7ac7608749c34aef5c0c5387cf262bf0da8db67a77ce397d49e53f3e2a8f210a3dbea1a9b3f3feb15c7d5bad8952b6fb7b53c WHIRLPOOL c45dc5fc91bc774f9f28bb06dff959391829fafac398bef198755395afe5a65bb2d32ba3ce157607a6040481955926866ed8f0760850bfca821be8599f4d7b64
DIST wine-staging-2.2.tar.gz 10078327 SHA256 9d3cbf7e5f12c623d275457b910a158e0b176fcf50c09a5f8425864de604bc1d SHA512 8ad3f8ba4c6439a9ec4884a55018a67c9e2c2384830074646aac7b70cb9f4f5a20f760247ab42dc3d2f697cdac7ea5322be8ed12c435cb0bc185ac08fdd4dd91 WHIRLPOOL a34c19aaace64307de56d935cb0cef17d7c066c39b83c51e70ea76a20083f928bea55fe38d62b7a8250b0a9e8f00e0d2b744f43fcab433069ffb96625d955303
DIST wine-staging-2.3.tar.gz 10071742 SHA256 9a81be606836fab6203857f7937ff97575947f75d52c80fb5489418efb8b87e1 SHA512 8e8af1e36cc69c63ec3542f0ec4db18b6d8c16b5c9077eb211297f3a886519da71bcf72934bf8d6d72e44c7c9f765e1d00203d0d75cab8544f69f9b0c10a7133 WHIRLPOOL 50738a6e20890748d7eb01152244d34b259759f61b3587ba39815dc066fc8e2b66ce182e1ddbc912f50076a3599aa060ec6a94eeaab4513ce3a776711929b9b1
DIST wine-staging-2.4.tar.gz 10067020 SHA256 709cab12c0ebf7cf9504fd4a67eb851272309e00066ad81f184b0f55c63e9deb SHA512 55d11851697836b582ba54696cadc812ef6b14872440f5c3ed6fbe30a05abcb8abe2ab31a11ea4daeb354854c7c0e6549401d4b26b26621808bdeb89aeb206f9 WHIRLPOOL 8d344b7e6e89322c8dbbe6fd211851c90a45a33b514c182609cc60dc21939f791abc71d8665cd66e5c5161f159fe24c4772b99405833e3d11985a644e1335eaf
diff --git a/app-emulation/wine-staging/wine-staging-2.13.ebuild b/app-emulation/wine-staging/wine-staging-2.13.ebuild
index b43eeb877d89..2e257e3dcee3 100644
--- a/app-emulation/wine-staging/wine-staging-2.13.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.13.ebuild
@@ -516,8 +516,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-staging/wine-staging-2.14.ebuild b/app-emulation/wine-staging/wine-staging-2.14.ebuild
index e7462afbb09f..588c73b5a00e 100644
--- a/app-emulation/wine-staging/wine-staging-2.14.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.14.ebuild
@@ -516,8 +516,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-staging/wine-staging-2.15.ebuild b/app-emulation/wine-staging/wine-staging-2.15.ebuild
index e7462afbb09f..588c73b5a00e 100644
--- a/app-emulation/wine-staging/wine-staging-2.15.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.15.ebuild
@@ -516,8 +516,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-staging/wine-staging-2.16.ebuild b/app-emulation/wine-staging/wine-staging-2.16.ebuild
index e7462afbb09f..588c73b5a00e 100644
--- a/app-emulation/wine-staging/wine-staging-2.16.ebuild
+++ b/app-emulation/wine-staging/wine-staging-2.16.ebuild
@@ -516,8 +516,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-staging/wine-staging-2.17.ebuild b/app-emulation/wine-staging/wine-staging-2.17.ebuild
new file mode 100644
index 000000000000..588c73b5a00e
--- /dev/null
+++ b/app-emulation/wine-staging/wine-staging-2.17.ebuild
@@ -0,0 +1,586 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(get_version_component_range 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
+HOMEPAGE="https://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+if [[ ${PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="https://github.com/wine-compholio/wine-staging.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ pipelight? ( staging )
+ s3tc? ( staging )
+ test? ( abi_x86_32 )
+ themes? ( staging )
+ vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ themes? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xml? (
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-baselibs-20140508-r14
+ !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-db-20140508-r3
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-medialibs-20140508-r6
+ !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-opengl-20140508-r1
+ !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-sdl-20140508-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-soundlibs-20140508
+ !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-xlibs-20140508
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ app-emulation/wine-desktop-common
+ >app-eselect/eselect-wine-0.3
+ !app-emulation/wine:0
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:4.7.1 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ prelink? ( sys-devel/prelink )
+ staging? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # GCC-specific bugs
+ if tc-is-gcc; then
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ ebegin "Checking for gcc-5 ms_abi compiler bug"
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+ # bug #574044
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+ ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "Wine cannot be built with this version of gcc-5.3"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/574044"
+ eerror
+ return 1
+ fi
+ fi
+ fi
+
+ # Ensure compiler support
+ if use abi_x86_64; then
+ ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+ if ! eend $?; then
+ eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+ fi
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64; then
+ if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+ eerror "You need gcc-4.4+ to compile 64-bit wine"
+ die
+ elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+ eerror "You need clang-3.8+ to compile 64-bit wine"
+ die
+ fi
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+ ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+ ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+ ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+ if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+ ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
+ ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+ ewarn "See package.env in man 5 portage for more information on how to do this."
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+ fi
+ fi
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${pn_live_val} ]]; then
+ if use staging; then
+ eerror "Because of the multi-repo nature of ${MY_PN}, ${pn_live_var}"
+ eerror "cannot be used to set the commit. Instead, you may use the"
+ eerror "environmental variables WINE_COMMIT, and STAGING_COMMIT."
+ eerror
+ return 1
+ fi
+ fi
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "WINE_COMMIT, STAGING_COMMIT, and D3D9_COMMIT"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ if use staging; then
+ local CURRENT_WINE_COMMIT=${EGIT_VERSION}
+
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}" "${STAGING_COMMIT}"
+ git-r3_checkout "${STAGING_EGIT_REPO_URI}" "${STAGING_DIR}"
+
+ local COMPAT_WINE_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+ if [[ "${CURRENT_WINE_COMMIT}" != "${COMPAT_WINE_COMMIT}" ]]; then
+ einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+ einfo "If src_prepare fails, try emerging with the env var WINE_COMMIT."
+ einfo "Example: WINE_COMMIT=${COMPAT_WINE_COMMIT} emerge -1 wine"
+ fi
+ fi
+ fi
+
+ default
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+ "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+ "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+ )
+ if use staging; then
+ ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+ ewarn "Wine bugzilla should explicitly state that staging was used."
+
+ local STAGING_EXCLUDE=""
+ STAGING_EXCLUDE="${STAGING_EXCLUDE} -W winhlp32-Flex_Workaround" # Avoid double patching https://bugs.winehq.org/show_bug.cgi?id=42132
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=eapply --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $? || die "Failed to apply Wine-Staging patches"
+ fi
+
+ default
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, https://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ use staging && myconf+=(
+ --with-xattr
+ $(use_with themes gtk3)
+ $(use_with vaapi va)
+ )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ # Remove wineconsole if neither backend is installed #551124
+ if ! use X && ! use ncurses; then
+ rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+ rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+ rm_wineconsole() {
+ rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ multilib_foreach_abi rm_wineconsole
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+ fi
+
+ # Failglob for bin and man loops
+ local glob_state=$(shopt -p failglob)
+ shopt -s failglob
+
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+
+ # respect LINGUAS when installing man pages, #469418
+ local l
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+ done
+
+ eval "${glob_state}"
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ else
+ if use staging; then
+ eselect wine register --staging ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ xdg_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ else
+ if use staging; then
+ eselect wine deregister --staging ${P} || die
+ fi
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 67182b4e212c..5c776157afdb 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -9,6 +9,7 @@ DIST wine-2.13.tar.xz 19439328 SHA256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe
DIST wine-2.14.tar.xz 19447812 SHA256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 SHA512 ff43d386d46c0c74449e667b61d8cebd5fa768c88e6220aa2f13df03d80b71b6c0bdf8cbab023aed96f7c88b9787a3be4989da892fa1778412534ae82a7279bb WHIRLPOOL 2d2784e1b2ddeac39a3cea4cb08a62d99d1d062d8d801874e8bf4f56d2538a4cb019418c60299556548028e2362dd533d9ea0956014a65ac7a367ed489c0c392
DIST wine-2.15.tar.xz 19463720 SHA256 d82d500cbf81fb08c711d3619bd52373138a05574d044f089af89707274868b3 SHA512 a52a42dd1f20fe68213c55a07ac5b2455150806e534f0ab77a8e9ae3d2f12840983fa92290dac569207d3640c7f45cda83801e9f2e80294863ffa854c6c89171 WHIRLPOOL 99c9497a44859ce310c764b3cd172d83ca1a2dce13633fee930ddbf1c40651ee4470f6bc9cfcb407ce65298a2afd73dc9edc536c2ba6f076631e5cf2085b8e61
DIST wine-2.16.tar.xz 19484716 SHA256 a561edcabecd6c44948e5b2ef11941b2ba047275240418fa2c98c1fdceda2c21 SHA512 749a36b536506c4b63ff7512e316f44503cdb0db46e38a124da86df638f3e8ff9c404b034ece5cbb95cf20c09bc46be9a38f2ee66480aa6a4f2385e2a7a7eea4 WHIRLPOOL 92ae0a427d89b24d41d4565e333cf3b7499c1dfedb6d2a204f934975c35cb589d38b4f669890c1fd6a37b9fe8f34d98be3e7d0986e9ff99516fe00a004574520
+DIST wine-2.17.tar.xz 19505528 SHA256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 SHA512 cb10c876e689aa601c68673aab32c0514dd174692a01bdb3afc78d5e6079b0e77f48783af2f54245f397c762da3b4e5f2c1d39d2ce7fdb3b117d338b95c24810 WHIRLPOOL 196427a68ab3b1261cb63bafd7f82b7a688ad439fa82ae3fc04b18c9da14cc8e95b827ca8ddd07124e1179c55ed0e0aba3bdcb4639b724a6dacf4952e8827e16
DIST wine-2.2.tar.xz 18916364 SHA256 64cb57e1d8aa07f5c89ef26743b494f2d3ef9c0f4e50d3ee896a93535f7751f4 SHA512 0700868244d397c1442948716321e5ff030c667edce464570f76aa4340199489a422872aa3975bc0a57b8285c9d59fc04e223a4bde094169fc6db460acb626c4 WHIRLPOOL ffc3d357a76592651b589c6ac6608720d0258474890faf8fe3e20ac29cdd1496d569721256f9389d347bf2734a556099154fd18ef1b56f45bb46c4c15771d6ca
DIST wine-2.3.tar.xz 18931732 SHA256 afc95c7a87cc8f0730b462c50a5dfc9c462eb02c6bf5874b4fa99946f49e067e SHA512 bea78e8468555ff9e08dedf3918da5ea82721549c43984869989bbdafeea00e454820ff9558aa29925c97a165a9b01e5cd1fd397f133833c58824984a6686171 WHIRLPOOL 1f5ec8e5c32d124277e4c71d95726d3a5337575757c3029567c77165d65fcfec2ddf33d3863b4bf55c9eff7c3582c1ec7dbd76d84ed8bbbe89dd16db6b0128c1
DIST wine-2.4.tar.xz 18953748 SHA256 87b5df07e4781fecce2f92415a4717208ea253a20a0df8b36b9f90b69b72748e SHA512 15ae7e97dc72a8636b2c15c93803ed430fa456d673add61457cf3e479e769559c682b40949b5d38828f6681f13183e560fcb4a2eb0f0ba25e6eade46f7d3d7c0 WHIRLPOOL 558ab7b7517ad5e03366b4db974047eba776585e958a5b71bb2e93993e21bc725ea7a8bcf2a4354f34ca38c94ba99ccd15f2f8b5e4b58066bf339d3517eec56c
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild
index df1dab33d1b6..06a2f3370362 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.14.ebuild
@@ -447,8 +447,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild
index df1dab33d1b6..06a2f3370362 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.15.ebuild
@@ -447,8 +447,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild
index df1dab33d1b6..06a2f3370362 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.16.ebuild
@@ -447,8 +447,8 @@ multilib_src_install_all() {
use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
- dosym "${MY_PREFIX}"/bin/wine{64,} # 404331
- dosym "${MY_PREFIX}"/bin/wine{64,}-preloader
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
fi
# Failglob for bin and man loops
diff --git a/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild b/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild
new file mode 100644
index 000000000000..06a2f3370362
--- /dev/null
+++ b/app-emulation/wine-vanilla/wine-vanilla-2.17.ebuild
@@ -0,0 +1,509 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools eutils flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator xdg-utils
+
+MY_PN="${PN%%-*}"
+MY_P="${MY_PN}-${PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(get_version_component_range 1)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+S="${WORKDIR}/${MY_P}"
+
+WDC_V="20150204"
+WINE_DESKTOP_COMMON_P="wine-desktop-common-${WDC_V}"
+
+DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ https://github.com/NP-Hardass/wine-desktop-common/archive/${WDC_V}.tar.gz -> ${WINE_DESKTOP_COMMON_P}.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="${PV}"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype udev +udisks v4l +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ X? ( truetype )
+ elibc_glibc? ( threads )
+ osmesa? ( opengl )
+ test? ( abi_x86_32 )" # osmesa-opengl #286560 # X-truetype #551124
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ xml? (
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-baselibs-20140508-r14
+ !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-db-20140508-r3
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-medialibs-20140508-r6
+ !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-opengl-20140508-r1
+ !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-sdl-20140508-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-soundlibs-20140508
+ !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-xlibs-20140508
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ app-emulation/wine-desktop-common
+ >app-eselect/eselect-wine-0.3
+ !app-emulation/wine:0
+ dos? ( >=games-emulation/dosbox-0.74_p20160629 )
+ gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
+ mono? ( app-emulation/wine-mono:4.7.1 )
+ perl? (
+ dev-lang/perl
+ dev-perl/XML-Simple
+ )
+ pulseaudio? (
+ realtime? ( sys-auth/rtkit )
+ )
+ samba? ( >=net-fs/samba-3.0.25[winbind] )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ sys-devel/flex
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ prelink? ( sys-devel/prelink )
+ xinerama? ( x11-proto/xineramaproto )"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_compiler_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # GCC-specific bugs
+ if tc-is-gcc; then
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ ebegin "Checking for gcc-5 ms_abi compiler bug"
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ ( "${T}"/pr66838 || false ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+ # bug #574044
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) = 3 ]]; then
+ ebegin "Checking for gcc-5-3 stack realignment compiler bug"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3 "${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
+ eerror "Wine cannot be built with this version of gcc-5.3"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.3.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/574044"
+ eerror
+ return 1
+ fi
+ fi
+ fi
+
+ # Ensure compiler support
+ if use abi_x86_64; then
+ ebegin "Checking for 64-bit compiler with builtin_ms_va_list support"
+ # Compile in subshell to prevent "Aborted" message
+ ( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o "${T}"/builtin_ms_va_list >/dev/null 2>&1)
+ if ! eend $?; then
+ eerror "This version of $(tc-getCC) does not support builtin_ms_va_list, can't enable 64-bit wine"
+ eerror
+ eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+ fi
+}
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ if use abi_x86_64; then
+ if tc-is-gcc && [[ $(gcc-major-version) -lt 4 || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 4 ) ]]; then
+ eerror "You need gcc-4.4+ to compile 64-bit wine"
+ die
+ elif tc-is-clang && [[ $(clang-major-version) -lt 3 || ( $(clang-major-version) -eq 3 && $(clang-minor-version) -lt 8 ) ]]; then
+ eerror "You need clang-3.8+ to compile 64-bit wine"
+ die
+ fi
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -le 3 ]]; then
+ ewarn "GCC-5.0-5.3 suffered from compiler bugs and are no longer supported by"
+ ewarn "Gentoo's Toolchain Team. If your ebuild fails the compiler checks in"
+ ewarn "the configure phase, either update your compiler or switch to <5.0 || >=5.4"
+ fi
+ if tc-is-gcc && [[ $(gcc-major-version) -eq 5 && $(gcc-minor-version) -eq 4 ]]; then
+ if has "-march=i686" ${CFLAGS} && ! has "-mtune=generic" ${CFLAGS}; then
+ ewarn "Compilation can hang with CFLAGS=\"-march=i686\". You can temporarily work"
+ ewarn "around this by adding \"-mtune=generic\" to your CFLAGS for wine."
+ ewarn "See package.env in man 5 portage for more information on how to do this."
+ ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=613128 for more details"
+ fi
+ fi
+
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2> /dev/null)" == "intel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+wine_env_vcs_vars() {
+ local pn_live_var="${PN//[-+]/_}_LIVE_COMMIT"
+ local pn_live_val="${pn_live_var}"
+ eval pn_live_val='$'${pn_live_val}
+ if [[ ! -z ${EGIT_COMMIT} ]]; then
+ eerror "Commits must now be specified using the environmental variables"
+ eerror "WINE_COMMIT"
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+
+ # Verify OSS support
+ if use oss && ! use kernel_FreeBSD; then
+ if ! has_version ">=media-sound/oss-4"; then
+ eerror "You cannot build wine with USE=oss without having support from a"
+ eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
+ eerror
+ die
+ fi
+ fi
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+ wine_env_vcs_vars || die
+
+ WINE_VARIANT="${PN#wine}-${PV}"
+ WINE_VARIANT="${WINE_VARIANT#-}"
+
+ MY_PREFIX="${EPREFIX}/usr/lib/wine-${WINE_VARIANT}"
+ MY_DATAROOTDIR="${EPREFIX}/usr/share/wine-${WINE_VARIANT}"
+ MY_DATADIR="${MY_DATAROOTDIR}"
+ MY_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ MY_INCLUDEDIR="${EPREFIX}/usr/include/wine-${WINE_VARIANT}"
+ MY_LIBEXECDIR="${EPREFIX}/usr/libexec/wine-${WINE_VARIANT}"
+ MY_LOCALSTATEDIR="${EPREFIX}/var/wine-${WINE_VARIANT}"
+ MY_MANDIR="${MY_DATADIR}/man"
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ EGIT_CHECKOUT_DIR="${S}" EGIT_COMMIT="${WINE_COMMIT}" git-r3_src_unpack
+ fi
+
+ default
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${MY_PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${MY_PN}-1.9.5-multilib-portage.patch #395615
+ "${FILESDIR}"/${MY_PN}-1.6-memset-O3.patch #480508
+ "${FILESDIR}"/${MY_PN}-2.0-multislot-apploader.patch
+ )
+
+ default
+ eautoreconf
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # Edit wine.desktop to work for specific variant
+ sed -e "/^Exec=/s/wine /wine-${WINE_VARIANT} /" -i loader/wine.desktop || die
+
+ # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}/${WINE_DESKTOP_COMMON_P}/icons/oic_winlogo.ico" dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS || die # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ wine_compiler_check || die
+
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --prefix="${MY_PREFIX}"
+ --datarootdir="${MY_DATAROOTDIR}"
+ --datadir="${MY_DATADIR}"
+ --docdir="${MY_DOCDIR}"
+ --includedir="${MY_INCLUDEDIR}"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/wine-${WINE_VARIANT}"
+ --libexecdir="${MY_LIBEXECDIR}"
+ --localstatedir="${MY_LOCALSTATEDIR}"
+ --mandir="${MY_MANDIR}"
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with udev)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with X xfixes)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${MY_PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D%/}${MY_PREFIX}"/bin/{wine{dump,maker},function_grep.pl} \
+ "${D%/}${MY_MANDIR}"/man1/wine{dump,maker}.1 || die
+ fi
+
+ # Remove wineconsole if neither backend is installed #551124
+ if ! use X && ! use ncurses; then
+ rm "${D%/}${MY_PREFIX}"/bin/wineconsole* || die
+ rm "${D%/}${MY_MANDIR}"/man1/wineconsole* || die
+ rm_wineconsole() {
+ rm "${D%/}${MY_PREFIX}/$(get_libdir)"/wine/{,fakedlls/}wineconsole.exe* || die
+ }
+ multilib_foreach_abi rm_wineconsole
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D%/}${MY_PREFIX}"/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym wine64 "${MY_PREFIX}"/bin/wine # 404331
+ dosym wine64-preloader "${MY_PREFIX}"/bin/wine-preloader
+ fi
+
+ # Failglob for bin and man loops
+ local glob_state=$(shopt -p failglob)
+ shopt -s failglob
+
+ # Make wrappers for binaries for handling multiple variants
+ # Note: wrappers instead of symlinks because some are shell which use basename
+ local b
+ for b in "${D%/}${MY_PREFIX}"/bin/*; do
+ make_wrapper "${b##*/}-${WINE_VARIANT}" "${MY_PREFIX}/bin/${b##*/}"
+ done
+
+ # respect LINGUAS when installing man pages, #469418
+ local l
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D%/}${MY_MANDIR}"/${l}*
+ done
+
+ eval "${glob_state}"
+}
+
+pkg_postinst() {
+ eselect wine register ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine register --vanilla ${P} || die
+ fi
+
+ eselect wine update --all --if-unset || die
+
+ xdg_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_prerm() {
+ eselect wine deregister ${P}
+ if [[ ${PN} == "wine-vanilla" ]]; then
+ eselect wine deregister --vanilla ${P} || die
+ fi
+
+ eselect wine update --all --if-unset || die
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/app-forensics/chkrootkit/chkrootkit-0.51.ebuild b/app-forensics/chkrootkit/chkrootkit-0.51.ebuild
index 64a6f3def3c9..5554007c7a66 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.51.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.51.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz -> ${P}.tar
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="+cron"
RDEPEND="cron? ( virtual/cron )"
diff --git a/dev-libs/dfxml/Manifest b/app-forensics/dfxml/Manifest
index 1ca18a4b31fc..1ca18a4b31fc 100644
--- a/dev-libs/dfxml/Manifest
+++ b/app-forensics/dfxml/Manifest
diff --git a/dev-libs/dfxml/dfxml-20170921.ebuild b/app-forensics/dfxml/dfxml-20170921-r1.ebuild
index fa4fcd22ca64..d291bbf43c4d 100644
--- a/dev-libs/dfxml/dfxml-20170921.ebuild
+++ b/app-forensics/dfxml/dfxml-20170921-r1.ebuild
@@ -31,10 +31,3 @@ src_prepare() {
eautoreconf
}
-
-src_install() {
- default
-
- insinto /usr/share/aclocal
- doins dfxml_configure.m4
-}
diff --git a/dev-libs/dfxml/dfxml-99999999.ebuild b/app-forensics/dfxml/dfxml-99999999.ebuild
index 1ec11d754926..2acea0ac8a0b 100644
--- a/dev-libs/dfxml/dfxml-99999999.ebuild
+++ b/app-forensics/dfxml/dfxml-99999999.ebuild
@@ -26,10 +26,3 @@ src_prepare() {
eautoreconf
}
-
-src_install() {
- default
-
- insinto /usr/share/aclocal
- doins dfxml_configure.m4
-}
diff --git a/dev-libs/dfxml/metadata.xml b/app-forensics/dfxml/metadata.xml
index 825589988b40..825589988b40 100644
--- a/dev-libs/dfxml/metadata.xml
+++ b/app-forensics/dfxml/metadata.xml
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild
index b123d156b30c..52ec54d8ac3d 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.5.ebuild
@@ -21,7 +21,7 @@ fi
LICENSE="GPL-2+ GPL-3+"
SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ppc64 x86"
IUSE="+macro-editor"
RDEPEND=">=app-i18n/fcitx-4.2.8
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index 91da71fb84d2..7b91b018eeea 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/BYVoid/OpenCC"
LICENSE="Apache-2.0"
SLOT="0/2"
-KEYWORDS="amd64 ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 x86"
IUSE="doc test"
DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-portage/repoman/repoman-2.3.3.ebuild b/app-portage/repoman/repoman-2.3.3.ebuild
index 7c332e0a3737..dfba7007c776 100644
--- a/app-portage/repoman/repoman-2.3.3.ebuild
+++ b/app-portage/repoman/repoman-2.3.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
S="${WORKDIR}/${P}/repoman"
else
SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-shells/zsh/zsh-5.3.1.ebuild b/app-shells/zsh/zsh-5.3.1.ebuild
index 109ec7dabe0c..af63863dfccc 100644
--- a/app-shells/zsh/zsh-5.3.1.ebuild
+++ b/app-shells/zsh/zsh-5.3.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit git-r3 autotools
EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
else
- KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
fi
diff --git a/dev-db/aerospike-server-community/Manifest b/dev-db/aerospike-server-community/Manifest
index 3554d2465aa8..f02ef640930b 100644
--- a/dev-db/aerospike-server-community/Manifest
+++ b/dev-db/aerospike-server-community/Manifest
@@ -1,8 +1,2 @@
-DIST aerospike-server-community-3.10.0.3-debian7.tgz 10347047 SHA256 fb0b47549cbe783317854b0edebe0ec112d8d5b073d7311a54739518bf2ae971 SHA512 1699bc2c8813c4b584eeef4c0edd8481915e9ccac55795717e87e6246894d836365aba2fdf8c884c6f4f4bdb3cc8d2a78141c32b1ef67cbf5efa1dc7340906ce WHIRLPOOL b6bf3a97c0023bb77f19b7cbd58785422551ce66cc7749773a1d8cfb3fa3d3ca1f96a1202718713859c23ccad0c14bded31759f36d0b0fa3039dd86e2ba1d6d2
-DIST aerospike-server-community-3.11.0.2-debian7.tgz 10137448 SHA256 3ede8b3232a8ca0f0e34f2eb9f37fa244dc502020f2d185f96ee3097d88cda21 SHA512 b4603df6de0252adb002ea25ec0ad7d6793ce9fe90e67504bfd43cbe503797471e01816dd9dcc18c2767ff98d80e181d57d91018dfc9a1e943719d24431b6160 WHIRLPOOL b4a48ceb5ee7adacc5a9d1a9baed6ad9812812dab1ded7c4f4236e25a6893d29413e53b8420d2b23d604db1163af19aaf037305f56fbc00e0795605e7c34a009
-DIST aerospike-server-community-3.12.1-debian7.tgz 10454559 SHA256 fc16a5f9fb816dedeb9b5d20c5b9a5bf56eb226ebcd615786473fd4c45620b96 SHA512 31de9c2fe1f781c4feb312c06ccea546b9016e04b750c4af5896e0ec1d5e8d26ffc3c6645ffe1c825773d1e00293359a7d48b2cd6d661644ab65408f5901503c WHIRLPOOL 7ba7708a5ec34968714c9438d64dd4db713f2bd16f0cdc0cecd47a4aa2b941f3889f9792ea85b9ae2c856279297514340310bb0d5ae813cbecfe8683148858e9
-DIST aerospike-server-community-3.12.1.1-debian7.tgz 10456157 SHA256 9776af687933c95ecf2bc783e13ae23552d925b365ade14994f31d76bcbb1999 SHA512 99196ee1af007ce587f738b1f9621ad336c13bcc4e2caae00358ea0005e2b0824974260c9136759012f985acfaf4a38d3d9719f9c2461526ab3e4a0665a3ca30 WHIRLPOOL 098c43b4252079461afcbb52ead017ec436a244ea0311c031f39a661b768788ee2da950618e6b5cd9554fabc9cb644bb769e8b9c87972d7c53ba5fb88b0ac8a5
-DIST aerospike-server-community-3.13.0.3-debian7.tgz 10660873 SHA256 4d94b69f9b0b72536cb1affca997543379e920cdd5fc1df11021596f9d275aca SHA512 cde658420ae5a64b73015864c7265d2719aadb75061035c14b1331e237b324e81708db6ec6fe07fc96859cf7cff94d1f3e9e35a5b0c9aa1805ecc35ab1b95b90 WHIRLPOOL 8b4163b785515becfa030685615f833cd088e2b98956c98c8a9d344c05e344a1ae6d7bdc769a30030ca078e956e979dce6b839e7ff19691e7fcb6f728e55ce34
-DIST aerospike-server-community-3.14.1.3-debian7.tgz 10451680 SHA256 02bbe342d6fd777317f26f3682c7b2fd978d3403e3fd2cb243101ce2b9567cb1 SHA512 56b611c6bfdd3d2591968899b53390b0f5a579634ba0dfd1b174e942e2014ef95a3bcef1254a1aeea63d899c188ad53bb524d18f56d1346f3d3bf86bdde7ce2c WHIRLPOOL 2bdc59fba968b87ec78bb02d5c39f10d3419a5c97558417f604da8079cac129906dbf3f98307b64b090619eef9dfe141ef013467bc1ffa6ff7e33c430a5e1d58
-DIST aerospike-server-community-3.9.0.3-debian7.tgz 9783678 SHA256 ec09d7f12c1001b8341892bff50f15a75a7e8f312b510c3627066befb9fc5612 SHA512 82b826fdb6bfdbb8508346accb2b0bf34f55a601b95e214d8b7fd108790a889e64dd5b76b4351285baa3f1c4f9d6a98945737c8ca42f26229364030674a2623b WHIRLPOOL f7bac66a56ad8b9ee47b3eedc16337b13d8674f42dba40f445876fe9c46ec3620dad73a9324f4a33daef98c740643c6361b86733ac6c741a68757b332101eefb
-DIST aerospike-server-community-3.9.1.1-debian7.tgz 9900121 SHA256 62526770c2881b17b928d4d0828f1b8bb5c434f37b0337863f167793f9393258 SHA512 a4ac583220eb15f976cf70a7b57ca3b2f9a0ed5a5fdc4689745b3df45c042a3e43010dda4ff16007455e32b9307474ed24114465c26cfd14be14800cd7b78332 WHIRLPOOL de08f3c057bc06380fd31928b002e611d9a3f0369d071de7bebbf3c079aaed1bc5672fe150f94c11dacfd318545b1d2529ece5eaa9bd584c5e5009192d276234
+DIST aerospike-server-community-3.13.0.7-debian7.tgz 10658707 SHA256 29715ff1698f69f29daeca80f0f70125aa2e8e1b798a34e8aa1ba23338552c66 SHA512 1dfe2fc52c7870f6c4bfbe26cb718cad7725c1362886c4ed30fed04ac40a692eedab47f03ce70fd2a4bc52a9df92ec08683eec24a1fa62a5674530272c705409 WHIRLPOOL 3780f47eecab4081359c2c41f3ec2fe28045bf55de0fb0889f15e0327522ff7ecdf401a8973a58d65efe575caaad6216e43dc8de695de21fbd71113cb2178a29
+DIST aerospike-server-community-3.14.1.4-debian7.tgz 10451324 SHA256 a7189f7d802b5d805d5d6e432b58de86c4db97bde482be255e58e61ef688362c SHA512 737c8e2e64d4738d97f1abe4199c4fbc5c00f4c967da3cf6ebbe6e77e416d40ec4c431cf3aec1b9dd4d6388efc0268220b5717924c7083631582899a2d3b6402 WHIRLPOOL dd46cabb8c7b6a8b77085d702538c037cb446327be335cef1cacbfa542613341af84ea6acac6038eb2ce7aee822f31bb8dbe0afb8e223212bf77237c28040e1e
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.10.0.3.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.10.0.3.ebuild
deleted file mode 100644
index 94171bdf43b0..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.10.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
- enewgroup aerospike
- enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
- local server_deb="${P}.debian7.x86_64.deb"
- local tools_deb="aerospike-tools-3.10.2.debian7.x86_64.deb"
-
- ar x "${server_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- ar x "${tools_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
- rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
- insinto /opt/
- doins -r opt/aerospike
-
- fperms +x -R /opt/aerospike/bin/
- fperms +x -R /opt/aerospike/lib/python/
-
- for dir in '/etc' '/var/log'; do
- keepdir "${dir}/aerospike"
- done
-
- insinto /etc/aerospike
- for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
- doins "${FILESDIR}/${conf}"
- done
-
- insinto /usr/bin
- doins usr/bin/*
- fperms +x -R /usr/bin/asd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/aerospike.logrotate aerospike
-
- newinitd "${FILESDIR}"/aerospike.init aerospike
-
- fowners -R aerospike:aerospike /opt/aerospike/
- fowners aerospike:aerospike /usr/bin/asd
- fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.11.0.2.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.11.0.2.ebuild
deleted file mode 100644
index 80f67cce7b38..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.11.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
- enewgroup aerospike
- enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
- local server_deb="${P}.debian7.x86_64.deb"
- local tools_deb="aerospike-tools-3.11.0.debian7.x86_64.deb"
-
- ar x "${server_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- ar x "${tools_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
- rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
- insinto /opt/
- doins -r opt/aerospike
-
- fperms +x -R /opt/aerospike/bin/
- fperms +x -R /opt/aerospike/lib/python/
-
- for dir in '/etc' '/var/log'; do
- keepdir "${dir}/aerospike"
- done
-
- insinto /etc/aerospike
- for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
- doins "${FILESDIR}/${conf}"
- done
-
- insinto /usr/bin
- doins usr/bin/*
- fperms +x -R /usr/bin/asd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/aerospike.logrotate aerospike
-
- newinitd "${FILESDIR}"/aerospike.init aerospike
-
- fowners -R aerospike:aerospike /opt/aerospike/
- fowners aerospike:aerospike /usr/bin/asd
- fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.12.1.1.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.12.1.1.ebuild
deleted file mode 100644
index 8b9ff74bd67c..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.12.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
- enewgroup aerospike
- enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
- local server_deb="${P}.debian7.x86_64.deb"
- local tools_deb="aerospike-tools-3.12.1.debian7.x86_64.deb"
-
- ar x "${server_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- ar x "${tools_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
- rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
- insinto /opt/
- doins -r opt/aerospike
-
- fperms +x -R /opt/aerospike/bin/
- fperms +x -R /opt/aerospike/lib/python/
-
- for dir in '/etc' '/var/log'; do
- keepdir "${dir}/aerospike"
- done
-
- insinto /etc/aerospike
- for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
- doins "${FILESDIR}/${conf}"
- done
-
- insinto /usr/bin
- doins usr/bin/*
- fperms +x -R /usr/bin/asd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/aerospike.logrotate aerospike
-
- newinitd "${FILESDIR}"/aerospike.init aerospike
-
- fowners -R aerospike:aerospike /opt/aerospike/
- fowners aerospike:aerospike /usr/bin/asd
- fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.12.1.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.12.1.ebuild
deleted file mode 100644
index 8b9ff74bd67c..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.12.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
- enewgroup aerospike
- enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
- local server_deb="${P}.debian7.x86_64.deb"
- local tools_deb="aerospike-tools-3.12.1.debian7.x86_64.deb"
-
- ar x "${server_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- ar x "${tools_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
- rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
- insinto /opt/
- doins -r opt/aerospike
-
- fperms +x -R /opt/aerospike/bin/
- fperms +x -R /opt/aerospike/lib/python/
-
- for dir in '/etc' '/var/log'; do
- keepdir "${dir}/aerospike"
- done
-
- insinto /etc/aerospike
- for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
- doins "${FILESDIR}/${conf}"
- done
-
- insinto /usr/bin
- doins usr/bin/*
- fperms +x -R /usr/bin/asd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/aerospike.logrotate aerospike
-
- newinitd "${FILESDIR}"/aerospike.init aerospike
-
- fowners -R aerospike:aerospike /opt/aerospike/
- fowners aerospike:aerospike /usr/bin/asd
- fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.3.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.7.ebuild
index 7cefe6e256e1..b7e20d5ad8b6 100644
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.3.ebuild
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.13.0.7.ebuild
@@ -13,7 +13,10 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-RDEPEND="app-crypt/gcr"
+RDEPEND="sys-libs/readline
+ sys-libs/zlib
+ dev-libs/openssl
+ "
DEPEND="${RDEPEND}"
S="${WORKDIR}/${P}-debian7"
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.3.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.4.ebuild
index 7cefe6e256e1..b7e20d5ad8b6 100644
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.3.ebuild
+++ b/dev-db/aerospike-server-community/aerospike-server-community-3.14.1.4.ebuild
@@ -13,7 +13,10 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE=""
-RDEPEND="app-crypt/gcr"
+RDEPEND="sys-libs/readline
+ sys-libs/zlib
+ dev-libs/openssl
+ "
DEPEND="${RDEPEND}"
S="${WORKDIR}/${P}-debian7"
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.9.0.3.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.9.0.3.ebuild
deleted file mode 100644
index 38ce3c559bc0..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.9.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
- enewgroup aerospike
- enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
- local server_deb="${P}.debian7.x86_64.deb"
- local tools_deb="aerospike-tools-3.9.0.debian7.x86_64.deb"
-
- ar x "${server_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- ar x "${tools_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
- rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
- insinto /opt/
- doins -r opt/aerospike
-
- fperms +x -R /opt/aerospike/bin/
- fperms +x -R /opt/aerospike/lib/python/
-
- for dir in '/etc' '/var/log'; do
- keepdir "${dir}/aerospike"
- done
-
- insinto /etc/aerospike
- for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
- doins "${FILESDIR}/${conf}"
- done
-
- insinto /usr/bin
- doins usr/bin/*
- fperms +x -R /usr/bin/asd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/aerospike.logrotate aerospike
-
- newinitd "${FILESDIR}"/aerospike.init aerospike
-
- fowners -R aerospike:aerospike /opt/aerospike/
- fowners aerospike:aerospike /usr/bin/asd
- fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/aerospike-server-community/aerospike-server-community-3.9.1.1.ebuild b/dev-db/aerospike-server-community/aerospike-server-community-3.9.1.1.ebuild
deleted file mode 100644
index 83e4d4a02bb4..000000000000
--- a/dev-db/aerospike-server-community/aerospike-server-community-3.9.1.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Flash-optimized, in-memory, nosql database"
-HOMEPAGE="http://www.aerospike.com"
-SRC_URI="http://www.aerospike.com/artifacts/${PN}/${PV}/${P}-debian7.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="app-crypt/gcr"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-debian7"
-
-pkg_setup() {
- enewgroup aerospike
- enewuser aerospike -1 /bin/bash /opt/aerospike aerospike
-}
-
-src_prepare() {
- local server_deb="${P}.debian7.x86_64.deb"
- local tools_deb="aerospike-tools-3.9.1.2.debian7.x86_64.deb"
-
- ar x "${server_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- ar x "${tools_deb}" || die
- tar xzf data.tar.gz && rm data.tar.gz || die
-
- rm *.deb asinstall control.tar.gz debian-binary LICENSE SHA256SUMS
- rm usr/bin/{asfixownership,asmigrate2to3}
-}
-
-src_install() {
- insinto /opt/
- doins -r opt/aerospike
-
- fperms +x -R /opt/aerospike/bin/
- fperms +x -R /opt/aerospike/lib/python/
-
- for dir in '/etc' '/var/log'; do
- keepdir "${dir}/aerospike"
- done
-
- insinto /etc/aerospike
- for conf in 'aerospike.conf' 'aerospike_mesh.conf' 'aerospike_ssd.conf'; do
- doins "${FILESDIR}/${conf}"
- done
-
- insinto /usr/bin
- doins usr/bin/*
- fperms +x -R /usr/bin/asd
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/aerospike.logrotate aerospike
-
- newinitd "${FILESDIR}"/aerospike.init aerospike
-
- fowners -R aerospike:aerospike /opt/aerospike/
- fowners aerospike:aerospike /usr/bin/asd
- fowners -R aerospike:aerospike /var/log/aerospike
-}
diff --git a/dev-db/mariadb/mariadb-10.0.32.ebuild b/dev-db/mariadb/mariadb-10.0.32.ebuild
index bfa7e635cc8a..e02c2cfe240c 100644
--- a/dev-db/mariadb/mariadb-10.0.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.32.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) 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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
PATCHES=(
diff --git a/dev-db/mariadb/mariadb-10.1.26.ebuild b/dev-db/mariadb/mariadb-10.1.26.ebuild
index 8db2ee3954f7..c40f1daf24c5 100644
--- a/dev-db/mariadb/mariadb-10.1.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.26.ebuild
@@ -21,7 +21,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) 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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/pgrouting/Manifest b/dev-db/pgrouting/Manifest
index 602175e5e41b..165c8aaa10cc 100644
--- a/dev-db/pgrouting/Manifest
+++ b/dev-db/pgrouting/Manifest
@@ -1 +1,2 @@
DIST pgrouting-2.0.0.tar.gz 3765933 SHA256 606309e8ece04abec062522374b48179c16bddb30dd4c5080b89a4298e8d163b SHA512 4a74cc1ce1bbbb8d95ae2aabc712e30c97e0418b1e4f28a255ecd9e57577bd7081a52e6e64a63cb06c9ca659271273b37bdbefb94d49e69b9c2ce45e96911884 WHIRLPOOL ce7492fe1512f7829bd887a7acaadc6c276719fc7e00ceb68a702a2476a9464c83bf929ef78381c8d36a6575dee21587c204f798511e1430731064c2c48a0815
+DIST pgrouting-2.5.0.tar.gz 7157856 SHA256 2c97df865484bf4e4e6f059b535b63bbe64534076b9d0c4bdd494f916fa24e9d SHA512 663dd5f5133d0bf1bbf7c35480c644ba848e65259023a0ef7f31b813b8ed99a4e2cfb813d870de7550e98ca1f8b0255aa28b2c948d13e8975af9f0d19f820784 WHIRLPOOL 0b9236414efd3b07e12dce1d4239151593212c2baae398b2b75e31e2ad09aa1f1fdb0d59471da716ae13ceef7b65fb9594b3090ecff0c1d2cab0a4c73177aae4
diff --git a/dev-db/pgrouting/pgrouting-2.5.0.ebuild b/dev-db/pgrouting/pgrouting-2.5.0.ebuild
new file mode 100644
index 000000000000..79e1b0aa8f7f
--- /dev/null
+++ b/dev-db/pgrouting/pgrouting-2.5.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+POSTGRES_COMPAT=( 9.{4,5,6} 10 )
+
+inherit eutils cmake-utils
+
+DESCRIPTION="pgRouting extends PostGIS and PostgreSQL with geospatial routing functionality."
+HOMEPAGE="http://pgrouting.org/index.html"
+LICENSE="GPL-2 MIT Boost-1.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/pgRouting/pgrouting/archive/v${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
+IUSE="+drivingdistance doc pdf html"
+
+REQUIRED_USE="html? ( doc ) pdf? ( doc )"
+
+RDEPEND="
+ || (
+ dev-db/postgresql:10[server]
+ dev-db/postgresql:9.6[server]
+ dev-db/postgresql:9.5[server]
+ dev-db/postgresql:9.4[server]
+ )
+ >=dev-db/postgis-2.0
+ dev-libs/boost
+ drivingdistance? ( sci-mathematics/cgal )
+"
+
+DEPEND="
+ doc? ( >=dev-python/sphinx-1.1 )
+ pdf? ( >=dev-python/sphinx-1.1[latex] )
+"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+postgres_check_slot() {
+ if ! declare -p POSTGRES_COMPAT &>/dev/null; then
+ die 'POSTGRES_COMPAT not declared.'
+ fi
+
+# Don't die because we can't run postgresql-config during pretend.
+[[ "$EBUILD_PHASE" = "pretend" \
+ && -z "$(which postgresql-config 2> /dev/null)" ]] && return 0
+
+ local res=$(echo ${POSTGRES_COMPAT[@]} \
+ | grep -c $(postgresql-config show 2> /dev/null) 2> /dev/null)
+
+ if [[ "$res" -eq "0" ]] ; then
+ eerror "PostgreSQL slot must be set to one of: "
+ eerror " ${POSTGRES_COMPAT[@]}"
+ return 1
+ fi
+
+ return 0
+}
+
+pkg_pretend() {
+ postgres_check_slot || die
+}
+
+pkg_setup() {
+ postgres_check_slot || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with drivingdistance DD)
+ $(cmake-utils_use_with doc DOC)
+ $(cmake-utils_use_build doc MAN)
+ $(cmake-utils_use_build html HTML)
+ $(cmake-utils_use_build pdf LATEX)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ local make_opts
+ use doc && make_opts="all doc"
+ cmake-utils_src_make ${make_opts}
+}
+
+src_install() {
+ use doc && doman "${BUILD_DIR}"/doc/man/en/pgrouting.7
+ use html && dohtml -r "${BUILD_DIR}"/doc/html/*
+ use pdf && dodoc "${BUILD_DIR}"/doc/latex/en/*.pdf
+
+ dodoc README* VERSION
+
+ cmake-utils_src_install
+}
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index 324c1f585eec..c293b47e81f0 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -6,3 +6,4 @@ DIST postgis-2.2.5.tar.gz 10223574 SHA256 1fcd458c1e095236d38e52160be5be0c62163f
DIST postgis-2.3.2.tar.gz 11336387 SHA256 e92e34c18f078a3d1a2503cd870efdc4fa9e134f0bcedbbbdb8b46b0e6af09e4 SHA512 d4503959c12e7e269817764e5fae4e567b1765ffe9c857a2382d072a0f159939ddb4f6a57c5ca34b822c585926d0f219f0d788b37e8b06a822ce7c0bcc4e88c6 WHIRLPOOL ff207196df6ab0fd858f93f2ac2b0f8863aab5ad12b0444817f99e7de2a618d6157929302b7199dc8c56d3b6b4b25e6c5bb964a129785e366fd03ae4616051f2
DIST postgis-2.3.3.tar.gz 11342032 SHA256 723d43a1c8ca4cf06359ec0b7fd5521b355db4e37128a26fb8c661b1fe2fc930 SHA512 c0ec4b4b5c470e5f88d1bb72c528269a0cf954981385580db3333502c2da74e431b5a86e3d6427c839c3d4440122be18a69261c8205aa71c8aa4b790550c5e9c WHIRLPOOL 427d4637e0073ad549cd2e74d117b2dc2b0b0e5fff98f9a0bbee3514c00b3688dd56acd7bb3f1742eda61238cf8c5ab81cea6ead7ea5880261b753a86e0f847e
DIST postgis-2.4.0rc1.tar.gz 12045664 SHA256 3032ffb468d0fe825d89c2eff767a7855c0d73c98028bc9524b81f540176113a SHA512 ab16ce125af95ad34af6d81de8974cead76669247ecfb5d03b94c40ff17e45dad8466f6d43392477892d2dbbe65580b9c518aeaebbcc8801e464dadacbdf21af WHIRLPOOL fc04313d2ad97ab9ae3b5f60e9dea80934300ede90b052b467738a46c7d0f01bbe9c58ec7bdc27c14a38250d165b275cf3f4ccc5c1eb6b54d96b11c65fc7ea0d
+DIST postgis-2.4.0rc2.tar.gz 12733657 SHA256 56ee34899a84e1b7bc0c207176f9fbdbbb67b61a74310d66fb87492dbca5b3dc SHA512 f09212c8db13c0bbb6bae7621ab78480c8948702b30158290d9364dd4bcff657f57ed35586aa2cfee48b147059481f9770f0698c518aaf4d1d9fc1b185667537 WHIRLPOOL ff9c073b0289db38426c307ab72be6c4c5e6c90a7ce9f4e89c198eccfb8baf3de04ef0446b21f56db35af37996b06de31ee6d2aaf43f4b8f8b6f05cccb4f08ec
diff --git a/dev-db/postgis/postgis-2.4.0_rc2.ebuild b/dev-db/postgis/postgis-2.4.0_rc2.ebuild
new file mode 100644
index 000000000000..057edc60dbd8
--- /dev/null
+++ b/dev-db/postgis/postgis-2.4.0_rc2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+POSTGRES_COMPAT=( 9.{2..6} )
+POSTGRES_USEDEP="server"
+
+inherit autotools eutils postgres-multi versionator
+
+MY_PV=$(replace_version_separator 3 '')
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Geographic Objects for PostgreSQL"
+HOMEPAGE="http://postgis.net"
+SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
+IUSE="doc gtk static-libs test"
+
+RDEPEND="
+ ${POSTGRES_DEP}
+ dev-libs/json-c
+ dev-libs/libxml2:2
+ >=sci-libs/geos-3.5.0
+ >=sci-libs/proj-4.6.0
+ >=sci-libs/gdal-1.10.0
+ gtk? ( x11-libs/gtk+:2 )
+"
+
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.5
+ dev-libs/libxslt
+ || (
+ media-gfx/imagemagick[png]
+ media-gfx/graphicsmagick[imagemagick,png]
+ )
+ )
+ virtual/pkgconfig
+ test? ( dev-util/cunit )
+"
+
+PGIS="$(get_version_component_range 1-2)"
+
+REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}"
+
+# Needs a running psql instance, doesn't work out of the box
+RESTRICT="test"
+
+MAKEOPTS+=' -j1'
+
+# These modules are built using the same *FLAGS that were used to build
+# dev-db/postgresql. The right thing to do is to ignore the current
+# *FLAGS settings.
+QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so"
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch"
+
+ local AT_M4DIR="macros"
+ eautoreconf
+ postgres-multi_src_prepare
+}
+
+src_configure() {
+ local myargs=""
+ use gtk && myargs+=" --with-gui"
+ postgres-multi_foreach econf ${myargs}
+}
+
+src_compile() {
+ postgres-multi_foreach emake
+ postgres-multi_foreach emake -C topology
+
+ if use doc ; then
+ postgres-multi_foreach emake comments
+ postgres-multi_foreach emake cheatsheets
+ postgres-multi_forbest emake -C doc html
+ fi
+}
+
+src_install() {
+ postgres-multi_foreach emake DESTDIR="${D}" install
+ postgres-multi_foreach emake -C topology DESTDIR="${D}" install
+ postgres-multi_forbest dobin ./utils/postgis_restore.pl
+
+ dodoc CREDITS TODO loader/README.* doc/*txt
+
+ docinto topology
+ dodoc topology/{TODO,README}
+
+ if use doc ; then
+ postgres-multi_foreach emake DESTDIR="${D}" comments-install
+
+ docinto html
+ postgres-multi_forbest dodoc doc/html/{postgis.html,style.css}
+
+ docinto html/images
+ postgres-multi_forbest dodoc doc/html/images/*
+ fi
+
+ use static-libs || find "${ED}" -name '*.a' -delete
+}
+
+pkg_postinst() {
+ ebegin "Refreshing PostgreSQL symlinks"
+ postgresql-config update
+ eend $?
+
+ elog "To finish installing PostGIS, follow the directions detailed at:"
+ elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions"
+}
diff --git a/dev-db/sqlite/sqlite-3.20.1.ebuild b/dev-db/sqlite/sqlite-3.20.1.ebuild
index f40d6aa2277d..ee52cadc0f77 100644
--- a/dev-db/sqlite/sqlite-3.20.1.ebuild
+++ b/dev-db/sqlite/sqlite-3.20.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
LICENSE="public-domain"
SLOT="3"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index 93f13769808b..5018efb098ac 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -26,6 +26,7 @@
<flag name="objc++">Build support for the Objective C++ language</flag>
<flag name="objc-gc">Build support for the Objective C code language
Garbage Collector</flag>
+ <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
<flag name="regression-test">Run the testsuite and install the results
(requires FEATURES=test)</flag>
<flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
diff --git a/dev-lang/logtalk/Manifest b/dev-lang/logtalk/Manifest
index a2b29eef34c0..d3e88db36ce2 100644
--- a/dev-lang/logtalk/Manifest
+++ b/dev-lang/logtalk/Manifest
@@ -1,5 +1,4 @@
-DIST lgt2410.tar.bz2 621950 SHA256 ba083578b7b8665cec8a2123152f42b4f554d586f8422ef521e32eb7e7306267 SHA512 81377ef68cd9ed6fbcfb07c818efa1c9310c3918cfdd400886141c976a3eeea0086c00fa3e9a45475b8852c3cd3163ee56def12aa26c2c360ddf2999ba9501b7 WHIRLPOOL 6775f69b6d69835acf1dc585312c2ecc56292de9fe6068ccf881611d973ed493b9420ca958eb2ce9333889a780003f6b2f9ffdfbfc83c8e8624b0bf9d9db82f5
-DIST lgt2422.tar.bz2 690047 SHA256 e8204b3182e9062f23e05d6e492a250de12b93baa8586716c8572f2266365a2e SHA512 db976729ae8499ef128f9f7ad257f600f07cb867bfb9ac350ac2c846712d18ebfd5989c674cf0a65286c6f525f5c4273d9b04632ae3719efae7d8047c448c085 WHIRLPOOL 6d76474fa586cc1c10551b2d2db36954466668716c719ce793ed2db9f663272d60462c2f7cde3783010d482df479308d0e5c0da24fd0a0f806a2055b8401d8ce
DIST logtalk-3.00.0.tar.bz2 1886297 SHA256 7462eaf8fd7fa865f8cccbb449a97981fbcb109a21536e2420f205b3b4b814b2 SHA512 bb4ecc709e71eee9a9a532bfcef764095e581189f3e17c9c0f2d80ceeaa4dd993d7da087b07e27f4a377a40d7a798378591d89ab6c801c7a26c1b1d646c7b76c WHIRLPOOL 21c3c9fc99e89173d3e0c109ca435847c2c735e17abca70e0f0c7646a3f8a8927e00aeb075386beec4e406faeb1ec7bc9ea7ec014933e5657c7c1d5c4d52099d
DIST logtalk-3.03.0.tar.bz2 1997131 SHA256 db48ee13f119a3956e87c2fabceddc03e008391dd1542f5e07909b3840bb0534 SHA512 8445b0dda78ce0a7a0fe380b03d061271eb924df34c8f035c96a949b177c99234e2998c65f18c55be04c7d661c94473448eb2dc79a586dbc346ab07887f0e98a WHIRLPOOL 37faa40c55c0c60dc9111fc323554fdf1747f9c3c328799fcdf73d765311a8b2af6faeab2b2523736425647a38b0c8ebce155f438efec052acc82c2c5dd8dd19
DIST logtalk-3.07.0.tar.bz2 2114396 SHA256 2f9a3f0861914bf38abfda3aec309e9779dfaaaf7214f7ada627a124eae87275 SHA512 1b26c4f49dee469d6f3a4ae15dd0c429b2b79a407aca9f518af6d1f19f682b6c72dd76c6ed3da38555353219f832efce6f0fb54a4a946cae2fccfa78c67c5757 WHIRLPOOL 972d6d9875af7b5c644d5cf608a2154338988c3fbd8032e7e5ebcf2b6289b8ef56c753dcda7478942fe7d6db7ae9e1779234185c2f4c1913d57b140a86448dd6
+DIST logtalk-3.11.2.tar.bz2 3122034 SHA256 4cccb40516194b1d461a72d1756c2ecb7eb7b38399586c1fd6893ceee774ad81 SHA512 5c48a4c2165c8b4bfe3047d7dc42f3210a72488fbc2e7349a93ae17ed3590cdd4ff22417f153f163c76605ffc30a5bc8fad2bd91099edf68e675b1d94fb7662b WHIRLPOOL e484d308ae75144bdfa009b45af20059df1baf428989c20260fd7304581586050897671621bc96378ec883885f9406efccb1f4de3444bed7fbe94c360f8c80f4
diff --git a/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch b/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch
new file mode 100644
index 000000000000..bbe75385a92e
--- /dev/null
+++ b/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch
@@ -0,0 +1,18 @@
+diff -urN logtalk-3.11.2.orig/scripts/logtalk_user_setup.sh logtalk-3.11.2/scripts/logtalk_user_setup.sh
+--- logtalk-3.11.2.orig/scripts/logtalk_user_setup.sh 2017-08-28 10:13:52.000000000 +0200
++++ logtalk-3.11.2/scripts/logtalk_user_setup.sh 2017-09-24 14:47:36.815968990 +0200
+@@ -130,14 +130,6 @@
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2*
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.dtd
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.xsd
+-ln -sf "$LOGTALKHOME"/BIBLIOGRAPHY.bib "$LOGTALKUSER"/BIBLIOGRAPHY.bib
+-ln -sf "$LOGTALKHOME"/CUSTOMIZE.md "$LOGTALKUSER"/CUSTOMIZE.md
+-ln -sf "$LOGTALKHOME"/INSTALL.md "$LOGTALKUSER"/INSTALL.md
+-ln -sf "$LOGTALKHOME"/LICENSE.txt "$LOGTALKUSER"/LICENSE.txt
+-ln -sf "$LOGTALKHOME"/QUICK_START.md "$LOGTALKUSER"/QUICK_START.md
+-ln -sf "$LOGTALKHOME"/README.md "$LOGTALKUSER"/README.md
+-ln -sf "$LOGTALKHOME"/RELEASE_NOTES.md "$LOGTALKUSER"/RELEASE_NOTES.md
+-ln -sf "$LOGTALKHOME"/UPGRADING.md "$LOGTALKUSER"/UPGRADING.md
+ ln -sf "$LOGTALKHOME"/adapters "$LOGTALKUSER"/adapters
+ ln -sf "$LOGTALKHOME"/manuals "$LOGTALKUSER"/manuals
+ ln -sf "$LOGTALKHOME"/paths "$LOGTALKUSER"/paths
diff --git a/dev-lang/logtalk/logtalk-2.41.0.ebuild b/dev-lang/logtalk/logtalk-2.41.0.ebuild
deleted file mode 100644
index 73e4602bde34..000000000000
--- a/dev-lang/logtalk/logtalk-2.41.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils versionator fdo-mime
-
-DESCRIPTION="Open source object-oriented logic programming language"
-HOMEPAGE="http://logtalk.org"
-MY_PV="lgt$(delete_all_version_separators)"
-SRC_URI="http://logtalk.org/files/${MY_PV}.tar.bz2"
-LICENSE="Artistic-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnupl qupl swipl xsbpl yappl xslt fop"
-
-DEPEND=""
-RDEPEND="
- gnupl? ( dev-lang/gprolog )
- qupl? ( !amd64? ( dev-lang/qu-prolog ) )
- swipl? ( dev-lang/swi-prolog )
- xsbpl? ( x86? ( dev-lang/xsb ) )
- yappl? ( dev-lang/yap )
- xslt? ( dev-libs/libxslt )
- fop? ( dev-java/fop )
- ${DEPEND}"
-
-S="${WORKDIR}/${MY_PV}"
-
-src_install() {
- # Look at scripts/install.sh for upstream installation process.
- # Install logtalk base
- mv scripts/logtalk_user_setup.sh integration/
- mkdir -p "${D}/usr/share/${P}"
- cp -r compiler configs contributions VERSION.txt \
- integration library wenv xml libpaths \
- examples settings.lgt "${D}/usr/share/${P}" \
- || die "Failed to install files"
-
- # Install mime file, the database will be updated later
- insinto /usr/share/mime/packages
- doins scripts/freedesktop/logtalk.xml
-
- # Install documentation
- dodoc BIBLIOGRAPHY.bib CUSTOMIZE.txt INSTALL.txt \
- LICENSE.txt QUICK_START.txt README.txt \
- RELEASE_NOTES.txt UPGRADING.txt VERSION.txt
- dohtml -r manuals/* || die "Failed to install html manual"
-
- rm -f man/man1/logtalk_backend_select.1
- rm -f man/man1/logtalk_version_select.1
- doman man/man1/*.1 || die "Failed to install man pages"
-
- # Integration symlinks
- dosym /usr/share/${P}/integration/logtalk_user_setup.sh \
- /usr/bin/logtalk_user_setup
- use gnupl && dosym /usr/share/${P}/integration/gplgt.sh \
- /usr/bin/gplgt
- use qupl && ! use amd64 && dosym /usr/share/${P}/integration/qplgt.sh \
- /usr/bin/qplgt
- use swipl && dosym /usr/share/${P}/integration/swilgt.sh \
- /usr/bin/swilgt
- use xsbpl && use x86 && dosym /usr/share/${P}/integration/xsblgt.sh \
- /usr/bin/xsblgt
- use yappl && dosym /usr/share/${P}/integration/yaplgt.sh \
- /usr/bin/yaplgt
-
- dosym /usr/share/${P}/xml/lgt2xml.sh /usr/bin/lgt2xml
- use xslt && dosym /usr/share/${P}/xml/lgt2html.sh /usr/bin/lgt2html
- use xslt && dosym /usr/share/${P}/xml/lgt2txt.sh /usr/bin/lgt2txt
- use fop && dosym /usr/share/${P}/xml/lgt2pdf.sh /usr/bin/lgt2pdf
-
- # Install environment files
- echo "LOGTALKHOME=/usr/share/${P}" > 99logtalk
- doenvd 99logtalk
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- ewarn "Before running logtalk, users should execute"
- ewarn "logtalk_user_setup *once*."
- ewarn "To start logtalk use one of the following:"
- use gnupl && ewarn "GNU Prolog: /usr/bin/gplgt"
- use qupl && ! use amd64 && ewarn "Qu Prolog: /usr/bin/qplgt"
- use swipl && ewarn "SWI Prolog: /usr/bin/swilgt"
- use xsbpl && use x86 && ewarn "XSB: /usr/bin/xsblgt"
- use yappl && ewarn "YAP: /usr/bin/yaplgt"
- ewarn ""
-
- ewarn "The environment has been set up to make the above"
- ewarn "integration scripts find files automatically for logtalk."
- ewarn "Please run 'etc-update && source /etc/profile' to update"
- ewarn "the environment now, otherwise it will be updated at next"
- ewarn "login."
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/dev-lang/logtalk/logtalk-2.42.2.ebuild b/dev-lang/logtalk/logtalk-2.42.2.ebuild
deleted file mode 100644
index 73e4602bde34..000000000000
--- a/dev-lang/logtalk/logtalk-2.42.2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils versionator fdo-mime
-
-DESCRIPTION="Open source object-oriented logic programming language"
-HOMEPAGE="http://logtalk.org"
-MY_PV="lgt$(delete_all_version_separators)"
-SRC_URI="http://logtalk.org/files/${MY_PV}.tar.bz2"
-LICENSE="Artistic-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="gnupl qupl swipl xsbpl yappl xslt fop"
-
-DEPEND=""
-RDEPEND="
- gnupl? ( dev-lang/gprolog )
- qupl? ( !amd64? ( dev-lang/qu-prolog ) )
- swipl? ( dev-lang/swi-prolog )
- xsbpl? ( x86? ( dev-lang/xsb ) )
- yappl? ( dev-lang/yap )
- xslt? ( dev-libs/libxslt )
- fop? ( dev-java/fop )
- ${DEPEND}"
-
-S="${WORKDIR}/${MY_PV}"
-
-src_install() {
- # Look at scripts/install.sh for upstream installation process.
- # Install logtalk base
- mv scripts/logtalk_user_setup.sh integration/
- mkdir -p "${D}/usr/share/${P}"
- cp -r compiler configs contributions VERSION.txt \
- integration library wenv xml libpaths \
- examples settings.lgt "${D}/usr/share/${P}" \
- || die "Failed to install files"
-
- # Install mime file, the database will be updated later
- insinto /usr/share/mime/packages
- doins scripts/freedesktop/logtalk.xml
-
- # Install documentation
- dodoc BIBLIOGRAPHY.bib CUSTOMIZE.txt INSTALL.txt \
- LICENSE.txt QUICK_START.txt README.txt \
- RELEASE_NOTES.txt UPGRADING.txt VERSION.txt
- dohtml -r manuals/* || die "Failed to install html manual"
-
- rm -f man/man1/logtalk_backend_select.1
- rm -f man/man1/logtalk_version_select.1
- doman man/man1/*.1 || die "Failed to install man pages"
-
- # Integration symlinks
- dosym /usr/share/${P}/integration/logtalk_user_setup.sh \
- /usr/bin/logtalk_user_setup
- use gnupl && dosym /usr/share/${P}/integration/gplgt.sh \
- /usr/bin/gplgt
- use qupl && ! use amd64 && dosym /usr/share/${P}/integration/qplgt.sh \
- /usr/bin/qplgt
- use swipl && dosym /usr/share/${P}/integration/swilgt.sh \
- /usr/bin/swilgt
- use xsbpl && use x86 && dosym /usr/share/${P}/integration/xsblgt.sh \
- /usr/bin/xsblgt
- use yappl && dosym /usr/share/${P}/integration/yaplgt.sh \
- /usr/bin/yaplgt
-
- dosym /usr/share/${P}/xml/lgt2xml.sh /usr/bin/lgt2xml
- use xslt && dosym /usr/share/${P}/xml/lgt2html.sh /usr/bin/lgt2html
- use xslt && dosym /usr/share/${P}/xml/lgt2txt.sh /usr/bin/lgt2txt
- use fop && dosym /usr/share/${P}/xml/lgt2pdf.sh /usr/bin/lgt2pdf
-
- # Install environment files
- echo "LOGTALKHOME=/usr/share/${P}" > 99logtalk
- doenvd 99logtalk
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- ewarn "Before running logtalk, users should execute"
- ewarn "logtalk_user_setup *once*."
- ewarn "To start logtalk use one of the following:"
- use gnupl && ewarn "GNU Prolog: /usr/bin/gplgt"
- use qupl && ! use amd64 && ewarn "Qu Prolog: /usr/bin/qplgt"
- use swipl && ewarn "SWI Prolog: /usr/bin/swilgt"
- use xsbpl && use x86 && ewarn "XSB: /usr/bin/xsblgt"
- use yappl && ewarn "YAP: /usr/bin/yaplgt"
- ewarn ""
-
- ewarn "The environment has been set up to make the above"
- ewarn "integration scripts find files automatically for logtalk."
- ewarn "Please run 'etc-update && source /etc/profile' to update"
- ewarn "the environment now, otherwise it will be updated at next"
- ewarn "login."
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/dev-lang/logtalk/logtalk-3.07.0.ebuild b/dev-lang/logtalk/logtalk-3.07.0.ebuild
index cf66066889e2..cb0cc659b75b 100644
--- a/dev-lang/logtalk/logtalk-3.07.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.07.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -32,6 +32,7 @@ src_install() {
cp -r adapters coding contributions core examples integration \
library paths scratch tests tools VERSION.txt \
loader-sample.lgt settings-sample.lgt tester-sample.lgt \
+ tests-sample.lgt \
"${D}/usr/share/${P}" \
|| die "Failed to install files"
@@ -101,9 +102,6 @@ src_install() {
pkg_postinst() {
fdo-mime_desktop_database_update
- ewarn "Before running logtalk, users should execute"
- ewarn "logtalk_user_setup *once*"
- ewarn ""
ewarn "The following integration scripts are installed"
ewarn "for running logtalk with selected Prolog compilers:"
ewarn "B-Prolog: /usr/bin/bplgt"
diff --git a/dev-lang/logtalk/logtalk-3.11.2.ebuild b/dev-lang/logtalk/logtalk-3.11.2.ebuild
new file mode 100644
index 000000000000..4469d4c34937
--- /dev/null
+++ b/dev-lang/logtalk/logtalk-3.11.2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fdo-mime
+
+DESCRIPTION="Open source object-oriented logic programming language"
+HOMEPAGE="http://logtalk.org"
+SRC_URI="http://logtalk.org/files/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="fop xslt"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ xslt? ( dev-libs/libxslt )
+ fop? ( dev-java/fop )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-portage.patch
+}
+
+src_install() {
+ # Look at scripts/install.sh for upstream installation process.
+ # Install logtalk base
+ mv scripts/logtalk_user_setup.sh integration/
+ mkdir -p "${D}/usr/share/${P}"
+ cp -r adapters coding contributions core docs examples integration \
+ library manuals paths scratch tests tools VERSION.txt \
+ loader-sample.lgt settings-sample.lgt tester-sample.lgt \
+ tests-sample.lgt \
+ "${D}/usr/share/${P}" \
+ || die "Failed to install files"
+
+ # Install mime file, the database will be updated later
+ insinto /usr/share/mime/packages
+ doins scripts/freedesktop/logtalk.xml
+
+ # Install documentation
+ dodoc ACKNOWLEDGMENTS.md BIBLIOGRAPHY.bib CUSTOMIZE.md \
+ INSTALL.md LICENSE.txt QUICK_START.md README.md \
+ RELEASE_NOTES.md UPGRADING.md VERSION.txt
+
+ rm -f man/man1/logtalk_backend_select.1
+ rm -f man/man1/logtalk_version_select.1
+ doman man/man1/*.1 || die "Failed to install man pages"
+
+ # Integration symlinks
+ dosym /usr/share/${P}/integration/logtalk_user_setup.sh \
+ /usr/bin/logtalk_user_setup
+ dosym /usr/share/${P}/integration/bplgt.sh \
+ /usr/bin/bplgt
+ dosym /usr/share/${P}/integration/cxlgt.sh \
+ /usr/bin/cxlgt
+ dosym /usr/share/${P}/integration/eclipselgt.sh \
+ /usr/bin/eclipselgt
+ dosym /usr/share/${P}/integration/gplgt.sh \
+ /usr/bin/gplgt
+ dosym /usr/share/${P}/integration/jiplgt.sh \
+ /usr/bin/jiplgt
+ dosym /usr/share/${P}/integration/lplgt.sh \
+ /usr/bin/lplgt
+ dosym /usr/share/${P}/integration/qplgt.sh \
+ /usr/bin/qplgt
+ dosym /usr/share/${P}/integration/quintuslgt.sh \
+ /usr/bin/quintuslgt
+ dosym /usr/share/${P}/integration/sicstuslgt.sh \
+ /usr/bin/sicstuslgt
+ dosym /usr/share/${P}/integration/swilgt.sh \
+ /usr/bin/swilgt
+ dosym /usr/share/${P}/integration/xsblgt.sh \
+ /usr/bin/xsblgt
+ dosym /usr/share/${P}/integration/xsbmtlgt.sh \
+ /usr/bin/xsbmtlgt
+ dosym /usr/share/${P}/integration/yaplgt.sh \
+ /usr/bin/yaplgt
+
+ dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2xml.sh \
+ /usr/bin/lgt2xml
+ use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2html.sh \
+ /usr/bin/lgt2html
+ use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2txt.sh \
+ /usr/bin/lgt2txt
+ use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2md.sh \
+ /usr/bin/lgt2md
+ use fop && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2pdf.sh \
+ /usr/bin/lgt2pdf
+
+ # Install environment files
+ echo "LOGTALKHOME=/usr/share/${P}" > 99logtalk
+ doenvd 99logtalk
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+
+ ewarn "The following integration scripts are installed"
+ ewarn "for running logtalk with selected Prolog compilers:"
+ ewarn "B-Prolog: /usr/bin/bplgt"
+ ewarn "CxProlog: /usr/bin/cxlgt"
+ ewarn "ECLiPSe: /usr/bin/eclipselgt"
+ ewarn "GNU Prolog: /usr/bin/gplgt"
+ ewarn "JIProlog: /usr/bin/jiplgt"
+ ewarn "Lean Prolog: /usr/bin/lplgt"
+ ewarn "Qu-Prolog: /usr/bin/qplgt"
+ ewarn "Quintus Prolog: /usr/bin/quintuslgt"
+ ewarn "SICStus Prolog: /usr/bin/sicstuslgt"
+ ewarn "SWI Prolog: /usr/bin/swilgt"
+ ewarn "XSB: /usr/bin/xsblgt"
+ ewarn "XSB MT: /usr/bin/xsbmtlgt"
+ ewarn "YAP: /usr/bin/yaplgt"
+ ewarn ""
+
+ ewarn "The environment has been set up to make the above"
+ ewarn "integration scripts find files automatically for logtalk."
+ ewarn "Please run 'etc-update && source /etc/profile' to update"
+ ewarn "the environment now, otherwise it will be updated at next"
+ ewarn "login."
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/dev-lang/logtalk/metadata.xml b/dev-lang/logtalk/metadata.xml
index e6cc2e552279..7adf5e18089a 100644
--- a/dev-lang/logtalk/metadata.xml
+++ b/dev-lang/logtalk/metadata.xml
@@ -6,11 +6,6 @@
<name>Prolog</name>
</maintainer>
<use>
- <flag name="gnupl">Support GNU Prolog back-end compiler</flag>
- <flag name="qupl">Support Qu-Prolog back-end compiler</flag>
- <flag name="swipl">Support SWI-Prolog back-end compiler</flag>
- <flag name="xsbpl">Support XSB back-end compiler</flag>
- <flag name="yappl">Support YAP back-end compiler</flag>
<flag name="xslt">Support for generating html documentation using xslt</flag>
<flag name="fop">Support for generating pdf documentation using fop</flag>
</use>
diff --git a/dev-lang/ruby/ruby-2.2.7-r4.ebuild b/dev-lang/ruby/ruby-2.2.7-r4.ebuild
index ae1a053c1518..d388c657fc2d 100644
--- a/dev-lang/ruby/ruby-2.2.7-r4.ebuild
+++ b/dev-lang/ruby/ruby-2.2.7-r4.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
RDEPEND="
diff --git a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
index 058f3c5b48fe..93b4219e284b 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-16.04.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
LICENSE="LGPL-2.1 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64"
IUSE="debug gtk gtk3 +introspection test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild b/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
index d685649e9d44..91c5ec59f618 100644
--- a/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.12-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs valgrind"
DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/libzip/libzip-1.3.0.ebuild b/dev-libs/libzip/libzip-1.3.0.ebuild
index 979511cb4b1e..7b78428aaf6b 100644
--- a/dev-libs/libzip/libzip-1.3.0.ebuild
+++ b/dev-libs/libzip/libzip-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
LICENSE="BSD"
SLOT="0/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="bzip2 static-libs"
RDEPEND="
diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild
index 30dd1c19a4b9..71866e63edef 100644
--- a/dev-python/automat/automat-0.5.0.ebuild
+++ b/dev-python/automat/automat-0.5.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="examples test"
RDEPEND="
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
index 30dd1c19a4b9..71866e63edef 100644
--- a/dev-python/automat/automat-0.6.0.ebuild
+++ b/dev-python/automat/automat-0.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="examples test"
RDEPEND="
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index ad084f9ec841..e6eb6d05d4d2 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -3,4 +3,5 @@ DIST awscli-1.10.53.tar.gz 474558 SHA256 c925e734d23dd082142b7815e1aa870f1cca93c
DIST awscli-1.10.59.tar.gz 484020 SHA256 270b8d7626f398e5867d777b75d16d0d48154d28e45dd309ac96597fa35c15f9 SHA512 b0329ec01a160527e6eb47bd877f102be4f6f53ca89007e1d6ba5012dc31c8fa907728b151b6daf8ed49d9abac48fa741bb4617d689eeeacf880404fe1b4919a WHIRLPOOL 5baf900600a7fbf177fb60e474352bde29fc5873ba9f7620b01bd3c0c2cc6b247075ce8a4ede24dc4b19a8e38d1789064167f424521477677ef83bb754797794
DIST awscli-1.11.0.tar.gz 497631 SHA256 48f26765be66689ef073e086873b016885f443471e542156d46376b527aa2d63 SHA512 db695a9b5d052d872f50883dbd716668b95c3ae6aee85b94ba5fb96aabfd8853cf2c6cdff76b7a2d8e7d006ae1dc65353bc6818999bf02c619dd0c4aa4d3dbbe WHIRLPOOL 3809581a03300f45d2d82f6e21f6f3a8a6d225421d0d4a69b1c6ecb5c6d332e30390837061d65b0b4a19e6905eeda5ca0392f5150247972c386bee86bd0fa810
DIST awscli-1.11.154.tar.gz 553172 SHA256 b11cd09c5fb39637801be277f7aa39d73e63fa5528d04dd90f25e4ed8e28c0e0 SHA512 cb4d0159c816a3abd750e1531f280aa1145fdac6b3b0106fcc913f1f9ab97ff92b5dc8778af2b15f55f94c7ffd64f5a5f5ec3189a062ea99e5e696d991abd8f1 WHIRLPOOL 6e0a72632b37a0d8b1de05a230949d696a515d5088dd832976c79d91e4a90603e7c5835b54cde176a645fe897831ab4dabeea128ed2828b985aa36ed2a6132f7
+DIST awscli-1.11.158.tar.gz 553030 SHA256 3028d5abb5b8d826ef127e848a384d4da6d4e8f187e0841001616a5cd536c652 SHA512 25c9a3636e7a83e0f9e090906354d2f4a8e44bc1de262987eb3f071b303d64056f2b149954097e57678e0a5553a136a1289c81999ea19a757ff3bea15fad215c WHIRLPOOL 31c8236a36dac1550efa58438b74e67976b538e18f79be5abb2066e47b9582e5b249e2022fda0cde7f3a7483893cb6c465a41dcdbb460613bb0be24cad50bf36
DIST awscli-1.11.81.tar.gz 544970 SHA256 61022acd60f130c85953d46d47bf4aa3b60d03835eb5e731e2bf533e9ddf5533 SHA512 61b355247d75939d2814ca0594fb1b4498d7a1dc008e27302328c09bbe4ce72a6eddff64712410bd2023663436fd41d405a6a19a1c53c872a0ae6e68a0718175 WHIRLPOOL fd8424e37900ce7c1942595f280468be71c965a95ad270904de89e9bedae656926de6159e79c64599d4a70bd996ba6a30309164c8aa599351aaa350b5a825143
diff --git a/dev-python/awscli/awscli-1.11.158.ebuild b/dev-python/awscli/awscli-1.11.158.ebuild
new file mode 100644
index 000000000000..b4f55ea2c62f
--- /dev/null
+++ b/dev-python/awscli/awscli-1.11.158.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.python.org/pypi/awscli"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-python/botocore[${PYTHON_USEDEP}]
+ <=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ <=dev-python/rsa-3.5.0[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.1.5[${PYTHON_USEDEP}]
+ <=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
diff --git a/dev-python/futures/futures-3.1.1.ebuild b/dev-python/futures/futures-3.1.1.ebuild
index 8aab88cd0de8..0b7ad52ac7a2 100644
--- a/dev-python/futures/futures-3.1.1.ebuild
+++ b/dev-python/futures/futures-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="doc"
DEPEND="
diff --git a/dev-python/geopy/geopy-1.11.0.ebuild b/dev-python/geopy/geopy-1.11.0.ebuild
index 42d8d598fcc8..cac709dd0f81 100644
--- a/dev-python/geopy/geopy-1.11.0.ebuild
+++ b/dev-python/geopy/geopy-1.11.0.ebuild
@@ -15,13 +15,14 @@ IUSE="test doc timezone yahoo"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
dev-python/placefinder[${PYTHON_USEDEP}] )
timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}]
+ test? ( dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
dev-python/nose-cover3[${PYTHON_USEDEP}]
dev-python/pylint[${PYTHON_USEDEP}] )
doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
diff --git a/dev-python/hyperlink/hyperlink-17.1.1.ebuild b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
index f637f017e376..9e2620d13d17 100644
--- a/dev-python/hyperlink/hyperlink-17.1.1.ebuild
+++ b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/m2r/m2r-0.1.5.ebuild b/dev-python/m2r/m2r-0.1.5.ebuild
index 87d66e1c0fe3..d6d2a181ec75 100644
--- a/dev-python/m2r/m2r-0.1.5.ebuild
+++ b/dev-python/m2r/m2r-0.1.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild
index 87d66e1c0fe3..d6d2a181ec75 100644
--- a/dev-python/m2r/m2r-0.1.6.ebuild
+++ b/dev-python/m2r/m2r-0.1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pexpect/pexpect-4.2.1.ebuild b/dev-python/pexpect/pexpect-4.2.1.ebuild
index 5e56a2ae000b..099143598caf 100644
--- a/dev-python/pexpect/pexpect-4.2.1.ebuild
+++ b/dev-python/pexpect/pexpect-4.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pmw/pmw-2.0.1.ebuild b/dev-python/pmw/pmw-2.0.1.ebuild
index 8eb4e3afb2d2..4bdfc6b21ed6 100644
--- a/dev-python/pmw/pmw-2.0.1.ebuild
+++ b/dev-python/pmw/pmw-2.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="py3"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc examples test"
DEPEND="!dev-python/pmw:0"
diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
index 7b66e373058b..efbe02167150 100644
--- a/dev-python/prometheus_client/Manifest
+++ b/dev-python/prometheus_client/Manifest
@@ -1 +1,2 @@
DIST prometheus_client-0.0.20.tar.gz 40773 SHA256 2012c4e5ef6fa559881e02c18a191b6dba43950ee8e03def8b4b5ff271eb7e99 SHA512 fa82eafedd6cfbefbad38de87ef556be512cb62e912de135dcba1cf8227302f7650dfb4139dd22ae760793c150db433b505f405c925f07763aece46d66415594 WHIRLPOOL dbe5b8dd33abe3cac4acffcb188160f425de66ae8141ed6ba8d2130eb770f7dbb636fa66bbfb6fe866048f4758b631a2d8b5898fe13281467e1862c390bb12f1
+DIST prometheus_client-0.0.21.tar.gz 40859 SHA256 8836c8e8ac7bed68b22d7b03552ad1c677c8e73821470c541d4733f4b9d13823 SHA512 e948ecc9044bd6a59fdc58bb3dd638c89d210a5856a360b4270eff206b2280ef7a68c1e94aea64f5cfb68a218499e61627e34c71363ff222b1a3d27403396a31 WHIRLPOOL 83746b1ff1c609acd961589c310c820dec6e3015e4174de8e0d71a0849ed439f858e05e7684965678d5f77f1b1a38438432412851b38c651cbbdf511198a3aed
diff --git a/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild b/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild
new file mode 100644
index 000000000000..af5a5b0c716d
--- /dev/null
+++ b/dev-python/prometheus_client/prometheus_client-0.0.21.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for the Prometheus monitoring system"
+HOMEPAGE="https://pypi.python.org/pypi/prometheus_client"
+SRC_URI="https://github.com/prometheus/client_python/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+S=${WORKDIR}/client_python-${PV}
+
+RDEPEND="|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+ pytest || die
+}
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
index 7341fbf66729..30b39030fb57 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/pycups/pycups-1.9.73-r1.ebuild b/dev-python/pycups/pycups-1.9.73-r1.ebuild
index a513564f5e9f..13bfc8f7406b 100644
--- a/dev-python/pycups/pycups-1.9.73-r1.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86"
SLOT="0"
IUSE="doc examples"
diff --git a/dev-python/pydns/pydns-3.1.1.ebuild b/dev-python/pydns/pydns-3.1.1.ebuild
index 95be5be1fa53..6004c2f169d1 100644
--- a/dev-python/pydns/pydns-3.1.1.ebuild
+++ b/dev-python/pydns/pydns-3.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PV}/+download/${MY_P}.tar.gz"
LICENSE="CNRI"
SLOT="3"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 hppa ~ia64 ~ppc ~sparc x86"
IUSE="examples"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
index 0ff5e9700d73..245594294805 100644
--- a/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
+++ b/dev-python/pylibmc/pylibmc-1.5.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/lericson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc test"
RDEPEND=">=dev-libs/libmemcached-0.32"
diff --git a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
index ddfb2d9db370..ded5cdf6e032 100644
--- a/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
+++ b/dev-python/tlslite/tlslite-0.4.9-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
#Refrain for now setting IUSE test and deps of test given test restricted.
IUSE=""
diff --git a/dev-python/twisted/twisted-17.5.0-r1.ebuild b/dev-python/twisted/twisted-17.5.0-r1.ebuild
index a859d97e120e..78bd82450ae2 100644
--- a/dev-python/twisted/twisted-17.5.0-r1.ebuild
+++ b/dev-python/twisted/twisted-17.5.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
# Dropped keywords due to new deps not keyworded
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/twython/twython-3.3.0.ebuild b/dev-python/twython/twython-3.3.0.ebuild
index 858cdfbf65e4..811a837599ab 100644
--- a/dev-python/twython/twython-3.3.0.ebuild
+++ b/dev-python/twython/twython-3.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/dev-ruby/json/json-1.8.6-r1.ebuild b/dev-ruby/json/json-1.8.6-r1.ebuild
index ac7ff90dfc27..1d21b4bfdf29 100644
--- a/dev-ruby/json/json-1.8.6-r1.ebuild
+++ b/dev-ruby/json/json-1.8.6-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/json/json-1.8.6.ebuild b/dev-ruby/json/json-1.8.6.ebuild
index 337c9eaff1d9..0810a567dd1b 100644
--- a/dev-ruby/json/json-1.8.6.ebuild
+++ b/dev-ruby/json/json-1.8.6.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/multi_json/multi_json-1.12.1.ebuild b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
index 077e2ce0dc1a..8660b9d9e4ac 100644
--- a/dev-ruby/multi_json/multi_json-1.12.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
HOMEPAGE="https://github.com/intridea/multi_json"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-ruby/rr/rr-1.2.1.ebuild b/dev-ruby/rr/rr-1.2.1.ebuild
index 6193ecf56bd8..1c60c993f2a1 100644
--- a/dev-ruby/rr/rr-1.2.1.ebuild
+++ b/dev-ruby/rr/rr-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? (
diff --git a/dev-ruby/rubygems/rubygems-2.6.13.ebuild b/dev-ruby/rubygems/rubygems-2.6.13.ebuild
index 5cfd28e682d3..0dd6d4b2f41d 100644
--- a/dev-ruby/rubygems/rubygems-2.6.13.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.6.13.ebuild
@@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )"
SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="server test"
diff --git a/dev-ruby/session/session-3.2.0.ebuild b/dev-ruby/session/session-3.2.0.ebuild
index 34ff7e50adf9..c694ab5e9391 100644
--- a/dev-ruby/session/session-3.2.0.ebuild
+++ b/dev-ruby/session/session-3.2.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://codeforpeople.com/lib/ruby/session/"
# by author.
LICENSE="Ruby"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test"
DEPEND+=" test? ( || ( sys-apps/coreutils sys-freebsd/freebsd-bin ) )"
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
index 985a20e0b181..8ef2241712f2 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.3.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/yajl-ruby"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="${RDEPEND} dev-libs/yajl"
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
index cdf34426d187..009601bfd42f 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 30ac5d833c68..7de33040a2f9 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1 +1 @@
-DIST promu-0.1.0_p20170607.tar.gz 399675 SHA256 e2995015d66c25e431284e24623a3ecb5813fdaf45cd31231d1ba5a9a500e1a0 SHA512 38c5230b8a301675b55ea80c2ab461be51d560d96511c8ce4ac101434e484dca0a90ccacb06b3bb9057d151fac407adc443833032ddd226416a1fd5af788edaf WHIRLPOOL d2779d629d1b04ca9ccc78711a591a19ef1beede1ac6708e45f3a0d0fd2bcf309858d7aaeba739c6ce17cf12bd5edc6612a123dee2a41d4796685c0b188e599d
+DIST promu-0.1.0.tar.gz 1065003 SHA256 043c4149bc85e4d51a93390cdb4fee6871d93123ced5c2d3d4f78a2265167bbc SHA512 18ad54b1ec9fe8975a0048b5c85609858cd500a2d3aa34e51e5c2c3d07a0df4337bac9648562e2007d5c8572e07c814c6bba7522b94836c258cde457df5815e2 WHIRLPOOL 3717496ee2296bfa27baf47d601f3bb5eaa4e4e27c3ebd7fd71979ae9e29d833f04065a16add9b2410fb4cff040d98a51e9d628ba316ab8cb488eda2ef4f7b15
diff --git a/dev-util/promu/promu-0.1.0_p20170607.ebuild b/dev-util/promu/promu-0.1.0.ebuild
index afa41dc9ac4e..6cefcabc0a9c 100644
--- a/dev-util/promu/promu-0.1.0_p20170607.ebuild
+++ b/dev-util/promu/promu-0.1.0.ebuild
@@ -5,20 +5,19 @@ EAPI=6
inherit golang-build golang-vcs-snapshot
EGO_PN="github.com/prometheus/promu"
-EGIT_COMMIT="85ceabc50a0f1c0072304f694333062836c9f640"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+EGIT_COMMIT="5e82f2f"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
DESCRIPTION="Prometheus Utility Tool"
HOMEPAGE="https://github.com/prometheus/promu"
-SRC_URI="${ARCHIVE_URI}"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
src_compile() {
LDFLAGS="-X github.com/prometheus/vendor/github.com/prometheus/common/version.Version=$(cat src/${EGO_PN}/VERSION)
- -X github.com/prometheus/vendor/github.com/prometheus/common/version.Revision=${EGIT_COMMIT:0:7}
+ -X github.com/prometheus/vendor/github.com/prometheus/common/version.Revision=${EGIT_COMMIT}
-extldflags \"-static\""
GOPATH="${S}" go build -ldflags "${LDFLAGS}" -o bin/promu src/${EGO_PN}/main.go || die
}
diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
index 9dd270b6827f..0bfbf53733fc 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
LICENSE="GPL-2 LGPL-2"
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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="crypt doc kerberos nls pam server"
RESTRICT="test"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index baffa39bda9b..a18e8042641c 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -139,6 +139,7 @@ if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
[[ -n ${D_VER} ]] && IUSE+=" d"
[[ -n ${SPECS_VER} ]] && IUSE+=" nossp"
tc_version_is_at_least 3 && IUSE+=" doc gcj awt hardened multilib objc"
+ tc_version_is_at_least 3.3 && IUSE+=" pgo"
tc_version_is_at_least 4.0 && IUSE+=" objc-gc"
tc_version_is_between 4.0 4.9 && IUSE+=" mudflap"
tc_version_is_at_least 4.1 && IUSE+=" libssp objc++"
@@ -1569,7 +1570,11 @@ gcc_do_make() {
# resulting binaries natively ^^;
GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all}
else
- GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean}
+ if tc_version_is_at_least 3.3 && use pgo; then
+ GCC_MAKE_TARGET=${GCC_MAKE_TARGET-profiledbootstrap}
+ else
+ GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap-lean}
+ fi
fi
# Older versions of GCC could not do profiledbootstrap in parallel due to
diff --git a/games-misc/lolcat/Manifest b/games-misc/lolcat/Manifest
index 0c720670d2c5..5dfd91c96f93 100644
--- a/games-misc/lolcat/Manifest
+++ b/games-misc/lolcat/Manifest
@@ -1 +1,2 @@
DIST lolcat-42.1.43.gem 205312 SHA256 98cb63bb018b5b56dc29009e7e8288ed66b7f7e34edb78e4cc9c9169998e019c SHA512 eaea5637655bb2571025a9b33fc40c13aa1e7a4e782f6b9cd217bfd19f19e497228cea23988913183968a23564cae8f07e488ac413f8c5b27e5b50ce9a58e0ce WHIRLPOOL 3bf334d2d0943cd58ce2419b196167fe3661c65f98f9e0cca1361350f0a20831c1955c113fbb8e652fe369196e382122bb5dc9de6d033705c36dab71b4abd572
+DIST lolcat-90.8.8.gem 56832 SHA256 ce80b9e21503553fd8cc9bc2bae6a66bfe300bc580a7b1284de06e8e300f03e0 SHA512 2517a2e903c52d16c9773a32fae000917741a0b323abc19cdf4cad68f9ba873f059cda5790819e0d2cb057239dca9ac39a191f9e05417a91ef99f2232e8af3dd WHIRLPOOL b1c85f6dbbec4a421fb337b1aacc16b2397d776fdf5db53d3609b4e35d5c7fd7ad7b372a6e824f2c686ef9c07fabb027c574343904e62adb009a3cfbc7e8475a
diff --git a/games-misc/lolcat/lolcat-90.8.8.ebuild b/games-misc/lolcat/lolcat-90.8.8.ebuild
new file mode 100644
index 000000000000..3e785fac1320
--- /dev/null
+++ b/games-misc/lolcat/lolcat-90.8.8.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="lolcat.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rainbows and unicorns!"
+HOMEPAGE="https://github.com/busyloop/lolcat"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_rdepend "
+ >=dev-ruby/trollop-2.1.2:2
+ >=dev-ruby/paint-2.0.0"
diff --git a/kde-frameworks/kpackage/kpackage-5.38.0.ebuild b/kde-frameworks/kpackage/kpackage-5.38.0.ebuild
index fb880a054be9..6240b9c90254 100644
--- a/kde-frameworks/kpackage/kpackage-5.38.0.ebuild
+++ b/kde-frameworks/kpackage/kpackage-5.38.0.ebuild
@@ -32,9 +32,10 @@ src_test() {
mkdir -p "${HOME}/.local/share/kservicetypes5" || die
cp "${S}"/src/kpackage/data/servicetypes/*desktop "${HOME}/.local/share/kservicetypes5/" || die
- # tests cannot be run in parallel #606942
+ # tests cannot be run in parallel #606942; disable broken test #630664
local myctestargs=(
-j1
+ -E "(plasma-querytest)"
)
kde5_src_test
diff --git a/kde-misc/plasma-applet-weather-widget/Manifest b/kde-misc/plasma-applet-weather-widget/Manifest
index f81fc1078fab..bd9a797ea4c1 100644
--- a/kde-misc/plasma-applet-weather-widget/Manifest
+++ b/kde-misc/plasma-applet-weather-widget/Manifest
@@ -1,2 +1 @@
-DIST plasma-applet-weather-widget-1.6.8.tar.gz 104894 SHA256 6632643ea20b090556ff916d4f17094f89c715bff89084189f72c523f8d38603 SHA512 4fcdcf40fd93e1ee0a86b8588e7546dd934ba2e1c5d4adda99464fff8d1134be687b09e5e4a7f51d36e9f1206238e35db815a77707ddb80c78b8d563a01dfbee WHIRLPOOL 84371868174d708aee942995eaf09f3a04051a42ba63f1a32878cffdd7b50f57f230eaa18026886097e717ed204b6278ff2fe41b1debc9a8ac8ffcf2d8b886c9
-DIST plasma-applet-weather-widget-1.6.9.tar.gz 106942 SHA256 9447a01adf3589006efea647daf3cc5eac74362dcd6475738164ccaac3a8ad98 SHA512 fd8a99fc8c78b90f1553547b3733aa337acb5e39efd242426ae91847694aa1163363f5415e6fa3d83a2bcd90493c4ef24be721d6f915c9ed8b1fb6503699f5d1 WHIRLPOOL 5c4e1752d519be1f3b818dd8e8e888006c82bc5f17f2cddfd93720de25bc5d475c31b590740053f41d8991ca42026bf8b42fd74b51ff600b5c519a9818312542
+DIST plasma-applet-weather-widget-1.6.10.tar.gz 107848 SHA256 9557441285121be52bfe27fa2bb214e865132b8581953faf88f1fae4ae1e87f2 SHA512 5db4c2e426b9b8296b70ec4edf5fc2dbc5e8056f66327569008a77b05201896ed23039aae063807726376e203d637053884bfeeac78c59c519b7fc5685797331 WHIRLPOOL b2f8b570d1ea97f39f742f2a546d8cf294c8af814283ea78c236a1672c460e04c6e3eb2134b3dde82e2a28d0143108cccf59d523e3a5abb9742e706388d15be8
diff --git a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.8.ebuild b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10.ebuild
index 88e387288f6f..88e387288f6f 100644
--- a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.8.ebuild
+++ b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.10.ebuild
diff --git a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.9.ebuild b/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.9.ebuild
deleted file mode 100644
index 88e387288f6f..000000000000
--- a/kde-misc/plasma-applet-weather-widget/plasma-applet-weather-widget-1.6.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Plasma 5 applet for weather forecasts"
-HOMEPAGE="https://store.kde.org/content/show.php/Weather+Widget?content=169572
-https://github.com/kotelnik/plasma-applet-weather-widget"
-
-if [[ ${KDE_BUILD_TYPE} = live ]] ; then
- EGIT_REPO_URI="https://github.com/kotelnik/${PN}.git"
-else
- SRC_URI="https://github.com/kotelnik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep plasma)
- $(add_qt_dep qtdeclarative 'xml')
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
index a402bb7b4963..f9e7a0683a5c 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.10.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.ijs.si/software/amavisd/${MY_P}.tar.xz"
LICENSE="GPL-2 BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
DEPEND=">=sys-apps/sed-4
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
index faa907017a14..b50747597c0d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.0-r3.ebuild
@@ -12,7 +12,7 @@ PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES=yes
LICENSE="GPL-2 BSD-2"
SLOT="0"
-KEYWORDS="amd64 hppa ppc64 x86"
+KEYWORDS="amd64 hppa ~ppc ppc64 x86"
IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
DEPEND=">=sys-apps/sed-4
diff --git a/media-libs/libao/libao-1.2.2.ebuild b/media-libs/libao/libao-1.2.2.ebuild
index 43eced2ede00..b0e8e1e6d212 100644
--- a/media-libs/libao/libao-1.2.2.ebuild
+++ b/media-libs/libao/libao-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="alsa nas mmap pulseaudio static-libs"
RDEPEND="
diff --git a/media-libs/libraw/libraw-0.18.2.ebuild b/media-libs/libraw/libraw-0.18.2.ebuild
index c2eb462dff53..0aeacdf3e3ca 100644
--- a/media-libs/libraw/libraw-0.18.2.ebuild
+++ b/media-libs/libraw/libraw-0.18.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libraw/libraw-0.18.4.ebuild b/media-libs/libraw/libraw-0.18.4.ebuild
index e283bac14e1e..af9ccb6680ba 100644
--- a/media-libs/libraw/libraw-0.18.4.ebuild
+++ b/media-libs/libraw/libraw-0.18.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz
LICENSE="LGPL-2.1 CDDL demosaic? ( GPL-2 GPL-3 )"
SLOT="0/16" # subslot = libraw soname version
-KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/taglib/taglib-1.11.1-r1.ebuild b/media-libs/taglib/taglib-1.11.1-r1.ebuild
index 452ccd55c92f..a1941dabbb97 100644
--- a/media-libs/taglib/taglib-1.11.1-r1.ebuild
+++ b/media-libs/taglib/taglib-1.11.1-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://taglib.github.io/"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1 MPL-1.1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
SLOT="0"
IUSE="boost debug examples test"
diff --git a/media-sound/qsynth/qsynth-0.4.4.ebuild b/media-sound/qsynth/qsynth-0.4.4.ebuild
index bafc0a80dd0a..d88d540d7268 100644
--- a/media-sound/qsynth/qsynth-0.4.4.ebuild
+++ b/media-sound/qsynth/qsynth-0.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="debug jack alsa pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ppc ~x86"
RDEPEND="
dev-qt/qtcore:5
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 25b093d5e704..3c7fb0d7be06 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,4 +1 @@
-DIST qtractor-0.8.0.tar.gz 1727292 SHA256 4710f1c9f377b0e2c678517c6c094921b504aec3c16702048d9b611fe930659f SHA512 b73232bbd2d967afe336b504d58f113ed2de36ab125dcda3585f607c4eabc6c88d898713a960af12155725d2074f7357b7dc3ffb30627d5efc15948f8c302572 WHIRLPOOL 3c5a825b296df964d6e61e4946bcea693e7f00dc36d1136cacf32bf50788ba1ebe232d9fb96b650c7d6a0e194eca7da44b6ceb7975e785c17a599ca6baa4f66a
-DIST qtractor-0.8.1.tar.gz 1734108 SHA256 baf14db40d0ea5b6356482b2c5b9e53aeb5e58177f820b408a4cb9e94b4e7adf SHA512 d408e52af3e9882d33de2f7736ab6fae32a47e71865c3fa7a50e433729eecef0ec8da75c50ec331306a7d78fa1f615afabbdc7450b4b900c6786f1270d70bfe9 WHIRLPOOL fc307527240bd2166586c972193bc28e74ea27b78ec78841d1f0becf824c3391d56134554fade4ac759e90d6a0f2219b6cbc82ab17e17eae95613251ab46c570
-DIST qtractor-0.8.2.tar.gz 1740580 SHA256 030707a881861b8d8313761e0b08095fa252f8fe9dd082846def19916ccae76a SHA512 43e12ca785bf28fa994204c69dc9422909f817da6fae0082bf0ab042b2e1e3254c2b90aa8966f903dffa21fe3bf800d119ecfa3e7528787375a313134dcc8985 WHIRLPOOL 193d7b3a7158b62c3872a9fb39b9f90d0f06a1dd5297f99e4183b174f3d746a63b9d7e2f20b26d5b3e9bcdb24737dec348ffb6cc3fb2e80b5252067b08a15e5b
DIST qtractor-0.8.3.tar.gz 1750869 SHA256 6852facb08c1a38c9c4bf5bf9922b0b9a050a00b85c6b5aeda1764f3afb8f83d SHA512 a80fd1c274ff11ff43b1c60a5fd0d4ff5c0e9d333849b6ff0b811e1afc31352395b47b712614c091af3a445d0664ea407d3b6594a38b7a6f5e8fc7adec6f62dc WHIRLPOOL 49ac1f3dfcabc2ebbc5b67a181997a5d15435a0d83f493f26fcb835715e837ed523a7cfe44412c36ebfc05dc8d7234d9031b47a5e84d2cc307af18c8f8c0fc45
diff --git a/media-sound/qtractor/qtractor-0.8.0-r1.ebuild b/media-sound/qtractor/qtractor-0.8.0-r1.ebuild
deleted file mode 100644
index 109cd03c7e70..000000000000
--- a/media-sound/qtractor/qtractor-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils flag-o-matic eutils
-
-DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
-HOMEPAGE="http://qtractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug dssi libsamplerate mad osc +qt5 rubberband vorbis cpu_flags_x86_sse zlib"
-
-RDEPEND="
- !qt5? (
- >=dev-qt/qtcore-4.2:4
- >=dev-qt/qtgui-4.7:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtx11extras:5
- )
- media-libs/alsa-lib
- media-libs/libsndfile
- virtual/jack
- media-libs/ladspa-sdk
- >=media-libs/lilv-0.16.0
- media-libs/lv2
- media-libs/suil
- dssi? ( media-libs/dssi )
- mad? ( media-libs/libmad )
- libsamplerate? ( media-libs/libsamplerate )
- osc? ( media-libs/liblo )
- rubberband? ( media-libs/rubberband )
- vorbis? ( media-libs/libvorbis )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS="README ChangeLog TODO AUTHORS"
-
-src_configure() {
- econf \
- $(use_enable mad libmad) \
- $(use_enable libsamplerate) \
- $(use_enable vorbis libvorbis) \
- $(use_enable osc liblo) \
- --enable-ladspa \
- $(use_enable dssi) \
- --enable-lilv \
- $(use_enable !qt5 qt4) \
- $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
- $(use_enable rubberband librubberband) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable zlib libz) \
- $(use_enable debug)
-
- if use qt5 ; then
- eqmake5 ${PN}.pro -o ${PN}.mak
- else
- eqmake4 ${PN}.pro -o ${PN}.mak
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- einstalldocs
-}
diff --git a/media-sound/qtractor/qtractor-0.8.1-r1.ebuild b/media-sound/qtractor/qtractor-0.8.1-r1.ebuild
deleted file mode 100644
index d855a90627bb..000000000000
--- a/media-sound/qtractor/qtractor-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils flag-o-matic eutils
-
-DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
-HOMEPAGE="http://qtractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug dssi libsamplerate mad osc +qt5 rubberband vorbis cpu_flags_x86_sse zlib"
-
-RDEPEND="
- !qt5? (
- >=dev-qt/qtcore-4.2:4
- >=dev-qt/qtgui-4.7:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtx11extras:5
- )
- media-libs/alsa-lib
- media-libs/libsndfile
- virtual/jack
- media-libs/ladspa-sdk
- >=media-libs/lilv-0.16.0
- media-libs/lv2
- media-libs/suil
- dssi? ( media-libs/dssi )
- mad? ( media-libs/libmad )
- libsamplerate? ( media-libs/libsamplerate )
- osc? ( media-libs/liblo )
- rubberband? ( media-libs/rubberband )
- vorbis? ( media-libs/libvorbis )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS="README ChangeLog TODO AUTHORS"
-
-src_configure() {
- append-cxxflags '-std=c++11'
- econf \
- $(use_enable mad libmad) \
- $(use_enable libsamplerate) \
- $(use_enable vorbis libvorbis) \
- $(use_enable osc liblo) \
- --enable-ladspa \
- $(use_enable dssi) \
- --enable-lilv \
- $(use_enable !qt5 qt4) \
- $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
- $(use_enable rubberband librubberband) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable zlib libz) \
- $(use_enable debug)
-
- if use qt5 ; then
- eqmake5 ${PN}.pro -o ${PN}.mak
- else
- eqmake4 ${PN}.pro -o ${PN}.mak
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- einstalldocs
-}
diff --git a/media-sound/qtractor/qtractor-0.8.2-r1.ebuild b/media-sound/qtractor/qtractor-0.8.2-r1.ebuild
deleted file mode 100644
index d855a90627bb..000000000000
--- a/media-sound/qtractor/qtractor-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils flag-o-matic eutils
-
-DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
-HOMEPAGE="http://qtractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug dssi libsamplerate mad osc +qt5 rubberband vorbis cpu_flags_x86_sse zlib"
-
-RDEPEND="
- !qt5? (
- >=dev-qt/qtcore-4.2:4
- >=dev-qt/qtgui-4.7:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtx11extras:5
- )
- media-libs/alsa-lib
- media-libs/libsndfile
- virtual/jack
- media-libs/ladspa-sdk
- >=media-libs/lilv-0.16.0
- media-libs/lv2
- media-libs/suil
- dssi? ( media-libs/dssi )
- mad? ( media-libs/libmad )
- libsamplerate? ( media-libs/libsamplerate )
- osc? ( media-libs/liblo )
- rubberband? ( media-libs/rubberband )
- vorbis? ( media-libs/libvorbis )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS="README ChangeLog TODO AUTHORS"
-
-src_configure() {
- append-cxxflags '-std=c++11'
- econf \
- $(use_enable mad libmad) \
- $(use_enable libsamplerate) \
- $(use_enable vorbis libvorbis) \
- $(use_enable osc liblo) \
- --enable-ladspa \
- $(use_enable dssi) \
- --enable-lilv \
- $(use_enable !qt5 qt4) \
- $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
- $(use_enable rubberband librubberband) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable zlib libz) \
- $(use_enable debug)
-
- if use qt5 ; then
- eqmake5 ${PN}.pro -o ${PN}.mak
- else
- eqmake4 ${PN}.pro -o ${PN}.mak
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- einstalldocs
-}
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
index 162a73287706..ead61fe926ed 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.3.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86"
IUSE="apache2 classicui lighttpd perl +web vim-syntax"
# In pkg_postinst(), we change the group of the Nagios configuration
diff --git a/net-analyzer/nagios/nagios-4.3.3.ebuild b/net-analyzer/nagios/nagios-4.3.3.ebuild
index 29ce0288b4d9..f312d58c9911 100644
--- a/net-analyzer/nagios/nagios-4.3.3.ebuild
+++ b/net-analyzer/nagios/nagios-4.3.3.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.nagios.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc ~x86"
IUSE=""
RDEPEND="~net-analyzer/nagios-core-${PV}
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index c18e8a28fae2..fb4f8722e752 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,2 +1,3 @@
DIST prometheus-1.7.1.tar.gz 5122747 SHA256 209832310f5bef99faef3beaaa95263612a4d0126ca512c4a4c23a8543d3ccf5 SHA512 98a42e95978477530082d7549c29f17b133043d7c233ba3c90b183f06a3f24ee578f8fed75cba476d3c93a22abcccfdbccc94488beb8450a02f260d24165ba26 WHIRLPOOL 8ab473430752336e09b4a0c38fd1117abe21196478d7f2f7e813c27f07c950cc3525d9e9ba32309711c73a1032f3cff27ddc1582d0c4b6c66fe82d5b58675550
DIST prometheus-2.0.0_beta4.tar.gz 5534359 SHA256 81196ea9d678c339ba592f29c0f0bdf6bd050862065c5b45351588dc47efbbce SHA512 2d2727e34cb6d71ba4ac431d3300a47482522c115f602358ce77c3ababb2defeec863d10d8cffc0325be0a9dde16e7c3beeed9a0f3c7b6b3b0db86e77e715b6c WHIRLPOOL 52abc94fa55d52e49d3da6a10e6504e07e5cafd635f7c337b941939ee5ff4a112dc7dfee0bfa96ae99086da9f2b14fb79eedb36158f4c0a746a77d3b158d386d
+DIST prometheus-2.0.0_beta5.tar.gz 5533740 SHA256 451d4c76fe583de1df3d6164aaec1ff2105ee449706acd1843f1a2119440914e SHA512 d84fddd5eb2f03b1edf95cd4fa83312f6e617be863ea77a05864345aa1685ad227e82002d9beb3efc1c18ea6a2539dbfdbcc20aa9d2c0ba510ac7293702b4bd9 WHIRLPOOL 7facfaba5727ffa519e633f49f1ef6b59b67a11ab978eacd6533c487df68a96d46fde6ed231f48c67684a214bbbc8a88e37901a5d835d7ffacb27e702d98d348
diff --git a/net-analyzer/prometheus/prometheus-2.0.0_beta5.ebuild b/net-analyzer/prometheus/prometheus-2.0.0_beta5.ebuild
new file mode 100644
index 000000000000..8fe0ba81b574
--- /dev/null
+++ b/net-analyzer/prometheus/prometheus-2.0.0_beta5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=${PV/_beta/-beta.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="64c7932"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+ enewgroup prometheus
+ enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+ pushd src/${EGO_PN} || die
+ GOPATH="${S}" promu build -v || die
+ popd || die
+}
+
+src_install() {
+ pushd src/${EGO_PN} || die
+ dobin promtool prometheus
+ dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+ insinto /etc/prometheus
+ doins documentation/examples/prometheus.yml
+ insinto /usr/share/prometheus
+ doins -r console_libraries consoles
+ dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+ dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+ popd || die
+
+ newinitd "${FILESDIR}"/prometheus-3.initd prometheus
+ newconfd "${FILESDIR}"/prometheus.confd prometheus
+ keepdir /var/log/prometheus /var/lib/prometheus
+ fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+ if has_version '<net-analyzer/prometheus-2.0.0_beta4'; then
+ ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+ ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+ ewarn "This release requires a clean storage directory and is not compatible with"
+ ewarn "files created by previous beta releases"
+ fi
+}
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
index aade92d19aaa..5ce4d4fd76cb 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="+drop-root libressl smi ssl samba suid test"
RDEPEND="
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index d8b44b27b57b..27752cc44d27 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -1,3 +1,6 @@
+DIST be13_api-20170924.tar.gz 75724 SHA256 6dc9f0157ec56e50ae7831a2fef8d3ecb88d689f318317bf1c4cc7dcb0917ae5 SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4 WHIRLPOOL 6ab2f40d45a2b8f495e7c0df2fa977b24c2245fe1015c627d1674eff519c206d301e0558f97c0528eeb1fb939f514cd976ae7caae323f86bc2493b75b5b90fbd
+DIST dfxml-20170921.tar.gz 163616 SHA256 f24bd6c149d07f9ed1089fc25afdab2451f6615e57d5f25529e8d2a59989bc18 SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1 WHIRLPOOL b693966c0da1b228415b1416cd3a7a3c25212d0c29839054739aa3fb821a9b429166d8be3e1c58bdcacdacc25fc2c9664e3aadc8aa40c060ec11fc7ca865145d
+DIST tcpflow-1.5.0alpha.tar.gz 763403 SHA256 ea5467880cd1ea56f2567f97db12bdcebcf5bfb722b6580a6d3ce3acf641a4f1 SHA512 240ea6ccb39d13cc86fdaf8bb8284b796d2ceb070aee2dbb0364a6d9f572863159e79ad40259aa6e85c729e28f35c2f453df261490c09c321276686be4627b96 WHIRLPOOL 733075c64ea6f10ed8cce4738514c2987fbb340f9765f180c2987c048fb481c5685f2d00d27b8ad903b77a670889223e71fb473fcbc9af4eb498580aabd1751e
DIST tcpflow_1.4.5+repack1-1.debian.tar.xz 11144 SHA256 b917e994ac1cd64cb63f719700b0a9862359779286cab89c9c29f73e64ec2d5b SHA512 ed2c491595a3d5382ca79fe945467639af3d99658d002353f90e07aa6b1a955e57ab0fbbc3fadf964e9d6d3dba4fd327a02c1b07d6a239efdf90b365928b2a1e WHIRLPOOL 0854405a429bd2f7276b18acc204e5ac5cfde1bbd4a8f5308e6bf667355eb1ea8a98c52b30a5a24aacb4f8f7b8469e75c2c49fc5f187aa87b869fad9c91d025c
DIST tcpflow_1.4.5+repack1-4.debian.tar.xz 12228 SHA256 f7207ea03e9aa1c96ec322835aed486a7fde2244d26ce4d9b23cb75d613a0e07 SHA512 27d8a7a735b06c35cc2985cb26a129a490fc2236eedeede21977afe4c3096a6fde3ea18de1aaa3a1c6a56bc36d332b1e8bd4c7be933d5b031509a69cae189b18 WHIRLPOOL 35817c9ca6cfec60d91d4809ae1661f26011c0f4fe020c15a168e82651a6dfa9c63a87188428675dbc7330ab43b0fcdc443b7d7ec954007fbbc8f4f5d9b7df3d
DIST tcpflow_1.4.5+repack1.orig.tar.gz 725962 SHA256 1d9b4ce2dd85adc1c608f34ada576b7f5b6d51c686ae6b870c3c277049a24af0 SHA512 fed8589957e3c790b5b6837b9b578d5dcbde316122ed6b3d4f908d1d73f23c6ed8a11720ee0510e878eaa7a6c559a2f35e7df2c77e3cb1f2810040adf7ac2b85 WHIRLPOOL 8743e20cea0fbee37c9ee050e8bbe02871e8a32dba2bbed922b912de457aa4eaf5cd21e8828a08eb3eafbf8d3897541230fc37bc4a15f7126e6b8adfb9fea860
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch
new file mode 100644
index 000000000000..6a2dc10cff9e
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-gentoo.patch
@@ -0,0 +1,191 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,6 @@
+ AC_PROG_INSTALL
+
+ m4_include([m4/slg_searchdirs.m4])
+-m4_include([m4/slg_gcc_all_warnings.m4])
+
+
+ # use C++11 mode if available; HAVE_CXX11 is defined in config.h if so. Don't
+@@ -96,96 +95,6 @@
+ fi
+
+ ################################################################
+-#
+-# Enable all the compiler debugging we can find
+-#
+-# This is originally from PhotoRec, but modified substantially by Simson
+-# Figure out which flags we can use with the compiler.
+-#
+-# These I don't like:
+-# -Wdeclaration-after-statement -Wconversion
+-# doesn't work: -Wunreachable-code
+-# causes configure to crash on gcc-4.2.1: -Wsign-compare-Winline
+-# causes warnings with unistd.h: -Wnested-externs
+-# Just causes too much annoyance: -Wmissing-format-attribute
+-# Check GCC
+-WARNINGS_TO_TEST="-MD -D_FORTIFY_SOURCE=2 -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes \
+- -Wshadow -Wwrite-strings -Wcast-align -Waggregate-return \
+- -Wbad-function-cast -Wcast-qual -Wundef -Wredundant-decls -Wdisabled-optimization \
+- -Wfloat-equal -Wmultichar -Wc++-compat -Wmissing-noreturn "
+-
+-if test $mingw = "no" ; then
+- # add the warnings we do not want to do on mingw
+- WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes"
+-fi
+-
+-echo "Warnings to test: $WARNINGS_TO_TEST"
+-
+-for option in $WARNINGS_TO_TEST
+-do
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS $option"
+- AC_MSG_CHECKING([whether gcc understands $option])
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+- [has_option=yes],
+- [has_option=no; CFLAGS="$SAVE_CFLAGS"])
+- AC_MSG_RESULT($has_option)
+- unset has_option
+- unset SAVE_CFLAGS
+- if test $option = "-Wmissing-format-attribute" ; then
+- AC_DEFINE(HAVE_MISSING_FORMAT_ATTRIBUTE_WARNING,1,
+- [Indicates that we have the -Wmissing-format-attribute G++ warning])
+- fi
+-done
+-unset option
+-
+-
+-# C++
+-# We don't use these warnings:
+-# -Waggregate-return -- aggregate returns are GOOD; they simplify code design
+-# We can use these warnings after ZLIB gets upgraded:
+-# -Wundef --- causes problems with zlib
+-# -Wcast-qual
+-# -Wmissing-format-attribute --- Just too annoying
+-AC_LANG_PUSH(C++)
+-WARNINGS_TO_TEST="-Wall -MD -D_FORTIFY_SOURCE=2 -Wpointer-arith \
+- -Wshadow -Wwrite-strings -Wcast-align \
+- -Wredundant-decls -Wdisabled-optimization \
+- -Wfloat-equal -Wmultichar -Wmissing-noreturn \
+- -Woverloaded-virtual -Wsign-promo \
+- -funit-at-a-time"
+-
+-if $CXX -dM -E - < /dev/null | grep -q __clang__ ; then
+- AC_MSG_RESULT([Using clang])
+- clang='yes'
+- else
+- AC_MSG_RESULT([not using clang])
+- clang='no'
+- # -Wstrict-null-sentinel is not supported under clang or under Darwin's gcc
+- WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wstrict-null-sentinel"
+-fi
+-
+-if test $mingw = "no" ; then
+- # add the warnings we don't want to do on mingw
+- WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Weffc++"
+-fi
+-
+-for option in $WARNINGS_TO_TEST
+-do
+- SAVE_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS $option"
+- AC_MSG_CHECKING([whether g++ understands $option])
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+- [has_option=yes],
+- [has_option=no; CXXFLAGS="$SAVE_CXXFLAGS"])
+- AC_MSG_RESULT($has_option)
+- unset has_option
+- unset SAVE_CXXFLAGS
+-done
+-unset option
+-AC_LANG_POP()
+-
+-################################################################
+ ##
+
+
+@@ -396,7 +305,12 @@
+ AC_CHECK_HEADERS(cap-ng.h)
+ fi
+
++################################################################
++# http-parser
+
++AC_CHECK_LIB(http_parser,http_parser_init,,
++ AC_MSG_ERROR([http-parser library not installed]))
++AC_CHECK_HEADERS(http_parser.h)
+
+ ################################################################
+ # Specify our other headers
+@@ -603,35 +517,6 @@
+ Mmissing_library="$Mmissing_library python27" # Not sure: https://github.com/macports/macports-ports/blob/master/lang/python27/Portfile
+ ])
+
+-############## drop optimization flags if requested ################
+-
+-# Should we disable optimization?
+-AC_ARG_WITH([opt], AC_HELP_STRING([--without-opt], [Drop all -O C flags]))
+-# Or maybe just tone it down a bit?
+-AC_ARG_WITH([o3], AC_HELP_STRING([--without-o3], [Do not force O3 optimization; use default level]))
+-
+-if test x"${AFF_NOOPT}" != "x" ; then
+- AC_MSG_NOTICE([Dropping optimization flags because AFF_NOOPT is set.])
+- with_opt="no";
+-fi
+-
+-if test "${with_opt}" = "no" ; then
+- AC_MSG_NOTICE([Dropping optimization flags])
+- CFLAGS=`echo "$CFLAGS" | sed s/-O[[0-9]]//` # note the double quoting!
+- CXXFLAGS=`echo "$CXXFLAGS" | sed s/-O[[0-9]]//`
+-
+- AC_MSG_NOTICE([Removing -D_FORTIFY_SOURCE=2])
+- CPPFLAGS=`echo $CPPFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
+- CXXFLAGS=`echo $CXXFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
+- CFLAGS=`echo $CFLAGS | sed s/-D_FORTIFY_SOURCE=2//`
+-else
+- # and increase optimizer from -O2 to -O3 if not explicitly forbidden
+- if test "${with_o3}" != "no" ; then
+- CFLAGS=`echo -g "$CFLAGS" | sed s/-O2/-O3/` # note the double quoting!
+- CXXFLAGS=`echo -g "$CXXFLAGS" | sed s/-O2/-O3/`
+- fi
+-fi
+-
+ AC_OUTPUT
+
+ ## Finally, record the values of CFLAGS, CPPFLAGS, and CXXFLAGS for DFXML
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -90,18 +90,10 @@
+ scan_netviz.cpp \
+ pcap_writer.h \
+ iptree.h \
+- http-parser/http_parser.c \
+- http-parser/http_parser.h \
+ mime_map.cpp \
+ mime_map.h
+
+ EXTRA_DIST =\
+- http-parser/AUTHORS \
+- http-parser/CONTRIBUTIONS \
+- http-parser/LICENSE-MIT \
+- http-parser/Makefile \
+- http-parser/README.md \
+- http-parser/http_parser.gyp \
+ wifipcap/README.txt \
+ wifipcap/TimeVal.cpp \
+ wifipcap/TimeVal.h \
+--- a/src/scan_http.cpp
++++ b/src/scan_http.cpp
+@@ -11,7 +11,11 @@
+ #include "tcpip.h"
+ #include "tcpdemux.h"
+
++#ifdef HAVE_HTTP_PARSER_H
++#include "http_parser.h"
++#else
+ #include "http-parser/http_parser.h"
++#endif
+
+ #include "mime_map.h"
+
diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
new file mode 100644
index 000000000000..b56144324c09
--- /dev/null
+++ b/net-analyzer/tcpflow/files/tcpflow-1.5.0_alpha-libcapng.patch
@@ -0,0 +1,13 @@
+--- a/src/tcpflow.cpp
++++ b/src/tcpflow.cpp
+@@ -30,6 +30,10 @@
+ #include <grp.h>
+ #endif
+
++#ifdef HAVE_CAP_NG_H
++#include <cap-ng.h>
++#endif
++
+ /* bring in inet_ntop if it is not present */
+ #define ETH_ALEN 6
+ #ifndef HAVE_INET_NTOP
diff --git a/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild b/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild
new file mode 100644
index 000000000000..6c5c1bdafe13
--- /dev/null
+++ b/net-analyzer/tcpflow/tcpflow-1.5.0_alpha.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic
+
+DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows"
+HOMEPAGE="https://github.com/simsong/tcpflow https://packages.qa.debian.org/t/tcpflow.html"
+SRC_URI="
+ https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz
+ https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz
+ https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz
+ https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz
+ https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz
+"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE="cairo test"
+
+RDEPEND="
+ dev-db/sqlite
+ dev-lang/python:2.7=
+ dev-libs/boost:=
+ dev-libs/openssl:=
+ net-libs/http-parser:=
+ net-libs/libpcap
+ sys-libs/libcap-ng
+ sys-libs/zlib:=
+ cairo? (
+ x11-libs/cairo
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( sys-apps/coreutils )
+"
+S=${WORKDIR}/${PN}-${P/_/}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.0_alpha-gentoo.patch
+ "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch
+)
+
+src_prepare() {
+ mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die
+ mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -fpermissive
+ econf $(usex cairo --enable-cairo=true --enable-cairo=false)
+}
diff --git a/net-analyzer/tsung/Manifest b/net-analyzer/tsung/Manifest
index 193a1644a2ea..fdf769f42fac 100644
--- a/net-analyzer/tsung/Manifest
+++ b/net-analyzer/tsung/Manifest
@@ -1 +1,2 @@
DIST tsung-1.6.0.tar.gz 1585794 SHA256 56846c3a90fd7037d9a76330cb8f3052238344491e2fe6ef1ebdb0b620eb3d84 SHA512 c66a84fc9b6781398ed4dee67f076fcddca28c5156782c05d6f5d7ce3e5e2ed6dbdb4076585f45a42aea65237b68aa08c8c80539706202a10cfec4e3ac8170cd WHIRLPOOL 3f083239c6c0950b6420dd7d401d0267f30655f5a3470f136326e6cc35414f779d58eb8e8aeac40eecb279976f5228369e5786e9df2b582e4ed75b45dc9fd35b
+DIST tsung-1.7.0.tar.gz 1572265 SHA256 6394445860ef34faedf8c46da95a3cb206bc17301145bc920151107ffa2ce52a SHA512 67490a95fb54f5196ae0302190190a6b8e79bbeba9a7c1932d83a949504489d4cc3ce048380c0cb09c6cae4c1e203d52de9ea0e2f4e7c3d7438b836aef532dac WHIRLPOOL f9175aebcff944b13550a11d10cd20cae8a0a1afadf6b40ab30aad6b02894008db0b340ff48f32ef76c0856be9921c4fcf2d877120937d1fe1ab869efe36825c
diff --git a/net-analyzer/tsung/tsung-1.7.0.ebuild b/net-analyzer/tsung/tsung-1.7.0.ebuild
new file mode 100644
index 000000000000..d2d90fd44c21
--- /dev/null
+++ b/net-analyzer/tsung/tsung-1.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Seems to be misconfigured
+RESTRICT="test"
+
+inherit eutils
+
+DESCRIPTION="Erlang's multi-protocol distributed load testing tool"
+HOMEPAGE="http://tsung.erlang-projects.org/"
+SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnuplot"
+
+DEPEND="dev-lang/erlang"
+RDEPEND="
+ gnuplot? (
+ sci-visualization/gnuplot
+ dev-perl/Template-Toolkit
+ )
+ ${DEPEND}
+"
+src_configure() {
+ ./configure --prefix="/usr" || die "econf failed"
+}
+
+src_compile() {
+ emake || die "Failed building"
+}
+
+src_install() {
+ emake -j1 DESTDIR="${D}" install || die "Failed installing"
+}
diff --git a/net-im/openmittsu/openmittsu-0.9.2.109.ebuild b/net-im/openmittsu/openmittsu-0.9.2.109.ebuild
index 3ac1b11f8409..aa52b268de9a 100644
--- a/net-im/openmittsu/openmittsu-0.9.2.109.ebuild
+++ b/net-im/openmittsu/openmittsu-0.9.2.109.ebuild
@@ -21,7 +21,7 @@ DEPEND=">=dev-libs/libsodium-1.0.11:=
>=dev-qt/qtnetwork-5.7.1:5=[ssl]
>=dev-qt/qtsql-5.7.1:5=[sqlite]
>=dev-qt/qtwidgets-5.7.1:5=
- >=media-gfx/qrencode-3.4.4-r1"
+ >=media-gfx/qrencode-3.4.4-r1:="
RDEPEND="${DEPEND}"
DOCS=(
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index 4890f31fdc4e..3db78776f9ed 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,2 +1,4 @@
DIST psi-1.2.tar.xz 2138940 SHA256 16ce1b767d40453032cd5d9ad5a9d4c6dba43989acc9a09538da3f74b7c614f5 SHA512 a486f6ee910cc17157849a68aa724608ddbeed319511646f6973a0789da192ec0fed7899024ad169c5b0e604372025dad7a58bacd223723d35ea490ec7f00b20 WHIRLPOOL 2a0f37067a085b3ce93864905367fa56584666bee6697bdae8f4eedd74cdf15f7be9eee85ba23440cb39a11e384e5ce7218a408042203fe70b398058a69b7867
+DIST psi-1.3.tar.xz 2143076 SHA256 59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b SHA512 b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe WHIRLPOOL 4fdccf0b730e86a2b44c417ffdb83e0f5acab714e8a00badfed6b3095159a10c11bd8ab1a5656172e12920ff72e20178eca93257974d538152cff7cf49424e47
DIST psi-l10n-1.2.tar.gz 2992381 SHA256 8a16c2d67c0aafbaa296fe06cd6b7de5f32683487b10245b10e8baae63b8f789 SHA512 946b86d12e76fe9a44f1adc154140a02f3d575e57b5f67c8d95472241c6d4510d1b4be81d8914d5670b15ea8ad1b836aa63fc62c3de94e0091b39e2fb234a130 WHIRLPOOL 6cd52e0dcd76f7df3137055de9d9e4518b1adfb8d6f03e9af59e0a49b01933c400d15671b252ea529543eab8f14aae34be8432c43bb28d9233f57833c0517718
+DIST psi-l10n-1.3.tar.gz 2991441 SHA256 122fb6e45e511fe96d8a84beb86e8e6fcb11500f468f9e97b52fddf193041378 SHA512 22885352b5f443ff0719ae4e861ce5626e779ec231ac13b5cd48a7c57065289c6c5504ae6d1f5782ad05b3d27a477fd52e729cfcd1c774786872d8a79cf55090 WHIRLPOOL 6aa0b6bbba0feceda1ca38bcff0166d3e6e0ed2b81bfd15bdfeabfac29411f114fbc7a6c27650a7e00f5b89bd53ef47763fd7013cd3cd9233a01612181e7b4c8
diff --git a/net-im/psi/psi-1.2.ebuild b/net-im/psi/psi-1.2.ebuild
index 322c0c6e2842..92f7233fa5a6 100644
--- a/net-im/psi/psi-1.2.ebuild
+++ b/net-im/psi/psi-1.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit l10n qmake-utils
+inherit l10n qmake-utils xdg-utils
DESCRIPTION="Qt XMPP client"
HOMEPAGE="http://psi-im.org/"
@@ -113,3 +113,14 @@ src_install() {
}
l10n_for_each_locale_do install_locale
}
+
+pkg_postinst()
+{
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/net-im/psi/psi-1.3.ebuild b/net-im/psi/psi-1.3.ebuild
new file mode 100644
index 000000000000..3d47e6fece4d
--- /dev/null
+++ b/net-im/psi/psi-1.3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit l10n qmake-utils xdg-utils
+
+DESCRIPTION="Qt XMPP client"
+HOMEPAGE="http://psi-im.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
+ https://github.com/psi-im/psi-l10n/archive/${PV}.tar.gz -> psi-l10n-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aspell crypt dbus debug doc enchant +hunspell ssl webengine webkit whiteboarding xscreensaver"
+
+# qconf generates not quite compatible configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+REQUIRED_USE="
+ ?? ( aspell enchant hunspell )
+ webengine? ( !webkit )
+"
+
+RDEPEND="
+ app-crypt/qca:2[qt5]
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ net-dns/libidn
+ sys-libs/zlib[minizip]
+ x11-libs/libX11
+ x11-libs/libxcb
+ aspell? ( app-text/aspell )
+ dbus? ( dev-qt/qtdbus:5 )
+ enchant? ( >=app-text/enchant-1.3.0 )
+ hunspell? ( app-text/hunspell:= )
+ webengine? (
+ >=dev-qt/qtwebchannel-5.7:5
+ >=dev-qt/qtwebengine-5.7:5[widgets]
+ )
+ webkit? ( dev-qt/qtwebkit:5 )
+ whiteboarding? ( dev-qt/qtsvg:5 )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+PDEPEND="
+ crypt? ( app-crypt/qca[gpg] )
+ ssl? ( app-crypt/qca:2[ssl] )
+"
+
+RESTRICT="test"
+
+src_configure() {
+ CONF=(
+ --no-separate-debug-info
+ --qtdir="$(qt5_get_bindir)/.."
+ $(use_enable aspell)
+ $(use_enable dbus qdbus)
+ $(use_enable enchant)
+ $(use_enable hunspell)
+ $(use_enable xscreensaver xss)
+ $(use_enable whiteboarding)
+ )
+
+ use debug && CONF+=("--debug")
+ use webengine && CONF+=("--enable-webkit" "--with-webkit=qtwebengine")
+ use webkit && CONF+=("--enable-webkit" "--with-webkit=qtwebkit")
+
+ econf "${CONF[@]}"
+
+ eqmake5 psi.pro
+}
+
+src_compile() {
+ emake
+ use doc && emake -C doc api_public
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ # this way the docs will be installed in the standard gentoo dir
+ rm "${ED}"/usr/share/psi/{COPYING,README} || die "Installed file set seems to be changed by upstream"
+ newdoc iconsets/roster/README README.roster
+ newdoc iconsets/system/README README.system
+ newdoc certs/README README.certs
+ dodoc README
+
+ use doc && HTML_DOCS=( doc/api/. )
+ einstalldocs
+
+ # install translations
+ local mylrelease="$(qt5_get_bindir)"/lrelease
+ cd "${WORKDIR}/psi-l10n-${PV}" || die
+ insinto /usr/share/psi
+ install_locale() {
+ "${mylrelease}" "translations/${PN}_${1}.ts" || die "lrelease ${1} failed"
+ doins "translations/${PN}_${1}.qm"
+ }
+ l10n_for_each_locale_do install_locale
+}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index 56868b48352b..20f9be17efad 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PLOCALES="be bg ca cs de en eo es et fa fi fr he hu it ja kk mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
PLOCALE_BACKUP="en"
-inherit l10n git-r3 qmake-utils
+inherit l10n git-r3 qmake-utils xdg-utils
DESCRIPTION="Qt XMPP client"
HOMEPAGE="http://psi-im.org/"
@@ -187,3 +187,13 @@ src_install() {
}
l10n_for_each_locale_do install_locale
}
+
+pkg_postinst(){
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/net-libs/axtls/axtls-2.1.3.ebuild b/net-libs/axtls/axtls-2.1.3.ebuild
index af1e0e06575b..a701820d392d 100644
--- a/net-libs/axtls/axtls-2.1.3.ebuild
+++ b/net-libs/axtls/axtls-2.1.3.ebuild
@@ -40,7 +40,7 @@ S="${WORKDIR}/${PN}-code"
LICENSE="BSD GPL-2"
SLOT="0/1"
-KEYWORDS="~amd64 arm ~arm64 hppa ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 hppa ~mips ppc ppc64 ~s390 ~sparc ~x86"
IUSE="httpd cgi-lua cgi-php static static-libs doc"
diff --git a/net-libs/libsoup/libsoup-2.56.1.ebuild b/net-libs/libsoup/libsoup-2.56.1.ebuild
index 3806f5a6cc5b..ea89078b478a 100644
--- a/net-libs/libsoup/libsoup-2.56.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.56.1.ebuild
@@ -17,7 +17,7 @@ SLOT="2.4"
IUSE="debug gssapi +introspection samba ssl test vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~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 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
index 5a7e6a8072ba..18343274ddc0 100644
--- a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
@@ -12,16 +12,18 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/5"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
RDEPEND="
!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
sodium? ( dev-libs/libsodium:= )
pgm? ( =net-libs/openpgm-5.2.122 )"
DEPEND="${RDEPEND}
- app-text/asciidoc
- app-text/xmlto
!elibc_Darwin? ( sys-apps/util-linux )
+ doc? (
+ app-text/asciidoc
+ app-text/xmlto
+ )
pgm? ( virtual/pkgconfig )"
PATCHES=( "${FILESDIR}"/${PN}-4.2.1-disable-experimental-zmq_poll-implementation.patch
@@ -42,6 +44,7 @@ src_configure() {
$(use_enable unwind libunwind)
$(use_with sodium libsodium)
$(use_with pgm)
+ $(use_with doc docs)
)
econf "${myeconfargs[@]}"
}
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 93b7ee2adde3..38ddc7298454 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,2 +1 @@
DIST eiskaltdcpp-2.2.10.tar.gz 3843143 SHA256 e461c8c499e459651d6382a6ded6788e5ac9a9c4ff26386c3cf073d94d606127 SHA512 97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818 WHIRLPOOL 463abac15ccabdbe002d6b5e30cf1baa7486055e304ec963a4d50449ff8b451d093beba273d2e11a9002e642d6dcb06e05970898b893a86c7917dfbfa02611ae
-DIST eiskaltdcpp-2.2.9.tar.gz 3578993 SHA256 99f1f66038ec19ec14992df484f97b88238df5dd260ca72d5023fb9a6fef44b4 SHA512 8b3a58e1fe757b5cef50b3ec534f135b2285d843f0120758f07bd3a1ce82aaf0874d78a04ba1d2eb4f584db50a2bc3315536ebdbabbb4d296b42e8ca90cc630b WHIRLPOOL 0bb140c903556fd82d1e888b2dd581c362375983ad585ea0686e5cb8bebcf257d8356d546af3779103b9173c1f3a1061df383da8932a835eb7c5a1bb0e932c55
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
deleted file mode 100644
index 1a40bf8d5bc1..000000000000
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PLOCALES="be bg cs de el en es fr hu it pl pt_BR ru sk sr@latin uk"
-
-inherit cmake-utils eutils l10n fdo-mime gnome2-utils
-[[ ${PV} = *9999* ]] && inherit git-r3
-
-DESCRIPTION="Qt based client for DirectConnect and ADC protocols, based on DC++ library"
-HOMEPAGE="https://github.com/eiskaltdcpp/eiskaltdcpp"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-IUSE="cli daemon dbus +dht +emoticons examples -gtk idn -javascript json libcanberra libnotify lua +minimal pcre +qt4 sound spell sqlite upnp -xmlrpc"
-
-REQUIRED_USE="
- cli? ( ^^ ( json xmlrpc ) )
- emoticons? ( || ( gtk qt4 ) )
- dbus? ( qt4 )
- javascript? ( qt4 )
- json? ( !xmlrpc )
- libcanberra? ( gtk )
- libnotify? ( gtk )
- spell? ( qt4 )
- sound? ( || ( gtk qt4 ) )
- sqlite? ( qt4 )
-"
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
-else
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- KEYWORDS=""
-fi
-
-RDEPEND="
- app-arch/bzip2
- >=dev-libs/boost-1.38:=
- >=dev-libs/openssl-0.9.8
- sys-apps/attr
- sys-libs/zlib
- virtual/libiconv
- virtual/libintl
- idn? ( net-dns/libidn )
- lua? ( >=dev-lang/lua-5.1 )
- pcre? ( >=dev-libs/libpcre-4.2 )
- upnp? ( >=net-libs/miniupnpc-1.6 )
- cli? (
- >=dev-lang/perl-5.10
- virtual/perl-Getopt-Long
- dev-perl/Data-Dump
- dev-perl/Term-ShellUI
- json? ( dev-perl/JSON-RPC )
- xmlrpc? ( dev-perl/RPC-XML )
- )
- daemon? ( xmlrpc? ( >=dev-libs/xmlrpc-c-1.19.0[abyss,cxx] ) )
- gtk? (
- x11-libs/pango
- x11-libs/gtk+:3
- >=dev-libs/glib-2.24:2
- x11-themes/hicolor-icon-theme
- libcanberra? ( media-libs/libcanberra )
- libnotify? ( >=x11-libs/libnotify-0.4.1 )
- )
- qt4? (
- >=dev-qt/qtcore-4.6.0:4
- >=dev-qt/qtgui-4.6.0:4
- dbus? ( >=dev-qt/qtdbus-4.6.0:4 )
- javascript? (
- dev-qt/qtscript:4
- x11-libs/qtscriptgenerator
- )
- spell? ( app-text/aspell )
- sqlite? ( dev-qt/qtsql:4[sqlite] )
- )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
-"
-DOCS=( AUTHORS ChangeLog.txt )
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
- && die "Sorry, but gcc-4.4 and earlier won't work."
- fi
-}
-
-src_prepare() {
- l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
-
- epatch_user
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="$(get_libdir)"
- -Dlinguas="$(l10n_get_locales)"
- -DLOCAL_MINIUPNP=OFF
- -DUSE_GTK=OFF
- -DUSE_LIBGNOME2=OFF
- "$(use cli && cmake-utils_use json USE_CLI_JSONRPC)"
- "$(use cli && cmake-utils_use xmlrpc USE_CLI_XMLRPC)"
- "$(cmake-utils_use daemon NO_UI_DAEMON)"
- "$(use daemon && cmake-utils_use json JSONRPC_DAEMON)"
- "$(use daemon && cmake-utils_use xmlrpc XMLRPC_DAEMON)"
- "$(cmake-utils_use dbus DBUS_NOTIFY)"
- "$(cmake-utils_use dht WITH_DHT)"
- "$(cmake-utils_use emoticons WITH_EMOTICONS)"
- "$(cmake-utils_use examples WITH_EXAMPLES)"
- "$(cmake-utils_use gtk USE_GTK3)"
- "$(cmake-utils_use idn USE_IDNA)"
- "$(cmake-utils_use javascript USE_JS)"
- "$(cmake-utils_use libcanberra LIBCANBERRA)"
- "$(cmake-utils_use libnotify USE_LIBNOTIFY)"
- "$(cmake-utils_use lua LUA_SCRIPT)"
- "$(cmake-utils_use lua WITH_LUASCRIPTS)"
- "$(cmake-utils_use !minimal WITH_DEV_FILES)"
- "$(cmake-utils_use pcre PERL_REGEX)"
- "$(cmake-utils_use qt4 USE_QT)"
- "$(cmake-utils_use sound WITH_SOUNDS)"
- "$(cmake-utils_use spell USE_ASPELL)"
- "$(cmake-utils_use sqlite USE_QT_SQLITE)"
- "$(cmake-utils_use upnp USE_MINIUPNP)"
- )
- cmake-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/net-p2p/eiskaltdcpp/metadata.xml b/net-p2p/eiskaltdcpp/metadata.xml
index 6661b81a3c96..b65eafebb426 100644
--- a/net-p2p/eiskaltdcpp/metadata.xml
+++ b/net-p2p/eiskaltdcpp/metadata.xml
@@ -1,23 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription lang="en">
- EiskaltDC++ is a multi-platform program that uses the Direct Connect and
- ADC protocol. It is compatible with other DC clients, such as the original DC
- from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all
- common DC hub software.
- </longdescription>
- <use>
- <flag name="cli">Enable sample cli based on readline</flag>
- <flag name="daemon">Enable eiskaltdcpp-daemon</flag>
- <flag name="dht">Enable DHT (distributed hash table) support for libeiskaltdcpp</flag>
- <flag name="emoticons">Install emoticon packs</flag>
- <flag name="json">Enable JSON for cli and daemon</flag>
- <flag name="libcanberra">Enable sound notifications support over libcanberra in EiskaltDC++ Gtk</flag>
- <flag name="minimal">Don't install headers</flag>
- </use>
- <upstream>
- <remote-id type="github">eiskaltdcpp/eiskaltdcpp</remote-id>
- </upstream>
+ <!-- maintainer-needed -->
+ <longdescription lang="en">
+ EiskaltDC++ is a multi-platform program that uses the Direct Connect and
+ ADC protocol. It is compatible with other DC clients, such as the original DC
+ from Neomodus, DC++ and derivatives. EiskaltDC++ also interoperates with all
+ common DC hub software.
+ </longdescription>
+ <use>
+ <flag name="cli">Enable sample cli based on readline</flag>
+ <flag name="daemon">Enable eiskaltdcpp-daemon</flag>
+ <flag name="dht">Enable DHT (distributed hash table) support for libeiskaltdcpp</flag>
+ <flag name="json">Enable JSON for cli and daemon</flag>
+ <flag name="libcanberra">Enable sound notifications support over libcanberra in EiskaltDC++ Gtk</flag>
+ <flag name="minimal">Don't install headers</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">eiskaltdcpp/eiskaltdcpp</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 80da89bf8217..1f5d83b9a317 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,2 +1,4 @@
DIST hplip-3.16.3-plugin.run 2084271 SHA256 b7edef2a1c5c0a5e001deb4a18c0ef7202e653596e97144b8908ae093818070f SHA512 2ae8aeb40c2604a2c6b9725700f9addf7a82e819d603631158a5d5feac931248e53e7533178100df1fc12b0dc2340cb3ae0d85f145cd023a311f77bbe67e7c7f WHIRLPOOL 928117f862030eca9c3e5813eb8c4db66570923695b0c7af17df1992f339d2478f42af67ca0e0eb8cfa1d7425b522082fde3b8c829c3f5167e1ec503c95a986b
DIST hplip-3.17.6-plugin.run 2059641 SHA256 7ba9377c6ea4ed2a498963dc53a400e3015374bd376dddb5e3248aeabb3aee28 SHA512 a04145a5512ceecc0d35b06846050507afb0905f865878f166f646de7f75368ea9392cc7daea9a0fbec236f6ea65192915f4be0196b005ce7a28b2807185191e WHIRLPOOL f0a02f1254e849c9b2df58ddcbbc1d91c4e496d41fae909245eb60ed3e2f1ac737b89bb4b7d5dbf75cd465d55d1a1ec2fcb0d3df1597addba9ffabaedc39801d
+DIST hplip-3.17.7-plugin.run 2059561 SHA256 3c7acfb8e349332c555c958181c86322a86c33848a11b481040a754d6b5c9db1 SHA512 605cae8ea4433943377e3865b6d0c84bcc0be6f4aa78ab0dbcf2543438fceede8bc0cd2c1a242822b97e173390851e210b0e0c8492d129ea5e7fbcb9c8c505ff WHIRLPOOL 7efc7602bee97f31627152acfa9731d2ebff705d8841f2d6472dc90bd6cd18080f629c46d46564659b0566a6bffeae86452353e2a4fa3b8599b5bb3f8ed09ea9
+DIST hplip-3.17.9-plugin.run 2059585 SHA256 98f717266340baa15e0385dc4928cc9c127a9403b72749f4899657cef8dfe883 SHA512 a7a9ee8b7edda3641b5c3aa403570aad72ce9cd42cdd4c64904a0be409cefa838712390c7f535482028ac2d494c711baef77f2f601835b01591fa673272c01ba WHIRLPOOL e6615652382d11ddbe646b793d1f5aff61872ab4f30925855be66faa4d8ebace113a43e369e1b4d199bb65d3bd0315de32cd49d264c52f6d47e7f17990f0263f
diff --git a/net-print/hplip-plugin/hplip-plugin-3.17.7.ebuild b/net-print/hplip-plugin/hplip-plugin-3.17.7.ebuild
new file mode 100644
index 000000000000..8617df53c8dc
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.17.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+#SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
+SRC_URI="http://hplipopensource.com/hplip-web/plugin/hplip-${PV}-plugin.run"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ ~net-print/hplip-${PV}
+ virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+ /usr/share/hplip/fax/plugins/fax_marvell.so
+ /usr/share/hplip/prnt/plugins/hbpl1.so
+ /usr/share/hplip/prnt/plugins/lj.so
+ /usr/share/hplip/scan/plugins/bb_escl.so
+ /usr/share/hplip/scan/plugins/bb_marvell.so
+ /usr/share/hplip/scan/plugins/bb_soapht.so
+ /usr/share/hplip/scan/plugins/bb_soap.so
+"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_unpack() {
+ unpack_makeself "hplip-${PV}-plugin.run"
+}
+
+src_install() {
+ local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+
+ insinto "${HPLIP_HOME}"/data/firmware
+ doins *.fw.gz
+
+ for plugin in *-${hplip_arch}.so; do
+ local plugin_type=prnt
+ case "${plugin}" in
+ fax_*) plugin_type=fax ;;
+ bb_*) plugin_type=scan ;;
+ esac
+
+ exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+ newexe ${plugin} ${plugin/-${hplip_arch}}
+ done
+
+ mkdir -p "${ED}/var/lib/hp/"
+ cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+ [plugin]
+ installed = 1
+ eula = 1
+ version = ${PV}
+ _EOF_
+}
diff --git a/net-print/hplip-plugin/hplip-plugin-3.17.9.ebuild b/net-print/hplip-plugin/hplip-plugin-3.17.9.ebuild
new file mode 100644
index 000000000000..8617df53c8dc
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.17.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit udev unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+#SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
+SRC_URI="http://hplipopensource.com/hplip-web/plugin/hplip-${PV}-plugin.run"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ ~net-print/hplip-${PV}
+ virtual/udev
+"
+DEPEND=""
+
+S=${WORKDIR}
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PRESTRIPPED="
+ /usr/share/hplip/fax/plugins/fax_marvell.so
+ /usr/share/hplip/prnt/plugins/hbpl1.so
+ /usr/share/hplip/prnt/plugins/lj.so
+ /usr/share/hplip/scan/plugins/bb_escl.so
+ /usr/share/hplip/scan/plugins/bb_marvell.so
+ /usr/share/hplip/scan/plugins/bb_soapht.so
+ /usr/share/hplip/scan/plugins/bb_soap.so
+"
+
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+src_unpack() {
+ unpack_makeself "hplip-${PV}-plugin.run"
+}
+
+src_install() {
+ local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+
+ insinto "${HPLIP_HOME}"/data/firmware
+ doins *.fw.gz
+
+ for plugin in *-${hplip_arch}.so; do
+ local plugin_type=prnt
+ case "${plugin}" in
+ fax_*) plugin_type=fax ;;
+ bb_*) plugin_type=scan ;;
+ esac
+
+ exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+ newexe ${plugin} ${plugin/-${hplip_arch}}
+ done
+
+ mkdir -p "${ED}/var/lib/hp/"
+ cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+ [plugin]
+ installed = 1
+ eula = 1
+ version = ${PV}
+ _EOF_
+}
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 162a78e62279..fdf234341847 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,3 +3,4 @@ DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa4
DIST hplip-3.16.5-patches-1.tar.xz 8200 SHA256 98866e57a247e7a30d9cd584ed9411aa79a6185294a73b4cc5961efe9a5e5fa6 SHA512 36d33da5fc4105183cbc5137845ddccd8ab2b6abbff053a3a51f3da61c26c2d9d48dcb735345fb453abd67b6a0797aa337102c366cce037bc7006599b20b1646 WHIRLPOOL 8ac91bdefeb177c092b1d6de16474e8e1da57ad046dbc579f14fd40a27d1837d9bf142573137ef8d91c37dc7b03ca908fd5bfad23a9815af2015b521091c2700
DIST hplip-3.17.6.tar.gz 23620156 SHA256 80287834aad7e3fa30f2e252ff281d351e3f2eb15267ac541531353dc7b5107e SHA512 370fa0e07f4f5b4dc4a6f52b02271102894da98bc902912ff1770a9e5029d486227f4170ff90a063c686d23e8bd075961073ecc59961419a226a850db9e71738 WHIRLPOOL d938d36cba1c9d34e02709e75209a9c4e0bc7db0f7fbbb875bab41e57009a9522f12cf5bcfc03530d5ad46c2b2bb3575e68898e8071116a03240cd7042e4b2b0
DIST hplip-3.17.7.tar.gz 23644395 SHA256 3577bd5afd40b73fd754664ad69f0187dde2e64879e7446309f2ed9fd7dc400d SHA512 f88c16d5b6e1986df5b7c1081802ed4832849de8d8b01961231965b115731eb9bd5c18fa52d5bf2eb412927b9de0057bf8025a1579b053c4d8441f0ad4e7ce3f WHIRLPOOL 2e0f0743ffce6d66970815d621a55618a00c360f2f4aa31a1742fcd17ad246a2717f5507b1b4910a93ea5fc06b5d7e87dfb2f08c50993c85bb6a654d13faf527
+DIST hplip-3.17.9.tar.gz 23862533 SHA256 b2aad842f51dae7da2dd08d09ce2c27bc5f73c82a560b9494dd33589b0948678 SHA512 25508b91723be9564b9a7e8093159507a1a01a9e50e9e801f452f71c28cce0bddee2f5bf796214fa5752de8d1799fc6fe102779dabae0dbcba1f4de6b207c095 WHIRLPOOL df3bd0a8c4af9e7bf2a4ee534b317e84d89707587f770ab0c6ae98ccd5bea50d8be704ed2f855c9f67af8cdd34afc2ab0b07bd150f8861fc4900aa471a85b6ee
diff --git a/net-print/hplip/hplip-3.17.9.ebuild b/net-print/hplip/hplip-3.17.9.ebuild
new file mode 100644
index 000000000000..a03a682bccb7
--- /dev/null
+++ b/net-print/hplip/hplip-3.17.9.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="threads,xml"
+
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
+
+DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
+HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
+SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
+ https://dev.gentoo.org/~billie/distfiles/${PN}-3.16.5-patches-1.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
+
+# dependency on dev-python/notify-python dropped due to python 3 incompatibility
+# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
+
+COMMON_DEPEND="
+ net-print/cups
+ virtual/jpeg:0
+ hpijs? ( net-print/cups-filters[foomatic] )
+ !minimal? (
+ ${PYTHON_DEPS}
+ sys-apps/dbus
+ !libusb0? ( virtual/libusb:1 )
+ libusb0? ( virtual/libusb:0 )
+ scanner? ( media-gfx/sane-backends )
+ snmp? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ net-analyzer/net-snmp
+ )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl
+ !minimal? (
+ >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
+ $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
+ fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
+ kernel_linux? ( virtual/udev )
+ qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] )
+ scanner? (
+ >=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
+ >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
+ X? ( || (
+ kde? ( kde-misc/skanlite )
+ media-gfx/xsane
+ media-gfx/sane-frontends
+ ) )
+ )
+ )
+ policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+ "${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+For more information on setting up your printer please take
+a look at the hplip section of the gentoo printing guide:
+https://wiki.gentoo.org/wiki/Printing
+
+Any user who wants to print must be in the lp group.
+"
+
+pkg_setup() {
+ use !minimal && python-single-r1_pkg_setup
+
+ use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+ if ! use hpcups && ! use hpijs ; then
+ ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+ ewarn "which is probably not what you want."
+ ewarn "You will almost certainly not be able to print."
+ fi
+
+ if use minimal ; then
+ ewarn "Installing driver portions only, make sure you know what you are doing."
+ ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+ ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+ else
+ use parport && linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ default
+
+ if use !minimal ; then
+ python_export EPYTHON PYTHON
+ python_fix_shebang .
+ fi
+
+ # Make desktop files follow the specification
+ # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+ sed -i -e '/^Categories=/s/Application;//' \
+ -e '/^Encoding=.*/d' hplip.desktop.in || die
+ sed -i -e '/^Categories=/s/Application;//' \
+ -e '/^Version=.*/d' \
+ -e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+ # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+ # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+ # https://bugs.launchpad.net/hplip/+bug/500086
+ local udevdir=$(get_udevdir)
+ sed -i -e "s|/etc/udev|${udevdir}|g" \
+ $(find . -type f -exec grep -l /etc/udev {} +) || die
+
+ # Force recognition of Gentoo distro by hp-check
+ sed -i \
+ -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+ installer/core_install.py || die
+
+ # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+ # The hpcups driver does not use foomatic-rip
+ local i
+ for i in ppd/hpijs/*.ppd.gz ; do
+ rm -f ${i}.temp || die
+ gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+ gzip > ${i}.temp || die
+ mv ${i}.temp ${i} || die
+ done
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf drv_build minimal_build
+
+ if use libusb0 ; then
+ myconf="${myconf} --enable-libusb01_build"
+ else
+ myconf="${myconf} --disable-libusb01_build"
+ fi
+
+ if use hpcups ; then
+ drv_build="$(use_enable hpcups hpcups-install)"
+ if use static-ppds ; then
+ drv_build="${drv_build} --enable-cups-ppd-install"
+ drv_build="${drv_build} --disable-cups-drv-install"
+ else
+ drv_build="${drv_build} --enable-cups-drv-install"
+ drv_build="${drv_build} --disable-cups-ppd-install"
+ fi
+ else
+ drv_build="--disable-hpcups-install"
+ drv_build="${drv_build} --disable-cups-drv-install"
+ drv_build="${drv_build} --disable-cups-ppd-install"
+ fi
+
+ if use hpijs ; then
+ drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+ if use static-ppds ; then
+ drv_build="${drv_build} --enable-foomatic-ppd-install"
+ drv_build="${drv_build} --disable-foomatic-drv-install"
+ else
+ drv_build="${drv_build} --enable-foomatic-drv-install"
+ drv_build="${drv_build} --disable-foomatic-ppd-install"
+ fi
+ else
+ drv_build="${drv_build} --disable-hpijs-install"
+ drv_build="${drv_build} --disable-foomatic-drv-install"
+ drv_build="${drv_build} --disable-foomatic-ppd-install"
+ fi
+
+ if use minimal ; then
+ if use hpijs ; then
+ minimal_build="--enable-hpijs-only-build"
+ else
+ minimal_build="--disable-hpijs-only-build"
+ fi
+ if use hpcups ; then
+ minimal_build="${minimal_build} --enable-hpcups-only-build"
+ else
+ minimal_build="${minimal_build} --disable-hpcups-only-build"
+ fi
+ fi
+
+ econf \
+ --disable-cups11-build \
+ --disable-lite-build \
+ --disable-foomatic-rip-hplip-install \
+ --disable-shadow-build \
+ --disable-qt3 \
+ --disable-qt4 \
+ --disable-udev_sysfs_rules \
+ --with-cupsbackenddir=$(cups-config --serverbin)/backend \
+ --with-cupsfilterdir=$(cups-config --serverbin)/filter \
+ --with-docdir=/usr/share/doc/${PF} \
+ --with-htmldir=/usr/share/doc/${PF}/html \
+ ${myconf} \
+ ${drv_build} \
+ ${minimal_build} \
+ $(use_enable doc doc-build) \
+ $(use_enable fax fax-build) \
+ $(use_enable !minimal gui-build) \
+ $(use_enable !minimal dbus-build) \
+ $(use_enable parport pp-build) \
+ $(use_enable policykit) \
+ $(use_enable qt5) \
+ $(use_enable scanner scan-build) \
+ $(use_enable snmp network-build)
+}
+
+src_install() {
+ # disable parallel install
+ # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+ emake -j1 DESTDIR="${D}" install
+ einstalldocs
+ # default
+
+ # Installed by sane-backends
+ # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+ rm -f "${ED%/}"/etc/sane.d/dll.conf || die
+
+ rm -f "${ED%/}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+ rmdir --ignore-fail-on-non-empty "${ED%/}"/usr/share/doc/${PF}/ || die
+
+ # Remove hal fdi files
+ rm -rf "${ED%/}"/usr/share/hal || die
+
+ find "${D}" -name '*.la' -delete || die
+
+ if use !minimal ; then
+ python_export EPYTHON PYTHON
+ python_optimize "${ED%/}"/usr/share/hplip
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/net-vpn/strongswan/Manifest b/net-vpn/strongswan/Manifest
index b3e0c053c888..a413933a7cdc 100644
--- a/net-vpn/strongswan/Manifest
+++ b/net-vpn/strongswan/Manifest
@@ -1 +1,2 @@
DIST strongswan-5.5.3.tar.bz2 4768820 SHA256 c5ea54b199174708de11af9b8f4ecf28b5b0743d4bc0e380e741f25b28c0f8d4 SHA512 0b0b25d2102c98cda54300dc8c3c3a49a55e64f7c695dda65a24f2194f19bce0b7aab9e4f7486c243b552f9d1a94867d6a8782ee504aad1c9973809706d599ac WHIRLPOOL 80bc68ed5afc46fa7585c806cc52713d47495664ea0c37746198918bad9814d14d261be921158b6c7a9cd5e8c84733b0b23b80b7c6338005adca38974241d7f1
+DIST strongswan-5.6.0.tar.bz2 4850722 SHA256 a14dc0d92634ed52730bfc76a76db30943a28ed3c65a560066e1e9f785827b13 SHA512 9362069a01c3642e62864d88fdb409a3c7514bf7c92cbe36e552c6a80915119cf5bb91c39592aab2d15b562684a0628a764e4fa7636d3b5fd2ebaf165c0ce649 WHIRLPOOL 5aeb256c254aae7d5923984355bcdb106d8cae6e7780df2c7849aa1fd8d5a27d6ad9a47c6d926c7dee2dff605f56bd2697034d4055dacdde1aea57168d8672af
diff --git a/net-vpn/strongswan/strongswan-5.6.0.ebuild b/net-vpn/strongswan/strongswan-5.6.0.ebuild
new file mode 100644
index 000000000000..d7477edc1686
--- /dev/null
+++ b/net-vpn/strongswan/strongswan-5.6.0.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils linux-info systemd user
+
+DESCRIPTION="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
+HOMEPAGE="http://www.strongswan.org/"
+SRC_URI="http://download.strongswan.org/${P}.tar.bz2"
+
+LICENSE="GPL-2 RSA DES"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+caps curl +constraints debug dhcp eap farp gcrypt +gmp ldap mysql networkmanager +non-root +openssl selinux sqlite pam pkcs11"
+
+STRONGSWAN_PLUGINS_STD="led lookip systime-fix unity vici"
+STRONGSWAN_PLUGINS_OPT="blowfish ccm ctr gcm ha ipseckey ntru padlock rdrand unbound whitelist"
+for mod in $STRONGSWAN_PLUGINS_STD; do
+ IUSE="${IUSE} +strongswan_plugins_${mod}"
+done
+
+for mod in $STRONGSWAN_PLUGINS_OPT; do
+ IUSE="${IUSE} strongswan_plugins_${mod}"
+done
+
+COMMON_DEPEND="!net-misc/openswan
+ gmp? ( >=dev-libs/gmp-4.1.5:= )
+ gcrypt? ( dev-libs/libgcrypt:0 )
+ caps? ( sys-libs/libcap )
+ curl? ( net-misc/curl )
+ ldap? ( net-nds/openldap )
+ openssl? ( >=dev-libs/openssl-0.9.8:=[-bindist] )
+ mysql? ( virtual/mysql )
+ sqlite? ( >=dev-db/sqlite-3.3.1 )
+ networkmanager? ( net-misc/networkmanager )
+ pam? ( sys-libs/pam )
+ strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns )"
+DEPEND="${COMMON_DEPEND}
+ virtual/linux-sources
+ sys-kernel/linux-headers"
+RDEPEND="${COMMON_DEPEND}
+ virtual/logger
+ sys-apps/iproute2
+ !net-vpn/libreswan
+ selinux? ( sec-policy/selinux-ipsec )"
+
+UGID="ipsec"
+
+pkg_setup() {
+ linux-info_pkg_setup
+ elog "Linux kernel version: ${KV_FULL}"
+
+ if ! kernel_is -ge 2 6 16; then
+ eerror
+ eerror "This ebuild currently only supports ${PN} with the"
+ eerror "native Linux 2.6 IPsec stack on kernels >= 2.6.16."
+ eerror
+ fi
+
+ if kernel_is -lt 2 6 34; then
+ ewarn
+ ewarn "IMPORTANT KERNEL NOTES: Please read carefully..."
+ ewarn
+
+ if kernel_is -lt 2 6 29; then
+ ewarn "[ < 2.6.29 ] Due to a missing kernel feature, you have to"
+ ewarn "include all required IPv6 modules even if you just intend"
+ ewarn "to run on IPv4 only."
+ ewarn
+ ewarn "This has been fixed with kernels >= 2.6.29."
+ ewarn
+ fi
+
+ if kernel_is -lt 2 6 33; then
+ ewarn "[ < 2.6.33 ] Kernels prior to 2.6.33 include a non-standards"
+ ewarn "compliant implementation for SHA-2 HMAC support in ESP and"
+ ewarn "miss SHA384 and SHA512 HMAC support altogether."
+ ewarn
+ ewarn "If you need any of those features, please use kernel >= 2.6.33."
+ ewarn
+ fi
+
+ if kernel_is -lt 2 6 34; then
+ ewarn "[ < 2.6.34 ] Support for the AES-GMAC authentification-only"
+ ewarn "ESP cipher is only included in kernels >= 2.6.34."
+ ewarn
+ ewarn "If you need it, please use kernel >= 2.6.34."
+ ewarn
+ fi
+ fi
+
+ if use non-root; then
+ enewgroup ${UGID}
+ enewuser ${UGID} -1 -1 -1 ${UGID}
+ fi
+}
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ local myconf=""
+
+ if use non-root; then
+ myconf="${myconf} --with-user=${UGID} --with-group=${UGID}"
+ fi
+
+ # If a user has already enabled db support, those plugins will
+ # most likely be desired as well. Besides they don't impose new
+ # dependencies and come at no cost (except for space).
+ if use mysql || use sqlite; then
+ myconf="${myconf} --enable-attr-sql --enable-sql"
+ fi
+
+ # strongSwan builds and installs static libs by default which are
+ # useless to the user (and to strongSwan for that matter) because no
+ # header files or alike get installed... so disabling them is safe.
+ if use pam && use eap; then
+ myconf="${myconf} --enable-eap-gtc"
+ else
+ myconf="${myconf} --disable-eap-gtc"
+ fi
+
+ for mod in $STRONGSWAN_PLUGINS_STD; do
+ if use strongswan_plugins_${mod}; then
+ myconf+=" --enable-${mod}"
+ fi
+ done
+
+ for mod in $STRONGSWAN_PLUGINS_OPT; do
+ if use strongswan_plugins_${mod}; then
+ myconf+=" --enable-${mod}"
+ fi
+ done
+
+ econf \
+ --disable-static \
+ --enable-ikev1 \
+ --enable-ikev2 \
+ --enable-swanctl \
+ --enable-socket-dynamic \
+ $(use_with caps capabilities libcap) \
+ $(use_enable curl) \
+ $(use_enable constraints) \
+ $(use_enable ldap) \
+ $(use_enable debug leak-detective) \
+ $(use_enable dhcp) \
+ $(use_enable eap eap-sim) \
+ $(use_enable eap eap-sim-file) \
+ $(use_enable eap eap-simaka-sql) \
+ $(use_enable eap eap-simaka-pseudonym) \
+ $(use_enable eap eap-simaka-reauth) \
+ $(use_enable eap eap-identity) \
+ $(use_enable eap eap-md5) \
+ $(use_enable eap eap-aka) \
+ $(use_enable eap eap-aka-3gpp2) \
+ $(use_enable eap md4) \
+ $(use_enable eap eap-mschapv2) \
+ $(use_enable eap eap-radius) \
+ $(use_enable eap eap-tls) \
+ $(use_enable eap xauth-eap) \
+ $(use_enable farp) \
+ $(use_enable gmp) \
+ $(use_enable gcrypt) \
+ $(use_enable mysql) \
+ $(use_enable networkmanager nm) \
+ $(use_enable openssl) \
+ $(use_enable pam xauth-pam) \
+ $(use_enable pkcs11) \
+ $(use_enable sqlite) \
+ "$(systemd_with_unitdir)" \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ doinitd "${FILESDIR}"/ipsec
+
+ local dir_ugid
+ if use non-root; then
+ fowners ${UGID}:${UGID} \
+ /etc/ipsec.conf \
+ /etc/strongswan.conf
+
+ dir_ugid="${UGID}"
+ else
+ dir_ugid="root"
+ fi
+
+ diropts -m 0750 -o ${dir_ugid} -g ${dir_ugid}
+ dodir /etc/ipsec.d \
+ /etc/ipsec.d/aacerts \
+ /etc/ipsec.d/acerts \
+ /etc/ipsec.d/cacerts \
+ /etc/ipsec.d/certs \
+ /etc/ipsec.d/crls \
+ /etc/ipsec.d/ocspcerts \
+ /etc/ipsec.d/private \
+ /etc/ipsec.d/reqs
+
+ dodoc NEWS README TODO || die
+
+ # shared libs are used only internally and there are no static libs,
+ # so it's safe to get rid of the .la files
+ find "${D}" -name '*.la' -delete || die "Failed to remove .la files."
+}
+
+pkg_preinst() {
+ has_version "<net-vpn/strongswan-4.3.6-r1"
+ upgrade_from_leq_4_3_6=$(( !$? ))
+
+ has_version "<net-vpn/strongswan-4.3.6-r1[-caps]"
+ previous_4_3_6_with_caps=$(( !$? ))
+}
+
+pkg_postinst() {
+ if ! use openssl && ! use gcrypt; then
+ elog
+ elog "${PN} has been compiled without both OpenSSL and libgcrypt support."
+ elog "Please note that this might effect availability and speed of some"
+ elog "cryptographic features. You are advised to enable the OpenSSL plugin."
+ elif ! use openssl; then
+ elog
+ elog "${PN} has been compiled without the OpenSSL plugin. This might effect"
+ elog "availability and speed of some cryptographic features. There will be"
+ elog "no support for Elliptic Curve Cryptography (Diffie-Hellman groups 19-21,"
+ elog "25, 26) and ECDSA."
+ fi
+
+ if [[ $upgrade_from_leq_4_3_6 == 1 ]]; then
+ chmod 0750 "${ROOT}"/etc/ipsec.d \
+ "${ROOT}"/etc/ipsec.d/aacerts \
+ "${ROOT}"/etc/ipsec.d/acerts \
+ "${ROOT}"/etc/ipsec.d/cacerts \
+ "${ROOT}"/etc/ipsec.d/certs \
+ "${ROOT}"/etc/ipsec.d/crls \
+ "${ROOT}"/etc/ipsec.d/ocspcerts \
+ "${ROOT}"/etc/ipsec.d/private \
+ "${ROOT}"/etc/ipsec.d/reqs
+
+ ewarn
+ ewarn "The default permissions for /etc/ipsec.d/* have been tightened for"
+ ewarn "security reasons. Your system installed directories have been"
+ ewarn "updated accordingly. Please check if necessary."
+ ewarn
+
+ if [[ $previous_4_3_6_with_caps == 1 ]]; then
+ if ! use non-root; then
+ ewarn
+ ewarn "IMPORTANT: You previously had ${PN} installed without root"
+ ewarn "privileges because it was implied by the 'caps' USE flag."
+ ewarn "This has been changed. If you want ${PN} with user privileges,"
+ ewarn "you have to re-emerge it with the 'non-root' USE flag enabled."
+ ewarn
+ fi
+ fi
+ fi
+ if ! use caps && ! use non-root; then
+ ewarn
+ ewarn "You have decided to run ${PN} with root privileges and built it"
+ ewarn "without support for POSIX capability dropping. It is generally"
+ ewarn "strongly suggested that you reconsider- especially if you intend"
+ ewarn "to run ${PN} as server with a public ip address."
+ ewarn
+ ewarn "You should re-emerge ${PN} with at least the 'caps' USE flag enabled."
+ ewarn
+ fi
+ if use non-root; then
+ elog
+ elog "${PN} has been installed without superuser privileges (USE=non-root)."
+ elog "This imposes several limitations mainly to the IKEv1 daemon 'pluto'"
+ elog "but also a few to the IKEv2 daemon 'charon'."
+ elog
+ elog "Please carefully read: http://wiki.strongswan.org/wiki/nonRoot"
+ elog
+ elog "pluto uses a helper script by default to insert/remove routing and"
+ elog "policy rules upon connection start/stop which requires superuser"
+ elog "privileges. charon in contrast does this internally and can do so"
+ elog "even with reduced (user) privileges."
+ elog
+ elog "Thus if you require IKEv1 (pluto) or need to specify a custom updown"
+ elog "script to pluto or charon which requires superuser privileges, you"
+ elog "can work around this limitation by using sudo to grant the"
+ elog "user \"ipsec\" the appropriate rights."
+ elog "For example (the default case):"
+ elog "/etc/sudoers:"
+ elog " ipsec ALL=(ALL) NOPASSWD: SETENV: /usr/sbin/ipsec"
+ elog "Under the specific connection block in /etc/ipsec.conf:"
+ elog " leftupdown=\"sudo -E ipsec _updown iptables\""
+ elog
+ fi
+ elog
+ elog "Make sure you have _all_ required kernel modules available including"
+ elog "the appropriate cryptographic algorithms. A list is available at:"
+ elog " http://wiki.strongswan.org/projects/strongswan/wiki/KernelModules"
+ elog
+ elog "The up-to-date manual is available online at:"
+ elog " http://wiki.strongswan.org/"
+ elog
+}
diff --git a/net-wireless/bluez/bluez-5.47-r1.ebuild b/net-wireless/bluez/bluez-5.47-r1.ebuild
index 53684067f9cf..43945ba07db2 100644
--- a/net-wireless/bluez/bluez-5.47-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.47-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0/3"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 x86"
IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
# Since this release all remaining extra-tools need readline support, but this could
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index b82f6915cfcd..121b4078df62 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -306,7 +306,3 @@ media-sound/mpg123 cpu_flags_x86_mmx cpu_flags_x86_3dnow cpu_flags_x86_3dnowext
# saves people from needlessly installing nasm
# Refs bug #93279
media-sound/lame cpu_flags_x86_mmx
-
-# Robert Buchholz <rbu@gentoo.org> (16 Aug 2008)
-# masked in base, unmask for x86/amd64
-dev-python/kaa-base -tls
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 4eb2e87ae803..c1f2b0728ebe 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -5,11 +5,6 @@
# Requires [cuda] which is masked in most of the profiles.
media-libs/opencv contrib_xfeatures2d
-# Alon Bar-Lev <alonbl@gentoo.org> (01 Sep 2017)
-# dev-python/tlslite is keyworded only for x86/amd64
-# waiting for ppc, bug#629506
-dev-python/kaa-base tls
-
# Rick Farina <zerochaos@gentoo.org> (11 May 2017)
# the needed deps are amd64/x86 only
net-analyzer/metasploit nexpose openvas
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 21cf1da1a2d7..ebfbaafd0d12 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -232,10 +232,6 @@ sys-power/pm-utils -video_cards_intel -video_cards_radeon
# X use flag only for amd64/x86, bug 285951.
media-gfx/iscan -X
-# Robert Buchholz <rbu@gentoo.org> (16 Aug 2008)
-# masked in base, unmask for x86/amd64
-dev-python/kaa-base -tls
-
# Serkan Kaba <serkan@gentoo.org> (20 Jul 2008)
app-text/enchant -zemberek
diff --git a/profiles/updates/3Q-2017 b/profiles/updates/3Q-2017
index 17b501c29f35..6f2ad8dcbea9 100644
--- a/profiles/updates/3Q-2017
+++ b/profiles/updates/3Q-2017
@@ -22,3 +22,4 @@ slotmove app-i18n/fcitx-table-extra 0 4
slotmove app-i18n/fcitx-unikey 0 4
slotmove app-i18n/kcm-fcitx 4 4-plasma4
slotmove app-i18n/kcm-fcitx 5 4-plasma5
+move dev-libs/dfxml app-forensics/dfxml
diff --git a/sci-calculators/units/units-2.14-r1.ebuild b/sci-calculators/units/units-2.14-r1.ebuild
index 18776691bb03..89d0cc43573d 100644
--- a/sci-calculators/units/units-2.14-r1.ebuild
+++ b/sci-calculators/units/units-2.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="FDL-1.3 GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="+units_cur"
REQUIRED_USE="units_cur? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sci-geosciences/gpsd/gpsd-3.16.ebuild b/sci-geosciences/gpsd/gpsd-3.16.ebuild
index 1fbfe4ba3351..bf36c89f403a 100644
--- a/sci-geosciences/gpsd/gpsd-3.16.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.16.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
HOMEPAGE="http://catb.org/gpsd/"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/22"
GPSD_PROTOCOLS=(
aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
diff --git a/sci-geosciences/gpsd/gpsd-3.17.ebuild b/sci-geosciences/gpsd/gpsd-3.17.ebuild
index d431599bc0aa..cd3ef4ffa066 100644
--- a/sci-geosciences/gpsd/gpsd-3.17.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
HOMEPAGE="http://catb.org/gpsd/"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/23"
GPSD_PROTOCOLS=(
aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index d431599bc0aa..cd3ef4ffa066 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -21,7 +21,7 @@ DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping c
HOMEPAGE="http://catb.org/gpsd/"
LICENSE="BSD"
-SLOT="0"
+SLOT="0/23"
GPSD_PROTOCOLS=(
aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index 2082a787a8f1..cb80bead87d3 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -5,10 +5,14 @@
<email>sci-geosciences@gentoo.org</email>
<name>Gentoo Geosciences Project</name>
</maintainer>
- <longdescription>Unbundled GPS daemon and library to support USB and serial
- GPS devices and various GPS/mapping clients, such as GPSDrive, kismet, and
- pygps.
-</longdescription>
+ <longdescription>
+ Unbundled GPS daemon and library to support USB and serial
+ GPS devices and various GPS/mapping clients, such as GPSDrive,
+ kismet, and pygps.
+ </longdescription>
+ <slots>
+ <subslots>Reflect major ABI of libgps.so.</subslots>
+ </slots>
<use>
<flag name="dbus">export gpsd data over dbus connections</flag>
<flag name="latency_timing">support latency timing information</flag>
diff --git a/sci-mathematics/flint/Manifest b/sci-mathematics/flint/Manifest
index b2cf3ea4ac96..d24120340b98 100644
--- a/sci-mathematics/flint/Manifest
+++ b/sci-mathematics/flint/Manifest
@@ -1,5 +1,3 @@
-DIST flint-2.3.tar.gz 830837 SHA256 6bb059048f822dc9291567949f1baed8c77f337ff2601e91a8e9d20936291a75 SHA512 8b5cb41ef9616c984554f7085dcd914d8d91b0f8b3964939c740336e79cfcc6e81fc9135084845615f56429952a4fc0eb3960c6df13d5f779c997c3b53763e56 WHIRLPOOL 12ee4c4e6efadbe2913783fcfe7583f084c6c10777e04293de6748cf177423f7652e5cd8bcdd0f412be73a40f4c5fc744a84c0de89f6c1ff527c20e55e102258
-DIST flint-2.4.3.tar.gz 1636527 SHA256 93585cd321c5a2fad053c903ba7cd947f54de71d31cf1dd1af6814906c1ee763 SHA512 d7cecb7116c458f554e09524b9df25784ed32f889a4d83a3fc6fbf16f08ace68890b3a748a8b1b03e543c121994ed7e5efbdca9e7dbb694a4571c8d25e983aa9 WHIRLPOOL 4ec1ce3447218c9a45a9548284b7948714327bf264e9087d7c0687936a586cb96eb921079770d78c482af158ca78c65193ccbf489a789771ae527eed4d75d588
DIST flint-2.4.4.tar.gz 1639262 SHA256 c4799e9394ef06d7b8625f7fd74ba2d8ca115dbb2aa506dcc6e369b49d0e5bc7 SHA512 236997cf64bdc96741740889f450fdbaf7d7e9b58252645f864d28005c9e7bdf87f7187cd17526606c605f0489f026398a1361b8f209f71158ca3b31c42d86d2 WHIRLPOOL 299820bc656e955d54dd06be3a1ba68440e8d9c72785ac54e7d9559da073b31c07b73598c9b18c98889f836dfd25ed8cd96d62a901a12a529698ae00ba30f1d1
DIST flint-2.4.5.tar.gz 1640022 SHA256 e489354df00f0d84976ccdd0477028693977c87ccd14f3924a89f848bb0e01e3 SHA512 088ff512ea2330f9323a6ca0dc875e8c0926d755317d6007eba4b333a14d7612e82ebcfeabd26d1ec4b9204c4517dee08f914ad1ec852e37336fe378710a8bfc WHIRLPOOL cf5a22a9353cc23f1ab056cf6737d61d8de91ab0dc0c4a2ae46cf0777abee240a49f76de15bf854a8275023735101ce306789bca9a052151b09017e02d111069
DIST flint-2.5.2.tar.gz 2212242 SHA256 cbf1fe0034533c53c5c41761017065f85207a1b770483e98b2392315f6575e87 SHA512 cce36947b558aabecaf780171b4bbc0e1330c3b1a7e3580717584be5cab4991d33b190531c7995b224a3a440e28c4a610d6f781901e29f48ced12a9c5ba960a2 WHIRLPOOL 74b237a8d258d17395aa0bf474c24a8ffe7ad01c4cbc4aa5b712fe14f1920191d9f96ef062461fbe8750b4461eacb0d88ff2a9d19990450363d87104e9ce203d
diff --git a/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
new file mode 100644
index 000000000000..5689e3633ee4
--- /dev/null
+++ b/sci-mathematics/flint/files/flint-2.4.4-PIE-FTBFS.patch
@@ -0,0 +1,17 @@
+Description: invoke $(CC) with -r and not -Wl,-r to fix FTBFS with PIE enabled
+Author: Logan Rosen <logan@ubuntu.com>
+Forwarded: yes
+
+diff --git a/Makefile.subdirs b/Makefile.subdirs
+index ec05fb0..f2d8b37 100644
+--- a/Makefile.subdirs
++++ b/Makefile.subdirs
+@@ -59,7 +59,7 @@ $(BUILD_DIR)/$(MOD_DIR)_%.o: %.c
+ $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@"
+
+ $(MOD_LOBJ): $(LOBJS)
+- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib
++ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib
+
+ -include $(LOBJS:.lo=.d)
+
diff --git a/sci-mathematics/flint/flint-2.3.ebuild b/sci-mathematics/flint/flint-2.3.ebuild
deleted file mode 100644
index fc33fe73114c..000000000000
--- a/sci-mathematics/flint/flint-2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/mpfr:0
- dev-libs/ntl
- sci-libs/mpir
- "
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # Correct lib paths to be multilib-proper #470732
- sed -i -e 's~/lib~/'$(get_libdir)'~' Makefile.in || die
-}
-
-src_configure() {
- # handwritten script, needs extra stabbing
- ./configure --with-mpir=/usr --with-mpfr=/usr --with-ntl=/usr --prefix="${D}/usr" || die
-}
diff --git a/sci-mathematics/flint/flint-2.4.3.ebuild b/sci-mathematics/flint/flint-2.4.3.ebuild
deleted file mode 100644
index 96f84aec152a..000000000000
--- a/sci-mathematics/flint/flint-2.4.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Fast Library for Number Theory"
-HOMEPAGE="http://www.flintlib.org/"
-SRC_URI="http://www.flintlib.org/${P}.tar.gz"
-
-RESTRICT="mirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gc ntl static-libs test"
-
-RDEPEND="dev-libs/gmp:0=
- dev-libs/mpfr:0
- gc? ( dev-libs/boehm-gc )
- ntl? ( dev-libs/ntl )"
-DEPEND="${RDEPEND}
- doc? ( app-text/texlive-core )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.4.3-libdir.patch \
- "${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \
- "${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch
-}
-
-src_configure() {
- ./configure \
- --prefix="${EPREFIX}/usr" \
- --with-gmp="${EPREFIX}/usr" \
- --with-mpfr="${EPREFIX}/usr" \
- $(usex ntl "--with-ntl=${EPREFIX}/usr" "") \
- $(use_enable static-libs static) \
- $(usex gc "--with-gc=${EPREFIX}/usr" "") \
- CC=$(tc-getCC) \
- CXX=$(tc-getCXX) \
- AR=$(tc-getAR) \
- || die
-}
-
-src_compile() {
- emake verbose
-
- if use doc ; then
- emake -C doc/latex
- fi
-}
-
-src_test() {
- emake AT= QUIET_CC= QUIET_CXX= QUIET_AR= check
-}
-
-src_install() {
- emake DESTDIR="${D}" LIBDIR="$(get_libdir)" install
- einstalldocs
- use doc && dodoc doc/latex/flint-manual.pdf
-}
diff --git a/sci-mathematics/flint/flint-2.4.4-r1.ebuild b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
index 8e4d583bd035..1068395a40c3 100644
--- a/sci-mathematics/flint/flint-2.4.4-r1.ebuild
+++ b/sci-mathematics/flint/flint-2.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -30,7 +30,12 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.4.3-libdir.patch \
"${FILESDIR}"/${PN}-2.4.3-whitespaces.patch \
"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
- "${FILESDIR}"/${PN}-2.4.4-test.patch
+ "${FILESDIR}"/${PN}-2.4.4-test.patch \
+ "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
+
+ sed -i \
+ -e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
+ ./configure || die
}
src_configure() {
diff --git a/sci-mathematics/flint/flint-2.4.5.ebuild b/sci-mathematics/flint/flint-2.4.5.ebuild
index 318603218d17..b36ea8b5f2b3 100644
--- a/sci-mathematics/flint/flint-2.4.5.ebuild
+++ b/sci-mathematics/flint/flint-2.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -32,7 +32,12 @@ src_prepare() {
"${FILESDIR}"/${PN}-2.4.3-cflags-ldflags.patch \
"${FILESDIR}"/${PN}-2.4.4-test.patch \
"${FILESDIR}"/${PN}-2.4.5-gmp6-compat.patch \
- "${FILESDIR}"/${PN}-2.4.5-ntl62.patch
+ "${FILESDIR}"/${PN}-2.4.5-ntl62.patch \
+ "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
+
+ sed -i \
+ -e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
+ ./configure || die
}
src_configure() {
diff --git a/sci-mathematics/flint/flint-2.5.2.ebuild b/sci-mathematics/flint/flint-2.5.2.ebuild
index e7ccd5124387..64f94ae79dcf 100644
--- a/sci-mathematics/flint/flint-2.5.2.ebuild
+++ b/sci-mathematics/flint/flint-2.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -26,6 +26,14 @@ DEPEND="${RDEPEND}
dev-texlive/texlive-latexextra
)"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.4.4-PIE-FTBFS.patch
+
+ sed -i \
+ -e '/echo "DLPATH_ADD=/s/\$DLPATH_ADD/\\\$(CURDIR)/' \
+ ./configure || die
+}
+
src_configure() {
./configure \
--prefix="${EPREFIX}/usr" \
diff --git a/sys-apps/coreutils/coreutils-8.26.ebuild b/sys-apps/coreutils/coreutils-8.26.ebuild
index 68dd62b5a81e..2af7e80c078a 100644
--- a/sys-apps/coreutils/coreutils-8.26.ebuild
+++ b/sys-apps/coreutils/coreutils-8.26.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr"
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/file/file-5.32.ebuild b/sys-apps/file/file-5.32.ebuild
index a06e263cceda..b6ade1f1cb66 100644
--- a/sys-apps/file/file-5.32.ebuild
+++ b/sys-apps/file/file-5.32.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-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 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index aa0c4bc5f944..9000a9fc7039 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls"
RDEPEND="dev-lang/perl
diff --git a/sys-apps/openrc/openrc-0.28.ebuild b/sys-apps/openrc/openrc-0.28.ebuild
index 4e23f10fe47e..162ff6c71eaf 100644
--- a/sys-apps/openrc/openrc-0.28.ebuild
+++ b/sys-apps/openrc/openrc-0.28.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
fi
LICENSE="BSD-2"
diff --git a/sys-apps/shadow/shadow-4.5.ebuild b/sys-apps/shadow/shadow-4.5.ebuild
index 8edfb554ad75..be31b68fb880 100644
--- a/sys-apps/shadow/shadow-4.5.ebuild
+++ b/sys-apps/shadow/shadow-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
IUSE="acl audit cracklib nls pam selinux skey xattr"
# Taken from the man/Makefile.am file.
LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
index f422d958d037..eca80c890f83 100644
--- a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
+++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
LICENSE="GPL-2"
SLOT="0"
[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha ~amd64 ~arm ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ia64 ppc ppc64 ~sparc ~x86"
IUSE="debug gdm +gtk +libkms +pango static-libs"
CDEPEND="
diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 43abab038eb3..52748bc1ff68 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -27,6 +27,7 @@
<flag name="objc++">Build support for the Objective C++ language</flag>
<flag name="objc-gc">Build support for the Objective C code language Garbage
Collector</flag>
+ <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
<flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag>
<flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
<flag name="ssp">Build packages with stack smashing protector on by default</flag>
diff --git a/sys-devel/qconf/qconf-2.3.ebuild b/sys-devel/qconf/qconf-2.3.ebuild
index bbb151d738c6..bc7eec1fe011 100644
--- a/sys-devel/qconf/qconf-2.3.ebuild
+++ b/sys-devel/qconf/qconf-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
# There is no one to one match to autotools-based configure
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c58ede0096f4..db606357d39a 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,3 +1,4 @@
+DIST chromium-61.0.3163.100.tar.xz 556305252 SHA256 4135968cac6623c1d2b224494600cd274098cce41c298f8c3908b354a34c281b SHA512 4dfd3a493ceb7c605eeab6f387541273d529e8b935a6104927e34836469aedcfcbb4a1154591585621d5c2e842e68701d32328acba842f840a20498822165f78 WHIRLPOOL a02443375a59073ad350665a46c978b67e1026078822b3a34f9fb1099a1bc62933ec25c6135c107388ebf21362d0e6a04e394a60275dd1e30b31c145ee7f93e8
DIST chromium-61.0.3163.79.tar.xz 556218140 SHA256 bdbc139ed86f3b5d1ec3c3b00caeaef4f9ac2c363438f03dded56e217ad10727 SHA512 3729c4888737824937386b73e17ffce0c8c902582e0395da20d2ea86eb179bf0edc2be0d2ea780a6fc76accdeb8967a66392bea5069c7ebb71322c750f614d61 WHIRLPOOL 5024a89372f974b62e09c89ce4786efa87a6f52712faf211508c1ccad7edb0120cebd98540b928094893877517abc1243a9bfabcf74e057a4e5fc2cacac8480d
DIST chromium-62.0.3202.18.tar.xz 517017924 SHA256 38d76599b999e3636c3eb60888acd34ea8a8d7e24e6dba21ec7ae39d2045d47f SHA512 7017bc7f17af969fc460f0001ae935dca48253d2dea65d5375a126434549bb7ce748518c716b6d06aa6ae357577ca08ec73c7fe0e11b606595c15768388bab87 WHIRLPOOL 305ca8e55bbd2d87c1b6444ed2580b2c6992c2c5072b0abc9751190e07e0a57bb2180d751aaf5a248beea8467c6888f681c1d76a0a7cfb6ccfc2ae5d9669f2ec
DIST chromium-62.0.3202.9.tar.xz 516991748 SHA256 d801d431417736098ee4bf4ecaea642f5fe6101ea88a4cf7b06a04da58331199 SHA512 26e253dc0b779408116e4fbcc41e306afbd34687a9cb9f748d49381cec4ace4a094630aec5be14878584051696c261052ce7b07fd75b9680217165afd3909fe9 WHIRLPOOL 82645f14dd1a19faecc8b8af3fcfef03b2e14cb04c0ad8653bf9e11ef84169ecae7d8fdcbed1a84da0433f621dbbb331319670bb9cb0723759df617dd46e4617
diff --git a/www-client/chromium/chromium-61.0.3163.100.ebuild b/www-client/chromium/chromium-61.0.3163.100.ebuild
new file mode 100644
index 000000000000..9c179037828d
--- /dev/null
+++ b/www-client/chromium/chromium-61.0.3163.100.ebuild
@@ -0,0 +1,670 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+ hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+ sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+COMMON_DEPEND="
+ app-arch/bzip2:=
+ cups? ( >=net-print/cups-1.3.11:= )
+ dev-libs/expat:=
+ dev-libs/glib:2
+ system-icu? ( <dev-libs/icu-59:= )
+ dev-libs/libxslt:=
+ dev-libs/nspr:=
+ >=dev-libs/nss-3.14.3:=
+ >=dev-libs/re2-0.2016.05.01:=
+ gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+ >=media-libs/alsa-lib-1.0.19:=
+ media-libs/fontconfig:=
+ media-libs/freetype:=
+ >=media-libs/harfbuzz-1.4.2:=[icu(-)]
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+ >=media-libs/openh264-1.6.0:=
+ pulseaudio? ( media-sound/pulseaudio:= )
+ system-ffmpeg? (
+ >=media-video/ffmpeg-3:=
+ || (
+ media-video/ffmpeg[-samba]
+ >=net-fs/samba-4.5.10-r1[-debug(-)]
+ )
+ !=net-fs/samba-4.5.12
+ media-libs/opus:=
+ )
+ sys-apps/dbus:=
+ sys-apps/pciutils:=
+ virtual/udev
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3[X]
+ x11-libs/libX11:=
+ x11-libs/libXcomposite:=
+ x11-libs/libXcursor:=
+ x11-libs/libXdamage:=
+ x11-libs/libXext:=
+ x11-libs/libXfixes:=
+ >=x11-libs/libXi-1.6.0:=
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libXScrnSaver:=
+ x11-libs/libXtst:=
+ x11-libs/pango:=
+ app-arch/snappy:=
+ media-libs/flac:=
+ >=media-libs/libwebp-0.4.0:=
+ sys-libs/zlib:=[minizip]
+ kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+ !=www-client/chromium-9999
+ !<www-plugins/chrome-binary-plugins-57
+ x11-misc/xdg-utils
+ virtual/opengl
+ virtual/ttf-fonts
+ selinux? ( sec-policy/selinux-chromium )
+ tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+ widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+ >=app-arch/gzip-1.7
+ !arm? (
+ dev-lang/yasm
+ )
+ dev-lang/perl
+ >=dev-util/gperf-3.0.3
+ >=dev-util/ninja-1.7.2
+ >=net-libs/nodejs-4.6.1
+ sys-apps/hwids[usb(+)]
+ >=sys-devel/bison-2.4.3
+ sys-devel/flex
+ virtual/pkgconfig
+ dev-vcs/git
+ $(python_gen_any_dep '
+ dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+ >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/simplejson[${PYTHON_USEDEP}]
+ ')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+ has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+ has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+ has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+ has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+ EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-widevine-r1.patch"
+ "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
+ "${FILESDIR}/${PN}-gcc-r1.patch"
+ "${FILESDIR}/${PN}-gn-bootstrap-r14.patch"
+ "${FILESDIR}/${PN}-atk-r1.patch"
+ "${FILESDIR}/${PN}-mojo-dep.patch"
+ "${FILESDIR}/${PN}-gcc5-r1.patch"
+)
+
+pre_build_checks() {
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ local -x CPP="$(tc-getCXX) -E"
+ if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+ # bugs: #601654
+ die "At least clang 3.9.1 is required"
+ fi
+ if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+ # bugs: #535730, #525374, #518668, #600288, #627356
+ die "At least gcc 5.0 is required"
+ fi
+ fi
+
+ # Check build requirements, bug #541816 and bug #471810 .
+ CHECKREQS_MEMORY="3G"
+ CHECKREQS_DISK_BUILD="5G"
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ CHECKREQS_DISK_BUILD="25G"
+ if ! use component-build; then
+ CHECKREQS_MEMORY="16G"
+ fi
+ fi
+ eshopts_pop
+ check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+ pre_build_checks
+}
+
+pkg_setup() {
+ pre_build_checks
+
+ # Make sure the build system will use the right python, bug #344367.
+ python-any-r1_pkg_setup
+
+ chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+ default
+
+ mkdir -p third_party/node/linux/node-linux-x64/bin || die
+ ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+ local keeplibs=(
+ base/third_party/dmg_fp
+ base/third_party/dynamic_annotations
+ base/third_party/icu
+ base/third_party/nspr
+ base/third_party/superfasthash
+ base/third_party/symbolize
+ base/third_party/valgrind
+ base/third_party/xdg_mime
+ base/third_party/xdg_user_dirs
+ breakpad/src/third_party/curl
+ chrome/third_party/mozilla_security_manager
+ courgette/third_party
+ net/third_party/mozilla_security_manager
+ net/third_party/nss
+ third_party/WebKit
+ third_party/analytics
+ third_party/angle
+ third_party/angle/src/common/third_party/base
+ third_party/angle/src/common/third_party/murmurhash
+ third_party/angle/src/third_party/compiler
+ third_party/angle/src/third_party/libXNVCtrl
+ third_party/angle/src/third_party/trace_event
+ third_party/boringssl
+ third_party/brotli
+ third_party/cacheinvalidation
+ third_party/catapult
+ third_party/catapult/third_party/polymer
+ third_party/catapult/third_party/py_vulcanize
+ third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
+ third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
+ third_party/catapult/tracing/third_party/d3
+ third_party/catapult/tracing/third_party/gl-matrix
+ third_party/catapult/tracing/third_party/jszip
+ third_party/catapult/tracing/third_party/mannwhitneyu
+ third_party/catapult/tracing/third_party/oboe
+ third_party/ced
+ third_party/cld_2
+ third_party/cld_3
+ third_party/cros_system_api
+ third_party/devscripts
+ third_party/dom_distiller_js
+ third_party/fips181
+ third_party/flatbuffers
+ third_party/flot
+ third_party/freetype
+ third_party/glslang-angle
+ third_party/google_input_tools
+ third_party/google_input_tools/third_party/closure_library
+ third_party/google_input_tools/third_party/closure_library/third_party/closure
+ third_party/googletest
+ third_party/hunspell
+ third_party/iccjpeg
+ third_party/inspector_protocol
+ third_party/jinja2
+ third_party/jstemplate
+ third_party/khronos
+ third_party/leveldatabase
+ third_party/libXNVCtrl
+ third_party/libaddressinput
+ third_party/libjingle
+ third_party/libphonenumber
+ third_party/libsecret
+ third_party/libsrtp
+ third_party/libudev
+ third_party/libwebm
+ third_party/libxml
+ third_party/libyuv
+ third_party/lss
+ third_party/lzma_sdk
+ third_party/markupsafe
+ third_party/mesa
+ third_party/modp_b64
+ third_party/mt19937ar
+ third_party/node
+ third_party/node/node_modules/vulcanize/third_party/UglifyJS2
+ third_party/openmax_dl
+ third_party/ots
+ third_party/pdfium
+ third_party/pdfium/third_party/agg23
+ third_party/pdfium/third_party/base
+ third_party/pdfium/third_party/build
+ third_party/pdfium/third_party/bigint
+ third_party/pdfium/third_party/freetype
+ third_party/pdfium/third_party/lcms2-2.6
+ third_party/pdfium/third_party/libopenjpeg20
+ third_party/pdfium/third_party/libpng16
+ third_party/pdfium/third_party/libtiff
+ third_party/ply
+ third_party/polymer
+ third_party/protobuf
+ third_party/protobuf/third_party/six
+ third_party/qcms
+ third_party/sfntly
+ third_party/skia
+ third_party/skia/third_party/vulkan
+ third_party/smhasher
+ third_party/spirv-headers
+ third_party/spirv-tools-angle
+ third_party/sqlite
+ third_party/swiftshader
+ third_party/swiftshader/third_party/llvm-subzero
+ third_party/swiftshader/third_party/subzero
+ third_party/usrsctp
+ third_party/vulkan
+ third_party/vulkan-validation-layers
+ third_party/web-animations-js
+ third_party/webdriver
+ third_party/webrtc
+ third_party/widevine
+ third_party/woff2
+ third_party/zlib/google
+ url/third_party/mozilla
+ v8/src/third_party/valgrind
+ v8/third_party/inspector_protocol
+
+ # gyp -> gn leftovers
+ base/third_party/libevent
+ third_party/adobe
+ third_party/speech-dispatcher
+ third_party/usb_ids
+ third_party/xdg-utils
+ third_party/yasm/run_yasm.py
+ )
+ if ! use system-ffmpeg; then
+ keeplibs+=( third_party/ffmpeg third_party/opus )
+ fi
+ if ! use system-icu; then
+ keeplibs+=( third_party/icu )
+ fi
+ if ! use system-libvpx; then
+ keeplibs+=( third_party/libvpx )
+ keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+ fi
+ if use tcmalloc; then
+ keeplibs+=( third_party/tcmalloc )
+ fi
+
+ # Remove most bundled libraries. Some are still needed.
+ build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+ if tc-is-cross-compiler; then
+ local -x AR=${BUILD_AR}
+ local -x CC=${BUILD_CC}
+ local -x CXX=${BUILD_CXX}
+ local -x NM=${BUILD_NM}
+ local -x CFLAGS=${BUILD_CFLAGS}
+ local -x CXXFLAGS=${BUILD_CXXFLAGS}
+ local -x LDFLAGS=${BUILD_LDFLAGS}
+ fi
+ einfo "Building GN..."
+ set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+ echo "$@"
+ "$@" || die
+}
+
+src_configure() {
+ local myconf_gn=""
+
+ # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+ myconf_gn+=" is_debug=false"
+
+ # Component build isn't generally intended for use by end users. It's mostly useful
+ # for development and debugging.
+ myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+ myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+ # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+ myconf_gn+=" enable_nacl=false"
+
+ # Use system-provided libraries.
+ # TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+ # TODO: use_system_hunspell (upstream changes needed).
+ # TODO: use_system_libsrtp (bug #459932).
+ # TODO: xml (bug #616818).
+ # TODO: use_system_protobuf (bug #525560).
+ # TODO: use_system_ssl (http://crbug.com/58087).
+ # TODO: use_system_sqlite (http://crbug.com/22208).
+
+ # libevent: https://bugs.gentoo.org/593458
+ local gn_system_libraries=(
+ flac
+ harfbuzz-ng
+ libdrm
+ libjpeg
+ libpng
+ libwebp
+ libxslt
+ openh264
+ re2
+ snappy
+ yasm
+ zlib
+ )
+ if use system-ffmpeg; then
+ gn_system_libraries+=( ffmpeg opus )
+ fi
+ if use system-icu; then
+ gn_system_libraries+=( icu )
+ fi
+ if use system-libvpx; then
+ gn_system_libraries+=( libvpx )
+ fi
+ build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+ # Optional dependencies.
+ myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+ myconf_gn+=" enable_widevine=$(usex widevine true false)"
+ myconf_gn+=" use_cups=$(usex cups true false)"
+ myconf_gn+=" use_gconf=false"
+ myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+ myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+ myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+ # TODO: link_pulseaudio=true for GN.
+
+ myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+ if tc-is-clang; then
+ myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+ else
+ myconf_gn+=" is_clang=false"
+ fi
+
+ # Never use bundled gold binary. Disable gold linker flags for now.
+ # Do not use bundled clang.
+ # Trying to use gold results in linker crash.
+ myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+ ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+ myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+ myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+ # Note: these are for Gentoo use ONLY. For your own distribution,
+ # please get your own set of keys. Feel free to contact chromium@gentoo.org
+ # for more info.
+ local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+ local google_default_client_id="329227923882.apps.googleusercontent.com"
+ local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+ myconf_gn+=" google_api_key=\"${google_api_key}\""
+ myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+ myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+ local myarch="$(tc-arch)"
+ if [[ $myarch = amd64 ]] ; then
+ myconf_gn+=" target_cpu=\"x64\""
+ ffmpeg_target_arch=x64
+ elif [[ $myarch = x86 ]] ; then
+ myconf_gn+=" target_cpu=\"x86\""
+ ffmpeg_target_arch=ia32
+ elif [[ $myarch = arm64 ]] ; then
+ myconf_gn+=" target_cpu=\"arm64\""
+ ffmpeg_target_arch=arm64
+ elif [[ $myarch = arm ]] ; then
+ myconf_gn+=" target_cpu=\"arm\""
+ ffmpeg_target_arch=$(usex neon arm-neon arm)
+ else
+ die "Failed to determine target arch, got '$myarch'."
+ fi
+
+ # Make sure that -Werror doesn't get added to CFLAGS by the build system.
+ # Depending on GCC version the warnings are different and we don't want
+ # the build to fail because of that.
+ myconf_gn+=" treat_warnings_as_errors=false"
+
+ # Disable fatal linker warnings, bug 506268.
+ myconf_gn+=" fatal_linker_warnings=false"
+
+ # Avoid CFLAGS problems, bug #352457, bug #390147.
+ if ! use custom-cflags; then
+ replace-flags "-Os" "-O2"
+ strip-flags
+
+ # Prevent linker from running out of address space, bug #471810 .
+ if use x86; then
+ filter-flags "-g*"
+ fi
+
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984.
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+ fi
+ fi
+
+ # Make sure the build system will use the right tools, bug #340795.
+ tc-export AR CC CXX NM
+
+ # Define a custom toolchain for GN
+ myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
+
+ if tc-is-cross-compiler; then
+ tc-export BUILD_{AR,CC,CXX,NM}
+ myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\""
+ myconf_gn+=" v8_snapshot_toolchain=\"${FILESDIR}/toolchain:host\""
+ else
+ myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\""
+ fi
+
+ # https://bugs.gentoo.org/588596
+ append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+ # Bug 491582.
+ export TMPDIR="${WORKDIR}/temp"
+ mkdir -p -m 755 "${TMPDIR}" || die
+
+ if ! use system-ffmpeg; then
+ local build_ffmpeg_args=""
+ if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+ build_ffmpeg_args+=" --disable-asm"
+ fi
+
+ # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+ einfo "Configuring bundled ffmpeg..."
+ pushd third_party/ffmpeg > /dev/null || die
+ chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+ --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+ chromium/scripts/copy_config.sh || die
+ chromium/scripts/generate_gn.py || die
+ popd > /dev/null || die
+ fi
+
+ third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+ touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+ bootstrap_gn
+
+ einfo "Configuring Chromium..."
+ set -- out/Release/gn gen --args="${myconf_gn}" out/Release
+ echo "$@"
+ "$@" || die
+}
+
+src_compile() {
+ local ninja_targets="chrome chromedriver"
+ if use suid; then
+ ninja_targets+=" chrome_sandbox"
+ fi
+
+ # Build mksnapshot and pax-mark it.
+ if tc-is-cross-compiler; then
+ eninja -C out/Release host/mksnapshot || die
+ pax-mark m out/Release/host/mksnapshot
+ else
+ eninja -C out/Release mksnapshot || die
+ pax-mark m out/Release/mksnapshot
+ fi
+
+ # Even though ninja autodetects number of CPUs, we respect
+ # user's options, for debugging with -j 1 or any other reason.
+ eninja -C out/Release ${ninja_targets} || die
+
+ pax-mark m out/Release/chrome
+}
+
+src_install() {
+ local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+ exeinto "${CHROMIUM_HOME}"
+ doexe out/Release/chrome
+
+ if use suid; then
+ newexe out/Release/chrome_sandbox chrome-sandbox
+ fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+ fi
+
+ doexe out/Release/chromedriver
+
+ # if ! use arm; then
+ # doexe out/Release/nacl_helper{,_bootstrap} || die
+ # insinto "${CHROMIUM_HOME}"
+ # doins out/Release/nacl_irt_*.nexe || die
+ # doins out/Release/libppGoogleNaClPluginChrome.so || die
+ # fi
+
+ local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+ sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+ doexe chromium-launcher.sh
+
+ # It is important that we name the target "chromium-browser",
+ # xdg-utils expect it; bug #355517.
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+ # keep the old symlink around for consistency
+ dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+ dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+ # Allow users to override command-line options, bug #357629.
+ insinto /etc/chromium
+ newins "${FILESDIR}/chromium.default" "default"
+
+ pushd out/Release/locales > /dev/null || die
+ chromium_remove_language_paks
+ popd
+
+ if use widevine; then
+ # These will be provided by chrome-binary-plugins
+ rm out/Release/libwidevinecdm*.so || die
+ fi
+
+ insinto "${CHROMIUM_HOME}"
+ doins out/Release/*.bin
+ doins out/Release/*.pak
+ doins out/Release/*.so
+
+ if ! use system-icu; then
+ doins out/Release/icudtl.dat
+ fi
+
+ doins -r out/Release/locales
+ doins -r out/Release/resources
+
+ insinto "${CHROMIUM_HOME}/swiftshader"
+ doins out/Release/swiftshader/*.so
+
+ newman out/Release/chrome.1 chromium.1
+ newman out/Release/chrome.1 chromium-browser.1
+
+ # Install icons and desktop entry.
+ local branding size
+ for size in 16 22 24 32 48 64 128 256 ; do
+ case ${size} in
+ 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+ *) branding="chrome/app/theme/chromium" ;;
+ esac
+ newicon -s ${size} "${branding}/product_logo_${size}.png" \
+ chromium-browser.png
+ done
+
+ local mime_types="text/html;text/xml;application/xhtml+xml;"
+ mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+ mime_types+="x-scheme-handler/ftp;" # bug #412185
+ mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+ make_desktop_entry \
+ chromium-browser \
+ "Chromium" \
+ chromium-browser \
+ "Network;WebBrowser" \
+ "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+ sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+ # Install GNOME default application entry (bug #303100).
+ insinto /usr/share/gnome-control-center/default-apps
+ newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ readme.gentoo_print_elog
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index e8a6665e398d..beda0b285c5a 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_61.0.3163.91-1_amd64.deb 63101682 SHA256 d124c94594364c81149d59d0efcb0cd11c9b4302862e5d8ae8d65b9a526c64e4 SHA512 f51f7c437cf8dc7a2a0e1a9a7c994afc3a8fa872abf77047f5b8d0bcb88e40d4e5246dc3a8c4f6005e58bd64f4b59c72a48e9ceeb6a58404664a43217bbb6fab WHIRLPOOL a887d340510bc7c8593797eb91d8909fff72136fff93198c19db09114cc8365a5a9f339f13625f280aaf57e0f5fb5c93388095874cfc3d6b96956692c63b2c5b
+DIST google-chrome-stable_61.0.3163.100-1_amd64.deb 65267668 SHA256 5b8b9655db8dcce4b276db7860ae1c8ce1079a33f161a716c17fda24b8d5a9b2 SHA512 ec8b3b29d4af45f0aac67cf564bb7f25e45543bc5aa97c075cb23b6a4f332795a6fb4922ce4c963d1305f41eb455e7b46a874b670dc7bb1b6676fff1c45f1040 WHIRLPOOL ddaf6dfe8d89bf58fcca7fcb2f58365cb82e9b751a8c15025e7ccc2d219b4255869b7d2f9a80ae292f3bfe19818ce55cb90f5e57b13a65d9808e78f8e7bda2f1
diff --git a/www-client/google-chrome/google-chrome-61.0.3163.91.ebuild b/www-client/google-chrome/google-chrome-61.0.3163.100.ebuild
index eb98674ec422..eb98674ec422 100644
--- a/www-client/google-chrome/google-chrome-61.0.3163.91.ebuild
+++ b/www-client/google-chrome/google-chrome-61.0.3163.100.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 82784aa7f7da..3e2de1ed0916 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
DIST google-chrome-beta_62.0.3202.29-1_amd64.deb 49583876 SHA256 b6a147ff4d89d71dbf82c0b06411a07003bb94129dd35c818229f4fb5178ae12 SHA512 898e4739c97ccfedfdc64fdf5bfa2414d4d2ef989a89c85b4e9839b02c0d52a6cf648d69b3932cdb82194a1e83251fb8dda9ce1115239d2f1862805e854fe21a WHIRLPOOL 53a05d9a8515f5d76bb0d45d751474b064d7e4495bf1f479b1b1bf72d7b0666b35f83440dcf86c1c656027969c434db6f7ba3fa58c0f615689b6aab75249cf14
-DIST google-chrome-stable_61.0.3163.91-1_amd64.deb 63101682 SHA256 d124c94594364c81149d59d0efcb0cd11c9b4302862e5d8ae8d65b9a526c64e4 SHA512 f51f7c437cf8dc7a2a0e1a9a7c994afc3a8fa872abf77047f5b8d0bcb88e40d4e5246dc3a8c4f6005e58bd64f4b59c72a48e9ceeb6a58404664a43217bbb6fab WHIRLPOOL a887d340510bc7c8593797eb91d8909fff72136fff93198c19db09114cc8365a5a9f339f13625f280aaf57e0f5fb5c93388095874cfc3d6b96956692c63b2c5b
+DIST google-chrome-stable_61.0.3163.100-1_amd64.deb 65267668 SHA256 5b8b9655db8dcce4b276db7860ae1c8ce1079a33f161a716c17fda24b8d5a9b2 SHA512 ec8b3b29d4af45f0aac67cf564bb7f25e45543bc5aa97c075cb23b6a4f332795a6fb4922ce4c963d1305f41eb455e7b46a874b670dc7bb1b6676fff1c45f1040 WHIRLPOOL ddaf6dfe8d89bf58fcca7fcb2f58365cb82e9b751a8c15025e7ccc2d219b4255869b7d2f9a80ae292f3bfe19818ce55cb90f5e57b13a65d9808e78f8e7bda2f1
DIST google-chrome-unstable_63.0.3218.0-1_amd64.deb 49945580 SHA256 ebba6546594be2056524310f8b1afc2acfba4bf4531b45ed22fa29e0f22d0b43 SHA512 624bc44c3e007742753c25b99c8ab198c15cfa291ae8be6ff730603ec4905bfa00a77023f5a5812ec5824e6965a48e21620bc1805a427cf6d399bcd70a1457f2 WHIRLPOOL b19e75c70b1718e90c2f8734facff7fdec31d8ab279fecf37fabb7400fd68cbd93fdc3fac8e00481bc06a7330d8dac1e940e1d92ffa8eac3f34e8d823abd91c1
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.91.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.100.ebuild
index 8173f0b7f5f0..8173f0b7f5f0 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.91.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-61.0.3163.100.ebuild
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 97cbdffdf303..b07dd966b812 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND="