diff --git a/app-admin/consul-template/consul-template-0.16.0.ebuild b/app-admin/consul-template/consul-template-0.16.0.ebuild index ff553accb848..6018d6e751e1 100644 --- a/app-admin/consul-template/consul-template-0.16.0.ebuild +++ b/app-admin/consul-template/consul-template-0.16.0.ebuild @@ -23,8 +23,6 @@ SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz " -STRIP_MASK="*.a" - pkg_setup() { enewgroup ${PN} enewuser ${PN} -1 -1 -1 ${PN} @@ -70,9 +68,6 @@ src_prepare() { src_compile() { export GOPATH=${S} go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die - go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die - # the previous command returns 2 on success... - #[[ -d ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*} ]] || die cd "${S}"/src/${EGO_PN%/*} || die PATH=${PATH}:${S}/bin \ XC_ARCH=$(go env GOARCH) \ @@ -101,19 +96,4 @@ src_install() { keepdir /etc/${PN}.d insinto /etc/${PN}.d doins "${FILESDIR}/"*.json.example - - rm -rf "${S}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/${EGO_PN%/*}/vendor - find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type f -delete || die - - while read -r -d '' x; do - x=${x#${S}/src} - [[ -d ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || - -f ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue - rm -rf "${S}"/src/${x} - done < <(find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type d -print0) - insopts -m0644 -p # preserve timestamps for bug 551486 - insinto $(dirname "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}") - doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*} - insinto $(dirname "$(get_golibdir)/src/${EGO_PN%/*}") - doins -r "${S}"/src/${EGO_PN%/*} } diff --git a/app-admin/consul/consul-0.6.4.ebuild b/app-admin/consul/consul-0.6.4.ebuild index 760b1a094971..f6b67844446f 100644 --- a/app-admin/consul/consul-0.6.4.ebuild +++ b/app-admin/consul/consul-0.6.4.ebuild @@ -155,7 +155,6 @@ src_install() { keepdir /etc/consul.d insinto /etc/consul.d doins "${FILESDIR}/"*.json.example - rm "${ED}etc/consul.d/ui-dir.json.example" || die for x in /var/{lib,log}/${PN}; do keepdir "${x}" diff --git a/app-admin/consul/consul-0.7.0.ebuild b/app-admin/consul/consul-0.7.0.ebuild index 4e65738708ef..2e69bb94f5fc 100644 --- a/app-admin/consul/consul-0.7.0.ebuild +++ b/app-admin/consul/consul-0.7.0.ebuild @@ -28,8 +28,6 @@ DEPEND=" >=dev-go/go-tools-0_pre20160121" RDEPEND="" -STRIP_MASK="*.a" - S="${WORKDIR}/src/${GO_PN}" pkg_setup() { @@ -82,7 +80,6 @@ src_prepare() { src_compile() { export GOPATH="${WORKDIR}" go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die - go install -v -work -x ${EGO_BUILD_FLAGS} "${GO_PN}/..." || die PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake } @@ -90,12 +87,10 @@ src_install() { local x dobin "${WORKDIR}/bin/${PN}" - rm -rf bin || die keepdir /etc/consul.d insinto /etc/consul.d doins "${FILESDIR}/"*.json.example - rm "${ED}etc/consul.d/ui-dir.json.example" || die for x in /var/{lib,log}/${PN}; do keepdir "${x}" @@ -107,19 +102,4 @@ src_install() { insinto /etc/logrotate.d newins "${FILESDIR}/${PN}.logrotated" "${PN}" systemd_dounit "${FILESDIR}/consul.service" - - find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type f -delete || die - rm -rf "${WORKDIR}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/${GO_PN}/vendor - - while read -r -d '' x; do - x=${x#${WORKDIR}/src} - [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || - -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue - rm -rf "${WORKDIR}"/src/${x} - done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0) - insopts -m0644 -p # preserve timestamps for bug 551486 - insinto "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" - doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN} - insinto "$(get_golibdir)/src/${GO_PN%/*}" - doins -r "${WORKDIR}"/src/${GO_PN} } diff --git a/app-admin/consul/files/ui-dir.json.example b/app-admin/consul/files/ui-dir.json.example deleted file mode 100644 index e5cf7464b123..000000000000 --- a/app-admin/consul/files/ui-dir.json.example +++ /dev/null @@ -1,3 +0,0 @@ -{ - "ui_dir": "/var/lib/consul/ui" -} diff --git a/app-admin/vault/vault-0.6.2.ebuild b/app-admin/vault/vault-0.6.2.ebuild index f16d491d94e0..48720ff886a2 100644 --- a/app-admin/vault/vault-0.6.2.ebuild +++ b/app-admin/vault/vault-0.6.2.ebuild @@ -23,8 +23,6 @@ RESTRICT="test" DEPEND=">=dev-lang/go-1.6:=" RDEPEND="" -STRIP_MASK="*.a" - FILECAPS=( -m 755 'cap_ipc_lock=+ep' usr/bin/${PN} ) @@ -74,9 +72,6 @@ pkg_setup() { src_compile() { export GOPATH=${S} go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die - go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" - # the previous command returns 2 on success... - [[ -d ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*} ]] || die cd "${S}"/src/${EGO_PN%/*} || die PATH=${PATH}:${S}/bin \ XC_ARCH=$(go env GOARCH) \ @@ -86,8 +81,6 @@ src_compile() { } src_install() { - local x - dodoc "${S}"/src/${EGO_PN%/*}/{CHANGELOG.md,CONTRIBUTING.md,README.md} newinitd "${FILESDIR}/${PN}.initd" "${PN}" newconfd "${FILESDIR}/${PN}.confd" "${PN}" @@ -103,19 +96,4 @@ src_install() { fowners ${PN}:${PN} /var/log/${PN} dobin "${S}/bin/${PN}" - - rm -rf "${S}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/${EGO_PN%/*}/vendor - find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type f -delete || die - - while read -r -d '' x; do - x=${x#${S}/src} - [[ -d ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} || - -f ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue - rm -rf "${S}"/src/${x} - done < <(find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type d -print0) - insopts -m0644 -p # preserve timestamps for bug 551486 - insinto $(dirname "$(get_golibdir)/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}") - doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*} - insinto $(dirname "$(get_golibdir)/src/${EGO_PN%/*}") - doins -r "${S}"/src/${EGO_PN%/*} } diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml index f1b97ec1576c..47e2f49fc730 100644 --- a/app-arch/rar/metadata.xml +++ b/app-arch/rar/metadata.xml @@ -1,15 +1,6 @@ - - elizabeth@interlinked.me - Elizabeth Myers - Proxied maintainer; set to assignee in all bugs - - - proxy-maint@gentoo.org - Proxy Maintainers - Install all SFX (Self-Extracting) files rather than just the native diff --git a/app-arch/rar/rar-5.2.1.ebuild b/app-arch/rar/rar-5.2.1.ebuild index 1010e1183bb5..414cef2e50e9 100644 --- a/app-arch/rar/rar-5.2.1.ebuild +++ b/app-arch/rar/rar-5.2.1.ebuild @@ -1,6 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ + EAPI=4 MY_PV="${PV/0_beta/b}" DESCRIPTION="RAR compressor/uncompressor" @@ -16,10 +17,11 @@ SRC_URI="x86? ( ${URI_x86} ) ${URI_w64} )" -LICENSE="RAR" +LICENSE="RAR BSD BSD-2" SLOT="0" KEYWORDS="-* amd64 x86" IUSE="all_sfx static" +RESTRICT="mirror bindist" DEPEND="all_sfx? ( app-arch/unrar )" RDEPEND="sys-libs/glibc" diff --git a/app-arch/rar/rar-5.3.0.ebuild b/app-arch/rar/rar-5.3.0.ebuild index 6e7d95d2603f..1605ce5ab119 100644 --- a/app-arch/rar/rar-5.3.0.ebuild +++ b/app-arch/rar/rar-5.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,10 +17,11 @@ SRC_URI="x86? ( ${URI_x86} ) ${URI_w64} )" -LICENSE="RAR" +LICENSE="RAR BSD BSD-2" SLOT="0" KEYWORDS="-* amd64 x86" IUSE="all_sfx static" +RESTRICT="mirror bindist" DEPEND="all_sfx? ( app-arch/unrar )" RDEPEND="sys-libs/glibc" diff --git a/app-dicts/myspell-en/metadata.xml b/app-dicts/myspell-en/metadata.xml index 32ca36b73768..097975e3adc2 100644 --- a/app-dicts/myspell-en/metadata.xml +++ b/app-dicts/myspell-en/metadata.xml @@ -1,13 +1,4 @@ - - elizabeth@interlinked.me - Elizabeth Myers - Proxied maintainer; set to assignee in all bugs - - - proxy-maint@gentoo.org - Proxy Maintainers - diff --git a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild index b75b17428172..5674b751de3a 100644 --- a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild @@ -51,7 +51,7 @@ if ${PRECOMPILED} ; then SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" else SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz + https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" fi diff --git a/app-misc/ca-certificates/ca-certificates-20160104.3.23.ebuild b/app-misc/ca-certificates/ca-certificates-20160104.3.23.ebuild index 55d20a1adf7f..5284a997f67b 100644 --- a/app-misc/ca-certificates/ca-certificates-20160104.3.23.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20160104.3.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -51,7 +51,7 @@ if ${PRECOMPILED} ; then SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" else SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz + https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" fi diff --git a/app-misc/ca-certificates/ca-certificates-20160104.3.27.1-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20160104.3.27.1-r1.ebuild new file mode 100644 index 000000000000..93d3a8f0095e --- /dev/null +++ b/app-misc/ca-certificates/ca-certificates-20160104.3.27.1-r1.ebuild @@ -0,0 +1,179 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# The Debian ca-certificates package merely takes the CA database as it exists +# in the nss package and repackages it for use by openssl. +# +# The issue with using the compiled debs directly is two fold: +# - they do not update frequently enough for us to rely on them +# - they pull the CA database from nss tip of tree rather than the release +# +# So we take the Debian source tools and combine them with the latest nss +# release to produce (largely) the same end result. The difference is that +# now we know our cert database is kept in sync with nss and, if need be, +# can be sync with nss tip of tree more frequently to respond to bugs. + +# When triaging bugs from users, here's some handy tips: +# - To see what cert is hitting errors, use openssl: +# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME +# Focus on the errors written to stderr. +# +# - Look at the upstream log as to why certs were added/removed: +# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt +# +# - If people want to add/remove certs, tell them to file w/mozilla: +# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk + +EAPI="5" +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) + +inherit eutils python-any-r1 + +if [[ ${PV} == *.* ]] ; then + # Compile from source ourselves. + PRECOMPILED=false + inherit versionator + + DEB_VER=$(get_version_component_range 1) + NSS_VER=$(get_version_component_range 2-) + RTM_NAME="NSS_${NSS_VER//./_}_RTM" +else + # Debian precompiled version. + PRECOMPILED=true + inherit unpacker +fi + +DESCRIPTION="Common CA Certificates PEM files" +HOMEPAGE="http://packages.debian.org/sid/ca-certificates" +NMU_PR="" +if ${PRECOMPILED} ; then + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" +else + SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz + https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz + cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" +fi + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" +${PRECOMPILED} || IUSE+=" cacert" + +DEPEND="" +if ${PRECOMPILED} ; then + DEPEND+=" !/dev/null + epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch + popd >/dev/null + fi + fi + + epatch "${FILESDIR}"/${PN}-20150426-root.patch + local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') + sed -i \ + -e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \ + -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ + usr/sbin/update-ca-certificates || die +} + +src_compile() { + cd "image/${EPREFIX}" || die + if ! ${PRECOMPILED} ; then + python_setup + local d="${S}/${PN}/mozilla" c="usr/share/${PN}" + # Grab the database from the nss sources. + cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die + emake -C "${d}" + + # Now move the files to the same places that the precompiled would. + mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla + if use cacert ; then + mkdir -p "${c}"/cacert.org + mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die + fi + mv "${d}"/*.crt "${c}"/mozilla/ || die + else + mv usr/share/doc/{ca-certificates,${PF}} || die + fi + + # Remove untrusted certs from StartCom and WoSign (bug #598072) + rm "${c}"/mozilla/StartCom* || die + rm "${c}"/mozilla/WoSign* || die + + ( + echo "# Automatically generated by ${CATEGORY}/${PF}" + echo "# $(date -u)" + echo "# Do not edit." + cd "${c}" + find * -name '*.crt' | LC_ALL=C sort + ) > etc/ca-certificates.conf + + sh usr/sbin/update-ca-certificates --root "${S}/image" || die +} + +src_install() { + cp -pPR image/* "${D}"/ || die + if ! ${PRECOMPILED} ; then + cd ca-certificates + doman sbin/*.8 + dodoc debian/README.* examples/ca-certificates-local/README + fi + + echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates + doenvd 98ca-certificates +} + +pkg_postinst() { + if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then + # if the user has local certs, we need to rebuild again + # to include their stuff in the db. + # However it's too overzealous when the user has custom certs in place. + # --fresh is to clean up dangling symlinks + "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" + fi + + if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then + ewarn "Removing the following broken symlinks:" + ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" + fi +} diff --git a/app-misc/ca-certificates/ca-certificates-20160104.3.27.1.ebuild b/app-misc/ca-certificates/ca-certificates-20160104.3.27.1.ebuild index a67d454cfa79..501429ca4dfc 100644 --- a/app-misc/ca-certificates/ca-certificates-20160104.3.27.1.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20160104.3.27.1.ebuild @@ -51,7 +51,7 @@ if ${PRECOMPILED} ; then SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" else SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz + https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" fi diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml index 32ca36b73768..097975e3adc2 100644 --- a/app-text/aspell/metadata.xml +++ b/app-text/aspell/metadata.xml @@ -1,13 +1,4 @@ - - elizabeth@interlinked.me - Elizabeth Myers - Proxied maintainer; set to assignee in all bugs - - - proxy-maint@gentoo.org - Proxy Maintainers - diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml index 9ffc5a6895c1..66fcbb8aeb34 100644 --- a/app-text/hunspell/metadata.xml +++ b/app-text/hunspell/metadata.xml @@ -1,15 +1,6 @@ - - elizabeth@interlinked.me - Elizabeth Myers - Proxied maintainer; set to assignee in all bugs - - - proxy-maint@gentoo.org - Proxy Maintainers - hunspell diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest index a3e18373c589..6c7e79775436 100644 --- a/app-text/languagetool/Manifest +++ b/app-text/languagetool/Manifest @@ -1 +1,2 @@ DIST LanguageTool-3.4.zip 95764120 SHA256 ff36380c5807c5bdc67d222c5f2adeeb0a047a02661885c29cd8297443846c9c SHA512 450c5faa98b61cd2ed132f1e3ff592914e0abd58ed02d9c372fb9ef57d566d32d7bbb3a3ecf6a3d26248379bbecd35934e4ae0e33bb5ae821eaa0eb17d6e07e2 WHIRLPOOL 9f44486917581ed723f61d5d8af7100c4ab679a7ca36362b2426f04575bf90966e2a5b6de15b28cbec517bae5f1d6ae1ec18c6c9b0643880130da03e838dc09d +DIST LanguageTool-3.5.zip 93540212 SHA256 643029da89041ccfb48772deaf0dd0e16942de2d381c5dc8ae9372f1b043bcab SHA512 ad49dd292ca6841e1ef439b2dbe55748f621333b418bd6a596534cd5b2cb7019170c98046c8e2c68c3d75a9e5d132cf329de6481eaaccb8f78aae2233bdb8e45 WHIRLPOOL d518d0eaee5447115f09dfac0071462d9a2c51e3327da7f9500a251571fb9186920f9c68eb008f151bc8db173ad22a4068b4953165d1219f05e6857fe8554369 diff --git a/app-text/languagetool/languagetool-3.5.ebuild b/app-text/languagetool/languagetool-3.5.ebuild new file mode 100644 index 000000000000..06b03fe708d7 --- /dev/null +++ b/app-text/languagetool/languagetool-3.5.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit java-pkg-2 + +MY_PN=LanguageTool +MY_P=${MY_PN}-${PV} + +DESCRIPTION="a proof-reading tool for many languages" +HOMEPAGE="http://www.languagetool.org/" +SRC_URI="http://www.languagetool.org/download/${MY_P}.zip" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-1.8 + dev-java/commons-cli:1 + dev-java/commons-io:1 + dev-java/commons-lang:2.1 + dev-java/commons-logging:0 + dev-java/guava:18 + dev-java/hamcrest-core:1.3 + dev-java/jna:0 + dev-java/jcommander:0 + dev-java/slf4j-api:0 + dev-java/slf4j-nop:0 +" +DEPEND="${RDEPEND} + app-arch/unzip" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + java-pkg-2_src_prepare + default +} + +src_compile() { :; } + +src_install() { + insinto /usr/share/${PN} + doins *.jar + doins -r org META-INF + + cat >>"${T}/${PN}" <<-EOF + #!/bin/sh + cd "${EROOT}usr/share/${PN}" + java -jar ${PN}-commandline.jar \$@ + EOF + + cat >>"${T}/${PN}-gui" <<-EOF + #!/bin/sh + cd "${EROOT}usr/share/${PN}" + java -jar ${PN}.jar \$@ + EOF + exeinto /usr/bin + doexe "${T}"/${PN} "${T}"/${PN}-gui + + dodoc CHANGES.md README.md + + pushd libs >/dev/null || die + rm {commons-io,commons-lang,commons-logging,jcommander,jna,junit}.jar || die + java-pkg_jarinto /usr/share/${PN}/libs + java-pkg_jar-from commons-io-1 commons-io.jar + java-pkg_jar-from commons-lang-2.1 commons-lang.jar + java-pkg_jar-from commons-logging commons-logging.jar + java-pkg_jar-from commons-cli-1 commons-cli.jar + java-pkg_jar-from guava-18 guava.jar + java-pkg_jar-from hamcrest-core-1.3 hamcrest-core.jar + java-pkg_jar-from jcommander jcommander.jar + java-pkg_jar-from jna jna.jar + java-pkg_jar-from slf4j-api slf4j-api.jar + java-pkg_jar-from slf4j-nop slf4j-nop.jar + java-pkg_dojar *.jar + popd >/dev/null || die +} diff --git a/app-vim/languagetool/Manifest b/app-vim/languagetool/Manifest index 51de5d0b16b0..d2dfc1e7bd8a 100644 --- a/app-vim/languagetool/Manifest +++ b/app-vim/languagetool/Manifest @@ -1 +1,2 @@ DIST languagetool-1.29.tar.bz2 8059 SHA256 92fd4bf94c65828f1c309da5257336a2287c07cae7ab6a4709ae1b79dcbbbcca SHA512 09b5bdc1d3590afe26578f687064a7a62493a11fafca903759dc1e9048cb22a04c6352127b13e4a63acb867d73d943b56fcae7f733350626f05b66a6d1f1626d WHIRLPOOL d5c8d411b465fdad629493e834d154e7e3a25898b20bc009c4ff9977593ab46ca6e0f6f57ae7933da08b9f7283ebc793106a4eb31a17d670050a94f27a2f2af5 +DIST languagetool-1.30.tar.bz2 8089 SHA256 b99b27e06a43e5ea0c1a3d3e02dcef9b8339c55bd725782fd0ea4cd1efc0592d SHA512 c04115752f8a601e85b718ea8d68cbdaa7628d14c252b4bb5bd11449ae2c5558ddee3d0f3a1bc2db84364e127fc211a0c4fe51e4ff9b442ebe99aa4f9d1db935 WHIRLPOOL b65931b68dd4a47f8ba77cfb4e9a08c58686495a6d095cddff7acc51c76969ec60c51f207bee73b5614fddbea95d35152c334df29f6f956d39c57335636a8fe8 diff --git a/app-vim/languagetool/languagetool-1.30.ebuild b/app-vim/languagetool/languagetool-1.30.ebuild new file mode 100644 index 000000000000..16017609ba22 --- /dev/null +++ b/app-vim/languagetool/languagetool-1.30.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit vim-plugin + +MY_PN=LanguageTool +DESCRIPTION="grammar checker for various languages" +HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3223" +LICENSE="vim" +KEYWORDS="~amd64 ~x86" + +VIM_PLUGIN_HELPFILES="${MY_PN}" + +RDEPEND="app-text/languagetool" + +PATCHES=( "${FILESDIR}"/${PN}-1.29-script.patch ) diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest index 3b5f7cf4559c..b4e824a95739 100644 --- a/dev-lang/mono/Manifest +++ b/dev-lang/mono/Manifest @@ -1,3 +1,3 @@ DIST mono-2.10.9.tar.bz2 34038017 SHA256 541038cd4edd4a1c485638d49697d45015ef7483bcb21bb6165e4d7eb770c9a5 SHA512 426881873e7f9aaf01e1306bed7b3ac220082ca40dce91fa4f4f331944e8d91453b3cdcc4918882ab039ed694ae8819eeb787edf6a2ad42cc661614076725c01 WHIRLPOOL 93f54fbbf032fb60467fd4317630588d349c3dfb50158bad478bd3e2650fd3e8f12d45be372873b57626d4ac48f798646c3650590bbf731dc2f005ee618b8548 DIST mono-4.4.1.0.tar.bz2 85897587 SHA256 165e7686b5cbb1ab671b4cb2069207999c3d70044002190b6ec84bb1fdf62b4a SHA512 d9b6c57c2d9327ea551083b81a2e6cc222ded9a04862056b0dfded1c5df56efbfc4960097df034595012231fe50d172174ab7b3e3f2d8c4c6953ab2106b1cb6a WHIRLPOOL 99f16622c6d1902a7efff41d55d114ed214979c1d902a5dcbc257c180a1e68ed519beb5383db2358096e3f8425483983565c8f438552de36ffabe4bfad3f5fbd -DIST mono-4.6.1.3.tar.bz2 83229465 SHA256 a5d4cec3d4676fcd7bcbc59b5ab12dc9a2481abbd10017a2ed737098a6b2e891 SHA512 b059fb00adbddf676d137c53a22cabdb86cedb829a25c1ed2d5b78bbd4bc38a0d3ec2cbc56cec91578e2e74478770cac147ac2b740531751585d6ed0bbc50e3b WHIRLPOOL ed080322b83549679c9b6fe8bac501df7390690508c32b97be47c1b0e3e020ba117aaad08250255409b0266b7270860acdf969d2342add1a918b38a635da1046 +DIST mono-4.6.1.5.tar.bz2 83174665 SHA256 3871ee72bdfc2ea5d636ffff22cf49ae6bac7c4a4f3d687214dd8ac236bbf7c3 SHA512 1d0c1ec2930ecea3faf1be572bc045300ef4a90d3fe7519f2a9c797be79298c61528d83baa5a24a57143a35be80f78297196556c33cd0f345d9907a973fe625a WHIRLPOOL 9ccfdfa68f2d9a75440c71fb22af988165608299d7aaeecac77fc783412cba4524a423b166a540d2381c98c58e3f7e40ada91381d45f67693e1f69e462bbb1d9 diff --git a/dev-lang/mono/mono-4.6.1.3.ebuild b/dev-lang/mono/mono-4.6.1.5.ebuild similarity index 100% rename from dev-lang/mono/mono-4.6.1.3.ebuild rename to dev-lang/mono/mono-4.6.1.5.ebuild diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index e0096e9b33cd..5ada768e5b95 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -2,3 +2,4 @@ DIST php-5.5.37.tar.bz2 13699851 SHA256 d2380ebe46caf17f2c4cd055867d00a82e6702dc DIST php-5.5.38.tar.xz 11077780 SHA256 cb527c44b48343c8557fe2446464ff1d4695155a95601083e5d1f175df95580f SHA512 c2cdb18b2c9edaeff66591e8f58f8ff488260f537cdf9ce09820c163f20ff5209c0def89343d429932c9506ad4ef3daacf224946dac1c59622501092483f30c6 WHIRLPOOL 4380c1daa39f04f90d1457152e366720b295e96aba6859625c6b375a3785b4e0f30fea590c1ee1edb439c2a405446526c702a003d68ea6c817ab8684068a7581 DIST php-5.6.26.tar.xz 12412992 SHA256 203a854f0f243cb2810d1c832bc871ff133eccdf1ff69d32846f93bc1bef58a8 SHA512 06ef6990c1ab6ef3c94157b72039ddbc40a8373b8f38c88ec4dfa771fcd422a0673ff5f6cbf3cf67a0fb10bedd8b9fa85aa95e08abb0d74163a90a322a1d8c24 WHIRLPOOL 11b183089a43bfad1ee787bd2512faf8d4611916cdfe348fb8ba3a2c2d35d560dcd38656e3a5b3ee98efb649e9f7ab219a89da7a72c163270760ad44a64bba09 DIST php-7.0.11.tar.xz 12258500 SHA256 d4cccea8da1d27c11b89386f8b8e95692ad3356610d571253d00ca67d524c735 SHA512 4d7df513a61489ecb1c3a963fbb76ad8e15b88fa134f52295a5339c900f7b2f98e547a3e479b8061dd4ff3c5f90cd62e3c39ec208d7de03b6146501e60500d5e WHIRLPOOL d9867f282df9a86efecb77c44f22a403598dc950b8ae2343000517fdb69890073bd78fbe7d1ee26be41459aefb3336a6508d6dd75b915859533e124b21b4e453 +DIST php-7.0.12.tar.xz 12520004 SHA256 f3d6c49e1c242e5995dec15e503fde996c327eb86cd7ec45c690e93c971b83ff SHA512 0bb29da6c70ee7e0a8e23d2027be31498d521dda834f55da59e35767b169226612d4e30fb141c7354b1597e3814ce52a476d928ccd098ab246b391b7e982630d WHIRLPOOL 3b6e95532d2c128980d9e8da6a34e99491d7f3b9e12a68138362253d3e0b78dc0a85c5c563ab6c03c72425ec7a86bf92042ee4ffeb1935608b3d1816f68d1ee9 diff --git a/dev-lang/php/php-7.0.12.ebuild b/dev-lang/php/php-7.0.12.ebuild new file mode 100644 index 000000000000..e6c002c8a12e --- /dev/null +++ b/dev-lang/php/php-7.0.12.ebuild @@ -0,0 +1,765 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools flag-o-matic versionator libtool systemd + +DESCRIPTION="The PHP language runtime engine" +HOMEPAGE="http://php.net/" +SRC_URI="http://php.net/distributions/${P}.tar.xz" + +LICENSE="PHP-3.01 + BSD + Zend-2.0 + bcmath? ( LGPL-2.1+ ) + fpm? ( BSD-2 ) + gd? ( gd ) + unicode? ( BSD-2 LGPL-2.1 )" + +SLOT="$(get_version_component_range 1-2)" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2 phpdbg" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl debug + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl + mhash mssql mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sysvipc systemd tidy +tokenizer truetype unicode wddx webp + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +# The supported (that is, autodetected) versions of BDB are listed in +# the ./configure script. Other versions *work*, but we need to stick to +# the ones that can be detected to avoid a repeat of bug #564824. +COMMON_DEPEND=" + >=app-eselect/eselect-php-0.9.1[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] + =dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( dev-libs/gmp:0 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0= ) + recode? ( app-text/recode ) + sharedmem? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + webp? ( media-libs/libwebp ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib + ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib ) +" + +RDEPEND="${COMMON_DEPEND} + virtual/mta + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +DEPEND="${COMMON_DEPEND} + app-arch/xz-utils + >=sys-devel/bison-3.0.1 + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" + +# Without USE=readline or libedit, the interactive "php -a" CLI will hang. +REQUIRED_USE=" + cli? ( ^^ ( readline libedit ) ) + truetype? ( gd ) + webp? ( gd ) + cjk? ( gd ) + exif? ( gd ) + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysqli ) + sharedmem? ( !threads ) + mysql? ( || ( mysqli pdo ) ) + || ( cli cgi fpm apache2 embed phpdbg )" + +PHP_MV="$(get_major_version)" + +# Allow users to install production version if they want to +if [[ "${PHP_INI_VERSION}" == "production" ]]; then + PHP_INI_UPSTREAM="php.ini-production" +else + PHP_INI_UPSTREAM="php.ini-development" +fi + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" || die + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" || die + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" php.ini + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \ + "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" \ + "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + if [[ "${sapi}" == "fpm" ]] ; then + einfo "Installing FPM config files php-fpm.conf and www.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + doins sapi/fpm/php-fpm.conf + insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d" + doins sapi/fpm/www.conf + fi + + dodoc php.ini-development + dodoc php.ini-production +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + eapply_user + + # Force rebuilding aclocal.m4 + rm -f aclocal.m4 || die "failed to remove aclocal.m4 in src_prepare" + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi + + # In php-7.x, the FPM pool configuration files have been split off + # of the main config. By default the pool config files go in + # e.g. /etc/php-fpm.d, which isn't slotted. So here we move the + # include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later + # we'll install the pool configuration file "www.conf" there. + php_set_ini_dir fpm + sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \ + sapi/fpm/php-fpm.conf.in \ + || die 'failed to move the include directory in php-fpm.conf' +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # The php-fpm config file wants localstatedir to be ${EPREFIX}/var + # and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002. + local our_conf=( + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}/man" + --infodir="${PHP_DESTDIR}/info" + --libdir="${PHP_DESTDIR}/lib" + --with-libdir="$(get_libdir)" + --localstatedir="${EPREFIX}/var" + --without-pear + $(use_enable threads maintainer-zts) + ) + + our_conf+=( + $(use_enable bcmath bcmath) + $(use_with bzip2 bz2 "${EPREFIX}/usr") + $(use_enable calendar calendar) + $(use_enable ctype ctype) + $(use_with curl curl "${EPREFIX}/usr") + $(use_enable xml dom) + $(use_with enchant enchant "${EPREFIX}/usr") + $(use_enable exif exif) + $(use_enable fileinfo fileinfo) + $(use_enable filter filter) + $(use_enable ftp ftp) + $(use_with nls gettext "${EPREFIX}/usr") + $(use_with gmp gmp "${EPREFIX}/usr") + $(use_enable hash hash) + $(use_with mhash mhash "${EPREFIX}/usr") + $(use_with iconv iconv \ + $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}/usr")) + $(use_enable intl intl) + $(use_enable ipv6 ipv6) + $(use_enable json json) + $(use_with kerberos kerberos "${EPREFIX}/usr") + $(use_enable xml libxml) + $(use_with xml libxml-dir "${EPREFIX}/usr") + $(use_enable unicode mbstring) + $(use_with crypt mcrypt "${EPREFIX}/usr") + $(use_with unicode onig "${EPREFIX}/usr") + $(use_with ssl openssl "${EPREFIX}/usr") + $(use_with ssl openssl-dir "${EPREFIX}/usr") + $(use_enable pcntl pcntl) + $(use_enable phar phar) + $(use_enable pdo pdo) + $(use_enable opcache opcache) + $(use_with postgres pgsql "${EPREFIX}/usr") + $(use_enable posix posix) + $(use_with spell pspell "${EPREFIX}/usr") + $(use_with recode recode "${EPREFIX}/usr") + $(use_enable simplexml simplexml) + $(use_enable sharedmem shmop) + $(use_with snmp snmp "${EPREFIX}/usr") + $(use_enable soap soap) + $(use_enable sockets sockets) + $(use_with sqlite sqlite3 "${EPREFIX}/usr") + $(use_enable sysvipc sysvmsg) + $(use_enable sysvipc sysvsem) + $(use_enable sysvipc sysvshm) + $(use_with systemd fpm-systemd) + $(use_with tidy tidy "${EPREFIX}/usr") + $(use_enable tokenizer tokenizer) + $(use_enable wddx wddx) + $(use_enable xml xml) + $(use_enable xmlreader xmlreader) + $(use_enable xmlwriter xmlwriter) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}/usr") + $(use_enable zip zip) + $(use_with zlib zlib "${EPREFIX}/usr") + $(use_enable debug debug) + ) + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm ; then + our_conf+=( "--enable-dba${shared}" ) + fi + + # DBA drivers support + our_conf+=( + $(use_with cdb cdb) + $(use_with berkdb db4 "${EPREFIX}/usr") + $(use_enable flatfile flatfile) + $(use_with gdbm gdbm "${EPREFIX}/usr") + $(use_enable inifile inifile) + $(use_with qdbm qdbm "${EPREFIX}/usr") + ) + + # Support for the GD graphics library + our_conf+=( + $(use_with truetype freetype-dir "${EPREFIX}/usr") + $(use_enable cjk gd-jis-conv) + $(use_with gd jpeg-dir "${EPREFIX}/usr") + $(use_with gd png-dir "${EPREFIX}/usr") + $(use_with xpm xpm-dir "${EPREFIX}/usr") + ) + if use webp; then + our_conf+=( --with-webp-dir="${EPREFIX}/usr" ) + fi + # enable gd last, so configure can pick up the previous settings + our_conf+=( $(use_with gd gd) ) + + # IMAP support + if use imap ; then + our_conf+=( + $(use_with imap imap "${EPREFIX}/usr") + $(use_with ssl imap-ssl "${EPREFIX}/usr") + ) + fi + + # Interbase/firebird support + our_conf+=( $(use_with firebird interbase "${EPREFIX}/usr") ) + + # LDAP support + if use ldap ; then + our_conf+=( + $(use_with ldap ldap "${EPREFIX}/usr") + $(use_with ldap-sasl ldap-sasl "${EPREFIX}/usr") + ) + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") ) + + local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock" + if use mysql || use mysqli ; then + our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") ) + fi + + # ODBC support + our_conf+=( + $(use_with odbc unixODBC "${EPREFIX}/usr") + $(use_with iodbc iodbc "${EPREFIX}/usr") + ) + + # Oracle support + our_conf+=( $(use_with oci8-instant-client oci8) ) + + # PDO support + if use pdo ; then + our_conf+=( + $(use_with mssql pdo-dblib "${EPREFIX}/usr") + $(use_with mysql pdo-mysql "${mysqllib}") + $(use_with postgres pdo-pgsql) + $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") + $(use_with firebird pdo-firebird "${EPREFIX}/usr") + $(use_with odbc pdo-odbc "unixODBC,${EPREFIX}/usr") + $(use_with oci8-instant-client pdo-oci) + ) + fi + + # readline/libedit support + our_conf+=( + $(use_with readline readline "${EPREFIX}/usr") + $(use_with libedit libedit "${EPREFIX}/usr") + ) + + # Session support + if use session ; then + our_conf+=( $(use_with sharedmem mm "${EPREFIX}/usr") ) + else + our_conf+=( $(use_enable session session) ) + fi + + # Use pic for shared modules such as apache2's mod_php + our_conf+=( --with-pic ) + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + our_conf+=( + --with-pcre-regex="${EPREFIX}/usr" + --with-pcre-dir="${EPREFIX}/usr" + ) + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Support user-passed configuration parameters + our_conf+=( ${EXTRA_ECONF:-} ) + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" || die + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + # The BUILD_DIR variable is used to determine where to output + # the files that autotools creates. This was all originally + # based on the autotools-utils eclass. + BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}" + cp -a "${S}" "${BUILD_DIR}" || die + cd "${BUILD_DIR}" || die + + local sapi_conf=( + --with-config-file-path="${PHP_INI_DIR}" + --with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}" + ) + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm|phpdbg) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( "--enable-${sapi}" ) + else + sapi_conf+=( "--disable-${sapi}" ) + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" ) + else + sapi_conf+=( --without-apxs2 ) + fi + ;; + esac + done + + # Construct the $myeconfargs array by concatenating $our_conf + # (the common args) and $sapi_conf (the SAPI-specific args). + local myeconfargs=( "${our_conf[@]}" ) + myeconfargs+=( "${sapi_conf[@]}" ) + + pushd "${BUILD_DIR}" > /dev/null || die + econf "${myeconfargs[@]}" + popd > /dev/null || die + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || \ + die "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" || die + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir "/usr/share/php${PHP_MV}" + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" || die + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp${PHP_MV}$(get_libname)" \ + "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + phpdbg) + source="sapi/phpdbg/phpdbg" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" + else + dobin "${source}" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use opcache ; then + into "${PHP_DESTDIR#${EPREFIX}}" + dolib.so "modules/opcache$(get_libname)" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" \ + "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \ + "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d \ + "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \ + "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null || die + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + elog + elog "To enable PHP in apache, you will need to add \"-D PHP\" to" + elog "your apache2 command. OpenRC users can append that string to" + elog "APACHE2_OPTS in /etc/conf.d/apache2." + elog + elog "The apache module configuration file 70_mod_php.conf is" + elog "provided (and maintained) by eselect-php." + elog + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} || die + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + # Remove dead symlinks for SAPIs that were just disabled. For + # example, if the user has the cgi SAPI enabled, then he has an + # eselect-php symlink for it. If he later reinstalls PHP with + # USE="-cgi", that symlink will break. This call to eselect is + # supposed to remove that dead link per bug 572436. + eselect php cleanup || die + + if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then + elog "To build extensions for this version of PHP, you will need to" + elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable." + elog + fi + + # Only mention PHP_INI_VERSION if the user doesn't have it set. + case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + elog "This ebuild installed a version of php.ini based on" + elog "${PHP_INI_UPSTREAM}. You can choose which version of" + elog "php.ini to install by default by setting PHP_INI_VERSION" + elog "to either 'production' or 'development' in your make.conf." + elog "Both versions of php.ini can be found with the PHP docs in" + elog "${EPREFIX}/usr/share/doc/${PF}" + elog + ;; + esac + + elog "For details on how version slotting works, please see" + elog "the wiki:" + elog + elog " https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_postrm() { + # This serves two purposes. First, if we have just removed the last + # installed version of PHP, then this will remove any dead symlinks + # belonging to eselect-php. Second, if a user upgrades slots from + # (say) 5.6 to 7.0 and depcleans the old slot, then this will update + # his existing symlinks to point to the new 7.0 installation. The + # latter is bug 432962. + # + # Note: the eselect-php package may not be installed at this point, + # so we can't die() if this command fails. + eselect php cleanup +} diff --git a/dev-python/pillow/pillow-3.4.2.ebuild b/dev-python/pillow/pillow-3.4.2.ebuild index f2c10638e063..8545b44162a8 100644 --- a/dev-python/pillow/pillow-3.4.2.ebuild +++ b/dev-python/pillow/pillow-3.4.2.ebuild @@ -88,7 +88,11 @@ python_install() { python_install_all() { use doc && local HTML_DOCS=( docs/_build/html/. ) - use examples && local EXAMPLES=( Scripts/. ) + if use examples ; then + docinto examples + dodoc Scripts/* + docompress -x /usr/share/doc/${PF}/examples + fi distutils-r1_python_install_all } diff --git a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild index 85700a0006c8..2b62b16aff3c 100644 --- a/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild +++ b/dev-python/pyopenssl/pyopenssl-16.2.0.ebuild @@ -52,6 +52,11 @@ python_test() { python_install_all() { use doc && local HTML_DOCS=( doc/_build/html/. ) - use examples && local EXAMPLES=( examples/. ) + if use examples ; then + docinto examples + dodoc -r examples/* + docompress -x /usr/share/doc/${PF}/examples + fi + distutils-r1_python_install_all } diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest index 366e7dbc5c1a..520a37e0bca5 100644 --- a/dev-util/pkgconf/Manifest +++ b/dev-util/pkgconf/Manifest @@ -1,3 +1,4 @@ DIST pkgconf-0.9.11.tar.bz2 86489 SHA256 3bdae1b2672133943dc0dda694ed57074f8b03c3fea10efb215d76d3cabe2c3b SHA512 21313ef29afcaa7c49a8cb512ecd3a821693945c22fb1a670ada74f41bca320e1b9ffb64e79adc2c33cb86822b74ddc850fadb16ddcde7eb805b81a50096992f WHIRLPOOL 7442a456af7e959c86f318ee74ec89883cc4e2ad16c9708f98d8ab30cdcf71ea7ef13f7e0f9bf945717b1dea8a317ffc5322878f88a5084c2dcbdc2aeafaf4d2 DIST pkgconf-0.9.12.tar.bz2 87109 SHA256 7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f SHA512 efe13db7a46992eb44ead493fc12b3fc6a5567e0206f701b6c48d9b5eb0bc90fcc9ae7a7e08ae641bb10df869287e5b68291701d4013d6cf27bd2b1518c29192 WHIRLPOOL 9fa7336e111f29648f5c37310bdeb2266bead1b86ff18183cfb57c06054916d235da20a5723bd364497d20a1f4db399eaf77f38c0bfc1519f2b7b825ab4666d0 DIST pkgconf-1.0.1.tar.gz 362653 SHA256 45ce2f6ab032451345185b800badd77c054040879bd2e56225dafc7fbe583cf1 SHA512 b379ed366327eb4de3a7ed732be58a3757fdcd231637f0fbc2f9b762fda08173244d05fd853d683cfa6bdad90f1d8ee663b3eae9aee024456ef46e8a021e7122 WHIRLPOOL ba9a26874d14b6dfd62858da1b50397bc0aa9637bfe0824d4911f4df1e430e60a9f589242f8dc60a792b16f5201f9e0944d637e0d3a4749a211b976459152d69 +DIST pkgconf-1.0.2.tar.xz 247972 SHA256 a7c67f8603c0d0400be17b2efac0fdc9ff46625f7e50aefe4ad31eff248115dd SHA512 679c9033489076ba5691c3a830b8e300c6cb2dc9e7eeffa1a478c681c7f1cc49896b0b5d0d069b14804a5c9bc31115ba672b1f724cd6282ce26d54945a5a8a42 WHIRLPOOL e7bcb19eba08ff271a470a1c8bba13810951c20e79b7dea5352ea20b8b519d4462892c623e8383b540f5af3b6daf302386b8b1831bfed3d7d143f33cb9e0830a diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml index bd273d83de0f..da933164fba0 100644 --- a/dev-util/pkgconf/metadata.xml +++ b/dev-util/pkgconf/metadata.xml @@ -2,12 +2,8 @@ - elizabeth@interlinked.me - Elizabeth Myers - - - proxy-maint@gentoo.org - Proxy Maintainers + floppym@gentoo.org + Mike Gilbert Install as a replacement for dev-util/pkgconfig diff --git a/dev-util/pkgconf/pkgconf-1.0.2.ebuild b/dev-util/pkgconf/pkgconf-1.0.2.ebuild new file mode 100644 index 000000000000..0a4a2ab274f0 --- /dev/null +++ b/dev-util/pkgconf/pkgconf-1.0.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI=( {https,git}://github.com/pkgconf/${PN}.git ) + inherit autotools git-r3 +else + SRC_URI="https://distfiles.dereferenced.org/pkgconf/${P}.tar.xz + https://github.com/pkgconf/pkgconf/releases/download/${P}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh + ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux + ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +fi + +inherit multilib-minimal + +DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" +HOMEPAGE="https://github.com/pkgconf/pkgconf" + +LICENSE="BSD-1" +SLOT="0" +IUSE="+pkg-config strict" + +DEPEND="" +RDEPEND="${DEPEND} + pkg-config? ( + !dev-util/pkgconfig + !dev-util/pkg-config-lite + !dev-util/pkgconfig-openbsd[pkg-config] + )" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/pkgconf +) + +src_prepare() { + default + + [[ ${PV} == "9999" ]] && eautoreconf + if use pkg-config; then + MULTILIB_CHOST_TOOLS+=( + /usr/bin/pkg-config + ) + fi +} + +multilib_src_configure() { + ECONF_SOURCE=${S} \ + econf $(use_enable strict) +} + +multilib_src_install() { + default + + if use pkg-config; then + dosym pkgconf /usr/bin/pkg-config + else + rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die + fi +} diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild index eff8a40f5340..0a4a2ab274f0 100644 --- a/dev-util/pkgconf/pkgconf-9999.ebuild +++ b/dev-util/pkgconf/pkgconf-9999.ebuild @@ -8,7 +8,8 @@ if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI=( {https,git}://github.com/pkgconf/${PN}.git ) inherit autotools git-r3 else - SRC_URI="https://github.com/pkgconf/pkgconf/releases/download/${P}/${P}.tar.gz" + SRC_URI="https://distfiles.dereferenced.org/pkgconf/${P}.tar.xz + https://github.com/pkgconf/pkgconf/releases/download/${P}/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" diff --git a/dev-vcs/bfg/Manifest b/dev-vcs/bfg/Manifest index de227b9c4fb4..5aa772d278f3 100644 --- a/dev-vcs/bfg/Manifest +++ b/dev-vcs/bfg/Manifest @@ -1,2 +1,3 @@ DIST bfg-1.12.12.jar 14664691 SHA256 03291c9cd9cdc664104f49b22b76bd39edc73052936cbfd72fc8d8595971fd9a SHA512 f3a9d39c764a8d42054ed346a51ac2402814a4a18f2802640e776653a3081800e38e3052ac447fd82f0d1667aa1ca5d6745a2e7b9c7503d3fec7c25d364c8cf3 WHIRLPOOL eca6191885752bf8af5e84a97c31f6c0ad191ea3f49a009e0fd99ea09c69c6c95337bbe82f6b8e5e3220286d25c66b86f1f8ea9e183c51ac56bdaa42d9abb1b2 DIST bfg-1.12.13.jar 14774921 SHA256 fbeb45314d45c7ff26bb513154675a2e1e822282e0d095c6d911fcf68fd089c0 SHA512 a65586b84b10bbbc3ba2058862348010c2513c5f4f5e91dbbdc3392622811aa40e473cc19ad4a7bf4eaa2cd2f9c49b60fdb4e557cb68b2d66afc6c47e34b4484 WHIRLPOOL 920cd40ad66d65087ad12e76893c5e591b41ac0cf99e3fce6acf492d61042c12c078a41824944762f1528a575f6d67ec2973d0d13a137876cf412e18a8a70c9b +DIST bfg-1.12.14.jar 14811487 SHA256 7a44d53ef626a4282c34cc363166e678c5d9e91e4c6815e8e069036edd9fab64 SHA512 ff6bf60a8cba67537f46968c2f24dd91a15c9d533b503396b28bcc0af368d2852228e276d87e44013aba612e24b23d094563fc4d166957aac9ab7349be9f8a26 WHIRLPOOL 2e176efa35eeb61763550748695a1cc789530c42072facb19fd833b54b76ef048f8ee8265ce73173ab7c7af807278961cea5ee9ac30d5cedcf5de9079f7f347e diff --git a/dev-vcs/bfg/bfg-1.12.14.ebuild b/dev-vcs/bfg/bfg-1.12.14.ebuild new file mode 100644 index 000000000000..ad54a9d338cb --- /dev/null +++ b/dev-vcs/bfg/bfg-1.12.14.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit java-pkg-2 + +DESCRIPTION="a faster alternative to git-filter-branch for removing bad data from git repos" +HOMEPAGE="http://rtyley.github.io/bfg-repo-cleaner/" +SRC_URI="http://repo1.maven.org/maven2/com/madgag/${PN}/${PV}/${P}.jar" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-1.6" + +S=${WORKDIR} + +src_prepare() { + default + java-pkg-2_src_prepare +} + +src_unpack() { :; } +src_compile() { :; } + +src_install() { + java-pkg_newjar "${DISTDIR}"/${P}.jar + java-pkg_dolauncher ${PN} +} diff --git a/licenses/RAR b/licenses/RAR index 2096988b6244..82af4af51fd8 100644 --- a/licenses/RAR +++ b/licenses/RAR @@ -1,143 +1,127 @@ - The RAR Archiver - EULA (End User License Agreement) for use and distribution - - - The RAR archiver is distributed as try before you buy. This means: - - 1. All copyrights to RAR are exclusively owned by the author - - Alexander Roshal. - - 2. Anyone may use this software during a test period of 40 days. - Following this test period of 40 days or less, if you wish to - continue to use RAR, you must purchase a license. - - 3. There are 2 basic types of licenses issued for RAR, these are: - - a. A single computer usage license. The user purchases one license - to use RAR archiver on one computer. - - Home users may use their single computer usage license on - all computers which are in property of the license owner. - - Business users require one license per computer RAR is - installed on. - - b. A multiple usage license. The user purchases a number of usage - licenses for use, by the purchaser or the purchaser's employees - on the same number of computers. - - In a network (server/client) environment you must purchase - a license copy for each separate client (workstation) - on which RAR is installed, used, or accessed. A separate - license copy for each client (workstation) is needed regardless - of whether the clients (workstations) will use RAR simultaneously - or at different times. If for example you wish to have - 9 different clients (workstations) in your network with access - to RAR, you must purchase 9 license copies. - - A user who purchased a RAR license, is granted a non-exclusive - right to use RAR on as many computers as defined by the licensing - terms above according to the number of licenses purchased, - for any legal purpose. The licensed RAR software may not be rented - or leased, but may be permanently transferred, in it's entirety, - if the person receiving it agrees to the terms of this license. - If the software is an update, the transfer must include the update - and all previous versions. - - 4. Licensing for RAR on mobile devices (U3 stick, USB stick, - external harddrive): - - In addition to the terms stated above following licensing terms - apply to the licensing of RAR on mobile devices. - - a. A single computer usage license. Home users may use their - single computer usage license on all mobile devices which are - in property of the license owner. - - Business users may use their single computer usage license - on one computer and one mobile device. - - b. A multiple usage license. Users who own a multiple usage - license may use that license on the same number of mobile - devices as number of computers (clients) the license was - purchased for. - - The number of computers/devices running RAR at any time is - limited to the number of licenses purchased according to the - licensing terms above. - - A licensed version of RAR on a mobile device may be used by - the purchaser or the purchaser's employees, on several computers - consecutively. - - There are no additional license fees, apart from the cost of - purchasing a license, associated with the use of RAR from - a mobile device on computers that are not owned by the owner - of the RAR license. - - 5. The RAR/WinRAR unlicensed trial version may be freely distributed, - with exceptions noted below, provided the distribution package is not - modified in any way. - - a. No person or company may distribute separate parts of the package - with the exception of the UnRAR components, without written - permission of the copyright owner. - - b. The RAR/WinRAR unlicensed trial version may not be distributed - inside of any other software package without written permission - of the copyright owner. - - c. Hacks/cracks, keys or key generators may not be included on the - same distribution. - - 6. To buy a license please see order.htm for details. - - 7. THE RAR ARCHIVER IS DISTRIBUTED "AS IS". NO WARRANTY OF ANY - KIND IS EXPRESSED OR IMPLIED. YOU USE AT YOUR OWN RISK. - NEITHER THE AUTHOR NOR THE AGENTS OF THE AUTHOR WILL BE LIABLE - FOR DATA LOSS, DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS - WHILE USING OR MISUSING THIS SOFTWARE. - - 8. There are no additional license fees, apart from the cost of - purchasing a license, associated with the creation and distribution - of RAR archives, volumes, self-extracting archives or self-extracting - volumes. Legally registered owners may use their copies of RAR/WinRAR - to produce archives and self-extracting archives and to distribute - those archives free of any additional RAR royalties. - - 9. You may not use, copy, emulate, clone, rent, lease, sell, modify, - decompile, disassemble, otherwise reverse engineer, or transfer - the licensed program, or any subset of the licensed program, except - as provided for in this agreement. Any such unauthorized use shall - result in immediate and automatic termination of this license and - may result in criminal and/or civil prosecution. - - 7zxa.dll library is copyrighted by Igor Pavlov and distributed - under LGPL Version 3 license ( http://www.gnu.org/licenses/lgpl.html ). - You can modify portions of 7zxa.dll and perform reverse engineering - solely for purpose of debugging such 7zxa.dll modifications according - to LGPL. Source code of 7zxa.dll is available on www.7-zip.org. - - Neither RAR binary code, WinRAR binary code, UnRAR source or UnRAR - binary code may be used or reverse engineered to re-create the RAR - compression algorithm, which is proprietary, without written - permission of the author. - - RAR and WinRAR keyfiles may not be distributed, except as stated - in item 3) above, outside of the area of legal control of the - person or persons who purchased the original license, without - written permission of the copyright holder. - - All rights not expressly granted here are reserved by Alexander Roshal. - - 10. Installing and using RAR/WinRAR signifies acceptance of these terms - and conditions of the license. - - 11. If you do not agree with the terms of this license you must - remove RAR/WinRAR files from your storage devices and cease to - use the product. - - Thank you for using the original RAR. - - Alexander L. Roshal - + END USER LICENSE AGREEMENT + + The following agreement regarding RAR (and its Windows version - WinRAR) + archiver - referred to as "software" - is made between win.rar GmbH - + referred to as "licensor" - and anyone who is installing, accessing + or in any other way using the software - referred to as "user". + + 1. The author and holder of the copyright of the software is + Alexander L. Roshal. The licensor and as such issuer of the license + and bearer of the worldwide exclusive usage rights including the rights + to reproduce, distribute and make the software available to the public + in any form is win.rar GmbH, Marienstr. 12, 10117 Berlin, Germany. + + 2. The software is distributed as try before you buy. This means that + anyone may use the software during a test period of a maximum of 40 days + at no charge. Following this test period, the user must purchase + a license to continue using the software. + + 3. The software's trial version may be freely distributed, with exceptions + noted below, provided the distribution package is not modified in any way. + + a. Nobody may distribute separate parts of the package, with the exception + of the UnRAR components, without written permission. + + b. The software's unlicensed trial version may not be distributed + inside of any other software package without written permission. + The software must remain in the original unmodified installation + file for download without any barrier and conditions to the user + such as collecting fees for the download or making the download + conditional on the user giving his contact data. + + c. The unmodified installation file of WinRAR must be provided pure + and unpaired. Any bundling is interdicted. In particular the use + of any install or download software which is providing any kind + of download bundles is prohibited unless granted by win.rar GmbH + in written form. + + d. Hacks/cracks, keys or key generators may not be included, pointed to + or referred to by the distributor of the trial version. + + e. In case of violation of the precedent conditions the allowance + lapses immediately and automatically. + + 4. The trial version of the software can display a registration reminder + dialog. Depending on the software version and configuration such dialog + can contain either a predefined text and links loaded locally + or a web page loaded from the internet. Such web page can contain + licensing instructions or other materials according to the licensor's + choice, including advertisement. When opening a web page, the software + transfers only those parameters which are technically required + by HTTP protocol to successfully open a web page in a browser. + + 5. The software is distributed "as is". No warranty of any kind is expressed + or implied. You use at your own risk. Neither the author, the licensor + nor the agents of the licensor will be liable for data loss, damages, + loss of profits or any other kind of loss while using or misusing + this software. + + 6. There are 2 basic types of licenses issued for the software. These are: + + a. A single computer usage license. The user purchases one license to + use the software on one computer. + + Home users may use their single computer usage license on all + computers and mobile devices (USB drive, external hard drive, etc.) + which are property of the license owner. + + Business users require one license per computer or mobile device + on which the software is installed. + + b. A multiple usage license. The user purchases a number of usage + licenses for use, by the purchaser or the purchaser's employees + on the same number of computers. + + In a network (server/client) environment the user must purchase + a license copy for each separate client (workstation) on which + the software is installed, used or accessed. A separate license copy + for each client (workstation) is needed regardless of whether + the clients (workstations) will use the software simultaneously + or at different times. If for example you wish to have 9 different + clients (workstations) in your network with access to RAR, + you must purchase 9 license copies. + + A user who purchased a license, is granted a non-exclusive right to use + the software on as many computers as defined by the licensing terms above + according to the number of licenses purchased, for any legal purpose. + + 7. There are no additional license fees, apart from the cost of the license, + associated with the creation and distribution of RAR archives, + volumes, self-extracting archives or self-extracting volumes. + Owners of a license may use their copies of the software to produce + archives and self-extracting archives and to distribute those archives + free of any additional royalties. + + 8. The licensed software may not be rented or leased but may be permanently + transferred, in its entirety, if the recipient agrees to the terms of + this license. + + 9. To buy a license, please read the file order.htm provided with + the software for details. + + 10. You may not use, copy, emulate, clone, rent, lease, sell, modify, + decompile, disassemble, otherwise reverse engineer, or transfer + the licensed software, or any subset of the licensed software, + except as provided for in this agreement. Any such unauthorized use + shall result in immediate and automatic termination of this license + and may result in criminal and/or civil prosecution. + + Neither RAR binary code, WinRAR binary code, UnRAR source + or UnRAR binary code may be used or reverse engineered to re-create + the RAR compression algorithm, which is proprietary, without written + permission. + + The software may be using components developed and/or copyrighted + by third parties. Please read "Acknowledgments" help file topic + for WinRAR or acknow.txt text file for other RAR versions for details. + + 11. This License Agreement is construed solely and exclusively under + German law. If you are a merchant, the courts at the registered office + of win.rar GmbH in Berlin/Germany shall have exclusive jurisdiction + for any and all disputes arising in connection with this License + Agreement or its validity. + + 12. Installing and using the software signifies acceptance of these terms + and conditions of the license. If you do not agree with the terms of this + license, you must remove all software files from your storage devices + and cease to use the software. diff --git a/media-fonts/fontawesome/Manifest b/media-fonts/fontawesome/Manifest index ca43e87a74bd..a950b5cabaf6 100644 --- a/media-fonts/fontawesome/Manifest +++ b/media-fonts/fontawesome/Manifest @@ -1 +1,2 @@ DIST fontawesome-4.6.3.tar.gz 2526615 SHA256 669fb1210c64eda3f998c86941641f1bcd0af4450643daf8841cb62d2b6c71a4 SHA512 ecf78028e7948e89d352c7f0de413198d95c235e36f49c24146d246012145ac62e0f4d1148655ef88be15710340688b2f3cc55247cfb6742a41400422f88d69f WHIRLPOOL 056ad3e1970d4eef4eaf2294bc3b5a0f02fb3de0145826ff10505e7bed851de4385629e10829675f94dd1a8ed49b4cdcaaabbc3c466c88f3bb094b5bb414629f +DIST fontawesome-4.7.0.tar.gz 2672776 SHA256 de512ba0e1dead382bbfce372cde74b3f18971d876fffb635ee9333f0db05d43 SHA512 913e5eec2211111e9601c92059745344766f4c3a6f3563cbc6f8a5f3850a0101bab8f3f992a97c6f1c264a2bbb5163f3feecc6b3f64fcb22c9592d2d38cc777d WHIRLPOOL 46fec87ce46bdbba6d5bf3a41bc7f2ffd76021eaa6ae62fb66183417d9685e683e6577f2e58d965320d013a2ca4a6f2ec69e65500c606a27e07f2d2ab857424f diff --git a/media-fonts/fontawesome/fontawesome-4.7.0.ebuild b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild new file mode 100644 index 000000000000..10a27d52445f --- /dev/null +++ b/media-fonts/fontawesome/fontawesome-4.7.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit font + +REPO_PN="Font-Awesome" + +DESCRIPTION="The iconic font" +HOMEPAGE="http://fontawesome.io" +SRC_URI="https://github.com/FortAwesome/${REPO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC-BY-3.0 OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="+otf +ttf" + +REQUIRED_USE="|| ( otf ttf )" + +DEPEND="" +RDEPEND="" + +S="${WORKDIR}/${REPO_PN}-${PV}" + +FONT_S="${S}/fonts" +FONT_SUFFIX="" + +src_configure() { + use otf && FONT_SUFFIX+="otf " + use ttf && FONT_SUFFIX+="ttf " +} diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest index 1923e5203918..27049522dcef 100644 --- a/media-libs/exiftool/Manifest +++ b/media-libs/exiftool/Manifest @@ -1,3 +1,4 @@ DIST Image-ExifTool-10.25.tar.gz 4161833 SHA256 edc2de5848375f7ccb88cd7d0260c98c4c581ffd509c4c249949f0cd1f522dd0 SHA512 6f3c9e432198a0be00efed1dc6044ea1be330099ec3d47bab8e761230c8fadc48bc26571202aea16e82890a9315ea752f25e06a2c7e5fd6d7690387e681870c7 WHIRLPOOL 49f11b61ada48c3d4d3d36d79f110a248c535bb8eb8625cdd7f5c4ef714c94676369b765abe63076589ea05b7c5cbf7ee5401c1c93e344cf704e26a091c5d464 DIST Image-ExifTool-10.27.tar.gz 4176031 SHA256 344f201a37f61a9f02ed7831cd86c89ccb14ea163ea77e129f094dc92e4b8852 SHA512 2f90c36afb7d870e4ea39e598afd15ab6183645b53d760cd2b1c883e424df22e1e50d4e2851abe8bf54a4e04a015597ca947053f9d1597f0709e6c0ff342f1c2 WHIRLPOOL fee344bc2354f16cb303a24f7f6b530d28fc4b4823b9cf11adbc2215c18c2a2e5c2608cfeeb5732e420b64f8cefbc35fb4c49a714a0da87a0e8313729c4291d2 DIST Image-ExifTool-10.28.tar.gz 4252944 SHA256 18cee8c0fb9331f63b883a5e5e42f5b40f5e30696289c00f1fe9e5e536f90bef SHA512 8fa37bdb5b52ea657dcdd86468cbce4ad113ef3afe7c52ca30b9ace6368d0dfe4bead69cd799bd403fd3d3dd8f7fdb24f8015eee19fec6d852bf8186b66f9b99 WHIRLPOOL c38fa5b29a4d82a74477acd593b968f8986098b02c5114093b497711f8669140a51040c358cf2c4665ce78f57609e67670fc8a3699eb31c15a58e5ba445ec9d3 +DIST Image-ExifTool-10.31.tar.gz 4201613 SHA256 192884639ff4934ecdb9edc107a0b9f1a49c9afadf457bae8fa97e15816dc1ea SHA512 6ae905be7f4670d9110d6dc9b7248b25a8aec50db89286aa85cb0bcf2de0a3f4cfabc89e32abd5cabcaa4da34d26b4efe3ed64fb7678076ea5999219502f70b4 WHIRLPOOL 73140eb16a5837e0784ef09ca8403d607070e53c22e4a182a3d381a926f24cf1b58082326ddc615dd2cc802d17377f12e329399bf6b757defb87b927eae752fa diff --git a/media-libs/exiftool/exiftool-10.31.ebuild b/media-libs/exiftool/exiftool-10.31.ebuild new file mode 100644 index 000000000000..e1513a94b78d --- /dev/null +++ b/media-libs/exiftool/exiftool-10.31.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_NAME=Image-ExifTool +inherit perl-module + +DESCRIPTION="Read and write meta information in image, audio and video files" +HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}" +SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos" +IUSE="doc" + +SRC_TEST="do" + +src_install() { + perl-module_src_install + use doc && dodoc -r html/ +} diff --git a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch new file mode 100644 index 000000000000..d9e50b698ac8 --- /dev/null +++ b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch @@ -0,0 +1,52 @@ +Description: Replace deprecated FFmpeg API +Author: Andreas Cadhalpun +Last-Update: <2015-11-28> + +--- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c ++++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c +@@ -153,7 +153,7 @@ seek_cb (void *opaque, + static size_t + create_thumbnail (int src_width, int src_height, + int src_stride[], +- enum PixelFormat src_pixfmt, ++ enum AVPixelFormat src_pixfmt, + const uint8_t * const src_data[], + int dst_width, int dst_height, + uint8_t **output_data, +@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src + if (NULL == + (scaler_ctx = + sws_getContext (src_width, src_height, src_pixfmt, +- dst_width, dst_height, PIX_FMT_RGB24, ++ dst_width, dst_height, AV_PIX_FMT_RGB24, + SWS_BILINEAR, NULL, NULL, NULL))) + { + #if DEBUG +@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src + return 0; + } + if (NULL == (dst_buffer = +- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height)))) ++ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height)))) + { + #if DEBUG + fprintf (stderr, +@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src + return 0; + } + avpicture_fill ((AVPicture *) dst_frame, dst_buffer, +- PIX_FMT_RGB24, dst_width, dst_height); ++ AV_PIX_FMT_RGB24, dst_width, dst_height); + sws_scale (scaler_ctx, + src_data, + src_stride, +@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src + } + encoder_codec_ctx->width = dst_width; + encoder_codec_ctx->height = dst_height; +- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24; ++ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24; + opts = NULL; + if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0) + { + diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch index ea0aeeb1c404..4893f9784a58 100644 --- a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch +++ b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch @@ -7,8 +7,8 @@ Add giflib-5.1.0 compatibility Index: src/plugins/gif_extractor.c =================================================================== ---- src/plugins/gif_extractor.c (revision 34094) -+++ src/plugins/gif_extractor.c (revision 34095) +--- a/src/plugins/gif_extractor.c (revision 34094) ++++ b/src/plugins/gif_extractor.c (revision 34095) @@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT if (gif_file == NULL || gif_error != 0) { diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild new file mode 100644 index 000000000000..cd34de2cbb31 --- /dev/null +++ b/media-libs/libextractor/libextractor-1.3-r1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="A library used to extract metadata from files of arbitrary type" +HOMEPAGE="https://www.gnu.org/software/libextractor/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ppc ppc64 x86" +IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg mp4 +magic midi mpeg tidy tiff vorbis +zlib" # test + +RESTRICT="test" + +RDEPEND="app-text/iso-codes + >=dev-libs/glib-2 + media-gfx/exiv2:= + sys-devel/libtool + virtual/libiconv + virtual/libintl + archive? ( app-arch/libarchive:= ) + bzip2? ( app-arch/bzip2 ) + ffmpeg? ( virtual/ffmpeg ) + flac? ( + media-libs/flac + media-libs/libogg + ) + gif? ( media-libs/giflib:= ) + gsf? ( gnome-extra/libgsf:= ) + gtk? ( x11-libs/gtk+:3 ) + jpeg? ( virtual/jpeg:0 ) + mp4? ( media-libs/libmp4v2:0 ) + magic? ( sys-apps/file ) + midi? ( media-libs/libsmf ) + mpeg? ( media-libs/libmpeg2 ) + tidy? ( app-text/htmltidy ) + tiff? ( media-libs/tiff:0 ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + zlib? ( sys-libs/zlib ) + !=metapost-1.803 is selected if it's installed, bug 498704 + if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then + if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then + einfo "Updating metapost symlink" + eselect mpost update || die + fi + fi + + python-single-r1_pkg_setup +} + +src_prepare() { + default + + if ! use vim-syntax ; then + sed -i 's/vim//' GNUmakefile.in || die + fi + + # respect CFLAGS + sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die + + for lang in ${LANGS}; do + use linguas_${lang} || rm po/${lang}.po || die + done + + # respect AR + sed -i "s/^AR=ar/AR=$(tc-getAR)/" stepmake/stepmake/library-vars.make || die + + # remove bundled texinfo file (fixes bug #448560) + rm tex/texinfo.tex || die + + eautoreconf +} + +src_configure() { + # documentation generation currently not supported since it requires a newer + # version of texi2html than is currently in the tree + + local myeconfargs+=( + --with-texgyre-dir=/usr/share/fonts/tex-gyre + --disable-documentation + --disable-optimising + --disable-pipe + $(use_enable debug debugging) + $(use_enable profile profiling) + ) + + has_version ">=dev-scheme/guile-2" && myeconfargs+=( --enable-guile2 ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use emacs ; then + elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ + || die "elisp-compile failed" + fi +} + +src_install () { + emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install + + # remove elisp files since they are in the wrong directory + rm -r "${ED}"/usr/share/emacs || die + + if use emacs ; then + elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \ + || die "elisp-install failed" + elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el + fi + + python_fix_shebang "${ED}" + + einstalldocs +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 1b3f3b048fc7..4d198da29a57 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -6,5 +6,5 @@ DIST kodi-16.0-generated-addons.tar.xz 76876 SHA256 fb164bf2aaf54d0c4a6da60b768b DIST kodi-16.0.tar.gz 52093964 SHA256 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 SHA512 b187f57601dfadc2119622f19558dbaca6ba7c708f5c24d65b876ee32888251940ffa8caadf978ee1afbd7c8da5007771e013d639819b998c345e968149995ac WHIRLPOOL ca19325b52c4c7de72a8d18cc9d68a83203274d3a432bcd83188904a9a2ba4e69372144c40ada3b3cd89ed12d740a1dceec75c5511b706b922374784bf817b3f DIST kodi-16.1-generated-addons.tar.xz 38988 SHA256 9e5187b26e9aa5e273ae84a2435db00d219a07631dc7b3a84a1c60aff61ef2f6 SHA512 e4da65ff96ccef7cb3be8bdc617917eb2dcec51241a8eeaefb908c99013d50a0dc8cd1fc16ac6c81409983c15f60958b19ef1baa84f638e9f888507f0df490be WHIRLPOOL b80161d54b8a7de2b2b0c907d42e574e5ccc0a4fac66f4a64d96cef6c8fa299a0f2704e93d02b42350eef044d3271d8614a24550b31aff026aec5a384fe69a1c DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d -DIST kodi-17.0b3-generated-addons.tar.xz 56996 SHA256 b475d2b0f1beff7e4775e99bfb2f5686d748202365a357bdeed3d7e5c7c01d20 SHA512 5318ec97e16864ff7a1f5fae1ac7f67636b2af58775389bde57fc7fee00eae6621f04810fffafeda215c8de0d47d2ed86025f585a9f18e10eae1d9193654fff2 WHIRLPOOL 928bdf9f7b3440c6300337e310cd1d4b8113d9f54819df6c91cab6f29a2919811dd418cb13bd3a02bef37289a5485f353d8ba814e454d62b3caea27ae304afd2 -DIST kodi-17.0b3.tar.gz 54917517 SHA256 c6008bb1320249a85f3f133897eab683ddd55c733b9b8984b53110e41cf5733c SHA512 ceaf0760c16f8b7c0f6ac0b0789389589bf7bc2a7c6d46b109a1772d5feabead1a13ee92852a6c6e3a85996129bc052e07f8ce6f5e4d8f5a9ffcf85a0f69b3cf WHIRLPOOL 7ba809c3e9944ec5e4340a038a9e8b56eec8d7be79079ad67d4909bad1e21b1ecd65e4f932e6afff72941fc2b66b9718697eedfd8e6a8dfea3910d257135aabd +DIST kodi-17.0b4-generated-addons.tar.xz 57024 SHA256 57da0a403fea4aed9a921ccec40d5fb6e2c4de8857308f9f46ce1339c8e6bd23 SHA512 78a786f6414ed38c6d89ae29537964586f7b5df28f08b0de3df209baa13905d35045dfcc71b40bf36dfbf29825892ed2b96cfee7365e56e5a13aa88abceddaf3 WHIRLPOOL bc582bc195637dd38ea0663c29decc5f30ed7b13586578d667191bd0fce696d6d7a934026a4be3f077fedcaef7611939ef3e74a0d5e9161ae65f4dd51d3bab87 +DIST kodi-17.0b4.tar.gz 54924547 SHA256 ace9a50e1552bf38633d92d6ef6af9a4489c5ecfda6c36e76f1d36d77d383308 SHA512 dadf34ca53f967db5fdefa95e551fc0a0be6f48bee641a431ab3a39efc324d8096bafb223f98939e2008cc1fa8d384ea6a6d63d1f7af65f2601f313ed2f6d773 WHIRLPOOL 3a45f73dec832232125eeca2ae76c8f66f6e534e1f65a3cf15e046f03159cb791575db99ab38a6fe1230cdb97e4f479d616bf1f2a7863bff799cfa99b196534a diff --git a/media-tv/kodi/kodi-17.0_beta3.ebuild b/media-tv/kodi/kodi-17.0_beta4.ebuild similarity index 100% rename from media-tv/kodi/kodi-17.0_beta3.ebuild rename to media-tv/kodi/kodi-17.0_beta4.ebuild diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 4fffadeac641..cbe6f4d35cd8 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Tue, 25 Oct 2016 14:40:32 +0000 +Wed, 26 Oct 2016 05:40:31 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 4fffadeac641..cbe6f4d35cd8 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Tue, 25 Oct 2016 14:40:32 +0000 +Wed, 26 Oct 2016 05:40:31 +0000 diff --git a/metadata/md5-cache/app-admin/consul-0.6.4 b/metadata/md5-cache/app-admin/consul-0.6.4 index c9880af4eebd..341addd0c156 100644 --- a/metadata/md5-cache/app-admin/consul-0.6.4 +++ b/metadata/md5-cache/app-admin/consul-0.6.4 @@ -10,4 +10,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/hashicorp/consul/archive/v0.6.4.tar.gz -> consul-0.6.4.tar.gz https://github.com/armon/circbuf/archive/bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz -> circbuf-bbbad097214e2918d8543d5201d12bfd7bca254d.tar.gz https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz https://github.com/armon/go-radix/archive/4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz -> go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz https://github.com/armon/gomdb/archive/151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz -> gomdb-151f2e08ef45cb0e57d694b2562f351955dff572.tar.gz https://github.com/beorn7/perks/archive/3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz -> perks-3ac7bf7a47d159a033b107610db8a1b6575507a4.tar.gz https://github.com/boltdb/bolt/archive/ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz -> bolt-ee4a0888a9abe7eefe5a0992ca4cb06864839873.tar.gz https://github.com/bgentry/speakeasy/archive/36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz -> speakeasy-36e9cfdd690967f4f690c6edcc9ffacd006014a0.tar.gz https://github.com/DataDog/datadog-go/archive/b050cd8f4d7c394545fd7d966c8e2909ce89d552.tar.gz -> datadog-go-b050cd8f4d7c394545fd7d966c8e2909ce89d552.tar.gz https://github.com/fsouza/go-dockerclient/archive/9b6c9720043b74304a6dd07a2a901d16e7bf3d3d.tar.gz -> go-dockerclient-9b6c9720043b74304a6dd07a2a901d16e7bf3d3d.tar.gz https://github.com/elazarl/go-bindata-assetfs/archive/57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz -> go-bindata-assetfs-57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2.tar.gz https://github.com/golang/protobuf/archive/127091107ff5f822298f1faa7487ffcf578adcf6.tar.gz -> go-protobuf-0_pre20160216.tar.gz https://github.com/hashicorp/consul-migrate/archive/v0.1.0.tar.gz -> consul-migrate-0.1.0.tar.gz https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz https://github.com/hashicorp/go-checkpoint/archive/e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz -> go-checkpoint-e4b2dc34c0f698ee04750bf2035d8b9384233e1b.tar.gz https://github.com/hashicorp/go-cleanhttp/archive/875fb671b3ddc66f8e2f0acc33829c8cb989a38d.tar.gz -> go-cleanhttp-875fb671b3ddc66f8e2f0acc33829c8cb989a38d.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/8e8ed81f8f0bf1bdd829593fdd5c29922c1ea990.tar.gz -> go-immutable-radix-8e8ed81f8f0bf1bdd829593fdd5c29922c1ea990.tar.gz https://github.com/hashicorp/go-memdb/archive/98f52f52d7a476958fa9da671354d270c50661a7.tar.gz -> go-memdb-98f52f52d7a476958fa9da671354d270c50661a7.tar.gz https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz https://github.com/hashicorp/go-reap/archive/2d85522212dcf5a84c6b357094f5c44710441912.tar.gz -> go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz https://github.com/hashicorp/memberlist/archive/cef12ad58224d55cf26caa9e3d239c2fcb3432a2.tar.gz -> memberlist-cef12ad58224d55cf26caa9e3d239c2fcb3432a2.tar.gz https://github.com/hashicorp/net-rpc-msgpackrpc/archive/a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz -> net-rpc-msgpackrpc-a14192a58a694c123d8fe5481d4a4727d6ae82f3.tar.gz https://github.com/hashicorp/raft/archive/057b893fd996696719e98b6c44649ea14968c811.tar.gz -> raft-057b893fd996696719e98b6c44649ea14968c811.tar.gz https://github.com/hashicorp/raft-boltdb/archive/d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz -> raft-boltdb-d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee.tar.gz https://github.com/hashicorp/raft-mdb/archive/55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz -> raft-mdb-55f29473b9e604b3678b93a8433a6cf089e70f76.tar.gz https://github.com/hashicorp/scada-client/archive/84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz -> scada-client-84989fd23ad4cc0e7ad44d6a871fd793eb9beb0a.tar.gz https://github.com/hashicorp/serf/archive/e4ec8cc423bbe20d26584b96efbeb9102e16d05f.tar.gz -> serf-e4ec8cc423bbe20d26584b96efbeb9102e16d05f.tar.gz https://github.com/hashicorp/yamux/archive/df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz -> yamux-df949784da9ed028ee76df44652e42d37a09d7e4.tar.gz https://github.com/inconshreveable/muxado/archive/f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz -> muxado-f693c7e88ba316d1a0ae3e205e22a01aa3ec2848.tar.gz https://github.com/jteeuwen/go-bindata/archive/a0ff2567cfb70903282db057e799fd826784d41d.tar.gz -> go-bindata-a0ff2567cfb70903282db057e799fd826784d41d.tar.gz https://github.com/mattn/go-isatty/archive/56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz -> go-isatty-56b76bdf51f7708750eac80fa38b952bb9f32639.tar.gz https://github.com/matttproud/golang_protobuf_extensions/archive/d0c3fe89de86839aecf2e0579c40ba3bb336a453.tar.gz -> golang_protobuf_extensions-d0c3fe89de86839aecf2e0579c40ba3bb336a453.tar.gz https://github.com/miekg/dns/archive/75e6e86cc601825c5dbcd4e0c209eab180997cd7.tar.gz -> dns-75e6e86cc601825c5dbcd4e0c209eab180997cd7.tar.gz https://github.com/mitchellh/cli/archive/cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz -> cli-cb6853d606ea4a12a15ac83cc43503df99fd28fb.tar.gz https://github.com/mitchellh/gox/archive/39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz -> gox-39862d88e853ecc97f45e91c1cdcb1b312c51eaa.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz https://github.com/prometheus/client_golang/archive/90c15b5efa0dc32a7d259234e02ac9a99e6d3b82.tar.gz -> client_golang-90c15b5efa0dc32a7d259234e02ac9a99e6d3b82.tar.gz https://github.com/prometheus/client_model/archive/fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz -> client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz https://github.com/prometheus/common/archive/40456948a47496dc22168e6af39297a2f8fbf38c.tar.gz -> common-40456948a47496dc22168e6af39297a2f8fbf38c.tar.gz https://github.com/prometheus/procfs/archive/406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8.tar.gz -> procfs-406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8.tar.gz https://github.com/ryanuber/columnize/archive/983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz -> columnize-983d3a5fab1bf04d1b412465d2d9f8430e2e917e.tar.gz _eclasses_=golang-base 08fe6e0e2b4750daff8887a7f0e1f873 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 -_md5_=65edd45e1ba48d0436c9cbe8c3e319c9 +_md5_=b045efe199a3b98efeb104c0d9f3a3d6 diff --git a/metadata/md5-cache/app-admin/consul-0.7.0 b/metadata/md5-cache/app-admin/consul-0.7.0 index 6b30f4140baa..4eb347c87921 100644 --- a/metadata/md5-cache/app-admin/consul-0.7.0 +++ b/metadata/md5-cache/app-admin/consul-0.7.0 @@ -9,4 +9,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/hashicorp/consul/archive/v0.7.0.tar.gz -> consul-0.7.0.tar.gz https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz _eclasses_=golang-base 08fe6e0e2b4750daff8887a7f0e1f873 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 -_md5_=b9391d4a84ff1958024756578e6d51a1 +_md5_=fe8a6aef023012f06bdc4e16a259b3ee diff --git a/metadata/md5-cache/app-admin/consul-template-0.16.0 b/metadata/md5-cache/app-admin/consul-template-0.16.0 index 7e5017eac495..4749bf6dc0c9 100644 --- a/metadata/md5-cache/app-admin/consul-template-0.16.0 +++ b/metadata/md5-cache/app-admin/consul-template-0.16.0 @@ -9,4 +9,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/hashicorp/consul-template/archive/v0.16.0.tar.gz -> consul-template-0.16.0.tar.gz https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz _eclasses_=golang-base 08fe6e0e2b4750daff8887a7f0e1f873 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 -_md5_=747e3ad58c02af86504cf096b1af2aef +_md5_=ef3fdaf21b8c600426e6d163d4a4e164 diff --git a/metadata/md5-cache/app-admin/vault-0.6.2 b/metadata/md5-cache/app-admin/vault-0.6.2 index 177d3cde4d62..ad328a1ffdf3 100644 --- a/metadata/md5-cache/app-admin/vault-0.6.2 +++ b/metadata/md5-cache/app-admin/vault-0.6.2 @@ -10,4 +10,4 @@ RESTRICT=test SLOT=0 SRC_URI=https://github.com/hashicorp/vault/archive/v0.6.2.tar.gz -> vault-0.6.2.tar.gz https://github.com/mitchellh/gox/archive/c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz -> gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz https://github.com/mitchellh/iochan/archive/87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz -> iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz _eclasses_=fcaps 6a1091a98b1dde01cc26ab3252da1a9b golang-base 08fe6e0e2b4750daff8887a7f0e1f873 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 -_md5_=8c0c8c546a4fe054352bb1f3417d617a +_md5_=cc14d90acd357e24f745765610023403 diff --git a/metadata/md5-cache/app-arch/rar-5.2.1 b/metadata/md5-cache/app-arch/rar-5.2.1 index 28956729b7d7..ff582ddfb1ed 100644 --- a/metadata/md5-cache/app-arch/rar-5.2.1 +++ b/metadata/md5-cache/app-arch/rar-5.2.1 @@ -5,8 +5,9 @@ EAPI=4 HOMEPAGE=http://www.rarsoft.com/ IUSE=all_sfx static KEYWORDS=-* amd64 x86 -LICENSE=RAR +LICENSE=RAR BSD BSD-2 RDEPEND=sys-libs/glibc +RESTRICT=mirror bindist SLOT=0 SRC_URI=x86? ( http://www.rarlab.com/rar/rarlinux-5.2.1.tar.gz ) amd64? ( http://www.rarlab.com/rar/rarlinux-x64-5.2.1.tar.gz ) all_sfx? ( http://www.rarlab.com/rar/rarlinux-5.2.1.tar.gz http://www.rarlab.com/rar/rarlinux-x64-5.2.1.tar.gz http://www.rarlab.com/rar/winrar-x64-521.exe ) -_md5_=bb20e70fc4c04e0f2a30b0bd7ff6dc6b +_md5_=318d0860310d6f6ede7e7d7f8f7fcda7 diff --git a/metadata/md5-cache/app-arch/rar-5.3.0 b/metadata/md5-cache/app-arch/rar-5.3.0 index 1731b677d059..7b55f7fc29ab 100644 --- a/metadata/md5-cache/app-arch/rar-5.3.0 +++ b/metadata/md5-cache/app-arch/rar-5.3.0 @@ -5,8 +5,9 @@ EAPI=5 HOMEPAGE=http://www.rarsoft.com/ IUSE=all_sfx static KEYWORDS=-* amd64 x86 -LICENSE=RAR +LICENSE=RAR BSD BSD-2 RDEPEND=sys-libs/glibc +RESTRICT=mirror bindist SLOT=0 SRC_URI=x86? ( http://www.rarsoft.com/rar/rarlinux-5.3.0.tar.gz ) amd64? ( http://www.rarsoft.com/rar/rarlinux-x64-5.3.0.tar.gz ) all_sfx? ( http://www.rarsoft.com/rar/rarlinux-5.3.0.tar.gz http://www.rarsoft.com/rar/rarlinux-x64-5.3.0.tar.gz http://www.rarsoft.com/rar/winrar-x64-530.exe ) -_md5_=4058f0e9c269ced6fbc3dd2bcc6a891d +_md5_=47f39da1b0ab115e9ff8a37542f7c263 diff --git a/metadata/md5-cache/app-misc/ca-certificates-20151214.3.21 b/metadata/md5-cache/app-misc/ca-certificates-20151214.3.21 index 42c5b9d03559..0c157900ca5b 100644 --- a/metadata/md5-cache/app-misc/ca-certificates-20151214.3.21 +++ b/metadata/md5-cache/app-misc/ca-certificates-20151214.3.21 @@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 LICENSE=MPL-1.1 RDEPEND=>=app-misc/c_rehash-1.7-r1 sys-apps/debianutils SLOT=0 -SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20151214.tar.xz ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/nss-3.21.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) +SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20151214.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_21_RTM/src/nss-3.21.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) _eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=76ddda1e091d383aa073de634e023b7e +_md5_=4bdd5bbfbfdc8aea399413980a318406 diff --git a/metadata/md5-cache/app-misc/ca-certificates-20160104.3.23 b/metadata/md5-cache/app-misc/ca-certificates-20160104.3.23 index 321dcedf82f0..0733eca3279c 100644 --- a/metadata/md5-cache/app-misc/ca-certificates-20160104.3.23 +++ b/metadata/md5-cache/app-misc/ca-certificates-20160104.3.23 @@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh LICENSE=MPL-1.1 RDEPEND=app-misc/c_rehash sys-apps/debianutils SLOT=0 -SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_23_RTM/src/nss-3.23.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) +SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_23_RTM/src/nss-3.23.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) _eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=5e29e54f449d0f6dea965c8a19d74d60 +_md5_=232ec77dd82d5d33e63a8c8ae786543a diff --git a/metadata/md5-cache/app-misc/ca-certificates-20160104.3.27.1 b/metadata/md5-cache/app-misc/ca-certificates-20160104.3.27.1 index 8f24d6adf70f..5b07d5727f92 100644 --- a/metadata/md5-cache/app-misc/ca-certificates-20160104.3.27.1 +++ b/metadata/md5-cache/app-misc/ca-certificates-20160104.3.27.1 @@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh LICENSE=MPL-1.1 RDEPEND=app-misc/c_rehash sys-apps/debianutils SLOT=0 -SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_27_1_RTM/src/nss-3.27.1.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) +SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_27_1_RTM/src/nss-3.27.1.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) _eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=43d020d81d29b51b5097cedd208ea1bd +_md5_=589c5d8908d5e17f433a89b1ccd32f2c diff --git a/metadata/md5-cache/app-misc/ca-certificates-20160104.3.27.1-r1 b/metadata/md5-cache/app-misc/ca-certificates-20160104.3.27.1-r1 new file mode 100644 index 000000000000..bbb9f47d4ecf --- /dev/null +++ b/metadata/md5-cache/app-misc/ca-certificates-20160104.3.27.1-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install postinst prepare setup unpack +DEPEND=|| ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 >=dev-lang/python-2.7.5-r2:2.7 ) +DESCRIPTION=Common CA Certificates PEM files +EAPI=5 +HOMEPAGE=http://packages.debian.org/sid/ca-certificates +IUSE=cacert +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt +LICENSE=MPL-1.1 +RDEPEND=app-misc/c_rehash sys-apps/debianutils +SLOT=0 +SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20160104.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_27_1_RTM/src/nss-3.27.1.tar.gz cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) +_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=c765a2ea81966fc2c55c06f8bfeafc52 diff --git a/metadata/md5-cache/app-text/languagetool-3.5 b/metadata/md5-cache/app-text/languagetool-3.5 new file mode 100644 index 000000000000..58e40746fa61 --- /dev/null +++ b/metadata/md5-cache/app-text/languagetool-3.5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install preinst prepare setup +DEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/guava:18 dev-java/hamcrest-core:1.3 dev-java/jna:0 dev-java/jcommander:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 app-arch/unzip >=dev-java/java-config-2.2.0-r3 +DESCRIPTION=a proof-reading tool for many languages +EAPI=6 +HOMEPAGE=http://www.languagetool.org/ +IUSE=elibc_FreeBSD +KEYWORDS=~amd64 ~x86 +LICENSE=LGPL-2.1 +RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/guava:18 dev-java/hamcrest-core:1.3 dev-java/jna:0 dev-java/jcommander:0 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 >=dev-java/java-config-2.2.0-r3 +SLOT=0 +SRC_URI=http://www.languagetool.org/download/LanguageTool-3.5.zip +_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-pkg-2 eb1f0d7d874162c70088f5ae32c31ee7 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=721c77a5e2dbd9b99416a2f525585187 diff --git a/metadata/md5-cache/app-vim/languagetool-1.30 b/metadata/md5-cache/app-vim/languagetool-1.30 new file mode 100644 index 000000000000..41dd03c1e5cf --- /dev/null +++ b/metadata/md5-cache/app-vim/languagetool-1.30 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst postrm +DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) +DESCRIPTION=grammar checker for various languages +EAPI=6 +HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=3223 +KEYWORDS=~amd64 ~x86 +LICENSE=vim +RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) +SLOT=0 +SRC_URI=mirror://gentoo/languagetool-1.30.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.30.tar.bz2 +_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin cba1cae8a355e4e89cbd2615aed3b1d5 +_md5_=134064d67af87cf5b90aca0254a1fc91 diff --git a/metadata/md5-cache/dev-lang/mono-4.6.1.3 b/metadata/md5-cache/dev-lang/mono-4.6.1.5 similarity index 99% rename from metadata/md5-cache/dev-lang/mono-4.6.1.3 rename to metadata/md5-cache/dev-lang/mono-4.6.1.5 index e2779fed39a7..5792c235b8a3 100644 --- a/metadata/md5-cache/dev-lang/mono-4.6.1.3 +++ b/metadata/md5-cache/dev-lang/mono-4.6.1.5 @@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux LICENSE=MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL RDEPEND=!minimal? ( >=dev-dotnet/libgdiplus-2.10 ) ia64? ( sys-libs/libunwind ) nls? ( sys-devel/gettext ) || ( www-client/links www-client/lynx ) SLOT=0 -SRC_URI=http://download.mono-project.com/sources/mono/mono-4.6.1.3.tar.bz2 +SRC_URI=http://download.mono-project.com/sources/mono/mono-4.6.1.5.tar.bz2 _eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc linux-info fd1e29abbb02cbc49f1a14299846e9c4 mono-env 10809200679bcceefebac9e72bebb6e6 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils 4c2654a34ebe732e85fda354f6ee642f toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=322972d4bd0b7167e17f9f2038c4af1a diff --git a/metadata/md5-cache/dev-lang/php-7.0.12 b/metadata/md5-cache/dev-lang/php-7.0.12 new file mode 100644 index 000000000000..e18d8a33ad5e --- /dev/null +++ b/metadata/md5-cache/dev-lang/php-7.0.12 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile configure install postinst postrm prepare test +DEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) app-arch/xz-utils >=sys-devel/bison-3.0.1 sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig +DESCRIPTION=The PHP language runtime engine +EAPI=6 +HOMEPAGE=http://php.net/ +IUSE=embed +cli cgi fpm apache2 phpdbg threads bcmath berkdb bzip2 calendar cdb cjk crypt +ctype curl debug enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl sysvipc systemd tidy +tokenizer truetype unicode wddx webp +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos +LICENSE=PHP-3.01 BSD Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 ) +RDEPEND=>=app-eselect/eselect-php-0.9.1[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] =dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( dev-libs/gmp:0 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu:= ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql:* ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline:0= ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* !gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) webp? ( media-libs/libwebp ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta fpm? ( selinux? ( sec-policy/selinux-phpfpm ) systemd? ( sys-apps/systemd ) ) +REQUIRED_USE=cli? ( ^^ ( readline libedit ) ) truetype? ( gd ) webp? ( gd ) cjk? ( gd ) exif? ( gd ) xpm? ( gd ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) wddx? ( xml ) xmlrpc? ( || ( xml iconv ) ) xmlreader? ( xml ) xslt? ( xml ) ldap-sasl? ( ldap ) mhash? ( hash ) phar? ( hash ) qdbm? ( !gdbm ) readline? ( !libedit ) recode? ( !imap !mysqli ) sharedmem? ( !threads ) mysql? ( || ( mysqli pdo ) ) || ( cli cgi fpm apache2 embed phpdbg ) +SLOT=7.0 +SRC_URI=http://php.net/distributions/php-7.0.12.tar.xz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=4b9961cc3b862a40b5ae7167feda03c3 diff --git a/metadata/md5-cache/dev-python/pillow-3.4.2 b/metadata/md5-cache/dev-python/pillow-3.4.2 index 0960eb3c9970..462a52ebbd74 100644 --- a/metadata/md5-cache/dev-python/pillow-3.4.2 +++ b/metadata/md5-cache/dev-python/pillow-3.4.2 @@ -11,4 +11,4 @@ REQUIRED_USE=test? ( jpeg tiff ) || ( python_targets_pypy python_targets_python2 SLOT=0 SRC_URI=mirror://pypi/P/Pillow/Pillow-3.4.2.zip _eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=c7ef8ff5c76f16d85ad9fbde5bf53839 +_md5_=7ca30a1cf50707cfe2061b652da465dd diff --git a/metadata/md5-cache/dev-python/pyopenssl-16.2.0 b/metadata/md5-cache/dev-python/pyopenssl-16.2.0 index 7f4a8d10409a..2171353e5bf4 100644 --- a/metadata/md5-cache/dev-python/pyopenssl-16.2.0 +++ b/metadata/md5-cache/dev-python/pyopenssl-16.2.0 @@ -12,4 +12,4 @@ RESTRICT=test SLOT=0 SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-16.2.0.tar.gz _eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=708926fe9871723d38e45b245005405e +_md5_=672b9b664181bacc239f54dea876578b diff --git a/metadata/md5-cache/dev-util/pkgconf-1.0.2 b/metadata/md5-cache/dev-util/pkgconf-1.0.2 new file mode 100644 index 000000000000..a7f74ca7fda4 --- /dev/null +++ b/metadata/md5-cache/dev-util/pkgconf-1.0.2 @@ -0,0 +1,12 @@ +DEFINED_PHASES=compile configure install prepare test +DESCRIPTION=pkg-config compatible replacement with no dependencies other than ANSI C89 +EAPI=6 +HOMEPAGE=https://github.com/pkgconf/pkgconf +IUSE=+pkg-config strict abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris +LICENSE=BSD-1 +RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] ) +SLOT=0 +SRC_URI=https://distfiles.dereferenced.org/pkgconf/pkgconf-1.0.2.tar.xz https://github.com/pkgconf/pkgconf/releases/download/pkgconf-1.0.2/pkgconf-1.0.2.tar.xz +_eclasses_=multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=babefd95a897eea57e193fa8100bace8 diff --git a/metadata/md5-cache/dev-util/pkgconf-9999 b/metadata/md5-cache/dev-util/pkgconf-9999 index 8e45d75d1c78..5644e783d9ae 100644 --- a/metadata/md5-cache/dev-util/pkgconf-9999 +++ b/metadata/md5-cache/dev-util/pkgconf-9999 @@ -8,4 +8,4 @@ LICENSE=BSD-1 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] ) SLOT=0 _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 git-r3 e928b84a9f6f1d9076d1d27687876dc6 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 -_md5_=c491f8d31c4c358679b4dc74f285ceca +_md5_=babefd95a897eea57e193fa8100bace8 diff --git a/metadata/md5-cache/dev-vcs/bfg-1.12.14 b/metadata/md5-cache/dev-vcs/bfg-1.12.14 new file mode 100644 index 000000000000..ced6cf74627c --- /dev/null +++ b/metadata/md5-cache/dev-vcs/bfg-1.12.14 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install preinst prepare setup unpack +DEPEND=>=dev-java/java-config-2.2.0-r3 +DESCRIPTION=a faster alternative to git-filter-branch for removing bad data from git repos +EAPI=6 +HOMEPAGE=http://rtyley.github.io/bfg-repo-cleaner/ +IUSE=elibc_FreeBSD +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-3+ +RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 +SLOT=0 +SRC_URI=http://repo1.maven.org/maven2/com/madgag/bfg/1.12.14/bfg-1.12.14.jar +_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 java-pkg-2 eb1f0d7d874162c70088f5ae32c31ee7 java-utils-2 a50950a73b5d5db46f42638e2996a087 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=1642b1b2fd701ad9a6f7e96b56d9bf1c diff --git a/metadata/md5-cache/media-fonts/fontawesome-4.7.0 b/metadata/md5-cache/media-fonts/fontawesome-4.7.0 new file mode 100644 index 000000000000..6e59f9e00000 --- /dev/null +++ b/metadata/md5-cache/media-fonts/fontawesome-4.7.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst postrm setup +DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) +DESCRIPTION=The iconic font +EAPI=6 +HOMEPAGE=http://fontawesome.io +IUSE=+otf +ttf X +KEYWORDS=~amd64 ~arm ~arm64 ~x86 +LICENSE=CC-BY-3.0 OFL-1.1 +REQUIRED_USE=|| ( otf ttf ) +SLOT=0 +SRC_URI=https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.tar.gz -> fontawesome-4.7.0.tar.gz +_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 font cd7790315ca5b8c505e1e0513df6acce multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=581037bf41d86d507258d056f2eb16f3 diff --git a/metadata/md5-cache/media-libs/exiftool-10.31 b/metadata/md5-cache/media-libs/exiftool-10.31 new file mode 100644 index 000000000000..50904314880d --- /dev/null +++ b/metadata/md5-cache/media-libs/exiftool-10.31 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=dev-lang/perl:= +DESCRIPTION=Read and write meta information in image, audio and video files +EAPI=6 +HOMEPAGE=http://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/ +IUSE=doc +KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos +LICENSE=|| ( Artistic GPL-1+ ) +RDEPEND=dev-lang/perl:= +SLOT=0 +SRC_URI=http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.31.tar.gz +_eclasses_=multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce +_md5_=4601702180ec547ebbe0d32fbc7b8e29 diff --git a/metadata/md5-cache/media-libs/libextractor-1.3-r1 b/metadata/md5-cache/media-libs/libextractor-1.3-r1 new file mode 100644 index 000000000000..4ef6e85637b5 --- /dev/null +++ b/metadata/md5-cache/media-libs/libextractor-1.3-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare +DEPEND=app-text/iso-codes >=dev-libs/glib-2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp4? ( media-libs/libmp4v2:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !=dev-libs/glib-2 media-gfx/exiv2:= sys-devel/libtool virtual/libiconv virtual/libintl archive? ( app-arch/libarchive:= ) bzip2? ( app-arch/bzip2 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac media-libs/libogg ) gif? ( media-libs/giflib:= ) gsf? ( gnome-extra/libgsf:= ) gtk? ( x11-libs/gtk+:3 ) jpeg? ( virtual/jpeg:0 ) mp4? ( media-libs/libmp4v2:0 ) magic? ( sys-apps/file ) midi? ( media-libs/libsmf ) mpeg? ( media-libs/libmpeg2 ) tidy? ( app-text/htmltidy ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) !=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-text/t1utils dev-lang/perl dev-libs/kpathsea >=dev-texlive/texlive-metapost-2013 || ( >=app-text/texlive-core-2013 >=dev-tex/metapost-1.803 ) virtual/pkgconfig media-gfx/fontforge[png] >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=GNU Music Typesetter +EAPI=6 +HOMEPAGE=http://lilypond.org/ +IUSE=debug emacs profile vim-syntax linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_eo linguas_es linguas_fi linguas_fr linguas_it linguas_ja linguas_nl linguas_ru linguas_sv linguas_tr linguas_uk linguas_vi linguas_zh_TW python_targets_python2_7 +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~x86 +LICENSE=GPL-3 FDL-1.3 +RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] +REQUIRED_USE=python_targets_python2_7 +RESTRICT=test +SLOT=0 +SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-2.19.49.tar.gz +_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 +_md5_=efd9eea8df2dba93e982f4440616f6b1 diff --git a/metadata/md5-cache/media-tv/kodi-17.0_beta3 b/metadata/md5-cache/media-tv/kodi-17.0_beta4 similarity index 97% rename from metadata/md5-cache/media-tv/kodi-17.0_beta3 rename to metadata/md5-cache/media-tv/kodi-17.0_beta4 index c6d276f48def..ec7b67a31ee8 100644 --- a/metadata/md5-cache/media-tv/kodi-17.0_beta3 +++ b/metadata/md5-cache/media-tv/kodi-17.0_beta4 @@ -9,6 +9,6 @@ LICENSE=GPL-2 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) dev-libs/expat dev-libs/fribidi dev-libs/libcdio[-minimal] cec? ( >=dev-libs/libcec-3.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 dev-libs/libxslt >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] media-fonts/anonymous-pro media-fonts/corefonts media-fonts/dejavu alsa? ( media-libs/alsa-lib ) media-libs/flac media-libs/fontconfig media-libs/freetype media-libs/jasper media-libs/jbigkit >=media-libs/libass-0.9.7 bluray? ( >=media-libs/libbluray-0.7.0 ) media-libs/libmad media-libs/libmodplug media-libs/libmpeg2 media-libs/libsamplerate >=media-libs/taglib-1.9 media-libs/tiff:0= media-sound/wavpack >=media-video/ffmpeg-3.0:=[encode] nfs? ( net-fs/libnfs:= ) webserver? ( net-libs/libmicrohttpd[messages] ) sftp? ( net-libs/libssh[sftp] ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus ) caps? ( sys-libs/libcap ) sys-libs/zlib virtual/jpeg:0= usb? ( virtual/libusb:1 ) mysql? ( virtual/mysql ) opengl? ( virtual/glu virtual/opengl >=media-libs/glew-1.5.6:= ) gles? ( media-libs/mesa[gles2] ) vaapi? ( x11-libs/libva[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) media-video/ffmpeg[vdpau] ) X? ( x11-apps/xdpyinfo x11-apps/mesa-progs x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender ) zeroconf? ( net-dns/avahi ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) REQUIRED_USE=|| ( gles opengl ) ?? ( gles vaapi ) udisks? ( dbus ) upower? ( dbus ) SLOT=0 -SRC_URI=https://github.com/xbmc/xbmc/archive/17.0b3-Krypton.tar.gz -> kodi-17.0b3.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.0b3-generated-addons.tar.xz ) +SRC_URI=https://github.com/xbmc/xbmc/archive/17.0b4-Krypton.tar.gz -> kodi-17.0b4.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.0b4-generated-addons.tar.xz ) _eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c _md5_=8d57fd9224eab767710c979a8f49d5d1 diff --git a/metadata/md5-cache/net-im/telegram-desktop-bin-0.10.11 b/metadata/md5-cache/net-im/telegram-desktop-bin-0.10.19 similarity index 81% rename from metadata/md5-cache/net-im/telegram-desktop-bin-0.10.11 rename to metadata/md5-cache/net-im/telegram-desktop-bin-0.10.19 index 7bb02d4a18c3..da765862fe3f 100644 --- a/metadata/md5-cache/net-im/telegram-desktop-bin-0.10.11 +++ b/metadata/md5-cache/net-im/telegram-desktop-bin-0.10.19 @@ -7,6 +7,6 @@ KEYWORDS=-* ~amd64 ~x86 LICENSE=telegram RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection >=sys-apps/dbus-1.4.20 x11-libs/libX11 >=x11-libs/libxcb-1.10[xkb] SLOT=0 -SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v0.10.11.tar.gz -> tdesktop-0.10.11.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.0.10.11.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.0.10.11.tar.xz ) +SRC_URI=https://github.com/telegramdesktop/tdesktop/archive/v0.10.19.tar.gz -> tdesktop-0.10.19.tar.gz amd64? ( https://updates.tdesktop.com/tlinux/tsetup.0.10.19.tar.xz ) x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.0.10.19.tar.xz ) _eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 _md5_=830d7cc20970f413c82fd858e85af10f diff --git a/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2 b/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2 index d35c25052ed6..04ede1e1ab97 100644 --- a/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2 +++ b/metadata/md5-cache/sci-libs/cblas-reference-20151113-r2 @@ -9,4 +9,4 @@ RDEPEND=app-eselect/eselect-cblas >=virtual/blas-3.6 virtual/pkgconfig virtual/f SLOT=0 SRC_URI=http://www.netlib.org/lapack/lapack-3.6.0.tgz _eclasses_=cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc fortran-2 8200fc942c3b3c1fc75d4d5bfd0ba7a2 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=6fb9fe7d403680bc27da785a2dbd7651 +_md5_=0b93515cc19679d60bcc0804b5ccd581 diff --git a/metadata/md5-cache/sys-apps/file-5.26-r1 b/metadata/md5-cache/sys-apps/file-5.26-r1 deleted file mode 100644 index de1726be6b5f..000000000000 --- a/metadata/md5-cache/sys-apps/file-5.26-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare test -DEPEND=python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) -DESCRIPTION=identify a file's format by scanning binary data for patterns -EAPI=5 -HOMEPAGE=http://www.darwinsys.com/file/ -IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 -KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd -LICENSE=BSD-2 -RDEPEND=python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) -SLOT=0 -SRC_URI=ftp://ftp.astron.com/pub/file/file-5.26.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.26.tar.gz -_eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=b8328917816243cfe3fa7ebead7e9704 diff --git a/metadata/md5-cache/sys-apps/file-5.27 b/metadata/md5-cache/sys-apps/file-5.29 similarity index 95% rename from metadata/md5-cache/sys-apps/file-5.27 rename to metadata/md5-cache/sys-apps/file-5.29 index 258b9ad311fa..3b4794005bb5 100644 --- a/metadata/md5-cache/sys-apps/file-5.27 +++ b/metadata/md5-cache/sys-apps/file-5.29 @@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh LICENSE=BSD-2 RDEPEND=python? ( python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) SLOT=0 -SRC_URI=ftp://ftp.astron.com/pub/file/file-5.27.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.27.tar.gz +SRC_URI=ftp://ftp.astron.com/pub/file/file-5.29.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.29.tar.gz _eclasses_=distutils-r1 674dae153419b2200ae54e879cc65b57 eutils b83a2420b796f7c6eff682679d08fe25 libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48 -_md5_=22ef54f9ff78f22e86e0ccf65749d560 +_md5_=640cbf4da345c667f73064630831b3df diff --git a/metadata/md5-cache/sys-apps/less-487 b/metadata/md5-cache/sys-apps/less-487 new file mode 100644 index 000000000000..d9fcb8e4cef2 --- /dev/null +++ b/metadata/md5-cache/sys-apps/less-487 @@ -0,0 +1,12 @@ +DEFINED_PHASES=configure install preinst prepare +DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) +DESCRIPTION=Excellent text file viewer +EAPI=5 +HOMEPAGE=http://www.greenwoodsoftware.com/less/ +IUSE=pcre unicode +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=|| ( GPL-3 BSD-2 ) +RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre ) +SLOT=0 +SRC_URI=http://www.greenwoodsoftware.com/less/less-487.tar.gz +_md5_=831c50c91b7fc6eec5199fe0eaa2d380 diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999 index 9ce87ef35d89..3347025b5aa2 100644 --- a/metadata/md5-cache/sys-devel/clang-9999 +++ b/metadata/md5-cache/sys-devel/clang-9999 @@ -10,4 +10,4 @@ RDEPEND=~sys-devel/llvm-9999:=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU? REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) SLOT=0/9999 _eclasses_=check-reqs aee25bdf4e2f459af86d17f7c41dcdf6 cmake-utils f3d38665b0a86e08ba3a5473cdbfafd3 eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc git-r3 e928b84a9f6f1d9076d1d27687876dc6 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 pax-utils 4c2654a34ebe732e85fda354f6ee642f python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=5ef1f8f222cc90b4aa7a172ab00d4916 +_md5_=d0ddde6d39624af3ac4b66e1168d4517 diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.9_rc2 b/metadata/md5-cache/sys-kernel/git-sources-4.9_rc2 new file mode 100644 index 000000000000..387302bf87a3 --- /dev/null +++ b/metadata/md5-cache/sys-kernel/git-sources-4.9_rc2 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install postinst postrm preinst setup test unpack +DEPEND=>=sys-devel/patch-2.7.4 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) +DESCRIPTION=The very latest -git version of the Linux kernel +EAPI=5 +HOMEPAGE=https://www.kernel.org +IUSE=symlink build +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 +LICENSE=GPL-2 freedist +RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc ) +RESTRICT=binchecks strip +SLOT=4.9_rc2 +SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.9-rc2.xz mirror://kernel/linux/kernel/v4.x/linux-4.8.tar.xz +_eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 kernel-2 f31f3b95b5d8f120e14f0b7aafbd8b47 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 1797277ea0e7cee5c7de7ce74cf8acd8 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c +_md5_=0675380e6faee4dfc25651554e58d99d diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-367.57 b/metadata/md5-cache/x11-drivers/nvidia-drivers-367.57 index 6563089a7346..7cb1404f786e 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-367.57 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-367.57 @@ -12,4 +12,4 @@ RESTRICT=bindist mirror SLOT=0/367 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/367.57/NVIDIA-FreeBSD-x86_64-367.57.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/367.57/NVIDIA-Linux-x86_64-367.57.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/367.57/NVIDIA-Linux-armv7l-gnueabihf-367.57.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/367.57/NVIDIA-FreeBSD-x86-367.57.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/367.57/NVIDIA-Linux-x86-367.57.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-367.57.tar.bz2 ) _eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc linux-info fd1e29abbb02cbc49f1a14299846e9c4 linux-mod 4755518412586c2fd655ff6e55780bcb multilib 165fc17c38d1b11dac2008280dab6e80 nvidia-driver fe3e559a49de32cd7df5ae282f98d107 portability bb1a0ed8ea152b957d17339f01d4d7f5 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 73058269b3e70e34e084fa3981282338 unpacker 45d07319df5f40ee6af58418b0f930be user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=8534c33944a89ee10b264f18636cd313 +_md5_=68bf6c221327fc89515a634486515bba diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-370.28 b/metadata/md5-cache/x11-drivers/nvidia-drivers-370.28 index fa2058ad50a3..ff3d7f05df9b 100644 --- a/metadata/md5-cache/x11-drivers/nvidia-drivers-370.28 +++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-370.28 @@ -12,4 +12,4 @@ RESTRICT=bindist mirror SLOT=0/370 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/370.28/NVIDIA-FreeBSD-x86_64-370.28.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/370.28/NVIDIA-Linux-x86_64-370.28.run ) arm? ( http://us.download.nvidia.com/XFree86/Linux-x86-ARM/370.28/NVIDIA-Linux-armv7l-gnueabihf-370.28.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/370.28/NVIDIA-FreeBSD-x86-370.28.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/370.28/NVIDIA-Linux-x86-370.28.run ) tools? ( ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-370.28.tar.bz2 ) _eclasses_=eutils b83a2420b796f7c6eff682679d08fe25 flag-o-matic 8632fcd33a047954f007dee9a137bdcc linux-info fd1e29abbb02cbc49f1a14299846e9c4 linux-mod 4755518412586c2fd655ff6e55780bcb multilib 165fc17c38d1b11dac2008280dab6e80 nvidia-driver fe3e559a49de32cd7df5ae282f98d107 portability bb1a0ed8ea152b957d17339f01d4d7f5 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 udev 73058269b3e70e34e084fa3981282338 unpacker 45d07319df5f40ee6af58418b0f930be user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c -_md5_=c67e1b1701a6640a56afe10935500bf7 +_md5_=b2bce49d71196262c2d31184f61d6dc5 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 4fffadeac641..cbe6f4d35cd8 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Tue, 25 Oct 2016 14:40:32 +0000 +Wed, 26 Oct 2016 05:40:31 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 1d9183e5be95..1d518c30bcf1 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Tue Oct 25 14:39:36 UTC 2016 +Wed Oct 26 05:39:35 UTC 2016 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index 4f513ae83b9c..e715d02c1aee 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Tue, 25 Oct 2016 15:30:01 +0000 +Wed, 26 Oct 2016 06:00:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 1678470d03b6..f67018c60f40 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1477406401 Tue 25 Oct 2016 02:40:01 PM UTC +1477460401 Wed 26 Oct 2016 05:40:01 AM UTC diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk index 4fffadeac641..cbe6f4d35cd8 100644 --- a/metadata/xml-schema/timestamp.chk +++ b/metadata/xml-schema/timestamp.chk @@ -1 +1 @@ -Tue, 25 Oct 2016 14:40:32 +0000 +Wed, 26 Oct 2016 05:40:31 +0000 diff --git a/net-im/telegram-desktop-bin/Manifest b/net-im/telegram-desktop-bin/Manifest index 2e98f17b9c95..5d67516eb9da 100644 --- a/net-im/telegram-desktop-bin/Manifest +++ b/net-im/telegram-desktop-bin/Manifest @@ -1,6 +1,6 @@ -DIST tdesktop-0.10.11.tar.gz 11418798 SHA256 882d08873f3ee3f728fcdb4a786f5be5f04ea96e0371da5435db6061088c8b43 SHA512 680dfe0ec5fefdbb3a68f0748c42e878188d8694388cd5b10ef6f7a60bee3cffc9e9d3d793b2de2230303dc6cdcb3ff1ab521e2f48fae67705d1f0e1a8901844 WHIRLPOOL 05c11373743317fc7e1eb5f7b960af855a0b0eff2365fb2f3a466638b947825bc72b2266cb6dfab2f486cd83dccf17373be55da42157a5ea07a3cf7f9d673bff DIST tdesktop-0.10.16.tar.gz 11488595 SHA256 fbc80eaf2b87335d024b2aa2504bf2de87daa224d2b579169f81d7e0317ef4e4 SHA512 55bc8fa9007dba3abf1873daf739a5630d07627fced8a72c83e098942d0e376012c6101286d633c798d1fc80183365166a9bb6a5f144574db42ce945ce0a8ef6 WHIRLPOOL 63e3dbb60d7426527655a53acdc7f7b052ca499a15a2a8fbfc34b538ce0e9db43d86e7c4a93ad891963aa7537f2697b7bec30aaf7bc423b82b0efb1b62e78a46 -DIST tsetup.0.10.11.tar.xz 20861112 SHA256 ff5c222e68409f771bc7605d73119c3f64b7132e6465b7b7717b63c7bacb6ae1 SHA512 ff354d20084df0c4da4ffc9e9d879b1a8b59df358cfebc75a8a919e1fb592b3237b78421e9b2c1e6fee6592e278a133f251ffb2a088fa896b5885c4df27a212d WHIRLPOOL 28d160980147c621f565c942d18653eaf187453adef6568502858e0ca516cb7552b28679002fa6c536ddd1ca59621f1bc57586f7d22d45f073833e7b26fbe84d +DIST tdesktop-0.10.19.tar.gz 11485857 SHA256 0620d2c6e2dc254e3d69659d311a6117efef251a16270ba908fec150712b50b4 SHA512 ff7cc265fa1b2f5f83e7dc54e3eaa45999925ad9c0dc0f3c3f376884c021dc4fb1787318a188ef47dc633529da981d2923118bde1b915d01f8c0f68785416b4d WHIRLPOOL 7b2843a8c0cd2d7251cab7287822ba062078361ea291dbe098f64571aac64be6a8c61c0ab6837626b2f72f3070d4e46a76dd999b9040abef9f35c2c8b330f654 DIST tsetup.0.10.16.tar.xz 24950460 SHA256 1fba994ca887f501beccbd75e0e25e0bf7b3c72a42503a730afbd467bd357ebe SHA512 819abb250c813b23a9644e7ac160e0fcbd7e7ccd4c066a78c1dfe5880bad48f79e676e657c33b3e5e35a40fb97f23a0f7adfd928caf18c771cfa337da2ee6d99 WHIRLPOOL d3c027ca03d90d6270715e9769951bb70efbec46e1837bd71d6d086cd8a3242d66ac1124aa74666dc75695cc9ecb8cf86676d983f24f4ed13f25527497187c61 -DIST tsetup32.0.10.11.tar.xz 21452952 SHA256 136efae700013d5e0d6efd088d766f338308d56ddb5b24b179a64e29227f0f20 SHA512 c0555bb7057a2a654515e2f02ab8c039fdd96f9ceb20c8a0555117e0aba096cb7ad568c970505195fb7e53f3c96cfb1d3c6dc8715fd4f5e737c0af80afafb972 WHIRLPOOL 28bfec493da6cb9bc5c8dca2ce1f42aefb2c6fb61e382c98a7037dc30c8bd0934b26c9f088510422c599dffbf2e48f8b02862202a0110a14991f54d8a37db24c +DIST tsetup.0.10.19.tar.xz 24945384 SHA256 586a6d98d8ee412581a73e501287f4bc972fa966f34e62c245878e6ef183042b SHA512 b2c17c778e8a9b4a7a7f07408e850a26f229b230668365a9aef212e17f601b4d9f0d9e2fd5958e1ab7c5f59ab908b4f86a72afb962ecc29fe3b107db0723efc5 WHIRLPOOL 2407dcd1e82c8c618d816b99bbdcec16756d2153f1d1925e72c0137ec3148d3673fb213a457e8f12710b260a082be3792ed736f4fe879e2a226739fb495621f9 DIST tsetup32.0.10.16.tar.xz 25576088 SHA256 1daacb1449a69fe6e81ba1e6675c9e60b8c2c1f018cdaec0426a57c330af1ec1 SHA512 16f71a33b1dd1c7d421963a82b3abc820f949eaf821e9718bb8125301106bd46853d19e323a8c8f94bb67ef7efaefd46c16ab9f396edd1a85b9df58b6490df7d WHIRLPOOL 8bcf7633d2a88353343eebee781488c751ff1863ceb2ed36a6b390e5040c7a399a26b8674d4953bd6efc584df0ad30a0fdfa562d9bf7875305c3d0c0fda658dc +DIST tsetup32.0.10.19.tar.xz 25559412 SHA256 b0f9c9ff51f8caf67f549960b2c4fde3d2d683ac8e77b3ed1c2d4c9e7f3283b3 SHA512 4b613a2dec6a76aebdb9c23ec62a0eadd1e47135d73ef444635bc4b585486d85a7a9fa4ae4a9c6d931de0ffb8745bb12b4437eeb2209008da089d2394f07ab17 WHIRLPOOL d20110f799560a9150898dae1bf6483449ac38fc65ed53714e9a3781ba21093f7285771fb11189bde8e2bd816997e4cdb12e6e7d5274f9cd90557f7470d2ada4 diff --git a/net-im/telegram-desktop-bin/telegram-desktop-bin-0.10.11.ebuild b/net-im/telegram-desktop-bin/telegram-desktop-bin-0.10.19.ebuild similarity index 100% rename from net-im/telegram-desktop-bin/telegram-desktop-bin-0.10.11.ebuild rename to net-im/telegram-desktop-bin/telegram-desktop-bin-0.10.19.ebuild diff --git a/profiles/base/packages b/profiles/base/packages index 3788d1c38c8e..90779ba925a7 100644 --- a/profiles/base/packages +++ b/profiles/base/packages @@ -30,13 +30,10 @@ *app-arch/tar *app-arch/xz-utils *app-shells/bash:0 -#*dev-lang/perl -#*dev-lang/python *net-misc/iputils *net-misc/rsync *net-misc/wget *sys-apps/coreutils -#*sys-apps/debianutils *sys-apps/diffutils *sys-apps/file # Much of the tree relies on newer features like "-exec +". @@ -49,20 +46,13 @@ *sys-apps/less # stopgap solution for functions.sh #373219 and #504116 *sys-apps/openrc -#*>=sys-apps/portage-2.0.51.22 *sys-process/procps *sys-process/psmisc *sys-apps/sed *sys-apps/which -#*sys-devel/autoconf -#*sys-devel/automake *sys-devel/binutils -#*sys-devel/bison -#*sys-devel/flex *sys-devel/gcc *sys-devel/gnuconfig -#*sys-devel/libtool -#*sys-devel/m4 *sys-devel/make *>=sys-devel/patch-2.7 *sys-fs/e2fsprogs diff --git a/profiles/license_groups b/profiles/license_groups index 25d257c02cc5..b94585631061 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -79,7 +79,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina hashcat intel-ucode ipw2100-f # License agreements that try to take away your rights. These are more # restrictive than "all-rights-reserved" or require explicit approval. -EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA GIMPS GOG-EULA google-chrome googleearth Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi +EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA GIMPS GOG-EULA google-chrome googleearth Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi # Deprecated license labels, used by repoman #DEPRECATED as-is diff --git a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild b/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild index 9a1017c7c4be..c2ecde10ff9b 100644 --- a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild +++ b/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild @@ -74,7 +74,6 @@ src_install() { rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die rmdir "${ED}/usr/include" || die - rm -rf "${ED}"/usr/lib/ || die eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF} } diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index c3f5f33b9870..58b34731bfac 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -1,5 +1,4 @@ DIST file-5.22.tar.gz 732556 SHA256 c4e3a8e44cb888c5e4b476e738503e37fb9de3b25a38c143e214bfc12109fc0b SHA512 e9f1648c3b490bac642a2a9e01d31a8bd49c3e2a1feea1b25869aa1d5e37aa99bbf3fdc5d301618a8b97aec046f10e400a57f8a1d0dd61d3583830aaf3fcbda8 WHIRLPOOL de9ce9305fd824d85128617e196fe6b02ea470b63eb2a35d31e857f7cf91e09f85166aaa72695aaf4a7516413b3a146db85588e7da65f32b131a477b3dece176 DIST file-5.25.tar.gz 739485 SHA256 3735381563f69fb4239470b8c51b876a80425348b8285a7cded8b61d6b890eca SHA512 4a5176a7e80df2bb7e45916490433d22eb98a442d49d04146afcbdcf92ff619ea3e73e95c8991e6b6a0628efb9d127bfa4aafc1cae523f8261ca693bc5e13402 WHIRLPOOL 70c682ff05e58487a551cd98091e27272baa41e034157bec93ac4d69b2f3e93caed40f37d64ef698527124e86ba4a5cb5975abacfd9eb30e4d3583262e5f0b0b -DIST file-5.26.tar.gz 773061 SHA256 2ef32b4ec936b0ff7b59a021dce56086a716663b6df1138c7ea597d396bf50cf SHA512 e3251dde54f200b6bcade5db97fda25e73efcb2629ff5c464601c82190e12290b89eb942d820d43aa67ef37be3c0f2db00e7e5c303c083e4a8d1c49499b907dd WHIRLPOOL f8922b8cbfe153347f793e34ba7be1c3e36e55800e22fcb675f971bcc2094781a0784d887ece32760e2586fe6c459f56ce605610225f6746dacd70a922ac9e10 -DIST file-5.27.tar.gz 774063 SHA256 c2e7d509b1167c4915901ecd257ee924d229a348bf988df6d1934ef0fa34a1a7 SHA512 fcf607d367d85b8a971a62793efc79f7e548e029dd7bb41f95bf992c271c514d70cd4bb5c2ca577e470e0ff1df9dca31beaaf19a5fd4e3f617b36061eff46195 WHIRLPOOL ea7483dce63a4b1f5fa7ee2571e918997bcffb46a7267a1fa45990dc33966e04a22f20d01105b268f6e6ca530a3a9c3f20f4f802a445847c60ee7f943cc5b570 DIST file-5.28.tar.gz 777859 SHA256 0ecb5e146b8655d1fa84159a847ee619fc102575205a0ff9c6cc60fc5ee2e012 SHA512 42136505e21b14396e3af4e0d3f349687176cf0771d2dc9fed3599a30c7bab59184459f1e51033bce2d6ee0e292eba034bdfda727decca1219c1b3419e6bbfdc WHIRLPOOL f12889fc2a692084989d7029d8b9c849344e4236df8afc9e46c6441712aace5e07fee3bb05267ef76da7d41fbcb6b21db4e3bf6e22af660d43b2edeb6ff1571c +DIST file-5.29.tar.gz 783919 SHA256 ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0 SHA512 58db17a6bea5d71723f3f7d25300985b3aa78f27fdb1e8b9bb41e61dc325236acaca7c1475cc2725ed672151e1764892dff83d37c24313fe26f45ee3388d4462 WHIRLPOOL e80f117f3db08707c197db2f30aa81407c85b6a5ff0125b41a311c1d6f7dfbf3c0a315ebd1115bef3eecf05beed1fad3570a90d047ecbc7d3a29adcb8ea5c094 diff --git a/sys-apps/file/file-5.26-r1.ebuild b/sys-apps/file/file-5.26-r1.ebuild deleted file mode 100644 index fb300b33091e..000000000000 --- a/sys-apps/file/file-5.26-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) -DISTUTILS_OPTIONAL=1 - -inherit eutils distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://github.com/glensc/file.git" - inherit autotools git-r3 -else - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz - ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -DESCRIPTION="identify a file's format by scanning binary data for patterns" -HOMEPAGE="http://www.darwinsys.com/file/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="python static-libs zlib" - -DEPEND="python? ( ${PYTHON_DEPS} - dev-python/setuptools ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic )" - -PATCHES=( - "${FILESDIR}"/${P}-header-define.patch - "${FILESDIR}"/${P}-nes-magic.patch - "${FILESDIR}"/${P}-php-magic.patch - "${FILESDIR}"/${P}-msoffice-magic.patch - "${FILESDIR}"/${P}-stdin-rpm.patch - "${FILESDIR}"/${P}-tests-fatal.patch - "${FILESDIR}"/${P}-stdin-test.patch - "${FILESDIR}"/${P}-compress-1.patch - "${FILESDIR}"/${P}-compress-2.patch -) - -src_prepare() { - epatch "${PATCHES[@]}" - [[ ${PV} == "9999" ]] && eautoreconf - elibtoolize - - # don't let python README kill main README #60043 - mv python/README{,.python} -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - ac_cv_header_zlib_h=$(usex zlib) \ - ac_cv_lib_z_gzopen=$(usex zlib) - econf \ - $(use_enable static-libs static) -} - -src_configure() { - # when cross-compiling, we need to build up our own file - # because people often don't keep matching host/target - # file versions #362941 - if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then - mkdir -p "${WORKDIR}"/build - cd "${WORKDIR}"/build - tc-export_build_env BUILD_C{C,XX} - ECONF_SOURCE=${S} \ - ac_cv_header_zlib_h=no \ - ac_cv_lib_z_gzopen=no \ - CHOST=${CBUILD} \ - CFLAGS=${BUILD_CFLAGS} \ - CXXFLAGS=${BUILD_CXXFLAGS} \ - CPPFLAGS=${BUILD_CPPFLAGS} \ - LDFLAGS="${BUILD_LDFLAGS} -static" \ - CC=${BUILD_CC} \ - CXX=${BUILD_CXX} \ - econf --disable-shared - fi - - multilib-minimal_src_configure -} - -multilib_src_compile() { - if multilib_is_native_abi ; then - emake - else - emake -C src libmagic.la - fi -} - -src_compile() { - if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then - emake -C "${WORKDIR}"/build/src file - PATH="${WORKDIR}/build/src:${PATH}" - fi - multilib-minimal_src_compile - - use python && cd python && distutils-r1_src_compile -} - -multilib_src_install() { - if multilib_is_native_abi ; then - default - else - emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" - fi -} - -multilib_src_install_all() { - dodoc ChangeLog MAINT README - - use python && cd python && distutils-r1_src_install - prune_libtool_files -} diff --git a/sys-apps/file/file-5.27.ebuild b/sys-apps/file/file-5.29.ebuild similarity index 91% rename from sys-apps/file/file-5.27.ebuild rename to sys-apps/file/file-5.29.ebuild index 658a92fa32a2..cef9687a7c4b 100644 --- a/sys-apps/file/file-5.27.ebuild +++ b/sys-apps/file/file-5.29.ebuild @@ -43,11 +43,10 @@ src_prepare() { multilib_src_configure() { ECONF_SOURCE=${S} \ - ac_cv_header_zlib_h=$(usex zlib) \ - ac_cv_lib_z_gzopen=$(usex zlib) econf \ --enable-fsect-man5 \ - $(use_enable static-libs static) + $(use_enable static-libs static) \ + $(use_enable zlib) } src_configure() { @@ -78,12 +77,15 @@ multilib_src_compile() { if multilib_is_native_abi ; then emake else - emake -C src libmagic.la + cd src + emake magic.h #586444 + emake libmagic.la fi } src_compile() { if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then + emake -C "${WORKDIR}"/build/src magic.h #586444 emake -C "${WORKDIR}"/build/src file PATH="${WORKDIR}/build/src:${PATH}" fi @@ -96,7 +98,7 @@ multilib_src_install() { if multilib_is_native_abi ; then default else - emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" + emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}" fi } diff --git a/sys-apps/file/files/file-5.26-compress-1.patch b/sys-apps/file/files/file-5.26-compress-1.patch deleted file mode 100644 index b10bfd21a32b..000000000000 --- a/sys-apps/file/files/file-5.26-compress-1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 52ae939467583ec499f6c62cdb406e8f982c0310 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 19 Apr 2016 13:39:19 +0000 -Subject: [PATCH] Fix compression code (Werner Fink) - ---- - src/compress.c | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/src/compress.c b/src/compress.c -index f322445..0ebc837 100644 ---- a/src/compress.c -+++ b/src/compress.c -@@ -231,9 +231,9 @@ file_zmagic(struct magic_set *ms, int fd, const char *name, - goto error; - DPRINTF("rv = %d\n", rv); - if ((ms->flags & MAGIC_COMPRESS_TRANSP) != 0) -- goto out; -+ break; - if (mime != MAGIC_MIME && mime != 0) -- goto out; -+ break; - if ((file_printf(ms, - mime ? " compressed-encoding=" : " (")) == -1) - goto error; -@@ -250,16 +250,19 @@ file_zmagic(struct magic_set *ms, int fd, const char *name, - } - if (!mime && file_printf(ms, ")") == -1) - goto error; -- goto out; -+ /*FALLTHROUGH*/ - case NODATA: -- goto out; -+ break; - default: - abort(); -+ /*NOTREACHED*/ -+ error: -+ rv = -1; -+ break; - } - } --out: -- rv = 1; --error: -+ DPRINTF("rv = %d\n", rv); -+ - #ifdef HAVE_SIGNAL_H - (void)signal(SIGPIPE, osigpipe); - #endif --- -2.7.4 - diff --git a/sys-apps/file/files/file-5.26-compress-2.patch b/sys-apps/file/files/file-5.26-compress-2.patch deleted file mode 100644 index d27656f7fec8..000000000000 --- a/sys-apps/file/files/file-5.26-compress-2.patch +++ /dev/null @@ -1,73 +0,0 @@ -http://mx.gw.com/pipermail/file/2016/001978.html - -From 26879a2b5ec6880cb46b416880e520c628927abd Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 19 Apr 2016 23:36:36 +0000 -Subject: [PATCH] Restore part of previous logic, that breaks out of the - uncompress loop if there was a compression match error or not. Separate the - return values to avoid confusion. - ---- - src/compress.c | 23 ++++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) - -diff --git a/src/compress.c b/src/compress.c -index 0ebc837..2a95f85 100644 ---- a/src/compress.c -+++ b/src/compress.c -@@ -187,7 +187,7 @@ file_zmagic(struct magic_set *ms, int fd, const char *name, - size_t i, nsz; - char *rbuf; - file_pushbuf_t *pb; -- int rv = 0; -+ int urv, prv, rv = 0; - int mime = ms->flags & MAGIC_MIME; - #ifdef HAVE_SIGNAL_H - sig_t osigpipe; -@@ -214,26 +214,26 @@ file_zmagic(struct magic_set *ms, int fd, const char *name, - if (!zm) - continue; - nsz = nbytes; -- rv = uncompressbuf(fd, ms->bytes_max, i, buf, &newbuf, &nsz); -+ urv = uncompressbuf(fd, ms->bytes_max, i, buf, &newbuf, &nsz); - DPRINTF("uncompressbuf = %d, %s, %zu\n", rv, (char *)newbuf, - nsz); -- switch (rv) { -+ switch (urv) { - case OKDATA: - case ERRDATA: - - ms->flags &= ~MAGIC_COMPRESS; -- if (rv == ERRDATA) -- rv = file_printf(ms, "%s ERROR: %s", -+ if (urv == ERRDATA) -+ prv = file_printf(ms, "%s ERROR: %s", - methodname(i), newbuf); - else -- rv = file_buffer(ms, -1, name, newbuf, nsz); -- if (rv == -1) -+ prv = file_buffer(ms, -1, name, newbuf, nsz); -+ if (prv == -1) - goto error; -- DPRINTF("rv = %d\n", rv); -+ rv = 1; - if ((ms->flags & MAGIC_COMPRESS_TRANSP) != 0) -- break; -+ goto out; - if (mime != MAGIC_MIME && mime != 0) -- break; -+ goto out; - if ((file_printf(ms, - mime ? " compressed-encoding=" : " (")) == -1) - goto error; -@@ -261,6 +261,7 @@ file_zmagic(struct magic_set *ms, int fd, const char *name, - break; - } - } -+out: - DPRINTF("rv = %d\n", rv); - - #ifdef HAVE_SIGNAL_H --- -2.7.4 - diff --git a/sys-apps/file/files/file-5.26-header-define.patch b/sys-apps/file/files/file-5.26-header-define.patch deleted file mode 100644 index 349614f8c930..000000000000 --- a/sys-apps/file/files/file-5.26-header-define.patch +++ /dev/null @@ -1,26 +0,0 @@ -http://mx.gw.com/pipermail/file/2016/001955.html - -From c4b6ea9b998882d08692599e28f4245714eaf8bb Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Sun, 17 Apr 2016 13:56:03 +0000 -Subject: [PATCH] add missing define. - ---- - src/magic.h.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/magic.h.in b/src/magic.h.in -index 1e567cd..3d6954a 100644 ---- a/src/magic.h.in -+++ b/src/magic.h.in -@@ -114,6 +114,7 @@ int magic_errno(magic_t); - #define MAGIC_PARAM_ELF_SHNUM_MAX 3 - #define MAGIC_PARAM_ELF_NOTES_MAX 4 - #define MAGIC_PARAM_REGEX_MAX 5 -+#define MAGIC_PARAM_BYTES_MAX 6 - - int magic_setparam(magic_t, int, const void *); - int magic_getparam(magic_t, int, void *); --- -2.7.4 - diff --git a/sys-apps/file/files/file-5.26-msoffice-magic.patch b/sys-apps/file/files/file-5.26-msoffice-magic.patch deleted file mode 100644 index a43d3f16dd91..000000000000 --- a/sys-apps/file/files/file-5.26-msoffice-magic.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 84609201fbbd9074f5426b991c5242a08ed78712 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 19 Apr 2016 18:14:19 +0000 -Subject: [PATCH] Strengthen the magic of relocatable microsoft objects to - avoid spurious matches (Joerg Jenderek) - ---- - magic/Magdir/xenix | 23 +++++++++++++++++++++-- - 1 file changed, 21 insertions(+), 2 deletions(-) - -diff --git a/magic/Magdir/xenix b/magic/Magdir/xenix -index 38e1e3c..ca5eaae 100644 ---- a/magic/Magdir/xenix -+++ b/magic/Magdir/xenix -@@ -12,7 +12,26 @@ - # XXX - "x.out" collides with PDP-11 archives - # - 0 string core core file (Xenix) --0 byte 0x80 8086 relocatable (Microsoft) -+# URL: http://www.polarhome.com/service/man/?qf=86rel&tf=2&of=Xenix -+# Reference: http://www.azillionmonkeys.com/qed/Omfg.pdf -+# Update: Joerg Jenderek -+# recordtype~TranslatorHEADerRecord -+0 byte 0x80 -+# GRR: line above is too general as it catches also Extensible storage engine DataBase -+# skip examples like GENA.SND Switch.Snd by looking for record length maximal 1024-3 -+>1 uleshort <1022 -+# skip examples like GAME.PICTURE Strange.Pic by looking for positiv record length -+>>1 uleshort >0 -+# skip examples like Xtable.Data FRACTAL.GEN SHR.VIEW by looking for positiv string length -+>>>3 ubyte >0 -+# skip examples like OMBRE.6 with "UUUUUU" by looking for filename like "hello.c" -+>>>>4 regex [a-zA-Z_/]{1,8}[.] 8086 relocatable (Microsoft) -+#!:mime application/octet-stream -+!:mime application/x-object -+!:ext o/a -+>>>>>3 pstring x \b, "%s" -+# checksum -+#>>>>>(3.b+4) ubyte x \b, checksum 0x%2.2x - 0 leshort 0xff65 x.out - >2 string __.SYMDEF randomized - >0 byte x archive --- -2.7.4 - diff --git a/sys-apps/file/files/file-5.26-nes-magic.patch b/sys-apps/file/files/file-5.26-nes-magic.patch deleted file mode 100644 index 0cc43b0f3d61..000000000000 --- a/sys-apps/file/files/file-5.26-nes-magic.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://mx.gw.com/pipermail/file/2016/001969.html - -From 402b28ae533f5d013cd44e29eeaf64bcd4e5a925 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Mon, 18 Apr 2016 20:22:10 +0000 -Subject: [PATCH] Add missing continuation - ---- - magic/Magdir/console | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/magic/Magdir/console b/magic/Magdir/console -index ed69f43..9448223 100644 ---- a/magic/Magdir/console -+++ b/magic/Magdir/console -@@ -53,7 +53,7 @@ - # so most of the data isn't easily parseable. - # - 0 string UNIF --4 lelong <16 UNIF v%d format NES ROM image -+>4 lelong <16 UNIF v%d format NES ROM image - - #------------------------------------------------------------------------------ - # gameboy: file(1) magic for the Nintendo (Color) Gameboy raw ROM format --- -2.7.4 - diff --git a/sys-apps/file/files/file-5.26-php-magic.patch b/sys-apps/file/files/file-5.26-php-magic.patch deleted file mode 100644 index 310af1b6e05d..000000000000 --- a/sys-apps/file/files/file-5.26-php-magic.patch +++ /dev/null @@ -1,28 +0,0 @@ -http://mx.gw.com/pipermail/file/2016/001947.html -http://mx.gw.com/pipermail/file/2016/001949.html - -From a5995b6e56c1a476360ccc58598a389f6cd71948 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 19 Apr 2016 13:40:02 +0000 -Subject: [PATCH] Fix wrong level - ---- - magic/Magdir/commands | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/magic/Magdir/commands b/magic/Magdir/commands -index 95109f3..fddb764 100644 ---- a/magic/Magdir/commands -+++ b/magic/Magdir/commands -@@ -101,7 +101,7 @@ - 0 string =5 regex [\ \n] - >>6 string /*\ Smarty\ version Smarty compiled template -->24 regex [0-9.]+ \b, version %s -+>>>24 regex [0-9.]+ \b, version %s - !:mime text/x-php - - 0 string Zend\x00 PHP script Zend Optimizer data --- -2.7.4 - diff --git a/sys-apps/file/files/file-5.26-stdin-rpm.patch b/sys-apps/file/files/file-5.26-stdin-rpm.patch deleted file mode 100644 index 7ba5072daf1a..000000000000 --- a/sys-apps/file/files/file-5.26-stdin-rpm.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://mx.gw.com/pipermail/file/2016/001975.html - -From 11edb37a71851b5bcbd4e51ca6ad3dcbf57e9761 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Tue, 19 Apr 2016 20:51:54 +0000 -Subject: [PATCH] Revert: Don't close stdin... - ---- - src/magic.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/magic.c b/src/magic.c -index 46e4678..8cf6269 100644 ---- a/src/magic.c -+++ b/src/magic.c -@@ -346,7 +346,7 @@ private void - close_and_restore(const struct magic_set *ms, const char *name, int fd, - const struct stat *sb) - { -- if (name == NULL) -+ if (fd == STDIN_FILENO || name == NULL) - return; - (void) close(fd); - --- -2.7.4 - diff --git a/sys-apps/file/files/file-5.26-stdin-test.patch b/sys-apps/file/files/file-5.26-stdin-test.patch deleted file mode 100644 index 85e59a5dced8..000000000000 --- a/sys-apps/file/files/file-5.26-stdin-test.patch +++ /dev/null @@ -1,132 +0,0 @@ -http://mx.gw.com/pipermail/file/2016/001963.html - -From 20c59ad54afc7427ea680f84c8ee5a576ba54b08 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Mon, 18 Apr 2016 15:10:34 +0000 -Subject: [PATCH] Downgrade DER comparison and offset lookup failures to be - handled as match failures. - ---- - src/softmagic.c | 60 ++++++++++++++++++++++++++++++++++++++------------------- - 1 file changed, 40 insertions(+), 20 deletions(-) - -diff --git a/src/softmagic.c b/src/softmagic.c -index 14a8bc5..5b5f0f9 100644 ---- a/src/softmagic.c -+++ b/src/softmagic.c -@@ -186,11 +186,11 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, - ((text && (m->str_flags & FLT) == STRING_BINTEST) || - (!text && (m->str_flags & FLT) == STRING_TEXTTEST))) || - (m->flag & mode) != mode) { -+flush: - /* Skip sub-tests */ -- while (magindex + 1 < nmagic && -- magic[magindex + 1].cont_level != 0 && -- ++magindex) -- continue; -+ while (magindex < nmagic - 1 && -+ magic[magindex + 1].cont_level != 0) -+ magindex++; - continue; /* Skip to next top-level test*/ - } - -@@ -227,10 +227,7 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, - * main entry didn't match, - * flush its continuations - */ -- while (magindex < nmagic - 1 && -- magic[magindex + 1].cont_level != 0) -- magindex++; -- continue; -+ goto flush; - } - - if ((e = handle_annotation(ms, m)) != 0) { -@@ -255,8 +252,14 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, - if (print && mprint(ms, m) == -1) - return -1; - -- if (moffset(ms, m, nbytes, &ms->c.li[cont_level].off) == -1) -+ switch (moffset(ms, m, nbytes, &ms->c.li[cont_level].off)) { -+ case -1: - return -1; -+ case 0: -+ goto flush; -+ default: -+ break; -+ } - - /* and any continuations that match */ - if (file_check_mem(ms, ++cont_level) == -1) -@@ -362,9 +365,16 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, - if (print && mprint(ms, m) == -1) - return -1; - -- if (moffset(ms, m, nbytes, -- &ms->c.li[cont_level].off) == -1) -+ switch (moffset(ms, m, nbytes, -+ &ms->c.li[cont_level].off)) { -+ case -1: - return -1; -+ case 0: -+ flush = 1; -+ break; -+ default: -+ break; -+ } - - if (*m->desc) - *need_separator = 1; -@@ -813,9 +823,13 @@ moffset(struct magic_set *ms, struct magic *m, size_t nbytes, int32_t *op) - case FILE_DER: - { - o = der_offs(ms, m, nbytes); -- if (o == -1) { -- file_error(ms, 0, "EOF computing DER offset"); -- return -1; -+ if (o == -1 || (size_t)o > nbytes) { -+ if ((ms->flags & MAGIC_DEBUG) != 0) { -+ (void)fprintf(stderr, -+ "Bad DER offset %d nbytes=%zu", -+ o, nbytes); -+ } -+ return 0; - } - break; - } -@@ -825,12 +839,13 @@ moffset(struct magic_set *ms, struct magic *m, size_t nbytes, int32_t *op) - break; - } - -- if ((size_t)o >= nbytes) { -- file_error(ms, 0, "Offset out of range"); -+ if ((size_t)o > nbytes) { -+ file_error(ms, 0, "Offset out of range %zu > %zu", -+ (size_t)o, nbytes); - return -1; - } - *op = o; -- return 0; -+ return 1; - } - - private uint32_t -@@ -2107,8 +2122,13 @@ magiccheck(struct magic_set *ms, struct magic *m) - return 1; - case FILE_DER: - matched = der_cmp(ms, m); -- if (matched == -1) -- file_error(ms, 0, "EOF comparing DER entries"); -+ if (matched == -1) { -+ if ((ms->flags & MAGIC_DEBUG) != 0) { -+ (void) fprintf(stderr, -+ "EOF comparing DER entries"); -+ } -+ return 0; -+ } - return matched; - default: - file_magerror(ms, "invalid type %d in magiccheck()", m->type); --- -2.7.4 - diff --git a/sys-apps/file/files/file-5.26-tests-fatal.patch b/sys-apps/file/files/file-5.26-tests-fatal.patch deleted file mode 100644 index 29c9338e9b6b..000000000000 --- a/sys-apps/file/files/file-5.26-tests-fatal.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://mx.gw.com/pipermail/file/2016/001961.html - -From fe1b14d68fe47a0641606c142222d6b0fb9e05d9 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Mon, 18 Apr 2016 18:16:45 +0000 -Subject: [PATCH] exit on error. - ---- - tests/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index c2cb5ee..e55cdf4 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -13,7 +13,7 @@ issue311docx.testfile - T = $(top_srcdir)/tests - check-local: - MAGIC=$(top_builddir)/magic/magic ./test -- for i in $T/*.testfile; do echo Running test: $$i; MAGIC=$(top_builddir)/magic/magic ./test $$i $${i%%.testfile}.result; done -+ set -e; for i in $T/*.testfile; do echo Running test: $$i; MAGIC=$(top_builddir)/magic/magic ./test $$i $${i%%.testfile}.result; done - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. --- -2.7.4 - diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest index 25c18252bf00..c72d12708b02 100644 --- a/sys-apps/less/Manifest +++ b/sys-apps/less/Manifest @@ -1,3 +1,4 @@ DIST code2color-0.2 200711 SHA256 2365c9009b1cc3c30430b88775ec402164df105fd12364871d05dcaed20be954 SHA512 c0ab9f411d5a106c81334343e3c4a63b67d27b95e2d128145e3ac1ee46cd6c228c61796cf96e51826e69b3e465e7bdaa81b1a48cad934c23b310f2ea2ebd8e75 WHIRLPOOL d0207e84a5849c554b1dfc5882ab46d8afc411c7d26e912235ec05565880e6ed0db8449133502234a01ae8f59feae211486b6a523e37859d8404f72fff9b8f93 DIST less-481.tar.gz 316622 SHA256 3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5 SHA512 29995757ac416ed6770cf6e82e6fe325bd1d61d51666d80c4fe72b2b4217b0b1d706d337d89ed54bdc4d83d57f3e2c0166e642b20ef2ad194e52aad630b3e717 WHIRLPOOL e5c8b22d7d1149feafdad0130e00aa5564e818a845c3b4e2b6d151e851dd64ff390fdad01ee79580fe6ab92defc11930d3f3e0ca0d189d2882419444a3d7028c DIST less-483.tar.gz 316897 SHA256 7ebb1a0a141a94f863c0b83eff94fb115d716802fabe8007e442adbaf81ce41f SHA512 2377e439516655f365cc02484cda9a7079e53684d774e6499d4afaef4d7ac72eab109924af14122f51bff2e2f15d527ab5bc513f3600f22c9bd8e722cb8392bc WHIRLPOOL e54fe3a4a9366f5220129e64a63ef1827d893c88e148783305076042aa112f0d00253601634678d83ab2b20c5c7ba820a7f1dd057c950ba043a7379d17b6a0ba +DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a WHIRLPOOL e1a6c5dc2ea17e57226083f022d3c39b8a9d17428b7aa15385138680e78fa1ee22800e216a40fe5aa0ca38ca4c0025792a2839031faabdf8f9384dec3c750f74 diff --git a/sys-apps/less/less-487.ebuild b/sys-apps/less/less-487.ebuild new file mode 100644 index 000000000000..e782e9af867e --- /dev/null +++ b/sys-apps/less/less-487.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +DESCRIPTION="Excellent text file viewer" +HOMEPAGE="http://www.greenwoodsoftware.com/less/" +SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz" + +LICENSE="|| ( GPL-3 BSD-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 ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="pcre unicode" + +DEPEND=">=app-misc/editor-wrapper-3 + >=sys-libs/ncurses-5.2:0= + pcre? ( dev-libs/libpcre )" +RDEPEND="${DEPEND}" + +src_prepare() { + chmod a+x configure || die +} + +src_configure() { + export ac_cv_lib_ncursesw_initscr=$(usex unicode) + export ac_cv_lib_ncurses_initscr=$(usex !unicode) + econf \ + --with-regex=$(usex pcre pcre posix) \ + --with-editor="${EPREFIX}"/usr/libexec/editor +} + +src_install() { + default + + newbin "${FILESDIR}"/lesspipe.sh lesspipe + newenvd "${FILESDIR}"/less.envd 70less +} + +pkg_preinst() { + if has_version "<${CATEGORY}/${PN}-483-r1" ; then + elog "The lesspipe.sh symlink has been dropped. If you are still setting" + elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'." + elog "Colorization support has been dropped. If you want that, check out" + elog "the new app-text/lesspipe package." + fi +} diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 65444a8b1ba9..6a09eb1c944d 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -115,8 +115,6 @@ src_unpack() { src_prepare() { python_setup - # automatically select active system GCC's libraries, bugs #406163 and #417913 - eapply "${FILESDIR}"/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch # support overriding clang runtime install directory eapply "${FILESDIR}"/9999/0005-cmake-Supporting-overriding-runtime-libdir-via-CLANG.patch # support overriding LLVMgold.so plugin directory @@ -145,6 +143,10 @@ multilib_src_configure() { # TODO: get them properly conditional #-DLLVM_BUILD_TESTS=$(usex test) + # these are not propagated reliably, so redefine them + -DLLVM_ENABLE_EH=ON + -DLLVM_ENABLE_RTTI=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) # libgomp support fails to find headers without explicit -I # furthermore, it provides only syntax checking diff --git a/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch b/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch deleted file mode 100644 index 00bf28016eba..000000000000 --- a/sys-devel/clang/files/9999/0002-driver-Support-obtaining-active-toolchain-from-gcc-c.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0384060d2de35ee56aa252cc18eccf773d674d56 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Fri, 5 Sep 2014 16:49:35 +0200 -Subject: [PATCH] driver: Support obtaining active toolchain from gcc-config on - Gentoo - -Author: Richard Yao -Bug: https://bugs.gentoo.org/406163 -Bug: https://bugs.gentoo.org/417913 ---- - lib/Driver/ToolChains.cpp | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp -index 67f165c..0f0d786 100644 ---- a/lib/Driver/ToolChains.cpp -+++ b/lib/Driver/ToolChains.cpp -@@ -1430,6 +1430,31 @@ void Generic_GCC::GCCInstallationDetector::init( - } - } - -+ // Try to respect gcc-config on Gentoo. However, do that only -+ // if --gcc-toolchain is not provided or equal to the Gentoo default. -+ // This avoids accidentally enforcing system GCC version when using -+ // a custom toolchain. -+ if (GCCToolchainDir == "" || GCCToolchainDir == D.SysRoot + "/usr") { -+ for (unsigned k = 0, ke = CandidateTripleAliases.size(); k < ke; ++k) { -+ llvm::ErrorOr> File = -+ llvm::MemoryBuffer::getFile(D.SysRoot + "/etc/env.d/gcc/config-" + CandidateTripleAliases[k].str()); -+ if (File) -+ { -+ const std::string VersionText = File.get()->getBuffer().rsplit('-').second.substr(0,5).str(); -+ const std::string GentooPath = D.SysRoot + "/usr/lib/gcc/" + CandidateTripleAliases[k].str() + "/" + VersionText; -+ if (llvm::sys::fs::exists(GentooPath + "/crtbegin.o")) -+ { -+ Version = GCCVersion::Parse(VersionText); -+ GCCInstallPath = GentooPath; -+ GCCParentLibPath = GCCInstallPath + "/../../.."; -+ GCCTriple.setTriple(CandidateTripleAliases[k]); -+ IsValid = true; -+ return; -+ } -+ } -+ } -+ } -+ - // Loop over the various components which exist and select the best GCC - // installation available. GCC installs are ranked by version number. - Version = GCCVersion::Parse("0.0.0"); --- -2.10.0 - diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest index d2d9bfcb69fe..f7afacdbfb10 100644 --- a/sys-kernel/git-sources/Manifest +++ b/sys-kernel/git-sources/Manifest @@ -1,2 +1,3 @@ DIST linux-4.8.tar.xz 91966856 SHA256 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a SHA512 a48a065f21e1c7c4de4cf8ca47b8b8d9a70f86b64e7cfa6e01be490f78895745b9c8790734b1d22182cf1f930fb87eaaa84e62ec8cc1f64ac4be9b949e7c0358 WHIRLPOOL 3888c8c07db0c069f827245d4d7306087f78f7d03e8240eb1fcd13622cd5dbe1c17cd8ed7dc11513f77f3efd5dbd84e2b48e82bdb9b9bfd2242fd62ae32812d5 DIST patch-4.9-rc1.xz 6697396 SHA256 427d6035e65ec53889b1d0c30facfe1c2e80f1617b2842011311f82a4338b295 SHA512 978643c86a428f89616e1149aa05547d965fc5c4b8264ef0847ff10a987f33c9d0d549c28a8f832c79781676691227bfff1601266fe9f0bcdb4ad3a5a8e1a3ed WHIRLPOOL 755cbc5ad1362ac8c938c2d4de39f23b685fc9e0ca9a56d1746efc6c2d935bafc8f3d85f147db9ac6ef556e7178fa68751e3ff00185db83bb7429b01df679629 +DIST patch-4.9-rc2.xz 6748836 SHA256 a1d5fba9bcf704566ac096fe16bb417421aa426f490240d3219a1f7201d4ea99 SHA512 28bea3f4d00b1b61944517f38efeb60226ef7498fa991370e8bf5fadf536722fed0fbbda94ad1842e50c5599227bce1e8f27340956dc285e9ed4d2fc72170fb3 WHIRLPOOL 2436ef0d669b5e9ea0351d334e07a194d5dfe36cb25fa1e5b0421f8e72a5a21d30c5bf3897f42777da037d37887c272b7086f137591eb8bc83fb141adb6315b6 diff --git a/sys-kernel/git-sources/git-sources-4.9_rc2.ebuild b/sys-kernel/git-sources/git-sources-4.9_rc2.ebuild new file mode 100644 index 000000000000..462921a42a37 --- /dev/null +++ b/sys-kernel/git-sources/git-sources-4.9_rc2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +UNIPATCH_STRICTORDER="yes" +K_NOUSENAME="yes" +K_NOSETEXTRAVERSION="yes" +K_NOUSEPR="yes" +K_SECURITY_UNSUPPORTED="1" +K_BASE_VER="4.8" +K_EXP_GENPATCHES_NOUSE="1" +K_FROM_GIT="yes" +ETYPE="sources" +CKV="${PVR/-r/-git}" + +# only use this if it's not an _rc/_pre release +[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}" +inherit kernel-2 +detect_version + +DESCRIPTION="The very latest -git version of the Linux kernel" +HOMEPAGE="https://www.kernel.org" +SRC_URI="${KERNEL_URI}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" + +K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and +experimental nature. If you have any issues, try a matching vanilla-sources +ebuild -- if the problem is not there, please contact the upstream kernel +developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to +report the problem so it can be fixed in time for the next kernel release." + +RDEPEND="" +DEPEND="${RDEPEND} + >=sys-devel/patch-2.7.4" + +pkg_postinst() { + postinst_sources +} diff --git a/www-client/seamonkey-bin/metadata.xml b/www-client/seamonkey-bin/metadata.xml index 43e340ec9a9a..19b8198d9b8c 100644 --- a/www-client/seamonkey-bin/metadata.xml +++ b/www-client/seamonkey-bin/metadata.xml @@ -1,15 +1,6 @@ - - elizabeth@interlinked.me - Elizabeth Myers - Proxied maintainer; set to assignee in all bugs - - - proxy-maint@gentoo.org - Proxy Maintainers - mozilla@gentoo.org Gentoo Mozilla Team diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-367.35-pax.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-367.35-pax.patch new file mode 100644 index 000000000000..b615064ddc42 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-367.35-pax.patch @@ -0,0 +1,404 @@ +diff -urp work.orig/kernel/common/inc/nv-linux.h work/kernel/common/inc/nv-linux.h +--- work.orig/kernel/common/inc/nv-linux.h 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/common/inc/nv-linux.h 2016-07-16 22:45:59.870806346 +0200 +@@ -1308,6 +1308,9 @@ extern void *nvidia_stack_t_cache; + #define NV_KMEM_CACHE_CREATE(name, type) \ + NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, 0, NULL) + ++#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type) \ ++ NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, SLAB_USERCOPY, NULL) ++ + #define NV_KMEM_CACHE_DESTROY(kmem_cache) \ + kmem_cache_destroy(kmem_cache) + +diff -urp work.orig/kernel/common/inc/nv-modeset-interface.h work/kernel/common/inc/nv-modeset-interface.h +--- work.orig/kernel/common/inc/nv-modeset-interface.h 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/common/inc/nv-modeset-interface.h 2016-07-16 22:46:16.223400774 +0200 +@@ -72,7 +72,7 @@ typedef struct { + * mix nvidia and nvidia-modeset kernel modules from different + * releases. + */ +- const char *version_string; ++// const char *version_string; + + /* + * Return system information. +@@ -117,6 +117,6 @@ typedef struct { + + } nvidia_modeset_rm_ops_t; + +-NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops); ++NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string); + + #endif /* _NV_MODESET_INTERFACE_H_ */ +diff -urp work.orig/kernel/common/inc/nv-register-module.h work/kernel/common/inc/nv-register-module.h +--- work.orig/kernel/common/inc/nv-register-module.h 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/common/inc/nv-register-module.h 2016-07-16 22:45:59.870806346 +0200 +@@ -34,7 +34,7 @@ typedef struct nvidia_module_s { + int (*ioctl)(struct inode *, struct file * file, unsigned int cmd, unsigned long arg); + unsigned int (*poll)(struct file * file, poll_table *wait); + +-} nvidia_module_t; ++} __do_const nvidia_module_t; + + int nvidia_register_module(nvidia_module_t *); + int nvidia_unregister_module(nvidia_module_t *); +diff -urp work.orig/kernel/nvidia/nv.c work/kernel/nvidia/nv.c +--- work.orig/kernel/nvidia/nv.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv.c 2016-07-16 22:45:59.874809435 +0200 +@@ -654,7 +654,7 @@ int __init nvidia_init_module(void) + NV_SPIN_LOCK_INIT(&km_lock); + #endif + +- nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name, ++ nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE_USERCOPY(nvidia_stack_cache_name, + nvidia_stack_t); + if (nvidia_stack_t_cache == NULL) + { +diff -urp work.orig/kernel/nvidia/nv-chrdev.c work/kernel/nvidia/nv-chrdev.c +--- work.orig/kernel/nvidia/nv-chrdev.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv-chrdev.c 2016-07-16 22:45:59.874809435 +0200 +@@ -20,8 +20,6 @@ int nv_register_chrdev(void *param) + { + nvidia_module_t *module = (nvidia_module_t *)param; + +- module->instance = nv_module_instance; +- + return (nvidia_register_module(module)); + } + +diff -urp work.orig/kernel/nvidia/nv-instance.c work/kernel/nvidia/nv-instance.c +--- work.orig/kernel/nvidia/nv-instance.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv-instance.c 2016-07-16 22:45:59.874809435 +0200 +@@ -51,6 +51,7 @@ struct pci_driver nv_pci_driver = { + nvidia_module_t nv_fops = { + .owner = THIS_MODULE, + .module_name = MODULE_NAME, ++ .instance = MODULE_INSTANCE_NUMBER, + .open = nvidia_open, + .close = nvidia_close, + .ioctl = nvidia_ioctl, +diff -urp work.orig/kernel/nvidia/nv-mmap.c work/kernel/nvidia/nv-mmap.c +--- work.orig/kernel/nvidia/nv-mmap.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv-mmap.c 2016-07-16 22:45:59.874809435 +0200 +@@ -113,12 +113,12 @@ nvidia_vma_release(struct vm_area_struct + } + + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_ACCESS) +-static int ++static ssize_t + nvidia_vma_access( + struct vm_area_struct *vma, + unsigned long addr, + void *buffer, +- int length, ++ size_t length, + int write + ) + { +diff -urp work.orig/kernel/nvidia/nv-modeset-interface.c work/kernel/nvidia/nv-modeset-interface.c +--- work.orig/kernel/nvidia/nv-modeset-interface.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv-modeset-interface.c 2016-07-16 22:54:36.567962197 +0200 +@@ -100,10 +100,9 @@ static NvU32 nvidia_modeset_enumerate_gp + return count; + } + +-NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops) ++NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string) + { +- const nvidia_modeset_rm_ops_t local_rm_ops = { +- .version_string = NV_VERSION_STRING, ++ static const nvidia_modeset_rm_ops_t local_rm_ops = { + .system_info = { + .allow_write_combining = NV_FALSE, + }, +@@ -116,17 +115,26 @@ NV_STATUS nvidia_get_rm_ops(nvidia_modes + .set_callbacks = nvidia_modeset_set_callbacks, + }; + +- if (strcmp(rm_ops->version_string, NV_VERSION_STRING) != 0) ++ static const nvidia_modeset_rm_ops_t local_rm_ops_wc = { ++ .system_info = { ++ .allow_write_combining = NV_TRUE, ++ }, ++ .alloc_stack = nvidia_modeset_rm_ops_alloc_stack, ++ .free_stack = nvidia_modeset_rm_ops_free_stack, ++ .enumerate_gpus = nvidia_modeset_enumerate_gpus, ++ .open_gpu = nvidia_dev_get, ++ .close_gpu = nvidia_dev_put, ++ .op = rm_kernel_rmapi_op, /* provided by nv-kernel.o */ ++ .set_callbacks = nvidia_modeset_set_callbacks, ++ }; ++ ++ if (strcmp(*version_string, NV_VERSION_STRING) != 0) + { +- rm_ops->version_string = NV_VERSION_STRING; ++ *version_string = NV_VERSION_STRING; + return NV_ERR_GENERIC; + } + +- *rm_ops = local_rm_ops; +- +- if (NV_ALLOW_WRITE_COMBINING(NV_MEMORY_TYPE_FRAMEBUFFER)) { +- rm_ops->system_info.allow_write_combining = NV_TRUE; +- } ++ *rm_ops = NV_ALLOW_WRITE_COMBINING(NV_MEMORY_TYPE_FRAMEBUFFER) ? &local_rm_ops_wc : &local_rm_ops; + + return NV_OK; + } +diff -urp work.orig/kernel/nvidia-drm/nvidia-drm-drv.c work/kernel/nvidia-drm/nvidia-drm-drv.c +--- work.orig/kernel/nvidia-drm/nvidia-drm-drv.c 2016-07-12 06:53:45.000000000 +0200 ++++ work/kernel/nvidia-drm/nvidia-drm-drv.c 2016-07-16 22:45:59.878812524 +0200 +@@ -592,7 +592,7 @@ static const struct drm_ioctl_desc nv_dr + DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), + }; + +-static struct drm_driver nv_drm_driver = { ++static drm_driver_no_const nv_drm_driver __read_only = { + + .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER, + +@@ -649,6 +649,7 @@ static void nvidia_update_drm_driver_fea + return; + } + ++ pax_open_kernel(); + nv_drm_driver.driver_features |= DRIVER_MODESET | DRIVER_ATOMIC; + + nv_drm_driver.master_set = nvidia_drm_master_set; +@@ -657,6 +658,7 @@ static void nvidia_update_drm_driver_fea + nv_drm_driver.dumb_create = nvidia_drm_dumb_create; + nv_drm_driver.dumb_map_offset = nvidia_drm_dumb_map_offset; + nv_drm_driver.dumb_destroy = drm_gem_dumb_destroy; ++ pax_close_kernel(); + + #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + } +diff -urp work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c work/kernel/nvidia-modeset/nvidia-modeset-linux.c +--- work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c 2016-07-12 06:53:46.000000000 +0200 ++++ work/kernel/nvidia-modeset/nvidia-modeset-linux.c 2016-07-16 22:47:09.334133112 +0200 +@@ -317,29 +317,28 @@ static void nvkms_resume(NvU32 gpuId) + * Interface with resman. + *************************************************************************/ + +-static nvidia_modeset_rm_ops_t __rm_ops = { 0 }; ++static const nvidia_modeset_rm_ops_t *__rm_ops; + static nvidia_modeset_callbacks_t nvkms_rm_callbacks = { +- nvkms_suspend, +- nvkms_resume ++ .suspend = nvkms_suspend, ++ .resume = nvkms_resume + }; + + static int nvkms_alloc_rm(void) + { + NV_STATUS nvstatus; + int ret; ++ const char *version_string = NV_VERSION_STRING; + +- __rm_ops.version_string = NV_VERSION_STRING; +- +- nvstatus = nvidia_get_rm_ops(&__rm_ops); ++ nvstatus = nvidia_get_rm_ops(&__rm_ops, &version_string); + + if (nvstatus != NV_OK) { + printk(KERN_ERR NVKMS_LOG_PREFIX "Version mismatch: " + "nvidia.ko(%s) nvidia-modeset.ko(%s)\n", +- __rm_ops.version_string, NV_VERSION_STRING); ++ version_string, NV_VERSION_STRING); + return -EINVAL; + } + +- ret = __rm_ops.set_callbacks(&nvkms_rm_callbacks); ++ ret = __rm_ops->set_callbacks(&nvkms_rm_callbacks); + if (ret < 0) { + printk(KERN_ERR NVKMS_LOG_PREFIX "Failed to register callbacks\n"); + return ret; +@@ -350,20 +349,20 @@ static int nvkms_alloc_rm(void) + + static void nvkms_free_rm(void) + { +- __rm_ops.set_callbacks(NULL); ++ __rm_ops->set_callbacks(NULL); + } + + void NVKMS_API_CALL nvkms_call_rm(void *ops) + { + nvidia_modeset_stack_ptr stack = NULL; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return; + } + +- __rm_ops.op(stack, ops); ++ __rm_ops->op(stack, ops); + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + } + + /************************************************************************* +@@ -685,13 +684,13 @@ NvBool NVKMS_API_CALL nvkms_open_gpu(NvU + nvidia_modeset_stack_ptr stack = NULL; + NvBool ret; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return NV_FALSE; + } + +- ret = __rm_ops.open_gpu(gpuId, stack) == 0; ++ ret = __rm_ops->open_gpu(gpuId, stack) == 0; + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + + return ret; + } +@@ -700,23 +699,23 @@ void NVKMS_API_CALL nvkms_close_gpu(NvU3 + { + nvidia_modeset_stack_ptr stack = NULL; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return; + } + +- __rm_ops.close_gpu(gpuId, stack); ++ __rm_ops->close_gpu(gpuId, stack); + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + } + + NvU32 NVKMS_API_CALL nvkms_enumerate_gpus(nv_gpu_info_t *gpu_info) + { +- return __rm_ops.enumerate_gpus(gpu_info); ++ return __rm_ops->enumerate_gpus(gpu_info); + } + + NvBool NVKMS_API_CALL nvkms_allow_write_combining(void) + { +- return __rm_ops.system_info.allow_write_combining; ++ return __rm_ops->system_info.allow_write_combining; + } + + /************************************************************************* +diff -urp work.orig/kernel/nvidia-uvm/uvm8_global.c work/kernel/nvidia-uvm/uvm8_global.c +--- work.orig/kernel/nvidia-uvm/uvm8_global.c 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm8_global.c 2016-07-16 22:45:59.878812524 +0200 +@@ -35,17 +35,17 @@ + #include "nv_uvm_interface.h" + + uvm_global_t g_uvm_global; +-static struct UvmOpsUvmEvents g_exported_uvm8_ops; ++static struct UvmOpsUvmEvents g_exported_uvm8_ops = { ++ .startDevice = NULL, ++ .stopDevice = NULL, ++ .isrTopHalf = uvm8_isr_top_half, ++}; + static bool g_ops_registered = false; + + static NV_STATUS uvm8_register_callbacks(void) + { + NV_STATUS status = NV_OK; + +- g_exported_uvm8_ops.startDevice = NULL; +- g_exported_uvm8_ops.stopDevice = NULL; +- g_exported_uvm8_ops.isrTopHalf = uvm8_isr_top_half; +- + // Register the UVM callbacks with the main GPU driver: + status = uvm_rm_locked_call(nvUvmInterfaceRegisterUvmCallbacks(&g_exported_uvm8_ops)); + if (status != NV_OK) +diff -urp work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c +--- work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c 2016-07-16 22:45:59.878812524 +0200 +@@ -368,7 +368,7 @@ void uvm_gpu_semaphore_set_payload(uvm_g + // being optimized out on non-SMP configs (we need them for interacting with + // the GPU correctly even on non-SMP). + mb(); +- ACCESS_ONCE(*semaphore->payload) = payload; ++ ACCESS_ONCE_RW(*semaphore->payload) = payload; + } + + // This function is intended to catch channels which have been left dangling in +diff -urp work.orig/kernel/nvidia-uvm/uvm8_hal.h work/kernel/nvidia-uvm/uvm8_hal.h +--- work.orig/kernel/nvidia-uvm/uvm8_hal.h 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm8_hal.h 2016-07-16 22:45:59.878812524 +0200 +@@ -310,7 +310,7 @@ typedef struct + // fault_buffer_ops: id is a hardware class + uvm_fault_buffer_hal_t fault_buffer_ops; + } u; +-} uvm_hal_class_ops_t; ++} __do_const uvm_hal_class_ops_t; + + // When UVM next support is enabled support for future chips in the hal is + // enabled by providing additional hal table entries below. +diff -urp work.orig/kernel/nvidia-uvm/uvm8_mmu.h work/kernel/nvidia-uvm/uvm8_mmu.h +--- work.orig/kernel/nvidia-uvm/uvm8_mmu.h 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm8_mmu.h 2016-07-16 22:45:59.878812524 +0200 +@@ -24,7 +24,6 @@ + #ifndef __UVM8_MMU_H__ + #define __UVM8_MMU_H__ + +-#include "uvm8_forward_decl.h" + #include "uvm8_hal_types.h" + #include "uvm8_pmm_gpu.h" + #include "uvmtypes.h" +diff -urp work.orig/kernel/nvidia-uvm/uvm_common.c work/kernel/nvidia-uvm/uvm_common.c +--- work.orig/kernel/nvidia-uvm/uvm_common.c 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm_common.c 2016-07-16 22:45:59.878812524 +0200 +@@ -51,7 +51,6 @@ + #define UVM_SPIN_LOOP_PRINT_TIMEOUT_SEC 30ULL + + static dev_t g_uvmBaseDev; +-struct UvmOpsUvmEvents g_exportedUvmOps; + + static char* uvm_driver_mode = "8"; + +@@ -175,8 +174,10 @@ static NV_STATUS uvmSetupGpuProvider(voi + { + NV_STATUS status = NV_OK; + +- g_exportedUvmOps.startDevice = uvm_gpu_event_start_device; +- g_exportedUvmOps.stopDevice = uvm_gpu_event_stop_device; ++ static struct UvmOpsUvmEvents g_exportedUvmOps = { ++ .startDevice = uvm_gpu_event_start_device, ++ .stopDevice = uvm_gpu_event_stop_device, ++ }; + + // call RM to exchange the function pointers. + status = nvUvmInterfaceRegisterUvmCallbacks(&g_exportedUvmOps); +diff -urp work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h work/kernel/nvidia-uvm/uvm_full_fault_buffer.h +--- work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm_full_fault_buffer.h 2016-07-16 22:45:59.878812524 +0200 +@@ -31,6 +31,7 @@ + #define _UVM_FULL_FAULT_BUFFER_H_ + + #include "uvmtypes.h" ++#include "linux/compiler.h" + + #define MAXWELL_FAULT_BUFFER_A (0xb069) + #define MEM_RD32(a) (*(const volatile NvU32 *)(a)) +@@ -303,7 +304,7 @@ typedef struct + NvUvmControlPrefetch_t controlPrefetch; + NvUvmTestFaultBufferOverflow_t testFaultBufferOverflow; + NvUvmClearFaultBufferOverflow_t clearFaultBufferOverflow; +-} UvmFaultBufferOps; ++} __no_const UvmFaultBufferOps; + + /****************************************************************************** + uvmfull_fault_buffer_init +diff -urp work.orig/kernel/nvidia-uvm/uvm_linux.h work/kernel/nvidia-uvm/uvm_linux.h +--- work.orig/kernel/nvidia-uvm/uvm_linux.h 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm_linux.h 2016-07-16 22:45:59.882815613 +0200 +@@ -508,7 +508,7 @@ static inline NvU64 NV_GETTIME(void) + + // WRITE_ONCE/READ_ONCE have incompatible definitions across versions, which produces warnings. + // Therefore, we define our own macros +-#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE(x) = (val)) ++#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE_RW(x) = (val)) + #define UVM_READ_ONCE(x) ACCESS_ONCE(x) + + // Added in 3.11 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-367.57-pax.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-367.57-pax.patch new file mode 100644 index 000000000000..bf2013265ad2 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-367.57-pax.patch @@ -0,0 +1,391 @@ +diff -urp work.orig/kernel/common/inc/nv-linux.h work/kernel/common/inc/nv-linux.h +--- work.orig/kernel/common/inc/nv-linux.h 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/common/inc/nv-linux.h 2016-07-16 22:45:59.870806346 +0200 +@@ -1308,6 +1308,9 @@ extern void *nvidia_stack_t_cache; + #define NV_KMEM_CACHE_CREATE(name, type) \ + NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, 0, NULL) + ++#define NV_KMEM_CACHE_CREATE_USERCOPY(name, type) \ ++ NV_KMEM_CACHE_CREATE_FULL(name, sizeof(type), 0, SLAB_USERCOPY, NULL) ++ + #define NV_KMEM_CACHE_DESTROY(kmem_cache) \ + kmem_cache_destroy(kmem_cache) + +diff -urp work.orig/kernel/common/inc/nv-modeset-interface.h work/kernel/common/inc/nv-modeset-interface.h +--- work.orig/kernel/common/inc/nv-modeset-interface.h 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/common/inc/nv-modeset-interface.h 2016-07-16 22:46:16.223400774 +0200 +@@ -72,7 +72,7 @@ typedef struct { + * mix nvidia and nvidia-modeset kernel modules from different + * releases. + */ +- const char *version_string; ++// const char *version_string; + + /* + * Return system information. +@@ -117,6 +117,6 @@ typedef struct { + + } nvidia_modeset_rm_ops_t; + +-NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops); ++NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string); + + #endif /* _NV_MODESET_INTERFACE_H_ */ +diff -urp work.orig/kernel/common/inc/nv-register-module.h work/kernel/common/inc/nv-register-module.h +--- work.orig/kernel/common/inc/nv-register-module.h 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/common/inc/nv-register-module.h 2016-07-16 22:45:59.870806346 +0200 +@@ -34,7 +34,7 @@ typedef struct nvidia_module_s { + int (*ioctl)(struct inode *, struct file * file, unsigned int cmd, unsigned long arg); + unsigned int (*poll)(struct file * file, poll_table *wait); + +-} nvidia_module_t; ++} __do_const nvidia_module_t; + + int nvidia_register_module(nvidia_module_t *); + int nvidia_unregister_module(nvidia_module_t *); +diff -urp work.orig/kernel/nvidia/nv.c work/kernel/nvidia/nv.c +--- work.orig/kernel/nvidia/nv.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv.c 2016-07-16 22:45:59.874809435 +0200 +@@ -654,7 +654,7 @@ int __init nvidia_init_module(void) + NV_SPIN_LOCK_INIT(&km_lock); + #endif + +- nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE(nvidia_stack_cache_name, ++ nvidia_stack_t_cache = NV_KMEM_CACHE_CREATE_USERCOPY(nvidia_stack_cache_name, + nvidia_stack_t); + if (nvidia_stack_t_cache == NULL) + { +diff -urp work.orig/kernel/nvidia/nv-chrdev.c work/kernel/nvidia/nv-chrdev.c +--- work.orig/kernel/nvidia/nv-chrdev.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv-chrdev.c 2016-07-16 22:45:59.874809435 +0200 +@@ -20,8 +20,6 @@ int nv_register_chrdev(void *param) + { + nvidia_module_t *module = (nvidia_module_t *)param; + +- module->instance = nv_module_instance; +- + return (nvidia_register_module(module)); + } + +diff -urp work.orig/kernel/nvidia/nv-instance.c work/kernel/nvidia/nv-instance.c +--- work.orig/kernel/nvidia/nv-instance.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv-instance.c 2016-07-16 22:45:59.874809435 +0200 +@@ -51,6 +51,7 @@ struct pci_driver nv_pci_driver = { + nvidia_module_t nv_fops = { + .owner = THIS_MODULE, + .module_name = MODULE_NAME, ++ .instance = MODULE_INSTANCE_NUMBER, + .open = nvidia_open, + .close = nvidia_close, + .ioctl = nvidia_ioctl, +diff -urp work.orig/kernel/nvidia/nv-mmap.c work/kernel/nvidia/nv-mmap.c +--- work.orig/kernel/nvidia/nv-mmap.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv-mmap.c 2016-07-16 22:45:59.874809435 +0200 +@@ -113,12 +113,12 @@ nvidia_vma_release(struct vm_area_struct + } + + #if defined(NV_VM_OPERATIONS_STRUCT_HAS_ACCESS) +-static int ++static ssize_t + nvidia_vma_access( + struct vm_area_struct *vma, + unsigned long addr, + void *buffer, +- int length, ++ size_t length, + int write + ) + { +diff -urp work.orig/kernel/nvidia/nv-modeset-interface.c work/kernel/nvidia/nv-modeset-interface.c +--- work.orig/kernel/nvidia/nv-modeset-interface.c 2016-07-12 06:52:21.000000000 +0200 ++++ work/kernel/nvidia/nv-modeset-interface.c 2016-07-16 22:54:36.567962197 +0200 +@@ -100,10 +100,9 @@ static NvU32 nvidia_modeset_enumerate_gp + return count; + } + +-NV_STATUS nvidia_get_rm_ops(nvidia_modeset_rm_ops_t *rm_ops) ++NV_STATUS nvidia_get_rm_ops(const nvidia_modeset_rm_ops_t **rm_ops, const char **version_string) + { +- const nvidia_modeset_rm_ops_t local_rm_ops = { +- .version_string = NV_VERSION_STRING, ++ static const nvidia_modeset_rm_ops_t local_rm_ops = { + .system_info = { + .allow_write_combining = NV_FALSE, + }, +@@ -116,17 +115,26 @@ NV_STATUS nvidia_get_rm_ops(nvidia_modes + .set_callbacks = nvidia_modeset_set_callbacks, + }; + +- if (strcmp(rm_ops->version_string, NV_VERSION_STRING) != 0) ++ static const nvidia_modeset_rm_ops_t local_rm_ops_wc = { ++ .system_info = { ++ .allow_write_combining = NV_TRUE, ++ }, ++ .alloc_stack = nvidia_modeset_rm_ops_alloc_stack, ++ .free_stack = nvidia_modeset_rm_ops_free_stack, ++ .enumerate_gpus = nvidia_modeset_enumerate_gpus, ++ .open_gpu = nvidia_dev_get, ++ .close_gpu = nvidia_dev_put, ++ .op = rm_kernel_rmapi_op, /* provided by nv-kernel.o */ ++ .set_callbacks = nvidia_modeset_set_callbacks, ++ }; ++ ++ if (strcmp(*version_string, NV_VERSION_STRING) != 0) + { +- rm_ops->version_string = NV_VERSION_STRING; ++ *version_string = NV_VERSION_STRING; + return NV_ERR_GENERIC; + } + +- *rm_ops = local_rm_ops; +- +- if (NV_ALLOW_WRITE_COMBINING(NV_MEMORY_TYPE_FRAMEBUFFER)) { +- rm_ops->system_info.allow_write_combining = NV_TRUE; +- } ++ *rm_ops = NV_ALLOW_WRITE_COMBINING(NV_MEMORY_TYPE_FRAMEBUFFER) ? &local_rm_ops_wc : &local_rm_ops; + + return NV_OK; + } +diff -urp work.orig/kernel/nvidia-drm/nvidia-drm-drv.c work/kernel/nvidia-drm/nvidia-drm-drv.c +--- work.orig/kernel/nvidia-drm/nvidia-drm-drv.c 2016-07-12 06:53:45.000000000 +0200 ++++ work/kernel/nvidia-drm/nvidia-drm-drv.c 2016-07-16 22:45:59.878812524 +0200 +@@ -592,7 +592,7 @@ static const struct drm_ioctl_desc nv_dr + DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), + }; + +-static struct drm_driver nv_drm_driver = { ++static drm_driver_no_const nv_drm_driver __read_only = { + + .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_RENDER, + +@@ -649,6 +649,7 @@ static void nvidia_update_drm_driver_fea + return; + } + ++ pax_open_kernel(); + nv_drm_driver.driver_features |= DRIVER_MODESET | DRIVER_ATOMIC; + + nv_drm_driver.master_set = nvidia_drm_master_set; +@@ -657,6 +658,7 @@ static void nvidia_update_drm_driver_fea + nv_drm_driver.dumb_create = nvidia_drm_dumb_create; + nv_drm_driver.dumb_map_offset = nvidia_drm_dumb_map_offset; + nv_drm_driver.dumb_destroy = drm_gem_dumb_destroy; ++ pax_close_kernel(); + + #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + } +diff -urp work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c work/kernel/nvidia-modeset/nvidia-modeset-linux.c +--- work.orig/kernel/nvidia-modeset/nvidia-modeset-linux.c 2016-07-12 06:53:46.000000000 +0200 ++++ work/kernel/nvidia-modeset/nvidia-modeset-linux.c 2016-07-16 22:47:09.334133112 +0200 +@@ -317,29 +317,28 @@ static void nvkms_resume(NvU32 gpuId) + * Interface with resman. + *************************************************************************/ + +-static nvidia_modeset_rm_ops_t __rm_ops = { 0 }; ++static const nvidia_modeset_rm_ops_t *__rm_ops; + static nvidia_modeset_callbacks_t nvkms_rm_callbacks = { +- nvkms_suspend, +- nvkms_resume ++ .suspend = nvkms_suspend, ++ .resume = nvkms_resume + }; + + static int nvkms_alloc_rm(void) + { + NV_STATUS nvstatus; + int ret; ++ const char *version_string = NV_VERSION_STRING; + +- __rm_ops.version_string = NV_VERSION_STRING; +- +- nvstatus = nvidia_get_rm_ops(&__rm_ops); ++ nvstatus = nvidia_get_rm_ops(&__rm_ops, &version_string); + + if (nvstatus != NV_OK) { + printk(KERN_ERR NVKMS_LOG_PREFIX "Version mismatch: " + "nvidia.ko(%s) nvidia-modeset.ko(%s)\n", +- __rm_ops.version_string, NV_VERSION_STRING); ++ version_string, NV_VERSION_STRING); + return -EINVAL; + } + +- ret = __rm_ops.set_callbacks(&nvkms_rm_callbacks); ++ ret = __rm_ops->set_callbacks(&nvkms_rm_callbacks); + if (ret < 0) { + printk(KERN_ERR NVKMS_LOG_PREFIX "Failed to register callbacks\n"); + return ret; +@@ -350,20 +349,20 @@ static int nvkms_alloc_rm(void) + + static void nvkms_free_rm(void) + { +- __rm_ops.set_callbacks(NULL); ++ __rm_ops->set_callbacks(NULL); + } + + void NVKMS_API_CALL nvkms_call_rm(void *ops) + { + nvidia_modeset_stack_ptr stack = NULL; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return; + } + +- __rm_ops.op(stack, ops); ++ __rm_ops->op(stack, ops); + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + } + + /************************************************************************* +@@ -685,13 +684,13 @@ NvBool NVKMS_API_CALL nvkms_open_gpu(NvU + nvidia_modeset_stack_ptr stack = NULL; + NvBool ret; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return NV_FALSE; + } + +- ret = __rm_ops.open_gpu(gpuId, stack) == 0; ++ ret = __rm_ops->open_gpu(gpuId, stack) == 0; + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + + return ret; + } +@@ -700,23 +699,23 @@ void NVKMS_API_CALL nvkms_close_gpu(NvU3 + { + nvidia_modeset_stack_ptr stack = NULL; + +- if (__rm_ops.alloc_stack(&stack) != 0) { ++ if (__rm_ops->alloc_stack(&stack) != 0) { + return; + } + +- __rm_ops.close_gpu(gpuId, stack); ++ __rm_ops->close_gpu(gpuId, stack); + +- __rm_ops.free_stack(stack); ++ __rm_ops->free_stack(stack); + } + + NvU32 NVKMS_API_CALL nvkms_enumerate_gpus(nv_gpu_info_t *gpu_info) + { +- return __rm_ops.enumerate_gpus(gpu_info); ++ return __rm_ops->enumerate_gpus(gpu_info); + } + + NvBool NVKMS_API_CALL nvkms_allow_write_combining(void) + { +- return __rm_ops.system_info.allow_write_combining; ++ return __rm_ops->system_info.allow_write_combining; + } + + /************************************************************************* +diff -urp work.orig/kernel/nvidia-uvm/uvm8_global.c work/kernel/nvidia-uvm/uvm8_global.c +--- work.orig/kernel/nvidia-uvm/uvm8_global.c 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm8_global.c 2016-07-16 22:45:59.878812524 +0200 +@@ -35,17 +35,17 @@ + #include "nv_uvm_interface.h" + + uvm_global_t g_uvm_global; +-static struct UvmOpsUvmEvents g_exported_uvm8_ops; ++static struct UvmOpsUvmEvents g_exported_uvm8_ops = { ++ .startDevice = NULL, ++ .stopDevice = NULL, ++ .isrTopHalf = uvm8_isr_top_half, ++}; + static bool g_ops_registered = false; + + static NV_STATUS uvm8_register_callbacks(void) + { + NV_STATUS status = NV_OK; + +- g_exported_uvm8_ops.startDevice = NULL; +- g_exported_uvm8_ops.stopDevice = NULL; +- g_exported_uvm8_ops.isrTopHalf = uvm8_isr_top_half; +- + // Register the UVM callbacks with the main GPU driver: + status = uvm_rm_locked_call(nvUvmInterfaceRegisterUvmCallbacks(&g_exported_uvm8_ops)); + if (status != NV_OK) +diff -urp work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c +--- work.orig/kernel/nvidia-uvm/uvm8_gpu_semaphore.c 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm8_gpu_semaphore.c 2016-07-16 22:45:59.878812524 +0200 +@@ -368,7 +368,7 @@ void uvm_gpu_semaphore_set_payload(uvm_g + // being optimized out on non-SMP configs (we need them for interacting with + // the GPU correctly even on non-SMP). + mb(); +- ACCESS_ONCE(*semaphore->payload) = payload; ++ ACCESS_ONCE_RW(*semaphore->payload) = payload; + } + + // This function is intended to catch channels which have been left dangling in +diff -urp work.orig/kernel/nvidia-uvm/uvm8_hal.h work/kernel/nvidia-uvm/uvm8_hal.h +--- work.orig/kernel/nvidia-uvm/uvm8_hal.h 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm8_hal.h 2016-07-16 22:45:59.878812524 +0200 +@@ -310,7 +310,7 @@ typedef struct + // fault_buffer_ops: id is a hardware class + uvm_fault_buffer_hal_t fault_buffer_ops; + } u; +-} uvm_hal_class_ops_t; ++} __do_const uvm_hal_class_ops_t; + + // When UVM next support is enabled support for future chips in the hal is + // enabled by providing additional hal table entries below. +diff -urp work.orig/kernel/nvidia-uvm/uvm8_mmu.h work/kernel/nvidia-uvm/uvm8_mmu.h +--- work.orig/kernel/nvidia-uvm/uvm8_mmu.h 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm8_mmu.h 2016-07-16 22:45:59.878812524 +0200 +@@ -24,7 +24,6 @@ + #ifndef __UVM8_MMU_H__ + #define __UVM8_MMU_H__ + +-#include "uvm8_forward_decl.h" + #include "uvm8_hal_types.h" + #include "uvm8_pmm_gpu.h" + #include "uvmtypes.h" +diff -urp work.orig/kernel/nvidia-uvm/uvm_common.c work/kernel/nvidia-uvm/uvm_common.c +--- work.orig/kernel/nvidia-uvm/uvm_common.c 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm_common.c 2016-07-16 22:45:59.878812524 +0200 +@@ -51,7 +51,6 @@ + #define UVM_SPIN_LOOP_PRINT_TIMEOUT_SEC 30ULL + + static dev_t g_uvmBaseDev; +-struct UvmOpsUvmEvents g_exportedUvmOps; + + static char* uvm_driver_mode = "8"; + +diff -urp work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h work/kernel/nvidia-uvm/uvm_full_fault_buffer.h +--- work.orig/kernel/nvidia-uvm/uvm_full_fault_buffer.h 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm_full_fault_buffer.h 2016-07-16 22:45:59.878812524 +0200 +@@ -31,6 +31,7 @@ + #define _UVM_FULL_FAULT_BUFFER_H_ + + #include "uvmtypes.h" ++#include "linux/compiler.h" + + #define MAXWELL_FAULT_BUFFER_A (0xb069) + #define MEM_RD32(a) (*(const volatile NvU32 *)(a)) +@@ -303,7 +304,7 @@ typedef struct + NvUvmControlPrefetch_t controlPrefetch; + NvUvmTestFaultBufferOverflow_t testFaultBufferOverflow; + NvUvmClearFaultBufferOverflow_t clearFaultBufferOverflow; +-} UvmFaultBufferOps; ++} __no_const UvmFaultBufferOps; + + /****************************************************************************** + uvmfull_fault_buffer_init +diff -urp work.orig/kernel/nvidia-uvm/uvm_linux.h work/kernel/nvidia-uvm/uvm_linux.h +--- work.orig/kernel/nvidia-uvm/uvm_linux.h 2016-07-12 06:52:17.000000000 +0200 ++++ work/kernel/nvidia-uvm/uvm_linux.h 2016-07-16 22:45:59.882815613 +0200 +@@ -508,7 +508,7 @@ static inline NvU64 NV_GETTIME(void) + + // WRITE_ONCE/READ_ONCE have incompatible definitions across versions, which produces warnings. + // Therefore, we define our own macros +-#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE(x) = (val)) ++#define UVM_WRITE_ONCE(x, val) (ACCESS_ONCE_RW(x) = (val)) + #define UVM_READ_ONCE(x) ACCESS_ONCE(x) + + // Added in 3.11 diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-367.57.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-367.57.ebuild index b3f9c7e94aad..58a7c6308456 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-367.57.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-367.57.ebuild @@ -176,7 +176,7 @@ src_prepare() { ewarn "Using PAX patches is not supported. You will be asked to" ewarn "use a standard kernel should you have issues. Should you" ewarn "need support with these patches, contact the PaX team." - epatch "${FILESDIR}"/${PN}-364.12-pax.patch + epatch "${FILESDIR}"/${PN}-367.57-pax.patch fi # Allow user patches so they can support RC kernels and whatever else diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-370.28.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-370.28.ebuild index e776f905334f..619ab9baa5ac 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-370.28.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-370.28.ebuild @@ -176,7 +176,7 @@ src_prepare() { ewarn "Using PAX patches is not supported. You will be asked to" ewarn "use a standard kernel should you have issues. Should you" ewarn "need support with these patches, contact the PaX team." - epatch "${FILESDIR}"/${PN}-364.12-pax.patch + epatch "${FILESDIR}"/${PN}-367.35-pax.patch fi # Allow user patches so they can support RC kernels and whatever else