diff --git a/Manifest.files.gz b/Manifest.files.gz
index 337dd48b6d11..9f20727cb604 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 73903b30676a..5e187d4e92b2 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
new file mode 100644
index 000000000000..fe02f30c4c87
--- /dev/null
+++ b/app-admin/ansible-lint/Manifest
@@ -0,0 +1 @@
+DIST ansible-lint-3.4.23.tar.gz 36922 BLAKE2B a012155d9608ce0517f152837cc7f5f8330848f3e6b6b8b62b1985c9aae5260d3b8c2e9016f945a30b8433387549a9421970d9f56fc32ff9aac25a71dc150285 SHA512 4b2357327319f2cc2c0863ed74af3c799afa97f6e8e1885f9c621a9b0b4ed4b33c731f4a0e8557bf7d03f4e1680a06e60b8602b48fbb55c55325f1dda31a51e7
diff --git a/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild b/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
new file mode 100644
index 000000000000..25c9f45d9906
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-3.4.23.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P=${P/_/}
+
+DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
+HOMEPAGE="https://github.com/willthames/ansible-lint"
+SRC_URI="https://github.com/willthames/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_P}"
+
+CDEPEND="app-admin/ansible[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/flake8[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ )
+ ${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+python_test() {
+ nosetests || die
+}
diff --git a/app-admin/ansible-lint/metadata.xml b/app-admin/ansible-lint/metadata.xml
new file mode 100644
index 000000000000..c7b18bf539b8
--- /dev/null
+++ b/app-admin/ansible-lint/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ chainsaw@gentoo.org
+ Tony Vroon
+
+
+ ansible-lint
+ willthames/ansible-lint
+ https://github.com/willthames/ansible-lint/issues
+
+
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 65f4e4e815a9..49a2f3c04b14 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,5 @@
DIST logstash-5.6.10.tar.gz 104373711 BLAKE2B 759bf003e1799aeaef0a1279b3c7cf5732126ae65e9ca0a3e315cb6f7a1b4e4417fad1fd86328a58be99e04e8053264d873b04cf43cac2b49490bbdc82c8e8b7 SHA512 9ba887da982755efd21b363e9c084660c9b7e6c042e00a8c599f60d6bba5621af7ede43957f6c3d976888f4c13e6ae17cc69afd184f2dcdd41a311972f59a745
DIST logstash-6.2.4.zip 153969993 BLAKE2B 989f631484be14014b8230e09fa049a0e470078fed938f2df55134a27d5f4f2d8670187126d32c4933b77b496a6ed96e12d180922c2c318c67fb3dbeec5a5a3b SHA512 65f6e5accc4441cb930e5c45723edeea54ba034a25680ca34114296af5a2c456d4152f9b38469475e600fce27a27b0d9c1d206039d12f2ec9cfeb02942a5c189
+DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
DIST logstash-oss-6.3.1.tar.gz 143787612 BLAKE2B 2de3b991d27019b1c7df7cfa7152c009f2569e12562106babb56081be2a7ac7d94a967e7c52b58f721c2f70f1e8ec9c2730653ff094cf0dd3a9933486ac13be7 SHA512 959d9d5985e117d23ae12efe248a13ae33f8f3ede320fb3b6872e1c27738b601779f0e2402e7be4a2383cd0f220e50cdfd2d6b160d7f5805b2439cee4d8bd94c
+DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
diff --git a/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild b/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild
new file mode 100644
index 000000000000..acbb17a3c74d
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.3.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 user
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Tool for managing events and logs"
+HOMEPAGE="https://www.elastic.co/products/logstash"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
+ !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RESTRICT="strip"
+QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup ${MY_PN}
+ enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+ keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+ keepdir "/var/lib/${MY_PN}"
+ keepdir "/var/log/${MY_PN}"
+
+ insinto "/usr/share/${MY_PN}"
+ newins "${FILESDIR}/agent.conf.sample" agent.conf
+
+ rm -v config/{pipelines.yml,startup.options} || die
+ insinto /etc/${MY_PN}
+ doins -r config/.
+ doins "${FILESDIR}/pipelines.yml"
+ rm -rv config data || die
+
+ insinto "/opt/${MY_PN}"
+ doins -r .
+ fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
+
+ newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
+ newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
+
+ insinto /usr/share/eselect/modules
+ doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+ ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
+ ewarn "Install the plugins via eselect module that will automatically re-install"
+ ewarn "all self installed plugins after Logstash upgrades."
+ elog
+ elog "Installing plugins:"
+ elog "eselect logstash-plugin install logstash-output-gelf"
+ elog
+
+ elog "Reinstalling self installed plugins (installed via eselect module):"
+ eselect logstash-plugin reinstall
+
+ elog
+ elog "Sample configuration:"
+ elog "${EROOT%/}/usr/share/${MY_PN}"
+ elog
+ elog "The default pipeline configuration expects the configuration(s) to be found in:"
+ elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
+}
diff --git a/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index d4758fc50621..6381ef41d5e7 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -1,19 +1,22 @@
-
- hydrapolic@gmail.com
- Tomáš Mózes
-
-
- erkiferenc@gmail.com
- Ferenc Erki
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
- elastic/logstash
-
+
+ hydrapolic@gmail.com
+ Tomáš Mózes
+
+
+ erkiferenc@gmail.com
+ Ferenc Erki
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ elastic/logstash
+
+
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 48e4d0a3f28c..c43d25535adf 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -1,4 +1,6 @@
DIST rsyslog-8.35.0.tar.gz 2590108 BLAKE2B e201c1366b8ab96c070829d51de079212e82216a793eb7622aa91c66e2330981de8be547b1ee7f102ed7d8c8de054d58ba151e95238146a61fba8fe908c5f929 SHA512 3b8845fc057147c2dd740b3bb432e7fb101ad60be5c6bc86a2c2796bcd3f3526c617d45b9e8301388d51047a125ca18ba4ac54f8be2a13eabbbe8fb9361beecc
DIST rsyslog-8.36.0.tar.gz 2639477 BLAKE2B 9c7343d853f79e2955a8999e2871a2a9b008cb3ef75b94e2381a3a0ff3e49445593d852d7de3819851dc0d4c17a91d966ca2fbfd52e8215ebdbaf6b7ccd68bdf SHA512 b0c8689374b5b0fb5ad9675ad8983ce67bd04d34ad07d39cf8f91498fd2fd21a173f1077e5fa1b66a89a9d93ab011fc6345ac1a3be9961f4794fc9e152c32a50
+DIST rsyslog-8.37.0.tar.gz 2697435 BLAKE2B d88a06e8a5da15ed88d0d6c92032f71be10c2b77970e26b8fe5258e116f8f635c2e359408260b8e486401b8d9ea0e234e22070f520d42bb7884923df4f216ee3 SHA512 2989eb7ed3333151e979a720fa0e95e330bda9b40f65009f7969069bcbbeee8f493c6a3189f67bbbc2529d3a2ac14a022d7e8c4f2d0dae42b67d7508d7611fa0
DIST rsyslog-doc-8.35.0.tar.gz 7427270 BLAKE2B 5441080c07a8398cd5d513ba6abe0335f62762f105354105549f0440c0429c62a4f28a4cc84a71d049bc8134cd64bda2c2210a2f30fd5b94f53e0bc783e7c8d1 SHA512 f78d0451eef789d60f7c5ae1eed46c4a9f7a6ade73b829f65aa2373aa786b00e84e8957089532b1b652838bd9f62b41d92530276a0d27e21b8e94d5f0e4728a6
DIST rsyslog-doc-8.36.0.tar.gz 7570338 BLAKE2B 031f94b88fb97e6c8b01d224279138c371a5f54ecc5d7a9298b4ec6351c5d380065877888ab1969386b76b9e715937b7335bee59c3d5b8ddd4910392a58d08cb SHA512 a93f56c9c9464a9ca87f61169c6fcfaa94608f31210eaac77e882e64bf5f514c887765db6bb57e4defafeb2a6e552506f0274c1ed275306efc1656f5520b5efa
+DIST rsyslog-doc-8.37.0.tar.gz 7587722 BLAKE2B 266e5be77e4ca91e3777ee4f2c999986ee7318287546c1fb84ee21f1f4995907fa8caac84ef47cec2665ef29f34151b4b22ed6c35ea1ffe0c4ddff8d05e23136 SHA512 827ac6762ad9257d9499201d5dc3d110c65f11891ab58d36dce568ffa5f8b57fe10505bc2c7b0743dcca319f294ba6418a880b7ca787eb19dcc1f262ba0f3b59
diff --git a/app-admin/rsyslog/rsyslog-8.37.0.ebuild b/app-admin/rsyslog/rsyslog-8.37.0.ebuild
new file mode 100644
index 000000000000..b4a87abfe6dd
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.37.0.ebuild
@@ -0,0 +1,454 @@
+# Copyright 1999-2018 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,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+ DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+ SRC_URI="
+ https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+ doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+ "
+
+ PATCHES=()
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac"
+IUSE+=" snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/libfastjson-0.99.8:=
+ >=dev-libs/libestr-0.1.9
+ >=sys-libs/zlib-1.2.5
+ curl? ( >=net-misc/curl-7.35.0 )
+ dbi? ( >=dev-db/libdbi-0.8.3 )
+ elasticsearch? ( >=net-misc/curl-7.35.0 )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+ grok? ( >=dev-libs/grok-0.9.2 )
+ jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+ kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+ kerberos? ( virtual/krb5 )
+ kubernetes? ( >=net-misc/curl-7.35.0 )
+ mdblookup? ( dev-libs/libmaxminddb:= )
+ mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+ mysql? ( virtual/libmysqlclient:= )
+ normalize? (
+ >=dev-libs/libee-0.4.0
+ >=dev-libs/liblognorm-2.0.3:=
+ )
+ omhttpfs? ( >=net-misc/curl-7.35.0 )
+ omudpspoof? ( >=net-libs/libnet-1.1.6 )
+ postgres? ( >=dev-db/postgresql-8.4.20:= )
+ rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ relp? ( >=dev-libs/librelp-1.2.14:= )
+ rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+ rfc5424hmac? (
+ !libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+ openssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+ systemd? ( >=sys-apps/systemd-234 )
+ uuid? ( sys-apps/util-linux:0= )
+ xxhash? ( dev-libs/xxhash:= )
+ zeromq? (
+ >=net-libs/czmq-3.0.2
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2015.02.24
+ virtual/pkgconfig
+ test? (
+ jemalloc? ( =dev-python/sphinx-1.1.3-r7 )"
+ DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+ DEPEND+=" >=sys-devel/bison-2.4.3"
+ DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]]; then
+ git-r3_fetch
+ git-r3_checkout
+ else
+ unpack ${P}.tar.gz
+ fi
+
+ if use doc; then
+ if [[ ${PV} == "9999" ]]; then
+ local _EGIT_BRANCH=
+ if [[ -n "${EGIT_BRANCH}" ]]; then
+ # Cannot use rsyslog commits/branches for documentation repository
+ _EGIT_BRANCH=${EGIT_BRANCH}
+ unset EGIT_BRANCH
+ fi
+
+ git-r3_fetch "${DOC_REPO_URI}"
+ git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+ if [[ -n "${_EGIT_BRANCH}" ]]; then
+ # Restore previous EGIT_BRANCH information
+ EGIT_BRANCH=${_EGIT_BRANCH}
+ fi
+ else
+ cd "${S}" || die "Cannot change dir into '${S}'"
+ mkdir docs || die "Failed to create docs directory"
+ cd docs || die "Failed to change dir into '${S}/docs'"
+ unpack ${PN}-doc-${PV}.tar.gz
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Maintainer notes:
+ # * Guardtime support is missing because libgt isn't yet available
+ # in portage.
+ # * Hadoop's HDFS file system output module is currently not
+ # supported in Gentoo because nobody is able to test it
+ # (JAVA dependency).
+ # * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+ # upstream PR 129 and 136) so we need to export HIREDIS_*
+ # variables because rsyslog's build system depends on pkg-config.
+
+ if use redis; then
+ export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+ export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+ fi
+
+ local myeconfargs=(
+ --disable-debug-symbols
+ --disable-generate-man-pages
+ --without-valgrind-testbench
+ --disable-liblogging-stdlog
+ $(use_enable test testbench)
+ $(use_enable test libfaketime)
+ $(use_enable test extended-tests)
+ # Input Plugins without depedencies
+ --enable-imdiag
+ --enable-imfile
+ --enable-impstats
+ --enable-imptcp
+ # Message Modificiation Plugins without depedencies
+ --enable-mmanon
+ --enable-mmaudit
+ --enable-mmcount
+ --enable-mmfields
+ --enable-mmjsonparse
+ --enable-mmpstrucdata
+ --enable-mmrm1stspace
+ --enable-mmsequence
+ --enable-mmutf8fix
+ # Output Modification Plugins without dependencies
+ --enable-mail
+ --enable-omprog
+ --enable-omruleset
+ --enable-omstdout
+ --enable-omuxsock
+ # Misc
+ --enable-fmhash
+ $(use_enable xxhash fmhash-xxhash)
+ --enable-pmaixforwardedfrom
+ --enable-pmciscoios
+ --enable-pmcisconames
+ --enable-pmlastmsg
+ --enable-pmsnare
+ # DB
+ $(use_enable dbi libdbi)
+ $(use_enable mongodb ommongodb)
+ $(use_enable mysql)
+ $(use_enable postgres pgsql)
+ $(use_enable redis omhiredis)
+ # Debug
+ $(use_enable debug)
+ $(use_enable debug diagtools)
+ $(use_enable debug memcheck)
+ $(use_enable debug valgrind)
+ # Misc
+ $(use_enable curl fmhttp)
+ $(use_enable elasticsearch)
+ $(use_enable gcrypt libgcrypt)
+ $(use_enable jemalloc)
+ $(use_enable kafka imkafka)
+ $(use_enable kafka omkafka)
+ $(use_enable kerberos gssapi-krb5)
+ $(use_enable kubernetes mmkubernetes)
+ $(use_enable normalize mmnormalize)
+ $(use_enable mdblookup mmdblookup)
+ $(use_enable grok mmgrok)
+ $(use_enable omhttpfs)
+ $(use_enable omudpspoof)
+ $(use_enable rabbitmq omrabbitmq)
+ $(use_enable relp)
+ $(use_enable rfc3195)
+ $(use_enable rfc5424hmac mmrfc5424addhmac)
+ $(use_enable snmp)
+ $(use_enable snmp mmsnmptrapd)
+ $(use_enable gnutls)
+ $(use_enable openssl)
+ $(use_enable systemd imjournal)
+ $(use_enable systemd omjournal)
+ $(use_enable usertools)
+ $(use_enable uuid)
+ $(use_enable zeromq imczmq)
+ $(use_enable zeromq omczmq)
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ if use doc && [[ "${PV}" == "9999" ]]; then
+ einfo "Building documentation ..."
+ local doc_dir="${S}/docs"
+ cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+ sphinx-build -b html source build || die "Building documentation failed!"
+ fi
+}
+
+src_test() {
+ local _has_increased_ulimit=
+
+ # Sometimes tests aren't executable (i.e. when added via patch)
+ einfo "Adjusting permissions of test scripts ..."
+ find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+ die "Failed to adjust test scripts permission"
+
+ if ulimit -n 3072; then
+ _has_increased_ulimit="true"
+ fi
+
+ if ! emake --jobs 1 check; then
+ eerror "Test suite failed! :("
+
+ if [[ -z "${_has_increased_ulimit}" ]]; then
+ eerror "Probably because open file limit couldn't be set to 3072."
+ fi
+
+ if has userpriv ${FEATURES}; then
+ eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+ "before you submit a bug report."
+ fi
+
+ fi
+}
+
+src_install() {
+ local DOCS=(
+ AUTHORS
+ ChangeLog
+ "${FILESDIR}"/README.gentoo
+ )
+
+ use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+ default
+
+ newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+ keepdir /var/empty/dev
+ keepdir /var/spool/${PN}
+ keepdir /etc/ssl/${PN}
+ keepdir /etc/${PN}.d
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+ insinto /etc/rsyslog.d/
+ newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+ if use mysql; then
+ insinto /usr/share/doc/${PF}/scripts/mysql
+ doins plugins/ommysql/createDB.sql
+ fi
+
+ if use postgres; then
+ insinto /usr/share/doc/${PF}/scripts/pgsql
+ doins plugins/ompgsql/createDB.sql
+ fi
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst() {
+ local advertise_readme=0
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ # This is a new installation
+
+ advertise_readme=1
+
+ if use mysql || use postgres; then
+ echo
+ elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+ elog " /usr/share/doc/${PF}/scripts"
+ fi
+
+ if use ssl; then
+ echo
+ elog "To create a default CA and certificates for your server and clients, run:"
+ elog " emerge --config =${PF}"
+ elog "on your logging server. You can run it several times,"
+ elog "once for each logging client. The client certificates will be signed"
+ elog "using the CA certificate generated during the first run."
+ fi
+ fi
+
+ if [[ ${advertise_readme} -gt 0 ]]; then
+ # We need to show the README file location
+
+ echo ""
+ elog "Please read"
+ elog ""
+ elog " ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+ elog ""
+ elog "for more details."
+ fi
+}
+
+pkg_config() {
+ if ! use ssl ; then
+ einfo "There is nothing to configure for rsyslog unless you"
+ einfo "used USE=ssl to build it."
+ return 0
+ fi
+
+ # Make sure the certificates directory exists
+ local CERTDIR="${EROOT}/etc/ssl/${PN}"
+ if [[ ! -d "${CERTDIR}" ]]; then
+ mkdir "${CERTDIR}" || die
+ fi
+ einfo "Your certificates will be stored in ${CERTDIR}"
+
+ # Create a default CA if needed
+ if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+ einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = Portage automated CA
+ ca
+ cert_signing_key
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-self-signed \
+ --load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+ # Create the server certificate
+ echo
+ einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for server ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_server
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ else
+ einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+ fi
+
+ # Create a client certificate
+ echo
+ einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+ read -r CN
+
+ einfo "Creating private key and certificate for client ${CN}..."
+ certtool --generate-privkey \
+ --outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+ cat > "${T}/${PF}.$$" <<- _EOF
+ cn = ${CN}
+ tls_www_client
+ dns_name = ${CN}
+ expiration_days = 3650
+ _EOF
+
+ certtool --generate-certificate \
+ --outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+ --load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+ --load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+ --load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+ --template "${T}/${PF}.$$" &>/dev/null
+ chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+ rm -f "${T}/${PF}.$$"
+
+ echo
+ einfo "Here is the documentation on how to encrypt your log traffic:"
+ einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 0c745067e722..d392dbbbcd9a 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest
index da30f491a32d..130ef15911d8 100644
--- a/app-crypt/kbfs/Manifest
+++ b/app-crypt/kbfs/Manifest
@@ -5,3 +5,4 @@ DIST kbfs-1.0.48.tar.gz 5639704 BLAKE2B 4d8152c8bf1a72b0493840c6ffa0da35ba6abcb6
DIST kbfs-2.0.0.tar.gz 5674786 BLAKE2B 65924644babbaf95867792da6a9c1f5c9c517bbe36292c3b5e40afaeb2879b1145d0b6017f3b66e6bc2ec4b858a312ab1d86ff1d8515f99c9004eeb1acaf8caa SHA512 6e51490b52cc5484d940ee057dc9b453a88d44622b1c533dd29e75eed5fa075f33d9cb6ac438401d80aa148d7561c1bc63deece5e75cdc30bb54102f2d00215b
DIST kbfs-2.1.0.tar.gz 5703221 BLAKE2B 55daa1d8f1efe4a0264477b54c1ea8db74e972b1ecdd536f4ab8042e66117c6854889aeb203fa6fea6f757e928af514520be3732ee07ccc1289ccc9f5d3f27a8 SHA512 04dd058e97c85d5188cc61a56cc4a4468ec1d4d6b2f65cbe0edb88cec2864cef3525e6f48729761a2cc6fa79559794e5a3fd9663cb31dcaaaeff90a32f2a211a
DIST kbfs-2.3.0.tar.gz 5718571 BLAKE2B 300106465081e91bdd1a74631eff12bdf82a3042ce6c3f532c0b61016291769a8e0f87af0cbc0b34b3d3c95ec054580654e8152bf97a56c0dfe3641b88483d79 SHA512 c7521f9664ec78fc8fd1a6d9f3e86f4680260ed507223c2a6a2694ff686984bfc615ac454da10ff7b01247866ad65a5e719e3fb8db5f0c3044e019ab7a82356f
+DIST kbfs-2.5.0.tar.gz 5788528 BLAKE2B 986d0411bb33dbef781c101beca3b90827f06e4c714795424b6f4fbe2abf628a4cce67699f434e872f7886816213e1cb2467d45ea4e06157ca1f23b433284457 SHA512 a12f3491c3d7dd42b78d24957f3b469837a8e6d682e91dfe6020e74e24374ce95f9de31578579680ee35513637512e84849d598d34b3e8e78f96cf99ac9cd701
diff --git a/app-crypt/kbfs/kbfs-2.5.0.ebuild b/app-crypt/kbfs/kbfs-2.5.0.ebuild
new file mode 100644
index 000000000000..41a15fe68057
--- /dev/null
+++ b/app-crypt/kbfs/kbfs-2.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Keybase Filesystem (KBFS)"
+HOMEPAGE="https://keybase.io/docs/kbfs"
+SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ app-crypt/gnupg
+ sys-fs/fuse
+ "
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ mkdir -vp "${S}/src/github.com/keybase" || die
+ ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die
+}
+
+src_compile() {
+ EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+ EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \
+ golang-build_src_compile
+ EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \
+ EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \
+ golang-build_src_compile
+ EGO_PN="github.com/keybase/kbfs/redirector" \
+ EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \
+ golang-build_src_compile
+}
+
+src_test() {
+ EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+ golang-build_src_test
+}
+
+src_install() {
+ dobin "${T}/kbfsfuse"
+ dobin "${T}/git-remote-keybase"
+ dobin "${T}/keybase-redirector"
+ systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service"
+}
diff --git a/app-crypt/kbfs/kbfs-9999.ebuild b/app-crypt/kbfs/kbfs-9999.ebuild
index 6c648020c5ec..c90799ed3f94 100644
--- a/app-crypt/kbfs/kbfs-9999.ebuild
+++ b/app-crypt/kbfs/kbfs-9999.ebuild
@@ -38,6 +38,11 @@ src_compile() {
golang-build_src_compile
}
+src_test() {
+ EGO_PN="github.com/keybase/kbfs/kbfsfuse" \
+ golang-build_src_test
+}
+
src_install() {
dobin "${T}/kbfsfuse"
dobin "${T}/git-remote-keybase"
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 395ff785e1bf..7d830a36bea9 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -4,3 +4,4 @@ DIST keybase-1.0.48.tar.gz 34026876 BLAKE2B c620a664b47f66932d1b49c22509aac73a6c
DIST keybase-2.0.0.tar.gz 34340958 BLAKE2B fa9bcf2285a987131e00a5bc8b06ad09fa86f3bf3de87cc4e48669131fcf93e2c515435fc1e9d6663455d16744889131d09b5957fa5f78f9d3ecc91d10667bc1 SHA512 d7b91c9a0ef69442501956ba3a09f40490adf76ef38bf945617793a8238daee68f3fc2be7a5d2118531c2364f5604016ec241226a22bd217dbab3dafbf77fd25
DIST keybase-2.1.0.tar.gz 34444571 BLAKE2B 834f1001b136461c5665f12530d660e619d93c8b4e4b5f0c96da94af23f0667c778d7ddabc65d0585ac472cd91f89240bc4260b2034bf20c26b4047839570299 SHA512 0d71a22b5f56442fdc03848f831487da097dc817bfcacfb5a8eea1a9a13e87d231619216b6bab61862de71289373977c4c8d345518152137c8804005bf20e3e4
DIST keybase-2.3.0.tar.gz 34524576 BLAKE2B 5793892b6bcfeafbaebb4a38d35e77d9267a74243da61ecbb7472026b3c500cc6f6cc49dbbec2add65cecae2ce209bb24bc03f2eb393307b82958afeb8824537 SHA512 f2b92ec21fd8cfa182aac7655b836415b902c599f9e3a08a3f84d35c3f3728027a8eef8a06fb8ed4ba77b9a66888f49fd89013304f948c0f0276705f16ca4396
+DIST keybase-2.5.0.tar.gz 35012800 BLAKE2B 46cba22bafbfcf519e658a05db349f047a622f30d6ec03d5e8b3c637e7d3351188c65b0725853c4c62da30ea1d4388d19c9a430a9c4d06b14712daca05c468d2 SHA512 05313c4373ffc8fc41097fabfd13fdbf4d0af789257bbbc4a9ff0500ab3ca9c9d5d50ab62bc38b7328aad3cbf631aa55fcd1a74b5dc73f3d31e76851733d7d5f
diff --git a/app-crypt/keybase/keybase-2.5.0.ebuild b/app-crypt/keybase/keybase-2.5.0.ebuild
new file mode 100644
index 000000000000..af077ef41e52
--- /dev/null
+++ b/app-crypt/keybase/keybase-2.5.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build systemd
+
+DESCRIPTION="Client for keybase.io"
+HOMEPAGE="https://keybase.io/"
+SRC_URI="https://github.com/keybase/client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ ~app-crypt/kbfs-${PV}"
+RDEPEND="
+ app-crypt/gnupg"
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+ ln -vs "client-${PV}" "${P}" || die
+ mkdir -vp "${S}/src/github.com/keybase" || die
+ ln -vs "${S}" "${S}/src/github.com/keybase/client" || die
+}
+
+src_compile() {
+ EGO_PN="github.com/keybase/client/go/keybase" \
+ EGO_BUILD_FLAGS="-tags production -o ${T}/keybase" \
+ golang-build_src_compile
+}
+
+src_test() {
+ EGO_PN="github.com/keybase/client/go/keybase" \
+ golang-build_src_test
+}
+
+src_install() {
+ dobin "${T}/keybase"
+ dobin "${S}/packaging/linux/run_keybase"
+ systemd_douserunit "${S}/packaging/linux/systemd/keybase.service"
+ dodir "/opt/keybase"
+ insinto "/opt/keybase"
+ doins "${S}/packaging/linux/crypto_squirrel.txt"
+}
+
+pkg_postinst() {
+ elog "Start/Restart keybase: run_keybase"
+ elog "Run the service: keybase service"
+ elog "Run the client: keybase login"
+ ewarn "Note that the user keybasehelper is obsolete and can be removed"
+}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 5caca7434dfe..851caaac5c31 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/myspell-lv/metadata.xml b/app-dicts/myspell-lv/metadata.xml
index 4e0da686a621..7a38bb900964 100644
--- a/app-dicts/myspell-lv/metadata.xml
+++ b/app-dicts/myspell-lv/metadata.xml
@@ -1,12 +1,5 @@
-
- maris.gis@gmail.com
- Maris Nartiss
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 8266b7e9bfae..81728b582cf0 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index b844fe23b8b9..79a06fb1f0b8 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1 +1,2 @@
DIST okteta-0.25.1.tar.xz 951952 BLAKE2B 180cb7426b85cc8598f774d50556fe26d95d11e7c8b5be542a38fd4fa1c0479b401e6be59e7ca86eabba805c2a5d2ea2d818960cb218d173fd87db23f9c5525f SHA512 67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174
+DIST okteta-0.25.2.tar.xz 954124 BLAKE2B b880001d6351479accb2f5f2e00a2574337695642bf9082b030d1a56e828fa4cc8e4cf00c6781e12328a20fde004cddaad057b0dbce2fb34a243e24df48ee878 SHA512 78f905479dc5070754b53d8fb7374d162a64479303092ce3f391953a01332946d98151f181a6c9363c68dad7098b58909b4db53724fac9aa848606f9ff3b6511
diff --git a/app-editors/okteta/okteta-0.25.2.ebuild b/app-editors/okteta/okteta-0.25.2.ebuild
new file mode 100644
index 000000000000..89727e9e83b1
--- /dev/null
+++ b/app-editors/okteta/okteta-0.25.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta"
+IUSE="crypt designer"
+
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript 'scripttools')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ crypt? ( app-crypt/qca:2[qt5(+)] )
+ designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DOMIT_EXAMPLES=ON
+ $(cmake-utils_use_find_package crypt Qca-qt5)
+ -DBUILD_DESIGNERPLUGIN=$(usex designer)
+ )
+
+ kde5_src_configure
+}
+
+src_test() {
+ local myctestargs=( -j1 )
+
+ kde5_src_test
+}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 299a3d1d8dfb..cbbb2c614cc9 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/volatility/volatility-2.4.1.ebuild b/app-forensics/volatility/volatility-2.4.1.ebuild
index c8a3f592e56d..5e8485be14ac 100644
--- a/app-forensics/volatility/volatility-2.4.1.ebuild
+++ b/app-forensics/volatility/volatility-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,9 +7,9 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Framework for analyzing volatile memory"
-HOMEPAGE="http://www.volatilityfoundation.org/"
+HOMEPAGE="https://www.volatilityfoundation.org/"
#2.4.1 not on mirrors yet
-#SRC_URI="http://downloads.volatilityfoundation.org/releases/${PV}/${P}.tar.gz"
+#SRC_URI="https://downloads.volatilityfoundation.org/releases/${PV}/${P}.tar.gz"
SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2+"
diff --git a/app-forensics/volatility/volatility-2.6-r1.ebuild b/app-forensics/volatility/volatility-2.6-r1.ebuild
new file mode 100644
index 000000000000..c490119d38c7
--- /dev/null
+++ b/app-forensics/volatility/volatility-2.6-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Framework for analyzing volatile memory"
+HOMEPAGE="https://www.volatilityfoundation.org/"
+SRC_URI="https://downloads.volatilityfoundation.org/releases/${PV}/${P}.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}-master
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-libs/distorm64-3[${PYTHON_USEDEP}]
+ dev-libs/libpcre
+ || (
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+ )"
+
+src_install() {
+ distutils-r1_src_install
+ mkdir "${D}/usr/share/${PN}" || die
+ mv "${D}/usr/contrib/plugins" "${D}/usr/share/${PN}/" || die
+ rmdir --ignore-fail-on-non-empty "${D}/usr/contrib" || die
+ mv "${D}/usr/tools" "${D}/usr/share/${PN}/" || die
+ dosym vol.py /usr/bin/volatility
+}
diff --git a/app-forensics/volatility/volatility-2.6.ebuild b/app-forensics/volatility/volatility-2.6.ebuild
index 74668be64645..fa24d21da652 100644
--- a/app-forensics/volatility/volatility-2.6.ebuild
+++ b/app-forensics/volatility/volatility-2.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,8 +7,8 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Framework for analyzing volatile memory"
-HOMEPAGE="http://www.volatilityfoundation.org/"
-SRC_URI="http://downloads.volatilityfoundation.org/releases/${PV}/${P}.zip"
+HOMEPAGE="https://www.volatilityfoundation.org/"
+SRC_URI="https://downloads.volatilityfoundation.org/releases/${PV}/${P}.zip"
LICENSE="GPL-2+"
SLOT="0"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index fd8dd7456efd..b02ba40f539b 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest
index 4a8d08502cb7..51a37bcc860d 100644
--- a/app-i18n/sunpinyin-data/Manifest
+++ b/app-i18n/sunpinyin-data/Manifest
@@ -1,3 +1,4 @@
-DIST dict.utf8-20120830.tar.bz2 652472 BLAKE2B bd31553027e25261e2d69a4f1a82d2c1f18b424f16f1b62a817151892b0d012be7cf1f2b7f7fbbfda98dbc40c21186eaccdca2453d139f0e50aaf3d793d64671 SHA512 4400bc2a54cbf828e1d34f8240d8915a29171d6def125fecf4aa13b442dc2442d9ea591e4451cf030d22d974fbdba09adde4112c08acae9ae023823311ae8535
DIST dict.utf8-20130220.tar.bz2 652859 BLAKE2B 9e0cdefc0db519b0e12dd2cb2621ef500e0ed5a0ff9a0eea76d6f64eac1cdb455f2d3c8a806fe7aa8c50cbc369c0ef6d937fdf01fecbc349773b12375bb419f3 SHA512 d58ec106959a7713e452df2fe2fa5a5f66e82bd67eeeee8740cd3eeedf30af8d14a90dae224ed2931dffd85b0327c704927409bde0247452d79cf40c5bc7cff8
+DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc789986899cc626341f13b702ee1e0b54780c992b2988289bdbe7ff979f3243efc1b5a5e04a0529b9a3f6b327a49faef SHA512 adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b
+DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519
DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 BLAKE2B 55d8820228986f9a7b3d567ebca7bf37079e3d05f9b062814116702957e4447c5283ac9034b6a9171a9696df01398bb29ea55a2a1ded3a952e48f14a697d8698 SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97
diff --git a/app-i18n/sunpinyin-data/files/SLM-inst.mk b/app-i18n/sunpinyin-data/files/SLM-inst.mk
deleted file mode 100644
index 9216a941ad1c..000000000000
--- a/app-i18n/sunpinyin-data/files/SLM-inst.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; indent-tabs-mode: t -*- vim:noet:ts=4
-# Sample Makefile for lexicon generation and installation.
-
-# Little endian platforms: alpha amd64 arm hurd-i386 i386 ia64 mipsel sh3 sh4
-# Big endian platforms: hppa m68k mips powerpc ppc64 sparc s390
-ifndef ENDIANNESS
- ENDIANNESS = le
-endif
-
-DICT_FILE = dict.utf8
-
-SLM_TARGET = lm_sc
-TSLM2_TEXT_FILE = ${SLM_TARGET}.t2g.arpa
-TSLM2_ORIG_FILE = ${SLM_TARGET}.t2g.orig
-TSLM2_DIST_FILE = ${SLM_TARGET}.t2g
-TSLM3_TEXT_FILE = ${SLM_TARGET}.t3g.arpa
-TSLM3_ORIG_FILE = ${SLM_TARGET}.t3g.orig
-TSLM3_DIST_FILE = ${SLM_TARGET}.t3g
-
-PYTRIE_FILE = pydict_sc.bin
-PYTRIE_LOG_FILE = pydict_sc.log
-
-SYSTEM_DATA_DIR = ${DESTDIR}/usr/share/sunpinyin
-
-all: slm3_dist
-install: slm3_install
-
-tslm2_orig: ${TSLM2_ORIG_FILE}
-${TSLM2_ORIG_FILE}: ${DICT_FILE} ${TSLM2_TEXT_FILE}
- tslmpack ${TSLM2_TEXT_FILE} ${DICT_FILE} $@
-
-tslm2_dist: ${TSLM2_DIST_FILE}
-${TSLM2_DIST_FILE}: ${TSLM2_ORIG_FILE}
- tslmendian -e ${ENDIANNESS} -i $^ -o $@
-
-lexicon2: ${DICT_FILE} ${TSLM2_ORIG_FILE}
- genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM2_ORIG_FILE} \
- -l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
-
-tslm3_orig: ${TSLM3_ORIG_FILE}
-${TSLM3_ORIG_FILE}: ${DICT_FILE} ${TSLM3_TEXT_FILE}
- tslmpack ${TSLM3_TEXT_FILE} ${DICT_FILE} $@
-
-tslm3_dist: ${TSLM3_DIST_FILE}
-${TSLM3_DIST_FILE}: ${TSLM3_ORIG_FILE}
- tslmendian -e ${ENDIANNESS} -i $^ -o $@
-
-lexicon3: ${DICT_FILE} ${TSLM3_ORIG_FILE}
- genpyt -e ${ENDIANNESS} -i ${DICT_FILE} -s ${TSLM3_ORIG_FILE} \
- -l ${PYTRIE_LOG_FILE} -o ${PYTRIE_FILE}
-
-slm2_dist: ${TSLM2_DIST_FILE} lexicon2
-slm2_install: ${TSLM2_DIST_FILE} ${PYTRIE_FILE}
- install -d ${SYSTEM_DATA_DIR}
- install -Dm644 $^ ${SYSTEM_DATA_DIR}
-
-slm3_dist: ${TSLM3_DIST_FILE} lexicon3
-slm3_install: ${TSLM3_DIST_FILE} ${PYTRIE_FILE}
- install -d ${SYSTEM_DATA_DIR}
- install -Dm644 $^ ${SYSTEM_DATA_DIR}
-
diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml
index 11bbcd490ca1..3ce0e2257d3e 100644
--- a/app-i18n/sunpinyin-data/metadata.xml
+++ b/app-i18n/sunpinyin-data/metadata.xml
@@ -6,6 +6,6 @@
Cjk
- sunpinyin
+ sunpinyin/open-gram
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
deleted file mode 100644
index fa390bb7a465..000000000000
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20121025.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DICT_VERSION="20120830"
-LM_VERSION="${PV}"
-
-DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://open-gram.googlecode.com/"
-SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
- https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- default
- mkdir "${S}" || die
- mv "${WORKDIR}"/dict.utf8 "${S}" || die
- mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
- cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
-}
-
-src_compile() {
- # we don't have any big-endian architectures keyworded yet, so hardcode
- emake ENDIANNESS=le
-}
-
-src_install() {
- emake ENDIANNESS=le DESTDIR="${D}" install
-}
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
index 9b450e30a2e9..81a424941c72 100644
--- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild
@@ -1,37 +1,44 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI="6"
DICT_VERSION="${PV}"
LM_VERSION="20121025"
DESCRIPTION="Data sets for Sunpinyin"
-HOMEPAGE="https://open-gram.googlecode.com/"
-SRC_URI="https://open-gram.googlecode.com/files/dict.utf8-${DICT_VERSION}.tar.bz2
- https://open-gram.googlecode.com/files/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
+HOMEPAGE="https://github.com/sunpinyin/open-gram"
+SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
+ mirror://sourceforge/open-gram/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
-DEPEND=">=app-i18n/sunpinyin-2.0.4_pre20130108"
-RDEPEND="${DEPEND}"
+DEPEND="=app-i18n/sunpinyin-2.0.4*"
src_unpack() {
default
mkdir "${S}" || die
mv "${WORKDIR}"/dict.utf8 "${S}" || die
mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die
- cp "${FILESDIR}"/SLM-inst.mk "${S}"/Makefile || die
}
src_compile() {
- # we don't have any big-endian architectures keyworded yet, so hardcode
- emake ENDIANNESS=le
+ # lm_sc.t3g
+ echoit tslmpack lm_sc.t3g.arpa dict.utf8 lm_sc.t3g.orig
+ echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
+ # lexicon3
+ echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
+}
+
+echoit() {
+ echo "${@}"
+ "${@}"
}
src_install() {
- emake ENDIANNESS=le DESTDIR="${D}" install
+ insinto /usr/share/${PN/-data}
+ doins lm_sc.t3g pydict_sc.bin
}
diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
new file mode 100644
index 000000000000..c35487a14eac
--- /dev/null
+++ b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DICT_VERSION="20131214"
+LM_VERSION="${PV}"
+
+DESCRIPTION="Data sets for Sunpinyin"
+HOMEPAGE="https://github.com/sunpinyin/open-gram"
+SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2
+ mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="=app-i18n/sunpinyin-3*"
+
+src_unpack() {
+ default
+ mkdir "${S}" || die
+ mv "${WORKDIR}"/dict.utf8 "${S}" || die
+ mv "${WORKDIR}"/lm_sc.3gm.arpa "${S}" || die
+}
+
+src_compile() {
+ # lm_sc.t3g
+ echoit slmpack lm_sc.3gm.arpa dict.utf8 lm_sc.3gm
+ echoit slmthread lm_sc.3gm lm_sc.t3g.orig
+ echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g
+ # lexicon3
+ echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin
+}
+
+echoit() {
+ echo "${@}"
+ "${@}"
+}
+
+src_install() {
+ insinto /usr/share/${PN/-data}
+ doins lm_sc.t3g pydict_sc.bin
+}
diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest
index a45f3fc99626..7a8249823461 100644
--- a/app-i18n/sunpinyin/Manifest
+++ b/app-i18n/sunpinyin/Manifest
@@ -2,3 +2,4 @@ DIST dict.utf8.tar.bz2 1598995 BLAKE2B 4cb990b6bbb440218c6af695369bdccf97b820da9
DIST lm_sc.t3g.arpa.tar.bz2 25098718 BLAKE2B a7cd87d4e786a7dfe854b33c5c70019075ec99b02fd6cb33f91f89babdd2b255b6d157fff30c22b5372e74908483b814cc9698fd84caa3e56c61e76a59dbea04 SHA512 1e5e577c92df2f230b6b5962298ef7c215f6069b53e8e2dd4c5ad3eb54f999fc239b0924b4ab031af59c3194da15d6317ea2860f158e805b5cf0126666eaad98
DIST sunpinyin-2.0.3.tar.gz 169394 BLAKE2B d93472c0c208da2a7aab99b1d514fa01acf67e69bdddc2c0e15f40af7a2abaf8860f8e792c2bd286bd1ec3a24124b0284d28295115c8dff1051f5df3c2314bb7 SHA512 25f1fc4b8f550663861f2c7426832924676f83e1f201689fde51b04ca78704b46dbbf2b92736234d5e1a729ba1bb23bd1f3a0394f6b8b54cb0df57b9bb7ece1d
DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2
+DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
index f2f6b389ba09..de85e82c1d5e 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.3-force-switch.patch
@@ -1,5 +1,3 @@
-diff --git a/SConstruct b/SConstruct
-index 68cd365..9bb6ebc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -180,12 +180,6 @@ libdir = env['LIBDIR']
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
similarity index 80%
rename from app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
rename to app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
index 77fe2831c7d8..0bceb38318b3 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4_pre20130108-gcc6-use-float.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch
@@ -1,5 +1,9 @@
---- sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h.old 2016-09-20 02:54:15.046257131 -0400
-+++ sunpinyin-2.0.4_pre20130108/src/slm/tslmpack/common.h 2016-09-20 02:55:48.041124978 -0400
+https://bugs.gentoo.org/553796
+
+Author: Peter Levine
+
+--- a/src/slm/tslmpack/common.h
++++ b/src/slm/tslmpack/common.h
@@ -53,10 +53,10 @@
typedef std::map RealIndexMap; // map real values to their indices
typedef std::map TLexicon; // map word to wid
diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
index 54831df21220..36e69d2deda3 100644
--- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
+++ b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch
@@ -1,9 +1,8 @@
-From: Guo Yixuan
-Bug: https://code.google.com/archive/p/sunpinyin/issues/327
-Gentoo-Bug: 553796
+https://bugs.debian.org/790287
+https://code.google.com/p/sunpinyin/issues/detail?id=327
+
+Author: Guo Yixuan
-diff --git a/man/SConscript b/man/SConscript
-index f3ebd03..e1551eb 100644
--- a/man/SConscript
+++ b/man/SConscript
@@ -1,7 +1,7 @@
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
index 8ef0101da1e5..c79fd710b993 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.3-r2.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
-inherit scons-utils toolchain-funcs
+inherit python-any-r1 scons-utils toolchain-funcs
-DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
-HOMEPAGE="https://sunpinyin.googlecode.com"
+DESCRIPTION="A Statistical Language Model based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
SRC_URI="${HOMEPAGE}/files/${P}.tar.gz
https://open-gram.googlecode.com/files/dict.utf8.tar.bz2
https://open-gram.googlecode.com/files/lm_sc.t3g.arpa.tar.bz2"
@@ -18,35 +19,34 @@ IUSE=""
RDEPEND="dev-db/sqlite:3"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ ${PYTHON_DEPS}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-force-switch.patch
+ "${FILESDIR}"/${P}-gcc-4.7.patch
+)
src_unpack() {
- unpack "${P}.tar.gz"
- ln -s "${DISTDIR}/dict.utf8.tar.bz2" "${S}/raw/" || die "dict file not found"
- ln -s "${DISTDIR}/lm_sc.t3g.arpa.tar.bz2" "${S}/raw/" || die "dict file not found"
+ unpack ${P}.tar.gz
+ ln -s "${DISTDIR}"/dict.utf8.tar.bz2 "${S}"/raw/ || die "dict file not found"
+ ln -s "${DISTDIR}"/lm_sc.t3g.arpa.tar.bz2 "${S}"/raw/ || die "dict file not found"
}
src_prepare() {
- eapply "${FILESDIR}/${P}-force-switch.patch"
- eapply "${FILESDIR}/${P}-gcc-4.7.patch"
default
-}
-
-src_configure() {
tc-export CXX
- myesconsargs=(
- --prefix="${EPREFIX}"/usr
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- --libdatadir="${EPREFIX}"/usr/lib
- )
}
src_compile() {
- escons || die
+ escons \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --libdatadir="${EPREFIX}"/usr/lib
}
src_install() {
- escons --install-sandbox="${ED}" install || die
+ escons --install-sandbox="${D}" install
}
pkg_postinst() {
diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
similarity index 60%
rename from app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
rename to app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
index 84ef8dcc2cb4..34f908fd9808 100644
--- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r1.ebuild
+++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI="6"
PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-any-r1 scons-utils toolchain-funcs
+
+inherit python-any-r1 scons-utils toolchain-funcs
DESCRIPTION="A Statistical Language Model based Chinese input method library"
HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
@@ -20,28 +21,26 @@ DEPEND="${RDEPEND}
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig"
-PDEPEND="app-i18n/sunpinyin-data"
+PDEPEND="<=app-i18n/sunpinyin-data-20130220"
+
+PATCHES=(
+ "${FILESDIR}"/${P/_pre*}-gcc-6.patch
+ "${FILESDIR}"/${P/_pre*}-pod2man.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.0.4-pod2man.patch
- epatch "${FILESDIR}"/${P}-gcc6-use-float.patch
- epatch_user
-}
+ sed -i "/^docdir/s/${PN}/${PF}/" SConstruct
-src_configure() {
+ default
tc-export CXX
- myesconsargs=(
- --prefix="${EPREFIX}"/usr
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- )
}
src_compile() {
- escons
+ escons \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
}
src_install() {
escons --install-sandbox="${D}" install
- rm -rf "${D}"/usr/share/doc/${PN} || die
- dodoc doc/{README,SLM-inst.mk,SLM-train.mk}
}
diff --git a/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild
new file mode 100644
index 000000000000..386c1694c1a2
--- /dev/null
+++ b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot
+
+DESCRIPTION="A Statistical Language Model based Chinese input method library"
+HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0/3"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig"
+PDEPEND=">=app-i18n/sunpinyin-data-20140820"
+
+src_prepare() {
+ sed -i "/^docdir/s/${PN}/${PF}/" SConstruct
+
+ default
+ tc-export CXX
+}
+
+src_compile() {
+ escons \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+ escons --install-sandbox="${D}" install
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 2964d518298a..82ef9c9598a1 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
index 23bc999bd73b..47665d99a84f 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -35,16 +35,24 @@ python_install_all() {
distutils-r1_python_install_all
}
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+ SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+ fi
+}
+
pkg_postinst() {
# Create cache directory for revdep-rebuild
mkdir -p -m 0755 "${EROOT%/}"/var/cache
mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
- einfo "Starting with this version, ebump, ekeyword and imlate are now"
- einfo "part of the gentoolkit package."
- einfo "The gentoolkit-dev package is now deprecated in favor of a single"
- einfo "gentoolkit package. The remaining tools from gentoolkit-dev"
- einfo "are now obsolete/unused with the git based tree."
+ if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+ elog "Starting with this version, ebump, ekeyword and imlate are now"
+ elog "part of the gentoolkit package."
+ elog "The gentoolkit-dev package is now deprecated in favor of a single"
+ elog "gentoolkit package. The remaining tools from gentoolkit-dev"
+ elog "are now obsolete/unused with the git based tree."
+ fi
# Only show the elog information on a new install
if [[ ! ${REPLACING_VERSIONS} ]]; then
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
index ed5581daa990..6722fbcda234 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -35,16 +35,24 @@ python_install_all() {
distutils-r1_python_install_all
}
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+ SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+ fi
+}
+
pkg_postinst() {
# Create cache directory for revdep-rebuild
mkdir -p -m 0755 "${EROOT%/}"/var/cache
mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
- einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
- einfo "part of the gentoolkit package."
- einfo "The gentoolkit-dev package is now deprecated in favor of a single"
- einfo "gentoolkit package. The remaining tools from gentoolkit-dev"
- einfo "are now obsolete/unused with the git based tree."
+ if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+ elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+ elog "part of the gentoolkit package."
+ elog "The gentoolkit-dev package is now deprecated in favor of a single"
+ elog "gentoolkit package. The remaining tools from gentoolkit-dev"
+ elog "are now obsolete/unused with the git based tree."
+ fi
# Only show the elog information on a new install
if [[ ! ${REPLACING_VERSIONS} ]]; then
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index 8d1838ed8c35..3ef6b39ef078 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -39,16 +39,24 @@ python_install_all() {
distutils-r1_python_install_all
}
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-0.4.0"; then
+ SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
+ fi
+}
+
pkg_postinst() {
# Create cache directory for revdep-rebuild
mkdir -p -m 0755 "${EROOT%/}"/var/cache
mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
- einfo "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
- einfo "part of the gentoolkit package."
- einfo "The gentoolkit-dev package is now deprecated in favor of a single"
- einfo "gentoolkit package. The remaining tools from gentoolkit-dev"
- einfo "are now obsolete/unused with the git based tree."
+ if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
+ elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
+ elog "part of the gentoolkit package."
+ elog "The gentoolkit-dev package is now deprecated in favor of a single"
+ elog "gentoolkit package. The remaining tools from gentoolkit-dev"
+ elog "are now obsolete/unused with the git based tree."
+ fi
# Only show the elog information on a new install
if [[ ! ${REPLACING_VERSIONS} ]]; then
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 0737c5db309f..cb5319f1a704 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index f387cc6bd230..fb2417626b67 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,2 +1,3 @@
DIST master-pdf-editor-4.3.82_qt5.amd64.tar.gz 14934502 BLAKE2B f93c756f9270b2857af02047c6ebd242d35ddaf23b70118d440c21cc7a0718937aa9945bb24adad6544e984f9390e9f49bfce5298bb8bc54f3c705372aff0fd4 SHA512 9bc6b056bdc8ce349dbab139f64c90948f3e0498918f07df6249fee2fad98a35b133aa7913e375366d062e134878feed0fadd097ab1d5504e97884ffa2c37b24
DIST master-pdf-editor-5.0.36_qt5.amd64.tar.gz 16021838 BLAKE2B d46b9f6205e2832535060584a8841e3fa35d3b59c99a7fc2bcca5f913771633eed0d987a94141ef186b2077b65c781509b5f9938a033a5a856a9b0ad914bd5fc SHA512 31bae232d4629e10b29a4c7273ef7635bb7ec7cce9dc837355fc0d9aacc98943ec009eeac7b445f022831da8a2c400a7ce2b1de82b4e780d625ff49120e2a964
+DIST master-pdf-editor-5.1.00_qt5.amd64.tar.gz 16045580 BLAKE2B 89696a74d2df83836b1e9201d1bee8ba6a30a41f6a39664a975f9bbfb061b4536558d8746e24c57bfcb495f5324ed9d851471276f0da9f9f1d8caa454bf48c38 SHA512 a67d0668cb4c9daa0287af7bce4f24436c31b1636d29aed03503c0976c3efbc2df9ff34c2e65421e5e4cd3e184544bd78a4312b85aa6aee6af0cdaa18ba9c4a2
diff --git a/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild b/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
index 2af6159261c6..cb32e02a6562 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
@@ -5,7 +5,7 @@ EAPI=6
inherit xdg-utils desktop
-DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
+DESCRIPTION="A complete solution for viewing and editing PDF files"
HOMEPAGE="https://code-industry.net/free-pdf-editor/"
SRC_URI="http://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.0.36.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.0.36.ebuild
index 6ef28a8e6ba9..b3809849559f 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.0.36.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.0.36.ebuild
@@ -5,7 +5,7 @@ EAPI=6
inherit xdg-utils desktop
-DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
+DESCRIPTION="A complete solution for viewing and editing PDF files"
HOMEPAGE="https://code-industry.net/free-pdf-editor/"
SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.1.00.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.1.00.ebuild
new file mode 100644
index 000000000000..b3809849559f
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.1.00.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils desktop
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+ >=media-gfx/sane-backends-1.0
+ >=dev-qt/qtsvg-5.4.1:5
+ >=dev-qt/qtnetwork-5.4.1:5
+ >=dev-qt/qtgui-5.4.1:5
+ >=dev-qt/qtprintsupport-5.4.1:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+ insinto /opt/${PN}
+ doins -r fonts lang stamps templates masterpdfeditor5.png
+
+ exeinto /opt/${PN}
+ doexe masterpdfeditor5
+
+ dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+ make_desktop_entry "masterpdfeditor5 %f" \
+ "Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+ "Office;Graphics;Viewer" \
+ "MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 80c3e6a27ffe..043964f615a1 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 1dff0fb6f43a..55be30adaaba 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -13,6 +13,7 @@ DIST rust-1.27.1-arm-unknown-linux-gnueabihf.tar.xz 101382108 BLAKE2B 8743930b86
DIST rust-1.27.1-armv7-unknown-linux-gnueabihf.tar.xz 98288932 BLAKE2B 4794e8c54c8f733de6129829bab9e02644651fd6350db76bdb8c69f32fcff0a61e4992241431fea2b871e04a6f28607810918c5161a5a8a0b3fe756a37b619e3 SHA512 405bd579e69ec73de384487c4cd77eefcbc6c537ca3421f38ce2d35b8cd911def82fb9006b788a8aa6cdef69f620a5b1f2a2f7364bf7ddd0452d80b33315fa43
DIST rust-1.27.1-i686-unknown-linux-gnu.tar.xz 144852524 BLAKE2B f087ad3ee7f942482c6aa02f9dcdc4adf6ede64e698024f7dcca6dccedcc5f9e9805050015d8328c5b672c94cb7f1008551a95a69b1ce8e754e048c5604dd11e SHA512 e0c7d5f64db768321bbdf229529b12f93e36507db03329b0b26094fd81cdf013804f929105ac4545903eb4494770120407c40616086b431ea66413be7e1163d3
DIST rust-1.27.1-x86_64-unknown-linux-gnu.tar.xz 144328984 BLAKE2B 45551c2f4258c821e9b56ac09d673c46032b5f480da5fc51c0e0e33f66be7f0619aa4ad878336dbffae32e6eb43f2adfbba927ad5cfbb919b9e4395169d5c3bd SHA512 b419c19f75082a63a669ebeeefbce907ca7e7ac50a1c1355d1b10b3a4c1f8e28a76c4fd677efd8cb966a6e70a76059813e39b8dfe93de1401c7419d57ddca52a
+DIST rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz 98937652 BLAKE2B 836d3dd4e583fa50dd317c3bea56257e6ea19defdb38c16be6debb2854e147c8a92c4832263e4ac314136022a176526fe7d3774a3c5a84cd8d364cd2a1532860 SHA512 8d9acbc90ddaa1e0de0234a21798b19b5365ea371a12f9a143c6ebacbb48f57344da6e827e867513be502bce2801de27a0dbbacdf8618c653aeb58026b6c469c
DIST rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz 104676648 BLAKE2B b26b23c3605e6584c51e0e914dbb3be60996e079e52ff2d4850ed43c1f1f7cd5ac575b40dbe852f927d36654f5ab7e384548f3a92b3466bfbb1cda7f9f069bcb SHA512 a1eaf1d7826ebfe222d233cabd8b88073ca2c8dd42a0b870e324dfc63e7290308418222c56802bc421c9bda119dc7c5f3e225ff33cacad5776b79cbcc1a877b2
DIST rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz 104992084 BLAKE2B df97766d7abf73f668a2936834bc0f35739289eeeb5395276a2fdfd5b6c0baee3ba1eee1099f19d4f4f1cbd1a33cf62ad888dd3d1856b613ac853c6a17650741 SHA512 3b58b83f38bf8d8e841ae6614d72bb6e6faf75fb7c19abc5451548b0e6de0ef3b64dfbc70481a1e40f74074bfad701aa7a58296b4a0d07957a418bd3cd769917
DIST rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz 105144132 BLAKE2B d9e0791c7dc77ade26d383a5c57117a2b7b50c6a523b31fbf604c0b779c966c5055554f85c718353f2e581bfe8a228369671a8b731f808bc0133ad3fad61f853 SHA512 9142110e0c24657aca41468648d9364c2e6fce60b08ca7113c944a53701fc5a309481a8fdd5845b229bcc750ccad63af561d452c3a3a0727ab1ca7a461b06d3d
diff --git a/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild
new file mode 100644
index 000000000000..75593e6949a4
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils bash-completion-r1 versionator toolchain-funcs
+
+MY_P="rust-${PV}"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
+ arm? (
+ https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
+ https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
+ https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
+ )
+ arm64? ( https://static.rust-lang.org/dist/${MY_P}-aarch64-unknown-linux-gnu.tar.xz )
+ x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+SLOT="stable"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cargo doc libressl rustfmt"
+
+CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
+
+DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+ !dev-lang/rust:0
+ cargo? ( !dev-util/cargo )
+ rustfmt? ( !dev-util/rustfmt )
+"
+RDEPEND="${DEPEND}
+ cargo? (
+ sys-libs/zlib
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ net-libs/libssh2
+ net-libs/http-parser
+ net-misc/curl[ssl]
+ )"
+PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
+
+QA_PREBUILT="
+ opt/${P}/bin/*-${PV}
+ opt/${P}/lib/*.so
+ opt/${P}/lib/rustlib/*/lib/*.so
+ opt/${P}/lib/rustlib/*/lib/*.rlib*
+"
+
+pkg_pretend () {
+ if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
+ die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
+ fi
+}
+
+src_unpack() {
+ default
+
+ local postfix
+ use amd64 && postfix=x86_64-unknown-linux-gnu
+
+ if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+ postfix=arm-unknown-linux-gnueabi
+ elif use arm && [[ ${CHOST} == armv6*h* ]]; then
+ postfix=arm-unknown-linux-gnueabihf
+ elif use arm && [[ ${CHOST} == armv7*h* ]]; then
+ postfix=armv7-unknown-linux-gnueabihf
+ fi
+
+ use arm64 && postfix=aarch64-unknown-linux-gnu
+ use x86 && postfix=i686-unknown-linux-gnu
+ mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+}
+
+src_install() {
+ local std=$(grep 'std' ./components)
+ local components="rustc,${std}"
+ use doc && components="${components},rust-docs"
+ use cargo && components="${components},cargo"
+ use rustfmt && components="${components},rustfmt-preview"
+ ./install.sh \
+ --components="${components}" \
+ --disable-verify \
+ --prefix="${D}/opt/${P}" \
+ --mandir="${D}/usr/share/${P}/man" \
+ --disable-ldconfig \
+ || die
+
+ local rustc=rustc-bin-${PV}
+ local rustdoc=rustdoc-bin-${PV}
+ local rustgdb=rust-gdb-bin-${PV}
+ local rustlldb=rust-lldb-bin-${PV}
+
+ mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
+ mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
+ mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
+ mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die
+
+ dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
+ dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
+ dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
+ dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
+
+ if use cargo; then
+ local cargo=cargo-bin-${PV}
+ mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die
+ dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
+ fi
+ if use rustfmt; then
+ local rustfmt=rustfmt-bin-${PV}
+ local cargo_fmt=cargo-fmt-bin-${PV}
+ mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die
+ mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die
+ dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
+ dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
+ fi
+
+ cat <<-EOF > "${T}"/50${P}
+ LDPATH="/opt/${P}/lib"
+ MANPATH="/usr/share/${P}/man"
+ EOF
+ doenvd "${T}"/50${P}
+
+ cat <<-EOF > "${T}/provider-${P}"
+ /usr/bin/rustdoc
+ /usr/bin/rust-gdb
+ /usr/bin/rust-lldb
+ EOF
+ if use cargo; then
+ echo /usr/bin/cargo >> "${T}/provider-${P}"
+ fi
+ if use rustfmt; then
+ echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+ echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+ fi
+ dodir /etc/env.d/rust
+ insinto /etc/env.d/rust
+ doins "${T}/provider-${P}"
+}
+
+pkg_postinst() {
+ eselect rust update --if-unset
+
+ elog "Rust installs a helper script for calling GDB now,"
+ elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
+
+ if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
+ elog "install app-emacs/rust-mode to get emacs support for rust."
+ fi
+
+ if has_version app-editors/gvim || has_version app-editors/vim; then
+ elog "install app-vim/rust-vim to get vim support for rust."
+ fi
+
+ if has_version 'app-shells/zsh'; then
+ elog "install app-shells/rust-zshcomp to get zsh completion for rust."
+ fi
+}
+
+pkg_postrm() {
+ eselect rust unset --if-invalid
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 75f1542a732d..2e9d6fce83f7 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/beignet/beignet-1.3.2-r1.ebuild b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
index c562b68c13b3..7975dc31d3ce 100644
--- a/dev-libs/beignet/beignet-1.3.2-r1.ebuild
+++ b/dev-libs/beignet/beignet-1.3.2-r1.ebuild
@@ -82,7 +82,7 @@ multilib_src_configure() {
VENDOR_DIR="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
local mycmakeargs=(
- -DCMAKE_INSTALL_PREFIX="${VENDOR_DIR}"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/${VENDOR_DIR}"
-DOCLICD_COMPAT=$(usex ocl-icd)
$(usex ocl20 "" "-DENABLE_OPENCL_20=OFF")
)
@@ -96,7 +96,7 @@ multilib_src_install() {
cmake-utils_src_install
insinto /etc/OpenCL/vendors/
- echo "${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
+ echo "${EPREFIX%/}/${VENDOR_DIR}/lib/${PN}/libcl.so" > "${PN}-${ABI}.icd" || die "Failed to generate ICD file"
doins "${PN}-${ABI}.icd"
dosym "lib/${PN}/libcl.so" "${VENDOR_DIR}"/libOpenCL.so.1
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 55e603224eed..6fd70afa425f 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,4 +1,2 @@
-DIST libgit2-0.26.5.tar.gz 4734075 BLAKE2B cdc34a5792576d97d8bc8a8c998e610e9c2caab4899f55bfd11da382d73d3061277ac068edd20c8e31d7cf5c3b26ca688fd67eb43ca7b9e0b82413fb04d04b3f SHA512 7dd7c567ad776db76b3514e6532f52841a4279b58dc51b44d39ab53b6911220cb60ee8f37b4c6ad6f369edbbd43a2591cf5f46aca354282f56735c8b215d533b
DIST libgit2-0.26.6.tar.gz 4734435 BLAKE2B 0831d0a78ba74b6cd989821f0abb6774f8879f18906025ce02d7c0f7f8f3e7f03b30121f79e370b85201e110a6fc4aca2ae2e608b12f01cd527ab42bf597099d SHA512 6a5a167bfe8696294cf188feec2aad898af52f4c05a3a40a55f48ea3168d200a60fc42b3819a22b1bf472be696f5dafef473d457c08bab164cbf654c4de6bda7
-DIST libgit2-0.27.3.tar.gz 4771877 BLAKE2B a15aed24d0391cf8d5c74329f5064d703def5db1cbf132881279d501d1ba31002367e54171e8a341b75862d327eddb1abebdaeeaee6878a14ad1d8abbbc8402d SHA512 e470050b89289908ec64dafaa954ad9bfc8f557ba7dafcab440d9efde474f736c025d8202bfd81a508070d9cf678f3fb1f3687d72a849ce86edd1ee90ad13c3b
DIST libgit2-0.27.4.tar.gz 4772254 BLAKE2B 9c0e7b436d8cb07a8f1407d22bcd4c7b161f3ceef9dc4e67f9daec784a1cfb9f8f2e493a78f5ef6b4893e54c1f1b567ae53ead52a992ee10eabe3229195417a1 SHA512 d27db86eb1b9f0d4057f8538ba1985ee76c3ca106e57d417fa9bff79d575f91a07ad28693112b58dc1d61d68116a82e6a145f12276158f2806b6c4964d741f61
diff --git a/dev-libs/libgit2/libgit2-0.26.5.ebuild b/dev-libs/libgit2/libgit2-0.26.5.ebuild
deleted file mode 100644
index c94b6bca4718..000000000000
--- a/dev-libs/libgit2/libgit2-0.26.5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/26"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- sys-libs/zlib
- net-libs/http-parser:=
- curl? (
- !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
- libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
- )
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
- # skip online tests
- sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DBUILD_CLAR=$(usex test)
- -DENABLE_TRACE=$(usex trace)
- -DUSE_GSSAPI=$(usex gssapi)
- -DUSE_SSH=$(usex ssh)
- -DTHREADSAFE=$(usex threads)
- -DCURL=$(usex curl)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake-utils_src_test
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- find examples -name '.gitignore' -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.26.6.ebuild b/dev-libs/libgit2/libgit2-0.26.6.ebuild
index 6ea72cb9ceb8..fe1356367611 100644
--- a/dev-libs/libgit2/libgit2-0.26.6.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~ppc-macos"
fi
DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgit2/libgit2-0.27.3.ebuild b/dev-libs/libgit2/libgit2-0.27.3.ebuild
deleted file mode 100644
index 456ded8f18df..000000000000
--- a/dev-libs/libgit2/libgit2-0.27.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/27"
-IUSE="+curl examples gssapi libressl +ssh test +threads trace"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- sys-libs/zlib
- net-libs/http-parser:=
- curl? (
- !libressl? ( net-misc/curl:=[curl_ssl_openssl(-)] )
- libressl? ( net-misc/curl:=[curl_ssl_libressl(-)] )
- )
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
- # skip online tests
- sed -i '/libgit2_clar/s/-ionline/-xonline/' tests/CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DBUILD_CLAR=$(usex test)
- -DENABLE_TRACE=$(usex trace)
- -DUSE_GSSAPI=$(usex gssapi)
- -DUSE_SSH=$(usex ssh)
- -DTHREADSAFE=$(usex threads)
- -DCURL=$(usex curl)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake-utils_src_test
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- find examples -name '.gitignore' -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3e9a1f03a171..328146ba6c37 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/openpyxl/openpyxl-2.4.11.ebuild b/dev-python/openpyxl/openpyxl-2.4.11.ebuild
index e25dc627767f..3d62292acd11 100644
--- a/dev-python/openpyxl/openpyxl-2.4.11.ebuild
+++ b/dev-python/openpyxl/openpyxl-2.4.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/pyinsane/Manifest b/dev-python/pyinsane/Manifest
index 6881adbaf6b5..8fbb94bd5928 100644
--- a/dev-python/pyinsane/Manifest
+++ b/dev-python/pyinsane/Manifest
@@ -1,2 +1,3 @@
DIST pyinsane-2.0.10.tar.gz 327159 BLAKE2B ae63e08fc557513ccac0633fac47bb29b3c8a023c481289ec60724f5fcdae0827e02d5f37d3f104d454ebcb1d1a7681248866461bce6201f056c988f858aa0d3 SHA512 bb882ab51c1e6cea7cad75851ffe5918ee08467d4772d27c23a0c5ec9f2dea3ee7d83601ae35e56e2f717ff7683cec5a45aa47b2a4e167fe4dddb9db3229a3b1
DIST pyinsane2-2.0.12.tar.gz 56107 BLAKE2B 81085e414f162c4fe3623e05b904c35864b95c8ceb5aa25cb92aa87086d4ee44f9f1bea58239373217e93793bfba0d8bb894ab75d69d6c213741cf6e53721284 SHA512 72fc87d5c7eab078f4a9694569c5759046587a8439820fadfe1b8899b7445e063f9fc2f3e93a86b1f9329f729466a5e19b86e46c128caf9ac8b143cfd9e17817
+DIST pyinsane2-2.0.13.tar.gz 57172 BLAKE2B 26081f7df1d4077f2580f8968c20a88092446136f441fab16a8bc1e34ffc9d5e11221c6a3f74a111f66f839d3cea5ed7518ebe4321b563cba1f3cb3a6053bf74 SHA512 613ea6aae00df550089a691ef6cdd00ea00324ad3a02e35bcb1cd1b0723e34afe9692828100115432e5df9c7bef09f861ce3e1d06915c02c007f92bc8030a91b
diff --git a/dev-python/pyinsane/pyinsane-2.0.13.ebuild b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
new file mode 100644
index 000000000000..5048615b8a4d
--- /dev/null
+++ b/dev-python/pyinsane/pyinsane-2.0.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="${PN}2"
+
+DESCRIPTION="Python implementation of the Sane API and abstration layer"
+HOMEPAGE="https://github.com/openpaperwork/pyinsane"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="media-gfx/sane-backends
+ dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RESTRICT="test" # Tests require at least one scanner with a flatbed and an ADF
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+python_prepare_all() {
+ sed -e "/'nose>=1.0'/d" \
+ -i setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index 9991c226473d..5530a99cdefd 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,2 +1,3 @@
DIST pyocr-0.4.7.tar.gz 1283774 BLAKE2B 0c4958882c350ee9e71f956694c180097607ca1c9e75b2886185361013f6038fd584a73de63de80546354de4023c6a8b1a589205f2e0c9165904d4fd3881b9f8 SHA512 ee4433c34058e0c79478dbf4276f55dabadcf5c841e86e1988e574bf91d96b96a314ef5e15047fb510737c956b4deed200eb47799de6fb1c021e407a6d49c192
DIST pyocr-0.5.1.tar.gz 17525 BLAKE2B 0f2d6383fe59fae2f3f0c7abb185e8a1c4ddfab7e5cd219cff56fa8c2b9b690ab696ea2fada91ea66060ea8d8e71a7d0cfa38a9ddc7bb8fc3ffc05ae0b1a304f SHA512 829c4d4591931a4823e5d328df05a950bf65b4ff38a899ffa1c1f8e57fa031bcf68e22e18828681e285758a4be14097f7344b95c169e64206743c2521a81776c
+DIST pyocr-0.5.2.tar.gz 17532 BLAKE2B 0bd47a52379cbdf5d2a7c1a5a966596101101a7750458e317287835a857bfd2ff18fec4b6648a62a78db138038f4aee047135909a4486fd6b720c4508972cc5d SHA512 81f66e9c98b934392bb847b18bff88843fe43212499bb550894264aaef810312bc097c5cfa898e06323ce320cc73002ff632fa5767d36704d28b27eb4d0ace6c
diff --git a/dev-python/pyocr/pyocr-0.5.2.ebuild b/dev-python/pyocr/pyocr-0.5.2.ebuild
new file mode 100644
index 000000000000..f08810e858da
--- /dev/null
+++ b/dev-python/pyocr/pyocr-0.5.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
+HOMEPAGE="https://github.com/openpaperwork/pyocr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+IUSE="cuneiform +tesseract"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="cuneiform? ( app-text/cuneiform )
+ tesseract? ( app-text/tesseract )
+ dev-python/pillow
+ dev-python/six"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+RESTRICT="test" # reguires tesseract[l10n_fr,l10n_en,l10n_jp]
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
new file mode 100644
index 000000000000..b63c8baa497a
--- /dev/null
+++ b/dev-python/spyder-kernels/Manifest
@@ -0,0 +1,2 @@
+DIST spyder-kernels-0.2.4.tar.gz 35750 BLAKE2B 85cc767dc1ab8e071a6c08993b3d8d383e7b9bcf85be704fcd1bc3b321ff7ec532a7ecbb6a30dc2bce2fa7fd8d74812fae07dea5e10eff6309b3ca13fb16e6d5 SHA512 d5b8af3e0b8c5af9e29864912ecd27ee27a605938f36c0a7681167fb782e4b7fb79d5ffb4ae9b77fb82676301be664a1e1dd64f2f206fee2bf047f0ef9e05941
+DIST spyder-kernels-1.0.1.tar.gz 35936 BLAKE2B d3e572ba04823869bf8a602e96195a95c39da3c0e29d6bf17eeb305e21d60d72fb8c6bda9f111558468655759f1319e2d69d12b7a3c4011c18d22570d394d64e SHA512 05a4124e44cf1ba1d56927295dc9a2fea315ffe107d0f835a36d29b0727c2d7abe35e41974d62ece23b2d5ef78baa18c1d29910c0359b6fea900216e8f093d97
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
new file mode 100644
index 000000000000..d72ada7efcf5
--- /dev/null
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ grozin@gentoo.org
+ Andrey Grozin
+
+
+ spyder-kernels
+ spyder-ide/spyder-kernels
+
+
diff --git a/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
new file mode 100644
index 000000000000..eafa8d2f2793
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+ https://github.com/spyder-ide/spyder-kernels/
+ https://pypi.org/project/spyder-kernels/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/cloudpickle[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
new file mode 100644
index 000000000000..eafa8d2f2793
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="
+ https://github.com/spyder-ide/spyder-kernels/
+ https://pypi.org/project/spyder-kernels/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/cloudpickle[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index a489f0b9d1dc..322c808f62aa 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,2 +1,3 @@
DIST spyder-3.2.4.tar.gz 3345797 BLAKE2B 2df946f257fee7e87dd922b6ed3b3c0fa02438560cb7fa4087f25498eb134bfc8c342a0a928be37f08448dfea2917380a8521ead13954091b1854616012ace91 SHA512 46e89c68545695d1e64aaafdd2ed724b152a41088f1bfa645b8c66d8ae6bcc2d86e9830cd3f16edfb8027aad5786dfb67f2a8371839dd515df8ebe34446716e6
DIST spyder-3.2.8.tar.gz 3414627 BLAKE2B 95f85f719eba20eb9fed5183cfac582b040abc93724df512188d14167a1663c5be9906dfc499feda9f8b0d7a713c093dbf98e4f20f732e0e9669397e1b7c8482 SHA512 03dea90632af510cfc8c4cc684068213a54dac9eef671f04c83663dd40eb480a4b818e2d040efa7a78a0d17044018aa76f2931abbf344eb684094fc7a86ddf5e
+DIST spyder-3.3.0.tar.gz 2782654 BLAKE2B e85ef52109c723d6b1b011f0e81ab3a46d3e0e6ba72fd34a1eda9ed650c9e03532e8fd72e05365367f62035a6f03d6ec32d35314c54438bf639070c7bebfb4d6 SHA512 53a2b438afe245092eda4d202d2453b5b93d6682aafcdb00bf251ddcdb30cee2d81d8adadbe23fa36f64fa5f917b327690cb8f9e2cf5c0da2841b5eda648a26f
diff --git a/dev-python/spyder/files/spyder-3.3.0-build.patch b/dev-python/spyder/files/spyder-3.3.0-build.patch
new file mode 100644
index 000000000000..f6037237e0c0
--- /dev/null
+++ b/dev-python/spyder/files/spyder-3.3.0-build.patch
@@ -0,0 +1,49 @@
+diff -r -U3 spyder-3.3.0.orig/setup.py spyder-3.3.0/setup.py
+--- spyder-3.3.0.orig/setup.py 2018-06-27 11:28:24.000000000 +0700
++++ spyder-3.3.0/setup.py 2018-08-07 23:26:17.609046673 +0700
+@@ -75,12 +75,7 @@
+ def get_data_files():
+ """Return data_files in a platform dependent manner"""
+ if sys.platform.startswith('linux'):
+- if PY3:
+- data_files = [('share/applications', ['scripts/spyder3.desktop']),
+- ('share/icons', ['img_src/spyder3.png']),
+- ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
+- else:
+- data_files = [('share/applications', ['scripts/spyder.desktop']),
++ data_files = [('share/applications', ['scripts/spyder.desktop']),
+ ('share/icons', ['img_src/spyder.png'])]
+ elif os.name == 'nt':
+ data_files = [('scripts', ['img_src/spyder.ico',
+@@ -104,21 +99,6 @@
+
+
+ #==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+- def run(self):
+- install_data.run(self)
+- if sys.platform.startswith('linux'):
+- try:
+- subprocess.call(['update-desktop-database'])
+- except:
+- print("ERROR: unable to update desktop database",
+- file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-#==============================================================================
+ # Main scripts
+ #==============================================================================
+ # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+@@ -178,8 +158,7 @@
+ 'Programming Language :: Python :: 3',
+ 'Development Status :: 5 - Production/Stable',
+ 'Topic :: Scientific/Engineering',
+- 'Topic :: Software Development :: Widget Sets'],
+- cmdclass=CMDCLASS)
++ 'Topic :: Software Development :: Widget Sets'])
+
+
+ #==============================================================================
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index d43cf6ebe126..b6e901261f71 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -10,10 +10,15 @@
Python
- Spyder development environment and its PyQt5-based IDE tools:
- interactive Python shell, Python code editor, workspace
- (dict/list/string/array editor), doc viewer, history log,
- environment variables editor, ...
+ Spyder is a powerful scientific environment written in Python,
+ for Python,and designed by and for scientists, engineers and data analysts.
+ It features a unique combination of the advanced editing, analysis, debugging and profiling functionality
+ of a comprehensive development tool
+ with the data exploration, interactive execution, deep inspection and beautiful visualization capabilities
+ of an analysis package.
+ Furthermore, Spyder offers built-in integration with many popular scientific libraries,
+ including NumPy, SciPy, Pandas, IPython, QtConsole, Matplotlib, SymPy, and more,
+ and can be extended further with full plugin support.