diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 5c95ea9227cf..a09258eb1f77 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,3 +1 @@
-DIST calamares-2.4.6.tar.gz 2143386 SHA256 c091ad0db9b69b7552d7f282317ba4a4453d7e5ca7ee4bf98f605fe43c63597e SHA512 d2ba4675a846095c437231eb1d59f86668f7c65e2f9bda9681cd4de60324b8d8007f4337f8cd93ca71a303812ecdb8c55935805adc8fd25bb98f1e39432be009 WHIRLPOOL b54ac8347604942a00293c23e766142af867ac37dc3e910d93a07fc909eefb70bd9dc7744270320fcda10b25c3db50476f35074122ae60ee2243e46ab14ea206
-DIST calamares-3.0.1.tar.gz 2213505 SHA256 2c0f4f04d1520186ef0b30584daa73c32dce99603bb4d8f6880497ee3f2322b5 SHA512 9d6dfae611211bffae5509e97fdd1363701a2db675224badf058a4d22c395e150cf91d148fcfbe49fa7aef8c81049a331a91a3b350cb47acbb9af934e3c96f22 WHIRLPOOL d8fb6c7fe6a594055f3ba0be9fd9e46833b590accc58ffb36ef852bad3dbbb67560b021747f81f1f115d7622df0be1ab776d696d5ed818269badc9b3b47b721d
DIST calamares-3.1.0.tar.gz 2215820 SHA256 7b4c74fc350624a17eb8b8187ade490711bfdc608d2be07322c8a3fc0a449276 SHA512 17c15aafbc811f42246f8300f64ffe7d44b43ac24f5b6ced15c83715c5fff9644060964de82cc3e7021c710e6eebbc124785d9d7b85613c5f190ec0f8d5d5389 WHIRLPOOL 6c8e46aff3700d26e876dd6f02bf28e55ea59cebe46438e64a8d04e921df9e35d0c1c3077479767b67284805103c16cda7ef5e1a2ec50d9e735093cb9e04b886
diff --git a/app-admin/calamares/calamares-2.4.6.ebuild b/app-admin/calamares/calamares-2.4.6.ebuild
deleted file mode 100644
index f4d00d9a2425..000000000000
--- a/app-admin/calamares/calamares-2.4.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io"
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
- EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwebengine 'widgets')
- $(add_qt_dep qtwidgets)
- >=dev-cpp/yaml-cpp-0.5.1
- >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
- sys-apps/dbus
- sys-apps/dmidecode
- sys-auth/polkit-qt[qt5]
- sys-libs/kpmcore:5=
-"
-
-RDEPEND="${DEPEND}
- app-admin/sudo
- dev-libs/libatasmart
- net-misc/rsync
- >=sys-block/parted-3.0
- || ( sys-boot/grub:2 sys-boot/systemd-boot )
- sys-boot/os-prober
- sys-fs/squashfs-tools
- sys-fs/udisks:2[systemd]
- virtual/udev[systemd]
- networkmanager? ( net-misc/networkmanager )
- upower? ( sys-power/upower )
-"
-
-src_prepare() {
- python_setup
- export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
- PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
- PYTHON_CFLAGS="$(python_get_CFLAGS)"\
- PYTHON_LIBS="$(python_get_LIBS)"
-
- eapply_user
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWEBVIEW_FORCE_WEBKIT=OFF
- )
-
- kde5_src_configure
- sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
- sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
-}
-
-src_install() {
- kde5_src_install
- dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/calamares-3.0.1.ebuild b/app-admin/calamares/calamares-3.0.1.ebuild
deleted file mode 100644
index 02e122fac8ca..000000000000
--- a/app-admin/calamares/calamares-3.0.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="http://calamares.io"
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
- EGIT_REPO_URI="git://github.com/${PN}/${PN}"
-else
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kservice)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwebengine 'widgets')
- $(add_qt_dep qtwidgets)
- >=dev-cpp/yaml-cpp-0.5.1
- >=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
- sys-apps/dbus
- sys-apps/dmidecode
- sys-auth/polkit-qt[qt5]
- >=sys-libs/kpmcore-3.0.2:5=
- pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
- app-admin/sudo
- dev-libs/libatasmart
- net-misc/rsync
- >=sys-block/parted-3.0
- || ( sys-boot/grub:2 sys-boot/systemd-boot )
- sys-boot/os-prober
- sys-fs/squashfs-tools
- virtual/udev
- networkmanager? ( net-misc/networkmanager )
- upower? ( sys-power/upower )
-"
-
-src_prepare() {
- python_setup
- export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
- PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
- PYTHON_CFLAGS="$(python_get_CFLAGS)"\
- PYTHON_LIBS="$(python_get_LIBS)"
-
- eapply_user
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWEBVIEW_FORCE_WEBKIT=OFF
- -DWITH_PYTHONQT=$(usex pythonqt)
- )
-
- kde5_src_configure
- sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
- sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
-}
-
-src_install() {
- kde5_src_install
- dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 8fade34db067..bb8c22a262a5 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -2,6 +2,7 @@ DIST aws-sdk-go-1.0.11.tar.gz 2914311 SHA256 7750f3ed8f616fdfa5c478b176894790990
DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
DIST consul-template-0.12.2.tar.gz 93913 SHA256 9d8ae6ba84caa826400a3eef0e28325518a21c44332eebaaf3878dc5972f3997 SHA512 c085d916d7e7ae933583b6f397c73117a35b2f54e634db9bbe43a3e6f6b9497177729b3b5e25f028766eb6f9f59ff411486390bc2f544806af04f9038729533e WHIRLPOOL af485e0b743eb3d34d52bdbc6dd1edcf17614e07061384f24c5bd1d5d74d5a5bc1c092553fd074269566298847af2052ffd6dbf8b8e9a524438227e7230fe2d8
DIST consul-template-0.16.0.tar.gz 2369947 SHA256 c20e1e54c333baa8b1e031710f71a5a533ffe079d657763567478a021344ff55 SHA512 7f5f34ae7ccd5a9ce27f07a96bd6b226a78197d1455bbba76c5aab36d93090661eafc0ed513fce6930020095ab4cda799f71ed208a85ba83f540204f0d041994 WHIRLPOOL e6b11aa093bf2c0910c2dbac98703d7aed935ebf68f3cad059ca0f4f1ccda0f59ced2851aff916003c2fea99830f418296fe067d96d039ad3306e4a3a448870f
+DIST consul-template-0.18.5.tar.gz 5285939 SHA256 749bff38cefc1a2ced91a73f766550fb36ed793f402041bf31c624d1969e5b0b SHA512 1709c889cd414d2b3510400e8077aec49006c31958618a38f6bce78dad2ba4aac5405410b030bf968b5cf148f4cfbe963ccf95a015cd1e58f2f6d1f09edc13de WHIRLPOOL 9d9062043414d19d9038c962206d9868bef517a00e773a4205bf4c909fc0c9a8e0a2609b2cd92947159d91b7ae9adc3a96d7d3bf8865d11562d0a9e7c9940ee7
DIST copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz 4028 SHA256 4e7271e88e101ac324f799c421b1c8c1477d1f54048d6b6b1ff3930498870272 SHA512 3c804e126f676cb7a6c5af775b7fdf6a3b591b42315707ebb83a66a96f583eac414e01402bc489d9b218b64db7780f57bd5a4bd922aff59dca068b869f825de5 WHIRLPOOL 3be054304612292adef0361bbd2d94d51c4186d4a66bf949d326345da0f7f5c6f5558c0db62fb1ed1144899155f5c63ceeb9243c267b82605b024cf6898f31ba
DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
DIST etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz 2171596 SHA256 72f642f10d014dff089b7a0fe66168639d30ed0e1586cec43a88b2bd7311cc11 SHA512 cc1d75d73c46f7c8438ddec8f0cf6829936e4ecb58efcaae958f818bbdd777751b393406e6c89784d9234080766ea67d71e660aa973f409ce4319768e76f4dad WHIRLPOOL 7f645f6ae41769e8bf0e4f35e4ac399df385bd1693f3c49d0f3e2859cfbf58e0cbd6f9be8c7de101e37720514828e56ae996cbf8a89e665a867ae083457bf9e8
diff --git a/app-admin/consul-template/consul-template-0.18.5.ebuild b/app-admin/consul-template/consul-template-0.18.5.ebuild
new file mode 100644
index 000000000000..b04c5a353362
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.18.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="http://${EGO_PN}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-lang/go-1.6:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ eapply_user
+ # Avoid the need to have a git checkout
+ sed -e 's:^GIT.*::' \
+ -i src/${EGO_PN}/scripts/compile.sh || die
+}
+
+src_compile() {
+ export GOPATH=${S}
+ cd "${S}"/src/${EGO_PN} || die
+ PATH=${PATH}:${S}/bin \
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ emake bin-local
+}
+
+src_test() {
+ cd "${S}"/src/${EGO_PN} || die
+ emake test || die
+}
+
+src_install() {
+ dobin "${S}"/src/${EGO_PN}/pkg/$(go env GOOS)_$(go env GOARCH)/${PN}
+ dodoc "${S}"/src/${EGO_PN}/{CHANGELOG.md,README.md}
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+}
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 7d0f3abf5357..d9c22b7b40df 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -3,5 +3,6 @@ DIST consul-0.7.2.tar.gz 4200076 SHA256 28441273a928d0976a668ca0657ec655b10fffe4
DIST consul-0.7.3.tar.gz 5022341 SHA256 4055c74382e9fd33c34389ed2b0ed00ab48dca19c1ab1f4293ca3d8f842b1d3d SHA512 abb81183118fa3af0e3ef6c46b15441c8ce6b15dbd37e8516a36f2a2fe7eda8f98a11c40e14181392858ba92d86f4148849c15b6afef16439f1b2e250159a717 WHIRLPOOL 04a4fed4f699a25201e036fd086c9375cd8cb54adfb31e1137f45fa24a478bdc8e1e16798354df192e7badffca0ab7ef6af3394aa371d32a3924912cfdc8f33d
DIST consul-0.7.5.tar.gz 5157056 SHA256 e213ba0c55bcb0d752ab120c770048e5156159db5974dc94193731f2e67d7d1f SHA512 6825a92ca2d1e3bf1db561de803e890bfa3a4c08718477a819ea10f5d0d9d13bf23ba7bedf2123cfa32b8f87d63ede7ee85d57a20f8cef5effd4651d28ab8a36 WHIRLPOOL 56e139b39bf73df558369acdd99a0cec42e05b88333013c18f69cfc56837ec007985ec48a845d461df44eed57d0f13256948942860431b84ab4d5d01becca2d2
DIST consul-0.8.0.tar.gz 4629677 SHA256 d50787c290d91f6e3472d2adeb3b2cedf3eb71c7c0fce32b60d2739af2d81dcf SHA512 4bb8bb50e4ab897cac7936bef590c7d8f93eca61913cd88588d5d0324c04fe2582d224dd25191b20bf76b000f764b4decce23118d3f8ed024b887b3194520644 WHIRLPOOL b0f1b03ed013f5a23a3d37cabe09fdc839c4097612f6355238ecfee55a7d5ab91b6386a6d107dfb01f210ff722e505abbe3882b0f6c2fd4015e20b1faef91765
+DIST consul-0.8.3.tar.gz 6513579 SHA256 8088ae2f4259a736400211eed63f6df3b5264f3a18d31b31845c4a4481b349ac SHA512 84c72f5cdc9f82288b29b92e386324214bf71ef3952cbd3391f4c7c427cf5f385a3e472304cfb8c837bbfb009547ad3b736d6f66f0546a5f994d547d431bd4b8 WHIRLPOOL 159e0cc899702d19e5d46e02b4e64da5097a13016acc0331a638f248f6678ecee19ef019dad3123a42081a97985b7498622731d486c6eb9e015da80d442b2c33
DIST gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
diff --git a/app-admin/consul/consul-0.8.3.ebuild b/app-admin/consul/consul-0.8.3.ebuild
new file mode 100644
index 000000000000..feb992b3d54e
--- /dev/null
+++ b/app-admin/consul/consul-0.8.3.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-base systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.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
+"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="
+ >=dev-lang/go-1.7.5:=
+ >=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+ enewgroup consul
+ enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+get_archive_go_package() {
+ local archive=${1} uri x
+ for x in ${SRC_URI}; do
+ if [[ ${x} == http* ]]; then
+ uri=${x}
+ elif [[ ${x} == ${archive} ]]; then
+ break
+ fi
+ done
+ uri=${uri#https://}
+ echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+ local go_package x
+ # Unpack packages to appropriate locations for GOPATH
+ for x in ${A}; do
+ unpack ${x}
+ if [[ ${x} == *.tar.gz ]]; then
+ go_package=$(get_archive_go_package ${x})
+ mkdir -p src/${go_package%/*}
+ mv ${go_package##*/}-* src/${go_package} || die
+ fi
+ done
+}
+
+src_unpack() {
+ mkdir "${S}" || die
+ cd "${S}" || die
+ unpack_go_packages
+}
+
+src_prepare() {
+ eapply_user
+
+ sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
+ -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e 's:go get -u -v $(GOTOOLS)::' \
+ -i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+ go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ PATH=${PATH}:${S}/bin \
+ emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_install() {
+ local x
+
+ dobin "${S}/bin/${PN}"
+
+ keepdir /etc/consul.d
+ insinto /etc/consul.d
+ doins "${FILESDIR}/"*.json.example
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners consul:consul "${x}"
+ done
+
+ newinitd "${FILESDIR}/consul.initd" "${PN}"
+ newconfd "${FILESDIR}/consul.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/consul.service"
+}
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 1171ab909d51..90c4af6f1852 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1,3 +1,3 @@
DIST filebeat-5.2.2.tar.gz 16489808 SHA256 45c89fab339de3d3e7f9a83c7a48312ede147d5989b67b8619d9128353c891c3 SHA512 7cf54eb0b27d830e51bf97964f078874eae62e1d9642fb598cdd2f0a405db4a74e1f299c5e57e29a67cfea209b9b3c7f38bdcbe6b2e2885285b77615236971c1 WHIRLPOOL 3a708a799b3360cee12a58d858bd51f474fb86c143c6648edd451d2862ce05ae0bc9544ceef62ddbf05bc50c439a7ee041faef70214ced3e53e16e8452a9f486
DIST filebeat-5.3.2.tar.gz 17595133 SHA256 e8c765531276e4731c5148bd99fad1efc799f3ec68e1d32a2fe116995f2b9e2f SHA512 080d079a063641e3688cc9f1563517e9a314ca834b0fa90fe12d455f984bb83282243736ecf17a7e62214034b71d373afc503d3bc5ff3d106ef5965ce00c3543 WHIRLPOOL ef6aee18d24e2b25439485121f30af2ff4d76c4ac2fe97acd1f6ec70d27c8a49ce9c3323baaa2305f56f20dea0118c970458c0cb8bfa05bc0227fdb3987f1478
-DIST filebeat-5.4.0.tar.gz 17823310 SHA256 d236f9433d48b69cc2f0bf3617f17d5f2eec261acee96cc28d8b72be84afc0a7 SHA512 7249f130a4d0c2bb6797c243a9b57e8f44552c548ad33f48a48463bdd16b3419500688be3d96c426155d2fdda3c94058837bf4fcdc59a849d02230e118699a18 WHIRLPOOL ea27e97a3ccffca5839c307b2a4de5428dd5cb6fb90941ad298887492217e23a15081b4f0e9b394175d80b70c1aeef7fc5a2d6b5c1df65b77012e9b11c569c74
+DIST filebeat-5.4.1.tar.gz 18060876 SHA256 1be33563960699941006fd6957bd9ddcfe923b2299a7d589b35a390d0111eb8d SHA512 07c50580c2f145abfe9988837df965a863f8ed4c07a39916a7bf0739f6a79b6d26ed2c4fc9f8b35a781a9943fd7a8d957ee1aefab9027a563865ba96b3683598 WHIRLPOOL 1209770ec6552796659904e08607aede78c51315d22174d9bc14e86a9927caab924478cd597a84a823256d5fb807f1846aa8775fe025323fc0e6506f72c1d5a8
diff --git a/app-admin/filebeat/filebeat-5.4.0-r1.ebuild b/app-admin/filebeat/filebeat-5.4.1.ebuild
similarity index 100%
rename from app-admin/filebeat/filebeat-5.4.0-r1.ebuild
rename to app-admin/filebeat/filebeat-5.4.1.ebuild
diff --git a/app-admin/logrotate/logrotate-3.12.2.ebuild b/app-admin/logrotate/logrotate-3.12.2.ebuild
index aec656ec0361..b73823ba8520 100644
--- a/app-admin/logrotate/logrotate-3.12.2.ebuild
+++ b/app-admin/logrotate/logrotate-3.12.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> $
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acl +cron selinux"
CDEPEND="
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index abff0d7e2176..af1dbed1f866 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,3 +1,3 @@
DIST logstash-5.2.2.zip 100068713 SHA256 35bd0378f5b9001b4c3056b11496936ef47c09e3ddc469353bc8951e3b81e174 SHA512 923b35e8bcc97f6036cd4a484df546b2cc1341ec8fe5080bea8f979856086aaaae5f71fa0c3f7aee2207f7c3e71aec18af416278123362f89990c05ec9e2c92f WHIRLPOOL 4a67ed0ba3b532da5d488b2e45f53149b4e63b6b638b6fe1058a13eab904cb7ec24cd87306868a4770fe6aadfe13f7d76bfc9973e73104a8e4e9aee455321c32
DIST logstash-5.3.2.zip 100247384 SHA256 b0dfe9295c86dc4efbc1b0884c8078fd414e2e96480c3b513b2a92dab47cb505 SHA512 c150a3076b035204677275081267ac781b34d7abd1e93214cf79d73c326afb58b24ebd91453dd6fb7ba3157cb28de9b319e077e07e4b0cb3db939b99174b130b WHIRLPOOL 83d8b347266e0846b2967b6c11c6615dd3a438d8eaf5dbe057caf7569a6f64ff39a352b56b9ef9127d045d7a37d484a5a09130961cbe190946d7f1b52a66251a
-DIST logstash-5.4.0.zip 98567077 SHA256 f7a817009f7458cb186d652497e68003c221b07dbf28b5097a66b40ffb022a2a SHA512 4d552d43a1817ba04d25a3ada1cf87ecdae632a520627d3b6cb514b7e3384a6a09a98e8f24ea19328c60c4549b9dd1eb0e1a5282665f85877afbd7e7fef88e71 WHIRLPOOL 25dc935abee1ae1852c83801d50fc08bc2896e2744282f219e2afef4e9da5f608472baf4f88b31127959495d320643bbf7f94d7fea809b15d8186f333649ad0e
+DIST logstash-5.4.1.zip 98842493 SHA256 06812d9a1cb9cae6ad83ecabdb6f25337873176db7fec054189c0631e2339bed SHA512 f7cdaf427c34c7a9b1fc3d131572f8be7c7bd113840d221c4faa9e431c9f5ed51ceaebf377a747f5db73c8c46cb7ff550401eae088eb144b056b28896600bf45 WHIRLPOOL 0e1035ebc8253cd058483282bc73e0ccc044e30a9eea6bc033cb37442622e8e7efdba0f97592128da8ae4de932d92f35ccdffa718af6ecab5d5049889e68dc2e
diff --git a/app-admin/logstash-bin/logstash-bin-5.4.0.ebuild b/app-admin/logstash-bin/logstash-bin-5.4.1.ebuild
similarity index 100%
rename from app-admin/logstash-bin/logstash-bin-5.4.0.ebuild
rename to app-admin/logstash-bin/logstash-bin-5.4.1.ebuild
diff --git a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
index 08e0031923ab..a10b5392407d 100644
--- a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
+++ b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://www.freedesktop.org/software/PackageKit/releases/${MY_P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/app-admin/rcm/Manifest b/app-admin/rcm/Manifest
new file mode 100644
index 000000000000..1333b2036e64
--- /dev/null
+++ b/app-admin/rcm/Manifest
@@ -0,0 +1 @@
+DIST rcm-1.3.1.tar.gz 89437 SHA256 9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f SHA512 1fd8ad6f8bee16177444469bddbef8d9b99f0b2bedc82c9833523370dfda4583c425f1ab8f2195f11236d1385553a2a49ead6d4c5f0803deeb56737b6836a0d9 WHIRLPOOL a5614c0901d413ac49584234dd8fc989e5add6d8f6af6a743e76998bb4655e84596e8d564c2ef5f0b80ab3c7c729eadb7c65d3ae40c370378ae72da7205bf4bd
diff --git a/app-admin/rcm/metadata.xml b/app-admin/rcm/metadata.xml
new file mode 100644
index 000000000000..4d26f07cf226
--- /dev/null
+++ b/app-admin/rcm/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ fgtham+genbugs@gmail.com
+ Florian Tham
+ Proxy maintainer - set to assignee on bugs
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ thoughtbot/rcm
+
+
+ rcm is a management suite for dotfiles.
+
+
diff --git a/app-admin/rcm/rcm-1.3.1.ebuild b/app-admin/rcm/rcm-1.3.1.ebuild
new file mode 100644
index 000000000000..ffe718061357
--- /dev/null
+++ b/app-admin/rcm/rcm-1.3.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="rc file (dotfile) management"
+HOMEPAGE="https://github.com/thoughtbot/rcm"
+SRC_URI="https://thoughtbot.github.io/${PN}/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-util/cram )"
+
+src_test() {
+ emake -j1 check
+}
diff --git a/app-admin/serf/Manifest b/app-admin/serf/Manifest
index 6deaa63a4270..57f6f41847bd 100644
--- a/app-admin/serf/Manifest
+++ b/app-admin/serf/Manifest
@@ -1,3 +1,6 @@
+DIST github.com-mitchellh-gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
+DIST github.com-mitchellh-iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
DIST gox-c9740af9c6574448fd48eb30a71f964014c7a837.tar.gz 15772 SHA256 826666828f1ec3e535268fa95d983362c6c773e9a87aa94613e7a47805d22e38 SHA512 d4b2d5d9666285584697bc0d6ddc2f1a1e3f23741650e831adb42baffbb5f72fc3d5ae8a8fb6719faf1df75d3da334941b0404387f0c213aabdb5c3d5634c55d WHIRLPOOL 89d52013bfb563a11a4042760470ac317398c3f8a61b9e7734c3ac2737d916126ad10a113948eb5a8362de3d77e598e42f4a0510760ae67465bde08658947f7a
DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c117246bb1d4d78ad5c3bc5d301942bcebaae5b1e35da1ad7851ceac71a675 SHA512 2efc0e3cbca496240e3e24550fd0d2aab742eb9b227230ff1ed4ee47344b994642b028bd4644cd45cd697f5f5ef6a729aad65537b10c6555bd52d9ca4b9c717c WHIRLPOOL 15dfd50bfc992a7b6a1b5d672d5bf9bfcb71a357eae371eac773e7fe9ad4ec8d4d0578e0dc6b12bb14689d1497129616b0eb300bbcb483a6865ac315bced562a
DIST serf-0.8.0.tar.gz 1439191 SHA256 f56e8da3e6cf748c20ae629aacfd652a04adfacfd0ee0af6560c33933d93547a SHA512 2e074ee8d002e6c7803f23d50d42800cf660ee22c968be8adf4f5e4cefde6dd39bf601c9bd91544d5f45d639ed0eec82c31a0fd1b903e8a0223f2cdd967bbf36 WHIRLPOOL 09b5e5471c14e11bbeb214a64ec57720cd31779c9d331bba2eea31cac9859cdff12d925923514272101449f7d62b671e685f768af1cf2f2497ad1a7a36402570
+DIST serf-0.8.1.tar.gz 1445011 SHA256 266d38c08d7459d38ba901d7cdaf36122a3cb77049fa537f5ab17fac1747d094 SHA512 81a4bc2e1659324980fd59464af021ad5ec80431dc1b49b875bb0c97c8f92766dfee9b204bd8c9ab4e175a281bc23815f5e3008ecfb2848c7354c33603bb5514 WHIRLPOOL 1d7a39b84b939b73dda817df3f9b98c044a93e20561ed7cb573ee68afc2742a3f7aea9cfc837b6b25cd1abdf390bc84c2460b97b27c2a0090f13f9a73b5a7779
diff --git a/app-admin/serf/serf-0.8.1.ebuild b/app-admin/serf/serf-0.8.1.ebuild
new file mode 100644
index 000000000000..963e9bcc99ef
--- /dev/null
+++ b/app-admin/serf/serf-0.8.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=(
+ "github.com/mitchellh/gox c9740af9c6574448fd48eb30a71f964014c7a837"
+ "github.com/mitchellh/iochan 87b45ffd0e9581375c491fef3d32130bb15c5bd7"
+)
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/serf"
+DESCRIPTION="Service orchestration and management tool"
+HOMEPAGE="https://www.serfdom.io/"
+SRC_URI="https://github.com/hashicorp/serf/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="
+ >=dev-lang/go-1.6:=
+ >=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+ enewgroup serf
+ enewuser serf -1 -1 /var/lib/${PN} serf
+}
+
+src_prepare() {
+ eapply_user
+ # Avoid the need to have a git checkout
+ sed -e 's:^GIT.*::' \
+ -e 's:-X main.GitCommit.*:" \\:' \
+ -i "${S}/src/${EGO_PN}/scripts/build.sh" || die
+
+ # go install golang.org/x/tools/cmd/stringer: mkdir /usr/lib/go-gentoo/bin/: permission denied
+ sed -e 's:go get -u -v $(GOTOOLS)::' \
+ -e 's:^GIT.*::' \
+ -i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+ export GOPATH="${S}"
+ mkdir "${S}/src/github.com/mitchellh" || die
+ mv "${S}/src/${EGO_PN}/vendor/github.com/mitchellh/"{gox,iochan} \
+ "${S}/src/github.com/mitchellh" || die
+ go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
+ # The dev target sets causes build.sh to set appropriate XC_OS
+ # and XC_ARCH, and skips generation of an unused zip file,
+ # avoiding a dependency on app-arch/zip.
+ PATH=${PATH}:${S}/bin \
+ emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_test() {
+ emake -C "${S}/src/${EGO_PN}" test
+}
+
+src_install() {
+ local x
+
+ dobin "${S}/bin/${PN}"
+
+ keepdir /etc/serf.d
+ insinto /etc/serf.d
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners serf:serf "${x}"
+ done
+
+ newinitd "${FILESDIR}/serf.initd" "${PN}"
+ newconfd "${FILESDIR}/serf.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/serf.service"
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 7d3660779d2c..8650e3847bfa 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,2 +1 @@
-DIST sudo-1.8.20p1.tar.gz 2930394 SHA256 9e980eb23a60dd11f0f452e672e705d7a386882bc230c6e8483050e03182db1d SHA512 b7d4c07a550da917029e31d15e734d9462f3565ee43eb5f6fd19463b54a2fa3f444381f0999d6d1ba643b65832056dd9177dad4452fa9f87f2542c223b13f258 WHIRLPOOL 7e652f70782d7c5240fa23198d16d94171510d7eb52df56ee667a3da17c26643257d4304c3bfdb94a77831b904ac1c4d4027f2d1140764ddcd130159a3c3a3d3
DIST sudo-1.8.20p2.tar.gz 2930769 SHA256 bd42ae1059e935f795c69ea97b3de09fe9410a58a74b5d5e6836eb5067a445d9 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda WHIRLPOOL 4e9b6ddaba8cdb4d82358e01252136af56ae50f656f9802285471c7c1e5c831d26aa07cb78205f63ea6098f98846911938681a89256afe5419372039d0e4e792
diff --git a/app-admin/sudo/sudo-1.8.20_p1.ebuild b/app-admin/sudo/sudo-1.8.20_p1.ebuild
deleted file mode 100644
index 621ff50e219c..000000000000
--- a/app-admin/sudo/sudo-1.8.20_p1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils pam multilib libtool
-
-MY_P=${P/_/}
-MY_P=${MY_P/beta/b}
-
-uri_prefix=
-case ${P} in
- *_beta*|*_rc*) uri_prefix=beta/ ;;
-esac
-
-DESCRIPTION="Allows users or groups to run commands as other users"
-HOMEPAGE="http://www.sudo.ws/"
-SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
- ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
-
-# Basic license is ISC-style as-is, some files are released under
-# 3-clause BSD license
-LICENSE="ISC BSD"
-SLOT="0"
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
-fi
-IUSE="gcrypt ldap nls pam offensive openssl selinux skey +sendmail"
-
-CDEPEND="
- gcrypt? ( dev-libs/libgcrypt:= )
- openssl? ( dev-libs/openssl:0= )
- pam? ( virtual/pam )
- skey? ( >=sys-auth/skey-1.1.5-r1 )
- ldap? (
- >=net-nds/openldap-2.1.30-r1
- dev-libs/cyrus-sasl
- )
- sys-libs/zlib
-"
-RDEPEND="
- ${CDEPEND}
- selinux? ( sec-policy/selinux-sudo )
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
- >=app-misc/editor-wrapper-3
- virtual/editor
- sendmail? ( virtual/mta )
-"
-DEPEND="
- ${CDEPEND}
- sys-devel/bison
-"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- pam? ( !skey )
- skey? ( !pam )
- ?? ( gcrypt openssl )
-"
-
-MAKEOPTS+=" SAMPLES="
-
-src_prepare() {
- default
- elibtoolize
-}
-
-set_rootpath() {
- # FIXME: secure_path is a compile time setting. using ROOTPATH
- # is not perfect, env-update may invalidate this, but until it
- # is available as a sudoers setting this will have to do.
- einfo "Setting secure_path ..."
-
- # first extract the default ROOTPATH from build env
- ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
- if [[ -z ${ROOTPATH} ]] ; then
- ewarn " Failed to find ROOTPATH, please report this"
- fi
-
- # then remove duplicate path entries
- cleanpath() {
- local newpath thisp IFS=:
- for thisp in $1 ; do
- if [[ :${newpath}: != *:${thisp}:* ]] ; then
- newpath+=:$thisp
- else
- einfo " Duplicate entry ${thisp} removed..."
- fi
- done
- ROOTPATH=${newpath#:}
- }
- cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
-
- # finally, strip gcc paths #136027
- rmpath() {
- local e newpath thisp IFS=:
- for thisp in ${ROOTPATH} ; do
- for e ; do [[ $thisp == $e ]] && continue 2 ; done
- newpath+=:$thisp
- done
- ROOTPATH=${newpath#:}
- }
- rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
- einfo "... done"
-}
-
-src_configure() {
- local ROOTPATH
- set_rootpath
-
- # audit: somebody got to explain me how I can test this before I
- # enable it.. - Diego
- # plugindir: autoconf code is crappy and does not delay evaluation
- # until `make` time, so we have to use a full path here rather than
- # basing off other values.
- myeconfargs=(
- --enable-zlib=system
- --with-editor="${EPREFIX}"/usr/libexec/editor
- --with-env-editor
- --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/var/run/sudo
- --with-secure-path="${ROOTPATH}"
- --with-vardir="${EPREFIX}"/var/db/sudo
- --without-linux-audit
- --without-opie
- $(use_enable gcrypt)
- $(use_enable nls)
- $(use_enable openssl)
- $(use_with offensive insults)
- $(use_with offensive all-insults)
- $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
- $(use_with ldap)
- $(use_with pam)
- $(use_with skey)
- $(use_with selinux)
- $(use_with sendmail)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if use ldap ; then
- dodoc README.LDAP
- dosbin plugins/sudoers/sudoers2ldif
-
- cat <<-EOF > "${T}"/ldap.conf.sudo
- # See ldap.conf(5) and README.LDAP for details
- # This file should only be readable by root
-
- # supported directives: host, port, ssl, ldap_version
- # uri, binddn, bindpw, sudoers_base, sudoers_debug
- # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
- EOF
-
- insinto /etc
- doins "${T}"/ldap.conf.sudo
- fperms 0440 /etc/ldap.conf.sudo
-
- insinto /etc/openldap/schema
- newins doc/schema.OpenLDAP sudo.schema
- fi
-
- pamd_mimic system-auth sudo auth account session
-
- keepdir /var/db/sudo
- fperms 0700 /var/db/sudo
-
- # Don't install into /var/run as that is a tmpfs most of the time
- # (bug #504854)
- rm -rf "${D}"/var/run
-}
-
-pkg_postinst() {
- if use ldap ; then
- ewarn
- ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
- ewarn
- if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
- ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
- ewarn "configured in /etc/nsswitch.conf."
- ewarn
- ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
- ewarn " sudoers: ldap files"
- ewarn
- fi
- fi
- if use prefix ; then
- ewarn
- ewarn "To use sudo, you need to change file ownership and permissions"
- ewarn "with root privileges, as follows:"
- ewarn
- ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
- ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
- ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
- ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
- ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
- ewarn
- fi
-
- elog "To use the -A (askpass) option, you need to install a compatible"
- elog "password program from the following list. Starred packages will"
- elog "automatically register for the use with sudo (but will not force"
- elog "the -A option):"
- elog ""
- elog " [*] net-misc/ssh-askpass-fullscreen"
- elog " net-misc/x11-ssh-askpass"
- elog ""
- elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
- elog "variable to the program you want to use."
-}
diff --git a/app-admin/sudo/sudo-1.8.20_p2.ebuild b/app-admin/sudo/sudo-1.8.20_p2.ebuild
index 163cd3850235..621ff50e219c 100644
--- a/app-admin/sudo/sudo-1.8.20_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.20_p2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
LICENSE="ISC BSD"
SLOT="0"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris"
fi
IUSE="gcrypt ldap nls pam offensive openssl selinux skey +sendmail"
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index a013336805fa..a2e1c21b9f88 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -3,3 +3,4 @@ DIST iochan-87b45ffd0e9581375c491fef3d32130bb15c5bd7.tar.gz 1785 SHA256 71c11724
DIST vault-0.5.3.tar.gz 3591764 SHA256 b312f3d098ebabd4ed7647cf54bc219a0d2afeba49ee8b614a38e455900b2dae SHA512 d0706e045a674aab81c09d9c75d089896e44162bbeece7a92e03eb605997617ba3f8a4d7eeac65c40c4b68d8ea4bb76b3f3893d57466d83d9db6ca5e37ccb05e WHIRLPOOL a1893985d8acb788702fa3d5ce89b05179be23fab03e6fe34249c7554cacc5836bb6b0fc10c1aac8446dd7374c6c5df1abc58990104a59b63ec4f552160fbeea
DIST vault-0.6.2.tar.gz 4862801 SHA256 295197e8ec7d03d4e141733579250ed653b13862a2d83dfd0d11a6e82f28b436 SHA512 5d444c32ee1dc464f9210331ed26ab56b9aaeb5fbdcb5c2fcc4d9363c6d1e60780d7c2f5020ebc3345fb8c3f32b3b8f8acc58533d5a036202685252b2affbe3e WHIRLPOOL d378f57598f6a9e8ce2e0a92382c2496ef1d78a714d3666d12b53760043e97b9eab4eea291a99745af59efcd2323907885d228f43a2154252ab2da1d47592a38
DIST vault-0.6.5.tar.gz 5628341 SHA256 ef4c2fffbc80e126e027e76b30e37351fcaf0baf1178e1fba0e8912276441c00 SHA512 3a135281a2135aae45e9a659b0492d37069b080f42956f8a1fdbf842a8a1e54b474b7c5b48c0e6170b206fdb52da7a718a9702d5a14d3aa99f8e560839268374 WHIRLPOOL 9b2b564cefd1a1bd2858b3b34937314437f6b5dc5fd183f4be58d0517b75465064a860054102a286fd29ae5bb1cb2ba7b0c8b7ff7d52c911905c0ccedc053fd8
+DIST vault-0.7.2.tar.gz 6547973 SHA256 8f0f4e2c8e8877abe5b21d8886a740484e7a921748d4a6092c5d754fbab31030 SHA512 3a811f1a3f7c318bf645bf93c66c15c6a9d06718806ca5dd7a5ff95eeafef6dc6e58bcb829373716172cf2fe863240d1f4fdd34f8dcc1d31a2e36f6917e533ba WHIRLPOOL 9bcc998eb7ece4064bb598be41630232e06fb3c04a7a339efc79572739591772fb8352520f731448efe1aea0d67332cec06e312a81e9a805e75fd2e8106adc88
diff --git a/app-admin/vault/files/vault.service b/app-admin/vault/files/vault.service
index cee34e2845bc..3071d0346277 100644
--- a/app-admin/vault/files/vault.service
+++ b/app-admin/vault/files/vault.service
@@ -8,6 +8,7 @@ User=vault
Environment=VAULT_SERVER_OPTS="-config=/etc/vault.d"
ExecStart=/usr/bin/vault server $VAULT_SERVER_OPTS
CapabilityBoundingSet=CAP_IPC_LOCK
+AmbientCapabilities=CAP_IPC_LOCK
Capabilities=CAP_IPC_LOCK=ep
SecureBits=keep-caps
Restart=on-failure
diff --git a/app-admin/vault/vault-0.7.2.ebuild b/app-admin/vault/vault-0.7.2.ebuild
new file mode 100644
index 000000000000..ce3c889603d7
--- /dev/null
+++ b/app-admin/vault/vault-0.7.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base systemd user
+
+EGO_PN="github.com/hashicorp/${PN}/..."
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.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
+"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.7:="
+RDEPEND=""
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+get_archive_go_package() {
+ local archive=${1} uri x
+ for x in ${SRC_URI}; do
+ if [[ ${x} == http* ]]; then
+ uri=${x}
+ elif [[ ${x} == ${archive} ]]; then
+ break
+ fi
+ done
+ uri=${uri#https://}
+ echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+ local go_package x
+ # Unpack packages to appropriate locations for GOPATH
+ for x in ${A}; do
+ unpack ${x}
+ if [[ ${x} == *.tar.gz ]]; then
+ go_package=$(get_archive_go_package ${x})
+ mkdir -p src/${go_package%/*}
+ mv ${go_package##*/}-* src/${go_package} || die
+ fi
+ done
+}
+
+src_unpack() {
+ mkdir "${S}" && cd "${S}" || die
+ unpack_go_packages
+}
+
+src_prepare() {
+ eapply_user
+ # Avoid the need to have a git checkout
+ sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+ -e 's:^\(GIT_DIRTY=\).*:\1:' \
+ -e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+ -i src/${EGO_PN%/*}/scripts/build.sh || die
+}
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+ export GOPATH=${S}
+ go install -v -work -x ${EGO_BUILD_FLAGS} "github.com/mitchellh/gox/..." || die
+ cd "${S}"/src/${EGO_PN%/*} || die
+ PATH=${PATH}:${S}/bin \
+ XC_ARCH=$(go env GOARCH) \
+ XC_OS=$(go env GOOS) \
+ XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+ emake
+}
+
+src_install() {
+ dodoc "${S}"/src/${EGO_PN%/*}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ dobin "${S}/bin/${PN}"
+}
diff --git a/app-arch/bzip2/bzip2-1.0.6-r8.ebuild b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
new file mode 100644
index 000000000000..0adb22239225
--- /dev/null
+++ b/app-arch/bzip2/bzip2-1.0.6-r8.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: atm, libbz2.a is always PIC :(, so it is always built quickly
+# (since we're building shared libs) ...
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
+HOMEPAGE="http://www.bzip.org/"
+SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
+
+LICENSE="BZIP2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="static static-libs"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.0.6-saneso.patch
+ "${FILESDIR}"/${PN}-1.0.4-man-links.patch #172986
+ "${FILESDIR}"/${PN}-1.0.6-progress.patch
+ "${FILESDIR}"/${PN}-1.0.3-no-test.patch
+ "${FILESDIR}"/${PN}-1.0.4-POSIX-shell.patch #193365
+ "${FILESDIR}"/${PN}-1.0.6-mingw.patch #393573
+ "${FILESDIR}"/${PN}-1.0.6-out-of-tree-build.patch
+ "${FILESDIR}"/${PN}-1.0.6-CVE-2016-3189.patch #620466
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+
+ # - Use right man path
+ # - Generate symlinks instead of hardlinks
+ # - pass custom variables to control libdir
+ sed -i \
+ -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' \
+ -e 's:ln -s -f $(PREFIX)/bin/:ln -s -f :' \
+ -e 's:$(PREFIX)/lib:$(PREFIX)/$(LIBDIR):g' \
+ Makefile || die
+}
+
+bemake() {
+ emake \
+ VPATH="${S}" \
+ CC="$(tc-getCC)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
+ "$@"
+}
+
+multilib_src_compile() {
+ bemake -f "${S}"/Makefile-libbz2_so all
+ # Make sure we link against the shared lib #504648
+ ln -sf libbz2.so.${PV} libbz2.so
+ bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')"
+}
+
+multilib_src_install() {
+ into /usr
+
+ # Install the shared lib manually. We install:
+ # .x.x.x - standard shared lib behavior
+ # .x.x - SONAME some distros use #338321
+ # .x - SONAME Gentoo uses
+ dolib.so libbz2.so.${PV}
+ local v
+ for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do
+ dosym libbz2.so.${PV} /usr/$(get_libdir)/${v}
+ done
+ use static-libs && dolib.a libbz2.a
+
+ if multilib_is_native_abi ; then
+ gen_usr_ldscript -a bz2
+
+ dobin bzip2recover
+ into /
+ dobin bzip2
+ fi
+}
+
+multilib_src_install_all() {
+ # `make install` doesn't cope with out-of-tree builds, nor with
+ # installing just non-binaries, so handle things ourselves.
+ insinto /usr/include
+ doins bzlib.h
+ into /usr
+ dobin bz{diff,grep,more}
+ doman *.1
+
+ dosym bzdiff /usr/bin/bzcmp
+ dosym bzdiff.1 /usr/share/man/man1/bzcmp.1
+
+ dosym bzmore /usr/bin/bzless
+ dosym bzmore.1 /usr/share/man/man1/bzless.1
+
+ local x
+ for x in bunzip2 bzcat bzip2recover ; do
+ dosym bzip2.1 /usr/share/man/man1/${x}.1
+ done
+ for x in bz{e,f}grep ; do
+ dosym bzgrep /usr/bin/${x}
+ dosym bzgrep.1 /usr/share/man/man1/${x}.1
+ done
+
+ dodoc README* CHANGES manual.pdf
+ dohtml manual.html
+
+ # move "important" bzip2 binaries to /bin and use the shared libbz2.so
+ dosym bzip2 /bin/bzcat
+ dosym bzip2 /bin/bunzip2
+}
diff --git a/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
new file mode 100644
index 000000000000..1d0c3a6dd34f
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.6-CVE-2016-3189.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Backport
+https://bugzilla.suse.com/attachment.cgi?id=681334
+
+CVE: CVE-2016-3189
+Signed-off-by: Armin Kuster
+
+Index: bzip2-1.0.6/bzip2recover.c
+===================================================================
+--- bzip2-1.0.6.orig/bzip2recover.c
++++ bzip2-1.0.6/bzip2recover.c
+@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv )
+ bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 );
+ bsPutUInt32 ( bsWr, blockCRC );
+ bsClose ( bsWr );
++ outFile = NULL;
+ }
+ if (wrBlock >= rbCtr) break;
+ wrBlock++;
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 9440ad0745dc..d18b1d863fef 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,4 @@
DIST engrampa-1.12.0.tar.xz 1380144 SHA256 4f1f8b0829000f6bb2d8a53a8da098dc5b177638c6d8e5b3fb52402a4541759c SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec WHIRLPOOL b1132440b2d02fd2bfa9c903794113cf7d36eb7e67b4dc3222635dc7c33c459a87885ce1ec7bcdc623db8c75a6d33015ade6faaf3cfa8fd85fc85631d87366da
DIST engrampa-1.14.1.tar.xz 1417444 SHA256 43d882e772c53d13856f02e44454927e3bab4c5d77094057572be6972e0310d8 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763 WHIRLPOOL 6793b07c57d91ce73c102fc59b4e18141532f895814b4879547b10db4dec24029185d944cce5f34e8a880e9da2a2e229dfc44cf3d6d95ae264b2207ddcbedb8c
DIST engrampa-1.16.0.tar.xz 1430028 SHA256 dd7f11d60693cb77691a589551bcaf4050d4921d996fbbbe3a61ed7fc4072efc SHA512 d0bf44040b4aa8298137605b632a1b022a69c665cc0324a3358693e7151091f1adba0f6eb01ee04b8ada09977f979ed3c3ed8b3f5314b06d96fede0c4ff37ce2 WHIRLPOOL 1f759fbec85e073d156b6f539e23cb3f610bfd38007e88ec640e37e14cab01743adc7cbdaf53ab6776b2ba1886a6b4a6dad6f0a4cd5c735c0998bfa72632242f
+DIST engrampa-1.18.1.tar.xz 1427140 SHA256 be7218078f13d715e35580d231c0b5090fac1210b9de83f93311079f39b8aabc SHA512 9b39783f508a0582a2e77ea6a2cd3665b6054274bea8ad14f78ed37e20533e78554eca23fc171e090bd881468d630d5f644d687bee8bb282f5a106c80b1daf17 WHIRLPOOL 5aee31a84c2fb3f098201cd5f1f1974ed601fef261adcf369be293e1daa94644a0d40c90a0130e6db52a2568d95ea1b212ed58c53c8c5fbba1e5b97dd4e488d5
diff --git a/app-arch/engrampa/engrampa-1.18.1.ebuild b/app-arch/engrampa/engrampa-1.18.1.ebuild
new file mode 100644
index 000000000000..408158541234
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.18.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32.0:2
+ >=dev-libs/json-glib-0.14:0
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango:0
+ virtual/libintl:0
+ caja? ( >=mate-base/caja-1.17.1 )
+ >=x11-libs/gtk+-3.14:3[X]
+ magic? ( sys-apps/file )
+ packagekit? ( app-admin/packagekit-base )
+ !!app-arch/mate-file-archiver"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+ app-text/yelp-tools
+ >=dev-util/intltool-0.50.1:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+src_configure() {
+ mate_src_configure \
+ --disable-run-in-place \
+ $(use_enable caja caja-actions) \
+ $(use_enable magic) \
+ $(use_enable packagekit)
+}
+
+pkg_postinst() {
+ mate_pkg_postinst
+
+ elog ""
+ elog "${PN} is a frontend for several archiving utilities. If you want a"
+ elog "particular achive format supported install the relevant package."
+ elog
+ elog "For example:"
+ elog " 7-zip : emerge app-arch/p7zip"
+ elog " ace : emerge app-arch/unace"
+ elog " arj : emerge app-arch/arj"
+ elog " cpio : emerge app-arch/cpio"
+ elog " deb : emerge app-arch/dpkg"
+ elog " iso : emerge app-cdr/cdrtools"
+ elog " jar,zip : emerge app-arch/zip or emerge app-arch/unzip"
+ elog " lha : emerge app-arch/lha"
+ elog " lzma : emerge app-arch/xz-utils"
+ elog " lzop : emerge app-arch/lzop"
+ elog " rar : emerge app-arch/unrar"
+ elog " rpm : emerge app-arch/rpm"
+ elog " unstuff : emerge app-arch/stuffit"
+ elog " zoo : emerge app-arch/zoo"
+}
diff --git a/app-backup/buttersink/buttersink-0.6.8.ebuild b/app-backup/buttersink/buttersink-0.6.8.ebuild
index 44802d17a6e9..998f4d7a31d8 100644
--- a/app-backup/buttersink/buttersink-0.6.8.ebuild
+++ b/app-backup/buttersink/buttersink-0.6.8.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/AmesCornish/buttersink"
LICENSE="GPL-3"
SLOT=0
+IUSE="test"
# local tests would require root and cause sandbox issues with btrfs subvolume
# operations, and network tests would require an SSH server with root login to
@@ -30,10 +31,10 @@ fi
RDEPEND="${PYTHON_DEPS}
dev-python/boto[${PYTHON_USEDEP}]
dev-python/crcmod[${PYTHON_USEDEP}]
- dev-python/flake8[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
sys-fs/btrfs-progs"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
python_prepare_all() {
if [[ ${PV} == 9999 ]] ; then
diff --git a/app-backup/buttersink/buttersink-9999.ebuild b/app-backup/buttersink/buttersink-9999.ebuild
index 44802d17a6e9..998f4d7a31d8 100644
--- a/app-backup/buttersink/buttersink-9999.ebuild
+++ b/app-backup/buttersink/buttersink-9999.ebuild
@@ -11,6 +11,7 @@ HOMEPAGE="https://github.com/AmesCornish/buttersink"
LICENSE="GPL-3"
SLOT=0
+IUSE="test"
# local tests would require root and cause sandbox issues with btrfs subvolume
# operations, and network tests would require an SSH server with root login to
@@ -30,10 +31,10 @@ fi
RDEPEND="${PYTHON_DEPS}
dev-python/boto[${PYTHON_USEDEP}]
dev-python/crcmod[${PYTHON_USEDEP}]
- dev-python/flake8[${PYTHON_USEDEP}]
dev-python/psutil[${PYTHON_USEDEP}]
sys-fs/btrfs-progs"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
python_prepare_all() {
if [[ ${PV} == 9999 ]] ; then
diff --git a/app-backup/duply/Manifest b/app-backup/duply/Manifest
index 3692d2c9467e..b88e1ec30830 100644
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@@ -2,3 +2,4 @@ DIST duply_1.11.2.tgz 44094 SHA256 06843960ae5753395cb5be72a9c9f2fe78e6ea81a17c6
DIST duply_1.11.3.tgz 44198 SHA256 585757a02abc91bcc0e37004eef735794d6581d1a30ec68303c6c04833b20940 SHA512 5817d4571c27288b227add04e84fa0066e278cdbc819a9332cb6fa2aaf6609e923abe9824ac704fed250b961300c57ca1de945af03370287f7cbf68876513457 WHIRLPOOL de27f44067b087d7d3324eb211573d14315c3f4143441e13853801ba36792dd7ec0aa926d2819f9f01d68b081ee9e0fbcad961496fd2a7b29ad6ced082af9dd1
DIST duply_1.9.2.tgz 36222 SHA256 2bfc0964ebc0bae5752e0b4a12eb8fb6f78a27739f32c9acb4ac81947506c5ab SHA512 9ef5e22f43a6854e413ed1c2b88b10d0ae75cff7b2bcd927d20a588234555e9b7eff25d094f688f9d4f8510eba6bc20f7635c0de9ab9b402966075595922333e WHIRLPOOL 6a3e79c87e0b28386f0ed6fd8eb7973659477ad278e80e292a3e6cea944fd512baffc9a455e148faeadb687a46a8e274ce86668c29f30244b5b63f1f850a9c00
DIST duply_2.0.1.tgz 44914 SHA256 9d2baf55ada5ab36a6da3fa909c8bdc4ce9a0116eac259ebba0efe9b93180bb0 SHA512 28f1670f2579956cb4d0d5727403e8b9f4afcdd8ea79e117536dfb89b3f3cf6a7bc7eb802bc4dcd39fc6a443a9f8fa3fe722f2b8336186517184940ce6fa73ec WHIRLPOOL 7c41a8d14cf6f372dea831de0d16179c369a75fc4eff77469ae85b3877526babc2fe112829b4cf295be8808bdda803a01ed83f6db73fa4ed952ae936ac990766
+DIST duply_2.0.2.tgz 45406 SHA256 33869adad763d5dd0a79a3d1d5b860a77f8e40be5150c3876d6ce5476004415f SHA512 2f53d380445272a2354f6914c39373e93d27fdcc5c712d7041fc798547280cebff53882f93d0467d86fc044b8a3a73a6b2fe04a9eaadae55b58bc9c617bab48a WHIRLPOOL 2c8b50b71b27e669c831639093b45a08906f2c6d8af735350e532a34bdf96c21f3ed0b1e191cf97bf6c7215def5cd2c65e6a4fd7dd62e54ee25e8aa0726ee724
diff --git a/app-backup/duply/duply-2.0.2.ebuild b/app-backup/duply/duply-2.0.2.ebuild
new file mode 100644
index 000000000000..8eddec6aefe9
--- /dev/null
+++ b/app-backup/duply/duply-2.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="A shell frontend for duplicity"
+HOMEPAGE="http://duply.net"
+SRC_URI="mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.0.x/${PN}_${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/txt2man"
+RDEPEND="app-backup/duplicity"
+
+S=${WORKDIR}/${PN}_${PV}
+
+src_install() {
+ dobin ${PN}
+ ./${PN} txt2man > ${PN}.1 || die
+ doman ${PN}.1
+ dodoc CHANGELOG.txt
+ readme.gentoo_create_doc
+}
diff --git a/app-benchmarks/i7z/Manifest b/app-benchmarks/i7z/Manifest
index 4b517de685c8..474b6ddf5684 100644
--- a/app-benchmarks/i7z/Manifest
+++ b/app-benchmarks/i7z/Manifest
@@ -1,2 +1 @@
-DIST i7z-0.27.2.tar.gz 51226 SHA256 a7f72d65732c17eef0df4f284927fe744fc650075f2364c51c9497534d8f47f1 SHA512 d693fda4d12bf7b0d8e694d9f97876fcd2cad4556c950b4eab09ae21d121e63e221e1e1b27bcf23a241fd868b09165639ecfafeaa126144ad809199fcaca1cbb WHIRLPOOL aaea6bc544a554703cd85f7e2e075588114a6c807e1311421300464f1468560423e987f1582b5e58a2fd48eb1753559958ea39ed9ab97e621718e7f46e8c476e
DIST i7z-93_p20131012.tar.gz 879969 SHA256 e127bddf850e7febd39cef2d2b13dca5fe19cc2a1bb1099d72b683be5d8bd1c0 SHA512 ef2dfc36407b18a2081413d423cc3d38c38121e386d9068eee9a794b810232727b3abbd22d3b36bc32206f4dc89dd881a4550df19108c439a91f01369bf74d5a WHIRLPOOL f46d7c3ae19920315e68d6c3264d14613f457201e1107c07b6c74632fff13c1cdb75747add8f1618937c5b4430a476dfc5f5d30fc01df16579fd843e4516faab
diff --git a/app-benchmarks/i7z/i7z-0.27.2.ebuild b/app-benchmarks/i7z/i7z-0.27.2.ebuild
deleted file mode 100644
index e11ec632c02c..000000000000
--- a/app-benchmarks/i7z/i7z-0.27.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="A better i7 (and now i3, i5) reporting tool for Linux"
-HOMEPAGE="https://github.com/ajaiantilal/i7z"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="X"
-
-RDEPEND="
- sys-libs/ncurses:0=
- X? ( dev-qt/qtgui:4= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ncurses.patch
- tc-export CC
-}
-
-src_compile() {
- default
- if use X; then
- cd GUI
- eqmake4 ${PN}_GUI.pro && emake clean && emake
- fi
-}
-
-src_install() {
- emake DESTDIR="${ED}" docdir=/usr/share/doc/${PF} install
- use X && dosbin GUI/i7z_GUI
-}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 50962e99d45f..e8dc818dc7a5 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,2 +1,3 @@
DIST p11-kit-0.23.2.tar.gz 1022733 SHA256 ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0 SHA512 b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f WHIRLPOOL 03ffdce4b96682a7283e9d473f90f2c50be7de5930e1b3cda420bfd09002f3b0bd23351d5edf97f63f6df02545994628d97cf424fc92f66f3ccb04342ddab21c
DIST p11-kit-0.23.5.tar.gz 1074479 SHA256 0d8fed192563c324bb5ace3c068f06558a5569a6e8eb47eee1cd79ada3b1124f SHA512 5276db3c9bb14d5e0441e7b781033b1684edfc1d4da88a9c9ce501ed1f6121918d3afe6725ceb0e2d65fc253c2f9eebf37c3380741de6c1b09cec06ae86417a7 WHIRLPOOL 6d641b7884915e3ebd93ffc6a4364fe43269af0e1bd55419d87cddc9a2074d9217f666a968d6b5bad92b4c20f52d062b0164524585460d41c78c3c590aa3b0ea
+DIST p11-kit-0.23.7.tar.gz 1087009 SHA256 988e7c86f2641b36702503481292ef0686e6b1c39d80b215699b6dbf1024be41 SHA512 c9f492220a963726cd1883c276a4a3e607c07f77a34253797beb9f11e671cadcc1b1fa85baa746a0c5bc3f439a8c362e0b2f86796500215fa05efb5446f2baf8 WHIRLPOOL bca4968ade1621339fa98c896b8e4a72a6dea47f56ca2d99d343dd569427e05da6f04428601966c4a4c64e3d56c58f2a505b291ba6f6765385b7ba1629605066
diff --git a/app-crypt/p11-kit/p11-kit-0.23.7.ebuild b/app-crypt/p11-kit/p11-kit-0.23.7.ebuild
new file mode 100644
index 000000000000..2844a9889097
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit ltprune multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html https://github.com/p11-glue/p11-kit"
+SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4[${MULTILIB_USEDEP}] )
+ libffi? ( >=dev-libs/libffi-3.0.0[${MULTILIB_USEDEP}] )
+ trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+pkg_setup() {
+ # disable unsafe tests, bug#502088
+ export FAKED_MODE=1
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable trust trust-module) \
+ $(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+ $(use_enable debug) \
+ $(use_with libffi) \
+ $(use_with asn1 libtasn1)
+
+ if multilib_is_native_abi; then
+ # re-use provided documentation
+ ln -s "${S}"/doc/manual/html doc/manual/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/app-crypt/qca/qca-2.1.3-r1.ebuild b/app-crypt/qca/qca-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..1bdc07abea39
--- /dev/null
+++ b/app-crypt/qca/qca-2.1.3-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multibuild qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 +qt4 qt5 sasl softstore +ssl test"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+RDEPEND="
+ !app-crypt/qca-cyrus-sasl
+ !app-crypt/qca-gnupg
+ !app-crypt/qca-logger
+ !app-crypt/qca-ossl
+ !app-crypt/qca-pkcs11
+ botan? ( dev-libs/botan:0 )
+ gcrypt? ( dev-libs/libgcrypt:= )
+ gpg? ( app-crypt/gnupg )
+ nss? ( dev-libs/nss )
+ pkcs11? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-libs/pkcs11-helper
+ )
+ qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtnetwork:5
+ )
+ sasl? ( dev-libs/cyrus-sasl:2 )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? (
+ qt4? ( dev-qt/qttest:4 )
+ qt5? ( dev-qt/qttest:5 )
+ )
+"
+
+DOCS=( README TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable-pgp-test.patch"
+ "${FILESDIR}/${P}-c++11.patch"
+)
+
+qca_plugin_use() {
+ echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ -DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_mkspecsdir)/features"
+ -DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(${MULTIBUILD_VARIANT}_get_plugindir)"
+ $(qca_plugin_use botan)
+ $(qca_plugin_use gcrypt)
+ $(qca_plugin_use gpg gnupg)
+ $(qca_plugin_use logger)
+ $(qca_plugin_use nss)
+ $(qca_plugin_use pkcs11)
+ $(qca_plugin_use sasl cyrus-sasl)
+ $(qca_plugin_use softstore)
+ $(qca_plugin_use ssl ossl)
+ -DBUILD_TESTS=$(usex test)
+ )
+
+ if [[ ${MULTIBUILD_VARIANT} == qt4 ]]; then
+ mycmakeargs+=(-DQT4_BUILD=ON)
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ mytest() {
+ local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+ cmake-utils_src_test
+ }
+
+ multibuild_foreach_variant mytest
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+
+ if use doc; then
+ pushd "${BUILD_DIR}" >/dev/null || die
+ doxygen Doxyfile.in || die
+ dodoc -r apidocs/html
+ popd >/dev/null || die
+ fi
+
+ if use examples; then
+ dodoc -r "${S}"/examples
+ fi
+}
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index b5a9ba07eeef..38c6b78c44ca 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -1,2 +1,3 @@
DIST dict-en-20160901.oxt 6025820 SHA256 04ed9a2cbfeb42d77519232239e2c850b43b618f41e36dbe6e3389d1bc76676a SHA512 f52b1fe8c32c6f7dad389d43f52356ecc989365113593513c61a36ad6fed03c6eab7e08c9a07b281c1a30bdf6dbe2d201bc2ed83c6b1fce1006e16de969a30b0 WHIRLPOOL 7819569189de66e3b988a8168f57246467fe3c64c48030592adffcddd576445db643942e2fd05ce7dde52ce93efaf8b42cf6845a3588545a29c0fa5f643df292
DIST dict-en-20170101.oxt 5960816 SHA256 0522dcd0692b00d7ef555b5f5582750d5cb8279ac4c70e2b2190cec60169b366 SHA512 fae05d3e4bdc9bbd5dda6eb2c0de2f5d0860973e75fe0931bcb0d0e0a5015fb6042beec7f811bee0011f519d13d0f3b52b09fbd906a75340bf311177885ccc1d WHIRLPOOL afc033e0a07121f5b15b1956393c950d75a42e648e885b3e65eafe8de6d191a105196f7c8a41ab2716ec8ec96bb210455d99fa5fc0b5825b7b0539ec3404c9bc
+DIST dict-en-20170501.oxt 5964856 SHA256 942d38f685eff64d1c97edb0b50fe938e66b0ee1d6117ca104ebdd7ae7edc123 SHA512 df8b2f15903d650b5fe9499dd278d2831f98aba421e83d38e7807e42c3c2304fc7921f12663589a7195de6d298be6103e3f7a58b15755512bd1db0e4c4f7c5d5 WHIRLPOOL ad71ec4dde9f380b43262d719c8247c31e9953c50df0093ef57b81b08ce26c70989454f27c1d789e5bdc2523deab68bdbfdcc2b158d5c66123baf45b088d67f4
diff --git a/app-dicts/myspell-en/myspell-en-20170501.ebuild b/app-dicts/myspell-en/myspell-en-20170501.ebuild
new file mode 100644
index 000000000000..4a22cb35078f
--- /dev/null
+++ b/app-dicts/myspell-en/myspell-en-20170501.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
+
+MYSPELL_DICT=(
+ "en_AU.aff"
+ "en_AU.dic"
+ "en_CA.aff"
+ "en_CA.dic"
+ "en_GB.aff"
+ "en_GB.dic"
+ "en_US.aff"
+ "en_US.dic"
+ "en_ZA.aff"
+ "en_ZA.dic"
+)
+
+MYSPELL_HYPH=(
+ "hyph_en_GB.dic"
+)
+
+MYSPELL_THES=(
+ "th_en_US_v2.dat"
+ "th_en_US_v2.idx"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="English dictionaries for myspell/hunspell"
+HOMEPAGE="http://extensions.libreoffice.org/extensions/english-dictionaries"
+SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
+
+LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index d444a0347bd2..a349d4845893 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,3 +1,4 @@
DIST pluma-1.12.2.tar.xz 3397280 SHA256 eb74988a9fa9892f883b2ccdc9cf217478576815bcb02662d2e3cf2ae39ef870 SHA512 db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275 WHIRLPOOL 30e45dc3e399e77403d23ebe1c8fb98592f3a408de3bd5ee724e621168b26116de0c520348dd74929e360a251b8d727ef9967746b14732fc6e03d63ffb3091c4
DIST pluma-1.14.1.tar.xz 3415364 SHA256 5517e9bf93ec22a3036498f2e95652fb9046229b8a0da66a742643eab7e595a1 SHA512 5d04e053ab2eb0f90e34d9af541004867c7317fd9386229c4e702e95a80420df16b20e4ae4c30bbee79fe904282f6134f7c361971be07cd6952612d975c88d11 WHIRLPOOL 217d447f0ebe9bcf069b6831421e9680256c7b70753ab126aaf5641ba518df12b4fc60041feb433873a0cbc2d7108bf871958e13186b71e050d9f0610db9b770
DIST pluma-1.16.0.tar.xz 3412640 SHA256 0eb4a4486f1c83119969567cedb05894f25ac5d43cefb4c3ed88ca2f75eff29d SHA512 2472a1631cb89f4df0d09558bd274b6c6d042ae4cbb6ae0134a089cfefb5d0673ec28d78d3665dd1933f76a9c20517afe626f921e06703af9e3c71b9f3b96260 WHIRLPOOL 74c57e589e0f1c2013eb01b1c1aa9e455b0741486f5e1537588f641521fb180b6f7f7a02a9512e069dd94a1d9111fd3d52000a3c05adf30f84ef2ebbadeb0c22
+DIST pluma-1.18.2.tar.xz 3348500 SHA256 ff0f29d4eaa946cbb2b26bbdc2b2d5a308b2d16ec99ea384bcb13f1f3d1a09fc SHA512 285170531c92ad13fdd35286c06de62b75f0426a830c51f4f54799b4b5377d65b3e1fd1e1af3827462a356947e853e4203a4ed394a8b6137bbd87e289f490b6d WHIRLPOOL 13ede09dcede35be84797a3c597fbb1b3fc06aaf866dab17a831c19c577a22aa61af7b5758221a971cc6244bc2c966041228911947ecbaca59292b98d3c4da7d
diff --git a/app-editors/pluma/pluma-1.18.2.ebuild b/app-editors/pluma/pluma-1.18.2.ebuild
new file mode 100644
index 000000000000..65d4d2f88bc0
--- /dev/null
+++ b/app-editors/pluma/pluma-1.18.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate multilib python-single-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Pluma text editor for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+introspection spell"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
+# https://github.com/mate-desktop/mate-text-editor/issues/33
+RESTRICT="test"
+
+COMMON_DEPEND="dev-libs/atk:0
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/libpeas-1.2.0[gtk]
+ >=dev-libs/libxml2-2.5:2
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.14.0:3[introspection?]
+ >=x11-libs/gtksourceview-3.0.0:3.0
+ x11-libs/libICE:0
+ x11-libs/libX11:0
+ >=x11-libs/libSM-1.0
+ x11-libs/pango:0
+ virtual/libintl:0
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+ spell? (
+ >=app-text/enchant-1.2:0
+ >=app-text/iso-codes-0.35:0
+ )
+ !!app-editors/mate-text-editor"
+
+RDEPEND="${PYTHON_DEPS}
+ ${COMMON_DEPEND}
+ >=mate-base/mate-desktop-1.9[introspection?]"
+
+DEPEND="${COMMON_DEPEND}
+ ~app-text/docbook-xml-dtd-4.1.2
+ app-text/rarian:0
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.50.1:*
+ >=sys-devel/libtool-2.2.6:2
+ >=sys-devel/gettext-0.17:*
+ virtual/pkgconfig:*"
+
+src_configure() {
+ mate_src_configure \
+ $(use_enable introspection) \
+ $(use_enable spell)
+}
+
+src_test() {
+ # FIXME: This should be handled at eclass level.
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+ unset DBUS_SESSION_BUS_ADDRESS
+
+ GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index de64e435c445..e2ab7921f85d 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,2 +1 @@
-DIST ebuild-mode-1.31.tar.xz 29492 SHA256 09bcea9ede052bf33bde402f472340570fb8eff67196cd69d4ea4820d84edf0e SHA512 8e4868a40966d5b56573425fe41d638ef1bc10a1161759218c22d33cbeb67ed3e1c75553c58a1f1c9e3ff0d2d8b25794404909a2bd19e76be93a037f8f3a0581 WHIRLPOOL d256a716baa2a276e62790e8996815e608c22e6bb2072f62a4089cc8b594d9e5470f7d574c33c23cc6817c74d59d1927e7591f8d8150985641ba61c50d6335c2
DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.31-r1.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.31-r1.ebuild
deleted file mode 100644
index b5105be0ca52..000000000000
--- a/app-emacs/ebuild-mode/ebuild-mode-1.31-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1 elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
-SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-DOCS="ChangeLog keyword-generation.sh"
-ELISP_PATCHES="${P}-id.patch"
-ELISP_TEXINFO="${PN}.texi"
-SITEFILE="50${PN}-gentoo-1.31.el"
-DOC_CONTENTS="Some optional features may require installation of additional
- packages, like app-portage/gentoolkit-dev for echangelog."
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.37.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.37.ebuild
index 5e04dd683489..80158ab8c976 100644
--- a/app-emacs/ebuild-mode/ebuild-mode-1.37.ebuild
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.37.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
DOCS="ChangeLog keyword-generation.sh"
ELISP_TEXINFO="${PN}.texi"
diff --git a/app-emacs/ebuild-mode/files/ebuild-mode-1.31-id.patch b/app-emacs/ebuild-mode/files/ebuild-mode-1.31-id.patch
deleted file mode 100644
index fadedf7ba178..000000000000
--- a/app-emacs/ebuild-mode/files/ebuild-mode-1.31-id.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 9d8da599f80d8360a8ddb15eb637ff781e370da2
-Author: Ulrich Müller
-Date: Sun Feb 26 19:36:17 2017 +0100
-
- Remove $Id$ line from ebuild skeleton header.
-
- * ebuild-mode.el (ebuild-mode-insert-skeleton): Remove $Id$ line
- from ebuild header.
-
---- a/ebuild-mode.el
-+++ b/ebuild-mode.el
-@@ -402,7 +402,6 @@ and `all-completions' for details."
- ;; standard header
- "# Copyright 1999-" (format-time-string "%Y") " Gentoo Foundation\n"
- "# Distributed under the terms of the GNU General Public License v2\n"
-- "# $Id$\n"
- "\n"
- ;; EAPI
- "EAPI="
diff --git a/app-emulation/genymotion-bin/Manifest b/app-emulation/genymotion-bin/Manifest
index 4a64ae3a15c9..2f435a8ce5f6 100644
--- a/app-emulation/genymotion-bin/Manifest
+++ b/app-emulation/genymotion-bin/Manifest
@@ -1,2 +1 @@
-DIST genymotion-2.8.1_x64.bin 47061574 SHA256 4f971beb117c578d07ca71a7a8d6cd3a574fdee2df48eb165a15a26b57625408 SHA512 8ca4f46e983ffa2a19c21e961b6638af859f7635bd3a976c0b5709622a536569c81ccf3b08f52f0016e37990d83b1fd38cc86c9dbb5599e727fd48558567dfa7 WHIRLPOOL 2ccd896f1f017d2399366d822b5615b607fe74d557d3c3b6c746bdd2814cd081835397608a08f1135367cb79a26e19917f0f4186d1e535b63f347647afbbc5ce
DIST genymotion-2.9.0-linux_x64.bin 44858494 SHA256 2392c8fdce45354d109b001e72d994f26bd6d4a3976ef91f02404178dc66c110 SHA512 cf96b804ecfb5c620d20ce601ab6a99bdcc9365efa9bf6e830ac54c75ad2838372115db425a549b89a05bc496ce39dbb51a3abeba1641e300f801f996eeaaf1f WHIRLPOOL 49b2abe0f04b34810140410deac8a0063787963828186b97bc595da94686b50b46c5c7422dcc4bb49b26eb8cf438e696914f11fd0bb37f0830731781bfe401d8
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild
deleted file mode 100644
index 45b76acfd35f..000000000000
--- a/app-emulation/genymotion-bin/genymotion-bin-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-MY_PN="${PN/-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Complete set of tools that provide a virtual environment for Android"
-HOMEPAGE="http://genymotion.com"
-SRC_URI="${MY_P}_x64.bin"
-DOWNLOAD_URL="https://www.genymotion.com/download/"
-
-LICENSE="genymotion"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-DEPEND=""
-RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 )
- virtual/opengl
- media-libs/libpng:1.2
- dev-libs/openssl
- dev-qt/qtgui:5[libinput,xcb]
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtwebkit:5
- dev-qt/qtsvg:5
- dev-qt/qtx11extras:5
- dev-qt/qtdeclarative:5
- dev-qt/qtconcurrent:5
- dev-util/android-sdk-update-manager
- media-libs/jpeg:8
- dev-libs/double-conversion
- sys-apps/util-linux
- media-libs/fontconfig:1.0
- media-libs/harfbuzz[graphite]
- >=dev-libs/libffi-3.0.13-r1
- media-libs/gstreamer[orc]
-"
-RESTRICT="bindist fetch"
-S="${WORKDIR}"
-
-pkg_nofetch() {
- einfo
- einfo "Please visit ${DOWNLOAD_URL} and download ${MY_P}_x64.bin"
- einfo "which must be placed in ${DISTDIR}"
- einfo
-}
-
-src_unpack() {
- cp "${DISTDIR}/${A}" "${WORKDIR}" || die "cp failed"
-}
-
-src_prepare() {
- default
-
- # removed function _install_desktop_file because happens outside of sandbox
- sed -i -e "s/_install_desktop_file\ ||\ abort//" ${A} || die "sed failed"
- chmod +x ${A} || die "chmod failed"
- yes | ./${A} -d "${S}" > /dev/null || die "unpack failed"
-
- # removed windows line for bashcompletion
- sed -i -e "s/complete\ -F\ _gmtool\ gmtool.exe//" "${S}/${MY_PN}/completion/bash/gmtool.bash" || die "sed failed"
-}
-
-QA_PREBUILT="
- opt/${MY_PN}/*.so*
- opt/${MY_PN}/imageformats/*.so
- opt/${MY_PN}/plugins/*.so*
- opt/${MY_PN}/device-upgrade
- opt/${MY_PN}/${MY_PN}
- opt/${MY_PN}/genyshell
- opt/${MY_PN}/player
- opt/${MY_PN}/${MY_PN}adbtunneld
- opt/${MY_PN}/gmtool
-"
-
-src_install() {
- insinto /opt/"${MY_PN}"
- doins -r "${MY_PN}"/{plugins,translations,icons}
-
- doins "${MY_PN}"/{libcom,librendering}.so*
- # library that differ from system version
- doins "${MY_PN}"/{libicudata,libicui18n,libicuuc,libswscale,libavutil,libprotobuf}.so*
- # android library
- doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender}.so*
-
- insopts -m0755
- doins "${MY_PN}"/{device-upgrade,genymotion,genyshell,player,genymotionadbtunneld,gmtool}
-
- dosym "${ED%/}"/opt/"${MY_PN}"/genyshell /opt/bin/genyshell
- dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}" /opt/bin/"${MY_PN}"
- dosym "${ED%/}"/opt/"${MY_PN}"/device-upgrade /opt/bin/"${MY_PN}"-device-upgrade
- dosym "${ED%/}"/opt/"${MY_PN}"/player /opt/bin/"${MY_PN}"-player
- dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}"adbtunneld /opt/bin/"${MY_PN}"adbtunneld
- dosym "${ED%/}"/opt/"${MY_PN}"/gmtool /opt/bin/gmtool
-
- # Workaround
- dosym "${ED%/}/"usr/$(get_libdir)/qt5/plugins/imageformats/libqsvg.so /opt/"${MY_PN}"/imageformats/libqsvg.so
-
- newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
-
- if has_version "app-shells/zsh" ; then
- insinto /usr/share/zsh/site-functions
- doins "${MY_PN}/completion/zsh/_gmtool"
- fi
-
- make_desktop_entry "/opt/${MY_PN}/${MY_PN}" "Genymotion ${PV}" "/opt/${MY_PN}/icons/icon.png" "Development;Emulator;"
- mv "${ED%/}"/usr/share/applications/*.desktop "${ED%/}"/usr/share/applications/"${MY_PN}".desktop || die "mv failed"
-}
-
-pkg_postinst() {
- elog "Genymotion needs adb to work correctly: install with android-sdk-update-manager"
- elog "'Android SDK Platform-tools' and 'Android SDK Tools'"
- elog "Your user should also be in the android group to work correctly"
- elog "Then in Genymotion set the android-sdk-update-manager directory: (Settings->ADB)"
- elog
- elog " /opt/android-sdk-update-manager"
-}
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.9.0.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.9.0-r1.ebuild
similarity index 83%
rename from app-emulation/genymotion-bin/genymotion-bin-2.9.0.ebuild
rename to app-emulation/genymotion-bin/genymotion-bin-2.9.0-r1.ebuild
index 535cd7d4ae10..b0faa6ff4a4f 100644
--- a/app-emulation/genymotion-bin/genymotion-bin-2.9.0.ebuild
+++ b/app-emulation/genymotion-bin/genymotion-bin-2.9.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils bash-completion-r1
+inherit eutils bash-completion-r1 pax-utils
MY_PN="${PN/-bin}"
MY_P="${MY_PN}-${PV}"
@@ -20,24 +20,25 @@ KEYWORDS="-* ~amd64"
DEPEND=""
RDEPEND="|| ( >=app-emulation/virtualbox-5.0.28 >=app-emulation/virtualbox-bin-5.0.28 )
virtual/opengl
- media-libs/libpng:1.2
dev-libs/openssl
- dev-qt/qtgui:5[libinput,xcb]
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
dev-qt/qtsql:5[sqlite]
dev-qt/qtwebkit:5
+ dev-qt/qtwebsockets:5
dev-qt/qtsvg:5
dev-qt/qtx11extras:5
- dev-qt/qtdeclarative:5
+ dev-qt/qtdeclarative:5[widgets]
+ dev-qt/qtquickcontrols:5
dev-qt/qtconcurrent:5
- dev-util/android-sdk-update-manager
- media-libs/jpeg:8
- dev-libs/double-conversion
+ dev-qt/qtgraphicaleffects:5
sys-apps/util-linux
- media-libs/fontconfig:1.0
- media-libs/harfbuzz[graphite]
- >=dev-libs/libffi-3.0.13-r1
- media-libs/gstreamer[orc]
"
+# note if you compile protobuf with >=gcc-5.1 you need to disable the new c++11 abi
+# -D_GLIBCXX_USE_CXX11_ABI=0 to your CXXFLAGS for protobuf
+# =dev-libs/protobuf-2.6*
+
RESTRICT="bindist fetch"
S="${WORKDIR}"
@@ -82,22 +83,23 @@ src_install() {
doins "${MY_PN}"/{libcom,librendering}.so*
# library that differ from system version
- doins "${MY_PN}"/{libicudata,libicui18n,libicuuc,libswscale,libavutil,libprotobuf}.so*
+ doins "${MY_PN}"/{libswscale,libavutil,libprotobuf}.so*
# android library
doins "${MY_PN}"/{libEGL_translator,libGLES_CM_translator,libGLES_V2_translator,libOpenglRender,libemugl_logger}.so*
insopts -m0755
doins "${MY_PN}"/{device-upgrade,genymotion,genyshell,player,genymotionadbtunneld,gmtool}
+ pax-mark -m "${ED%/}/opt/${MY_PN}/${MY_PN}"
+ pax-mark -m "${ED%/}/opt/${MY_PN}/gmtool"
+
dosym "${ED%/}"/opt/"${MY_PN}"/genyshell /opt/bin/genyshell
dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}" /opt/bin/"${MY_PN}"
- dosym "${ED%/}"/opt/"${MY_PN}"/device-upgrade /opt/bin/"${MY_PN}"-device-upgrade
- dosym "${ED%/}"/opt/"${MY_PN}"/player /opt/bin/"${MY_PN}"-player
- dosym "${ED%/}"/opt/"${MY_PN}"/"${MY_PN}"adbtunneld /opt/bin/"${MY_PN}"adbtunneld
dosym "${ED%/}"/opt/"${MY_PN}"/gmtool /opt/bin/gmtool
# Workaround
dosym "${ED%/}/"usr/$(get_libdir)/qt5/plugins/imageformats/libqsvg.so /opt/"${MY_PN}"/imageformats/libqsvg.so
+ dosym "${ED%/}/"usr/$(get_libdir)/qt5/plugins/sqldrivers/libqsqlite.so /opt/"${MY_PN}"/sqldrivers/libqsqlite.so
newbashcomp "${MY_PN}/completion/bash/gmtool.bash" gmtool
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 01fff6c49bc4..77d3858e6eec 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,4 +1,2 @@
-DIST libvirt-2.5.0.tar.xz 13638636 SHA256 819dffefbfd6ae95dfe1b28cfdee15ebcf9f91bbd732157488a57705bf81cb1e SHA512 256d6cae635851d710ffa3bdfd6b4d744687610b899a65821829af0f66a65e9c4ae287c8651534b40fc04f6525920b3704e90028a6f906af141cd61f2e79d10c WHIRLPOOL 64ef68bba5b2b47ef8c191c3cadc8121267fc07f6fdc40f7969b3762bab222872b987ad8d04b22c2f6d6629d7599a7ff3263b3491f0143d59a172b269d81284c
-DIST libvirt-3.1.0.tar.xz 13906204 SHA256 7879029a0fcac4e58dbeec66f0bc77771565c4b6667212c8f6251eefb03732a9 SHA512 e08c82aa3c06b2ea7615b71937fa16e7ae52cb82350bacaefcac1a872471bbbf993e20b4b14f5bb4d7c539be18c42b377df9100b493d3873b5fd5f1f67449e17 WHIRLPOOL 7fdb068a95575499115eb542342e2d133c3d877df3190f40f97de4f2f0af67fdc722c3d1bcaeea14306dcf94ff4a013bd5e60736e7866de3ae56e662df7c5dc4
DIST libvirt-3.2.0.tar.xz 14057340 SHA256 9481a083b567a07927f239553dd70b5c0d1bff5b9b4ec61be1899981c646209e SHA512 35a9db3d59a3817d15fd6a586a2a73860b3d8a2d2ff37dbea1b4045fe1514c3535fce2eeba0f09df2d0bb9072ed9f1078ca9bad61a37c586eb019ddad3f898c4 WHIRLPOOL 499eb2cbf1367c99c106a747c76087f6ed980cc057cdb10cefe50a8a823a294f67925c98b1baa6ac7e12dcc20c90145b9a0c1e0927772e3b4a046bb4414391a0
DIST libvirt-3.3.0.tar.xz 14043384 SHA256 29e00984174e33cf2183b478382c017de26860452ffee17b73871051264ebb1b SHA512 69166ddd7d4b9ef3b1bf2466e781139ef9b4d224a64acc7b8e6fca8786d36482138a1fe7b7407c0fca3b3d012cb418d168671a3e65e428f023c16493b7718c2d WHIRLPOOL 1b2688f6b9a89608677070b5ce1fd2b2af115336126d4214071bc1abba25056d54dbbf16d6bdfab7582b252a833d3e53e51175d552d5c936b08973c0eed76643
diff --git a/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch b/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch
deleted file mode 100644
index 990fbacc217d..000000000000
--- a/app-emulation/libvirt/files/libvirt-1.3.1-fix_paths_for_apparmor.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 2adcefb..cdee23b 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -23,7 +23,7 @@ EXTRA_DIST = \
- apparmor/TEMPLATE.lxc \
- apparmor/libvirt-qemu \
- apparmor/libvirt-lxc \
-- apparmor/usr.lib.libvirt.virt-aa-helper \
-+ apparmor/usr.libexec.virt-aa-helper \
- apparmor/usr.sbin.libvirtd \
- lxcconvert/virt-lxc-convert \
- polkit/libvirt-acl.rules \
-@@ -55,7 +55,7 @@ rename_rename_SOURCES = rename/rename.c
- if WITH_APPARMOR_PROFILES
- apparmordir = $(sysconfdir)/apparmor.d/
- apparmor_DATA = \
-- apparmor/usr.lib.libvirt.virt-aa-helper \
-+ apparmor/usr.libexec.virt-aa-helper \
- apparmor/usr.sbin.libvirtd \
- $(NULL)
-
-diff --git a/examples/apparmor/usr.lib.libvirt.virt-aa-helper b/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-deleted file mode 100644
-index b34fb35..0000000
---- a/examples/apparmor/usr.lib.libvirt.virt-aa-helper
-+++ /dev/null
-@@ -1,48 +0,0 @@
--# Last Modified: Mon Apr 5 15:10:27 2010
--#include
--
--profile virt-aa-helper /usr/{lib,lib64}/libvirt/virt-aa-helper {
-- #include
--
-- # needed for searching directories
-- capability dac_override,
-- capability dac_read_search,
--
-- # needed for when disk is on a network filesystem
-- network inet,
--
-- deny @{PROC}/[0-9]*/mounts r,
-- @{PROC}/[0-9]*/net/psched r,
-- owner @{PROC}/[0-9]*/status r,
-- @{PROC}/filesystems r,
--
-- # for hostdev
-- /sys/devices/ r,
-- /sys/devices/** r,
--
-- /usr/{lib,lib64}/libvirt/virt-aa-helper mr,
-- /sbin/apparmor_parser Ux,
--
-- /etc/apparmor.d/libvirt/* r,
-- /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
--
-- # for backingstore -- allow access to non-hidden files in @{HOME} as well
-- # as storage pools
-- audit deny @{HOME}/.* mrwkl,
-- audit deny @{HOME}/.*/ rw,
-- audit deny @{HOME}/.*/** mrwkl,
-- audit deny @{HOME}/bin/ rw,
-- audit deny @{HOME}/bin/** mrwkl,
-- @{HOME}/ r,
-- @{HOME}/** r,
-- /var/lib/libvirt/images/ r,
-- /var/lib/libvirt/images/** r,
-- /{media,mnt,opt,srv}/** r,
--
-- /**.img r,
-- /**.qcow{,2} r,
-- /**.qed r,
-- /**.vmdk r,
-- /**.[iI][sS][oO] r,
-- /**/disk{,.*} r,
--}
-diff --git a/examples/apparmor/usr.libexec.virt-aa-helper b/examples/apparmor/usr.libexec.virt-aa-helper
-new file mode 100644
-index 0000000..08b871a
---- /dev/null
-+++ b/examples/apparmor/usr.libexec.virt-aa-helper
-@@ -0,0 +1,48 @@
-+# Last Modified: Mon Apr 5 15:10:27 2010
-+#include
-+
-+profile virt-aa-helper /usr/libexec/virt-aa-helper {
-+ #include
-+
-+ # needed for searching directories
-+ capability dac_override,
-+ capability dac_read_search,
-+
-+ # needed for when disk is on a network filesystem
-+ network inet,
-+
-+ deny @{PROC}/[0-9]*/mounts r,
-+ @{PROC}/[0-9]*/net/psched r,
-+ owner @{PROC}/[0-9]*/status r,
-+ @{PROC}/filesystems r,
-+
-+ # for hostdev
-+ /sys/devices/ r,
-+ /sys/devices/** r,
-+
-+ /usr/libexec/virt-aa-helper mr,
-+ /sbin/apparmor_parser Ux,
-+
-+ /etc/apparmor.d/libvirt/* r,
-+ /etc/apparmor.d/libvirt/libvirt-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]* rw,
-+
-+ # for backingstore -- allow access to non-hidden files in @{HOME} as well
-+ # as storage pools
-+ audit deny @{HOME}/.* mrwkl,
-+ audit deny @{HOME}/.*/ rw,
-+ audit deny @{HOME}/.*/** mrwkl,
-+ audit deny @{HOME}/bin/ rw,
-+ audit deny @{HOME}/bin/** mrwkl,
-+ @{HOME}/ r,
-+ @{HOME}/** r,
-+ /var/lib/libvirt/images/ r,
-+ /var/lib/libvirt/images/** r,
-+ /{media,mnt,opt,srv}/** r,
-+
-+ /**.img r,
-+ /**.qcow{,2} r,
-+ /**.qed r,
-+ /**.vmdk r,
-+ /**.[iI][sS][oO] r,
-+ /**/disk{,.*} r,
-+}
-diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
-index 5d606e6..b2cd8c6 100644
---- a/examples/apparmor/usr.sbin.libvirtd
-+++ b/examples/apparmor/usr.sbin.libvirtd
-@@ -58,8 +58,10 @@
- audit deny /sys/kernel/security/apparmor/.* rwxl,
- /sys/kernel/security/apparmor/profiles r,
- /usr/{lib,lib64}/libvirt/* PUxr,
-- /usr/{lib,lib64}/libvirt/libvirt_parthelper ix,
-- /usr/{lib,lib64}/libvirt/libvirt_iohelper ix,
-+ /usr/libexec/virt-aa-helper PUxr,
-+ /usr/libexec/libvirt_lxc PUxr,
-+ /usr/libexec/libvirt_parthelper ix,
-+ /usr/libexec/libvirt_iohelper ix,
- /etc/libvirt/hooks/** rmix,
- /etc/xen/scripts/** rmix,
-
diff --git a/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild b/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
deleted file mode 100644
index b65675437737..000000000000
--- a/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt.git"
- SRC_URI=""
- KEYWORDS=""
- SLOT="0"
-else
- # Versions with 4 numbers are stable updates:
- if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
- SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
- else
- SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
- fi
- KEYWORDS="amd64 x86"
- SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
- apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
- libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
- +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
- wireshark-plugins xen zeroconf zfs elibc_glibc
-"
-
-REQUIRED_USE="
- firewalld? ( virt-network )
- libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- policykit? ( dbus )
- qemu? ( libvirtd )
- uml? ( libvirtd )
- vepa? ( macvtap )
- virt-network? ( libvirtd )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
- app-misc/scrub
- dev-libs/libgcrypt:0
- dev-libs/libnl:3
- >=dev-libs/libxml2-2.7.6
- || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
- >=net-libs/gnutls-1.0.25:0=
- net-libs/libssh2
- >=net-misc/curl-7.18.0
- sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
- sys-devel/gettext
- sys-libs/ncurses:0=
- sys-libs/readline:=
- apparmor? ( sys-libs/libapparmor )
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap-ng )
- dbus? ( sys-apps/dbus )
- elibc_glibc? ( sys-libs/glibc[rpc(+)] )
- firewalld? ( net-firewall/firewalld )
- fuse? ( >=sys-fs/fuse-2.8.6 )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- libssh? ( net-libs/libssh )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- openvz? ( sys-kernel/openvz-sources:* )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2[-device-mapper-only(-)]
- )
- pcap? ( >=net-libs/libpcap-1.0.0 )
- policykit? ( >=sys-auth/polkit-0.9 )
- qemu? (
- >=app-emulation/qemu-0.13.0
- dev-libs/yajl
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- virt-network? (
- net-dns/dnsmasq[script]
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6]
- net-misc/radvd
- sys-apps/iproute2[-minimal]
- )
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? (
- app-emulation/xen
- app-emulation/xen-tools:=
- )
- udev? (
- virtual/udev
- >=x11-libs/libpciaccess-0.10.9
- )
- zeroconf? ( >=net-dns/avahi-0.6[dbus] )
- zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
- app-text/xhtml1
- dev-lang/perl
- dev-libs/libxslt
- dev-perl/XML-XPath
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
- "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch
- "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
-)
-
-pkg_setup() {
- if use qemu; then
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 "qemu,kvm"
- fi
-
- use policykit && enewgroup libvirt
-
- # Check kernel configuration:
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+="
- ~FUSE_FS"
-
- use lvm && CONFIG_CHECK+="
- ~BLK_DEV_DM
- ~DM_MULTIPATH
- ~DM_SNAPSHOT"
-
- use lxc && CONFIG_CHECK+="
- ~BLK_CGROUP
- ~CGROUP_CPUACCT
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~CGROUP_NET_PRIO
- ~CGROUP_PERF
- ~CGROUPS
- ~CGROUP_SCHED
- ~CPUSETS
- ~IPC_NS
- ~MACVLAN
- ~NAMESPACES
- ~NET_CLS_CGROUP
- ~NET_NS
- ~PID_NS
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~USER_NS
- ~UTS_NS
- ~VETH
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS"
-
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES"
-
- use macvtap && CONFIG_CHECK+="
- ~MACVTAP"
-
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_MARK_T
- ~BRIDGE_NF_EBTABLES
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
- ~NETFILTER_XT_TARGET_CHECKSUM"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_T_NAT
- ~NET_ACT_POLICE
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_SCH_HTB
- ~NET_SCH_INGRESS
- ~NET_SCH_SFQ"
-
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- if kernel_is ge 3 6; then
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
- fi
-
- ERROR_USER_NS="Optional depending on LXC configuration."
-
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- touch "${S}/.mailmap"
-
- default
-
- if [[ ${PV} = *9999* ]]; then
- # git checkouts require bootstrapping to create the configure script.
- # Additionally the submodules must be cloned to the right locations
- # bug #377279
- ./bootstrap || die "bootstrap failed"
- (
- git submodule status | sed 's/^[ +-]//;s/ .*//'
- git hash-object bootstrap.conf
- ) >.git-module-status
- fi
-
- # Tweak the init script:
- cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
- -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
- -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
- -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
- -i "${S}/libvirtd.init" || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with apparmor)
- $(use_with apparmor apparmor-profiles)
- $(use_with audit)
- $(use_with caps capng)
- $(use_with dbus)
- $(use_with firewalld)
- $(use_with fuse)
- $(use_with glusterfs)
- $(use_with glusterfs storage-gluster)
- $(use_with iscsi storage-iscsi)
- $(use_with libvirtd)
- $(use_with libssh)
- $(use_with lvm storage-lvm)
- $(use_with lvm storage-mpath)
- $(use_with lxc)
- $(use_with macvtap)
- $(use_enable nls)
- $(use_with numa numactl)
- $(use_with numa numad)
- $(use_with openvz)
- $(use_with parted storage-disk)
- $(use_with pcap libpcap)
- $(use_with phyp)
- $(use_with policykit polkit)
- $(use_with qemu)
- $(use_with qemu yajl)
- $(use_with rbd storage-rbd)
- $(use_with sasl)
- $(use_with selinux)
- $(use_with udev)
- $(use_with uml)
- $(use_with vepa virtualport)
- $(use_with virt-network network)
- $(use_with wireshark-plugins wireshark-dissector)
- $(use_with xen)
- $(use_with xen xen-inotify)
- $(use_with xen libxl)
- $(use_with zeroconf avahi)
- $(use_with zfs storage-zfs)
-
- --without-hal
- --without-netcf
- --without-sanlock
- --without-xenapi
-
- --with-esx
- --with-init-script=systemd
- --with-qemu-group=$(usex caps qemu root)
- --with-qemu-user=$(usex caps qemu root)
- --with-remote
- --with-storage-fs
- --with-vmware
-
- --disable-static
- --disable-werror
-
- --with-html-subdir=${PF}/html
- --localstatedir=/var
- )
-
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
- else
- myeconfargs+=( $(use_with virtualbox vbox) )
- fi
-
- econf "${myeconfargs[@]}"
-
- if [[ ${PV} = *9999* ]]; then
- # Restore gnulib's config.sub and config.guess
- # bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}"
-
- # remove problematic tests, bug #591416, bug #591418
- sed -i -e 's#commandtest$(EXEEXT) # #' \
- -e 's#virfirewalltest$(EXEEXT) # #' \
- -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
- -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
- tests/Makefile
-
- export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
- find "${D}" -name '*.la' -delete || die
-
- # Remove bogus, empty directories. They are either not used, or
- # libvirtd is able to create them on demand
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var/cache
- rm -rf "${D}"/var/run
- rm -rf "${D}"/var/log
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- systemd_install_serviced \
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # we only ever want to generate this once
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
- fi
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- FORCE_PRINT_ELOG=1 # remove for next version bump
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-3.1.0.ebuild b/app-emulation/libvirt/libvirt-3.1.0.ebuild
deleted file mode 100644
index 66c3fa5acfbe..000000000000
--- a/app-emulation/libvirt/libvirt-3.1.0.ebuild
+++ /dev/null
@@ -1,382 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils user linux-info systemd readme.gentoo-r1
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt.git"
- SRC_URI=""
- KEYWORDS="amd64 x86"
- SLOT="0"
-else
- # Versions with 4 numbers are stable updates:
- if [[ ${PV} =~ ^[0-9]+(\.[0-9]+){3} ]]; then
- SRC_URI="http://libvirt.org/sources/stable_updates/${P}.tar.xz"
- else
- SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
- fi
- KEYWORDS="amd64 x86"
- SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-IUSE="
- apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm
- libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit
- +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network
- wireshark-plugins xen zeroconf zfs elibc_glibc
-"
-
-REQUIRED_USE="
- firewalld? ( virt-network )
- libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- policykit? ( dbus )
- qemu? ( libvirtd )
- uml? ( libvirtd )
- vepa? ( macvtap )
- virt-network? ( libvirtd )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
- app-misc/scrub
- dev-libs/libgcrypt:0
- dev-libs/libnl:3
- >=dev-libs/libxml2-2.7.6
- || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 )
- >=net-libs/gnutls-1.0.25:0=
- net-libs/libssh2
- >=net-misc/curl-7.18.0
- sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
- sys-devel/gettext
- sys-libs/ncurses:0=
- sys-libs/readline:=
- apparmor? ( sys-libs/libapparmor )
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap-ng )
- dbus? ( sys-apps/dbus )
- elibc_glibc? ( sys-libs/glibc[rpc(+)] )
- firewalld? ( net-firewall/firewalld )
- fuse? ( >=sys-fs/fuse-2.8.6 )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- libssh? ( net-libs/libssh )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
- nfs? ( net-fs/nfs-utils )
- numa? (
- >sys-process/numactl-2.0.2
- sys-process/numad
- )
- openvz? ( sys-kernel/openvz-sources:* )
- parted? (
- >=sys-block/parted-1.8[device-mapper]
- sys-fs/lvm2[-device-mapper-only(-)]
- )
- pcap? ( >=net-libs/libpcap-1.0.0 )
- policykit? ( >=sys-auth/polkit-0.9 )
- qemu? (
- >=app-emulation/qemu-0.13.0
- dev-libs/yajl
- )
- rbd? ( sys-cluster/ceph )
- sasl? ( dev-libs/cyrus-sasl )
- selinux? ( >=sys-libs/libselinux-2.0.85 )
- virt-network? (
- net-dns/dnsmasq[script]
- net-firewall/ebtables
- >=net-firewall/iptables-1.4.10[ipv6]
- net-misc/radvd
- sys-apps/iproute2[-minimal]
- )
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? (
- app-emulation/xen
- app-emulation/xen-tools:=
- )
- udev? (
- virtual/udev
- >=x11-libs/libpciaccess-0.10.9
- )
- zeroconf? ( >=net-dns/avahi-0.6[dbus] )
- zfs? ( sys-fs/zfs )"
-
-DEPEND="${RDEPEND}
- app-text/xhtml1
- dev-lang/perl
- dev-libs/libxslt
- dev-perl/XML-XPath
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
- "${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
- "${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
- "${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
- "${FILESDIR}"/${PN}-3.1.0-musl-fix-includes.patch # bug #609488
-)
-
-pkg_setup() {
- if use qemu; then
- enewgroup qemu 77
- enewuser qemu 77 -1 -1 "qemu,kvm"
- fi
-
- use policykit && enewgroup libvirt
-
- # Check kernel configuration:
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+="
- ~FUSE_FS"
-
- use lvm && CONFIG_CHECK+="
- ~BLK_DEV_DM
- ~DM_MULTIPATH
- ~DM_SNAPSHOT"
-
- use lxc && CONFIG_CHECK+="
- ~BLK_CGROUP
- ~CGROUP_CPUACCT
- ~CGROUP_DEVICE
- ~CGROUP_FREEZER
- ~CGROUP_NET_PRIO
- ~CGROUP_PERF
- ~CGROUPS
- ~CGROUP_SCHED
- ~CPUSETS
- ~IPC_NS
- ~MACVLAN
- ~NAMESPACES
- ~NET_CLS_CGROUP
- ~NET_NS
- ~PID_NS
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~USER_NS
- ~UTS_NS
- ~VETH
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS"
-
- kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
- ~DEVPTS_MULTIPLE_INSTANCES"
-
- use macvtap && CONFIG_CHECK+="
- ~MACVTAP"
-
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_MARK_T
- ~BRIDGE_NF_EBTABLES
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
- ~NETFILTER_XT_TARGET_CHECKSUM"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="
- ~BRIDGE_EBT_T_NAT
- ~NET_ACT_POLICE
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_SCH_HTB
- ~NET_SCH_INGRESS
- ~NET_SCH_SFQ"
-
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- if kernel_is ge 3 6; then
- CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
- kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
- fi
-
- ERROR_USER_NS="Optional depending on LXC configuration."
-
- if [[ -n ${CONFIG_CHECK} ]]; then
- linux-info_pkg_setup
- fi
-}
-
-src_prepare() {
- touch "${S}/.mailmap"
-
- default
-
- if [[ ${PV} = *9999* ]]; then
- # git checkouts require bootstrapping to create the configure script.
- # Additionally the submodules must be cloned to the right locations
- # bug #377279
- ./bootstrap || die "bootstrap failed"
- (
- git submodule status | sed 's/^[ +-]//;s/ .*//'
- git hash-object bootstrap.conf
- ) >.git-module-status
- fi
-
- # Tweak the init script:
- cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
- sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
- -e "s/USE_FLAG_AVAHI/$(usex zeroconf 'use avahi-daemon' '')/" \
- -e "s/USE_FLAG_ISCSI/$(usex iscsi 'use iscsid' '')/" \
- -e "s/USE_FLAG_RBD/$(usex rbd 'use ceph' '')/" \
- -i "${S}/libvirtd.init" || die "sed failed"
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_with apparmor)
- $(use_with apparmor apparmor-profiles)
- $(use_with audit)
- $(use_with caps capng)
- $(use_with dbus)
- $(use_with firewalld)
- $(use_with fuse)
- $(use_with glusterfs)
- $(use_with glusterfs storage-gluster)
- $(use_with iscsi storage-iscsi)
- $(use_with libvirtd)
- $(use_with libssh)
- $(use_with lvm storage-lvm)
- $(use_with lvm storage-mpath)
- $(use_with lxc)
- $(use_with macvtap)
- $(use_enable nls)
- $(use_with numa numactl)
- $(use_with numa numad)
- $(use_with openvz)
- $(use_with parted storage-disk)
- $(use_with pcap libpcap)
- $(use_with phyp)
- $(use_with policykit polkit)
- $(use_with qemu)
- $(use_with qemu yajl)
- $(use_with rbd storage-rbd)
- $(use_with sasl)
- $(use_with selinux)
- $(use_with udev)
- $(use_with uml)
- $(use_with vepa virtualport)
- $(use_with virt-network network)
- $(use_with wireshark-plugins wireshark-dissector)
- $(use_with xen)
- $(use_with xen xen-inotify)
- $(use_with xen libxl)
- $(use_with zeroconf avahi)
- $(use_with zfs storage-zfs)
-
- --without-hal
- --without-netcf
- --without-sanlock
- --without-xenapi
-
- --with-esx
- --with-init-script=systemd
- --with-qemu-group=$(usex caps qemu root)
- --with-qemu-user=$(usex caps qemu root)
- --with-remote
- --with-storage-fs
- --with-vmware
-
- --disable-static
- --disable-werror
-
- --with-html-subdir=${PF}/html
- --localstatedir=/var
- )
-
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
- else
- myeconfargs+=( $(use_with virtualbox vbox) )
- fi
-
- econf "${myeconfargs[@]}"
-
- if [[ ${PV} = *9999* ]]; then
- # Restore gnulib's config.sub and config.guess
- # bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
- fi
-}
-
-src_test() {
- cd "${BUILD_DIR}"
-
- # remove problematic tests, bug #591416, bug #591418
- sed -i -e 's#commandtest$(EXEEXT) # #' \
- -e 's#virfirewalltest$(EXEEXT) # #' \
- -e 's#nwfilterebiptablestest$(EXEEXT) # #' \
- -e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
- tests/Makefile
-
- export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" \
- SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
-
- find "${D}" -name '*.la' -delete || die
-
- # Remove bogus, empty directories. They are either not used, or
- # libvirtd is able to create them on demand
- rm -rf "${D}"/etc/sysconfig
- rm -rf "${D}"/var/cache
- rm -rf "${D}"/var/run
- rm -rf "${D}"/var/log
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- systemd_install_serviced \
- "${FILESDIR}"/libvirtd.service.conf libvirtd.service
-
- systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
- newinitd "${S}/libvirtd.init" libvirtd || die
- newinitd "${FILESDIR}/libvirt-guests.init-r2" libvirt-guests || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
- newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
-
- newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
- newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
-
- DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_preinst() {
- # we only ever want to generate this once
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
- fi
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-3.3.0.ebuild b/app-emulation/libvirt/libvirt-3.3.0.ebuild
index 674ea5e9798d..66c3fa5acfbe 100644
--- a/app-emulation/libvirt/libvirt-3.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-3.3.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt.git"
SRC_URI=""
- KEYWORDS=""
+ KEYWORDS="amd64 x86"
SLOT="0"
else
# Versions with 4 numbers are stable updates:
@@ -18,7 +18,7 @@ else
else
SRC_URI="http://libvirt.org/sources/${P}.tar.xz"
fi
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
SLOT="0/${PV}"
fi
diff --git a/app-emulation/openstack-guest-agents-unix/Manifest b/app-emulation/openstack-guest-agents-unix/Manifest
index a62aa5825f84..ece98464c070 100644
--- a/app-emulation/openstack-guest-agents-unix/Manifest
+++ b/app-emulation/openstack-guest-agents-unix/Manifest
@@ -1,3 +1,3 @@
-DIST c9a4f15b8c8f2349601d3073cc95e30d3b91af13.zip 143082 SHA256 2c6baa1467f79363c260a694cfe46d895bdebd99d56b3b1267f010365ef162b8 SHA512 f4ef4ca4d844109ef741126eee7c313734f5faefcf68926294c83411384eb7461c779070ed0bfcc35ffba56ef47e2677bf4b990dccd9007aa6b82551346dca8f WHIRLPOOL 08a19eefcea016cb38e6beaaed6801c076caf7e5c99d38d5a089b44c20907fbddc15930fc45d3d63cd1f6e8c8ab91e6d54c5c236ec6da60fb7ec3638c8b737f3
DIST openstack-guest-agents-unix-1.39.0.tar.gz 75013 SHA256 eaa22564c8da46c2c1c08e6c0ccd2507e181ffac66fa89f1d9ac2323a2a77d97 SHA512 4f7c4c1f2bc2c8ebda25dc8c0fa79c39e8e5a83040ff103f8c583d9142e71c6527d23e430da983e3a8c9add508298c31ec13a7e56d1db3b5338736dd470fec80 WHIRLPOOL 8e91593dcf6e1f0a8281a9a19946aa67c6e57acfcd5dd5739cddc9b0db0ea0952552f592f598a156140f5c8834fd47f9e20fddddec0f7648bcc40ebce0127d63
DIST openstack-guest-agents-unix-1.39.1.tar.gz 75458 SHA256 dab0bafb2a632040b0e76ac277fee5714dc8eb9cb9781e80f64a94aaa6bd06a2 SHA512 b1e88bb3492018375e7b2275829e2698d82d75c975a396ab7409c9b88f7787145b0da87c81a089aa8914fae30e996654b589bc1675bba769b661d7d1deb9590d WHIRLPOOL 5ba6cf326b78ea5141611b59d9d2b21b9c6a54f4ed9b358a6751ac135a77eac0c20a0b8ce7e078557158bc6a0192e13fed44c75bb9e7794eded1f4777b24b072
+DIST openstack-guest-agents-unix-1.39.1_p20170227.zip 143082 SHA256 2c6baa1467f79363c260a694cfe46d895bdebd99d56b3b1267f010365ef162b8 SHA512 f4ef4ca4d844109ef741126eee7c313734f5faefcf68926294c83411384eb7461c779070ed0bfcc35ffba56ef47e2677bf4b990dccd9007aa6b82551346dca8f WHIRLPOOL 08a19eefcea016cb38e6beaaed6801c076caf7e5c99d38d5a089b44c20907fbddc15930fc45d3d63cd1f6e8c8ab91e6d54c5c236ec6da60fb7ec3638c8b737f3
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
index f76fb70d59ea..55c5697d99b9 100644
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1_p20170227.ebuild
@@ -10,7 +10,7 @@ COMMIT="c9a4f15b8c8f2349601d3073cc95e30d3b91af13"
DESCRIPTION="Unix Guest Agent for OpenStack"
HOMEPAGE="https://wiki.openstack.org/wiki/GuestAgent"
-SRC_URI="https://github.com/rackerlabs/${PN}/archive/${COMMIT}.zip"
+SRC_URI="https://github.com/rackerlabs/${PN}/archive/${COMMIT}.zip -> ${P}.zip"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index fc13e01c7191..fb4bf0440932 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -1,2 +1 @@
-DIST qemu-2.8.1.tar.bz2 28366270 SHA256 018e4c7ed22c220395cf41f835d01505e49d0e579a548bd3d72b03809442bbcd SHA512 0397b4029cdcb77ed053c44b3579a3f34894038e6fc6b4aa88de14515f5a78bf2f41c5e865f37111529f567c85d2f1c4deefae47dde54f76eac79410e5b2bdda WHIRLPOOL c41f53f18fac44efd1c81ba9d95204d23e9a70dc9c21624177be2fe92a327428fd5704b25bc334229fa36ae395fb4c82ba3955db39719c4458343978a4d3141a
DIST qemu-2.9.0.tar.bz2 28720490 SHA256 00bfb217b1bb03c7a6c3261b819cfccbfb5a58e3e2ceff546327d271773c6c14 SHA512 4b28966eec0ca44681e35fcfb64a4eaef7c280b8d65c91d03f2efa37f76278fd8c1680e5798c7a30dbfcc8f3c05f4a803f48b8a2dfec3a4181bac079b2a5e422 WHIRLPOOL d79fe89eb271a56aee0cbd328e5f96999176b711afb5683d164b7b99d91e6dd2bfaf6e2ff4cd820a941c94f28116765cb07ffd5809d75c2f9654a67d56bfc0c1
diff --git a/app-emulation/qemu/qemu-2.8.1-r2.ebuild b/app-emulation/qemu/qemu-2.8.1-r2.ebuild
deleted file mode 100644
index 1f2da1c38599..000000000000
--- a/app-emulation/qemu/qemu-2.8.1-r2.ebuild
+++ /dev/null
@@ -1,764 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses,readline"
-
-PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
-
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
- user udev fcaps readme.gentoo-r1 pax-utils l10n
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://git.qemu.org/qemu.git"
- inherit git-r3
- SRC_URI=""
-else
- SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
- KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
-fi
-
-DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
-HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
-
-LICENSE="GPL-2 LGPL-2 BSD-2"
-SLOT="0"
-IUSE="accessibility +aio alsa bluetooth bzip2 +caps +curl debug +fdt
- glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux
- kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png
- pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy
- spice ssh static static-user systemtap tci test usb usbredir vde
- +vhost-net virgl virtfs +vnc vte xattr xen xfs"
-
-COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel
- mips mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc
- sparc64 x86_64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
- lm32 moxie ppcemb tricore unicore32 xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS}
- armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus tilegx"
-
-use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
-use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
-IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-
-# Allow no targets to be built so that people can get a tools-only build.
-# Block USE flag configurations known to not work.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- gtk2? ( gtk )
- qemu_softmmu_targets_arm? ( fdt )
- qemu_softmmu_targets_microblaze? ( fdt )
- qemu_softmmu_targets_ppc? ( fdt )
- qemu_softmmu_targets_ppc64? ( fdt )
- sdl2? ( sdl )
- static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio )
- virtfs? ( xattr )
- vte? ( gtk )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# and user/softmmu targets (qemu-*, qemu-system-*).
-#
-# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
-#
-# The attr lib isn't always linked in (although the USE flag is always
-# respected). This is because qemu supports using the C library's API
-# when available rather than always using the extranl library.
-ALL_DEPEND="
- >=dev-libs/glib-2.0[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- python? ( ${PYTHON_DEPS} )
- systemtap? ( dev-util/systemtap )
- xattr? ( sys-apps/attr[static-libs(+)] )"
-
-# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
-# softmmu targets (qemu-system-*).
-SOFTMMU_TOOLS_DEPEND="
- >=x11-libs/pixman-0.28.0[static-libs(+)]
- accessibility? (
- app-accessibility/brltty[api]
- app-accessibility/brltty[static-libs(+)]
- )
- aio? ( dev-libs/libaio[static-libs(+)] )
- alsa? ( >=media-libs/alsa-lib-1.0.13 )
- bluetooth? ( net-wireless/bluez )
- bzip2? ( app-arch/bzip2[static-libs(+)] )
- caps? ( sys-libs/libcap-ng[static-libs(+)] )
- curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
- fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
- gnutls? (
- dev-libs/nettle:=[static-libs(+)]
- >=net-libs/gnutls-3.0:=[static-libs(+)]
- )
- gtk? (
- gtk2? (
- x11-libs/gtk+:2
- vte? ( x11-libs/vte:0 )
- )
- !gtk2? (
- x11-libs/gtk+:3
- vte? ( x11-libs/vte:2.91 )
- )
- )
- infiniband? ( sys-fabric/librdmacm:=[static-libs(+)] )
- iscsi? ( net-libs/libiscsi )
- jpeg? ( virtual/jpeg:0=[static-libs(+)] )
- lzo? ( dev-libs/lzo:2[static-libs(+)] )
- ncurses? (
- sys-libs/ncurses:0=[unicode]
- sys-libs/ncurses:0=[static-libs(+)]
- )
- nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- opengl? (
- virtual/opengl
- media-libs/libepoxy[static-libs(+)]
- media-libs/mesa[static-libs(+)]
- media-libs/mesa[egl,gbm]
- )
- png? ( media-libs/libpng:0=[static-libs(+)] )
- pulseaudio? ( media-sound/pulseaudio )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
- sdl? (
- !sdl2? (
- media-libs/libsdl[X]
- >=media-libs/libsdl-1.2.11[static-libs(+)]
- )
- sdl2? (
- media-libs/libsdl2[X]
- media-libs/libsdl2[static-libs(+)]
- )
- )
- seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
- smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
- snappy? ( app-arch/snappy[static-libs(+)] )
- spice? (
- >=app-emulation/spice-protocol-0.12.3
- >=app-emulation/spice-0.12.0[static-libs(+)]
- )
- ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
- usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
- usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
- vde? ( net-misc/vde[static-libs(+)] )
- virgl? ( media-libs/virglrenderer[static-libs(+)] )
- virtfs? ( sys-libs/libcap )
- xen? ( app-emulation/xen-tools:= )
- xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-
-X86_FIRMWARE_DEPEND="
- >=sys-firmware/ipxe-1.0.0_p20130624
- pin-upstream-blobs? (
- ~sys-firmware/seabios-1.10.1
- ~sys-firmware/sgabios-0.1_pre8
- ~sys-firmware/vgabios-0.7a
- )
- !pin-upstream-blobs? (
- sys-firmware/seabios
- sys-firmware/sgabios
- sys-firmware/vgabios
- )"
-
-CDEPEND="
- !static? (
- ${ALL_DEPEND//\[static-libs(+)]}
- ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
- )
- qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
- qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )"
-DEPEND="${CDEPEND}
- dev-lang/perl
- =dev-lang/python-2*
- sys-apps/texinfo
- virtual/pkgconfig
- kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- gtk? ( nls? ( sys-devel/gettext ) )
- static? (
- ${ALL_DEPEND}
- ${SOFTMMU_TOOLS_DEPEND}
- )
- static-user? ( ${ALL_DEPEND} )
- test? (
- dev-libs/glib[utils]
- sys-devel/bc
- )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-qemu )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.0-cflags.patch
- "${FILESDIR}"/${PN}-2.5.0-sysmacros.patch
- "${FILESDIR}"/${PN}-2.7.0-CVE-2016-8669-1.patch #597108
- "${FILESDIR}"/${PN}-2.8.0-CVE-2016-9908.patch #601826
- "${FILESDIR}"/${PN}-2.8.0-CVE-2016-9912.patch #602630
- "${FILESDIR}"/${PN}-2.8.0-CVE-2016-10028.patch #603444
- "${FILESDIR}"/${PN}-2.8.0-CVE-2016-10155.patch #606720
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5525-1.patch #606264
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5525-2.patch
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5552.patch #606722
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5578.patch #607000
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5579.patch #607100
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5856.patch #608036
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5857.patch #608038
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5898.patch #608520
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5973.patch #609334
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-5987.patch #609398
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-6505.patch #612220
- "${FILESDIR}"/${PN}-2.8.0-CVE-2017-7377.patch #614744
- "${FILESDIR}"/${PN}-2.8.1-CVE-2017-7471.patch #616484
- "${FILESDIR}"/${PN}-2.8.1-CVE-2017-8086.patch #616460
-)
-
-STRIP_MASK="/usr/share/qemu/palcode-clipper"
-
-QA_PREBUILT="
- usr/share/qemu/openbios-ppc
- usr/share/qemu/openbios-sparc64
- usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper
- usr/share/qemu/s390-ccw.img
- usr/share/qemu/u-boot.e500"
-
-QA_WX_LOAD="usr/bin/qemu-i386
- usr/bin/qemu-x86_64
- usr/bin/qemu-alpha
- usr/bin/qemu-arm
- usr/bin/qemu-cris
- usr/bin/qemu-m68k
- usr/bin/qemu-microblaze
- usr/bin/qemu-microblazeel
- usr/bin/qemu-mips
- usr/bin/qemu-mipsel
- usr/bin/qemu-or32
- usr/bin/qemu-ppc
- usr/bin/qemu-ppc64
- usr/bin/qemu-ppc64abi32
- usr/bin/qemu-sh4
- usr/bin/qemu-sh4eb
- usr/bin/qemu-sparc
- usr/bin/qemu-sparc64
- usr/bin/qemu-armeb
- usr/bin/qemu-sparc32plus
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32"
-
-DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
-kernel module loaded before running kvm. The easiest way to ensure that the
-kernel module is loaded is to load it on boot.
- For AMD CPUs the module is called 'kvm-amd'.
- For Intel CPUs the module is called 'kvm-intel'.
-Please review /etc/conf.d/modules for how to load these.
-
-Make sure your user is in the 'kvm' group. Just run
- $ gpasswd -a kvm
-then have re-login.
-
-For brand new installs, the default permissions on /dev/kvm might not let
-you access it. You can tell udev to reset ownership/perms:
- $ udevadm trigger -c add /dev/kvm
-
-If you want to register binfmt handlers for qemu user targets:
-For openrc:
- # rc-update add qemu-binfmt
-For systemd:
- # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
-
-pkg_pretend() {
- if use kernel_linux && kernel_is lt 2 6 25; then
- eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
- elif use kernel_linux; then
- if ! linux_config_exists; then
- eerror "Unable to check your kernel for KVM support"
- else
- CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
- ERROR_KVM="You must enable KVM in your kernel to continue"
- ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
- ERROR_KVM_AMD+=" your kernel configuration."
- ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
- ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
- ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
- ERROR_TUN+=" into your kernel or loaded as a module to use the"
- ERROR_TUN+=" virtual network device if using -net tap."
- ERROR_BRIDGE="You will also need support for 802.1d"
- ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
- use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
- ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
- ERROR_VHOST_NET+=" support"
-
- if use amd64 || use x86 || use amd64-linux || use x86-linux; then
- CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
- fi
-
- use python && CONFIG_CHECK+=" ~DEBUG_FS"
- ERROR_DEBUG_FS="debugFS support required for kvm_stat"
-
- # Now do the actual checks setup above
- check_extra_config
- fi
- fi
-
- if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
- eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
- eerror "instances are still pointing to it. Please update your"
- eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
- eerror "and the right system binary (e.g. qemu-system-x86_64)."
- die "update your virt configs to not use qemu-kvm"
- fi
-}
-
-pkg_setup() {
- enewgroup kvm 78
-}
-
-# Sanity check to make sure target lists are kept up-to-date.
-check_targets() {
- local var=$1 mak=$2
- local detected sorted
-
- pushd "${S}"/default-configs >/dev/null || die
-
- # Force C locale until glibc is updated. #564936
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "${var}: ${sorted}"
- eerror "$(printf '%-*s' ${#var} configure): ${detected}"
- die "sync ${var} to the list of targets"
- fi
-
- popd >/dev/null
-}
-
-handle_locales() {
- # Make sure locale list is kept up-to-date.
- local detected sorted
- detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
- sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
- if [[ ${sorted} != "${detected}" ]] ; then
- eerror "The ebuild needs to be kept in sync."
- eerror "PLOCALES: ${sorted}"
- eerror " po/*.po: ${detected}"
- die "sync PLOCALES"
- fi
-
- # Deal with selective install of locales.
- if use nls ; then
- # Delete locales the user does not want. #577814
- rm_loc() { rm po/$1.po || die; }
- l10n_for_each_disabled_locale_do rm_loc
- else
- # Cheap hack to disable gettext .mo generation.
- rm -f po/*.po
- fi
-}
-
-src_prepare() {
- check_targets IUSE_SOFTMMU_TARGETS softmmu
- check_targets IUSE_USER_TARGETS linux-user
-
- # Alter target makefiles to accept CFLAGS set via flag-o
- sed -i -r \
- -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
- Makefile Makefile.target || die
-
- default
-
- # Fix ld and objcopy being called directly
- tc-export AR LD OBJCOPY
-
- # Verbose builds
- MAKEOPTS+=" V=1"
-
- # Run after we've applied all patches.
- handle_locales
-}
-
-##
-# configures qemu based on the build directory and the build type
-# we are using.
-#
-qemu_src_configure() {
- debug-print-function ${FUNCNAME} "$@"
-
- local buildtype=$1
- local builddir="${S}/${buildtype}-build"
-
- mkdir "${builddir}"
-
- local conf_opts=(
- --prefix=/usr
- --sysconfdir=/etc
- --libdir=/usr/$(get_libdir)
- --docdir=/usr/share/doc/${PF}/html
- --disable-bsd-user
- --disable-guest-agent
- --disable-strip
- --disable-werror
- # We support gnutls/nettle for crypto operations. It is possible
- # to use gcrypt when gnutls/nettle are disabled (but not when they
- # are enabled), but it's not really worth the hassle. Disable it
- # all the time to avoid automatically detecting it. #568856
- --disable-gcrypt
- --python="${PYTHON}"
- --cc="$(tc-getCC)"
- --cxx="$(tc-getCXX)"
- --host-cc="$(tc-getBUILD_CC)"
- $(use_enable debug debug-info)
- $(use_enable debug debug-tcg)
- --enable-docs
- $(use_enable tci tcg-interpreter)
- $(use_enable xattr attr)
- )
-
- # Disable options not used by user targets. This simplifies building
- # static user targets (USE=static-user) considerably.
- conf_notuser() {
- if [[ ${buildtype} == "user" ]] ; then
- echo "--disable-${2:-$1}"
- else
- use_enable "$@"
- fi
- }
- conf_opts+=(
- $(conf_notuser accessibility brlapi)
- $(conf_notuser aio linux-aio)
- $(conf_notuser bzip2)
- $(conf_notuser bluetooth bluez)
- $(conf_notuser caps cap-ng)
- $(conf_notuser curl)
- $(conf_notuser fdt)
- $(conf_notuser glusterfs)
- $(conf_notuser gnutls)
- $(conf_notuser gnutls nettle)
- $(conf_notuser gtk)
- $(conf_notuser infiniband rdma)
- $(conf_notuser iscsi libiscsi)
- $(conf_notuser jpeg vnc-jpeg)
- $(conf_notuser kernel_linux kvm)
- $(conf_notuser lzo)
- $(conf_notuser ncurses curses)
- $(conf_notuser nfs libnfs)
- $(conf_notuser numa)
- $(conf_notuser opengl)
- $(conf_notuser png vnc-png)
- $(conf_notuser rbd)
- $(conf_notuser sasl vnc-sasl)
- $(conf_notuser sdl)
- $(conf_notuser seccomp)
- $(conf_notuser smartcard)
- $(conf_notuser snappy)
- $(conf_notuser spice)
- $(conf_notuser ssh libssh2)
- $(conf_notuser usb libusb)
- $(conf_notuser usbredir usb-redir)
- $(conf_notuser vde)
- $(conf_notuser vhost-net)
- $(conf_notuser virgl virglrenderer)
- $(conf_notuser virtfs)
- $(conf_notuser vnc)
- $(conf_notuser vte)
- $(conf_notuser xen)
- $(conf_notuser xen xen-pci-passthrough)
- $(conf_notuser xfs xfsctl)
- )
-
- if [[ ! ${buildtype} == "user" ]] ; then
- # audio options
- local audio_opts="oss"
- use alsa && audio_opts="alsa,${audio_opts}"
- use sdl && audio_opts="sdl,${audio_opts}"
- use pulseaudio && audio_opts="pa,${audio_opts}"
- conf_opts+=(
- --audio-drv-list="${audio_opts}"
- )
- use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
- use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
- fi
-
- case ${buildtype} in
- user)
- conf_opts+=(
- --enable-linux-user
- --disable-system
- --disable-blobs
- --disable-tools
- )
- local static_flag="static-user"
- ;;
- softmmu)
- conf_opts+=(
- --disable-linux-user
- --enable-system
- --disable-tools
- --with-system-pixman
- )
- local static_flag="static"
- ;;
- tools)
- conf_opts+=(
- --disable-linux-user
- --disable-system
- --disable-blobs
- --enable-tools
- )
- local static_flag="static"
- ;;
- esac
-
- local targets="${buildtype}_targets"
- [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
-
- # Add support for SystemTAP
- use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
-
- # We always want to attempt to build with PIE support as it results
- # in a more secure binary. But it doesn't work with static or if
- # the current GCC doesn't have PIE support.
- if use ${static_flag}; then
- conf_opts+=( --static --disable-pie )
- else
- gcc-specs-pie && conf_opts+=( --enable-pie )
- fi
-
- echo "../configure ${conf_opts[*]}"
- cd "${builddir}"
- ../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
-}
-
-src_configure() {
- local target
-
- python_setup
-
- softmmu_targets= softmmu_bins=()
- user_targets= user_bins=()
-
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- if use "qemu_softmmu_targets_${target}"; then
- softmmu_targets+=",${target}-softmmu"
- softmmu_bins+=( "qemu-system-${target}" )
- fi
- done
-
- for target in ${IUSE_USER_TARGETS} ; do
- if use "qemu_user_targets_${target}"; then
- user_targets+=",${target}-linux-user"
- user_bins+=( "qemu-${target}" )
- fi
- done
-
- softmmu_targets=${softmmu_targets#,}
- user_targets=${user_targets#,}
-
- [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
- [[ -n ${user_targets} ]] && qemu_src_configure "user"
- qemu_src_configure "tools"
-}
-
-src_compile() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- default
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- default
- fi
-
- cd "${S}/tools-build"
- default
-}
-
-src_test() {
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- pax-mark m */qemu-system-* #515550
- emake -j1 check
- emake -j1 check-report.html
- fi
-}
-
-qemu_python_install() {
- python_domodule "${S}/scripts/qmp/qmp.py"
-
- python_doscript "${S}/scripts/kvm/vmxcap"
- python_doscript "${S}/scripts/qmp/qmp-shell"
- python_doscript "${S}/scripts/qmp/qemu-ga-client"
-}
-
-# Generate binfmt support files.
-# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
-# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
-generate_initd() {
- local out="${T}/qemu-binfmt"
- local out_systemd="${T}/qemu.conf"
- local d="${T}/binfmt.d"
-
- einfo "Generating qemu binfmt scripts and configuration files"
-
- # Generate the debian fragments first.
- mkdir -p "${d}"
- "${S}"/scripts/qemu-binfmt-conf.sh \
- --debian \
- --exportdir "${d}" \
- --qemu-path "${EPREFIX}/usr/bin" \
- || die
- # Then turn the fragments into a shell script we can source.
- sed -E -i \
- -e 's:^([^ ]+) (.*)$:\1="\2":' \
- "${d}"/* || die
-
- # Generate the init.d script by assembling the fragments from above.
- local f qcpu package interpreter magic mask
- cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
- for f in "${d}"/qemu-* ; do
- source "${f}"
-
- # Normalize the cpu logic like we do in the init.d for the native cpu.
- qcpu=${package#qemu-}
- case ${qcpu} in
- arm*) qcpu="arm";;
- mips*) qcpu="mips";;
- ppc*) qcpu="ppc";;
- s390*) qcpu="s390";;
- sh*) qcpu="sh";;
- sparc*) qcpu="sparc";;
- esac
-
- cat <>"${out}"
- if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
- echo ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
- fi
-EOF
-
- echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
-
- done
- cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
-}
-
-src_install() {
- if [[ -n ${user_targets} ]]; then
- cd "${S}/user-build"
- emake DESTDIR="${ED}" install
-
- # Install binfmt handler init script for user targets.
- generate_initd
- doinitd "${T}/qemu-binfmt"
-
- # Install binfmt/qemu.conf.
- insinto "/usr/share/qemu/binfmt.d"
- doins "${T}/qemu.conf"
- fi
-
- if [[ -n ${softmmu_targets} ]]; then
- cd "${S}/softmmu-build"
- emake DESTDIR="${ED}" install
-
- # This might not exist if the test failed. #512010
- [[ -e check-report.html ]] && dohtml check-report.html
-
- if use kernel_linux; then
- udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
- fi
-
- if use python; then
- python_foreach_impl qemu_python_install
- fi
- fi
-
- cd "${S}/tools-build"
- emake DESTDIR="${ED}" install
-
- # Disable mprotect on the qemu binaries as they use JITs to be fast #459348
- pushd "${ED}"/usr/bin >/dev/null
- pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
- popd >/dev/null
-
- # Install config file example for qemu-bridge-helper
- insinto "/etc/qemu"
- doins "${FILESDIR}/bridge.conf"
-
- # Remove the docdir placed qmp-commands.txt
- mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/" || die
-
- cd "${S}"
- dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
- newdoc pc-bios/README README.pc-bios
- dodoc docs/qmp-*.txt
-
- if [[ -n ${softmmu_targets} ]]; then
- # Remove SeaBIOS since we're using the SeaBIOS packaged one
- rm "${ED}/usr/share/qemu/bios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
- fi
-
- # Remove vgabios since we're using the vgabios packaged one
- rm "${ED}/usr/share/qemu/vgabios.bin"
- rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
- rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
- rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
- rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
- dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
- dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
- dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
- dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
- fi
-
- # Remove sgabios since we're using the sgabios packaged one
- rm "${ED}/usr/share/qemu/sgabios.bin"
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
- fi
-
- # Remove iPXE since we're using the iPXE packaged one
- rm "${ED}"/usr/share/qemu/pxe-*.rom
- if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
- dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
- dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
- dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
- dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
- dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
- dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
- fi
- fi
-
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- DISABLE_AUTOFORMATTING=true
- readme.gentoo_print_elog
-
- if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
- udev_reload
- fi
-
- fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
-}
-
-pkg_info() {
- echo "Using:"
- echo " $(best_version app-emulation/spice-protocol)"
- echo " $(best_version sys-firmware/ipxe)"
- echo " $(best_version sys-firmware/seabios)"
- if has_version 'sys-firmware/seabios[binary]'; then
- echo " USE=binary"
- else
- echo " USE=''"
- fi
- echo " $(best_version sys-firmware/vgabios)"
-}
diff --git a/app-leechcraft/lc-secman/lc-secman-9999.ebuild b/app-leechcraft/lc-secman/lc-secman-9999.ebuild
index b7ee29e4e596..79aea9e550a6 100644
--- a/app-leechcraft/lc-secman/lc-secman-9999.ebuild
+++ b/app-leechcraft/lc-secman/lc-secman-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Security and personal data manager for LeechCraft"
SLOT="0"
KEYWORDS=""
-IUSE="debug crypt"
+IUSE="debug crypt exposecontents"
DEPEND="~app-leechcraft/lc-core-${PV}
crypt? ( dev-libs/openssl:0 )
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
-DENABLE_SECMAN_SECURESTORAGE=$(usex crypt)
+ -DWITH_SECMAN_EXPOSE_CONTENTSDISPLAY=$(usex exposecontents)
)
cmake-utils_src_configure
diff --git a/app-leechcraft/lc-secman/metadata.xml b/app-leechcraft/lc-secman/metadata.xml
index ef43617d9e97..c5747e4376da 100644
--- a/app-leechcraft/lc-secman/metadata.xml
+++ b/app-leechcraft/lc-secman/metadata.xml
@@ -9,4 +9,7 @@
proxy-maint@gentoo.org
Proxy Maintainers
+
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index 70242850aaa1..11a6d2c03360 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,2 +1 @@
-DIST asciinema-1.3.0.tar.gz 34214 SHA256 968016828119d53b8e4e6ccf40a2635704d236f8e805f635c15adc09a4373a55 SHA512 882f2f9c23c42d6930fc54797a87134004c1e679b2c054d29c71a9af616604f6e54aa1461b7f0f9826557c66dcf51470710d6e2886d785cbf28464ea2397d5d2 WHIRLPOOL 68a9a32b4067115cdece92a69f824a15ac42bfe1855701fb1e74cb7d138022f235a83c4a879453f87ac3757f1dc3c5036d596e4b7cea84cf8f8891b696b1a1fe
DIST asciinema-1.4.0.tar.gz 35264 SHA256 841a55b0f51988d5e155e99badbd6ce5cf3b43cca2ba15cd20c971a19719dc9a SHA512 23c67a462acdbbbed495e6cc3e0e22ed028effcc945af30b5925854e216c6f74bb1b416d9b0001726732ae8be510796e996bbca69b225c20422143e5ed1aca5c WHIRLPOOL 42cce226c8d94cc957e3e719eebbb887a696aec987f7ff02972a6ec74d6cc249a79fb804089d95e05341952816f6cc5ef5591f43eb1c411c746b804d2d5bb126
diff --git a/app-misc/asciinema/asciinema-1.3.0.ebuild b/app-misc/asciinema/asciinema-1.3.0.ebuild
deleted file mode 100644
index 9843507560f2..000000000000
--- a/app-misc/asciinema/asciinema-1.3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-inherit distutils-r1
-
-DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.python.org/pypi/asciinema"
-SRC_URI="https://github.com/asciinema/asciinema/archive/v1.3.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md doc/asciicast-v1.md )
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- # obsolete, already removed in upstream git
- rm asciinema/requests_http_adapter.py || die
-}
-
-python_test() {
- nosetests || die
-}
-
-src_install() {
- distutils-r1_src_install
- doman man/asciinema.1
-}
diff --git a/app-misc/asciinema/asciinema-1.4.0.ebuild b/app-misc/asciinema/asciinema-1.4.0.ebuild
index d293a38ae601..207d700d9a1b 100644
--- a/app-misc/asciinema/asciinema-1.4.0.ebuild
+++ b/app-misc/asciinema/asciinema-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test"
DEPEND="
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index 24916fc22110..daa78032a934 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,2 +1,2 @@
DIST colordiff-1.0.16.tar.gz 21542 SHA256 eaf1cfe17dd0e820d38a0b24b0a402eba68b32e9bf9e7791ca2d1831029f138b SHA512 41b4eb0c90b19f358b6d9154158ece51fe5169fc24e2ea9a4c50ac98218a173fc054b76a69e3c63967f98a0e5d50b7eb29b706780bcfbb3f17a4f45cce1d6d4a WHIRLPOOL 26e9fd2e005a03053cc4c63aaa63f0bfae8d19efc834f77592e6b33d1490c1adf5c771637b2db74fbe5c66d323dd853ac06a1fa1dd6076a948cb1e7ad51df68e
-DIST colordiff-1.0.17.tar.gz 21561 SHA256 780f70916f6fdc2eccbb519069662de1411705601ba1f1808a7e34f4d987d427 SHA512 9cb4804815158b3b73a3c9f1e4c06005d8a76d96b80c4412cd0474db74866ea6f38f03bc5940594b4096f949aef9e1336fe88948feaeba2703cf0b228aa5f2df WHIRLPOOL 7046c04ab5df73a6a19c120f9a3dd92d85d4bc43ab7f9ce571f362ca37f63d241273edf84dba5dbea18c9c1435f0b2c7f2c8d02068a4e6ce5e60390f5c6d4d34
+DIST colordiff-1.0.18.tar.gz 21695 SHA256 29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0 SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83 WHIRLPOOL 08aca61054644346a6bd0335a4f76c80a922a2ff92aa0d4a0be11b4b7905425788f52f0337a13e098a630b111365f2f105fa983490d69d1826e6660b4c5f606d
diff --git a/app-misc/colordiff/colordiff-1.0.17.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
similarity index 100%
rename from app-misc/colordiff/colordiff-1.0.17.ebuild
rename to app-misc/colordiff/colordiff-1.0.18.ebuild
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index eaa7362e3e81..8ba7fddf6fbb 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -1,5 +1,5 @@
DIST elasticsearch-2.4.4.tar.gz 27343272 SHA256 981092e6ca65ba5560b8b97a74e5ed0eb2236e9128efdb85bb652cec340158e2 SHA512 899a4d2fc64548bcd488ece223f5f189dfb191eceb36390c4b9d8d0d90ef9d2cb67ada475223b9b2e0bd0fb521a4ab978bc7f60781195927e36d027925338c14 WHIRLPOOL 1a90bb8c923a9eab6cc4390b3daaa44cd85d5c1a3a1a5ef7d274050eb25b061a11a91b0f57ebe9f3cb27aafee3267af8f63ca87837f79d622ff362fbc5b6ae1a
DIST elasticsearch-5.1.2.tar.gz 33299777 SHA256 74d752f9a8b46898d306ad169b72f328e17215c0909149e156a576089ef11c42 SHA512 1867626e8a87f11ed109e1325fd1d16c9e0af06ebe6a30c78ea679ab533ab377f5da8ea55af6871be33af226f02187a2aadd77e5e23c097dd24055be21e9d691 WHIRLPOOL 2e9df71c915343e2cc8ad82c59b877f41f5e093cbeba21f471c32cb51a195eccc6223bc48da48bb4af2e6bea9f2539f2e93b866963148f4ca2940ba4466e614e
DIST elasticsearch-5.2.2.tar.gz 33799732 SHA256 cf88930695794a8949342d386f028548bd10b26ecc8c4b422a94ea674faf8ac9 SHA512 670f8aa81a34191a13cc8c608a9dc7bec60c63bbed8fdb9bc0619585d644867576a7677eb0f14b4e4d064e59def186d4b431930bf79b54bcbf59a29b0b327e85 WHIRLPOOL 4ec1f3b5ed15b9f22d27512ea784ffe9e32e00808fec89418860955d2f4759d045775e18c0a61693da47f39de9f235de954eada231fbd6de5fbfd17f552e8452
-DIST elasticsearch-5.3.2.tar.gz 33704368 SHA256 a94fe46bc90eb271a0d448d20e49cb02526ac032281c683c79a219240280a1e8 SHA512 430021202fd747ea376e36e9035f05eaa27f06c25f2f8616e218a248f0aeaaffd8577d689c790b618e3fdbcbae23b7bd664d4380d0e323483f6e158675a4bc00 WHIRLPOOL 0fee048029880dabe901c0f9842ac331ef78204a70d0c71993cddbb8e76b7614af0e4b8e8181b36b9039b64093c9fd0720f5c8a2e7c515fc6634ac465c5f283a
-DIST elasticsearch-5.4.0.tar.gz 33302352 SHA256 bf74ff7efcf615febb62979e43045557dd8940eb48f111e45743c2def96e82d6 SHA512 52718b73ebf9de491d1815adce62e7ef61d257a074495b7f81d9ff3a81e5a4c25600f02a2de01edda4d8fa798d81602a75375b6774dced714b1c14edce46739b WHIRLPOOL bc89239c7a119092b49d5c10f0ca758a45c716ef1f443aac2ef399ddaaf09c9cba6ad8b9271372f7ba5c8f2e7b028aa661efa2949c02e802a4d8706d4da6eb37
+DIST elasticsearch-5.3.3.tar.gz 33701608 SHA256 c7e23fddd74d66207b01dea777597c9d04c242973e1ac61aec0f13b716ebed1d SHA512 36fc00081af5555ceb0c0c6e8300c184d40e7176e084d899f2bfaafc3a36c6ba0f457c4bccde95a282d441fa26d84aba4ee1b8ef634831ffdef2f14feb725daa WHIRLPOOL ce641c9cb2071661a221f95fe38018ae2108ffdd855c70aafba4286da369cde461ff39afc674d650ca33925c350592d82e170b2e937e73e949279ca49850a325
+DIST elasticsearch-5.4.1.tar.gz 33321278 SHA256 09d6422bd33b82f065760cd49a31f2fec504f2a5255e497c81050fd3dceec485 SHA512 6b88c1f93516aea57af462ced95fd32f3b2639c919fbb00348f4ea12849ce88521e095d9a4c7d96a09b420ac4ed07c7ad6fc9c54c0f2fa1f9f8fa4ec36071cb3 WHIRLPOOL 4725922bb7bb3300f6ca13533beac07e4aeab3b3d44f7013bae53449c45da510bb123a8eebce8b6eed5e5ecdf5f0b4b93cdafd9d7f654fcf341fcd175936ef64
diff --git a/app-misc/elasticsearch/elasticsearch-5.3.2.ebuild b/app-misc/elasticsearch/elasticsearch-5.3.3.ebuild
similarity index 100%
rename from app-misc/elasticsearch/elasticsearch-5.3.2.ebuild
rename to app-misc/elasticsearch/elasticsearch-5.3.3.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-5.4.0.ebuild b/app-misc/elasticsearch/elasticsearch-5.4.1.ebuild
similarity index 100%
rename from app-misc/elasticsearch/elasticsearch-5.4.0.ebuild
rename to app-misc/elasticsearch/elasticsearch-5.4.1.ebuild
diff --git a/app-misc/grabcartoons/Manifest b/app-misc/grabcartoons/Manifest
index 0c0b9017f202..1f9b0dd635bf 100644
--- a/app-misc/grabcartoons/Manifest
+++ b/app-misc/grabcartoons/Manifest
@@ -1 +1 @@
-DIST cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz 40998 SHA256 4cb1061ff66540d8b9fe5ef470cdf55ba3e458fd136d59250a626eb4f29d519c SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5 WHIRLPOOL b52c5e1b786dc2073f70c46e1a7a16d89ef586aa42456466466c5bff9e39f27a74c471c41a5682950563f1f7ff93669b8bd285d3642d66ed46a593c3f96e6a59
+DIST grabcartoons-2.8.4_p20141112.tar.gz 40998 SHA256 4cb1061ff66540d8b9fe5ef470cdf55ba3e458fd136d59250a626eb4f29d519c SHA512 6de81d151414ccbb7b00c2f472f0d811a7024c67a3c4bdc929babf2ff8990280ba1fde0851e4405dbc487c58e99f13a1dd07a0cd202099f6289dd0ed61296ee5 WHIRLPOOL b52c5e1b786dc2073f70c46e1a7a16d89ef586aa42456466466c5bff9e39f27a74c471c41a5682950563f1f7ff93669b8bd285d3642d66ed46a593c3f96e6a59
diff --git a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
index 0dd1a1b2aa7b..77fbcd8f86b9 100644
--- a/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
+++ b/app-misc/grabcartoons/grabcartoons-2.8.4_p20141112.ebuild
@@ -1,29 +1,33 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
DESCRIPTION="Comic-summarizing utility"
HOMEPAGE="http://zzamboni.org/grabcartoons"
-EGIT_COMMIT="cb230f01fb288a0b9f0fc437545b97d06c846bd3"
-SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz"
-KEYWORDS="~amd64 ~x86"
+
LICENSE="BSD"
SLOT="0"
+IUSE=""
+# Opens a web page, which is unacceptable during an emerge.
+RESTRICT="test"
RDEPEND="
dev-lang/perl
virtual/perl-Getopt-Long"
-# Opens a web page, which is unacceptable during an emerge.
-RESTRICT="test"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-PATCHES=(
- "${FILESDIR}"/2.8.4-fix-install-paths.patch
- )
+PATCHES=( "${FILESDIR}"/2.8.4-fix-install-paths.patch )
src_install() {
- emake PREFIX="${ED}"usr install
- dodoc ChangeLog README
+ emake PREFIX="${ED%/}"/usr install
+ einstalldocs
}
diff --git a/app-misc/grabcartoons/grabcartoons-9999.ebuild b/app-misc/grabcartoons/grabcartoons-9999.ebuild
index 06e1dd331810..77fbcd8f86b9 100644
--- a/app-misc/grabcartoons/grabcartoons-9999.ebuild
+++ b/app-misc/grabcartoons/grabcartoons-9999.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils git-r3
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/zzamboni/grabcartoons/archive/cb230f01fb288a0b9f0fc437545b97d06c846bd3.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
DESCRIPTION="Comic-summarizing utility"
HOMEPAGE="http://zzamboni.org/grabcartoons"
-EGIT_REPO_URI="https://github.com/zzamboni/grabcartoons.git"
-
-if [[ "${PV}" != "9999" ]] ; then
- KEYWORDS="~amd64 ~x86"
- #EGIT_COMMIT=""
-fi
-
LICENSE="BSD"
SLOT="0"
-
-RDEPEND="dev-lang/perl
- virtual/perl-Getopt-Long"
-
+IUSE=""
# Opens a web page, which is unacceptable during an emerge.
RESTRICT="test"
-src_prepare() {
- epatch "${FILESDIR}"/2.8.4-fix-install-paths.patch
-}
+RDEPEND="
+ dev-lang/perl
+ virtual/perl-Getopt-Long"
+
+PATCHES=( "${FILESDIR}"/2.8.4-fix-install-paths.patch )
src_install() {
- emake PREFIX="${ED}"/usr install
- dodoc ChangeLog README
+ emake PREFIX="${ED%/}"/usr install
+ einstalldocs
}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 4a55d6920c44..fa2e4dc74d05 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,2 +1 @@
-DIST gramps-4.2.4.tar.gz 18683901 SHA256 25190692f2f0d06e05f0761fef45173dd8d6693762572a62845b544a2c622efa SHA512 640b7b8affc29eee000232a3828f71c6e6e4ee568a4fce2ae8f9eaeabc87682e2dd9e2f1db1e8093e368d86583e80ce3c5261cf223f9cc6e210e7d6272781499 WHIRLPOOL ae118840749364b2904e5ed35f318019c54551305cf98d6e118bf9c539d1507dbce74b46fe66430e53c1115d09d3c73296a91f354ad0bb734e6d182a3ae148d0
DIST gramps-4.2.5.tar.gz 18694912 SHA256 1de3007215b7d0b779ec8f086e14e7a75f2aa811ee37c6d0cff06bfc9458743d SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c WHIRLPOOL d9f49b188e20697477860ecb5916c452b95ea08c038b828b0f01edc1097d3d45b549e3e1a5bc5a4aad1d8aab390b8dfefc4ec46ac58420161de8e4d644c8f95e
diff --git a/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch b/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch
deleted file mode 100644
index 4c1f6920cbb0..000000000000
--- a/app-misc/gramps/files/gramps-4.2.4-resourcepath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py 2016-09-04 14:44:02.000000000 +0000
-+++ b/setup.py 2016-09-22 12:21:52.496968618 +0000
-@@ -278,7 +278,7 @@
- if packaging:
- path = resource_path
- else:
-- path = os.path.abspath(os.path.join(self.install_data, 'share'))
-+ path = '/usr/share'
- fp.write(path)
-
- _install.run(self)
diff --git a/app-misc/gramps/gramps-4.2.4-r1.ebuild b/app-misc/gramps/gramps-4.2.4-r1.ebuild
deleted file mode 100644
index 43033e1cf0a2..000000000000
--- a/app-misc/gramps/gramps-4.2.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5} )
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+reports +exif spell"
-
-RDEPEND="
- dev-python/bsddb3[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- >=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
- dev-python/pyicu[${PYTHON_USEDEP}]
- gnome-base/librsvg:2
- >x11-libs/gtk+-3.14.8:3[introspection]
- x11-libs/pango[introspection]
- x11-misc/xdg-utils
- reports? ( media-gfx/graphviz )
- exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
- spell? ( app-text/gtkspell:3[introspection] )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-resourcepath.patch"
-)
-
-python_prepare_all() {
- sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-
- distutils-r1_python_prepare_all
-}
diff --git a/app-misc/gramps/gramps-4.2.5.ebuild b/app-misc/gramps/gramps-4.2.5.ebuild
index 6abcc0c4b44e..bc0c6b1ef46b 100644
--- a/app-misc/gramps/gramps-4.2.5.ebuild
+++ b/app-misc/gramps/gramps-4.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+reports exif geo spell"
RDEPEND="
diff --git a/app-misc/scrub/Manifest b/app-misc/scrub/Manifest
index b7613b32d4f2..7856001f5713 100644
--- a/app-misc/scrub/Manifest
+++ b/app-misc/scrub/Manifest
@@ -1,2 +1,2 @@
-DIST 2.5.2.tar.gz 192060 SHA256 92d688f994fb5b8d377bb41d46f077ebf5c41327d1b6af2824eb4d2bb2c7815e SHA512 1ae96c6f59d9039720642acc320a7e4498116594a3058ace86ea6346c58131283063c4337a8d6960a0fab5d4d592e471cb0652d7886def850d97a71e8dbce201 WHIRLPOOL dd5fb30d7df86f430a107aa25197cd3d5b1649635fd2e5f85c3495d8161fb96995086114e5d20ab85dfa26763ca319758463cf6251e3ff9c4c6c91f895baee8a
+DIST scrub-2.5.2.tar.gz 192060 SHA256 92d688f994fb5b8d377bb41d46f077ebf5c41327d1b6af2824eb4d2bb2c7815e SHA512 1ae96c6f59d9039720642acc320a7e4498116594a3058ace86ea6346c58131283063c4337a8d6960a0fab5d4d592e471cb0652d7886def850d97a71e8dbce201 WHIRLPOOL dd5fb30d7df86f430a107aa25197cd3d5b1649635fd2e5f85c3495d8161fb96995086114e5d20ab85dfa26763ca319758463cf6251e3ff9c4c6c91f895baee8a
DIST scrub-2.6.1.tar.gz 362536 SHA256 43d98d3795bc2de7920efe81ef2c5de4e9ed1f903c35c939a7d65adc416d6cb8 SHA512 6e434b9d81c5ac473188c37af790c808771204203b3f04a5ca316c6a890f872d1beb73ce4713546e14ae91287d7adaf2fbfa44a30af634c2b3af890e2a0e8640 WHIRLPOOL 443a790da1e2507984e8b5f55f566fcf8f850b7b81b4e01c4df5fa8d6b9045494af1defd4b36baaa44a91ae99fea18a9de2be41b8af52cea5f8fa103c92f4e21
diff --git a/app-misc/scrub/scrub-2.5.2.ebuild b/app-misc/scrub/scrub-2.5.2.ebuild
index 7cc0c2f1915e..ede2f37a6bc0 100644
--- a/app-misc/scrub/scrub-2.5.2.ebuild
+++ b/app-misc/scrub/scrub-2.5.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=6
DESCRIPTION="write patterns on disk/file"
HOMEPAGE="https://github.com/chaos/scrub"
-SRC_URI="https://github.com/chaos/${PN}/archive/${PV}.tar.gz"
+SRC_URI="https://github.com/chaos/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-misc/sleepyhead/Manifest b/app-misc/sleepyhead/Manifest
index 59cc1efe8695..058d74feb0f7 100644
--- a/app-misc/sleepyhead/Manifest
+++ b/app-misc/sleepyhead/Manifest
@@ -1,2 +1,3 @@
DIST sleepyhead-0.9.2.2.tgz 1399077 SHA256 49bcc7cf2b8351026a1f30b44d71a8500b9c74c6f6ac1aeeb14ca3b039ee7123 SHA512 bb6219c8575b8723b2db063d9a40b164d1aa50223b63468457c85b18895aefc74835d55bcd1f7d0e48e942531bd77041a749e44d870189d9ba011ad85d13c7fa WHIRLPOOL 3e1955aa2d1ab96da8a4f091f15538ba2bd091d935a2b9acaa012c7aadf304e7dcf5cf0f3284e0ed4c29d11f39420f236144adcaec0646f0f4d879c375a822c8
DIST sleepyhead-0.9.3.tgz 1804053 SHA256 b807f12c3f767037dd2e5bfdeb1f353e425ad537509be4cf3918ec61cf2efea2 SHA512 e50476e9b64ce056d33a55798a86b26fef6db4e8c6058e4e6c5c547e15acb745ea5d79bf3978713583da943626b2395894ed8109fa30a55ca15fa53ff29a2ac9 WHIRLPOOL 5759d97c0309a5c9f312ae9fde85531bc718da4fffe375d6f08b06dd2f34877e935339fa56634f482a3bfc66877c0ad0f4577832f3f89a64ec24dc18b880b826
+DIST sleepyhead-1.0.0_beta2.tar.bz2 3404013 SHA256 db6152a47df69c5cf85a75171d64c2208a953d838ea5c974c2399e8d7cc94353 SHA512 147a853bd77e6277b70d5d70f9b82f46c3f6328283c30b38d77e698146519367c9fa02f8fb21c687237657ceb78d7bc9ee07e4e8ccdbe41652ddd8dc55049eca WHIRLPOOL f07f7dc916e93e213998daecdb469b838e10c642ce87bbdba415e89eccbdab3392b5cbd8414e391270ccd8687b2cdc1c7777ebc8e098ec8eac43ab5d6702a2cc
diff --git a/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
new file mode 100644
index 000000000000..c9b052f2e449
--- /dev/null
+++ b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils qmake-utils
+DESCRIPTION="Software used to analyze data from CPAP machines"
+HOMEPAGE="https://sleepyhead.jedimark.net/"
+
+# Point to any required sources; these will be automatically downloaded by
+# Portage.
+SRC_URI="https://gitlab.com/sleepyhead/sleepyhead-code/repository/archive.tar.bz2?ref=1.0.0-beta-2 -> ${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND="virtual/opengl
+ x11-libs/libX11
+ dev-qt/qtcore:5=
+ dev-qt/qtgui:5=
+ dev-qt/qtopengl:5=
+ dev-qt/qtwebkit:5=
+ dev-qt/qtserialport:5=
+ virtual/glu"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/sleepyhead-code-1.0.0-beta-2-6b1c125218475720e1bf7c920ed3d10140b0b7c2"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+}
+
+src_prepare() {
+ eapply_user
+ rm configure
+ cd "${S}/3rdparty/quazip/"
+# epatch "${FILESDIR}/common_gui.patch"
+
+ sed -i '1i#define OF(x) x' quazip/ioapi.h quazip/unzip.c quazip/unzip.h \
+ quazip/zip.c quazip/zip.h
+ cd "${S}"
+ eqmake5 SleepyHeadQT.pro
+}
+
+src_install() {
+ cd "${S}/sleepyhead"
+ dobin SleepyHead || die
+ dodoc ../README || die
+ dodoc docs/* || die
+}
diff --git a/app-misc/tmux/tmux-2.3-r1.ebuild b/app-misc/tmux/tmux-2.3-r1.ebuild
index 69c674033d78..8f4589f16707 100644
--- a/app-misc/tmux/tmux-2.3-r1.ebuild
+++ b/app-misc/tmux/tmux-2.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
CDEPEND="
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 1f887c4cb9d1..c3bf0b2d0e3f 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -1,3 +1,4 @@
DIST scribus-1.4.6.tar.xz 73601104 SHA256 21e336500d9edc9c90ccf73087e5ef3df59ec3e4a3cbfec15367bcd8d078a19a SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3 WHIRLPOOL 5c2ee366cb53720b35ffec2f7e2db244105a95ed7b14c27cf4fab7636cbdf10c6a370c0a14f65f630cd8252b22a4a3ec4b5e592c71308f78269205a89ae56fb7
DIST scribus-1.5.0.tar.xz 75867348 SHA256 a3dbe66d12719355d41ae7f2cac7a8c9d5599b12aeb5c038d939636f054e8e68 SHA512 3d3f311543019cf985e12d25d0a9bd2ea470679aee0f40d0aed4d2f1532ea3cdbd4d2e215e59b559b4301613fb71f738a348c56d09d3c6e32da0047d9e212065 WHIRLPOOL feae71d139724b4927c81cab5d13168a9e00383f9a7890484cf5ab62f001b266b4af954440bc7edc51eedb65c3ace4541a7fc0836b0f6237061d6d38371ac6ca
DIST scribus-1.5.2.tar.xz 74456064 SHA256 ec5eec23aeda655d3a761cffb85853dcd2ede3973b9e62a1b3c28bd1093c74f5 SHA512 c3531bc5ef97e1f7d026ec7cff872ff7a6ea36472c794b632bee1a84fdeea87deaa56e8b9c467fe8e6db694266efc9ec84d822e5feefd2f99b4469d08826cea4 WHIRLPOOL cc1cd41c725aaa240a064149c011cee31f04e738ea386285b75f31aeb200b9351e6e434ed517a2d600c1de694f2f3584012e9213b0fdf094a6497d04c14e3fb7
+DIST scribus-1.5.3.tar.xz 74222084 SHA256 73a30b4727e19f5d301a936d23a84275cc4f5613a92416cbd843f5167721d74f SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980 WHIRLPOOL 0e4c36089e00f7bfc582f2138f4b402f26ca22ea6c7ecd1adce066e1b8741b839d34e769c2a7c4806e79279627d678223332cf36609d68716d32515f3389a48a
diff --git a/app-office/scribus/files/scribus-1.5.3-docdir.patch b/app-office/scribus/files/scribus-1.5.3-docdir.patch
new file mode 100644
index 000000000000..d866922fa18a
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-docdir.patch
@@ -0,0 +1,42 @@
+ CMakeLists.txt | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 29d66f3..1c08cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,19 +244,21 @@ else()
+ endif()
+
+ #SHARE - use the default on Apple as TAG_VERSION is empty
+-if(WIN32 OR OS2)
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+-else()
+- if(TAG_VERSION OR BUILD_OSX_BUNDLE)
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+- else()
+- if(NOT WANT_VERSIONING)
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+- else()
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+- endif()
+- endif()
+-endif()
++if(NOT DOCDIR)
++ if(WIN32 OR OS2)
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
++ else()
++ if(TAG_VERSION OR BUILD_OSX_BUNDLE)
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
++ else()
++ if(NOT WANT_VERSIONING)
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++ else()
++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
++ endif()
++ endif()
++ endif()
++endif()
+ if(NOT IS_ABSOLUTE ${DOCDIR})
+ add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
+ else()
diff --git a/app-office/scribus/files/scribus-1.5.3-fpic.patch b/app-office/scribus/files/scribus-1.5.3-fpic.patch
new file mode 100644
index 000000000000..ba0721955ef8
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.3-fpic.patch
@@ -0,0 +1,16 @@
+ scribus/third_party/prc/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
+index 5f7c2c6..1da7177 100644
+--- a/scribus/third_party/prc/CMakeLists.txt
++++ b/scribus/third_party/prc/CMakeLists.txt
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ set(SCRIBUS_PRC_LIB_SOURCES
+ oPRCFile.cc
+ PRCbitStream.cc
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch
index 442829d3bda9..d866922fa18a 100644
--- a/app-office/scribus/files/scribus-9999-docdir.patch
+++ b/app-office/scribus/files/scribus-9999-docdir.patch
@@ -1,8 +1,11 @@
+ CMakeLists.txt | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 79b1feb..259d474 100644
+index 29d66f3..1c08cdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -284,16 +284,18 @@ else()
+@@ -244,19 +244,21 @@ else()
endif()
#SHARE - use the default on Apple as TAG_VERSION is empty
@@ -11,21 +14,29 @@ index 79b1feb..259d474 100644
-else()
- if(TAG_VERSION OR BUILD_OSX_BUNDLE)
- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+- else()
+- if(NOT WANT_VERSIONING)
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+- else()
+- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+- endif()
+- endif()
+-endif()
+if(NOT DOCDIR)
+ if(WIN32 OR OS2)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
- else()
-- if(NOT WANT_VERSIONING)
-- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
++ else()
+ if(TAG_VERSION OR BUILD_OSX_BUNDLE)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
- else()
-- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
++ else()
+ if(NOT WANT_VERSIONING)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+ else()
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+ endif()
- endif()
- endif()
- endif()
++ endif()
++ endif()
++endif()
+ if(NOT IS_ABSOLUTE ${DOCDIR})
+ add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
+ else()
diff --git a/app-office/scribus/files/scribus-9999-fpic.patch b/app-office/scribus/files/scribus-9999-fpic.patch
new file mode 100644
index 000000000000..ba0721955ef8
--- /dev/null
+++ b/app-office/scribus/files/scribus-9999-fpic.patch
@@ -0,0 +1,16 @@
+ scribus/third_party/prc/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt
+index 5f7c2c6..1da7177 100644
+--- a/scribus/third_party/prc/CMakeLists.txt
++++ b/scribus/third_party/prc/CMakeLists.txt
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ )
+
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ set(SCRIBUS_PRC_LIB_SOURCES
+ oPRCFile.cc
+ PRCbitStream.cc
diff --git a/app-office/scribus/scribus-1.5.3.ebuild b/app-office/scribus/scribus-1.5.3.ebuild
new file mode 100644
index 000000000000..c783c2a96108
--- /dev/null
+++ b/app-office/scribus/scribus-1.5.3.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+CMAKE_MAKEFILE_GENERATOR=ninja
+CMAKE_MIN_VERSION=3.2.0
+
+inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1
+
+DESCRIPTION="Desktop publishing (DTP) and layout program"
+HOMEPAGE="http://www.scribus.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
+
+#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
+IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
+IUSE+=" ${IUSE_LINGUAS// / linguas_}"
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ tk? ( scripts )"
+
+# osg
+# couple of third_party libs bundled
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-text/libmspub
+ app-text/poppler:=
+ dev-libs/hyphen
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/fontconfig
+ media-libs/freetype:2
+ media-libs/lcms:2
+ media-libs/libcdr
+ media-libs/libpagemaker
+ media-libs/libpng:0=
+ media-libs/libvisio
+ media-libs/tiff:0
+ net-print/cups
+ sys-libs/zlib[minizip]
+ virtual/jpeg:0=
+ >=x11-libs/cairo-1.10.0[X,svg]
+ boost? ( >=dev-libs/boost-1.62:= )
+ hunspell? ( app-text/hunspell )
+ graphicsmagick? ( media-gfx/graphicsmagick )
+ osg? ( dev-games/openscenegraph )
+ pdf? ( app-text/podofo:0= )
+ scripts? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+ tk? ( dev-python/pillow[tk?,${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-docdir.patch
+ "${FILESDIR}"/${P}-fpic.patch
+)
+
+src_prepare() {
+ rm -r codegen/cheetah || die
+ cat > cmake/modules/FindZLIB.cmake <<- EOF || die
+ find_package(PkgConfig)
+ pkg_check_modules(ZLIB minizip zlib)
+ SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
+ SET( ZLIB_INCLUDE_DIR \${ZLIB_INCLUDE_DIRS} )
+ MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+ EOF
+
+ sed \
+ -e "/^\s*unzip\.[ch]/d" \
+ -e "/^\s*ioapi\.[ch]/d" \
+ -i scribus/CMakeLists.txt Scribus.pro || die
+ rm scribus/ioapi.[ch] || die
+
+ sed \
+ -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
+ -i resources/templates/CMakeLists.txt || die
+
+ edos2unix scribus/ui/propertiespalette_utils.cpp
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ # bug #550818
+ append-cppflags -DHAVE_MEMRCHR
+
+ local _lang lang langs
+ for lang in ${IUSE_LINGUAS}; do
+ _lang=$(translate_lang ${lang})
+ if use linguas_${lang} || [[ ${lang} == "en" ]]; then
+ # From the CMakeLists.txt
+ # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc"
+ langs+=";${_lang}"
+ else
+ # Don't install localized documentation
+ sed -e "/${_lang}/d" -i doc/CMakeLists.txt || die
+ safe_delete \
+ ./resources/dicts/README_${_lang}.txt \
+ ./resources/dicts/README_hyph_${_lang}.txt \
+ ./resources/dicts/hyph_${_lang}.dic \
+ ./resources/loremipsum/${_lang}.xml
+ fi
+ sed -e "/en_EN/d" -i doc/CMakeLists.txt || die
+ safe_delete \
+ ./resources/dicts/README_en_EN.txt \
+ ./resources/dicts/README_hyph_en_EN.txt \
+ ./resources/dicts/hyph_en_EN.dic \
+ ./resources/loremipsum/en_EN.xml
+ done
+
+ local mycmakeargs=(
+ -DHAVE_PYTHON=ON
+ -DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DWANT_DISTROBUILD=ON
+ -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
+ -DWANT_GUI_LANG="${langs#;};en"
+ -DWANT_CPP11=ON
+ -DWITH_PODOFO="$(usex pdf)"
+ -DWITH_BOOST="$(usex boost)"
+ -DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
+ -DWANT_NOOSG="$(usex !osg)"
+ -DWANT_DEBUG="$(usex debug)"
+ -DWANT_NOHEADERINSTALL="$(usex minimal)"
+ -DWANT_HUNSPELL="$(usex hunspell)"
+ -DWANT_NOEXAMPLES="$(usex !examples)"
+ -DWANT_NOTEMPLATES="$(usex !templates)"
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ local lang _lang
+ # en_EN can be deleted always
+ for lang in ${IUSE_LINGUAS}; do
+ if ! use linguas_${lang}; then
+ _lang=$(translate_lang ${lang})
+ safe_delete "${ED%/}"/usr/share/man/${_lang}
+ fi
+ done
+
+ if ! use scripts; then
+ rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
+ elif ! use tk; then
+ rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+ fi
+
+ use scripts && \
+ python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
+ python_optimize "${ED%/}"/usr/share/scribus/scripts
+
+ mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
+ ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
+ cat >> "${T}"/COPYING <<- EOF || die
+ ${PN} is licensed under the "${LICENSE}".
+ Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
+ EOF
+ dodoc "${T}"/COPYING
+ docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+ local size
+ for size in 16 32 128 256; do
+ newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+ done
+ newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
+ doicon resources/iconsets/*/scribus.png
+ domenu scribus.desktop
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
+
+safe_delete () {
+ local x
+ for x in ${@}; do
+ if [[ -d "${x}" ]]; then
+ ebegin "Deleting ${x} recursively"
+ rm -r "${x}" || die
+ eend $?
+ elif [[ -f "${x}" ]]; then
+ ebegin "Deleting ${x}"
+ rm "${x}" || die
+ eend $?
+ fi
+ done
+}
+
+translate_lang() {
+ _lang=${1}
+ [[ ${1} == "ru_RU" ]] && _lang+=_0
+ [[ ${1} == "de@1901" ]] && _lang=de_1901
+ echo ${_lang}
+}
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index 330982a019c7..3c14d44fe7b0 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,9 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="tk?"
CMAKE_MAKEFILE_GENERATOR=ninja
+CMAKE_MIN_VERSION=3.2.0
-inherit cmake-utils fdo-mime flag-o-matic multilib python-single-r1 subversion
+inherit cmake-utils eutils fdo-mime flag-o-matic gnome2 multilib python-single-r1
DESCRIPTION="Desktop publishing (DTP) and layout program"
HOMEPAGE="http://www.scribus.net/"
@@ -21,7 +22,7 @@ KEYWORDS=""
IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk"
#a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a
-IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fi fi_FI fr gl he hr hu hu_HU ia id id_ID is is_IS it ja ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI sq sr sv sv_SE th_TH tr uk uk_UA zh_CN zh_TW"
+IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW"
IUSE+=" ${IUSE_LINGUAS// / linguas_}"
REQUIRED_USE="
@@ -33,8 +34,7 @@ REQUIRED_USE="
COMMON_DEPEND="
${PYTHON_DEPS}
app-text/libmspub
- >=app-text/poppler-0.19.0:=
- dev-libs/boost
+ app-text/poppler:=
dev-libs/hyphen
dev-libs/librevenge
dev-libs/libxml2
@@ -51,14 +51,14 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/libcdr
media-libs/libpagemaker
- media-libs/libpng:0
+ media-libs/libpng:0=
media-libs/libvisio
media-libs/tiff:0
net-print/cups
sys-libs/zlib[minizip]
virtual/jpeg:0=
>=x11-libs/cairo-1.10.0[X,svg]
- boost? ( dev-libs/boost )
+ boost? ( >=dev-libs/boost-1.62:= )
hunspell? ( app-text/hunspell )
graphicsmagick? ( media-gfx/graphicsmagick )
osg? ( dev-games/openscenegraph )
@@ -74,11 +74,12 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}"/${P}-docdir.patch
- )
+ "${FILESDIR}"/${P}-fpic.patch
+)
src_prepare() {
rm -r codegen/cheetah || die
- cat > cmake/modules/FindZLIB.cmake <<- EOF
+ cat > cmake/modules/FindZLIB.cmake <<- EOF || die
find_package(PkgConfig)
pkg_check_modules(ZLIB minizip zlib)
SET( ZLIB_LIBRARY \${ZLIB_LIBRARIES} )
@@ -96,14 +97,15 @@ src_prepare() {
-e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \
-i resources/templates/CMakeLists.txt || die
- if has_version ">=dev-qt/qtcore-5.7.0" ; then
- append-cxxflags "-std=c++11" #bug 591948
- fi
+ edos2unix scribus/ui/propertiespalette_utils.cpp
cmake-utils_src_prepare
}
src_configure() {
+ # bug #550818
+ append-cppflags -DHAVE_MEMRCHR
+
local _lang lang langs
for lang in ${IUSE_LINGUAS}; do
_lang=$(translate_lang ${lang})
@@ -133,8 +135,9 @@ src_configure() {
-DPYTHON_INCLUDE_PATH="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
-DWANT_DISTROBUILD=ON
- -DDOCDIR="/usr/share/doc/${PF}/"
+ -DDOCDIR="${EPREFIX%/}/usr/share/doc/${PF}/"
-DWANT_GUI_LANG="${langs#;};en"
+ -DWANT_CPP11=ON
-DWITH_PODOFO="$(usex pdf)"
-DWITH_BOOST="$(usex boost)"
-DWANT_GRAPHICSMAGICK="$(usex graphicsmagick)"
@@ -148,6 +151,10 @@ src_configure() {
cmake-utils_src_configure
}
+src_compile() {
+ cmake-utils_src_compile
+}
+
src_install() {
cmake-utils_src_install
@@ -155,41 +162,52 @@ src_install() {
# en_EN can be deleted always
for lang in ${IUSE_LINGUAS}; do
if ! use linguas_${lang}; then
- _lang=$(translate_lang)
- safe_delete "${ED}"/usr/share/man/${_lang}
+ _lang=$(translate_lang ${lang})
+ safe_delete "${ED%/}"/usr/share/man/${_lang}
fi
done
if ! use scripts; then
- rm "${ED}"/usr/share/scribus/scripts/*.py || die
+ rm "${ED%/}"/usr/share/scribus/scripts/*.py || die
elif ! use tk; then
- rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
+ rm "${ED%/}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die
fi
use scripts && \
- python_fix_shebang "${ED}"/usr/share/scribus/scripts && \
- python_optimize "${ED}"/usr/share/scribus/scripts
+ python_fix_shebang "${ED%/}"/usr/share/scribus/scripts && \
+ python_optimize "${ED%/}"/usr/share/scribus/scripts
- mv "${ED}"/usr/share/doc/${PF}/{en,html} || die
- ln -sf html "${ED}"/usr/share/doc/${PF}/en || die
- cat >> "${T}"/COPYING <<- EOF
+ mv "${ED%/}"/usr/share/doc/${PF}/{en,html} || die
+ ln -sf html "${ED%/}"/usr/share/doc/${PF}/en || die
+ cat >> "${T}"/COPYING <<- EOF || die
${PN} is licensed under the "${LICENSE}".
Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text.
EOF
dodoc "${T}"/COPYING
docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING}
+ local size
+ for size in 16 32 128 256; do
+ newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png
+ done
+ newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png
doicon resources/iconsets/*/scribus.png
domenu scribus.desktop
}
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
+ gnome2_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
+ gnome2_icon_cache_update
}
safe_delete () {
@@ -203,8 +221,6 @@ safe_delete () {
ebegin "Deleting ${x}"
rm "${x}" || die
eend $?
- else
- ewarn "${x} not found"
fi
done
}
diff --git a/app-office/texmaker/texmaker-4.5-r2.ebuild b/app-office/texmaker/texmaker-4.5-r2.ebuild
new file mode 100644
index 000000000000..cc50ff4d0d20
--- /dev/null
+++ b/app-office/texmaker/texmaker-4.5-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils qmake-utils readme.gentoo
+
+DESCRIPTION="A nice LaTeX-IDE"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+COMMON_DEPEND="
+ app-text/hunspell
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXext
+ app-text/poppler:=[qt5]
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtscript:5
+ dev-qt/qtsingleapplication[X,qt5]
+ dev-qt/qtwebkit:5[printsupport]
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+RDEPEND="${COMMON_DEPEND}
+ app-text/ghostscript-gpl
+ app-text/psutils
+ media-libs/netpbm
+ virtual/latex-base"
+
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-unbundle.patch
+ "${FILESDIR}"/${P}-modern-styles.patch
+ )
+
+DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt )
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+ find singleapp hunspell -delete || die
+
+ epatch "${PATCHES[@]}"
+
+ cat >> ${PN}.pro <<- EOF
+ exists(texmakerx_my.pri):include(texmakerx_my.pri)
+ EOF
+
+ cp "${FILESDIR}"/texmakerx_my.pri . || die
+
+ sed \
+ -e '/^#include/s:hunspell/::g' \
+ -e '/^#include/s:singleapp/::g' \
+ -i *.cpp *.h || die
+
+ DOC_CONTENTS="A user manual with many screenshots is available at:
+ ${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}
+
+src_configure() {
+ local myeqmakeargs=(
+ ${PN}.pro
+ PREFIX="${EPREFIX}/usr"
+ DESKTOPDIR="${EPREFIX}/usr/share/applications"
+ ICONDIR="${EPREFIX}/usr/share/pixmaps"
+ )
+ eqmake5 ${myeqmakeargs[@]}
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ einstalldocs
+ readme.gentoo_create_doc
+}
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
index 69594c081d94..d4ca2562952a 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
index 75a2edcd9059..871d8dcb64de 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
@@ -33,16 +33,6 @@ python_prepare_all() {
python_install_all() {
distutils-r1_python_install_all
-
- # remove on Gentoo Prefix platforms where it's broken anyway
- if use prefix; then
- elog "The revdep-rebuild command is removed, the preserve-libs"
- elog "feature of portage will handle issues."
- rm "${ED}"/usr/bin/revdep-rebuild*
- rm "${ED}"/usr/share/man/man1/revdep-rebuild.1
- rm -rf "${ED}"/etc/revdep-rebuild
- rm -rf "${ED}"/var
- fi
}
pkg_postinst() {
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 6f7d9cf32d70..e3e24febf7a0 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -1,2 +1 @@
-DIST tatt-0.3.tar.gz 22527 SHA256 bad1f0f33889aaa5887bab8c80bcbdaa620c379de5ff381ab983ae23d24ac9ed SHA512 822ec8904e452afd2373ca7ff01a05b8020b261acfc02864523a22e91d83dea51a1d2a8c79ec75db38e6de00cb3c06b3799dee261f376ec91d261a9f468aaa19 WHIRLPOOL f9be83b45c3d79e004600fa3e1ecd2d1ab6e6720035f13ab5f0b4a46555c280663e6371fb9ed88ab0de6bbfb4a853a0f07963dbc25f668a3cd8482c369343b90
DIST tatt-0.4.tar.gz 23397 SHA256 53ed63685187acc55241698dac26a7cadbdf846dfc72709a9d67db65572dc2ef SHA512 57df8cdda9b6711da36e3635182fcfb64a376d7c3a76a29ea0252fc17597defe921d90bf9989f4fc199ab9848fae6fc4f53623140825f79368e90723a5562dd6 WHIRLPOOL a152e6cdee833d892eb0ff1b6c24d107b99ac4b7c92510d230fdbb6e1375825c1294a7008e1e09c496115f6116f3de48a4500dcc3a257998c8ee5bb0a29c08b0
diff --git a/app-portage/tatt/tatt-0.3.ebuild b/app-portage/tatt/tatt-0.3.ebuild
deleted file mode 100644
index 92b3bd9cce7e..000000000000
--- a/app-portage/tatt/tatt-0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="tatt is an arch testing tool"
-HOMEPAGE="https://github.com/tom111/tatt"
-SRC_URI="https://github.com/tom111/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+templates"
-
-RDEPEND="
- app-portage/eix
- app-portage/gentoolkit
- www-client/pybugz
- dev-python/configobj[${PYTHON_USEDEP}]"
-DEPEND="
- ${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
- if use templates; then
- insinto "/usr/share/${PN}"
- doins -r templates
- fi
- doman tatt.1
- doman tatt.5
-}
diff --git a/app-portage/tatt/tatt-0.4.ebuild b/app-portage/tatt/tatt-0.4.ebuild
index 53f3d1331572..d19585e1428d 100644
--- a/app-portage/tatt/tatt-0.4.ebuild
+++ b/app-portage/tatt/tatt-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kensington/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="+templates"
RDEPEND="
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 4d3fbcb37522..e36496ca9b6d 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,3 +1,4 @@
DIST atril-1.12.2.tar.xz 1663920 SHA256 47cd22969d4ff6ef860a310a57f77f1fcc0c5674113a72ee507d2b1b5c780226 SHA512 2ceeda42adeb284a25caff3a69d15a231129988fb410e4d502a281ccf5819307b9963722a2e330307a1c3b15d3c82405b708d983ed1c266e091a35264766e6ec WHIRLPOOL 8eb8a0cd40c0c3d21141493a09b3dc8f2c4d902fff1ed80fe5468b1ac342c81312518c015cbd288372f228bc4bb91bb1555af8f8b5842e72e4eb895fc787988c
DIST atril-1.14.2.tar.xz 1703272 SHA256 9a8eadd85bda4539560f01a2127be4d6c358c07c6a744c09d1fdb5bff7ce14f4 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b WHIRLPOOL 3e4bf2f6af6369b7cf410f161c159f6f0221d311b354c24d8b86fbcb14c3553d01ea6d79667d9817541aa401202bc8590d074f635745730854a148ca74b41dfc
DIST atril-1.16.1.tar.xz 1691456 SHA256 c74a5f8c8603fa5952efb4343f055677e4474f1907080be9658d4456d3dc092f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe WHIRLPOOL a7b386897c598e473642aa8c3ba2a40211c4389ef3560e574adf04072882887e37a50a7d83ff5fab4c74982908994c926211272d33220fb47a360e05c851a670
+DIST atril-1.18.0.tar.xz 1688144 SHA256 c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd SHA512 71e40faebfac08c60c90e7c919d2274976a5f03e6f9c6882fe81d4736152c14b1baf45da770f357030708d103203a4ffc47387c736c4df8737dfc5caf1fd466a WHIRLPOOL 4cef97e4a832a2123ddfc1ddaf2af8d44af9a746676ce356c0d7dcc4fe463a762ab33982fa2045ca9bf461dd79c52b513d6fe263fd153121ff3a6afad1708ecc
diff --git a/app-text/atril/atril-1.18.0.ebuild b/app-text/atril/atril-1.18.0.ebuild
new file mode 100644
index 000000000000..e253873cfbba
--- /dev/null
+++ b/app-text/atril/atril-1.18.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
+ dev-libs/atk:0
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/libxml2-2.5:2
+ sys-libs/zlib:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.14:3[introspection?]
+ x11-libs/libICE:0
+ >=x11-libs/libSM-1:0
+ x11-libs/libX11:0
+ >=x11-libs/cairo-1.9.10:0
+ x11-libs/pango:0
+ caja? ( >=mate-base/caja-1.17.1[introspection?] )
+ djvu? ( >=app-text/djvu-3.5.17:0 )
+ dvi? (
+ virtual/tex-base:0
+ t1lib? ( >=media-libs/t1lib-5:5 )
+ )
+ epub? (
+ dev-libs/mathjax
+ >=net-libs/webkit-gtk-2.4.3:4
+ )
+ gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+ postscript? ( >=app-text/libspectre-0.2:0 )
+ tiff? ( >=media-libs/tiff-3.6:0 )
+ xps? ( >=app-text/libgxps-0.2.1:0 )
+ !!app-text/mate-document-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/rarian:0
+ app-text/yelp-tools:0
+ >=app-text/scrollkeeper-dtd-1:1.0
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.50.1:*
+ virtual/pkgconfig:*
+ sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+ # Passing --disable-help would drop offline help, that would be inconsistent
+ # with helps of the most of GNOME apps that doesn't require network for that.
+ mate_src_configure \
+ --disable-tests \
+ --enable-comics \
+ --enable-pdf \
+ --enable-pixbuf \
+ --enable-previewer \
+ --enable-thumbnailer \
+ $(use_with gnome-keyring keyring) \
+ $(use_enable caja) \
+ $(use_enable dbus) \
+ $(use_enable debug) \
+ $(use_enable djvu) \
+ $(use_enable dvi) \
+ $(use_enable epub) \
+ $(use_enable introspection) \
+ $(use_enable postscript ps) \
+ $(use_enable t1lib) \
+ $(use_enable tiff) \
+ $(use_enable xps)
+}
diff --git a/app-text/poppler/poppler-0.55.0-r1.ebuild b/app-text/poppler/poppler-0.55.0-r1.ebuild
index df90008fc250..d429f13df27e 100644
--- a/app-text/poppler/poppler-0.55.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.55.0-r1.ebuild
@@ -111,10 +111,15 @@ src_configure() {
$(cmake-utils_use_find_package qt5 Qt5Core)
-DWITH_TIFF="$(usex tiff)"
)
+ if use jpeg; then
+ mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+ else
+ mycmakeargs+=(-DENABLE_DCTDECODER=none)
+ fi
if use jpeg2k; then
mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
else
- mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+ mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
fi
if use lcms; then
mycmakeargs+=(-DENABLE_CMS=lcms2)
diff --git a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild b/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
index b9485e715485..2acd5b13dcf4 100644
--- a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
+++ b/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
inherit python-single-r1 vim-plugin
diff --git a/app-vim/vimclojure/Manifest b/app-vim/vimclojure/Manifest
index fba0de890885..408652111d62 100644
--- a/app-vim/vimclojure/Manifest
+++ b/app-vim/vimclojure/Manifest
@@ -1,2 +1 @@
-DIST 2.3.6.zip 44737 SHA256 7c1a9197e8ed2540c921a4e448c88d784740de891cfe58c57e19e9c5c499cd5b SHA512 daf4f691500c3b901a57849c6f07b500c49f7086e0733921f589e362a53a0d07b99eab7d6ea42f1828822942b294f51a684eec93ebab1797438da4b81199ca9d WHIRLPOOL b908cf86313cdd3521f15c2090cbb9f4f2a8a7c656ff1a152fa3707f62e1c6a49fbf6dcf2d596107e6cb2ab579f9aa3e5aec60d04fc91a8f08396bb813b43481
DIST vimclojure-2.3.6.zip 44737 SHA256 7c1a9197e8ed2540c921a4e448c88d784740de891cfe58c57e19e9c5c499cd5b SHA512 daf4f691500c3b901a57849c6f07b500c49f7086e0733921f589e362a53a0d07b99eab7d6ea42f1828822942b294f51a684eec93ebab1797438da4b81199ca9d WHIRLPOOL b908cf86313cdd3521f15c2090cbb9f4f2a8a7c656ff1a152fa3707f62e1c6a49fbf6dcf2d596107e6cb2ab579f9aa3e5aec60d04fc91a8f08396bb813b43481
diff --git a/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild b/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
index 689bdae730f1..70458eaecd0f 100644
--- a/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
+++ b/app-vim/vimclojure/vimclojure-2.3.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,8 +9,7 @@ MY_PN="VimClojure"
DESCRIPTION="vim plugin: Clojure syntax highlighting, filetype and indent settings"
HOMEPAGE="https://github.com/vim-scripts/VimClojure"
-#SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
-SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.zip"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
SLOT="0"
LICENSE="BSD"
KEYWORDS="amd64 x86"
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 3f0603310b8b..e2ab7921f85d 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,2 +1 @@
-DIST ebuild-mode-1.24.tar.xz 28816 SHA256 366fa7602d32cda107b560e9a24540a3a5b90fdda58d84a1d108e8a4c6a488ff SHA512 0894ad452b64133c223a4f93755404657eed5cf86667e45ce5c808d2232755bcedd835f1bbab1bd719ce850d56c6d92e339c4262ab0d7cc8aa42e039023db99d WHIRLPOOL ff38c8736051a6f6c34d00103b8f1fa2fe40ce910cc14187e9d95b11d7aa665ba03497b52b324d2e7b0e7c29da1d99e267a1934d5e2434bf986e863afb925801
DIST ebuild-mode-1.37.tar.xz 30816 SHA256 f7368a8757036874dde542c69c26b824fe3da5241098f89a6b7d7e2665cbbf1d SHA512 1d570b213ad0c6eef8817f69c99c0862703b9bddc24477234dde542b697ba372a06bbe8e4a91179a7d528b720a7dbfc13bb92c8ea0a4d3b3b8684fa4ee0065c0 WHIRLPOOL 75928f5965bdfe66733e203588f01ab3b5de67a5958d33f41069d0793842bd9617ab0904ab71f95aeae04e0aa2f55646e4c545d6199cc1d357140b8fd1a714ab
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.24.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.24.ebuild
deleted file mode 100644
index 4e5cb0c5a470..000000000000
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.24.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xemacs-elisp
-
-DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
-HOMEPAGE="https://www.gentoo.org/proj/en/lisp/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=app-editors/xemacs-21.4.20-r5
- app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- ${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
- -f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
- xemacs-elisp-make-autoload-file *.el || die
-}
diff --git a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
index e7e9b0b98c37..c740aab39ff1 100644
--- a/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
+++ b/dev-ada/gtkada/files/gtkada-2016-gentoo.patch
@@ -32,13 +32,13 @@
tools:
@echo "====== Building tools ====="
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
+ -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
build_library_type/%: src/gtkada-intl.adb
@echo "====== Building $(@F) libraries ====="
- ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+ ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
++ ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
+ -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
ifeq (${HAVE_OPENGL}, True)
${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
@@ -55,7 +55,7 @@
tests: testgtk/opengl/view_gl.adb
@echo "====== Building tests ====="
- cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+ cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
++ cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
+ -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
install/%: force
@@ -83,3 +83,20 @@
@echo '-----------------------------------------------------------------------'
@echo '-- GtkAda has now been installed. --'
+--- gtkada-gpl-2016-src/src/gtkada.gpr.old 2017-05-31 14:21:35.007965274 +0200
++++ gtkada-gpl-2016-src/src/gtkada.gpr 2017-05-31 14:23:16.597315577 +0200
+@@ -41,7 +41,13 @@
+ for Library_Name use "gtkada";
+ for Library_Version use
+ "lib" & Project'Library_Name & Shared.So_Ext & "." & Version;
+- for Library_Options use Shared.Gtk_Libs;
++
++ case Shared.Library_Kind is
++ when "relocatable" =>
++ for Library_Options use Shared.Gtk_Libs;
++ when others =>
++ null;
++ end case;
+
+ package Builder renames Shared.Builder;
+ package Naming renames Shared.Naming;
diff --git a/dev-cpp/muParser/muParser-2.2.5.ebuild b/dev-cpp/muParser/muParser-2.2.5.ebuild
index fd03ab26a691..830abea368df 100644
--- a/dev-cpp/muParser/muParser-2.2.5.ebuild
+++ b/dev-cpp/muParser/muParser-2.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/beltoforion/muparser/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="doc test"
S=${WORKDIR}/muparser-${PV}
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 1dd06bb5ced4..172662cc6313 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,9 +1,12 @@
DIST sqlite-autoconf-3160200.tar.gz 2508179 SHA256 65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615 SHA512 83bdd588504f265bbe93fb98a33a292aff5618c14f94d521c8557efbb5f777e82dfbb2d186cbfd4c628ee9522b1fcb73857e24ca2318fa34af3a3f9540e72b9a WHIRLPOOL 850a5051739f65eade0ee5740641a0503870f88d1ebdb40cab36b68d956896270ed59e387d57db74eede5ecd7fc9b3c14bc5841ff02e17eb50abc4701eba18fc
DIST sqlite-autoconf-3170000.tar.gz 2515143 SHA256 a4e485ad3a16e054765baf6371826b5000beed07e626510896069c0bf013874c SHA512 bebf2693ade1c99b6a178bbe663f64911bf7751932a2524506994cbbb19ab254e7febe3693a76084e55853c1ea85db9e4ece87192422583555fbe569915a2ca8 WHIRLPOOL c3ddeb9691470dfd10950ef36bca8f05f06faa171e3ee87da66d431ba364b7dd903b1350b8ab1aae445a2696ea56dd3f0c50e07d25bc83a09d673a9b92c84e3f
DIST sqlite-autoconf-3180000.tar.gz 2533004 SHA256 3757612463976e7d08c5e9f0af3021613fc24bbcfe1c51197d6776b9ece9ac5c SHA512 4c2efda1d63d1849f7a351cc57c02cc1820efe3c19f88460a131a1d6ae4f7411e4b7672a5581055e581093df29f65cebd9ff5b24125c18802523b17477dce1ef WHIRLPOOL 5424d028af1649cedeb9192d86939753000bb94676b0578d5bdd33591ddd064f2e9ca60a1abc6e185a8fbbfd13c04361e7bfd82945b3b7c01073b8e79e985031
+DIST sqlite-autoconf-3190200.tar.gz 2542613 SHA256 ca5361fb01cc3ad63d6fd4eb2cb0b6398e629595896d3558f7e121d37dac2ffc SHA512 fc9fbb76a741a22d620902868d5db6c8954db8a2692c8e91080ab96f41b4e18a4d27aa8f549c8fac62aaf5ad20c908abd01ecc0fdf7204310bf0cb6d1a2e5e14 WHIRLPOOL 003b4600a4689d94b690f9122e749401371deb39e0a04ffcdf161fc72b8d89349a7e9cf9883d54064c23ea08a72cac190d1d14fb586349c528a033d72b139a84
DIST sqlite-doc-3160200.zip 5521023 SHA256 c13ffbb6019f3849b251c22358f31ccb862a842c0a2379f552f2935600157dcb SHA512 b79d21074d1ab154e3b324fb2943f24321ad5cdbc6e2030f1d21940ae46538462af049e0e0cd7c6cf96dec2c59708eaf70aa4cb3c84ba1a0e87238ffcf31fca2 WHIRLPOOL 4d07279b8f186c4a015324021d60f3e76840594a35a2466cc023cd3ef32b5b01572d8a83db5d96f7281c617a8384485bdef60d390e1c12c4ecbc7e0223e1a194
DIST sqlite-doc-3170000.zip 5533032 SHA256 3102d9eab879074776216357e4c9e272f63d0cda975a0819ec5baba5e0922ff6 SHA512 6a7813be301416dc59401b7732733f44efad60b458ded0f4ed8d845aab0843a1123dd20d1e6f209dd32184a87bcd7e68e213e3676c43d1d05d2df5acc2c64b74 WHIRLPOOL dc1c9b6802985be34ac7819e08883c456a0a76fb1822eff46b26613760063b72888d34323cf15f0f48be69555c0b07b99424a85f29ac580c4ad8fa46b990b723
DIST sqlite-doc-3180000.zip 5552381 SHA256 6f763eba9f51cb1096d1d40fbdd7ff974203060ddb892fc735adb2d7d42f1dad SHA512 7b65130cb2174d823842cddc912432d206044a8b276fdc2eef437854de7d0b05b8eb5d7aec0ead5c3f88bb7788ae5f1c42ffb1e43ab00774a68f6f7fea72d517 WHIRLPOOL be95f25105aea7f553145b371d64d1192057a2931551758bea418dd41b2ead6e9c07368347320bb041a59051c89ca2c84e3cd4e1f95806cad30dca3adec6042b
+DIST sqlite-doc-3190200.zip 5577171 SHA256 0d136abeea8d045ab7acef64ce84028dacb418584fa5a259e7ab4233ef21ff46 SHA512 f81b8719a54cd5e7f993f3dbd76821fc39651ef20b12cfd19c6d58fcb948e7fa00aa97e2f25cab421ba85d27d10b12822a87d1ae49e33c004c83b8f68cbc781c WHIRLPOOL fd8d25184a1e291ea597d42ce76ce5959db8a974e90934e637851806021d054fdda0a37d33db159478158331d52024b8ad5de11410dad5eb595b590ddda1c657
DIST sqlite-src-3160200.zip 10081950 SHA256 ee77c2cc5cc4a7b0a746a1d4496f7aee0d71c558a3bbfcf8e9e0b35416910337 SHA512 db49551c09830cf4d8997f0a623deeed9f85db5f27e6ca9d8aa5812a23c1466bbcdf8bb56cf009511f72cafec8f09a305127123f54d90437b28770dac34a0897 WHIRLPOOL b8cc52d5111bde34dae02391be8d83f9e703672b2101b36f5409e9acc23743c00561b02bd14b098e29972077fa1866a506d6343b58e4897ca07dac0bb60f4367
DIST sqlite-src-3170000.zip 10120844 SHA256 86754bee6bcaf1f2a6bf4a02676eb3a43d22d4e5d8339e217424cb2be6b748c3 SHA512 e60381de33fbf566507454e4f1dfb7d3ada554e5c919f05f0dd2f96a6f266adaa62681437f21fdea1c24de57fb6141b798f97854918faa189b507f12f11e0d36 WHIRLPOOL 535c598f7bb9ddbecdd1ca841c0ecf398831c494c99c38542d1cbb756d8333260d6891aa36167aeba75df83fbaf402465dc65c9b3a7fb6685fa54420cb1a1342
DIST sqlite-src-3180000.zip 10166686 SHA256 eab4d137abd5aa1164244a5d558c9a02122071daf36984b236f8441d749b9ba6 SHA512 b82c5388066f2e905c067d75e890bf2ff03a522733b8c8e0ebdfffe1804d7ecb39b72f6d808fce59133ac8c645f8b6e163e3dff7bbb0d66bbe8748e069ca7a84 WHIRLPOOL b92890b587761dfd550b39fbd64c4fddaf58e495c0f2b7526a624c3415147494648add3fa6968a09411e73c9b0653ec541a49a34daeb7ad2ae4840e829528380
+DIST sqlite-src-3190200.zip 10193843 SHA256 899c370b162a3b1febc644be5363433789a629bd07f5f80231defb5603d1abc1 SHA512 026b97bfc73b6ecf4c48b344a13adfb1c484d76a4fe78fd06bc4d175bb516c324483c6a647eaffc989469b3134c1874a1869b2d6a7d4112e685d75317992deb1 WHIRLPOOL 8af9215bfb2e2c2b418ff19f5e6a31d9ce68c47a3ec5d31fa2747e6de1936a32844fa6d500d876f77038a50dd332d73740594a2a7a9141eff32bc5bf523c5966
diff --git a/dev-db/sqlite/sqlite-3.19.2.ebuild b/dev-db/sqlite/sqlite-3.19.2.ebuild
new file mode 100644
index 000000000000..cb6dc5fdf17c
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.19.2.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
+ tcl? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
+ test? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
+ tools? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
+ !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+ readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+ tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+ tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-arch/unzip )
+ tcl? ( app-arch/unzip )
+ test? (
+ app-arch/unzip
+ dev-lang/tcl:0[${MULTILIB_USEDEP}]
+ )
+ tools? ( app-arch/unzip )"
+
+full_tarball() {
+ use tcl || use test || use tools
+}
+
+pkg_setup() {
+ if full_tarball; then
+ S="${WORKDIR}/${PN}-src-${SRC_PV}"
+ else
+ S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+ fi
+}
+
+src_prepare() {
+ if full_tarball; then
+ eapply -p0 "${FILESDIR}/${PN}-3.18.0-full_tarball-build.patch"
+
+ eapply_user
+
+ # Fix AC_CHECK_FUNCS.
+ # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+ sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
+
+ # Fix references to $(OPT_FEATURE_FLAGS).
+ # https://sqlite.org/src/info/43ce3bd3a4b41ea7
+ sed -e "s/OPT_FEATURE_FLAGS=\"\$(OPT_FEATURE_FLAGS)/OPT_FEATURE_FLAGS=\"\${OPT_FEATURE_FLAGS}/" -i configure.ac || die "sed failed"
+ else
+ eapply -p0 "${FILESDIR}/${PN}-3.16.0-nonfull_tarball-build.patch"
+
+ eapply_user
+
+ # Fix AC_CHECK_FUNCS.
+ # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
+ sed \
+ -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
+ -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
+ -i configure.ac || die "sed failed"
+ fi
+
+ eautoreconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local CPPFLAGS="${CPPFLAGS}" options=()
+
+ options+=(
+ --enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+ --enable-threadsafe
+ )
+ if ! full_tarball; then
+ options+=(--disable-static-shell)
+ fi
+
+ # Support detection of misuse of SQLite API.
+ # https://sqlite.org/compile.html#enable_api_armor
+ append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+ # Support column metadata functions.
+ # https://sqlite.org/c3ref/column_database_name.html
+ append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+ # Support dbstat virtual table.
+ # https://sqlite.org/dbstat.html
+ append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+ # Support comments in output of EXPLAIN.
+ # https://sqlite.org/compile.html#enable_explain_comments
+ append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+
+ # Support Full-Text Search versions 3, 4 and 5.
+ # https://sqlite.org/fts3.html
+ # https://sqlite.org/fts5.html
+ append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+ options+=(--enable-fts5)
+
+ # Support hidden columns.
+ append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+ # Support JSON1 extension.
+ # https://sqlite.org/json1.html
+ append-cppflags -DSQLITE_ENABLE_JSON1
+
+ # Support memsys5 memory allocator.
+ # https://sqlite.org/malloc.html#memsys5
+ append-cppflags -DSQLITE_ENABLE_MEMSYS5
+
+ # Support Resumable Bulk Update extension.
+ # https://sqlite.org/rbu.html
+ append-cppflags -DSQLITE_ENABLE_RBU
+
+ # Support R*Trees.
+ # https://sqlite.org/rtree.html
+ append-cppflags -DSQLITE_ENABLE_RTREE
+
+ # Support scan status functions.
+ # https://sqlite.org/c3ref/stmt_scanstatus.html
+ # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+ append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+ # Support Session extension.
+ # https://sqlite.org/sessionintro.html
+ options+=(--enable-session)
+
+ # Support unknown() function.
+ # https://sqlite.org/compile.html#enable_unknown_sql_function
+ append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
+
+ # Support unlock notification.
+ # https://sqlite.org/unlock_notify.html
+ append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+ # Support soundex() function.
+ # https://sqlite.org/lang_corefunc.html#soundex
+ append-cppflags -DSQLITE_SOUNDEX
+
+ # debug USE flag.
+ if full_tarball; then
+ options+=($(use_enable debug))
+ else
+ if use debug; then
+ append-cppflags -DSQLITE_DEBUG
+ else
+ append-cppflags -DNDEBUG
+ fi
+ fi
+
+ # icu USE flag.
+ if use icu; then
+ # Support ICU extension.
+ # https://sqlite.org/compile.html#enable_icu
+ append-cppflags -DSQLITE_ENABLE_ICU
+ if full_tarball; then
+ sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ else
+ sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ fi
+ fi
+
+ # readline USE flag.
+ options+=(
+ --disable-editline
+ $(use_enable readline)
+ )
+ if full_tarball && use readline; then
+ options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+ fi
+
+ # secure-delete USE flag.
+ if use secure-delete; then
+ # Enable secure_delete pragma by default.
+ # https://sqlite.org/pragma.html#pragma_secure_delete
+ append-cppflags -DSQLITE_SECURE_DELETE
+ fi
+
+ # static-libs USE flag.
+ options+=($(use_enable static-libs static))
+
+ # tcl, test, tools USE flags.
+ if full_tarball; then
+ options+=(--enable-tcl)
+ fi
+
+ if [[ "${CHOST}" == *-mint* ]]; then
+ append-cppflags -DSQLITE_OMIT_WAL
+ fi
+
+ econf "${options[@]}"
+}
+
+multilib_src_compile() {
+ emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+ if use tools && multilib_is_native_abi; then
+ emake changeset dbdump dbhash rbu scrub showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+ fi
+}
+
+multilib_src_test() {
+ if [[ "${EUID}" -eq 0 ]]; then
+ ewarn "Skipping tests due to root permissions"
+ return
+ fi
+
+ emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+ if use tools && multilib_is_native_abi; then
+ install_tool() {
+ if [[ -f ".libs/${1}" ]]; then
+ newbin ".libs/${1}" "${2}"
+ else
+ newbin "${1}" "${2}"
+ fi
+ }
+
+ install_tool changeset sqlite3-changeset
+ install_tool dbdump sqlite3-db-dump
+ install_tool dbhash sqlite3-db-hash
+ install_tool rbu sqlite3-rbu
+ install_tool scrub sqlite3-scrub
+ install_tool showdb sqlite3-show-db
+ install_tool showjournal sqlite3-show-journal
+ install_tool showstat4 sqlite3-show-stat4
+ install_tool showwal sqlite3-show-wal
+ install_tool sqldiff sqlite3-diff
+ install_tool sqlite3_analyzer sqlite3-analyzer
+
+ unset -f install_tool
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+
+ doman sqlite3.1
+
+ if use doc; then
+ rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
+ (
+ docinto html
+ dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
+ )
+ fi
+}
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index 0a3fc3ba9949..395bf793d12d 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,2 +1 @@
-DIST sqlitebrowser-3.8.0.tar.gz 1538043 SHA256 f638a751bccde4bf0305a75685e2a72d26fc3e3a69d7e15fd84573f88c1a4d92 SHA512 6e262e3bd3b26a1574a69cc9f306774cc9fe69f87c3253aba6b40c35f2491bc0636b6d5e705526e039ee9d8ed27d21a4529a624d62e8879a3917cfb502a65589 WHIRLPOOL 35d3594643a65e6b69bec816430dab3017c3ba197a12ab56ed9f027525db02a635789fda723bbd823d2f66b3933ee2381181ea7e95151be515cf1ddceeb9c8f9
DIST sqlitebrowser-3.9.1.tar.gz 1704713 SHA256 d0d2e06a69927ba1d0b955f3261ce70c61befc5bd5ddaa06752dae8bb4219ed8 SHA512 c1e88063fac864f60a9802ae378e13d6f3a09e2f4e71e50c6abca4967a941c444a64617bad2dfc743cf9a6be554af9c73e4c61533300ed9a51652234ffdbd225 WHIRLPOOL 50c27ef3405573806e3c8939b69652f25896b9281b59d609cd3210faeb793d707d11ecdea4dada045eb4aa4da375327669566f71ecdbd151f669be1c2419a197
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild
deleted file mode 100644
index e75e489a89fe..000000000000
--- a/dev-db/sqlitebrowser/sqlitebrowser-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR=ninja
-
-inherit eutils cmake-utils
-
-DESCRIPTION="SQLite Database Browser"
-HOMEPAGE="http://sqlitebrowser.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt5 test"
-
-RDEPEND="
- dev-cpp/antlr-cpp:2
- dev-db/sqlite:3
- dev-libs/qcustomplot[qt5=]
- x11-libs/qscintilla:=
- !qt5? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtnetwork:5
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- )"
-DEPEND="${RDEPEND}
- qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.7.0-unbundle.patch )
-
-src_prepare() {
- # https://github.com/qingfengxia/qhexedit still bundled
- # x11-libs/qscintilla[qt4?,qt5?] still bundled
- find libs/{antlr-2.7.7,qcustomplot-source} -delete || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use qt5)
- $(cmake-utils_use_enable test TESTING)
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- doicon images/sqlitebrowser.svg
-}
diff --git a/dev-db/xbase/xbase-3.1.2.ebuild b/dev-db/xbase/xbase-3.1.2.ebuild
index eba9889c70a0..c38abe5a5f24 100644
--- a/dev-db/xbase/xbase-3.1.2.ebuild
+++ b/dev-db/xbase/xbase-3.1.2.ebuild
@@ -2,14 +2,15 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools ltprune
+
+inherit autotools
DESCRIPTION="xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library"
-HOMEPAGE="http://linux.techass.com/projects/xdb/"
+HOMEPAGE="https://sourceforge.net/projects/xdb/ http://linux.techass.com/projects/xdb/"
SRC_URI="mirror://sourceforge/xdb/${PN}64-${PV}.tar.gz"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd"
IUSE="doc static-libs"
@@ -39,15 +40,22 @@ src_configure() {
}
src_install() {
- default
- prune_libtool_files
+ if use doc; then
+ HTML_DOCS+=( html/. )
+ if [[ -e examples/.libs ]] ; then
+ rm -r examples/.libs || die
+ fi
+ dodoc -r examples
+ fi
- # media-tv/linuxtv-dvb-apps collision, bug #208596
- mv "${ED}/usr/bin/zap" "${ED}/usr/bin/${PN}-zap" || die
+ default
+ find "${D}" -name '*.la' -delete || die
if use doc; then
- dohtml html/*
- insinto /usr/share/doc/${PF}/examples
- doins examples/*
+ rm "${ED%/}"/usr/share/doc/${PF}/html/copying.lib || die
+ rm "${ED%/}"/usr/share/doc/${PF}/html/Makefile{,.in,.am} || die
fi
+
+ # media-tv/linuxtv-dvb-apps collision, bug #208596
+ mv "${ED%/}"/usr/bin/{,${PN}-}zap || die
}
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 077fc3755ee0..3f546102b036 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1 +1,2 @@
DIST tiled-0.18.2.tar.gz 6409369 SHA256 575e110dd4904f785222d9a298f63eddf5c5b0b8f1450cb684ef3a9ae91292cd SHA512 6cb6844541fc4e52e05e8d12974af395161fbe0c03dddd9be362b6df7a88620ddf13c3a96f8cdb175662d3ae13f162137cf74b6b4c2664ca7dd753e3cb48cd26 WHIRLPOOL 2945156eb99f88d65fa276e1d9a52724e09c996b35fa2bf1d198a41f5785cd52da3d090c268ac4a445dbf94cac12b66ab515b0786ff8bcd9798176220cc937bf
+DIST tiled-1.0.0.tar.gz 6575292 SHA256 a5e5f1f3ec9428f124e1fbe65ac3b7ab3c17dc13a3c0d489ff6d356f7f6ad43c SHA512 a5d8af9a1aeae5c4a9eefc865e28ad22c61dad6d04878867c495bbc0c9491723bc51ed30e428fd4d1eaed5c752f90e595d46cc46cde745588556a8b9fa2db727 WHIRLPOOL 7a8241314a60f6ad2c78b4067772475e151645d6668a0f975d177332334f52e79b5ee7e648395e67214d98889bf9d73da5a82d60c4a52a35c5e7cba05df6932d
diff --git a/dev-games/tiled/tiled-1.0.0.ebuild b/dev-games/tiled/tiled-1.0.0.ebuild
new file mode 100644
index 000000000000..065606a2484d
--- /dev/null
+++ b/dev-games/tiled/tiled-1.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
+
+DESCRIPTION="A general purpose tile map editor"
+HOMEPAGE="http://www.mapeditor.org/"
+SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-2 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-qt/qtcore-5.6:5
+ >=dev-qt/qtgui-5.6:5
+ >=dev-qt/qtnetwork-5.6:5
+ >=dev-qt/qtopengl-5.6:5
+ >=dev-qt/qtwidgets-5.6:5
+ sys-libs/zlib
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS COPYING NEWS.md README.md )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ einstalldocs
+
+ if use examples ; then
+ docompress -x /usr/share/doc/${PF}/examples
+ dodoc -r examples
+ fi
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/dev-haskell/bits-atomic/Manifest b/dev-haskell/bits-atomic/Manifest
index 9c9e96e1f9f1..2a704770099e 100644
--- a/dev-haskell/bits-atomic/Manifest
+++ b/dev-haskell/bits-atomic/Manifest
@@ -1 +1,2 @@
+DIST bits-atomic-0.1.3-gcc-5.patch 30907 SHA256 36fc94f29e45c5df056ffaae6b049f727ffeb6bff3463752f656aeffb027cd89 SHA512 0a40015f225325db3716ac0a17e33eef3f2042b72f933000a52734b103ea3e316a0242a0b75c90a31d0d4c31d33da8d32b07f7c067d79ade51df66ea75a3b19c WHIRLPOOL fe8c13afbfac29d80dc11adb1269bca47f2f241778c8b8ea67516194e90a48059e946d246e0432fdf5cc091a8e8646d9a12e643fd18bc8870523d79b9ed333e1
DIST bits-atomic-0.1.3.tar.gz 7982 SHA256 e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d SHA512 e13c21c81ebc6cce2f85a184a572eb1647439f605985a8344ff219cc685c7d0adcf5d2433ea75fa1560a807e329cab23b548435adc0087e6294417eb7a65fbf1 WHIRLPOOL 3c15101610d87f202b910c60f9b875623661872bc91c8ae084e720f94633392b1338df3ee9d8eb3bd104e3c9c0d7dd949ead3a8f28be65e6a9f6458fda620a08
diff --git a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild b/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
index e29ee53ddae6..59e62513134b 100644
--- a/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
+++ b/dev-haskell/bits-atomic/bits-atomic-0.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,8 @@ inherit haskell-cabal
DESCRIPTION="Atomic bit operations on memory locations for low-level synchronization"
HOMEPAGE="http://hackage.haskell.org/package/bits-atomic"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
+ https://dev.gentoo.org/~slyfox/patches/${P}-gcc-5.patch"
LICENSE="BSD"
SLOT="0/${PV}"
@@ -29,6 +30,6 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc-5.patch
+ epatch "${DISTDIR}"/${P}-gcc-5.patch
epatch "${FILESDIR}"/${P}-ghc-8.patch
}
diff --git a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-gcc-5.patch b/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-gcc-5.patch
deleted file mode 100644
index a500862f6184..000000000000
--- a/dev-haskell/bits-atomic/files/bits-atomic-0.1.3-gcc-5.patch
+++ /dev/null
@@ -1,610 +0,0 @@
-diff --git a/Setup.hs b/Setup.hs
-index 46f5022..36c3aa9 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -1,19 +1,7 @@
--{-# LANGUAGE CPP #-}
--import Distribution.Simple
--import Distribution.PackageDescription
--import Distribution.Simple.LocalBuildInfo(LocalBuildInfo, buildDir)
--import System.Cmd(system)
--
--ps :: String
--#if mingw32_HOST_OS || mingw32_TARGET_OS
--ps = ['\\']
--#else
--ps = ['/']
--#endif
-+#!/usr/bin/runhaskell
-+module Main where
-
--main = defaultMainWithHooks hooks
-- where hooks = simpleUserHooks { runTests = runTests' }
-+import Distribution.Simple
-
--runTests' :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
--runTests' _ _ _ lbi = system testprog >> return ()
-- where testprog = (buildDir lbi) ++ ps ++ "test" ++ ps ++ "test"
-+main :: IO ()
-+main = defaultMain
-diff --git a/bits-atomic.cabal b/bits-atomic.cabal
-index 68da7f7..97b513f 100644
---- a/bits-atomic.cabal
-+++ b/bits-atomic.cabal
-@@ -43,3 +43,3 @@ Stability: experimental
- Build-Type: Custom
--Cabal-Version: >= 1.6
-+Cabal-Version: >= 1.8
- Extra-Source-Files: cbits/atomic-bitops-gcc.c cbits/atomic-bitops-gcc.h
-@@ -64,11 +64,6 @@ library
-
--flag test
-- description: Build test program.
-- default: False
--
--Executable test
-- if flag(test)
-- buildable: True
-- build-depends:
-- base >= 4 && < 6,
-+test-suite test
-+ Type: exitcode-stdio-1.0
-+ build-depends: bits-atomic,
-+ base >= 4 && < 6,
- QuickCheck,
-@@ -78,6 +73,4 @@ Executable test
- test-framework
-- else
-- buildable: False
-- hs-source-dirs: ., test
-- other-modules: Data.Bits.Atomic
-+
-+ hs-source-dirs: test
- main-is: test.hs
-@@ -85,4 +78 @@ Executable test
- GHC-Prof-Options: -auto-all
--
-- Include-Dirs: cbits
-- C-Sources: cbits/atomic-bitops-gcc.c
-diff --git a/cbits/atomic-bitops-gcc.c b/cbits/atomic-bitops-gcc.c
-index 3f9d4ef..96ed076 100644
---- a/cbits/atomic-bitops-gcc.c
-+++ b/cbits/atomic-bitops-gcc.c
-@@ -5,39 +5,39 @@ void mem_barrier (void) {return __sync_synchronize ();}
- /* 8-bit */
--inline unsigned char fetch_and_add_8 (unsigned char *p, unsigned char v) {
-+unsigned char fetch_and_add_8 (unsigned char *p, unsigned char v) {
- return __sync_fetch_and_add (p, v);
- }
--inline unsigned char fetch_and_sub_8 (unsigned char *p, unsigned char v) {
-+unsigned char fetch_and_sub_8 (unsigned char *p, unsigned char v) {
- return __sync_fetch_and_sub (p, v);
- }
--inline unsigned char fetch_and_or_8 (unsigned char *p, unsigned char v) {
-+unsigned char fetch_and_or_8 (unsigned char *p, unsigned char v) {
- return __sync_fetch_and_or (p, v);
- }
--inline unsigned char fetch_and_and_8 (unsigned char *p, unsigned char v) {
-+unsigned char fetch_and_and_8 (unsigned char *p, unsigned char v) {
- return __sync_fetch_and_and (p, v);
- }
--inline unsigned char fetch_and_xor_8 (unsigned char *p, unsigned char v) {
-+unsigned char fetch_and_xor_8 (unsigned char *p, unsigned char v) {
- return __sync_fetch_and_xor (p, v);
- }
--inline unsigned char fetch_and_nand_8 (unsigned char *p, unsigned char v) {
-+unsigned char fetch_and_nand_8 (unsigned char *p, unsigned char v) {
- return __sync_fetch_and_nand (p, v);
- }
--inline unsigned char add_and_fetch_8 (unsigned char *p, unsigned char v) {
-+unsigned char add_and_fetch_8 (unsigned char *p, unsigned char v) {
- return __sync_add_and_fetch (p, v);
- }
--inline unsigned char sub_and_fetch_8 (unsigned char *p, unsigned char v) {
-+unsigned char sub_and_fetch_8 (unsigned char *p, unsigned char v) {
- return __sync_sub_and_fetch (p, v);
- }
--inline unsigned char or_and_fetch_8 (unsigned char *p, unsigned char v) {
-+unsigned char or_and_fetch_8 (unsigned char *p, unsigned char v) {
- return __sync_or_and_fetch (p, v);
- }
--inline unsigned char and_and_fetch_8 (unsigned char *p, unsigned char v) {
-+unsigned char and_and_fetch_8 (unsigned char *p, unsigned char v) {
- return __sync_and_and_fetch (p, v);
- }
--inline unsigned char xor_and_fetch_8 (unsigned char *p, unsigned char v) {
-+unsigned char xor_and_fetch_8 (unsigned char *p, unsigned char v) {
- return __sync_xor_and_fetch (p, v);
- }
--inline unsigned char nand_and_fetch_8 (unsigned char *p, unsigned char v) {
-+unsigned char nand_and_fetch_8 (unsigned char *p, unsigned char v) {
- return __sync_nand_and_fetch (p, v);
- }
--inline unsigned int
-+unsigned int
- bool_compare_and_swap_8 (unsigned char *p, unsigned char old, unsigned char new) {
-@@ -45,3 +45,3 @@ bool_compare_and_swap_8 (unsigned char *p, unsigned char old, unsigned char new)
- }
--inline unsigned char
-+unsigned char
- val_compare_and_swap_8 (unsigned char *p, unsigned char old, unsigned char new) {
-@@ -49,3 +49,3 @@ val_compare_and_swap_8 (unsigned char *p, unsigned char old, unsigned char new)
- }
--inline unsigned char lock_test_and_set_8 (unsigned char *p) {
-+unsigned char lock_test_and_set_8 (unsigned char *p) {
- // Only immediate 0/1 appear to be widely supported, so hardcode it
-@@ -60,39 +60,39 @@ void lock_release_8 (unsigned char *p) {
- /* 16-bit */
--inline unsigned short fetch_and_add_16 (unsigned short *p, unsigned short v) {
-+unsigned short fetch_and_add_16 (unsigned short *p, unsigned short v) {
- return __sync_fetch_and_add (p, v);
- }
--inline unsigned short fetch_and_sub_16 (unsigned short *p, unsigned short v) {
-+unsigned short fetch_and_sub_16 (unsigned short *p, unsigned short v) {
- return __sync_fetch_and_sub (p, v);
- }
--inline unsigned short fetch_and_or_16 (unsigned short *p, unsigned short v) {
-+unsigned short fetch_and_or_16 (unsigned short *p, unsigned short v) {
- return __sync_fetch_and_or (p, v);
- }
--inline unsigned short fetch_and_and_16 (unsigned short *p, unsigned short v) {
-+unsigned short fetch_and_and_16 (unsigned short *p, unsigned short v) {
- return __sync_fetch_and_and (p, v);
- }
--inline unsigned short fetch_and_xor_16 (unsigned short *p, unsigned short v) {
-+unsigned short fetch_and_xor_16 (unsigned short *p, unsigned short v) {
- return __sync_fetch_and_xor (p, v);
- }
--inline unsigned short fetch_and_nand_16 (unsigned short *p, unsigned short v) {
-+unsigned short fetch_and_nand_16 (unsigned short *p, unsigned short v) {
- return __sync_fetch_and_nand (p, v);
- }
--inline unsigned short add_and_fetch_16 (unsigned short *p, unsigned short v) {
-+unsigned short add_and_fetch_16 (unsigned short *p, unsigned short v) {
- return __sync_add_and_fetch (p, v);
- }
--inline unsigned short sub_and_fetch_16 (unsigned short *p, unsigned short v) {
-+unsigned short sub_and_fetch_16 (unsigned short *p, unsigned short v) {
- return __sync_sub_and_fetch (p, v);
- }
--inline unsigned short or_and_fetch_16 (unsigned short *p, unsigned short v) {
-+unsigned short or_and_fetch_16 (unsigned short *p, unsigned short v) {
- return __sync_or_and_fetch (p, v);
- }
--inline unsigned short and_and_fetch_16 (unsigned short *p, unsigned short v) {
-+unsigned short and_and_fetch_16 (unsigned short *p, unsigned short v) {
- return __sync_and_and_fetch (p, v);
- }
--inline unsigned short xor_and_fetch_16 (unsigned short *p, unsigned short v) {
-+unsigned short xor_and_fetch_16 (unsigned short *p, unsigned short v) {
- return __sync_xor_and_fetch (p, v);
- }
--inline unsigned short nand_and_fetch_16 (unsigned short *p, unsigned short v) {
-+unsigned short nand_and_fetch_16 (unsigned short *p, unsigned short v) {
- return __sync_nand_and_fetch (p, v);
- }
--inline unsigned int
-+unsigned int
- bool_compare_and_swap_16 (unsigned short *p, unsigned short old, unsigned short new) {
-@@ -100,3 +100,3 @@ bool_compare_and_swap_16 (unsigned short *p, unsigned short old, unsigned short
- }
--inline unsigned short
-+unsigned short
- val_compare_and_swap_16 (unsigned short *p, unsigned short old, unsigned short new) {
-@@ -104,3 +104,3 @@ val_compare_and_swap_16 (unsigned short *p, unsigned short old, unsigned short n
- }
--inline unsigned short lock_test_and_set_16 (unsigned short *p) {
-+unsigned short lock_test_and_set_16 (unsigned short *p) {
- // Only immediate 0/1 appear to be widely supported, so hardcode it
-@@ -115,39 +115,39 @@ void lock_release_16 (unsigned short *p) {
- /* 32-bit */
--inline unsigned int fetch_and_add_32 (unsigned int *p, unsigned int v) {
-+unsigned int fetch_and_add_32 (unsigned int *p, unsigned int v) {
- return __sync_fetch_and_add (p, v);
- }
--inline unsigned int fetch_and_sub_32 (unsigned int *p, unsigned int v) {
-+unsigned int fetch_and_sub_32 (unsigned int *p, unsigned int v) {
- return __sync_fetch_and_sub (p, v);
- }
--inline unsigned int fetch_and_or_32 (unsigned int *p, unsigned int v) {
-+unsigned int fetch_and_or_32 (unsigned int *p, unsigned int v) {
- return __sync_fetch_and_or (p, v);
- }
--inline unsigned int fetch_and_and_32 (unsigned int *p, unsigned int v) {
-+unsigned int fetch_and_and_32 (unsigned int *p, unsigned int v) {
- return __sync_fetch_and_and (p, v);
- }
--inline unsigned int fetch_and_xor_32 (unsigned int *p, unsigned int v) {
-+unsigned int fetch_and_xor_32 (unsigned int *p, unsigned int v) {
- return __sync_fetch_and_xor (p, v);
- }
--inline unsigned int fetch_and_nand_32 (unsigned int *p, unsigned int v) {
-+unsigned int fetch_and_nand_32 (unsigned int *p, unsigned int v) {
- return __sync_fetch_and_nand (p, v);
- }
--inline unsigned int add_and_fetch_32 (unsigned int *p, unsigned int v) {
-+unsigned int add_and_fetch_32 (unsigned int *p, unsigned int v) {
- return __sync_add_and_fetch (p, v);
- }
--inline unsigned int sub_and_fetch_32 (unsigned int *p, unsigned int v) {
-+unsigned int sub_and_fetch_32 (unsigned int *p, unsigned int v) {
- return __sync_sub_and_fetch (p, v);
- }
--inline unsigned int or_and_fetch_32 (unsigned int *p, unsigned int v) {
-+unsigned int or_and_fetch_32 (unsigned int *p, unsigned int v) {
- return __sync_or_and_fetch (p, v);
- }
--inline unsigned int and_and_fetch_32 (unsigned int *p, unsigned int v) {
-+unsigned int and_and_fetch_32 (unsigned int *p, unsigned int v) {
- return __sync_and_and_fetch (p, v);
- }
--inline unsigned int xor_and_fetch_32 (unsigned int *p, unsigned int v) {
-+unsigned int xor_and_fetch_32 (unsigned int *p, unsigned int v) {
- return __sync_xor_and_fetch (p, v);
- }
--inline unsigned int nand_and_fetch_32 (unsigned int *p, unsigned int v) {
-+unsigned int nand_and_fetch_32 (unsigned int *p, unsigned int v) {
- return __sync_nand_and_fetch (p, v);
- }
--inline unsigned int
-+unsigned int
- bool_compare_and_swap_32 (unsigned int *p, unsigned int old, unsigned int new) {
-@@ -155,3 +155,3 @@ bool_compare_and_swap_32 (unsigned int *p, unsigned int old, unsigned int new) {
- }
--inline unsigned int
-+unsigned int
- val_compare_and_swap_32 (unsigned int *p, unsigned int old, unsigned int new) {
-@@ -159,3 +159,3 @@ val_compare_and_swap_32 (unsigned int *p, unsigned int old, unsigned int new) {
- }
--inline unsigned int lock_test_and_set_32 (unsigned int *p) {
-+unsigned int lock_test_and_set_32 (unsigned int *p) {
- // Only immediate 0/1 appear to be widely supported, so hardcode it
-@@ -170,39 +170,39 @@ void lock_release_32 (unsigned int *p) {
- /* 64-bit */
--inline unsigned long long fetch_and_add_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long fetch_and_add_64 (unsigned long long *p, unsigned long long v) {
- return __sync_fetch_and_add (p, v);
- }
--inline unsigned long long fetch_and_sub_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long fetch_and_sub_64 (unsigned long long *p, unsigned long long v) {
- return __sync_fetch_and_sub (p, v);
- }
--inline unsigned long long fetch_and_or_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long fetch_and_or_64 (unsigned long long *p, unsigned long long v) {
- return __sync_fetch_and_or (p, v);
- }
--inline unsigned long long fetch_and_and_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long fetch_and_and_64 (unsigned long long *p, unsigned long long v) {
- return __sync_fetch_and_and (p, v);
- }
--inline unsigned long long fetch_and_xor_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long fetch_and_xor_64 (unsigned long long *p, unsigned long long v) {
- return __sync_fetch_and_xor (p, v);
- }
--inline unsigned long long fetch_and_nand_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long fetch_and_nand_64 (unsigned long long *p, unsigned long long v) {
- return __sync_fetch_and_nand (p, v);
- }
--inline unsigned long long add_and_fetch_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long add_and_fetch_64 (unsigned long long *p, unsigned long long v) {
- return __sync_add_and_fetch (p, v);
- }
--inline unsigned long long sub_and_fetch_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long sub_and_fetch_64 (unsigned long long *p, unsigned long long v) {
- return __sync_sub_and_fetch (p, v);
- }
--inline unsigned long long or_and_fetch_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long or_and_fetch_64 (unsigned long long *p, unsigned long long v) {
- return __sync_or_and_fetch (p, v);
- }
--inline unsigned long long and_and_fetch_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long and_and_fetch_64 (unsigned long long *p, unsigned long long v) {
- return __sync_and_and_fetch (p, v);
- }
--inline unsigned long long xor_and_fetch_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long xor_and_fetch_64 (unsigned long long *p, unsigned long long v) {
- return __sync_xor_and_fetch (p, v);
- }
--inline unsigned long long nand_and_fetch_64 (unsigned long long *p, unsigned long long v) {
-+unsigned long long nand_and_fetch_64 (unsigned long long *p, unsigned long long v) {
- return __sync_nand_and_fetch (p, v);
- }
--inline unsigned int
-+unsigned int
- bool_compare_and_swap_64 (unsigned long long *p, unsigned long long old, unsigned long long new) {
-@@ -210,3 +210,3 @@ bool_compare_and_swap_64 (unsigned long long *p, unsigned long long old, unsigne
- }
--inline unsigned long long
-+unsigned long long
- val_compare_and_swap_64 (unsigned long long *p, unsigned long long old, unsigned long long new) {
-@@ -214,3 +214,3 @@ val_compare_and_swap_64 (unsigned long long *p, unsigned long long old, unsigned
- }
--inline unsigned long long lock_test_and_set_64 (unsigned long long *p) {
-+unsigned long long lock_test_and_set_64 (unsigned long long *p) {
- // Only immediate 0/1 appear to be widely supported, so hardcode it
-@@ -225,39 +225,39 @@ void lock_release_64 (unsigned long long *p) {
- /* Word-sized */
--inline unsigned long fetch_and_add_word (unsigned long *p, unsigned long v) {
-+unsigned long fetch_and_add_word (unsigned long *p, unsigned long v) {
- return __sync_fetch_and_add (p, v);
- }
--inline unsigned long fetch_and_sub_word (unsigned long *p, unsigned long v) {
-+unsigned long fetch_and_sub_word (unsigned long *p, unsigned long v) {
- return __sync_fetch_and_sub (p, v);
- }
--inline unsigned long fetch_and_or_word (unsigned long *p, unsigned long v) {
-+unsigned long fetch_and_or_word (unsigned long *p, unsigned long v) {
- return __sync_fetch_and_or (p, v);
- }
--inline unsigned long fetch_and_and_word (unsigned long *p, unsigned long v) {
-+unsigned long fetch_and_and_word (unsigned long *p, unsigned long v) {
- return __sync_fetch_and_and (p, v);
- }
--inline unsigned long fetch_and_xor_word (unsigned long *p, unsigned long v) {
-+unsigned long fetch_and_xor_word (unsigned long *p, unsigned long v) {
- return __sync_fetch_and_xor (p, v);
- }
--inline unsigned long fetch_and_nand_word (unsigned long *p, unsigned long v) {
-+unsigned long fetch_and_nand_word (unsigned long *p, unsigned long v) {
- return __sync_fetch_and_nand (p, v);
- }
--inline unsigned long add_and_fetch_word (unsigned long *p, unsigned long v) {
-+unsigned long add_and_fetch_word (unsigned long *p, unsigned long v) {
- return __sync_add_and_fetch (p, v);
- }
--inline unsigned long sub_and_fetch_word (unsigned long *p, unsigned long v) {
-+unsigned long sub_and_fetch_word (unsigned long *p, unsigned long v) {
- return __sync_sub_and_fetch (p, v);
- }
--inline unsigned long or_and_fetch_word (unsigned long *p, unsigned long v) {
-+unsigned long or_and_fetch_word (unsigned long *p, unsigned long v) {
- return __sync_or_and_fetch (p, v);
- }
--inline unsigned long and_and_fetch_word (unsigned long *p, unsigned long v) {
-+unsigned long and_and_fetch_word (unsigned long *p, unsigned long v) {
- return __sync_and_and_fetch (p, v);
- }
--inline unsigned long xor_and_fetch_word (unsigned long *p, unsigned long v) {
-+unsigned long xor_and_fetch_word (unsigned long *p, unsigned long v) {
- return __sync_xor_and_fetch (p, v);
- }
--inline unsigned long nand_and_fetch_word (unsigned long *p, unsigned long v) {
-+unsigned long nand_and_fetch_word (unsigned long *p, unsigned long v) {
- return __sync_nand_and_fetch (p, v);
- }
--inline unsigned int
-+unsigned int
- bool_compare_and_swap_word (unsigned long *p, unsigned long old, unsigned long new) {
-@@ -265,3 +265,3 @@ bool_compare_and_swap_word (unsigned long *p, unsigned long old, unsigned long n
- }
--inline unsigned long
-+unsigned long
- val_compare_and_swap_word (unsigned long *p, unsigned long old, unsigned long new) {
-@@ -269,3 +269,3 @@ val_compare_and_swap_word (unsigned long *p, unsigned long old, unsigned long ne
- }
--inline unsigned long lock_test_and_set_word (unsigned long *p) {
-+unsigned long lock_test_and_set_word (unsigned long *p) {
- // Only immediate 0/1 appear to be widely supported, so hardcode it
-diff --git a/cbits/atomic-bitops-gcc.h b/cbits/atomic-bitops-gcc.h
-index f9eccc4..7e0ef15 100644
---- a/cbits/atomic-bitops-gcc.h
-+++ b/cbits/atomic-bitops-gcc.h
-@@ -6,19 +6,19 @@ void mem_barrier (void);
- /* 8-bit */
--inline unsigned char fetch_and_add_8 (unsigned char *, unsigned char );
--inline unsigned char fetch_and_sub_8 (unsigned char *, unsigned char );
--inline unsigned char fetch_and_or_8 (unsigned char *, unsigned char );
--inline unsigned char fetch_and_and_8 (unsigned char *, unsigned char );
--inline unsigned char fetch_and_xor_8 (unsigned char *, unsigned char );
--inline unsigned char fetch_and_nand_8 (unsigned char *, unsigned char );
--inline unsigned char add_and_fetch_8 (unsigned char *, unsigned char );
--inline unsigned char sub_and_fetch_8 (unsigned char *, unsigned char );
--inline unsigned char or_and_fetch_8 (unsigned char *, unsigned char );
--inline unsigned char and_and_fetch_8 (unsigned char *, unsigned char );
--inline unsigned char xor_and_fetch_8 (unsigned char *, unsigned char );
--inline unsigned char nand_and_fetch_8 (unsigned char *, unsigned char );
--inline unsigned int
-+unsigned char fetch_and_add_8 (unsigned char *, unsigned char );
-+unsigned char fetch_and_sub_8 (unsigned char *, unsigned char );
-+unsigned char fetch_and_or_8 (unsigned char *, unsigned char );
-+unsigned char fetch_and_and_8 (unsigned char *, unsigned char );
-+unsigned char fetch_and_xor_8 (unsigned char *, unsigned char );
-+unsigned char fetch_and_nand_8 (unsigned char *, unsigned char );
-+unsigned char add_and_fetch_8 (unsigned char *, unsigned char );
-+unsigned char sub_and_fetch_8 (unsigned char *, unsigned char );
-+unsigned char or_and_fetch_8 (unsigned char *, unsigned char );
-+unsigned char and_and_fetch_8 (unsigned char *, unsigned char );
-+unsigned char xor_and_fetch_8 (unsigned char *, unsigned char );
-+unsigned char nand_and_fetch_8 (unsigned char *, unsigned char );
-+unsigned int
- bool_compare_and_swap_8 (unsigned char *, unsigned char, unsigned char);
--inline unsigned char
-+unsigned char
- val_compare_and_swap_8 (unsigned char *, unsigned char , unsigned char);
--inline unsigned char lock_test_and_set_8 (unsigned char *);
-+unsigned char lock_test_and_set_8 (unsigned char *);
- void lock_release_8 (unsigned char *);
-@@ -26,19 +26,19 @@ void lock_release_8 (unsigned char *);
- /* 16-bit */
--inline unsigned short fetch_and_add_16 (unsigned short *, unsigned short );
--inline unsigned short fetch_and_sub_16 (unsigned short *, unsigned short );
--inline unsigned short fetch_and_or_16 (unsigned short *, unsigned short );
--inline unsigned short fetch_and_and_16 (unsigned short *, unsigned short );
--inline unsigned short fetch_and_xor_16 (unsigned short *, unsigned short );
--inline unsigned short fetch_and_nand_16 (unsigned short *, unsigned short );
--inline unsigned short add_and_fetch_16 (unsigned short *, unsigned short );
--inline unsigned short sub_and_fetch_16 (unsigned short *, unsigned short );
--inline unsigned short or_and_fetch_16 (unsigned short *, unsigned short );
--inline unsigned short and_and_fetch_16 (unsigned short *, unsigned short );
--inline unsigned short xor_and_fetch_16 (unsigned short *, unsigned short );
--inline unsigned short nand_and_fetch_16 (unsigned short *, unsigned short );
--inline unsigned int
-+unsigned short fetch_and_add_16 (unsigned short *, unsigned short );
-+unsigned short fetch_and_sub_16 (unsigned short *, unsigned short );
-+unsigned short fetch_and_or_16 (unsigned short *, unsigned short );
-+unsigned short fetch_and_and_16 (unsigned short *, unsigned short );
-+unsigned short fetch_and_xor_16 (unsigned short *, unsigned short );
-+unsigned short fetch_and_nand_16 (unsigned short *, unsigned short );
-+unsigned short add_and_fetch_16 (unsigned short *, unsigned short );
-+unsigned short sub_and_fetch_16 (unsigned short *, unsigned short );
-+unsigned short or_and_fetch_16 (unsigned short *, unsigned short );
-+unsigned short and_and_fetch_16 (unsigned short *, unsigned short );
-+unsigned short xor_and_fetch_16 (unsigned short *, unsigned short );
-+unsigned short nand_and_fetch_16 (unsigned short *, unsigned short );
-+unsigned int
- bool_compare_and_swap_16 (unsigned short *, unsigned short , unsigned short );
--inline unsigned short
-+unsigned short
- val_compare_and_swap_16 (unsigned short *, unsigned short , unsigned short );
--inline unsigned short lock_test_and_set_16 (unsigned short *);
-+unsigned short lock_test_and_set_16 (unsigned short *);
- void lock_release_16 (unsigned short *);
-@@ -47,19 +47,19 @@ void lock_release_16 (unsigned short *);
- /* 32-bit */
--inline unsigned int fetch_and_add_32 (unsigned int *, unsigned int );
--inline unsigned int fetch_and_sub_32 (unsigned int *, unsigned int );
--inline unsigned int fetch_and_or_32 (unsigned int *, unsigned int );
--inline unsigned int fetch_and_and_32 (unsigned int *, unsigned int );
--inline unsigned int fetch_and_xor_32 (unsigned int *, unsigned int );
--inline unsigned int fetch_and_nand_32 (unsigned int *, unsigned int );
--inline unsigned int add_and_fetch_32 (unsigned int *, unsigned int );
--inline unsigned int sub_and_fetch_32 (unsigned int *, unsigned int );
--inline unsigned int or_and_fetch_32 (unsigned int *, unsigned int );
--inline unsigned int and_and_fetch_32 (unsigned int *, unsigned int );
--inline unsigned int xor_and_fetch_32 (unsigned int *, unsigned int );
--inline unsigned int nand_and_fetch_32 (unsigned int *, unsigned int );
--inline unsigned int
-+unsigned int fetch_and_add_32 (unsigned int *, unsigned int );
-+unsigned int fetch_and_sub_32 (unsigned int *, unsigned int );
-+unsigned int fetch_and_or_32 (unsigned int *, unsigned int );
-+unsigned int fetch_and_and_32 (unsigned int *, unsigned int );
-+unsigned int fetch_and_xor_32 (unsigned int *, unsigned int );
-+unsigned int fetch_and_nand_32 (unsigned int *, unsigned int );
-+unsigned int add_and_fetch_32 (unsigned int *, unsigned int );
-+unsigned int sub_and_fetch_32 (unsigned int *, unsigned int );
-+unsigned int or_and_fetch_32 (unsigned int *, unsigned int );
-+unsigned int and_and_fetch_32 (unsigned int *, unsigned int );
-+unsigned int xor_and_fetch_32 (unsigned int *, unsigned int );
-+unsigned int nand_and_fetch_32 (unsigned int *, unsigned int );
-+unsigned int
- bool_compare_and_swap_32 (unsigned int *, unsigned int , unsigned int );
--inline unsigned int
-+unsigned int
- val_compare_and_swap_32 (unsigned int *, unsigned int , unsigned int );
--inline unsigned int lock_test_and_set_32 (unsigned int *);
-+unsigned int lock_test_and_set_32 (unsigned int *);
- void lock_release_32 (unsigned int *);
-@@ -67,19 +67,19 @@ void lock_release_32 (unsigned int *);
- /* 64-bit */
--inline unsigned long long fetch_and_add_64 (unsigned long long *, unsigned long long );
--inline unsigned long long fetch_and_sub_64 (unsigned long long *, unsigned long long );
--inline unsigned long long fetch_and_or_64 (unsigned long long *, unsigned long long );
--inline unsigned long long fetch_and_and_64 (unsigned long long *, unsigned long long );
--inline unsigned long long fetch_and_xor_64 (unsigned long long *, unsigned long long );
--inline unsigned long long fetch_and_nand_64 (unsigned long long *, unsigned long long );
--inline unsigned long long add_and_fetch_64 (unsigned long long *, unsigned long long );
--inline unsigned long long sub_and_fetch_64 (unsigned long long *, unsigned long long );
--inline unsigned long long or_and_fetch_64 (unsigned long long *, unsigned long long );
--inline unsigned long long and_and_fetch_64 (unsigned long long *, unsigned long long );
--inline unsigned long long xor_and_fetch_64 (unsigned long long *, unsigned long long );
--inline unsigned long long nand_and_fetch_64 (unsigned long long *, unsigned long long );
--inline unsigned int
-+unsigned long long fetch_and_add_64 (unsigned long long *, unsigned long long );
-+unsigned long long fetch_and_sub_64 (unsigned long long *, unsigned long long );
-+unsigned long long fetch_and_or_64 (unsigned long long *, unsigned long long );
-+unsigned long long fetch_and_and_64 (unsigned long long *, unsigned long long );
-+unsigned long long fetch_and_xor_64 (unsigned long long *, unsigned long long );
-+unsigned long long fetch_and_nand_64 (unsigned long long *, unsigned long long );
-+unsigned long long add_and_fetch_64 (unsigned long long *, unsigned long long );
-+unsigned long long sub_and_fetch_64 (unsigned long long *, unsigned long long );
-+unsigned long long or_and_fetch_64 (unsigned long long *, unsigned long long );
-+unsigned long long and_and_fetch_64 (unsigned long long *, unsigned long long );
-+unsigned long long xor_and_fetch_64 (unsigned long long *, unsigned long long );
-+unsigned long long nand_and_fetch_64 (unsigned long long *, unsigned long long );
-+unsigned int
- bool_compare_and_swap_64 (unsigned long long *, unsigned long long , unsigned long long );
--inline unsigned long long
-+unsigned long long
- val_compare_and_swap_64 (unsigned long long *, unsigned long long , unsigned long long );
--inline unsigned long long lock_test_and_set_64 (unsigned long long *);
-+unsigned long long lock_test_and_set_64 (unsigned long long *);
- void lock_release_64 (unsigned long long *);
-@@ -87,19 +87,19 @@ void lock_release_64 (unsigned long long *);
- /* Word */
--inline unsigned long fetch_and_add_word (unsigned long *, unsigned long );
--inline unsigned long fetch_and_sub_word (unsigned long *, unsigned long );
--inline unsigned long fetch_and_or_word (unsigned long *, unsigned long );
--inline unsigned long fetch_and_and_word (unsigned long *, unsigned long );
--inline unsigned long fetch_and_xor_word (unsigned long *, unsigned long );
--inline unsigned long fetch_and_nand_word (unsigned long *, unsigned long );
--inline unsigned long add_and_fetch_word (unsigned long *, unsigned long );
--inline unsigned long sub_and_fetch_word (unsigned long *, unsigned long );
--inline unsigned long or_and_fetch_word (unsigned long *, unsigned long );
--inline unsigned long and_and_fetch_word (unsigned long *, unsigned long );
--inline unsigned long xor_and_fetch_word (unsigned long *, unsigned long );
--inline unsigned long nand_and_fetch_word (unsigned long *, unsigned long );
--inline unsigned int
-+unsigned long fetch_and_add_word (unsigned long *, unsigned long );
-+unsigned long fetch_and_sub_word (unsigned long *, unsigned long );
-+unsigned long fetch_and_or_word (unsigned long *, unsigned long );
-+unsigned long fetch_and_and_word (unsigned long *, unsigned long );
-+unsigned long fetch_and_xor_word (unsigned long *, unsigned long );
-+unsigned long fetch_and_nand_word (unsigned long *, unsigned long );
-+unsigned long add_and_fetch_word (unsigned long *, unsigned long );
-+unsigned long sub_and_fetch_word (unsigned long *, unsigned long );
-+unsigned long or_and_fetch_word (unsigned long *, unsigned long );
-+unsigned long and_and_fetch_word (unsigned long *, unsigned long );
-+unsigned long xor_and_fetch_word (unsigned long *, unsigned long );
-+unsigned long nand_and_fetch_word (unsigned long *, unsigned long );
-+unsigned int
- bool_compare_and_swap_word (unsigned long *, unsigned long , unsigned long );
--inline unsigned long
-+unsigned long
- val_compare_and_swap_word (unsigned long *, unsigned long , unsigned long );
--inline unsigned long lock_test_and_set_word (unsigned long *);
-+unsigned long lock_test_and_set_word (unsigned long *);
- void lock_release_word (unsigned long *);
-diff --git a/test/test.hs b/test/test.hs
-index 8cf3cb2..38238b5 100644
---- a/test/test.hs
-+++ b/test/test.hs
-@@ -35,3 +35,3 @@ testPattern = 0xdeadbeef
-
--type PolyTest = (AtomicBits a, Storable a, Integral a, Bounded a) => a -> Assertion
-+type PolyTest = (AtomicBits a, Storable a, Integral a, Bounded a, Show a) => a -> Assertion
-
-@@ -50,3 +50,3 @@ testTypes _test = do
-
--test_compareAndSwap :: (AtomicBits a, Storable a, Integral a, Bounded a) =>
-+test_compareAndSwap :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) =>
- a -> Assertion
-@@ -65,3 +65,3 @@ test_compareAndSwap_all = testTypes test_compareAndSwap
-
--test_compareAndSwapBool :: (AtomicBits a, Storable a, Integral a, Bounded a) =>
-+test_compareAndSwapBool :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) =>
- a -> Assertion
-@@ -80,3 +80,3 @@ test_compareAndSwapBool_all = testTypes test_compareAndSwapBool
-
--test_fetchAndAdd :: (AtomicBits a, Storable a, Integral a, Bounded a) =>
-+test_fetchAndAdd :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) =>
- a -> Assertion
-@@ -98,3 +98,3 @@ test_fetchAndAdd_all = testTypes test_fetchAndAdd
-
--test_fetchAndSub :: (AtomicBits a, Storable a, Integral a, Bounded a) =>
-+test_fetchAndSub :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) =>
- a -> Assertion
-@@ -115,3 +115,3 @@ test_fetchAndSub_all = testTypes test_fetchAndSub
-
--test_fetchAndXor :: (AtomicBits a, Storable a, Integral a, Bounded a) =>
-+test_fetchAndXor :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) =>
- a -> Assertion
-@@ -127,3 +127,3 @@ test_fetchAndXor_all = testTypes test_fetchAndXor
-
--test_subAndFetch :: (AtomicBits a, Storable a, Integral a, Bounded a) =>
-+test_subAndFetch :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) =>
- a -> Assertion
-@@ -140,3 +140,3 @@ test_subAndFetch_all = testTypes test_subAndFetch
-
--test_lockTestRelease :: (AtomicBits a, Storable a, Integral a, Bounded a) =>
-+test_lockTestRelease :: (AtomicBits a, Storable a, Integral a, Bounded a, Show a) =>
- a -> Assertion
diff --git a/dev-haskell/cryptohash-cryptoapi/Manifest b/dev-haskell/cryptohash-cryptoapi/Manifest
index d362612d56c4..48ce932aaba9 100644
--- a/dev-haskell/cryptohash-cryptoapi/Manifest
+++ b/dev-haskell/cryptohash-cryptoapi/Manifest
@@ -1 +1,2 @@
DIST cryptohash-cryptoapi-0.1.3.tar.gz 2922 SHA256 56f080ba13b891b664bd986db17d6c1240adaea4792a14c173146929c61d4572 SHA512 c33af37d4d1d8f3b13ad1ed93db4ec138ea3bef315006ee8117ccacb5c36e2afeb92ae903d46de537f0fbea2a262c5c487eb32d3e1d7099de27b53cc4f17889a WHIRLPOOL d3c21859f9c2fb376440022657d2d44541339933c12c294d12288fc63b8de46f8a57ffbfec84288011cdc901429ad6e6089adb0db13cb15ec96f972871778e0e
+DIST cryptohash-cryptoapi-0.1.4.tar.gz 3094 SHA256 717a8664ebfaa1c31aaec1d78c9b7c776a5adcfdfc50ad88e21a34566f72058e SHA512 f5add1c8922e682d5d08073d0a3d03c6d5545f38edd90821bad7a92f354203ca380ca7e302b4b259bb9e2ce6ae09b1a2428e981e2d745a4a1b1a5cff696621e2 WHIRLPOOL ea81121d872ba4cfab50d41266bc72bc1169eb3c07c32fb8102a5bf79d44fdeefa752eeb408a18c0ef9e0f32c8c776c92d3a476411ed38772701282132d3f2ec
diff --git a/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
new file mode 100644
index 000000000000..27bc99ad3a7a
--- /dev/null
+++ b/dev-haskell/cryptohash-cryptoapi/cryptohash-cryptoapi-0.1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.7.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Crypto-api interfaces for cryptohash"
+HOMEPAGE="https://github.com/vincenthz/hs-cryptohash-cryptoapi"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/cereal-0.2:=[profile?]
+ >=dev-haskell/crypto-api-0.11:=[profile?]
+ >=dev-haskell/cryptonite-0.13:=[profile?]
+ dev-haskell/memory:=[profile?]
+ >=dev-haskell/tagged-0.1:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6
+"
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 54af6cd3448c..c4bf5d35a5b0 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -4,25 +4,13 @@ DIST icedtea-bin-core-3.4.0-ppc64.tar.xz 54156476 SHA256 4ab0d286746e583be1d630e
DIST icedtea-bin-core-3.4.0-x86.tar.xz 61316304 SHA256 673dd4eb192b769c3781d3f286fb7cfcd71ca61a376070d511239f6903ff2e65 SHA512 52091c3e5eb7b453169d87aeeda348c122d5c7c03ec801fde11cb6cdb6f97ae5daa4889bfb724a50feba63ab073ca5a2c341c67a812ccb2bcd0f3866c11e74a2 WHIRLPOOL 6ee9e1239eb5981bb66056256e4c3d1e49b1dd91a9eb988bbc3146cf2317c07aed15d8e1bb8929cadbb4b235cbee7f7bbe9bf45e2eb3283cff7f5598cf2f058b
DIST icedtea-bin-core-7.2.6.10-amd64.tar.xz 53414248 SHA256 332468fbfacd89cffd6f6f7f4860bbf9a4e49446e09d4a38154cef1f018a154d SHA512 11e2d094c3f53ffce8ddd639501d0ded25b991ede87521208da66cfe60c9d43ba1d5a0bb8b7985db5555796c1beaf931cc385a4c78910c1ddfc790322a678bc2 WHIRLPOOL e6a9a4b3043c53fb07d2b39bff08e13393a5cf515f901334397a3a6409efb79b98ac752830a6d73a7fa767e46589fc28d137c8422488b7b68b0da7a180e7e507
DIST icedtea-bin-core-7.2.6.10-x86.tar.xz 55334952 SHA256 717ebb14e834390206578c9ed487a03f3e80e663eb7c08d39dd05785641a1332 SHA512 4e0a8eb204d1144d9f784f0bc4de3f7ff6d84585c34c154f9f49b3bed2c2896ccbaadb016bd252c7f4d8402d4857f3541da1a953325d0bd962ff0674587c6d76 WHIRLPOOL 6d4f161aa8a403fd2517b390a4465c3513e470ed5ff9f8b5fdbfc659411668951dc336b972740d558f39b91234ab4e7cc764faa0ca59ee9a747685eed93422c3
-DIST icedtea-bin-core-7.2.6.8-amd64.tar.xz 53161352 SHA256 f96ef80de8568e3cd9d41c7829918e77c9705866e284e1390c94f68f911887a6 SHA512 833d586119cfa218e711bbccf33aaa4934bd4bc34839920af7ab2677b93e4c5ebe844c9cc293fb1aa47265695c9ac9673eea81d44fcc533118ccfcfa2aa490a3 WHIRLPOOL a438aa02fa1b3fec1129b06c43cad7990068798956a3880c8b71fc135e2ebab01dde9f3bf84c3ed44007b65f6e52e306e00933f8d9260f0550b6720945549301
-DIST icedtea-bin-core-7.2.6.8-x86.tar.xz 54834440 SHA256 c5867db7613cb73d94c0d413f00d1bc5e5563143977bdf046ca1bc42f00a28da SHA512 da511acc62225af3a3755e6dac7f0ffb47ed9eb4c6ce7faecde6850fd499cf9427504903d94b7efe5c5126095b0ac71dd5bbe401ff47ebd8026574f105b2b9c9 WHIRLPOOL 8471a3e60dbb75befeeb8f338165d3ae28b6fa3fb602f98ca5eaca4759ed8a447a728023853d3bbd04a822411dfdcaf45dcb55f6b2ba9beac6ccacba0ee3140e
-DIST icedtea-bin-core-7.2.6.9-amd64.tar.xz 53340768 SHA256 dc520389dc96e6b79ea7f7d72ec464c070977af5e17ab9843e84c406d884475e SHA512 2b7cc0fb6b1baea07c2bf429581868563f5b79cb0ff2f0d6ad7ae9fefd4ce99c9394b46ca41b04a345fe3bfa40d90654a1b30318ab1aae6e983ab5cca9571603 WHIRLPOOL 9a6781a662b7e46c5103c1098a2abc0c274bc0a3e3947437962630178647cba2a06ba3a649f5d2ba7c354a1430550e8a83cad0952e8879ce2997573b943c5817
-DIST icedtea-bin-core-7.2.6.9-x86.tar.xz 55025384 SHA256 0ea41e0bd36f23591be3a00f355ad0310e9a223892c10437b2f62ec846551d0f SHA512 a7d87789557532e9ad2ac36e836a5ea83357bfcede100e1225fa33258848f94d85cda59aae298bff3672b48b2ebdcc2efc72dab5078d3a168bdca920f00c3df7 WHIRLPOOL 95cb5658985d5e08233c0c6b6509c797b2b97464261ac42b3b2c01ba04d734aadb363401943b77842828cc1e5641bed198c850d56beee004be761b6669ef799d
DIST icedtea-bin-doc-3.4.0.tar.xz 11684272 SHA256 fb6d16f81bfc1b6d8c9bbf93a07797a3b667c7e3fbf6083292cfb858b6f58056 SHA512 06682cdb16fa7a49918f892aeb9ab6bf3fb4a4fc2b64cc555b38d38f826a70fa2451a5c549d0f1c113fc20f216d9ae3ab2fd81cd88ea79a14af94854e9ef3799 WHIRLPOOL 666aec67b8f1fe8d4bc2bdb0a5873ece59cebb44c480074d694365a04c40c17bc54913394fcbf6ce6257bac35e9e831217ec0806e63d9f7a66a97a480e6d4dbd
DIST icedtea-bin-doc-7.2.6.10.tar.xz 10614336 SHA256 e8a79fd42c8b6341df6dfc9a5a277aaecadcfe48e214988c900d1773313a95e2 SHA512 fa0748d0042f297527f5af11beccdad0b671225b8f258495ec93faa3f55b8669488575e53375ec71a8a8c75d17db4b26fd5980ce0381ed5ab598fb5c07c80af6 WHIRLPOOL 3f9f82c115869c5f849527485ef841d6b985139c3494e388a4d0a4a5c9adeba6c45aabe2da87d9717c692866a8baad0170f1059dd22d0911ba8b88e84f55f777
-DIST icedtea-bin-doc-7.2.6.8.tar.xz 10608092 SHA256 259f3e3bc826f93b5bab5720e21901ac1f17ef5807e9b8ff077c5315ee0275ae SHA512 84c741aea87ee9edbb4c54ee4dcecd2adc155f0598bbc1031fac5ed5e5c5828e259a839200b3f908d0928806a0c851ffcfa8aed4ec0486c11fb521a21173fafa WHIRLPOOL cadc1346bf2aeceabf60fac58d7a104012fb857962a9e7684071ca1319c2caf66d5909bfee5802d020db981db65cf58ffa70ecbf0a9ba40cfa5ba48797175d80
-DIST icedtea-bin-doc-7.2.6.9.tar.xz 10612564 SHA256 8b1674e37f5678aeb21c0b9ad6355aca21e03d699a8f1dc456b7a8fc7447e23c SHA512 6673ded54bd3719bcc3b53e91b426a3c71994d41dee674a5c25f4bf695fee47c77c8503313df6ab8e2c6055d779783550c70ce8e7a4d578c9e5b6af3bf9c0412 WHIRLPOOL 26243f77299e36f28303bc8dd762c2eb3fb24cad80338fc0af8a0d85d2b8bd0475a7e833fffcf0550c47c6540247f58448dd0dec0cccd3aa455b98f60a151e9c
DIST icedtea-bin-examples-3.4.0-amd64.tar.xz 1856216 SHA256 05d187bf937fb162ec828ae7fe214e739d4fb1d237320897eff5e196626c86af SHA512 0ec78903919ad524cdd0d9458c6c2ab437d38f2487807e8854e28df04a8126a43529f22080958e90ec16d7a0d9c72d01570058b383e507b2f1a96b7b7d9578e3 WHIRLPOOL 8dfaed413f1f722458e3b1c5616beacebe65b9a8dbec4e892e0c3b69135a0fbc3c2af2aba19ec0a2841a15bdbab4e051275e1ef84a2c870c6e2c6e11e3be85cb
DIST icedtea-bin-examples-3.4.0-arm.tar.xz 1840060 SHA256 546f99327d2dc1908a057842781c91693bd92c18663e4af65ab82da929de64cf SHA512 0bd3a13f77e69099b11c0dfee8437b43d64bee4f9ed411af523042c5a53ebff592832e5ff8973bfd9c2858789938b1cabbd230e9b6498721249315b7442a7d9e WHIRLPOOL e9096453f7d8fbde8636981aa140d7606380c05b31d8b1fa03430438f4650bc87dc51e890b8416d2fc06922a8e32f7ce32cb8ef0fdcf89dc0fc6706392904a2b
DIST icedtea-bin-examples-3.4.0-ppc64.tar.xz 1848048 SHA256 0fe715e84b6f405dc4a24e4c0e958b4691938c12452452747eccee3983c74967 SHA512 89565814818b8a07db3e65b49fd1d750521018ae9acc7800184fe511e327b904fdd6d91c7d7bdf85243685719ee9981abd19d4a727c12b936d75acc57ed80f76 WHIRLPOOL dd8a28b15c32c35c9bdfba9a24b6417ea984c15395de106e432b99dd2874a2aa90abd62aaf11f8ad822418ec1bf0068126c433115ee65b5e41d7fbd062538025
DIST icedtea-bin-examples-3.4.0-x86.tar.xz 1862844 SHA256 e61b53cb1320492ddadcf428ffc15f9a6178ebcffbeefc2bce8a870021ed809a SHA512 128f6afab5f634bab49c11e41b2e763629a728364031b5e27ab84240878b0c07cabaf94b3b7c43182fd6776a48c341074957b250f036ce42fae84754339282e3 WHIRLPOOL 37f60ac345a34dc708de62b89779eaf010438a18f49d6d3cc07b0bed8c080596e01169185c4d1e8579efa83559bb98d8d0c56694507530d53059dc0bd0105701
DIST icedtea-bin-examples-7.2.6.10-amd64.tar.xz 1796152 SHA256 a50a708e234055912ef8f7374d0d9a86f5dae80efd760ce0c58fb7fb9529dd4f SHA512 f3f2322d6c631130a21320fc4aa82f3c927ef9b877e557adc149d09794c859cd281542b71cacc761516eccf8b5b18ab9a7cd53a37b62cb591c738f5d60fb2301 WHIRLPOOL f47782336d8e6c1539a210f395d7bb999a7fd473ca9ef610fbb873d901a8674aa16bf05db7596a778585cac5de45cc38eb11dd35b5ba620f655facd07df02121
DIST icedtea-bin-examples-7.2.6.10-x86.tar.xz 1797320 SHA256 2f4de71a29f92b54b151640620853bd71cfa7ee1bd3e4713ed745ada353801aa SHA512 afa5e924bfff796a13e096ef94c708b9192350e86746fe9c86874db2a937add8050daddfba5a50109a6ebc226fa62f66dfc019d27e4053364bfe9249e40a87da WHIRLPOOL 1f6214b2f9fd777ed10a4f5c3f0830f0f3f171d032fffb1ff281f3eea648b9b7994de31fcd7ad65d734bb45d7816819c3d3b34657d52a6b91fa4aea093904464
-DIST icedtea-bin-examples-7.2.6.8-amd64.tar.xz 1796596 SHA256 115bc46dcd307ca9abb264f3b5a2e541c5e4e12fddd7a522d066b0cff249ca42 SHA512 f3fe08e294c1aee2d64a89ab69cb002fd01b640289bc9b68a84aa5261ef4a7432b6be245a144fba628a701354079a1e2d2e0676fd0fa2a1febc612936e157492 WHIRLPOOL d74bb84a95200606e04816f669ddfede9f1991b1df755e1a9cddc91c26301a1ae353470c7e209468f7acae4d34ceed35ed6445d356510fdfa1a2e793a43995d3
-DIST icedtea-bin-examples-7.2.6.8-x86.tar.xz 1796976 SHA256 50c9601c379d51d732ad7e349d2b873973ff2b1f383d7fade4fb2139eee15e8f SHA512 ab3101a86fcc62c2ca159830dffaff561f54cf1dc75ebce45efd72341881c97b078b8213040f70e41b421b17d81c3fa093371be2e160bcfaca7d5ef6ad2dfd31 WHIRLPOOL e2ebfc5fc099e03eab164d09d7ad13db8b97fcb6514961e5b0203bcb42f4ba28a45aadcbcbccf9d6933beb98c6929cecd6f61a51e5260d7c1a078d8d5535f921
-DIST icedtea-bin-examples-7.2.6.9-amd64.tar.xz 1796792 SHA256 edb89de7176d9a155e75034c737666aefceadc9f8026845c7b0175234bb73532 SHA512 5a456c4a3dc27161c0da5fac7f757e59beafafe0ce3d2adf36901f71955cc8075d52507e418f8cd1346d3381754ce5e4ca4a1d40eacbc2f6a37d52abd326dbf8 WHIRLPOOL 2dd6162a0f425a52ec4c4ca61ecf3e431f35da3c6565b0917901dedcdd0a763aee051b24269129975491f396a896b340b5387d8c74ef6e86685dbdf6071cfa50
-DIST icedtea-bin-examples-7.2.6.9-x86.tar.xz 1796468 SHA256 e766aca0dce9ef7e43c4866f7cbd7b9f780a444385259b0d8696f0737ccee65a SHA512 36ed733a1fddca19f6ed23ce66abf77864d1d08a4aed21712cd58aade8699ea39a2113dc74c5404cd875c2aa49b6ca98e02fa8cff82970926a9eb676e2d2f438 WHIRLPOOL 0fe6951506e49493d1ef10c0724089a19e3fe04069c0979d9b91e0428ccab3f382757db407f03866fc80269bd4098004df57759e785f1fd0e48adac24def04d3
DIST icedtea-bin-src-3.4.0.tar.xz 45704380 SHA256 c5a91481c3830148041404785316a203e37cbc3f8673cc97feccff443a4d61a5 SHA512 00cf87bbcb271202aaa08efdb3d804f92a5a8f158f998f689f0360a715485180c767fead34cbfdb8230465427227edf9c16c8779ee010301f25a7a2ad8a06c54 WHIRLPOOL bf80985e409636a0d0bab7849efd48eb19ea8bfaac75663e106129c9b2f511865f3ccaac4cd2a9f2402ae70d905aad2efd6a3edab2dcd0503f423f3ba645d4b7
DIST icedtea-bin-src-7.2.6.10.tar.xz 40201568 SHA256 354b76311fb9e28857dd64c3ca4b53504f5acfaa567d424aa2b24e73b692316a SHA512 c9310a5e776435f2192b046372f051a974e1c9b3be9265a51b344cb46ed82ff4d6cc5870f04ff7a3adb300aadbdbc7b9fda808b890a3a69d7b3ea960a7dddf54 WHIRLPOOL 107b64bfff32317e0439d38a5fbbc79c211048935d00abfebc541e0274123048a59b033e31b07c63156f1726ee127996f4ac0fa95fd5bf2238256bea09fd968c
-DIST icedtea-bin-src-7.2.6.8.tar.xz 40105456 SHA256 9fcc1ebcfa3518804c45215f4e83ea282a87dff2b4b52461cd878c77a5812b2d SHA512 3ba29db8f6edeb3433d03a1b679ea21ead501c7e343fdee15531ff0e86061bca3e37498c75362aaee319424dc6464803659c24089def3f3c579bcf86fe7a6ba6 WHIRLPOOL d0ab4d61ba741b9955deb958927efff871c8941127707dee860a4317c1fdf17301b456739591a81f998d9a2bdaf55eccdd26717df228e9c70960b101e8dd7ab3
-DIST icedtea-bin-src-7.2.6.9.tar.xz 40197760 SHA256 3e59c465de83f5a9f9fb66da1c3af0a0d5fc5da76285ad936846bc675f7823e5 SHA512 392de5356226daff9b91fb79813dce3a8f383136637c5d7f2647ab3cfd664dbc3eadd65b1387c7bc74c9e476c1bed4a02b0efc10445aba27d1ba60d746f892a9 WHIRLPOOL f2b83a21476e611747de33a06ada376bfe15a45336be7ab287db5fabfd2999defa73b12666a4cc4a7fa04ae893e1a0447f05951dbac49cb9fdcc32697c907125
diff --git a/dev-java/icedtea-bin/files/icedtea-bin-7.env b/dev-java/icedtea-bin/files/icedtea-bin-7.env
deleted file mode 100644
index 2bbe777a52b5..000000000000
--- a/dev-java/icedtea-bin/files/icedtea-bin-7.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="IcedTea JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.7"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/files/icedtea-bin-8.env b/dev-java/icedtea-bin/files/icedtea-bin-8.env
deleted file mode 100644
index 91343cfd1383..000000000000
--- a/dev-java/icedtea-bin/files/icedtea-bin-8.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VERSION="IcedTea JDK @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@"
-JAVAC="${JAVA_HOME}/bin/javac"
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea-bin-@PV@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.8"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar:${JAVA_HOME}/jre/lib/jfr.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild
deleted file mode 100644
index 4a45fba03e24..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.8.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-KEYWORDS="-* amd64 x86"
-
-inherit java-vm-2 multilib-build prefix toolchain-funcs
-
-BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
- source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
- multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )"
-
-for abi in amd64 x86; do
- SRC_URI+="
- ${abi}? (
- ${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
- examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
- )"
-done
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="7"
-
-IUSE="+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.42:2%
- >=dev-libs/nss-3.16.1-r1%
- >=dev-libs/nspr-4.10%
- >=media-libs/fontconfig-2.11:1.0%
- >=media-libs/freetype-2.5.5:2%
- >=media-libs/lcms-2.6:2%
- >=sys-libs/zlib-1.2.8-r1%
- virtual/jpeg:62%
- alsa? ( >=media-libs/alsa-lib-1.0% )
- cups? ( >=net-print/cups-2.0% )
- gtk? (
- >=dev-libs/atk-2.16.0%
- >=x11-libs/cairo-1.14.2%
- x11-libs/gdk-pixbuf:2%
- >=x11-libs/gtk+-2.24:2%
- >=x11-libs/pango-1.36%
- )
- !headless-awt? (
- >=media-libs/giflib-4.1.6-r1%
- =media-libs/libpng-1.6*%
- >=x11-libs/libX11-1.6%
- >=x11-libs/libXcomposite-0.4%
- >=x11-libs/libXext-1.3%
- >=x11-libs/libXi-1.7%
- >=x11-libs/libXrender-0.9.8%
- >=x11-libs/libXtst-1.2%
- )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- >=sys-devel/gcc-4.9.3[multilib?]
- >=sys-libs/glibc-2.22[multilib?]
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- selinux? ( sec-policy/selinux-java )
- multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
- !multilib? ( ${RDEPEND//%/} )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_prepare() {
- default
-
- if ! use alsa; then
- rm -v */jre/lib/*/libjsoundalsa.* || die
- fi
-
- if use headless-awt; then
- rm -vr */jre/lib/*/{xawt,libsplashscreen.*} \
- */{,jre/}bin/policytool */bin/appletviewer || die
- fi
-
- if ! use gtk; then
- rm -v */jre/lib/*/libjavagtk.* || die
- fi
-
- local lib=${P}-${ABI}/jre/lib
-
- # NSS is already required because of SunEC. The nss flag in the
- # icedtea package just comments or uncomments this line.
- sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" \
- ${lib}/security/java.security || die
-
- if [[ -n "${EPREFIX}" ]]; then
- # The binaries are built on a non-prefixed system so the
- # fontconfig needs to have prefixes inserted.
- rm ${lib}/fontconfig.Gentoo.bfc || die
- hprefixify ${lib}/fontconfig.Gentoo.properties.src
- mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
- fi
-
- # Fix the RPATHs, except on arm.
- # https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
- # https://github.com/NixOS/patchelf/issues/8
- if use arm; then
- ewarn "The RPATHs on these binaries are normally modified to avoid"
- ewarn "conflicts with an icedtea installation built from source. This"
- ewarn "is currently not possible on ARM so please refrain from"
- ewarn "installing dev-java/icedtea on the same system."
- else
- local old="/usr/$(get_libdir)/icedtea${SLOT}"
- local new="${EPREFIX}/opt/${P}"
- local elf rpath
-
- for elf in $(find -type f -executable ! -name "*.cgi" || die); do
- rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
- if [[ -n "${rpath}" ]]; then
- patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
- fi
- done
- fi
-}
-
-multilib_src_install() {
- local dest="/opt/${P}-${ABI}"
- dest="${dest/%-${DEFAULT_ABI}/}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- if multilib_is_native_abi; then
- dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r ${P}/doc/html
-
- # doins doesn't preserve executable bits.
- cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
- if use examples; then
- cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
- fi
-
- if use source; then
- cp ${P}/src.zip "${ddest}" || die
- fi
-
- # Use default VMHANDLE.
- java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
- else
- local x native=$(get_system_arch ${DEFAULT_ABI})
-
- for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
- dodir "${dest}"${x%/*}
- cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
- done
-
- for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
- [[ ${x##*/} = ${native} ]] && continue
- [[ -e "${ddest}"/${x#*/} ]] && continue
- dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
- done
-
- # Use ABI-suffixed VMHANDLE.
- VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
- fi
-
- # Both icedtea itself and the icedtea ebuild set PAX markings but we
- # disable them for the icedtea-bin build because the line below will
- # respect end-user settings when icedtea-bin is actually installed.
- java-vm_set-pax-markings "${ddest}"
-
- # Each invocation appends to the config.
- java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
- if use multilib; then
- multilib_foreach_abi multilib_src_install
- else
- multilib_src_install
- fi
-
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.9.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.9.ebuild
deleted file mode 100644
index 67f92fa50b9e..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.9.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-KEYWORDS="-* ~amd64 x86"
-
-inherit java-vm-2 multilib-build prefix toolchain-funcs
-
-BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
-SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
- source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
- multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )"
-
-for abi in amd64 x86; do
- SRC_URI+="
- ${abi}? (
- ${BASE_URI}/${PN}-core-${PV}-${abi}.tar.xz
- examples? ( ${BASE_URI}/${PN}-examples-${PV}-${abi}.tar.xz )
- )"
-done
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="7"
-
-IUSE="+alsa cjk +cups doc examples +gtk headless-awt multilib nsplugin nss pulseaudio selinux source +webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-RDEPEND=">=dev-libs/glib-2.42:2%
- >=media-libs/fontconfig-2.11:1.0%
- >=media-libs/freetype-2.5.5:2%
- >=media-libs/lcms-2.6:2%
- >=sys-libs/zlib-1.2.8-r1%
- virtual/jpeg:62%
- alsa? ( >=media-libs/alsa-lib-1.0% )
- cups? ( >=net-print/cups-2.0% )
- gtk? (
- >=dev-libs/atk-2.16.0%
- >=x11-libs/cairo-1.14.2%
- x11-libs/gdk-pixbuf:2%
- >=x11-libs/gtk+-2.24:2%
- >=x11-libs/pango-1.36%
- )
- !headless-awt? (
- >=media-libs/giflib-4.1.6-r1%
- =media-libs/libpng-1.6*%
- >=x11-libs/libX11-1.6%
- >=x11-libs/libXcomposite-0.4%
- >=x11-libs/libXext-1.3%
- >=x11-libs/libXi-1.7%
- >=x11-libs/libXrender-0.9.8%
- >=x11-libs/libXtst-1.2%
- )
- nss? (
- >=dev-libs/nss-3.16.1-r1%
- >=dev-libs/nspr-4.10%
- )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- >=sys-devel/gcc-4.9.3[multilib?]
- >=sys-libs/glibc-2.22[multilib?]
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- selinux? ( sec-policy/selinux-java )
- multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
- !multilib? ( ${RDEPEND//%/} )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
- nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-S="${WORKDIR}"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_prepare() {
- default
-
- if ! use alsa; then
- rm -v */jre/lib/*/libjsoundalsa.* || die
- fi
-
- if use headless-awt; then
- rm -vr */jre/lib/*/{xawt,libsplashscreen.*} \
- */{,jre/}bin/policytool */bin/appletviewer || die
- fi
-
- if ! use gtk; then
- rm -v */jre/lib/*/libjavagtk.* || die
- fi
-
- local lib=${P}-${ABI}/jre/lib
-
- # The nss flag in the icedtea package just (un)comments this line.
- sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" \
- ${lib}/security/java.security || die
-
- if [[ -n "${EPREFIX}" ]]; then
- # The binaries are built on a non-prefixed system so the
- # fontconfig needs to have prefixes inserted.
- rm ${lib}/fontconfig.Gentoo.bfc || die
- hprefixify ${lib}/fontconfig.Gentoo.properties.src
- mv ${lib}/fontconfig.Gentoo.properties{.src,} || die
- fi
-
- # Fix the RPATHs, except on arm.
- # https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
- # https://github.com/NixOS/patchelf/issues/8
- if use arm; then
- ewarn "The RPATHs on these binaries are normally modified to avoid"
- ewarn "conflicts with an icedtea installation built from source. This"
- ewarn "is currently not possible on ARM so please refrain from"
- ewarn "installing dev-java/icedtea on the same system."
- else
- local old="/usr/$(get_libdir)/icedtea${SLOT}"
- local new="${EPREFIX}/opt/${P}"
- local elf rpath
-
- for elf in $(find -type f -executable ! -name "*.cgi" || die); do
- rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
- if [[ -n "${rpath}" ]]; then
- patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
- fi
- done
- fi
-}
-
-multilib_src_install() {
- local dest="/opt/${P}-${ABI}"
- dest="${dest/%-${DEFAULT_ABI}/}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- if multilib_is_native_abi; then
- dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r ${P}/doc/html
-
- # doins doesn't preserve executable bits.
- cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
-
- if use examples; then
- cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
- fi
-
- if use source; then
- cp ${P}/src.zip "${ddest}" || die
- fi
-
- # Use default VMHANDLE.
- java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
- else
- local x native=$(get_system_arch ${DEFAULT_ABI})
-
- for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
- dodir "${dest}"${x%/*}
- cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
- done
-
- for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
- [[ ${x##*/} = ${native} ]] && continue
- [[ -e "${ddest}"/${x#*/} ]] && continue
- dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
- done
-
- # Use ABI-suffixed VMHANDLE.
- VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
- fi
-
- # Both icedtea itself and the icedtea ebuild set PAX markings but we
- # disable them for the icedtea-bin build because the line below will
- # respect end-user settings when icedtea-bin is actually installed.
- java-vm_set-pax-markings "${ddest}"
-
- # Each invocation appends to the config.
- java-vm_revdep-mask "${EPREFIX}${dest}"
-}
-
-src_install() {
- if use multilib; then
- multilib_foreach_abi multilib_src_install
- else
- multilib_src_install
- fi
-
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
diff --git a/dev-lang/go/go-1.8.3.ebuild b/dev-lang/go/go-1.8.3.ebuild
index 7bd87301f7c4..b01c31dca86b 100644
--- a/dev-lang/go/go-1.8.3.ebuild
+++ b/dev-lang/go/go-1.8.3.ebuild
@@ -39,7 +39,7 @@ case ${PV} in
case ${PV} in
*_beta*|*_rc*) ;;
*)
- KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+ KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
# The upstream tests fail under portage but pass if the build is
# run according to their documentation [1].
# I am restricting the tests on released versions until this is
diff --git a/dev-lang/lfe/Manifest b/dev-lang/lfe/Manifest
index 85ded70c4b8f..ee78e1a9b45d 100644
--- a/dev-lang/lfe/Manifest
+++ b/dev-lang/lfe/Manifest
@@ -1,4 +1,4 @@
DIST lfe-0.10.1.zip 296228 SHA256 05de4cd5a15ea37e505049c5d7e9c75fbb61ce1bcabec39d762df3dbeda7d814 SHA512 94719b42ecf6dc5505ea649df00b255b1e901d6104426192f34692e2f7bc85940b96b39fd1bfa00577b63c17e10d8fd51d3de743c02d8ac2263abe2fb47d4498 WHIRLPOOL a3c4420421afd45bf6a0908a3a0f42319a094d4d186636eebe5f58b4f2d11192c0a7cbc6eee7dbc1aa48f326fed8c1869932e4d277c41387f790006675f4985d
-DIST v0.7a.zip 216133 SHA256 c494135bf50a8dd62723e026a6b4cf4c5c4d6b8a01e59b6e41bbb6daf5c25dd3 SHA512 93f1b0e81275af21d3dbee73f364f4b67d4ce2d6beb7fe2c17e17d5f5330ec8762d63978ae291267ddd92d311b2ad7d2572854b5e3da9c884f4c706e23551aaa WHIRLPOOL 44067ac8e529d54e66cb18d0ae11c3f7d3a489b530f995e90eb000aae9e212ce79abc57388c515a681265a0242f568ae7efb3e1307e937c3aad55438b6d7b0da
-DIST v1.0.zip 303894 SHA256 1f3d9fe22bbaa1c5df50ba03595a0aa764e708f6eb52bcb5557a69426ca60114 SHA512 752ac6b142db95f63ba88ee92de28f846f3a7ccd605eea0da73da24ed0b7b4f0a06fb48697ea6064ccc28dda225ecd01843386085629b6b5465b09df66722bce WHIRLPOOL f4ca4ae467a2e534597e5f211c5f0758de27dc9a5613976ac3c86a22071ea8305c03f0dda17f9d2c61af3e45ca57152bd6b566289b8d25c3dcbe4a8e3bf25f08
-DIST v1.1.1.zip 386864 SHA256 6ab0581f3a61541a7afb507a3cfe1506b688c8a88890239dad25cb93823aec30 SHA512 8660716a73126615bd0cde161a780cc49ba57718afd820dbe891da5e1d9ec2f52cc1864159dcedba1c674ccfef42b9662ec8e0bbfe82c10798527ae0979b8f8e WHIRLPOOL 1930da778ec2c03ddc0033664d5a30ba2c000bffe68416775348466150aba8c5ad275b0a62a3520d436999e7f57a0a4b04bacb00d372f24e3b18ea52980b3d0b
+DIST lfe-0.7a.zip 216133 SHA256 bb7df590c71f04f9d1a14bb027e457036e6e2a938d71ad0ce02ea6da1188d03f SHA512 f8e8dd080142aed77109deed7627bcd6c9a90d4bddcc2207b5e3ffa0e744c889ac4890d18040e7bde239e1c69c6251819723637a8b9ad9c0cce01787c6e0e1b0 WHIRLPOOL 61b9f3dad007c2bded22ae61f871cbd83afa5e6e338fcc22eaf08e2ef19315e43941c006a60f8e2a2b1d030e16328487c95ffcc440768f7921b25564e480a523
+DIST lfe-1.0.zip 303894 SHA256 1f3d9fe22bbaa1c5df50ba03595a0aa764e708f6eb52bcb5557a69426ca60114 SHA512 752ac6b142db95f63ba88ee92de28f846f3a7ccd605eea0da73da24ed0b7b4f0a06fb48697ea6064ccc28dda225ecd01843386085629b6b5465b09df66722bce WHIRLPOOL f4ca4ae467a2e534597e5f211c5f0758de27dc9a5613976ac3c86a22071ea8305c03f0dda17f9d2c61af3e45ca57152bd6b566289b8d25c3dcbe4a8e3bf25f08
+DIST lfe-1.1.1.zip 386864 SHA256 6ab0581f3a61541a7afb507a3cfe1506b688c8a88890239dad25cb93823aec30 SHA512 8660716a73126615bd0cde161a780cc49ba57718afd820dbe891da5e1d9ec2f52cc1864159dcedba1c674ccfef42b9662ec8e0bbfe82c10798527ae0979b8f8e WHIRLPOOL 1930da778ec2c03ddc0033664d5a30ba2c000bffe68416775348466150aba8c5ad275b0a62a3520d436999e7f57a0a4b04bacb00d372f24e3b18ea52980b3d0b
diff --git a/dev-lang/lfe/lfe-0.7.ebuild b/dev-lang/lfe/lfe-0.7.ebuild
index 3c34508bc7d7..6982d4eefd2d 100644
--- a/dev-lang/lfe/lfe-0.7.ebuild
+++ b/dev-lang/lfe/lfe-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit multilib
DESCRIPTION="Lisp-flavoured Erlang"
HOMEPAGE="http://lfe.github.io/"
-SRC_URI="https://github.com/rvirding/lfe/archive/v0.7a.zip"
+SRC_URI="https://github.com/rvirding/lfe/archive/v0.7a.zip -> ${P}a.zip"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-lang/lfe/lfe-1.0.ebuild b/dev-lang/lfe/lfe-1.0.ebuild
index 037bb91da94d..bfb8337090ea 100644
--- a/dev-lang/lfe/lfe-1.0.ebuild
+++ b/dev-lang/lfe/lfe-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit multilib
DESCRIPTION="Lisp-flavoured Erlang"
HOMEPAGE="http://lfe.github.io/"
-SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip"
+SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip -> ${P}.zip"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-lang/lfe/lfe-1.1.1.ebuild b/dev-lang/lfe/lfe-1.1.1.ebuild
index ef6774fa2e93..bfb8337090ea 100644
--- a/dev-lang/lfe/lfe-1.1.1.ebuild
+++ b/dev-lang/lfe/lfe-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit multilib
DESCRIPTION="Lisp-flavoured Erlang"
HOMEPAGE="http://lfe.github.io/"
-SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip"
+SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip -> ${P}.zip"
LICENSE="BSD-2"
SLOT="0"
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index c9dc5912aec9..e40a23cc625a 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -5,3 +5,4 @@ DIST MoarVM-2017.01.tar.gz 3718510 SHA256 2074693a42a7f31218bf69b70fd5b73d6fd1a1
DIST MoarVM-2017.02.tar.gz 3775575 SHA256 3a486ca5d19a8e6256e379655ec9ed09ff2f1c4f6a57a7969a278819b5bcb4eb SHA512 9b15eb62863f828f4ec3d97c6668b26c51abb50dd277a63e54e919782f5efd1db1a14864b1ac4b8cf1244ee1012ef1c06a802815eaae5dc404d1ece31503ce4a WHIRLPOOL 3878445ef324fb06afce0c962dde5ff1ba0cad9b44d899c3a432b840de7936581bf16d50b5c28c92f9807bc5ac481ebc2b8bdc3e3c6b973e228747662bd163b2
DIST MoarVM-2017.03.tar.gz 4361623 SHA256 c562a91d462a15f3a964969ddea8b33eae4558e3b25d9e2105f81c259249dbee SHA512 2dfc1a75876d2744d74b1c2df6cbdec1fb73650bde755a534764ca564a3a7c9435691e60ee15f78df798e276c0af3c4db19e4f67df058a79aaa201aab3f96443 WHIRLPOOL 060204b69e91822dc2bb3fe0d6eaeaf9e7331b2e41d058e2025d0c3ffeed5d888acc14ca6ad820bb6f8ea0a652db5096f1598bd11c14c5e3f3699aa9ddb7de23
DIST MoarVM-2017.04.tar.gz 4383487 SHA256 7838c92e50afe75669f751db8e15f06666e32d5951d026a89de28f7c7a8c347f SHA512 52cac6743f3d3005d388261c676405ba27db184ed1b4498d81c09ad844ef8b9a7810a4a210537b55c699ea838222cc667fbdff2677f62973f571112a6925d0df WHIRLPOOL 6e8c3ac6d7bb018133acf5e31ce469f2df966ea91f12219ce1bc6788e7ac4f7d68fbf5686943bdb161aa8c525b3f7f1480cc38ab4499ecdfbfba71055eb87476
+DIST MoarVM-2017.05.tar.gz 4386504 SHA256 7cb9b7a871b14ac9b6cddc57e646d277177c4b3b21220e6fbc204084a15a4e41 SHA512 a8fc79a41c30bc79e5d872c7c822cc658c258a2e8fffcfd053afe78fc985646db76af40dc2d610001819953784d9bf4e6c6f20a5e5d7de3027f9d1a3d1279edb WHIRLPOOL e27ef8969170db8c6a4c38cb3d2dcb33895292f233ff000df9dc43533f3076bd6db1fa8344b62ca551e23454c1ac72bc959a322a09f45be074c7965886a84c6a
diff --git a/dev-lang/moarvm/moarvm-2017.05.ebuild b/dev-lang/moarvm/moarvm-2017.05.ebuild
new file mode 100644
index 000000000000..44513e80382d
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2017.05.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+ S="${WORKDIR}/${P}"
+else
+ SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+ dev-libs/libtommath
+ dev-libs/libuv
+ jit? ( dev-lang/lua:0[deprecated]
+ dev-lua/LuaBitOp )
+ virtual/libffi"
+DEPEND="${RDEPEND}
+ clang? ( >=sys-devel/clang-3.1 )
+ dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+ use doc && DOCS+=( docs/* )
+ local myconfigargs=(
+ "--prefix=/usr"
+ "--has-libtommath"
+ "--has-libuv"
+ "--has-libatomic_ops"
+ "--has-libffi"
+ "--libdir=$(get_libdir)"
+ "--compiler=$(usex clang clang gcc)"
+ "$(usex asan --asan)"
+ "$(usex debug --debug --no-debug)"
+ "$(usex jit --lua=/usr/bin/lua --no-jit)"
+ "$(usex optimize --optimize= --no-optimize)"
+ "$(usex static-libs --static)"
+ "$(usex ubsan --ubsan)"
+ )
+ use optimize && filter-flags '-O*'
+
+ perl Configure.pl "${myconfigargs[@]}" || die
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index cdbe2743505c..7b742e903a5d 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -5,3 +5,4 @@ DIST nqp-2017.01.tar.gz 3654574 SHA256 6b407aa2a908cc66dc60b8a1b5a7a76990afcecd2
DIST nqp-2017.02.tar.gz 3657637 SHA256 cf2f094296fc7706b2c2f0037331dd624dcdcb2cb41239883c8297b3b1fd38ce SHA512 4781fccfbe0bbcbb4529c8ed540263fc620bfcff2923c39dabd437824353caba6d2627082312bb7841b40b01caaf39282d6af9fcaa18601f9647e769e220d369 WHIRLPOOL d97b5aa9e119bf85fbc8c8da5954466455ff5b26580e61f668ae539ccf6ec4284cdd5be3afa2da053df9459903a3fbe6f0bebc9a47213e9e1e46ecfec943c1ef
DIST nqp-2017.03.tar.gz 3674277 SHA256 2dce67d6a4388a177a0a3c46b95717a47f31c705b0d8f825f936f65358b655e0 SHA512 8ca0be68785d8f0923d1ef63eca7eb9d7075c475b836911117d62f5030398933e0711bfc5b0ec082e4b4720d6f0fd0f1a74b8c35510f0fffe1e36a972937cd67 WHIRLPOOL 3f2a7b0ea4a7ac5ba1eefd4d4a3453a6c02b10d7c0e93570bdb89e33eadba29f664660024b532ed9a41718db767414b0e1ab362263ecd88490b9a1045d370070
DIST nqp-2017.04.tar.gz 3693688 SHA256 7c270fc91bb869094fdc981236beefd4e8ecad8b8f4129e7c83abeec67880634 SHA512 f68e3f63a57bffbaa94267e8da59336cb0c59b1b2538996619fa96d964062e13536208432cb778a717c65438c006a490d8cb5355c899add7146b54664b696fd9 WHIRLPOOL 7e9a92a82f80f3fac672fac58d9bb7014b2ab39de585e2cb43326b1b9a7982d5af72cae17db7dd8e8803c59dac25e66e764846e72e3b6783534e98771ef5ebcb
+DIST nqp-2017.05.tar.gz 3698847 SHA256 e5326a0a4c791f70802cadfc1a71ba119f0da6697b5c57ac6afcc367e21ee1ca SHA512 2679c48160179e5ed96ceba218a54e0841d89ea9d4ec931e6bd9fabd4541f48da3c3c66b866bb1d11311e9a342fbd77a694f88cb4256f8009a51ec1fbcef849f WHIRLPOOL d213dd6986a7fd1d81fad26c0dfc4112f443836de5c47a88c80dddf301e0dcaadf87228070dc76871871af0d55759d27ecb8cc24c72921263ef6190ca680e18f
diff --git a/dev-lang/nqp/nqp-2017.05.ebuild b/dev-lang/nqp/nqp-2017.05.ebuild
new file mode 100644
index 000000000000..e2dfdc734d8e
--- /dev/null
+++ b/dev-lang/nqp/nqp-2017.05.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+ inherit vcs-snapshot
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+ dev-java/asm:4
+ dev-java/jline:0
+ dev-java/jna:4
+ )
+ moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.7 )
+ dev-lang/perl"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+ ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+ ewarn "already being installed. So if it fails, try uninstalling both"
+ ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+java_prepare() {
+ # Don't clean stage0 jars.
+ einfo "Cleaning upstream jars"
+ java-pkg_clean 3rdparty/
+
+ # Don't use jars we just deleted.
+ sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+ src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+ MULTIBUILD_VARIANTS=()
+ use moar && MULTIBUILD_VARIANTS+=( moar )
+ use java && MULTIBUILD_VARIANTS+=( jvm )
+
+ multibuild_copy_sources
+
+ # This will pull in conditional java_prepare
+ default
+}
+
+nqp_configure() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ local myconfargs=(
+ "--backend=${MULTIBUILD_VARIANT}"
+ "--prefix=/usr" )
+
+ perl Configure.pl "${myconfargs[@]}" || die
+ popd || die
+}
+
+nqp_compile() {
+ if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+ JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+ elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+ emake -j1 \
+ -C "${BUILD_DIR}"
+ fi
+}
+
+nqp_test() {
+ emake -j1 \
+ -C "${BUILD_DIR}" \
+ test
+}
+
+nqp_install() {
+ # This is the actual reason we need multibuild.eclass.
+ # We need to distinguish the install procedure for MoarVM and JVM backends.
+ case "${MULTIBUILD_VARIANT}" in
+ moar)
+ emake \
+ DESTDIR="${ED}" \
+ -C "${BUILD_DIR}" \
+ install
+ ;;
+ jvm)
+ pushd "${BUILD_DIR}" > /dev/null || die
+ # Set JAVA_PKG_JARDEST early.
+ java-pkg_init_paths_
+
+ # Upstream sets the classpath to this location. Perhaps it's
+ # used to locate the additional libraries?
+ java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+ insinto "${JAVA_PKG_JARDEST}"
+ local jar
+
+ for jar in *.jar; do
+ if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+ # jars for NQP itself.
+ java-pkg_dojar ${jar}
+ else
+ # jars used by NQP.
+ doins ${jar}
+ fi
+ done
+
+ # Upstream uses -Xbootclasspath/a, which is faster due to lack
+ # of verification, but gjl isn't flexible enough yet. :(
+ java-pkg_dolauncher ${PN}-j --main ${PN}
+ dosym ${PN}-j /usr/bin/${PN}
+ dobin tools/jvm/eval-client.pl
+ popd > /dev/null || die
+ ;;
+ *)
+ die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+ ;;
+ esac
+}
+
+src_configure() {
+ multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+ multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+ multibuild_foreach_variant nqp_install
+
+ dodoc CREDITS README.pod
+ use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/perl/perl-5.24.1-r2.ebuild b/dev-lang/perl/perl-5.24.1-r2.ebuild
index ff54f77c3449..a6707ed295a4 100644
--- a/dev-lang/perl/perl-5.24.1-r2.ebuild
+++ b/dev-lang/perl/perl-5.24.1-r2.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.perl.org/"
LICENSE="|| ( Artistic GPL-1+ )"
SLOT="0/${SHORT_PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="berkdb debug doc gdbm ithreads"
RDEPEND="
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index 9e66647da6b1..f92ae729eff3 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -5,3 +5,4 @@ DIST rakudo-2017.01.tar.gz 2868425 SHA256 2651f60f3123aeb015e9fa11d55c5b506abb88
DIST rakudo-2017.02.tar.gz 2886120 SHA256 475aafbcdaf4c9ed0ac43cafb86e94a204b7124b394b94f3a7657820f3801848 SHA512 67dd0686c0604aebf79e6499c1e6b332e3878a59b8eec25d4993caa00e673597a77391fa69b928b0cec1ab0c6d281a83cfef72f79ed512ee74701712b1446b10 WHIRLPOOL 98fb76e270e36f84f7556aee6a7725f6c8ed2119ae8c12cafa18223ef711b3a5a0a780cfdb8079077214b7e142207dff88ad82b89a1a1bb7ec48a7da40486284
DIST rakudo-2017.03.tar.gz 2901724 SHA256 2dabc619c7ba3a935dd1b12caa8151cd220f18d516d807e268787dd10eefad09 SHA512 1f38db076cfa6932093d96b08573ffa691f7e68a676ce56826d64fc36828c9712f717df0c569d860b364aff587f974854bd47d5fb77b2d0c49e7e0d986466be0 WHIRLPOOL 8662b740870335d75be2b4089c56be565c3cbde673bcf041130c337edb01cf4c6b025112acfbaf4f616a2cd3f023a08309ec76eb2b54cf25248b09b3e4585f9c
DIST rakudo-2017.04.2.tar.gz 2937523 SHA256 3085e07241d8c483b8d9c7ca65dbf03c02fc8d22a56f9443e5316f6bd9673b7a SHA512 e4a87b7c8b1b0a51ffa3c20150b0cd8623b8a54d55d3c5bbb369f0ccbc732cd809247a8a4662838b95a8783c750009ea3e5b9db113d699a08a8b3c198e0534d7 WHIRLPOOL 2d2d45e04e7662c44296cd661b3d83311df64c44405967ed131970231c0bd57d6cf30d0363fe36102a5f8bda3f8aa0826bb70e53b593993ad5a13ea3b100a040
+DIST rakudo-2017.05.tar.gz 2958481 SHA256 5ec50c0b12255109341eb60535a7dcae0fd68672d272f66ba038521799ae3fe4 SHA512 f285b8920c6f2f5ba8b75c47ab5327470fa08987a207bdb5d0120b89a4b45a3a9a66641887629357889b62957a25fcfc64a88f1af177a5331fc30c3aae72deaa WHIRLPOOL 32a9f90a84d5e39c752d78434a94d85775c621b5aa16334b2e30a72e423cceeeb9ba9e95da642884fe791503196d86d0384265da72d94c17e3f45f166f810799
diff --git a/dev-lang/rakudo/rakudo-2017.05.ebuild b/dev-lang/rakudo/rakudo-2017.05.ebuild
new file mode 100644
index 000000000000..0916271bb833
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2017.05.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+ java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+ clang? ( sys-devel/clang )
+ java? ( >=virtual/jdk-1.7 )
+ >=dev-lang/perl-5.10"
+
+pkg_pretend() {
+ if has_version dev-lang/rakudo; then
+ ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+ ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+ ewarn "then do a new installation."
+ ewarn "(see Bug #584394)"
+ fi
+}
+
+src_configure() {
+ local backends
+ use moar && backends+="moar,"
+ use java && backends+="jvm"
+
+ local myargs=(
+ "--prefix=/usr"
+ "--sysroot=/"
+ "--sdkroot=/"
+ "--backends=${backends}"
+ )
+
+ perl Configure.pl "${myargs[@]}" || die
+
+ if use java; then
+ NQP=$(java-pkg_getjars --with-dependencies nqp)
+ fi
+}
+
+src_compile() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+ RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-libs/appstream/appstream-0.10.6-r1.ebuild b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
index 662af169e1d2..e197f6d9bcb8 100644
--- a/dev-libs/appstream/appstream-0.10.6-r1.ebuild
+++ b/dev-libs/appstream/appstream-0.10.6-r1.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(replace_all_version_separators '_')"
MY_P="APPSTREAM_${MY_PV}"
SRC_URI="https://github.com/ximion/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~x86"
S="${WORKDIR}/${PN}-${MY_P}"
fi
diff --git a/dev-libs/check/check-0.10.0-r1.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild
index f587c394efb8..fe3a81218e35 100644
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs subunit"
RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild b/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
index cb059aee76fc..b33784111c4c 100644
--- a/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-58.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="debug static-libs"
RDEPEND="
diff --git a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild b/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild
index 7e256a038d38..164323d0e27d 100644
--- a/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild
+++ b/dev-libs/icu-le-hb/icu-le-hb-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/behdad/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="icu"
SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-libs/icu/icu-58.2-r1.ebuild b/dev-libs/icu/icu-58.2-r1.ebuild
index 0ce88d62040a..6f1f176c977b 100644
--- a/dev-libs/icu/icu-58.2-r1.ebuild
+++ b/dev-libs/icu/icu-58.2-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="debug doc examples static-libs"
DEPEND="
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.0.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.0.ebuild
index c855b988e11e..d0141e2d7a6f 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.0.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
LICENSE="|| ( public-domain MIT )"
SLOT="0/11"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="doc test"
DEPEND="
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 92ac780e1e4b..6309a77bc42f 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -4,6 +4,7 @@ DIST gc-7.2d.tar.gz 1263064 SHA256 d9fe0ae8650d43746a48bfb394cab01a319f3809cee19
DIST libatomic_ops-1.1.tar.gz 178581 SHA256 f5fb0d89b5b26a7f0bb00c92463aeb62a425c491391bc7e36660a1ac0b5a1f13 SHA512 888efe425ee5e6a8008eb047dcb6db6577af73705a172010f1ef413510dfe8127977b37fe18a54be528ed3a0f0b1a7edc5e2ecc147fd6d9d3a7fe5ecaa9a1253 WHIRLPOOL c5c3c059f039de663965d030af3bd6c87e4fadd49b9a2740a96522f0ab68cefc6c39cf980fdd1d7d5b2aa2719172e13f8a122d3b77eb3eabd86ede15494c9f97
DIST libatomic_ops-1.2.tar.gz 183780 SHA256 a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781 SHA512 b3eb524b900f3da46730b4b158e73897f0443269b78ea429812d91f1468d17cccbf15dfd522301724049fe73aced38bf1567aff7b680795da392760890ed83bf WHIRLPOOL 3d9887d167895d7f4c1066eb0fe4c09d2c3ce4852ad84e38a190cc92ef877fd060ef7f235a7470ca1da3bb58c02d5eb2dcfd2115c1c238c27265df844bb27673
DIST libatomic_ops-7.4.0.tar.gz 455143 SHA256 2875ccc29254d3375dab9c5930c42df342f148f8cd7c646621dbf03f8c1d5b5a SHA512 3a2f6eac7c5f0fe0abaf8650047b8ec1c9c5abe732982a294a2afa920b588e17d64cb9f05a44be31b8cca9e52cc5ac79a26e1779bf60169c228344df4bbe86a9 WHIRLPOOL 32f213bddb235dc0657655d5320262a033d6f54a911077edddfa2d1c4f58568cd1e503cb2a305c0d3538c2c5d306efc4ac5d56f0fed510e6694883f093300e6b
+DIST libatomic_ops-7.4.6.tar.gz 479437 SHA256 96e88ba450ae5fa10aa8e94e6b151a63ffbe47f8069574bd12da22ae80c686db SHA512 29c6f937aa5d21343741aa0661aaf33ec9196b7784b7165d40dd87ce7bf8a7691f5ba94040663f078465ded1935ca01bb829a4b56b190f9db63cc141515d9819 WHIRLPOOL e9bf8917963ee2f4f639cea28b6c31e4a0a986bd495edaaa89d59c2f4350880a9fdd652058a2b293321cf06a64d04d8ddb0b3f596a76868b6a0a3a99c96beeff
DIST libatomic_ops-7.6.0.tar.gz 493177 SHA256 8e2c06d1d7a05339aae2ddceff7ac54552854c1cbf2bb34c06eca7974476d40f SHA512 58f1f1df94ff33bda5833af2e3a6a4af120ccfc0cec0fb15e2db24341e2ffd5a6436169cb4e7dbd96a6cb0431c1295dc4b5270d4b01806e470bacadc902720fc WHIRLPOOL 86d15b6f1ef3814ec22705f766b558aa5df3f20039477859d1399b61a6c446d3cde19a96ef4bf16a7e1ed36116d2cd11c269446e6fd9ef3c4314d0bdf9aa93d5
DIST libatomic_ops-7_4_2.tar.gz 115132 SHA256 2616be0a2f70f7e3eb12f131a36e32723ed5a1928f17b886c3e7c62f7ed14339 SHA512 3d06d5de930a369dd2af4413d8f573993eb927b45941ae8eba14ada91abd34a6baf31e1030d1ef6aa02bd6a2d8d59f9f306dd8dda6a68cf552a2745041111b2e WHIRLPOOL b2b90458b8bbc2660461c64f018c514652132cf65f7afd6a3719cd62fda95304523beff1ca4cab97cf730e25e3881bbaa3dc1e9b461a447b1956818c858b30ad
DIST libatomic_ops-7_4_4.tar.gz 115469 SHA256 ef8335676f18a111f885d48810ab090fb6bfad94e5a5dd76cdccd2a536828662 SHA512 2c1a773c61b5fecab467746e872f7eb1541c1f6770d2055d0440dac461294e896ff73460097a73c932ad07d6c44eb820ebfd039e5d87f1699d518498da6fa25f WHIRLPOOL 91a92d6deffb8bbc28e511ab949f635cb8f3bf57a7e2532b0721d925677b6c66a86ed8f8fda222810f441f41997f136b17a682434e0d24643f2e9cca46688e2a
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.4.6.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.4.6.ebuild
new file mode 100644
index 000000000000..3285bc73a08a
--- /dev/null
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.4.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Implementation for atomic memory update operations"
+HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
+SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT boehm-gc GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} econf
+}
diff --git a/dev-libs/libbase58/Manifest b/dev-libs/libbase58/Manifest
index 6c24c1c260f8..a5cce167bfe6 100644
--- a/dev-libs/libbase58/Manifest
+++ b/dev-libs/libbase58/Manifest
@@ -1,2 +1,2 @@
+DIST libbase58-0.1.0.tar.gz 5807 SHA256 43ac21173353c3d284406986501d15972f589b6d9247f61766b7acbf1f5a7a4a SHA512 8bfeeb194736cae291308b281f23f49774943dc0151863ddf99b92b657c0151a9873a110f79679e81f14bf0ecf3cf00bf43f517a24d5e89d032a0a5ebed1a358 WHIRLPOOL ba3baed348e4e7265ad14c04f7fca9b728ebd026a61275e4aaa852268f2513bc001610f013159b72c0367255a4c2d3d69b18c7b693c5e6eab6269c4894b6667c
DIST libbase58-0.1.1.tar.gz 6564 SHA256 51f665b52efc99b7a8205101569a0580a7d7defda1c4597e6e467c164f86a206 SHA512 c47cb7f891c54a8b07a01f033312baa97b7722965cc0c5003fb8591dedc304dd3ff408e8b31ee4b0634b58f6a7f0be55bee039a1fd8e24fdb62f7a72c4be7c3b WHIRLPOOL ec72557af9269a47a33c4d75260821b606b75a644ded2f4f30f02657fc3a6586240f91d76718b219e7cbde8a636987f5145405faa9603c2c19022aeeac1be878
-DIST v0.1.0.tar.gz 5807 SHA256 43ac21173353c3d284406986501d15972f589b6d9247f61766b7acbf1f5a7a4a SHA512 8bfeeb194736cae291308b281f23f49774943dc0151863ddf99b92b657c0151a9873a110f79679e81f14bf0ecf3cf00bf43f517a24d5e89d032a0a5ebed1a358 WHIRLPOOL ba3baed348e4e7265ad14c04f7fca9b728ebd026a61275e4aaa852268f2513bc001610f013159b72c0367255a4c2d3d69b18c7b693c5e6eab6269c4894b6667c
diff --git a/dev-libs/libbase58/libbase58-0.1.0.ebuild b/dev-libs/libbase58/libbase58-0.1.0.ebuild
index 187135c7d3f4..065fa8233a6e 100644
--- a/dev-libs/libbase58/libbase58-0.1.0.ebuild
+++ b/dev-libs/libbase58/libbase58-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ DESCRIPTION="C implementation of Bitcoin's base58 encoding"
HOMEPAGE="https://github.com/luke-jr/libbase58"
LICENSE="MIT"
-SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz"
+SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
IUSE="tools"
diff --git a/dev-libs/libbsd/libbsd-0.8.3-r1.ebuild b/dev-libs/libbsd/libbsd-0.8.3-r2.ebuild
similarity index 95%
rename from dev-libs/libbsd/libbsd-0.8.3-r1.ebuild
rename to dev-libs/libbsd/libbsd-0.8.3-r2.ebuild
index 6a09a9483408..cb80e112de47 100644
--- a/dev-libs/libbsd/libbsd-0.8.3-r1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.3-r2.ebuild
@@ -36,7 +36,7 @@ multilib_src_configure() {
multilib_src_install() {
emake DESTDIR="${D}" install
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+ find "${ED}" -name "*.la" -delete || die
rm "${ED%/}"/usr/share/man/man3/explicit_bzero.3 || die # 617462
}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 0e3ed50a61b3..8aa667b62071 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,5 +1,3 @@
-DIST libclc-0.1.0_pre20150305.tar.xz 45492 SHA256 5c221bc70438d50cc5893797ebd59a444910e057ccfce0671f3cdeb118854806 SHA512 5d6aa3d80da161fb987f954a1c192a06bab59de345e31a7fa55be1947feb14439f00e0d1a92d146428bfe257ab4be6ab949b9147e0650e2156124f5e9db7270c WHIRLPOOL 3fed78801b25cdcd56411847a679a511775ca7b42582d0b6791dfbe9ff544e15325cf4e5d528458d4db0334d400d4770ccdefd60db56043cc3508ce82862b1cc
-DIST libclc-0.2.0_pre20151006.tar.xz 74584 SHA256 188c013e9115fcef934fdac92bac9f306394742d9e6f82bdc9304e1ddbad8f21 SHA512 2e5231325c06f863bd032c91f44e2f681d4d0e24adde780e5c81114fc6121f762794a6fa8ee398aa379daf1645251cb5c69946ac19f1edc1fec102e2f281cdff WHIRLPOOL d85602cad06052d4b80951b42653fb0444d3f904bd97b5ef2e9071026e14f20764811de297537ddd4e95b5c86f1aa971aa3867c611e7cb720e66d4f0667c0844
DIST libclc-0.2.0_pre20160209.tar.xz 75756 SHA256 4ed3491997cc524faa0c982a29bc3b4028c1054786e6dfe929d9c43265d78ed7 SHA512 d3edff5e04dc3d34033fdccc0a0d8256ea03515bd98b32818ec181d541141acf9ea06bb7e6bb149ea5e7f5dbcbb76ba13453fb1f461b4737a15ac60c7b3fc4ca WHIRLPOOL 111f75bb89c8288ffefc7a2e1448fd79d41f47990450984537405e423cbf7ea3717e102408774667ac654650db44109c1473a25c2e84d79fa19bc3dad0f7b69c
DIST libclc-0.2.0_pre20160921.tar.gz 127817 SHA256 82c89bb15f79eaf525d283dda82403b213ef1a11b1ea9d843799fb04e08d190d SHA512 5aae6010f32935c0b8fa510fc27cfd0be2df3d58d73cb5fb280d6758aafe54bd63a0137e59053aa81dca01ad2c5a0591ee1d4a83e3ef9a590a009a1a19062373 WHIRLPOOL 6e29280dfa585999d0aa6720a0a33b329b08be31a9f19246e23cbca723210337f834d14a8064541796b05e27dd999af1d3050f04c4fbcdc1e0fe2af574cdb243
DIST libclc-0.2.0_pre20170118.tar.gz 130793 SHA256 a2d59b11b710468598f25b968ffd4e36125e6e9fe56e052ab09c9abc9c8fc295 SHA512 d94a58ebcafb7bbdbcded84574676537ae7b4ba86c7c2270cc1cd7aa3113104e018e53396b570e821c2fd473b6dd63677f59d990e36e15a7cdb43cdb96cd058c WHIRLPOOL 1ebddaa0b56171b755df35068bc57dcd54644ab447687bd0f5e47417834065574f614fafb495d0ae497942537474a6c36ff55a787a437f69b56d3734dd7385cf
diff --git a/dev-libs/libclc/libclc-0.1.0_pre20150305.ebuild b/dev-libs/libclc/libclc-0.1.0_pre20150305.ebuild
deleted file mode 100644
index a12fc513b6fd..000000000000
--- a/dev-libs/libclc/libclc-0.1.0_pre20150305.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-EGIT_REPO_URI="http://llvm.org/git/${PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-inherit base python-any-r1 $GIT_ECLASS
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="http://libclc.llvm.org/"
-
-if [[ $PV = 9999* ]]; then
- SRC_URI="${SRC_PATCHES}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.xz ${SRC_PATCHES}"
-fi
-
-LICENSE="|| ( MIT BSD )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=sys-devel/clang-3.6:0
- >=sys-devel/llvm-3.6:0
- =sys-devel/clang-3.7
- >=sys-devel/llvm-3.7"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}"
-
-src_unpack() {
- if [[ $PV = 9999* ]]; then
- git-r3_src_unpack
- else
- default
- mv ${PN}-*/ ${P} || die
- fi
-}
-
-src_configure() {
- ./configure.py \
- --with-llvm-config="$(type -P llvm-config)" \
- --prefix="${EPREFIX}/usr" || die
-}
-
-src_compile() {
- emake VERBOSE=1
-}
diff --git a/dev-libs/libevdev/libevdev-1.5.7.ebuild b/dev-libs/libevdev/libevdev-1.5.7.ebuild
index ccec4ef8703f..b7441c5584d7 100644
--- a/dev-libs/libevdev/libevdev-1.5.7.ebuild
+++ b/dev-libs/libevdev/libevdev-1.5.7.ebuild
@@ -18,7 +18,7 @@ else
fi
RESTRICT="test" # Tests need to run as root.
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
IUSE=""
DEPEND="${PYTHON_DEPS}"
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 617075c81e33..09f57d5e0f56 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,3 +1,2 @@
-DIST libfilezilla-0.9.0.tar.bz2 383160 SHA256 41d02b3eb54be1b1fdab89104a28a47fb654465a8d9ad00446c221a27bd9800c SHA512 9e2ec9bc74cb85404bf99fb0e8b26e5448c1096df834027b3dc5bb8fb7e73961a3ebbca077b7a743213d574b337eea197a182f485b9ceebd853949081fd32405 WHIRLPOOL d50fb251047477d8b1ecefb924b98dfadc48ea5f7c6980344817bcfcd4dae5344bae75d49e8bda8b68ef955864896a6293d633bd4384557cb9f3bb6bd3953440
DIST libfilezilla-0.9.1.tar.bz2 383315 SHA256 18b2391771f330cccab2c55a66197b9098f236e616f26f86326795b900913b1a SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393 WHIRLPOOL cbe3c1b30cd4dad6d6806c01921fe4bd15a8797f7dcf92737b34d04e3d35954a584d9155ea8385beecf52b176ac41b114814047f1b570791ff2a4314fa787a58
DIST libfilezilla-0.9.2.tar.bz2 383522 SHA256 c162e8a23555b3bbc707cf240b0b4122ea2975d6d8b10744325b968f656b3be3 SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88 WHIRLPOOL 16adf902b1a27766f86221e08e3599f84e64da30893ca3f67d3e467ef74c00eaa9db6abaef360a8a4ba4c47ebbfb92239344335a0fedd4cb9263b2542fde8147
diff --git a/dev-libs/libfilezilla/libfilezilla-0.9.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.9.0.ebuild
deleted file mode 100644
index 5ba7d95be5be..000000000000
--- a/dev-libs/libfilezilla/libfilezilla-0.9.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
-HOMEPAGE="https://lib.filezilla-project.org/"
-SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
- http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-util/cppunit )"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- if ! test-flag-CXX -std=c++14; then
- eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
- eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
- eerror "to gcc-4.9 or an equivalent version supporting C++14."
- die "Currently active compiler does not support -std=c++14"
- fi
- fi
-}
diff --git a/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild
index f55baf0c24b7..f78cdf117f63 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild
+++ b/dev-libs/libfilezilla/libfilezilla-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-libs/libinput/libinput-1.7.2.ebuild b/dev-libs/libinput/libinput-1.7.2.ebuild
index 056409f5fb60..d23406c2448d 100644
--- a/dev-libs/libinput/libinput-1.7.2.ebuild
+++ b/dev-libs/libinput/libinput-1.7.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="input_devices_wacom test"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index ee8ea0a28dec..4f37c0f2a064 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,3 +1,4 @@
DIST libmateweather-1.12.2.tar.xz 3394620 SHA256 9e94acc29b86db0eeb4ba1c0b0d64476a537a8deb31830b98bbeae74e6f2e944 SHA512 057037c6983ba6d21ae8c9af67d5b1bde1f7da81dbc5ef89e5eabc1b844178d2d121d29d90484baa001d22cb24e8dc832bcb1ad2702460d22f48db430fa20fd9 WHIRLPOOL 1c168a94980a42ee8e4f533138a4bdaa7ee2a07d08b5b8ae172402540d7029b893450b5c12732604698cfcd5f536258f7bcab21e99044ce09260bacb5efd8ea6
DIST libmateweather-1.14.3.tar.xz 3345244 SHA256 21507911543bccdaec57541b030de0d5522ef9640b1ac24044223bb43d026266 SHA512 51e1a29b5faca6d433f6a84fc3e08bf39e87ac48d77ff90085cd7d394b3f31388f7b6b3382e4b75dbdf3b2d07f16e9f9f92bff713d3a038270314313f614af36 WHIRLPOOL d87ce7627e1b0427ad8b2ae0fd997e77ce8caead61f5f930f5b925d0366c7efa27d48ff881dfb670f27de46de6379583fa7ea548ed159b34d541a92cde95e889
DIST libmateweather-1.16.1.tar.xz 3346620 SHA256 a3569ea5a51ec75eb29aadfba253faf04fbd3815d0a7882ddf6bd6c9c2422b70 SHA512 7cc49cc3fc16a3f06cd50db49f868d8f31a2acc95cf0c6912724248a1b35700ae0600363cd891d5bdf9961d3ae373841a0df412382933084f5e5224ff21aa386 WHIRLPOOL 5269293f740a1c8ef9d30351278514c52569e437ba1d231480b77cf42ae64ec738c22e9336275f5a8908ed86479690d53d6001b420832180b3cc634bfb37b803
+DIST libmateweather-1.18.0.tar.xz 3453408 SHA256 72e205f92bd9aed1a1d82abb17c5e26d447198d8bbdccf969d50c1c7c429b287 SHA512 505ec9b273fe5e4b50f5ea5cc470b3932fdde13e5b1687a3a8ec4dfe247cd56a2339d9265672a7de3bde55fe1410701ee6d5d10c459a7b991c60f4285474050d WHIRLPOOL 26e23fba099f3cdc5cadde6d9820ab0f60375d21ce966876ac99b79c31a92516835aeb89216dab5309deae304f66c5f404877cabd3acbca60a46732fe4ee9a83
diff --git a/dev-libs/libmateweather/libmateweather-1.18.0.ebuild b/dev-libs/libmateweather/libmateweather-1.18.0.ebuild
new file mode 100644
index 000000000000..c18aa299ea65
--- /dev/null
+++ b/dev-libs/libmateweather/libmateweather-1.18.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE library to access weather information from online services"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="debug"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+ >=dev-libs/libxml2-2.6:2
+ >=net-libs/libsoup-2.34:2.4
+ >=sys-libs/timezone-data-2010k:0
+ x11-libs/gdk-pixbuf:2
+ virtual/libintl:0
+ >=x11-libs/gtk+-3.0:3"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.50.1:*
+ sys-devel/gettext:*
+ >=sys-devel/libtool-2.2.6:2
+ virtual/pkgconfig:*"
+
+src_configure() {
+ mate_src_configure \
+ --enable-locations-compression \
+ --disable-all-translations-in-one-xml
+}
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
index 37a2d46c2237..b17412b5ef36 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-2
DESCRIPTION="Pthread functions stubs for platforms missing them"
SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-libs/librelp/librelp-1.2.13.ebuild b/dev-libs/librelp/librelp-1.2.13.ebuild
index ab14f75d6c47..89fc127ff7bd 100644
--- a/dev-libs/librelp/librelp-1.2.13.ebuild
+++ b/dev-libs/librelp/librelp-1.2.13.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
# subslot = soname version
SLOT="0/0.2.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
IUSE="debug doc +ssl static-libs"
RDEPEND="
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index d8384a3307b8..d82de384f41a 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -1,5 +1,4 @@
DIST libressl-2.3.10.tar.gz 3015911 SHA256 2d0b5aade0c5ed31a3c194fad5f8dd71cdd218b70205342739d24a625a54c4d3 SHA512 c783a1923a03a9c7c5d77a16dd4f9c798374c50e332ee7bc94ad6d5c2e112fb3db1de987ce84b3aaf822a1f68f4385270fafd687870bc8b275cc581619cb1d1e WHIRLPOOL cbfb31375b767f74e73ff04078cd2ef0b23501900269770e9b540d9ee58714e1f87068b8c11799e62d78edc22eeb4e535c61c6db4a63f3f3b30ae90871a2269c
DIST libressl-2.4.5.tar.gz 3016462 SHA256 d300c4e358aee951af6dfd1684ef0c034758b47171544230f3ccf6ce24fe4347 SHA512 bdbd0fcb868e77e5fba26da7653fe6e7f7b5017455e1beb13e11b42b8db0742b9ca6442f0949adc91ddc1f53fb93549a6c0529795cd34db2bf887cbca2d33070 WHIRLPOOL 1caa2e18304ec86f15f73e935a586d774aaa3c4248970596a7fa869f718ef9d12f6211e2abdbee90af4e4f83dfba77b45b3529dcc1077fe71e26e3beecf38bbf
DIST libressl-2.5.0.tar.gz 3012855 SHA256 8652bf6b55ab51fb37b686a3f604a2643e0e8fde2c56e6a936027d12afda6eae SHA512 6372b27f1696e957389646a05b0572ad6936443b34fee0e57153b063831e00318fa1b434e3e0369f0c3df872e15ad3bee2f85db0851021444612f2a6f266a332 WHIRLPOOL 9b145915734a1914f0d36df04a8b35aa2ce2c91f7d6b3a978c5c6845314c56c61718fce6c471ba1a03f3d1ff052246c3db767adee99bc3d38a6bd692b9086ad0
-DIST libressl-2.5.3.tar.gz 3285151 SHA256 14e34cc586ec4ce5763f76046dcf366c45104b2cc71d77b63be5505608e68a30 SHA512 e5ba2abb8a0835a025d2777d9c0e8e95813777af8167e322d8e5ae20485c32b628ced77141b156fd3619b65a5afae1a5bc90a7252166a9a54f7e3d23388b3bd0 WHIRLPOOL 687d2b0f2f4294bbc16022056cae7e9f1dd70f168aa087e5d12e4e0eb498b8df05de48c262e5c6b094ea4cbff68a3c74255f369029f377a91e0f34f23e2daf4a
DIST libressl-2.5.4.tar.gz 3286042 SHA256 107a5b522fbb8318d4c3be668075e5e607296f0a9255d71674caa94571336efa SHA512 8ca86c14af0020c90bef4651892799864938dab9d898172269cb78bad5963314e064f2b4c46e6a04e0b85d1eddbd1840b734803c11ceec8fd6bb1290e0fe204c WHIRLPOOL f1cfb1b126759275172616eadbc40e20ae8bbc615bfa4e49e68b3c5a9f66e6503007531a2ff59df482ebf6902008b431ca5891d73e6c8887862f11e00f76b423
diff --git a/dev-libs/libressl/libressl-2.5.3.ebuild b/dev-libs/libressl/libressl-2.5.3.ebuild
deleted file mode 100644
index 320352af0002..000000000000
--- a/dev-libs/libressl/libressl-2.5.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="http://www.libressl.org/"
-SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
-# we'll try to use the max of either. However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/43"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
- touch crypto/Makefile.in
-
- sed -i \
- -e '/^[ \t]*CFLAGS=/s#-g ##' \
- -e '/^[ \t]*CFLAGS=/s#-g"#"#' \
- -e '/^[ \t]*CFLAGS=/s#-O2 ##' \
- -e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
- -e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
- -e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
- configure || die "fixing CFLAGS failed"
-
- eapply_user
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- $(use_enable asm) \
- $(use_enable static-libs static)
-}
-
-multilib_src_test() {
- emake check
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/dev-libs/npth/Manifest b/dev-libs/npth/Manifest
index c2dc53d4dc45..2b0153411824 100644
--- a/dev-libs/npth/Manifest
+++ b/dev-libs/npth/Manifest
@@ -1,2 +1,3 @@
DIST npth-1.3.tar.bz2 295998 SHA256 bca81940436aed0734eb8d0ff8b179e04cc8c087f5625204419f5f45d736a82a SHA512 97b0278cc9448adb42c4a83b8e7bafeed939acaf3dd3a201a1b103df4e48f24224d4bdaeb97903ad1884914ce363cbceffe948a7c1db4f19abf87ca5964f5699 WHIRLPOOL 786dd42c0bb097f47c708cae633f32789d9724cfb5d0e0a12667c754ba32a273ddda6b1c061ad10be1fa2e98dbbcf6850d404e909243fd2e566ba17825f63526
DIST npth-1.4.tar.bz2 299106 SHA256 8915141836a3169a502d65c1ebd785fcc6d406cae5ee84474272ebf2fa96f1f2 SHA512 649009b4fbd2bbbb8fce2911c2f9070a758d037be0d147a63754e3c1f5a9ffb73b907cd09c79314fe60c25084ca7a7b3b387139dd83cc0e11a7e7ba64630ae1f WHIRLPOOL 02642a82d11be58fe5807d178a1fdac0fbcf935e6553d4eebe4d4d24601f04181e6892df0aa532e9b3db198141e6f1b68491bf8c92d18f24686e36492f37f0ab
+DIST npth-1.5.tar.bz2 299308 SHA256 294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2 SHA512 20f0ec59d304c68081e42535870af8e76c18e30aa7b04ccdafe60fe5261ad7275c2c0e3ea3a767d6145258a3a39fa641032cd97205318266dd727a5fe7ee331a WHIRLPOOL 1ac5d70aeba45bf66ca7f39b50f01995cca4b19e2d507c116d9704bbc00568d6fce213c469a05253631fe159b14c509dec5597f668669057ea80220b9cf92ca7
diff --git a/dev-libs/npth/npth-1.5.ebuild b/dev-libs/npth/npth-1.5.ebuild
new file mode 100644
index 000000000000..e5f5eb0839ce
--- /dev/null
+++ b/dev-libs/npth/npth-1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool ltprune
+
+DESCRIPTION="New GNU Portable Threads Library"
+HOMEPAGE="https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+ default
+ elibtoolize # for Solaris shared library
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
new file mode 100644
index 000000000000..8ba26208948a
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-build-system.patch
@@ -0,0 +1,30 @@
+index 8b78ba3..92aa570 100644
+--- a/config.pl
++++ b/config.pl
+@@ -1111,7 +1111,7 @@ sub GenerateMakefile
+ $rep.="\t\$(MAKE) prefix=\$(prefix) -C intl\n";
+ }
+ $text=~s/\@target_rules\@/$rep/g;
+- $rep="intl-dummy:\n\t\$(MAKE) -C intl/dummy\n";
++ $rep="intl-dummy:\n\t\$(MAKE) prefix=\$(prefix) -C intl/dummy\n";
+ $rep.="\tcp intl/dummy/libtvfintl.a $makeDir\n";
+ $rep.="\tranlib $makeDir/libtvfintl.a\n" if $conf{'UseRanLib'};
+ $text=~s/\@intl_dummy_rule\@/$rep/g;
+@@ -1196,7 +1196,7 @@ sub GenerateMakefile
+ }
+ if ($internac)
+ {
+- $rep.="\ninstall-internac:\n\t\$(MAKE) -C intl install\n";
++ $rep.="\ninstall-internac:\n\t\$(MAKE) prefix=\$(prefix) -C intl install\n";
+ }
+ $text=~s/\@install_rules\@/$rep/g;
+
+@@ -1216,7 +1216,7 @@ sub GenerateMakefile
+ $rep.="\trm -f intl/dummy/*.lo\n";
+ $rep.="\trm -f intl/dummy/*.a\n";
+ $rep.="\t-\$(MAKE) -C examples clean\n";
+- $rep.="\t-\$(MAKE) -C intl clean\n";
++ $rep.="\t-\$(MAKE) prefix=\$(prefix) -C intl clean\n";
+ $rep.="\trm -f configure.cache\n";
+ $rep.="\trm -f rhtv-config\$(EXE_EXT)\n";
+ $text=~s/\@clean\@/$rep/g;
diff --git a/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
new file mode 100644
index 000000000000..8570bb04222e
--- /dev/null
+++ b/dev-libs/tvision/files/tvision-2.1.0_pre2-gcc6.patch
@@ -0,0 +1,147 @@
+Fix gcc-6 compilation errors; bug 594176
+
+--- a/classes/tdesktop.cc
++++ b/classes/tdesktop.cc
+@@ -26,6 +26,10 @@ Modified cursor behavior while desktop locked by Salvador E. Tropea (SET)
+ #define Uses_TVCodePage
+ #include
+
++#include
++
++using std::abs;
++
+ TDeskInit::TDeskInit( TBackground *(*cBackground)( TRect ) ) :
+ createBackground( cBackground )
+ {
+--- a/classes/tdisplay.cc
++++ b/classes/tdisplay.cc
+@@ -22,6 +22,10 @@ same used in original Turbo Vision for compatibility purposes.
+ #define Uses_TVCodePage
+ #include
+
++#include
++
++using std::abs;
++
+ // Remove me please!
+ int TDisplay::dual_display=0;
+
+--- a/classes/tvtext1.cc
++++ b/classes/tvtext1.cc
+@@ -110,8 +110,8 @@
+ char TCheckBoxes::button[] = " [ ] ";
+ char TCheckBoxes::obutton[] = " [ ] ";
+
+-TScrollChars TScrollBar::vChars = {30, 31, 177, 254, 178};
+-TScrollChars TScrollBar::ovChars = {30, 31, 177, 254, 178};
+-TScrollChars TScrollBar::hChars = {17, 16, 177, 254, 178};
+-TScrollChars TScrollBar::ohChars = {17, 16, 177, 254, 178};
++TScrollChars TScrollBar::vChars = {30, 31, (char) 177, (char) 254, (char) 178};
++TScrollChars TScrollBar::ovChars = {30, 31, (char) 177, (char) 254, (char) 178};
++TScrollChars TScrollBar::hChars = {17, 16, (char) 177, (char) 254, (char) 178};
++TScrollChars TScrollBar::ohChars = {17, 16, (char) 177, (char) 254, (char) 178};
+
+--- a/classes/x11/x11src.cc
++++ b/classes/x11/x11src.cc
+@@ -94,6 +94,10 @@
+ #define TIMER_ALARM SIGALRM
+ #endif
+
++#include
++
++using std::abs;
++
+ const unsigned foWmin=5, foHmin=7, foWmax=20, foHmax=32;
+ const int cursorDelay=300000;
+
+@@ -2555,49 +2559,49 @@ Cursor TScreenX11::busyCursor,
+ TScreenX11::leftPtr;
+ char TScreenX11::busyCursorMap[]=
+ {
+- 0xff, 0xff, 0xff, 0x1f,
+- 0xfd, 0xff, 0xff, 0x1f,
+- 0xf9, 0xff, 0xff, 0x1f,
+- 0xf1, 0xff, 0xff, 0x1f,
+- 0xe1, 0x7f, 0xc0, 0x1f,
+- 0xc1, 0x7f, 0xc0, 0x1f,
+- 0x81, 0x3f, 0x80, 0x1f,
+- 0x01, 0x9f, 0x3b, 0x1f,
+- 0x01, 0xce, 0x7b, 0x1e,
+- 0xc1, 0xef, 0xfb, 0x1e,
+- 0xc9, 0xef, 0xf1, 0x18,
+- 0x9d, 0xef, 0xf1, 0x18,
+- 0x9f, 0xef, 0xfe, 0x18,
+- 0x3f, 0x6f, 0xff, 0x1e,
+- 0x3f, 0xcf, 0x7f, 0x1e,
+- 0xff, 0x9f, 0x3f, 0x1f,
+- 0xff, 0x3f, 0x80, 0x1f,
+- 0xff, 0x7f, 0xc0, 0x1f,
+- 0xff, 0x7f, 0xc0, 0x1f,
+- 0xff, 0xff, 0xff, 0x1f
++ (char)0xff, (char)0xff, (char)0xff, (char)0x1f,
++ (char)0xfd, (char)0xff, (char)0xff, (char)0x1f,
++ (char)0xf9, (char)0xff, (char)0xff, (char)0x1f,
++ (char)0xf1, (char)0xff, (char)0xff, (char)0x1f,
++ (char)0xe1, (char)0x7f, (char)0xc0, (char)0x1f,
++ (char)0xc1, (char)0x7f, (char)0xc0, (char)0x1f,
++ (char)0x81, (char)0x3f, (char)0x80, (char)0x1f,
++ (char)0x01, (char)0x9f, (char)0x3b, (char)0x1f,
++ (char)0x01, (char)0xce, (char)0x7b, (char)0x1e,
++ (char)0xc1, (char)0xef, (char)0xfb, (char)0x1e,
++ (char)0xc9, (char)0xef, (char)0xf1, (char)0x18,
++ (char)0x9d, (char)0xef, (char)0xf1, (char)0x18,
++ (char)0x9f, (char)0xef, (char)0xfe, (char)0x18,
++ (char)0x3f, (char)0x6f, (char)0xff, (char)0x1e,
++ (char)0x3f, (char)0xcf, (char)0x7f, (char)0x1e,
++ (char)0xff, (char)0x9f, (char)0x3f, (char)0x1f,
++ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
++ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
++ (char)0xff, (char)0x7f, (char)0xc0, (char)0x1f,
++ (char)0xff, (char)0xff, (char)0xff, (char)0x1f
+ };
+ char TScreenX11::busyCursorMask[]=
+ {
+- 0xfc, 0xff, 0xff, 0x1f,
+- 0xf8, 0xff, 0xff, 0x1f,
+- 0xf0, 0xff, 0xff, 0x1f,
+- 0xe0, 0x3f, 0x80, 0x1f,
+- 0xc0, 0x3f, 0x80, 0x1f,
+- 0x80, 0x3f, 0x80, 0x1f,
+- 0x00, 0x1f, 0x00, 0x1f,
+- 0x00, 0x0e, 0x00, 0x1e,
+- 0x00, 0x04, 0x00, 0x1c,
+- 0x00, 0x04, 0x00, 0x10,
+- 0x80, 0x07, 0x00, 0x10,
+- 0x08, 0x07, 0x00, 0x10,
+- 0x0c, 0x07, 0x00, 0x10,
+- 0x1f, 0x06, 0x00, 0x10,
+- 0x1f, 0x06, 0x00, 0x1c,
+- 0x3f, 0x0f, 0x00, 0x1e,
+- 0xff, 0x1f, 0x00, 0x1f,
+- 0xff, 0x3f, 0x80, 0x1f,
+- 0xff, 0x3f, 0x80, 0x1f,
+- 0xff, 0x3f, 0x80, 0x1f
++ (char)0xfc, (char)0xff, (char)0xff, (char)0x1f,
++ (char)0xf8, (char)0xff, (char)0xff, (char)0x1f,
++ (char)0xf0, (char)0xff, (char)0xff, (char)0x1f,
++ (char)0xe0, (char)0x3f, (char)0x80, (char)0x1f,
++ (char)0xc0, (char)0x3f, (char)0x80, (char)0x1f,
++ (char)0x80, (char)0x3f, (char)0x80, (char)0x1f,
++ (char)0x00, (char)0x1f, (char)0x00, (char)0x1f,
++ (char)0x00, (char)0x0e, (char)0x00, (char)0x1e,
++ (char)0x00, (char)0x04, (char)0x00, (char)0x1c,
++ (char)0x00, (char)0x04, (char)0x00, (char)0x10,
++ (char)0x80, (char)0x07, (char)0x00, (char)0x10,
++ (char)0x08, (char)0x07, (char)0x00, (char)0x10,
++ (char)0x0c, (char)0x07, (char)0x00, (char)0x10,
++ (char)0x1f, (char)0x06, (char)0x00, (char)0x10,
++ (char)0x1f, (char)0x06, (char)0x00, (char)0x1c,
++ (char)0x3f, (char)0x0f, (char)0x00, (char)0x1e,
++ (char)0xff, (char)0x1f, (char)0x00, (char)0x1f,
++ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
++ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f,
++ (char)0xff, (char)0x3f, (char)0x80, (char)0x1f
+ };
+
+ /* This is the function which creates cursors. On success it return
+
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild
index b013170a41d1..7c979b1df733 100644
--- a/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit eutils multilib
diff --git a/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
new file mode 100644
index 000000000000..800f4b2a0c14
--- /dev/null
+++ b/dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Text User Interface that implements the well known CUA widgets"
+HOMEPAGE="http://tvision.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tvision/rhtvision_${PV/_pre/-}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DOCS=( readme.txt THANKS TODO )
+
+HTML_DOCS=( www-site/. )
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc41.patch"
+ "${FILESDIR}/${P}-outb.patch"
+ "${FILESDIR}/${P}-underflow.patch"
+ "${FILESDIR}/${P}-asneeded.patch"
+ "${FILESDIR}/${P}-gcc44.patch"
+ "${FILESDIR}/${P}-ldconfig.patch"
+ "${FILESDIR}/${P}-flags.patch"
+ "${FILESDIR}/${P}-gcc6.patch" # bug #594176
+ "${FILESDIR}/${P}-build-system.patch" # for EAPI=6
+)
+
+src_prepare() {
+ # Strip hunk from invalid characters for gcc6.patch
+ sed -e ":TScrollChars: s:; // \x1E\x1F\xB1\xFE\xB2:;:" \
+ -e ":TScrollChars: s:; // \x11\x10\xB1\xFE\xB2:;:" \
+ -i classes/tvtext1.cc || die
+ default
+}
+
+src_configure() {
+ ./configure --fhs || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install \
+ prefix="\${DESTDIR}/usr" \
+ libdir="\$(prefix)/$(get_libdir)"
+
+ einstalldocs
+ dosym rhtvision /usr/include/tvision
+}
diff --git a/dev-libs/wayland/wayland-1.13.0.ebuild b/dev-libs/wayland/wayland-1.13.0.ebuild
index bb9b1ab1cede..5da4ef57104c 100644
--- a/dev-libs/wayland/wayland-1.13.0.ebuild
+++ b/dev-libs/wayland/wayland-1.13.0.ebuild
@@ -18,7 +18,7 @@ if [[ $PV = 9999* ]]; then
SRC_URI=""
else
SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+ KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
fi
LICENSE="MIT"
diff --git a/dev-ml/ocaml-dns/Manifest b/dev-ml/ocaml-dns/Manifest
index 6d074d8b18cc..2d4bbf0e0e7f 100644
--- a/dev-ml/ocaml-dns/Manifest
+++ b/dev-ml/ocaml-dns/Manifest
@@ -1,2 +1 @@
-DIST ocaml-dns-0.20.0.tar.gz 98660 SHA256 27f83f6ef242df944b8b272eedbad736daa649f3b4efc77abf142ef3a7008e26 SHA512 fbf6bfd580e025454f08dfdfa38c2e2d4a1d6ba35941988ca22fad80c61a58f1124693daabb5b643b12c54aba5a445282ca79c460e9411341dbbccbf6cdb32dc WHIRLPOOL 56784fc226ced8a88807810602000d5956eba39276a2a69b05850ff97d6a624890ec8906b32eaacaaca6a80f784f04ff4947aa4a72a50f707a14e1f9500f4315
DIST ocaml-dns-0.20.1.tar.gz 98673 SHA256 fb28e5e0e4d38ca52b13504f2e2c077f1257c589904f72c1d8bf52e5d7696599 SHA512 646d2620f718911021d3c42aa8bed0f78d20a565f6075cd6acba57ff41fd30e81446e4ebb80b25e9670124f9eda1314286207b1d3d92b335319d333c6728e7fb WHIRLPOOL b9d448bb14b7e284af319b2364b276c807b3bf8af96997b43337b4b0f450966ba95a1614baeec34fc2f91bc2d80e8ff0320af2947e45d9e0f3527f724aad8ce2
diff --git a/dev-ml/ocaml-dns/files/lwt3.patch b/dev-ml/ocaml-dns/files/lwt3.patch
deleted file mode 100644
index a158d8f75599..000000000000
--- a/dev-ml/ocaml-dns/files/lwt3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: ocaml-dns-0.20.0/lwt/dns_server_unix.ml
-===================================================================
---- ocaml-dns-0.20.0.orig/lwt/dns_server_unix.ml
-+++ ocaml-dns-0.20.0/lwt/dns_server_unix.ml
-@@ -31,10 +31,10 @@ let bind_fd ~address ~port =
- let err = sp "cannot resolve %s: %s" address (Printexc.to_string exn) in
- Lwt.fail (Failure err))
- in
-- src >|= fun src ->
-+ src >>= fun src ->
- let fd = Lwt_unix.(socket PF_INET SOCK_DGRAM 0) in
-- let () = Lwt_unix.bind fd src in
-- (fd, src)
-+ Lwt_unix.bind fd src >>= fun () ->
-+ Lwt.return (fd, src)
-
- let eventual_process_of_zonefiles zonefiles =
- Lwt_list.map_s (fun zonefile ->
diff --git a/dev-ml/ocaml-dns/files/uri.patch b/dev-ml/ocaml-dns/files/uri.patch
new file mode 100644
index 000000000000..09e50cfc5ea1
--- /dev/null
+++ b/dev-ml/ocaml-dns/files/uri.patch
@@ -0,0 +1,21 @@
+commit 152097361dbe987af5de4efde78ed28c720900a8
+Author: Anil Madhavapeddy
+Date: Tue May 30 20:45:06 2017 +0100
+
+ zone_parser: explictly depend on uri.services
+
+ This seems to have been pulled in implicitly before, but breaks
+ when compiled with jbuilder
+
+diff --git a/_tags b/_tags
+index b38be12..bb5d5c0 100644
+--- a/_tags
++++ b/_tags
+@@ -9,6 +9,7 @@ true : package(re re.str ipaddr uri base64 hashcons cstruct result)
+ "lwt": include
+ : package(lwt mirage-profile)
+ : package(cmdliner lwt.unix uri.services ipaddr.unix lwt)
++: package(uri.services)
+ : package(lwt duration mirage-time-lwt)
+ : package(mirage-stack-lwt mirage-kv-lwt)
+
diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild
deleted file mode 100644
index 7f438c62e281..000000000000
--- a/dev-ml/ocaml-dns/ocaml-dns-0.20.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A pure OCaml implementation of the DNS protocol"
-HOMEPAGE="https://github.com/mirage/ocaml-dns https://mirage.io"
-SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2 LGPL-2.1-with-linking-exception ISC"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="async +lwt +ocamlopt test"
-
-RDEPEND="
- async? ( dev-ml/async:= )
- lwt? ( >=dev-ml/lwt-3:=
- dev-ml/ocaml-cstruct:=[lwt(-)] )
- >=dev-lang/ocaml-4:=
- dev-ml/cmdliner:=
- dev-ml/mirage-profile:=
- >=dev-ml/ocaml-base64-2.0.0:=
- >=dev-ml/ocaml-cstruct-1.9.0:=
- >=dev-ml/ocaml-ipaddr-2.6.0:=
- dev-ml/ocaml-re:=
- >=dev-ml/ocaml-uri-1.7.0:=
- dev-ml/ocaml-hashcons:=[ocamlopt?]
- dev-lang/ocaml:=[ocamlopt?]
- ! ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+ dev-ml/ocaml-re:=
+ dev-ml/sexplib:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/stringext:=
+ dev-ml/type-conv:=
+ dev-lang/ocaml:=
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-ml/ounit-1.0.2 )
+ dev-ml/jbuilder
+ dev-ml/opam
+"
+
+src_install() {
+ opam-installer -i \
+ --prefix="${ED}/usr" \
+ --libdir="${D}/$(ocamlc -where)" \
+ --docdir="${ED}/usr/share/doc/${PF}" \
+ uri.install || die
+}
diff --git a/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild b/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild
index 8739af562f49..428929a6c100 100644
--- a/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild
+++ b/dev-ml/ocaml-webmachine/ocaml-webmachine-0.4.0.ebuild
@@ -22,7 +22,7 @@ DEPEND="
dev-ml/ocaml-cohttp:=[ocamlopt?]
dev-ml/ocaml-dispatch:=[ocamlopt?]
dev-ml/ocaml-re:=[ocamlopt?]
- dev-ml/ocaml-uri:=[ocamlopt?]
+ dev-ml/ocaml-uri:=[ocamlopt(+)?]
"
RDEPEND="${DEPEND}"
DEPEND="${DEPEND}
diff --git a/dev-ml/reason-parser/Manifest b/dev-ml/reason-parser/Manifest
index decfd0f8d936..7f233690332e 100644
--- a/dev-ml/reason-parser/Manifest
+++ b/dev-ml/reason-parser/Manifest
@@ -1,3 +1 @@
-DIST reason-parser-1.13.3.tar.gz 10253108 SHA256 b92840f8238dd6266c5678da3e4dc832776bcc98990ac47773020e34dce708a6 SHA512 82398fbbf72bcadfc868e5f33e8666ef80ef610f8313d08bc16593944569b7a16693fcc6397a117518bf8e32f71083f0ac4a416112f97cd220715f4293136b84 WHIRLPOOL a82dd8e28a012ed0716fba6bc79eee849110bfb42cd8221eb15847cadae90d62d909e635f3da465c6220382d6eee62f2f69a739d96d3d6a5baddc58623cd059e
-DIST reason-parser-1.13.4.tar.gz 6856260 SHA256 07b0f4a471b570b9f6ee699016d2fb9d98788d1ccfb428a2b2f20f1ee6f42b9e SHA512 ee2270ffbb3c3c818aafec2ef0f23f3741e66e5b077b3a84b49b357b003d24d639165c521bf0afe92bf81ef626ed6d863ea6d097b83a2e1b5a0349a679cc8c7f WHIRLPOOL ffc8b96ce5b653c1d78877f0422315cce3d42615b88bb6f09f52d3af9799fe30ed221094a5acbc49448f0d1e865b1702a2b5956a8d327a22b2db01eb33aa0da7
-DIST reason-parser-1.13.5.tar.gz 183248 SHA256 442266c4bdb0f5c11e56f1e239b042faa4d501291158c7bc82de1d4632e7a20a SHA512 a0ffebd80ecb0ba2a4b49bebe68e71589069e48a1992b07b122dd52495847971d23aba4d7ee7a3ad88fd75f45a758f80ebeea9acbef45b0eeab2966ec952475b WHIRLPOOL 98395a7c81003b3598b6cf730d01b867b6378dcaff9ecf0fd55151189cb8fa03b2ac8cbc733800b2ef8b0810908f88387ac6b8d0a6c1b6576e068336ba5b05da
+DIST reason-parser-2.0.0.tar.gz 183562 SHA256 533c1a8d26f8b85b2eeec1a80b407de9ee17e3ecfb9b5f1170ce31aab9266edc SHA512 43d05367978a273625d43fbee33c554777a24003b3a843b610da2a73187f2c5ad7dc110fd2b50ba4671ca05e7fcff6ed63fdf52f79769752b31d0aec48fab84c WHIRLPOOL 479eee7afc20269954e0aca352cb17414d29e28997276301009fd19e133e99d69d4ae1134eef673da96ce89027c03d5f13131f8626aa55a73719fb11f5b59870
diff --git a/dev-ml/reason-parser/files/menhir.patch b/dev-ml/reason-parser/files/menhir.patch
deleted file mode 100644
index 6c028eee34b0..000000000000
--- a/dev-ml/reason-parser/files/menhir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 2c15b2f2783b6ab44fe09387019f0918146c2895
-Author: Jason Rose
-Date: Wed Apr 19 17:49:42 2017 -0700
-
- Supporting menhir.20170416 (#1226)
-
-diff --git a/reason-parser/src/reason_toolchain.ml b/reason-parser/src/reason_toolchain.ml
-index 6c70d93..7f98586 100644
---- a/reason-parser/src/reason_toolchain.ml
-+++ b/reason-parser/src/reason_toolchain.ml
-@@ -506,20 +506,16 @@ module JS_syntax = struct
- if in_error then
- begin
- match supplier.last_token with
-+ | None -> assert false
- | Some triple ->
- (* We just recovered from the error state, try the original token again *)
- let checkpoint_with_previous_token = I.offer checkpoint triple in
-- let accept_new = I.loop_test
-- (fun _ _ -> true)
-- checkpoint_with_previous_token
-- false
-- in
-- if accept_new then
-- loop_handle_yacc supplier false checkpoint_with_previous_token
-- else
-+ match I.shifts checkpoint_with_previous_token with
-+ | None ->
- (* The original token still fail to be parsed, discard *)
- loop_handle_yacc supplier false checkpoint
-- | None -> assert false
-+ | Some env ->
-+ loop_handle_yacc supplier false checkpoint_with_previous_token
- end
- else
- let triple = read supplier in
diff --git a/dev-ml/reason-parser/reason-parser-1.13.3.ebuild b/dev-ml/reason-parser/reason-parser-1.13.3.ebuild
deleted file mode 100644
index e9a7ae9ee3bc..000000000000
--- a/dev-ml/reason-parser/reason-parser-1.13.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit findlib
-
-DESCRIPTION="Meta Language Toolchain"
-HOMEPAGE="https://github.com/facebook/reason"
-SRC_URI="https://github.com/facebook/reason/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-DEPEND="
- dev-lang/ocaml:=[ocamlopt?]
- dev-ml/menhir:=
- dev-ml/merlin-extend:=
- dev-ml/result:=
- dev-ml/topkg:=
- dev-ml/ocaml-migrate-parsetree:=
- dev-ml/ppx_tools_versioned:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- dev-ml/ocamlbuild
- dev-ml/opam
-"
-
-S="${WORKDIR}/reason-${PV}/${PN}"
-
-src_compile() {
- emake compile_error
- ocamlbuild -package topkg pkg/build.native || die
- ./build.native build \
- --native "$(usex ocamlopt true false)" \
- --native-dynlink "$(usex ocamlopt true false)" \
- || die
-}
-
-src_install() {
- opam-installer -i \
- --prefix="${ED}/usr" \
- --libdir="${D}/$(ocamlc -where)" \
- --docdir="${ED}/usr/share/doc/${PF}" \
- --mandir="${ED}/usr/share/man" \
- ${PN}.install || die
-}
diff --git a/dev-ml/reason-parser/reason-parser-1.13.4.ebuild b/dev-ml/reason-parser/reason-parser-1.13.4.ebuild
deleted file mode 100644
index c02afbc39bb5..000000000000
--- a/dev-ml/reason-parser/reason-parser-1.13.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit findlib eutils
-
-DESCRIPTION="Meta Language Toolchain"
-HOMEPAGE="https://github.com/facebook/reason"
-SRC_URI="https://github.com/facebook/reason/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt"
-
-DEPEND="
- dev-lang/ocaml:=[ocamlopt?]
- >=dev-ml/menhir-20170418:=
- dev-ml/merlin-extend:=
- dev-ml/result:=
- dev-ml/topkg:=
- dev-ml/ocaml-migrate-parsetree:=
- dev-ml/ppx_tools_versioned:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND}
- dev-ml/ocamlbuild
- dev-ml/opam
-"
-
-S="${WORKDIR}/reason-${PV}/${PN}"
-
-src_prepare() {
- epatch "${FILESDIR}/menhir.patch"
- default
-}
-
-src_compile() {
- emake compile_error
- ocamlbuild -package topkg pkg/build.native || die
- ./build.native build \
- --native "$(usex ocamlopt true false)" \
- --native-dynlink "$(usex ocamlopt true false)" \
- || die
-}
-
-src_install() {
- opam-installer -i \
- --prefix="${ED}/usr" \
- --libdir="${D}/$(ocamlc -where)" \
- --docdir="${ED}/usr/share/doc/${PF}" \
- --mandir="${ED}/usr/share/man" \
- ${PN}.install || die
-}
diff --git a/dev-ml/reason-parser/reason-parser-1.13.5.ebuild b/dev-ml/reason-parser/reason-parser-2.0.0.ebuild
similarity index 100%
rename from dev-ml/reason-parser/reason-parser-1.13.5.ebuild
rename to dev-ml/reason-parser/reason-parser-2.0.0.ebuild
diff --git a/dev-ml/reason/Manifest b/dev-ml/reason/Manifest
index c4fa2868ad34..685b56dd2a03 100644
--- a/dev-ml/reason/Manifest
+++ b/dev-ml/reason/Manifest
@@ -1 +1 @@
-DIST reason-1.13.5.tar.gz 6681110 SHA256 d769e15e507ae401e5f7d8e59a1c327729824dd9914d05d7fe0ee51c84afeb2f SHA512 e47836281fb36094358f746b3460ac9671782fbf51058b220f5fe2be060592db75b688c917e162345c3fdcf8822d9b7fad0483ae274a97ccf640bdd7853510a9 WHIRLPOOL 21e86a487263735af8968577f4b3dc8fb4492c9b831b24e27faf30d421e0e164342bc76661fa674c90a2bb78b911639ea12e5eb7562cb6144c6b0d414844e4fe
+DIST reason-2.0.0.tar.gz 6639139 SHA256 cfc2fc6416d00584047fc67eade5c6215cec5ea4c818cd7fe5b4d03d311ea3a8 SHA512 5e8fb81193de90fcf95ae39e66dab6b7638f1b6f37f7f438c3692e67de8f33667eca92e76df4968ad794e4bd02674583203e1058f1e990f3f6e87d8ce1fbbb43 WHIRLPOOL 8eb8395372aac8952bce2c0cfa58ab364cbedc46eb6f4e34ac496e95bb9729134f374cb42f59bd398f6ce9c68025e9c92259fb750381a0b11cf934b05aba1f0d
diff --git a/dev-ml/reason/files/utop.patch b/dev-ml/reason/files/utop.patch
deleted file mode 100644
index dc3c61ee7179..000000000000
--- a/dev-ml/reason/files/utop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit a8cfc8636ac2ab3292156d0038d54af730a59007
-Author: Cristiano Calcagno
-Date: Tue May 30 16:23:57 2017 +0200
-
- Fix utop compilation
-
-diff --git a/_tags b/_tags
-index ac43e8d..788a36e 100644
---- a/_tags
-+++ b/_tags
-@@ -1,5 +1,6 @@
- true: warn(@5@8@10@11@12@14@23-24@26@29@40), bin_annot, safe_string, debug
-
-+: thread
- : -traverse
- : -traverse
- : -traverse
diff --git a/dev-ml/reason/reason-1.13.5.ebuild b/dev-ml/reason/reason-2.0.0.ebuild
similarity index 95%
rename from dev-ml/reason/reason-1.13.5.ebuild
rename to dev-ml/reason/reason-2.0.0.ebuild
index bdb8d838039a..1ef34e4b334f 100644
--- a/dev-ml/reason/reason-1.13.5.ebuild
+++ b/dev-ml/reason/reason-2.0.0.ebuild
@@ -27,8 +27,6 @@ DEPEND="${DEPEND}
dev-ml/ocamlbuild
dev-ml/opam"
-PATCHES=( "${FILESDIR}/utop.patch" )
-
src_compile() {
emake precompile
emake build
diff --git a/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.220.0.ebuild b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.220.0.ebuild
new file mode 100644
index 000000000000..369f6a600932
--- /dev/null
+++ b/dev-perl/CPAN-Perl-Releases/CPAN-Perl-Releases-3.220.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=BINGOS
+DIST_VERSION=3.22
+inherit perl-module
+
+DESCRIPTION="Mapping Perl releases on CPAN to the location of the tarballs"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-File-Spec
+ virtual/perl-IO
+ >=virtual/perl-Test-Simple-0.470.0
+ )
+"
+src_test() {
+ perl_rm_files t/author-pod-coverage.t t/author-pod-syntax.t
+ perl-module_src_test
+}
diff --git a/dev-perl/CPAN-Perl-Releases/Manifest b/dev-perl/CPAN-Perl-Releases/Manifest
index c4dd0a91e2d8..b85ff27ae872 100644
--- a/dev-perl/CPAN-Perl-Releases/Manifest
+++ b/dev-perl/CPAN-Perl-Releases/Manifest
@@ -10,3 +10,4 @@ DIST CPAN-Perl-Releases-3.12.tar.gz 24920 SHA256 5a995fba2f998b878e5c5642894b0ce
DIST CPAN-Perl-Releases-3.16.tar.gz 24999 SHA256 59065fccd8502a65fbe3bf03ad8e4ca0ba689261a7cfc089cf4fb2a81f2df06f SHA512 129126320adbc7470946675dc3d9323030209b9ac3baef414cf1e72a6c843f6efe845de42dcf7400d6382c74a1b0ddd9eb818f4abd73e65363b67fcac90f2f59 WHIRLPOOL acaf98c070a2232bb1ff5f5abaece117173b5835a9ad5ad2735ba869c3e5affa6412866ed317bace877af28af4cb63def429d77c9a90be78c45cf4bd8f373414
DIST CPAN-Perl-Releases-3.18.tar.gz 24827 SHA256 c9d4ebd3dacab6dc25ff79a234a406821ee23a483a062becf7a98ed4d01e04ba SHA512 be3faa12f47b336480e2f5806334f5c8c03f5cec94c1cd6042125f07c2c1f98340cb79ed39a8de6a82956ef1a08434da1440a0af6bbf1fc7da821d416ec86626 WHIRLPOOL d5c492349015c89216b93c4085657d92b879e8ad446ccd156137e1a8187dd889c00710dd71396005394197daff43cd3747362a3b7126f4a0e7c8b34ffbaa9bc0
DIST CPAN-Perl-Releases-3.20.tar.gz 24849 SHA256 8cc19b619d1e3f448a9b1ad233c194d62409d4f5d9ab78fe9630653d576481f8 SHA512 205e2a81be88464fa932f564076ac502229990afe6eb2967d357fee3ec18716a7d4d538ec088d8fd354f1cf8bdd5fa4699a29d2014a22a0f185685d4db135606 WHIRLPOOL c878dd2f5d93f297582cfa750373f7c4ebd107bbb6581145a28c41a8f15f2c03891fd8400500a1082c33f7430dbe062cc9f597d6f441e43f659ef4e9e3ba7b9f
+DIST CPAN-Perl-Releases-3.22.tar.gz 24890 SHA256 3f665f0a9ee50b3dc8ffe71a355449ba6e5696b9faf736228f0c27b2311881af SHA512 ba91b5cc2f21316753e1e18b0d3105a0b3090f30333c5cc59149636841e35647f39191fa09dfd161d63aa5c57b1266b8866f47abd7d69fc23f0163546d812ade WHIRLPOOL d7a25456100b6caaddd543cb2ea9339d375440e74b95cf736f4721513f9131e11ab1db62f4be6796b658b446bef4d455fbcdbcbfe0ee8354d6a971042f5f5859
diff --git a/dev-perl/Config-Crontab/Config-Crontab-1.400.0.ebuild b/dev-perl/Config-Crontab/Config-Crontab-1.400.0.ebuild
deleted file mode 100644
index 20329f0bd15d..000000000000
--- a/dev-perl/Config-Crontab/Config-Crontab-1.400.0.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SCOTTW
-MODULE_VERSION=1.40
-inherit perl-module
-
-DESCRIPTION="Read/Write Vixie compatible crontab(5) files"
-LICENSE="Artistic"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-SRC_TEST="do"
diff --git a/dev-perl/Config-Crontab/Config-Crontab-1.410.0.ebuild b/dev-perl/Config-Crontab/Config-Crontab-1.410.0.ebuild
deleted file mode 100644
index 822f8a8253e8..000000000000
--- a/dev-perl/Config-Crontab/Config-Crontab-1.410.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SCOTTW
-DIST_VERSION=1.41
-DIST_EXAMPLES=("example/*")
-inherit perl-module
-
-DESCRIPTION="Read/Write Vixie compatible crontab(5) files"
-LICENSE="Artistic"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=""
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Config-Crontab/Manifest b/dev-perl/Config-Crontab/Manifest
index 772c7c9c4805..323f19ea7b6a 100644
--- a/dev-perl/Config-Crontab/Manifest
+++ b/dev-perl/Config-Crontab/Manifest
@@ -1,3 +1 @@
-DIST Config-Crontab-1.40.tar.gz 40769 SHA256 25b5893f2fb78ee1da82579afa627e8527d8ca86d08204e28283c455fe7ffb03 SHA512 1894868e92637aef1d5eaed22b8387ebe9546d0804d375e894e7acaed4eeece28dcf78eeb2658455885d1a6dc1683b0a6839c747dbd939f128d66df211d8e15f WHIRLPOOL 66f63cc7024955cd8da5dc3a999348f168b76f36773f251e6e4dbea79023379ea066fdd0d8a727813664f95fe32590a6a56f8842a58048ceb00db878bba6fad0
-DIST Config-Crontab-1.41.tar.gz 40838 SHA256 f47256336581976a5974240c35f66ef32a33ed85545cf1bb3b5f7b1b7bcb209e SHA512 d8df15532d5fd57453678eccf000e5a5c0cc51ddc466fc2b5e3580f81ae82f7390795ff011f90acbb5a728bbe1a90f113104d8b8f43361e756fe72ce4d35936e WHIRLPOOL cbf6829dee068a106444dbd09181d413329122a51547e861c3c9b4a0f37e62f2b87541f75a3e3bc94a16a25e62c78f348eed28fbe2b261165d85d342e6d4e490
DIST Config-Crontab-1.45.tar.gz 41420 SHA256 170f9f633afd52009f9b87a6a63b1071d574e27b853294eefa19249fc694255f SHA512 b4aa82341b113c698a8a5434ac406217877f27b5eb876d409a675daf8c9a5f5ed56cccac3a9e775437427691547b5c3b7829a5c35edee4c9fe33d9cace0879e9 WHIRLPOOL d574120e79a9441f2266d104fd11834f96cb5ad82dc4ce62b6a7c5ac04bb5583f0e59b4b2a10044eb9e94bb275d4db1c807fd8078d5afaad8ece76b1f9834f1c
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
index 6a885959e66b..e715d6389e22 100644
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Extract data from Macintosh BinHex files"
SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/CryptX/CryptX-0.48.0.ebuild b/dev-perl/CryptX/CryptX-0.48.0.ebuild
new file mode 100644
index 000000000000..c382275f7822
--- /dev/null
+++ b/dev-perl/CryptX/CryptX-0.48.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=MIK
+DIST_VERSION=0.048
+inherit perl-module
+
+DESCRIPTION="Self-contained crypto toolkit"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+
+RDEPEND="
+ >=virtual/perl-Exporter-5.590.0
+ !minimal? (
+ || ( dev-perl/JSON-XS virtual/perl-JSON-PP )
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ >=virtual/perl-Test-Simple-0.880.0
+ !minimal? (
+ >=virtual/perl-Math-BigInt-1.999.715
+ >=virtual/perl-Storable-2.0.0
+ )
+ )
+"
+
+src_test() {
+ perl_rm_files t/003_all_pm_pod.t
+ perl-module_src_test
+}
diff --git a/dev-perl/CryptX/Manifest b/dev-perl/CryptX/Manifest
index 145b3d0db962..f74431fd3392 100644
--- a/dev-perl/CryptX/Manifest
+++ b/dev-perl/CryptX/Manifest
@@ -1 +1,2 @@
DIST CryptX-0.047.tar.gz 1204369 SHA256 b96d266ee68a4ceea58dd11f4283e625b54b0cc55684e50a6838124689670b41 SHA512 7f4a146673fd116578b4a3ec3b18b48c6be1057d3369cd71fa5da78afd4bfd158b604260cead559034f5764453afbcf6822ee32e757e200f0d4bc5ffa29a554b WHIRLPOOL 6cc56cc6b6850e247a2582f07edad8ea58572c00d7d2eec25b8ffbbbe5794a1e3f85e25d9d4946420c42e856e1c1ec921426f11e6af40a7a9c21d0ce8377411c
+DIST CryptX-0.048.tar.gz 1257382 SHA256 89320a8626e86a0ae56ff9867760ee574808f59fb26c740dc862587904a0e6f5 SHA512 761f89ae167f419f222f810e16543912708849c3d60d944c6b15523e811d58f57ce8625dcdd813e951036107abe7b795eb9fded94e44510914222b8dafbedf7d WHIRLPOOL e8c9bfe77175122e6e1502f097224554583cecbb684ef600056bf925307b558004188440596aac0c943387b1e264b104542df910d598ee12abafa60946f395b5
diff --git a/dev-perl/CryptX/metadata.xml b/dev-perl/CryptX/metadata.xml
index 95d80b3275b3..c13e4f74704f 100644
--- a/dev-perl/CryptX/metadata.xml
+++ b/dev-perl/CryptX/metadata.xml
@@ -13,6 +13,7 @@
CryptX
Crypt::AuthEnc
Crypt::AuthEnc::CCM
+ Crypt::AuthEnc::ChaCha20Poly1305
Crypt::AuthEnc::EAX
Crypt::AuthEnc::GCM
Crypt::AuthEnc::OCB
@@ -44,6 +45,14 @@
Crypt::Cipher::Twofish
Crypt::Cipher::XTEA
Crypt::Digest
+ Crypt::Digest::BLAKE2b_160
+ Crypt::Digest::BLAKE2b_256
+ Crypt::Digest::BLAKE2b_384
+ Crypt::Digest::BLAKE2b_512
+ Crypt::Digest::BLAKE2s_128
+ Crypt::Digest::BLAKE2s_160
+ Crypt::Digest::BLAKE2s_224
+ Crypt::Digest::BLAKE2s_256
Crypt::Digest::CHAES
Crypt::Digest::MD2
Crypt::Digest::MD4
@@ -56,18 +65,26 @@
Crypt::Digest::SHA224
Crypt::Digest::SHA256
Crypt::Digest::SHA384
+ Crypt::Digest::SHA3_224
+ Crypt::Digest::SHA3_256
+ Crypt::Digest::SHA3_384
+ Crypt::Digest::SHA3_512
Crypt::Digest::SHA512
Crypt::Digest::SHA512_224
Crypt::Digest::SHA512_256
+ Crypt::Digest::SHAKE
Crypt::Digest::Tiger192
Crypt::Digest::Whirlpool
Crypt::KeyDerivation
Crypt::Mac
+ Crypt::Mac::BLAKE2b
+ Crypt::Mac::BLAKE2s
Crypt::Mac::F9
Crypt::Mac::HMAC
Crypt::Mac::OMAC
Crypt::Mac::PMAC
Crypt::Mac::Pelican
+ Crypt::Mac::Poly1305
Crypt::Mac::XCBC
Crypt::Misc
Crypt::Mode
@@ -82,10 +99,14 @@
Crypt::PK::ECC
Crypt::PK::RSA
Crypt::PRNG
+ Crypt::PRNG::ChaCha20
Crypt::PRNG::Fortuna
Crypt::PRNG::RC4
Crypt::PRNG::Sober128
Crypt::PRNG::Yarrow
+ Crypt::Stream::ChaCha
+ Crypt::Stream::RC4
+ Crypt::Stream::Sober128
CryptX
Math::BigInt::LTM
diff --git a/dev-perl/Data-FormValidator/Data-FormValidator-4.860.0-r1.ebuild b/dev-perl/Data-FormValidator/Data-FormValidator-4.860.0-r1.ebuild
new file mode 100644
index 000000000000..e91a4c28da9d
--- /dev/null
+++ b/dev-perl/Data-FormValidator/Data-FormValidator-4.860.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=DFARRELL
+DIST_VERSION=4.86
+inherit perl-module
+
+DESCRIPTION="Validates user input (usually from an HTML form) based on input profile"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/4.86-dot-in-inc.patch" )
+RDEPEND="dev-perl/Image-Size
+ >=dev-perl/Date-Calc-5.0
+ >=dev-perl/File-MMagic-1.17
+ >=dev-perl/MIME-Types-1.005
+ >=dev-perl/Regexp-Common-0.30.0
+ dev-perl/Email-Valid
+ virtual/perl-File-Spec
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+
+src_test() {
+ perl_rm_files t/pod.t
+ perl-module_src_test
+}
diff --git a/dev-perl/Data-FormValidator/files/4.86-dot-in-inc.patch b/dev-perl/Data-FormValidator/files/4.86-dot-in-inc.patch
new file mode 100644
index 000000000000..a6fdb276e42d
--- /dev/null
+++ b/dev-perl/Data-FormValidator/files/4.86-dot-in-inc.patch
@@ -0,0 +1,58 @@
+From bfc088aa911062d987c830d5bb56aa4afd0d3735 Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Sun, 4 Jun 2017 00:40:04 +1200
+Subject: [PATCH] Absolutize filenames during construction
+
+This way, any relative paths become absolute as soon as possible,
+so that if chdir happens between "new" and "load_profiles", the loaded
+file won't magically change.
+
+This also aims to turn the into a
+as the former no longer reads from "." since Perl 5.25.11, as paths
+with neither leading "./" or leading "/" imply @INC traversal.
+
+This aims to resolve RT#120671
+
+https://rt.cpan.org/Ticket/Display.html?id=120671
+https://bugs.gentoo.org/613378
+---
+ Makefile.PL | 1 +
+ lib/Data/FormValidator.pm | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.PL b/Makefile.PL
+index a9839a6..cef175a 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -19,6 +19,7 @@ WriteMakefile(
+ 'Regexp::Common' => 0.03, # when ::whitespace was added
+ 'Scalar::Util' => 0,
+ 'Email::Valid' => 0,
++ 'File::Spec' => 0,
+ },
+ (eval { ExtUtils::MakeMaker->VERSION(6.46) } ? (META_MERGE => {
+ 'meta-spec' => { version => 2 },
+diff --git a/lib/Data/FormValidator.pm b/lib/Data/FormValidator.pm
+index 7075dc4..bc0709e 100644
+--- a/lib/Data/FormValidator.pm
++++ b/lib/Data/FormValidator.pm
+@@ -24,6 +24,7 @@
+
+ package Data::FormValidator;
+ use Exporter 'import';
++use File::Spec qw();
+ use 5.008;
+
+ use Data::FormValidator::Results;
+@@ -147,7 +148,7 @@ sub new {
+ $profiles = $profiles_or_file;
+ }
+ else {
+- $file = $profiles_or_file;
++ $file = File::Spec->rel2abs( $profiles_or_file );
+ }
+
+
+--
+2.12.2
+
diff --git a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.140.0.ebuild b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.140.0.ebuild
deleted file mode 100644
index ded7a3cb71d7..000000000000
--- a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.140.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=SIXAPART
-DIST_VERSION=0.14
-inherit perl-module
-
-DESCRIPTION="Simple, transparent data interface, with caching"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-
-RDEPEND="dev-perl/Class-Trigger
- dev-perl/Class-Data-Inheritable
- dev-perl/Class-Accessor
- dev-perl/DBI
- virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
- >=dev-perl/Module-Build-Tiny-0.35.0
- >=virtual/perl-ExtUtils-MakeMaker-6.590.0
- test? (
- dev-perl/Test-Exception
- dev-perl/DBD-SQLite
- virtual/perl-version
- )
-"
-DIST_TEST="do"
diff --git a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.90.0-r1.ebuild b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.90.0-r1.ebuild
deleted file mode 100644
index 92725e705dde..000000000000
--- a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.90.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=SIXAPART
-MODULE_VERSION=0.09
-inherit perl-module
-
-DESCRIPTION="Simple, transparent data interface, with caching"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-
-RDEPEND="dev-perl/Class-Trigger
- dev-perl/Class-Data-Inheritable
- dev-perl/Class-Accessor
- dev-perl/DBI"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build
- test? ( dev-perl/Test-Exception
- dev-perl/DBD-SQLite )"
-
-SRC_TEST=do
diff --git a/dev-perl/Data-ObjectDriver/Manifest b/dev-perl/Data-ObjectDriver/Manifest
index 7abbee175f2d..f0dac89ef62c 100644
--- a/dev-perl/Data-ObjectDriver/Manifest
+++ b/dev-perl/Data-ObjectDriver/Manifest
@@ -1,3 +1 @@
-DIST Data-ObjectDriver-0.09.tar.gz 108863 SHA256 b0ffe505415dc3dfa14cab4236519d85308011ee31cd13578cd7c2a6bd944e1f SHA512 dae39750c787525de855caffef8819f3af6f48deeaa1916f824ad502fc0f3fd6badeb98b7b8699624493d75cb827f98588d2915617cf7376636de91cd1fce311 WHIRLPOOL 6abc45aedcacfc8ac49e8fde8f8c8d2280235d7677a559d225a5cfe2c6c233beb21f9926beb3852feb4cbd27d9ef6b61b4bc9793b2f753e11642a53a44949985
-DIST Data-ObjectDriver-0.14.tar.gz 84311 SHA256 ada52f63b42acc0c23caa54c4c17ca4c2f9f174af9470edc97ed2968fb6c075c SHA512 34a19e4f678fd0ebd0fa24f9f873ebf0bdac657dfb5bd480298abfa2859b53eb9cb00571a97bc0b969393530b992d112eda649fb545b49153b58c7322618683f WHIRLPOOL 76a1ddbbdf96b056119a3373b0dad93d0012e63714a03d00f4e870b3539314319ace62274df4b11ba44e8f50a23c285ab8261c3aa5a469d71038c433dbe40d70
DIST Data-ObjectDriver-0.15.tar.gz 84386 SHA256 ea5ce639ad1914dd9c19ebea94d8689e2d0bde9c21ab8eced4b97dbc649648d6 SHA512 5be77086f2aa646e9bc80fc8d3de2edb6726946a17149573efbce2bbe83d2ec1b294aa20cd66330f0827ee26a5113b9e02ea542111aed94804c0ccdce1e89c1b WHIRLPOOL 42aefdfc9d5a75893f72c66d11fc6cab6b44f04cb334c7fb13fae5608b04b96a6170fb6d3195fab5a3302c586e6bf2b863b1475a5e9af15edf98907ff59e00cf
diff --git a/dev-perl/Date-Manip/Date-Manip-6.510.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.510.0.ebuild
index 5f74d8994cb9..80e9134c98dd 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.510.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.510.0.ebuild
@@ -36,5 +36,5 @@ mydoc="HISTORY"
src_test() {
perl_rm_files t/pod_coverage.t t/pod.t
- perl-module_src_test
+ TZ=UTC perl-module_src_test
}
diff --git a/dev-perl/Date-Manip/Date-Manip-6.520.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.520.0.ebuild
index cdbefe8b1d3b..91656ab8096a 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.520.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.520.0.ebuild
@@ -34,5 +34,5 @@ mydoc="HISTORY"
src_test() {
perl_rm_files t/pod_coverage.t t/pod.t
- perl-module_src_test
+ TZ=UTC perl-module_src_test
}
diff --git a/dev-perl/Date-Manip/Date-Manip-6.560.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.560.0.ebuild
index 911ba475c8ac..ef055447d448 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.560.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.560.0.ebuild
@@ -36,5 +36,5 @@ DEPEND="${RDEPEND}
src_test() {
perl_rm_files t/pod_coverage.t t/pod.t
- perl-module_src_test
+ TZ=UTC perl-module_src_test
}
diff --git a/dev-perl/Date-Manip/Date-Manip-6.570.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.570.0.ebuild
index fd928284efd2..ccad9edb31e3 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.570.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.570.0.ebuild
@@ -33,5 +33,5 @@ DEPEND="${RDEPEND}
src_test() {
perl_rm_files t/pod_coverage.t t/pod.t
- perl-module_src_test
+ TZ=UTC perl-module_src_test
}
diff --git a/dev-perl/Date-Manip/Date-Manip-6.580.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.580.0.ebuild
index 0a571d62778e..0dc45263a219 100644
--- a/dev-perl/Date-Manip/Date-Manip-6.580.0.ebuild
+++ b/dev-perl/Date-Manip/Date-Manip-6.580.0.ebuild
@@ -33,5 +33,5 @@ DEPEND="${RDEPEND}
src_test() {
perl_rm_files t/pod_coverage.t t/pod.t
- perl-module_src_test
+ TZ=UTC perl-module_src_test
}
diff --git a/dev-perl/Date-Manip/Date-Manip-6.590.0.ebuild b/dev-perl/Date-Manip/Date-Manip-6.590.0.ebuild
new file mode 100644
index 000000000000..bbb5c27d7945
--- /dev/null
+++ b/dev-perl/Date-Manip/Date-Manip-6.590.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SBECK
+DIST_VERSION=6.59
+
+inherit perl-module
+
+DESCRIPTION="Perl date manipulation routines"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="elibc_musl test"
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-Encode
+ virtual/perl-File-Spec
+ virtual/perl-IO
+ virtual/perl-Storable
+ elibc_musl? ( sys-libs/timezone-data )
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.670.100
+ test? (
+ dev-perl/Test-Inter
+ virtual/perl-Test-Simple
+ )
+"
+
+src_test() {
+ perl_rm_files t/pod_coverage.t t/pod.t
+ TZ=UTC perl-module_src_test
+}
diff --git a/dev-perl/Date-Manip/Manifest b/dev-perl/Date-Manip/Manifest
index a82767657ced..78a771945798 100644
--- a/dev-perl/Date-Manip/Manifest
+++ b/dev-perl/Date-Manip/Manifest
@@ -3,3 +3,4 @@ DIST Date-Manip-6.52.tar.gz 1833161 SHA256 3f7b31a0d9f47a111e1a128e708d4c1ee0f68
DIST Date-Manip-6.56.tar.gz 1829314 SHA256 acae07026b84d157f161d569b41026f4770e72872a5c7d70c295e2083a1ff5ec SHA512 1faf36ab2d96b5841ffd408b981818cb86ca12c327adbc2b29e8369ab63d9cd6a57b1cce232ad46333945d0be4b155761038df19da3f1a0a3f3b66d817c41337 WHIRLPOOL 83b4fddc154dbc9ecb0b29e19e40f41fdd364d9312e7f0c53ad835fbf0bb19bf5bc0c8918feef5b266ac4403b48c02ac133982b46ff7be140412df60afd8e5a8
DIST Date-Manip-6.57.tar.gz 1831444 SHA256 864c1e71a62db5f58fd570ddf82259feb025203a58187fdddec96824f54e2f76 SHA512 c2dbe195cfcc4c60f5b120fb4af0d487a6d3713b874f48a78c0ebf32364c2062c68e03bbc72a9ad54c25a3b6dada7a3b2041f16755665e93206de1320a88ba9a WHIRLPOOL ea35b247c79cafaa57f7ca391f3445f8936278f2d184b42dbb63f970759cbe4c6d2c75186cba9ec545215a071348267a6a9d6d66707ddcd498a73613ef6531e3
DIST Date-Manip-6.58.tar.gz 1820488 SHA256 485eec6c00141c477941598de7081746f57365b9705d4a751fb1d164ded2b363 SHA512 f2f2b7e5655f31135134284a993194777313ca1f07e8869daf4850a48dbe8e5fe7fccdcd1caa82d07234fd29e5f1c74e44bc2c3c10cc6f84541b317493b40c6d WHIRLPOOL a7555c44531e07afdebcd2221e58985e9f6008b93a4f875fe76cdc85eb501def37bda103b60a7639cb5ae4d4e36ba77ab3076e17bf53c6d69fe1e3925abcad96
+DIST Date-Manip-6.59.tar.gz 1825069 SHA256 50c71db870008dfd22f42e2e55a392a9a337a44ebbc86e98be5d209b5b0b8a12 SHA512 ec1217cdedf4901d4b1165f1d4e1213c66a49144f7d06fba697d1216cd9e59a900ef441b9fab98990b0ef9e54a88ac27e27c336dfafcc19a1e9343c9a1e7c801 WHIRLPOOL 703afccadda458a94357590a094e275834cba473c38b2fd767e3d2ff9bc03873cfe466de5bc751a0b8e543d5de5260bc2eaffd34986c880a94ff1ca9e93c603a
diff --git a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.60.0-r1.ebuild b/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.60.0-r1.ebuild
deleted file mode 100644
index 2de2086588cd..000000000000
--- a/dev-perl/DateTime-Format-W3CDTF/DateTime-Format-W3CDTF-0.60.0-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=GWILLIAMS
-MODULE_VERSION=0.06
-inherit perl-module
-
-DESCRIPTION="Parse and format W3CDTF datetime strings"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/DateTime"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build"
-
-SRC_TEST="do"
diff --git a/dev-perl/DateTime-Format-W3CDTF/Manifest b/dev-perl/DateTime-Format-W3CDTF/Manifest
index 3be56848b049..6ce960e7cc3c 100644
--- a/dev-perl/DateTime-Format-W3CDTF/Manifest
+++ b/dev-perl/DateTime-Format-W3CDTF/Manifest
@@ -1,2 +1 @@
-DIST DateTime-Format-W3CDTF-0.06.tar.gz 29825 SHA256 b9a542bed9c52b0a89dd590a5184e38ee334c824bbe6bac842dd7dd1f88fbd7a SHA512 2c4155850880b9325091a47670b37d90f6d8ef1d89cd62d6d139c2e35e1d185c37b00be1edf47a352b906114e4122e3b45759eee150d3aaaf6bdddc266b87255 WHIRLPOOL 9f740968eeacb26ef247d2a7c9a073e6de7099e7e9f16c9c89a844366ff587227b7675321e37fd794a5bd7950d080a71fc03e353b3d189121db70a9ead4e6d55
DIST DateTime-Format-W3CDTF-0.07.tar.gz 29598 SHA256 69a02b661bbf1daa14a4813cb6786eaa66dbdf2743f0b3f458e30234c3a26268 SHA512 f5b8f3437c4e9a7e192900af16e83a567889dbdf1a934d604461c5096c271b497cda9bd4f9359658f536d262232e4521519f92c06bf07712922403baf6429c64 WHIRLPOOL 65c01fc6da006c26f44760bbe7e18bbe953657a6c2af23d1fb9752f91e1c057ae8476cd6fb6ab9e7544e4ac5a35743cb5bf44d3636663d6aabb3eedec27b60c3
diff --git a/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.43.0.ebuild b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.43.0.ebuild
new file mode 100644
index 000000000000..bc35aff565be
--- /dev/null
+++ b/dev-perl/Glib-Object-Introspection/Glib-Object-Introspection-0.43.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=XAOC
+DIST_VERSION=0.043
+inherit perl-module xdg-utils
+
+DESCRIPTION="Dynamically create Perl language bindings"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-perl/glib-perl-1.320.0
+ >=dev-libs/gobject-introspection-1.0
+ >=dev-libs/libffi-3.0.0
+ >=dev-libs/glib-2.0.0
+"
+DEPEND="
+ >=dev-perl/ExtUtils-Depends-0.300.0
+ >=dev-perl/ExtUtils-PkgConfig-1.0.0
+ ${RDEPEND}
+"
+
+pkg_setup() {
+ xdg_environment_reset # bug #599128
+}
diff --git a/dev-perl/Glib-Object-Introspection/Manifest b/dev-perl/Glib-Object-Introspection/Manifest
index 3d4a2a652806..52b18c9f376a 100644
--- a/dev-perl/Glib-Object-Introspection/Manifest
+++ b/dev-perl/Glib-Object-Introspection/Manifest
@@ -1,2 +1,3 @@
DIST Glib-Object-Introspection-0.040.tar.gz 79009 SHA256 515d6af0e085c9cbed3f1a1215d1fae46dac31a8459dc950f896f368df1488bb SHA512 bd5e4db8b6e331fb9641e75a50a95fff1a823597a8e4c4e9f99a81e7aa2ee30d93856c56ecfea3785b8719dba6590169bcd006ea06d97170889091e6b9480e9f WHIRLPOOL 875399d816076495a667df589d1dcfaa0486caab9990389d4af75445ee536c59dfb6658050ce4db65509cda8e5df8285de8b2b2a1f5dc729c6ddc9ca3f99bd18
DIST Glib-Object-Introspection-0.042.tar.gz 80942 SHA256 0101aa45417a80a066fae198e37dc9814abf24afab454d72909070ab5c8293d9 SHA512 a91ba7d553187ed0eb6b35bd68c70de40c82d5e42422ec0a370fa77268cc5b81be3b9b76947ceaf78541224bd188ab902f12be7a5e0efaf94638fea39ba57ba0 WHIRLPOOL dfdffa01b1d89c645cf1149f0295f32f27472ed938c2499ae1d6c6825e368826ef3cf85af348bbe3bb0178c807dd92e94d0328e86330010c94ba908e0a92990e
+DIST Glib-Object-Introspection-0.043.tar.gz 80985 SHA256 5a0b7c69d9c8c2ecfdf7340e414954ea5edc43a7999eff9b3278bd95e3e7df30 SHA512 b812ac4faca2f1df1192f7ac2374f5552811c353a363a33b3e6877c568ef68f0b4e1b8181a4738988017150317eb27e43976989cca802e7ba24d2a3cc2fa537e WHIRLPOOL 4d348575e4d4c3bfd2dc9e076816114f4016e8cf6350e1913d72b8cd5e11028bc9e90a91912d74db65a1fe1057fdf16d05de33d10bab9ea8ba5268132638f817
diff --git a/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.14.0.ebuild b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.14.0.ebuild
new file mode 100644
index 000000000000..6e8ded53ff39
--- /dev/null
+++ b/dev-perl/Google-Ads-AdWords-Client/Google-Ads-AdWords-Client-4.14.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+DIST_AUTHOR=SUNDQUIST
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Google AdWords API Perl Client Library"
+HOMEPAGE="https://github.com/googleads/googleads-perl-lib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+PATCHES=(
+ "${FILESDIR}/4.14.0-no-dot-in-inc.patch"
+ "${FILESDIR}/4.14.0-unescaped-lbracket.patch"
+)
+RDEPEND="
+ dev-perl/Class-Load
+ >=dev-perl/Class-Std-Fast-0.0.5
+ dev-perl/Crypt-OpenSSL-RSA
+ dev-perl/File-HomeDir
+ virtual/perl-File-Spec
+ dev-perl/IO-Socket-SSL
+ dev-perl/JSON-Parse
+ dev-perl/LWP-Protocol-https
+ dev-perl/libwww-perl
+ dev-perl/Log-Log4perl
+ >=dev-perl/SOAP-WSDL-2.00.10
+ virtual/perl-Scalar-List-Utils
+ dev-perl/Template-Toolkit
+ dev-perl/URI
+ dev-perl/XML-Simple
+ dev-perl/XML-XPath
+ examples? (
+ virtual/perl-Digest-SHA
+ virtual/perl-File-Temp
+ dev-perl/HTTP-Server-Simple
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.400.0
+ test? (
+ dev-perl/Config-Properties
+ dev-perl/Data-Uniqid
+ virtual/perl-File-Temp
+ dev-perl/Test-Deep
+ dev-perl/Test-Exception
+ dev-perl/Test-MockObject
+ virtual/perl-Test-Simple
+ )
+"
diff --git a/dev-perl/Google-Ads-AdWords-Client/Manifest b/dev-perl/Google-Ads-AdWords-Client/Manifest
index a247820d81c7..a4f016f41d8c 100644
--- a/dev-perl/Google-Ads-AdWords-Client/Manifest
+++ b/dev-perl/Google-Ads-AdWords-Client/Manifest
@@ -1,2 +1,3 @@
DIST Google-Ads-AdWords-Client-4.11.0.tar.gz 4863360 SHA256 5117987ac8600e0c70342bfb8ed3ac355b4b79af3d30ee27e39ed438fba992ac SHA512 c4209469889d6359779f8153684e5c93d9db837b27c8de6fb96384def3a0dcd7b4815c5a37f21041f0a052d1273e3a2ea9b76f5f15071e9ee3c96f89e19cda3a WHIRLPOOL ec68c41c2b24d26373aeb776cf28e11804b7afc08f8c61fd6d8f6a1376061922a86fbcb2d74650510e1a81a086d812d0114609550fed5ad128ec1255b757224f
DIST Google-Ads-AdWords-Client-4.13.0.tar.gz 5567923 SHA256 c5594f5d3836511272df44224e7905ee2e33b74476a4d8d6920d9d3998901e62 SHA512 7559410470c45c0ad2739c4206618eb86d371a3b1333f5e97a52399eacf9d002b28cba4412c0d043e7f064967061903e7b8b179029270cbe43b1d270531f9350 WHIRLPOOL 7aadb6707b092ce45d9a9c3e9c9a0eb3369addbe8c251ce382c29d1455d3f7a0da0f367025e2d1c7ee7d33bec6199c2ced50b4e06f778573ace6dc009e8868d3
+DIST Google-Ads-AdWords-Client-4.14.0.tar.gz 7757731 SHA256 dfe96f306631fa50db95fa4e43e07da1e888e539a697ce7c7af3372f75bfa55d SHA512 e9a90400620a14062b97b14752f5f28df9fe16c84efd09bc6fa9968c4d97672d31bbe9737efc965a7c7321825a52bb1d8e8c4c415f51c6794f7da83bfb71f3c6 WHIRLPOOL 68b6b625fe6f1a6c9e5945ec355225fb95035f1554724448500b527599eb330323dadc3f18f8f162e4c09b0f29b7169623e037bff657005661cbeda6d40b32c0
diff --git a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch
new file mode 100644
index 000000000000..218cb69b1483
--- /dev/null
+++ b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-no-dot-in-inc.patch
@@ -0,0 +1,83 @@
+From a67324b5622088422b0b0c1a403c594312452d16 Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Sun, 4 Jun 2017 07:35:25 +1200
+Subject: [PATCH 1/3] t/001_require.t: Force a relative path load for require
+ test
+
+require_ok("Foo") is implemented in terms of require "Foo"
+
+This means:
+
+require "Foo.pm"
+
+Only loads "Foo.pm" from "." if:
+
+- '.' is in @INC ( Not true by default in Perl >5.25.11 )
+- Foo.pm is not installed in Perl5lib ( dangerous assumption )
+
+This forces require to side-step @INC traversal by using an explicit
+prefix of "./", which is special-cased in require.
+
+This fixes RT#120674
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=120674
+---
+ t/001_require.t | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/001_require.t b/t/001_require.t
+index fe0d205..d70b2d2 100755
+--- a/t/001_require.t
++++ b/t/001_require.t
+@@ -24,7 +24,7 @@ use File::Spec;
+ use Test::More qw(no_plan);
+
+ # Set up @INC at runtime with an absolute path.
+-my $lib_path = File::Spec->catdir(dirname($0), "..", "lib");
++my $lib_path = File::Spec->rel2abs(File::Spec->catdir(dirname($0), "..", "lib"));
+ push(@INC, $lib_path);
+
+ require_ok 'Google::Ads::AdWords::Client';
+@@ -38,6 +38,6 @@ sub test_require {
+ local $SIG{__WARN__} = sub {
+ warn @_ unless $_[0] =~ /redefine/;
+ };
+- require_ok($file_name);
++ require_ok("./$file_name");
+ }
+ }
+--
+2.12.2
+
+From 76f5a421585b8c85b7e39b91adb0b257d1d83665 Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Sun, 4 Jun 2017 07:40:01 +1200
+Subject: [PATCH 2/3] t/020_GenerateOfflineCredentials.t: Force relative path
+ for script
+
+require "some/path.pl" previously fell into worknig due to '.' being
+in @INC, as this still invokes @INC traversal
+
+This change simply forces a "./" so that Perl uses direct access via
+a special-cased path instead of relying on @INC traversal, which becomes
+unsafe to depend on since Perl 5.25.11
+---
+ t/020_GenerateOfflineCredentials.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/020_GenerateOfflineCredentials.t b/t/020_GenerateOfflineCredentials.t
+index 0dcde9d..dfa8b50 100755
+--- a/t/020_GenerateOfflineCredentials.t
++++ b/t/020_GenerateOfflineCredentials.t
+@@ -51,7 +51,7 @@ my $stdout;
+ open(STDOUT, ">", \$stdout);
+
+ # Calling the offline credentials code
+-require qw(examples/oauth/generate_offline_credentials.pl);
++require qw(./examples/oauth/generate_offline_credentials.pl);
+ ok(generate_offline_credentials($client));
+
+ # Checking the auth mock was correctly called
+--
+2.12.2
+
diff --git a/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch
new file mode 100644
index 000000000000..4e7a4546f9cd
--- /dev/null
+++ b/dev-perl/Google-Ads-AdWords-Client/files/4.14.0-unescaped-lbracket.patch
@@ -0,0 +1,46 @@
+From a7e92591ac0415fbb7119e4ad7572f910e4fdb8f Mon Sep 17 00:00:00 2001
+From: Kent Fredric
+Date: Sun, 4 Jun 2017 07:43:59 +1200
+Subject: [PATCH 3/3] Fix unescaped "{" error in tests t/022* and t/024*
+
+Perl 5.26 makes use of literal unescaped { in a regex illegal,
+and this leads to test failures.
+
+This change simply quotes the offending characters to make tests pass.
+
+This closes RT#118509
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=118509
+---
+ t/022_ReportUtils.t | 2 +-
+ t/024_BatchJobHandler.t | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/022_ReportUtils.t b/t/022_ReportUtils.t
+index 4f5f326..d0e2000 100755
+--- a/t/022_ReportUtils.t
++++ b/t/022_ReportUtils.t
+@@ -57,7 +57,7 @@ my $report_as_string = $report_handler->get_as_string();
+ ok(!$report_as_string, "report as string");
+ ok($report_as_string->isa("Google::Ads::Common::ReportDownloadError"),
+ "check report handler->report_as_string return type");
+-ok($report_as_string =~ /ReportDownloadError\s{[^}]+}/,
++ok($report_as_string =~ /ReportDownloadError\s\{[^}]+}/,
+ "check ReportDownloadError STRINGIFY");
+
+ my ($fh, $filename) = tempfile();
+diff --git a/t/024_BatchJobHandler.t b/t/024_BatchJobHandler.t
+index 15983ae..4b86703 100755
+--- a/t/024_BatchJobHandler.t
++++ b/t/024_BatchJobHandler.t
+@@ -133,6 +133,6 @@ my $batch_job_handler_error =
+ description => "test"
+ });
+ ok(!$batch_job_handler_error, "BOOLIFY on error false");
+-ok($batch_job_handler_error =~ /BatchJobHandlerError\s{[^}]+}/,
++ok($batch_job_handler_error =~ /BatchJobHandlerError\s\{[^}]+}/,
+ "check BatchJobHandlerError STRINGIFY");
+
+--
+2.12.2
+
diff --git a/dev-perl/Google-Ads-AdWords-Client/metadata.xml b/dev-perl/Google-Ads-AdWords-Client/metadata.xml
index 0232c1b06907..57765fd8a784 100644
--- a/dev-perl/Google-Ads-AdWords-Client/metadata.xml
+++ b/dev-perl/Google-Ads-AdWords-Client/metadata.xml
@@ -3886,6 +3886,1364 @@
Google::Ads::AdWords::v201702::WebsiteCallMetricsConversion
Google::Ads::AdWords::v201702::YouTubeChannel
Google::Ads::AdWords::v201702::YouTubeVideo
+ Google::Ads::AdWords::v201705::AccessReason
+ Google::Ads::AdWords::v201705::AccountLabel
+ Google::Ads::AdWords::v201705::AccountLabelOperation
+ Google::Ads::AdWords::v201705::AccountLabelPage
+ Google::Ads::AdWords::v201705::AccountLabelReturnValue
+ Google::Ads::AdWords::v201705::AccountLabelService::AccountLabelServiceInterfacePort
+ Google::Ads::AdWords::v201705::AccountLabelService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AccountLabelService::RequestHeader
+ Google::Ads::AdWords::v201705::AccountLabelService::ResponseHeader
+ Google::Ads::AdWords::v201705::AccountLabelService::get
+ Google::Ads::AdWords::v201705::AccountLabelService::getResponse
+ Google::Ads::AdWords::v201705::AccountLabelService::mutate
+ Google::Ads::AdWords::v201705::AccountLabelService::mutateResponse
+ Google::Ads::AdWords::v201705::AccountUserListStatus
+ Google::Ads::AdWords::v201705::Ad
+ Google::Ads::AdWords::v201705::Ad::Type
+ Google::Ads::AdWords::v201705::AdCallMetricsConversion
+ Google::Ads::AdWords::v201705::AdCustomizerError
+ Google::Ads::AdWords::v201705::AdCustomizerError::Reason
+ Google::Ads::AdWords::v201705::AdCustomizerFeed
+ Google::Ads::AdWords::v201705::AdCustomizerFeedAttribute
+ Google::Ads::AdWords::v201705::AdCustomizerFeedAttribute::Type
+ Google::Ads::AdWords::v201705::AdCustomizerFeedError
+ Google::Ads::AdWords::v201705::AdCustomizerFeedError::Reason
+ Google::Ads::AdWords::v201705::AdCustomizerFeedOperation
+ Google::Ads::AdWords::v201705::AdCustomizerFeedPage
+ Google::Ads::AdWords::v201705::AdCustomizerFeedReturnValue
+ Google::Ads::AdWords::v201705::AdCustomizerFeedService::AdCustomizerFeedServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdCustomizerFeedService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdCustomizerFeedService::RequestHeader
+ Google::Ads::AdWords::v201705::AdCustomizerFeedService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdCustomizerFeedService::get
+ Google::Ads::AdWords::v201705::AdCustomizerFeedService::getResponse
+ Google::Ads::AdWords::v201705::AdCustomizerFeedService::mutate
+ Google::Ads::AdWords::v201705::AdCustomizerFeedService::mutateResponse
+ Google::Ads::AdWords::v201705::AdError
+ Google::Ads::AdWords::v201705::AdError::Reason
+ Google::Ads::AdWords::v201705::AdGroup
+ Google::Ads::AdWords::v201705::AdGroup::Status
+ Google::Ads::AdWords::v201705::AdGroupAd
+ Google::Ads::AdWords::v201705::AdGroupAd::Status
+ Google::Ads::AdWords::v201705::AdGroupAdCountLimitExceeded
+ Google::Ads::AdWords::v201705::AdGroupAdError
+ Google::Ads::AdWords::v201705::AdGroupAdError::Reason
+ Google::Ads::AdWords::v201705::AdGroupAdLabel
+ Google::Ads::AdWords::v201705::AdGroupAdLabelOperation
+ Google::Ads::AdWords::v201705::AdGroupAdLabelReturnValue
+ Google::Ads::AdWords::v201705::AdGroupAdOperation
+ Google::Ads::AdWords::v201705::AdGroupAdPage
+ Google::Ads::AdWords::v201705::AdGroupAdPolicySummary
+ Google::Ads::AdWords::v201705::AdGroupAdReturnValue
+ Google::Ads::AdWords::v201705::AdGroupAdService::AdGroupAdServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdGroupAdService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdGroupAdService::RequestHeader
+ Google::Ads::AdWords::v201705::AdGroupAdService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdGroupAdService::get
+ Google::Ads::AdWords::v201705::AdGroupAdService::getResponse
+ Google::Ads::AdWords::v201705::AdGroupAdService::mutate
+ Google::Ads::AdWords::v201705::AdGroupAdService::mutateLabel
+ Google::Ads::AdWords::v201705::AdGroupAdService::mutateLabelResponse
+ Google::Ads::AdWords::v201705::AdGroupAdService::mutateResponse
+ Google::Ads::AdWords::v201705::AdGroupAdService::query
+ Google::Ads::AdWords::v201705::AdGroupAdService::queryResponse
+ Google::Ads::AdWords::v201705::AdGroupAdService::upgradeUrl
+ Google::Ads::AdWords::v201705::AdGroupAdService::upgradeUrlResponse
+ Google::Ads::AdWords::v201705::AdGroupBidLandscape
+ Google::Ads::AdWords::v201705::AdGroupBidLandscape::Type
+ Google::Ads::AdWords::v201705::AdGroupBidLandscapePage
+ Google::Ads::AdWords::v201705::AdGroupBidModifier
+ Google::Ads::AdWords::v201705::AdGroupBidModifierOperation
+ Google::Ads::AdWords::v201705::AdGroupBidModifierPage
+ Google::Ads::AdWords::v201705::AdGroupBidModifierReturnValue
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::AdGroupBidModifierServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::RequestHeader
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::get
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::getResponse
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::mutate
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::mutateResponse
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::query
+ Google::Ads::AdWords::v201705::AdGroupBidModifierService::queryResponse
+ Google::Ads::AdWords::v201705::AdGroupChangeData
+ Google::Ads::AdWords::v201705::AdGroupCriterion
+ Google::Ads::AdWords::v201705::AdGroupCriterionError
+ Google::Ads::AdWords::v201705::AdGroupCriterionError::Reason
+ Google::Ads::AdWords::v201705::AdGroupCriterionLabel
+ Google::Ads::AdWords::v201705::AdGroupCriterionLabelOperation
+ Google::Ads::AdWords::v201705::AdGroupCriterionLabelReturnValue
+ Google::Ads::AdWords::v201705::AdGroupCriterionLimitExceeded
+ Google::Ads::AdWords::v201705::AdGroupCriterionLimitExceeded::CriteriaLimitType
+ Google::Ads::AdWords::v201705::AdGroupCriterionOperation
+ Google::Ads::AdWords::v201705::AdGroupCriterionPage
+ Google::Ads::AdWords::v201705::AdGroupCriterionReturnValue
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::AdGroupCriterionServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::RequestHeader
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::get
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::getResponse
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::mutate
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::mutateLabel
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::mutateLabelResponse
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::mutateResponse
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::query
+ Google::Ads::AdWords::v201705::AdGroupCriterionService::queryResponse
+ Google::Ads::AdWords::v201705::AdGroupEstimate
+ Google::Ads::AdWords::v201705::AdGroupEstimateRequest
+ Google::Ads::AdWords::v201705::AdGroupExtensionSetting
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingOperation
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingPage
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingReturnValue
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::AdGroupExtensionSettingServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::RequestHeader
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::get
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::getResponse
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::mutate
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::mutateResponse
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::query
+ Google::Ads::AdWords::v201705::AdGroupExtensionSettingService::queryResponse
+ Google::Ads::AdWords::v201705::AdGroupFeed
+ Google::Ads::AdWords::v201705::AdGroupFeed::Status
+ Google::Ads::AdWords::v201705::AdGroupFeedError
+ Google::Ads::AdWords::v201705::AdGroupFeedError::Reason
+ Google::Ads::AdWords::v201705::AdGroupFeedOperation
+ Google::Ads::AdWords::v201705::AdGroupFeedPage
+ Google::Ads::AdWords::v201705::AdGroupFeedReturnValue
+ Google::Ads::AdWords::v201705::AdGroupFeedService::AdGroupFeedServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdGroupFeedService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdGroupFeedService::RequestHeader
+ Google::Ads::AdWords::v201705::AdGroupFeedService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdGroupFeedService::get
+ Google::Ads::AdWords::v201705::AdGroupFeedService::getResponse
+ Google::Ads::AdWords::v201705::AdGroupFeedService::mutate
+ Google::Ads::AdWords::v201705::AdGroupFeedService::mutateResponse
+ Google::Ads::AdWords::v201705::AdGroupFeedService::query
+ Google::Ads::AdWords::v201705::AdGroupFeedService::queryResponse
+ Google::Ads::AdWords::v201705::AdGroupLabel
+ Google::Ads::AdWords::v201705::AdGroupLabelOperation
+ Google::Ads::AdWords::v201705::AdGroupLabelReturnValue
+ Google::Ads::AdWords::v201705::AdGroupOperation
+ Google::Ads::AdWords::v201705::AdGroupPage
+ Google::Ads::AdWords::v201705::AdGroupReturnValue
+ Google::Ads::AdWords::v201705::AdGroupService::AdGroupServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdGroupService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdGroupService::RequestHeader
+ Google::Ads::AdWords::v201705::AdGroupService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdGroupService::get
+ Google::Ads::AdWords::v201705::AdGroupService::getResponse
+ Google::Ads::AdWords::v201705::AdGroupService::mutate
+ Google::Ads::AdWords::v201705::AdGroupService::mutateLabel
+ Google::Ads::AdWords::v201705::AdGroupService::mutateLabelResponse
+ Google::Ads::AdWords::v201705::AdGroupService::mutateResponse
+ Google::Ads::AdWords::v201705::AdGroupService::query
+ Google::Ads::AdWords::v201705::AdGroupService::queryResponse
+ Google::Ads::AdWords::v201705::AdGroupServiceError
+ Google::Ads::AdWords::v201705::AdGroupServiceError::Reason
+ Google::Ads::AdWords::v201705::AdGroupType
+ Google::Ads::AdWords::v201705::AdParam
+ Google::Ads::AdWords::v201705::AdParamError
+ Google::Ads::AdWords::v201705::AdParamError::Reason
+ Google::Ads::AdWords::v201705::AdParamOperation
+ Google::Ads::AdWords::v201705::AdParamPage
+ Google::Ads::AdWords::v201705::AdParamPolicyError
+ Google::Ads::AdWords::v201705::AdParamService::AdParamServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdParamService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdParamService::RequestHeader
+ Google::Ads::AdWords::v201705::AdParamService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdParamService::get
+ Google::Ads::AdWords::v201705::AdParamService::getResponse
+ Google::Ads::AdWords::v201705::AdParamService::mutate
+ Google::Ads::AdWords::v201705::AdParamService::mutateResponse
+ Google::Ads::AdWords::v201705::AdSchedule
+ Google::Ads::AdWords::v201705::AdServingOptimizationStatus
+ Google::Ads::AdWords::v201705::AdSharingError
+ Google::Ads::AdWords::v201705::AdSharingError::Reason
+ Google::Ads::AdWords::v201705::AdUnionId
+ Google::Ads::AdWords::v201705::AdUrlUpgrade
+ Google::Ads::AdWords::v201705::AdWordsConversionTracker
+ Google::Ads::AdWords::v201705::AdWordsConversionTracker::TextFormat
+ Google::Ads::AdWords::v201705::AdWordsConversionTracker::TrackingCodeType
+ Google::Ads::AdWords::v201705::Address
+ Google::Ads::AdWords::v201705::AddressInfo
+ Google::Ads::AdWords::v201705::AdvertisingChannelSubType
+ Google::Ads::AdWords::v201705::AdvertisingChannelType
+ Google::Ads::AdWords::v201705::AdwordsUserListService::AdwordsUserListServiceInterfacePort
+ Google::Ads::AdWords::v201705::AdwordsUserListService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::AdwordsUserListService::RequestHeader
+ Google::Ads::AdWords::v201705::AdwordsUserListService::ResponseHeader
+ Google::Ads::AdWords::v201705::AdwordsUserListService::get
+ Google::Ads::AdWords::v201705::AdwordsUserListService::getResponse
+ Google::Ads::AdWords::v201705::AdwordsUserListService::mutate
+ Google::Ads::AdWords::v201705::AdwordsUserListService::mutateMembers
+ Google::Ads::AdWords::v201705::AdwordsUserListService::mutateMembersResponse
+ Google::Ads::AdWords::v201705::AdwordsUserListService::mutateResponse
+ Google::Ads::AdWords::v201705::AdwordsUserListService::query
+ Google::Ads::AdWords::v201705::AdwordsUserListService::queryResponse
+ Google::Ads::AdWords::v201705::AdxError
+ Google::Ads::AdWords::v201705::AdxError::Reason
+ Google::Ads::AdWords::v201705::AffiliateLocationFeedData
+ Google::Ads::AdWords::v201705::AgeRange
+ Google::Ads::AdWords::v201705::AgeRange::AgeRangeType
+ Google::Ads::AdWords::v201705::ApiError
+ Google::Ads::AdWords::v201705::ApiException
+ Google::Ads::AdWords::v201705::AppConversion
+ Google::Ads::AdWords::v201705::AppConversion::AppConversionType
+ Google::Ads::AdWords::v201705::AppConversion::AppPlatform
+ Google::Ads::AdWords::v201705::AppFeedItem
+ Google::Ads::AdWords::v201705::AppFeedItem::AppStore
+ Google::Ads::AdWords::v201705::AppPaymentModel
+ Google::Ads::AdWords::v201705::AppPaymentModel::AppPaymentModelType
+ Google::Ads::AdWords::v201705::AppPostbackUrlError
+ Google::Ads::AdWords::v201705::AppPostbackUrlError::Reason
+ Google::Ads::AdWords::v201705::AppUrl
+ Google::Ads::AdWords::v201705::AppUrl::OsType
+ Google::Ads::AdWords::v201705::AppUrlList
+ Google::Ads::AdWords::v201705::ApplicationException
+ Google::Ads::AdWords::v201705::ApprovalStatus
+ Google::Ads::AdWords::v201705::Attribute
+ Google::Ads::AdWords::v201705::AttributeFieldMapping
+ Google::Ads::AdWords::v201705::AttributeType
+ Google::Ads::AdWords::v201705::AttributionModelType
+ Google::Ads::AdWords::v201705::Audio
+ Google::Ads::AdWords::v201705::AudioError
+ Google::Ads::AdWords::v201705::AudioError::Reason
+ Google::Ads::AdWords::v201705::AuthenticationError
+ Google::Ads::AdWords::v201705::AuthenticationError::Reason
+ Google::Ads::AdWords::v201705::AuthorizationError
+ Google::Ads::AdWords::v201705::AuthorizationError::Reason
+ Google::Ads::AdWords::v201705::BasicUserList
+ Google::Ads::AdWords::v201705::BatchJob
+ Google::Ads::AdWords::v201705::BatchJobError
+ Google::Ads::AdWords::v201705::BatchJobError::Reason
+ Google::Ads::AdWords::v201705::BatchJobOperation
+ Google::Ads::AdWords::v201705::BatchJobOpsService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::BatchJobOpsService::BatchJobOpsServiceInterfacePort
+ Google::Ads::AdWords::v201705::BatchJobOpsService::mutate
+ Google::Ads::AdWords::v201705::BatchJobOpsService::mutateResponse
+ Google::Ads::AdWords::v201705::BatchJobPage
+ Google::Ads::AdWords::v201705::BatchJobProcessingError
+ Google::Ads::AdWords::v201705::BatchJobProcessingError::Reason
+ Google::Ads::AdWords::v201705::BatchJobReturnValue
+ Google::Ads::AdWords::v201705::BatchJobService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::BatchJobService::BatchJobServiceInterfacePort
+ Google::Ads::AdWords::v201705::BatchJobService::RequestHeader
+ Google::Ads::AdWords::v201705::BatchJobService::ResponseHeader
+ Google::Ads::AdWords::v201705::BatchJobService::get
+ Google::Ads::AdWords::v201705::BatchJobService::getResponse
+ Google::Ads::AdWords::v201705::BatchJobService::mutate
+ Google::Ads::AdWords::v201705::BatchJobService::mutateResponse
+ Google::Ads::AdWords::v201705::BatchJobService::query
+ Google::Ads::AdWords::v201705::BatchJobService::queryResponse
+ Google::Ads::AdWords::v201705::BatchJobStatus
+ Google::Ads::AdWords::v201705::Bid
+ Google::Ads::AdWords::v201705::BidLandscape
+ Google::Ads::AdWords::v201705::BidLandscape::LandscapePoint
+ Google::Ads::AdWords::v201705::BidModifierSource
+ Google::Ads::AdWords::v201705::BidSource
+ Google::Ads::AdWords::v201705::BiddableAdGroupCriterion
+ Google::Ads::AdWords::v201705::BiddingErrors
+ Google::Ads::AdWords::v201705::BiddingErrors::Reason
+ Google::Ads::AdWords::v201705::BiddingScheme
+ Google::Ads::AdWords::v201705::BiddingStrategyConfiguration
+ Google::Ads::AdWords::v201705::BiddingStrategyError
+ Google::Ads::AdWords::v201705::BiddingStrategyError::Reason
+ Google::Ads::AdWords::v201705::BiddingStrategyOperation
+ Google::Ads::AdWords::v201705::BiddingStrategyPage
+ Google::Ads::AdWords::v201705::BiddingStrategyReturnValue
+ Google::Ads::AdWords::v201705::BiddingStrategyService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::BiddingStrategyService::BiddingStrategyServiceInterfacePort
+ Google::Ads::AdWords::v201705::BiddingStrategyService::RequestHeader
+ Google::Ads::AdWords::v201705::BiddingStrategyService::ResponseHeader
+ Google::Ads::AdWords::v201705::BiddingStrategyService::get
+ Google::Ads::AdWords::v201705::BiddingStrategyService::getResponse
+ Google::Ads::AdWords::v201705::BiddingStrategyService::mutate
+ Google::Ads::AdWords::v201705::BiddingStrategyService::mutateResponse
+ Google::Ads::AdWords::v201705::BiddingStrategyService::query
+ Google::Ads::AdWords::v201705::BiddingStrategyService::queryResponse
+ Google::Ads::AdWords::v201705::BiddingStrategySource
+ Google::Ads::AdWords::v201705::BiddingStrategyType
+ Google::Ads::AdWords::v201705::Bids
+ Google::Ads::AdWords::v201705::BillingAccount
+ Google::Ads::AdWords::v201705::BooleanAttribute
+ Google::Ads::AdWords::v201705::Budget
+ Google::Ads::AdWords::v201705::Budget::BudgetDeliveryMethod
+ Google::Ads::AdWords::v201705::Budget::BudgetStatus
+ Google::Ads::AdWords::v201705::BudgetError
+ Google::Ads::AdWords::v201705::BudgetError::Reason
+ Google::Ads::AdWords::v201705::BudgetOperation
+ Google::Ads::AdWords::v201705::BudgetOrder
+ Google::Ads::AdWords::v201705::BudgetOrderError
+ Google::Ads::AdWords::v201705::BudgetOrderError::Reason
+ Google::Ads::AdWords::v201705::BudgetOrderOperation
+ Google::Ads::AdWords::v201705::BudgetOrderPage
+ Google::Ads::AdWords::v201705::BudgetOrderRequest
+ Google::Ads::AdWords::v201705::BudgetOrderRequest::Status
+ Google::Ads::AdWords::v201705::BudgetOrderReturnValue
+ Google::Ads::AdWords::v201705::BudgetOrderService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::BudgetOrderService::BudgetOrderServiceInterfacePort
+ Google::Ads::AdWords::v201705::BudgetOrderService::RequestHeader
+ Google::Ads::AdWords::v201705::BudgetOrderService::ResponseHeader
+ Google::Ads::AdWords::v201705::BudgetOrderService::get
+ Google::Ads::AdWords::v201705::BudgetOrderService::getBillingAccounts
+ Google::Ads::AdWords::v201705::BudgetOrderService::getBillingAccountsResponse
+ Google::Ads::AdWords::v201705::BudgetOrderService::getResponse
+ Google::Ads::AdWords::v201705::BudgetOrderService::mutate
+ Google::Ads::AdWords::v201705::BudgetOrderService::mutateResponse
+ Google::Ads::AdWords::v201705::BudgetPage
+ Google::Ads::AdWords::v201705::BudgetReturnValue
+ Google::Ads::AdWords::v201705::BudgetService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::BudgetService::BudgetServiceInterfacePort
+ Google::Ads::AdWords::v201705::BudgetService::RequestHeader
+ Google::Ads::AdWords::v201705::BudgetService::ResponseHeader
+ Google::Ads::AdWords::v201705::BudgetService::get
+ Google::Ads::AdWords::v201705::BudgetService::getResponse
+ Google::Ads::AdWords::v201705::BudgetService::mutate
+ Google::Ads::AdWords::v201705::BudgetService::mutateResponse
+ Google::Ads::AdWords::v201705::BudgetService::query
+ Google::Ads::AdWords::v201705::BudgetService::queryResponse
+ Google::Ads::AdWords::v201705::CallConversionType
+ Google::Ads::AdWords::v201705::CallFeedItem
+ Google::Ads::AdWords::v201705::CallOnlyAd
+ Google::Ads::AdWords::v201705::CalloutFeedItem
+ Google::Ads::AdWords::v201705::Campaign
+ Google::Ads::AdWords::v201705::CampaignBidModifier
+ Google::Ads::AdWords::v201705::CampaignBidModifierError
+ Google::Ads::AdWords::v201705::CampaignBidModifierError::Reason
+ Google::Ads::AdWords::v201705::CampaignBidModifierOperation
+ Google::Ads::AdWords::v201705::CampaignBidModifierPage
+ Google::Ads::AdWords::v201705::CampaignBidModifierReturnValue
+ Google::Ads::AdWords::v201705::CampaignBidModifierService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CampaignBidModifierService::CampaignBidModifierServiceInterfacePort
+ Google::Ads::AdWords::v201705::CampaignBidModifierService::RequestHeader
+ Google::Ads::AdWords::v201705::CampaignBidModifierService::ResponseHeader
+ Google::Ads::AdWords::v201705::CampaignBidModifierService::get
+ Google::Ads::AdWords::v201705::CampaignBidModifierService::getResponse
+ Google::Ads::AdWords::v201705::CampaignBidModifierService::mutate
+ Google::Ads::AdWords::v201705::CampaignBidModifierService::mutateResponse
+ Google::Ads::AdWords::v201705::CampaignChangeData
+ Google::Ads::AdWords::v201705::CampaignCriterion
+ Google::Ads::AdWords::v201705::CampaignCriterion::CampaignCriterionStatus
+ Google::Ads::AdWords::v201705::CampaignCriterionError
+ Google::Ads::AdWords::v201705::CampaignCriterionError::Reason
+ Google::Ads::AdWords::v201705::CampaignCriterionOperation
+ Google::Ads::AdWords::v201705::CampaignCriterionPage
+ Google::Ads::AdWords::v201705::CampaignCriterionReturnValue
+ Google::Ads::AdWords::v201705::CampaignCriterionService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CampaignCriterionService::CampaignCriterionServiceInterfacePort
+ Google::Ads::AdWords::v201705::CampaignCriterionService::RequestHeader
+ Google::Ads::AdWords::v201705::CampaignCriterionService::ResponseHeader
+ Google::Ads::AdWords::v201705::CampaignCriterionService::get
+ Google::Ads::AdWords::v201705::CampaignCriterionService::getResponse
+ Google::Ads::AdWords::v201705::CampaignCriterionService::mutate
+ Google::Ads::AdWords::v201705::CampaignCriterionService::mutateResponse
+ Google::Ads::AdWords::v201705::CampaignCriterionService::query
+ Google::Ads::AdWords::v201705::CampaignCriterionService::queryResponse
+ Google::Ads::AdWords::v201705::CampaignError
+ Google::Ads::AdWords::v201705::CampaignError::Reason
+ Google::Ads::AdWords::v201705::CampaignEstimate
+ Google::Ads::AdWords::v201705::CampaignEstimateRequest
+ Google::Ads::AdWords::v201705::CampaignExtensionSetting
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingOperation
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingPage
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingReturnValue
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::CampaignExtensionSettingServiceInterfacePort
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::RequestHeader
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::ResponseHeader
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::get
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::getResponse
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::mutate
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::mutateResponse
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::query
+ Google::Ads::AdWords::v201705::CampaignExtensionSettingService::queryResponse
+ Google::Ads::AdWords::v201705::CampaignFeed
+ Google::Ads::AdWords::v201705::CampaignFeed::Status
+ Google::Ads::AdWords::v201705::CampaignFeedError
+ Google::Ads::AdWords::v201705::CampaignFeedError::Reason
+ Google::Ads::AdWords::v201705::CampaignFeedOperation
+ Google::Ads::AdWords::v201705::CampaignFeedPage
+ Google::Ads::AdWords::v201705::CampaignFeedReturnValue
+ Google::Ads::AdWords::v201705::CampaignFeedService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CampaignFeedService::CampaignFeedServiceInterfacePort
+ Google::Ads::AdWords::v201705::CampaignFeedService::RequestHeader
+ Google::Ads::AdWords::v201705::CampaignFeedService::ResponseHeader
+ Google::Ads::AdWords::v201705::CampaignFeedService::get
+ Google::Ads::AdWords::v201705::CampaignFeedService::getResponse
+ Google::Ads::AdWords::v201705::CampaignFeedService::mutate
+ Google::Ads::AdWords::v201705::CampaignFeedService::mutateResponse
+ Google::Ads::AdWords::v201705::CampaignFeedService::query
+ Google::Ads::AdWords::v201705::CampaignFeedService::queryResponse
+ Google::Ads::AdWords::v201705::CampaignGroup
+ Google::Ads::AdWords::v201705::CampaignGroupError
+ Google::Ads::AdWords::v201705::CampaignGroupError::Reason
+ Google::Ads::AdWords::v201705::CampaignGroupOperation
+ Google::Ads::AdWords::v201705::CampaignGroupPage
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTarget
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetError
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetError::Reason
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetOperation
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetPage
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetReturnValue
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::CampaignGroupPerformanceTargetServiceInterfacePort
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::RequestHeader
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::ResponseHeader
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::get
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::getResponse
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::mutate
+ Google::Ads::AdWords::v201705::CampaignGroupPerformanceTargetService::mutateResponse
+ Google::Ads::AdWords::v201705::CampaignGroupReturnValue
+ Google::Ads::AdWords::v201705::CampaignGroupService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CampaignGroupService::CampaignGroupServiceInterfacePort
+ Google::Ads::AdWords::v201705::CampaignGroupService::RequestHeader
+ Google::Ads::AdWords::v201705::CampaignGroupService::ResponseHeader
+ Google::Ads::AdWords::v201705::CampaignGroupService::get
+ Google::Ads::AdWords::v201705::CampaignGroupService::getResponse
+ Google::Ads::AdWords::v201705::CampaignGroupService::mutate
+ Google::Ads::AdWords::v201705::CampaignGroupService::mutateResponse
+ Google::Ads::AdWords::v201705::CampaignGroupStatus
+ Google::Ads::AdWords::v201705::CampaignLabel
+ Google::Ads::AdWords::v201705::CampaignLabelOperation
+ Google::Ads::AdWords::v201705::CampaignLabelReturnValue
+ Google::Ads::AdWords::v201705::CampaignOperation
+ Google::Ads::AdWords::v201705::CampaignPage
+ Google::Ads::AdWords::v201705::CampaignPreferenceError
+ Google::Ads::AdWords::v201705::CampaignPreferenceError::Reason
+ Google::Ads::AdWords::v201705::CampaignReturnValue
+ Google::Ads::AdWords::v201705::CampaignService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CampaignService::CampaignServiceInterfacePort
+ Google::Ads::AdWords::v201705::CampaignService::RequestHeader
+ Google::Ads::AdWords::v201705::CampaignService::ResponseHeader
+ Google::Ads::AdWords::v201705::CampaignService::get
+ Google::Ads::AdWords::v201705::CampaignService::getResponse
+ Google::Ads::AdWords::v201705::CampaignService::mutate
+ Google::Ads::AdWords::v201705::CampaignService::mutateLabel
+ Google::Ads::AdWords::v201705::CampaignService::mutateLabelResponse
+ Google::Ads::AdWords::v201705::CampaignService::mutateResponse
+ Google::Ads::AdWords::v201705::CampaignService::query
+ Google::Ads::AdWords::v201705::CampaignService::queryResponse
+ Google::Ads::AdWords::v201705::CampaignSharedSet
+ Google::Ads::AdWords::v201705::CampaignSharedSet::Status
+ Google::Ads::AdWords::v201705::CampaignSharedSetError
+ Google::Ads::AdWords::v201705::CampaignSharedSetError::Reason
+ Google::Ads::AdWords::v201705::CampaignSharedSetOperation
+ Google::Ads::AdWords::v201705::CampaignSharedSetPage
+ Google::Ads::AdWords::v201705::CampaignSharedSetReturnValue
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::CampaignSharedSetServiceInterfacePort
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::RequestHeader
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::ResponseHeader
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::get
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::getResponse
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::mutate
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::mutateResponse
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::query
+ Google::Ads::AdWords::v201705::CampaignSharedSetService::queryResponse
+ Google::Ads::AdWords::v201705::CampaignStatus
+ Google::Ads::AdWords::v201705::CampaignTrialType
+ Google::Ads::AdWords::v201705::Carrier
+ Google::Ads::AdWords::v201705::CategoryProductsAndServicesSearchParameter
+ Google::Ads::AdWords::v201705::Chain
+ Google::Ads::AdWords::v201705::ChangeStatus
+ Google::Ads::AdWords::v201705::ClientTermsError
+ Google::Ads::AdWords::v201705::ClientTermsError::Reason
+ Google::Ads::AdWords::v201705::CollectionSizeError
+ Google::Ads::AdWords::v201705::CollectionSizeError::Reason
+ Google::Ads::AdWords::v201705::ComparableValue
+ Google::Ads::AdWords::v201705::CompetitionSearchParameter
+ Google::Ads::AdWords::v201705::CompetitionSearchParameter::Level
+ Google::Ads::AdWords::v201705::ConstantData
+ Google::Ads::AdWords::v201705::ConstantDataService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::ConstantDataService::ConstantDataServiceInterfacePort
+ Google::Ads::AdWords::v201705::ConstantDataService::RequestHeader
+ Google::Ads::AdWords::v201705::ConstantDataService::ResponseHeader
+ Google::Ads::AdWords::v201705::ConstantDataService::UserInterestTaxonomyType
+ Google::Ads::AdWords::v201705::ConstantDataService::getAgeRangeCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getAgeRangeCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getCarrierCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getCarrierCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getGenderCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getGenderCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getLanguageCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getLanguageCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getMobileAppCategoryCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getMobileAppCategoryCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getMobileDeviceCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getMobileDeviceCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getOperatingSystemVersionCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getOperatingSystemVersionCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getProductBiddingCategoryData
+ Google::Ads::AdWords::v201705::ConstantDataService::getProductBiddingCategoryDataResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getUserInterestCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getUserInterestCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantDataService::getVerticalCriterion
+ Google::Ads::AdWords::v201705::ConstantDataService::getVerticalCriterionResponse
+ Google::Ads::AdWords::v201705::ConstantOperand
+ Google::Ads::AdWords::v201705::ConstantOperand::ConstantType
+ Google::Ads::AdWords::v201705::ConstantOperand::Unit
+ Google::Ads::AdWords::v201705::ContentLabel
+ Google::Ads::AdWords::v201705::ContentLabelType
+ Google::Ads::AdWords::v201705::ConversionDeduplicationMode
+ Google::Ads::AdWords::v201705::ConversionOptimizerEligibility
+ Google::Ads::AdWords::v201705::ConversionOptimizerEligibility::RejectionReason
+ Google::Ads::AdWords::v201705::ConversionTracker
+ Google::Ads::AdWords::v201705::ConversionTracker::Category
+ Google::Ads::AdWords::v201705::ConversionTracker::Status
+ Google::Ads::AdWords::v201705::ConversionTrackerOperation
+ Google::Ads::AdWords::v201705::ConversionTrackerPage
+ Google::Ads::AdWords::v201705::ConversionTrackerReturnValue
+ Google::Ads::AdWords::v201705::ConversionTrackerService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::ConversionTrackerService::ConversionTrackerServiceInterfacePort
+ Google::Ads::AdWords::v201705::ConversionTrackerService::RequestHeader
+ Google::Ads::AdWords::v201705::ConversionTrackerService::ResponseHeader
+ Google::Ads::AdWords::v201705::ConversionTrackerService::get
+ Google::Ads::AdWords::v201705::ConversionTrackerService::getResponse
+ Google::Ads::AdWords::v201705::ConversionTrackerService::mutate
+ Google::Ads::AdWords::v201705::ConversionTrackerService::mutateResponse
+ Google::Ads::AdWords::v201705::ConversionTrackerService::query
+ Google::Ads::AdWords::v201705::ConversionTrackerService::queryResponse
+ Google::Ads::AdWords::v201705::ConversionTrackingError
+ Google::Ads::AdWords::v201705::ConversionTrackingError::Reason
+ Google::Ads::AdWords::v201705::ConversionTrackingSettings
+ Google::Ads::AdWords::v201705::CountryConstraint
+ Google::Ads::AdWords::v201705::CpaBid
+ Google::Ads::AdWords::v201705::CpcBid
+ Google::Ads::AdWords::v201705::CpmBid
+ Google::Ads::AdWords::v201705::Criterion
+ Google::Ads::AdWords::v201705::Criterion::Type
+ Google::Ads::AdWords::v201705::CriterionAttribute
+ Google::Ads::AdWords::v201705::CriterionBidLandscape
+ Google::Ads::AdWords::v201705::CriterionBidLandscapePage
+ Google::Ads::AdWords::v201705::CriterionError
+ Google::Ads::AdWords::v201705::CriterionError::Reason
+ Google::Ads::AdWords::v201705::CriterionParameter
+ Google::Ads::AdWords::v201705::CriterionPolicyError
+ Google::Ads::AdWords::v201705::CriterionTypeGroup
+ Google::Ads::AdWords::v201705::CriterionUse
+ Google::Ads::AdWords::v201705::CriterionUserInterest
+ Google::Ads::AdWords::v201705::CriterionUserList
+ Google::Ads::AdWords::v201705::CriterionUserList::MembershipStatus
+ Google::Ads::AdWords::v201705::CrmBasedUserList
+ Google::Ads::AdWords::v201705::CurrencyCodeError
+ Google::Ads::AdWords::v201705::CurrencyCodeError::Reason
+ Google::Ads::AdWords::v201705::CustomParameter
+ Google::Ads::AdWords::v201705::CustomParameters
+ Google::Ads::AdWords::v201705::Customer
+ Google::Ads::AdWords::v201705::CustomerChangeData
+ Google::Ads::AdWords::v201705::CustomerError
+ Google::Ads::AdWords::v201705::CustomerError::Reason
+ Google::Ads::AdWords::v201705::CustomerExtensionSetting
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingOperation
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingPage
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingReturnValue
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::CustomerExtensionSettingServiceInterfacePort
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::RequestHeader
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::ResponseHeader
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::get
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::getResponse
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::mutate
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::mutateResponse
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::query
+ Google::Ads::AdWords::v201705::CustomerExtensionSettingService::queryResponse
+ Google::Ads::AdWords::v201705::CustomerFeed
+ Google::Ads::AdWords::v201705::CustomerFeed::Status
+ Google::Ads::AdWords::v201705::CustomerFeedError
+ Google::Ads::AdWords::v201705::CustomerFeedError::Reason
+ Google::Ads::AdWords::v201705::CustomerFeedOperation
+ Google::Ads::AdWords::v201705::CustomerFeedPage
+ Google::Ads::AdWords::v201705::CustomerFeedReturnValue
+ Google::Ads::AdWords::v201705::CustomerFeedService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CustomerFeedService::CustomerFeedServiceInterfacePort
+ Google::Ads::AdWords::v201705::CustomerFeedService::RequestHeader
+ Google::Ads::AdWords::v201705::CustomerFeedService::ResponseHeader
+ Google::Ads::AdWords::v201705::CustomerFeedService::get
+ Google::Ads::AdWords::v201705::CustomerFeedService::getResponse
+ Google::Ads::AdWords::v201705::CustomerFeedService::mutate
+ Google::Ads::AdWords::v201705::CustomerFeedService::mutateResponse
+ Google::Ads::AdWords::v201705::CustomerFeedService::query
+ Google::Ads::AdWords::v201705::CustomerFeedService::queryResponse
+ Google::Ads::AdWords::v201705::CustomerOrderLineError
+ Google::Ads::AdWords::v201705::CustomerOrderLineError::Reason
+ Google::Ads::AdWords::v201705::CustomerService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CustomerService::CustomerServiceInterfacePort
+ Google::Ads::AdWords::v201705::CustomerService::RequestHeader
+ Google::Ads::AdWords::v201705::CustomerService::ResponseHeader
+ Google::Ads::AdWords::v201705::CustomerService::getCustomers
+ Google::Ads::AdWords::v201705::CustomerService::getCustomersResponse
+ Google::Ads::AdWords::v201705::CustomerService::getServiceLinks
+ Google::Ads::AdWords::v201705::CustomerService::getServiceLinksResponse
+ Google::Ads::AdWords::v201705::CustomerService::mutate
+ Google::Ads::AdWords::v201705::CustomerService::mutateResponse
+ Google::Ads::AdWords::v201705::CustomerService::mutateServiceLinks
+ Google::Ads::AdWords::v201705::CustomerService::mutateServiceLinksResponse
+ Google::Ads::AdWords::v201705::CustomerSyncError
+ Google::Ads::AdWords::v201705::CustomerSyncError::Reason
+ Google::Ads::AdWords::v201705::CustomerSyncSelector
+ Google::Ads::AdWords::v201705::CustomerSyncService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::CustomerSyncService::CustomerSyncServiceInterfacePort
+ Google::Ads::AdWords::v201705::CustomerSyncService::RequestHeader
+ Google::Ads::AdWords::v201705::CustomerSyncService::ResponseHeader
+ Google::Ads::AdWords::v201705::CustomerSyncService::get
+ Google::Ads::AdWords::v201705::CustomerSyncService::getResponse
+ Google::Ads::AdWords::v201705::DataDrivenModelStatus
+ Google::Ads::AdWords::v201705::DataEntry
+ Google::Ads::AdWords::v201705::DataError
+ Google::Ads::AdWords::v201705::DataError::Reason
+ Google::Ads::AdWords::v201705::DataService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::DataService::DataServiceInterfacePort
+ Google::Ads::AdWords::v201705::DataService::RequestHeader
+ Google::Ads::AdWords::v201705::DataService::ResponseHeader
+ Google::Ads::AdWords::v201705::DataService::getAdGroupBidLandscape
+ Google::Ads::AdWords::v201705::DataService::getAdGroupBidLandscapeResponse
+ Google::Ads::AdWords::v201705::DataService::getCampaignCriterionBidLandscape
+ Google::Ads::AdWords::v201705::DataService::getCampaignCriterionBidLandscapeResponse
+ Google::Ads::AdWords::v201705::DataService::getCriterionBidLandscape
+ Google::Ads::AdWords::v201705::DataService::getCriterionBidLandscapeResponse
+ Google::Ads::AdWords::v201705::DataService::getDomainCategory
+ Google::Ads::AdWords::v201705::DataService::getDomainCategoryResponse
+ Google::Ads::AdWords::v201705::DataService::queryAdGroupBidLandscape
+ Google::Ads::AdWords::v201705::DataService::queryAdGroupBidLandscapeResponse
+ Google::Ads::AdWords::v201705::DataService::queryCampaignCriterionBidLandscape
+ Google::Ads::AdWords::v201705::DataService::queryCampaignCriterionBidLandscapeResponse
+ Google::Ads::AdWords::v201705::DataService::queryCriterionBidLandscape
+ Google::Ads::AdWords::v201705::DataService::queryCriterionBidLandscapeResponse
+ Google::Ads::AdWords::v201705::DataService::queryDomainCategory
+ Google::Ads::AdWords::v201705::DataService::queryDomainCategoryResponse
+ Google::Ads::AdWords::v201705::DataUploadResult
+ Google::Ads::AdWords::v201705::DatabaseError
+ Google::Ads::AdWords::v201705::DatabaseError::Reason
+ Google::Ads::AdWords::v201705::Date
+ Google::Ads::AdWords::v201705::DateError
+ Google::Ads::AdWords::v201705::DateError::Reason
+ Google::Ads::AdWords::v201705::DateKey
+ Google::Ads::AdWords::v201705::DateRange
+ Google::Ads::AdWords::v201705::DateRangeError
+ Google::Ads::AdWords::v201705::DateRangeError::Reason
+ Google::Ads::AdWords::v201705::DateRuleItem
+ Google::Ads::AdWords::v201705::DateRuleItem::DateOperator
+ Google::Ads::AdWords::v201705::DateSpecificRuleUserList
+ Google::Ads::AdWords::v201705::DateTimeRange
+ Google::Ads::AdWords::v201705::DayOfWeek
+ Google::Ads::AdWords::v201705::DeprecatedAd
+ Google::Ads::AdWords::v201705::DeprecatedAd::Type
+ Google::Ads::AdWords::v201705::DimensionProperties
+ Google::Ads::AdWords::v201705::Dimensions
+ Google::Ads::AdWords::v201705::DisapprovalReason
+ Google::Ads::AdWords::v201705::DisplayAttribute
+ Google::Ads::AdWords::v201705::DistinctError
+ Google::Ads::AdWords::v201705::DistinctError::Reason
+ Google::Ads::AdWords::v201705::DomainCategory
+ Google::Ads::AdWords::v201705::DomainCategoryPage
+ Google::Ads::AdWords::v201705::DoubleAttribute
+ Google::Ads::AdWords::v201705::DoubleValue
+ Google::Ads::AdWords::v201705::Draft
+ Google::Ads::AdWords::v201705::DraftAsyncError
+ Google::Ads::AdWords::v201705::DraftAsyncErrorPage
+ Google::Ads::AdWords::v201705::DraftAsyncErrorService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::DraftAsyncErrorService::DraftAsyncErrorServiceInterfacePort
+ Google::Ads::AdWords::v201705::DraftAsyncErrorService::RequestHeader
+ Google::Ads::AdWords::v201705::DraftAsyncErrorService::ResponseHeader
+ Google::Ads::AdWords::v201705::DraftAsyncErrorService::get
+ Google::Ads::AdWords::v201705::DraftAsyncErrorService::getResponse
+ Google::Ads::AdWords::v201705::DraftAsyncErrorService::query
+ Google::Ads::AdWords::v201705::DraftAsyncErrorService::queryResponse
+ Google::Ads::AdWords::v201705::DraftError
+ Google::Ads::AdWords::v201705::DraftError::Reason
+ Google::Ads::AdWords::v201705::DraftOperation
+ Google::Ads::AdWords::v201705::DraftPage
+ Google::Ads::AdWords::v201705::DraftReturnValue
+ Google::Ads::AdWords::v201705::DraftService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::DraftService::DraftServiceInterfacePort
+ Google::Ads::AdWords::v201705::DraftService::RequestHeader
+ Google::Ads::AdWords::v201705::DraftService::ResponseHeader
+ Google::Ads::AdWords::v201705::DraftService::get
+ Google::Ads::AdWords::v201705::DraftService::getResponse
+ Google::Ads::AdWords::v201705::DraftService::mutate
+ Google::Ads::AdWords::v201705::DraftService::mutateResponse
+ Google::Ads::AdWords::v201705::DraftService::query
+ Google::Ads::AdWords::v201705::DraftService::queryResponse
+ Google::Ads::AdWords::v201705::DraftStatus
+ Google::Ads::AdWords::v201705::DynamicSearchAd
+ Google::Ads::AdWords::v201705::DynamicSearchAdsSetting
+ Google::Ads::AdWords::v201705::EfficiencyTargetType
+ Google::Ads::AdWords::v201705::EnhancedCpcBiddingScheme
+ Google::Ads::AdWords::v201705::EntityAccessDenied
+ Google::Ads::AdWords::v201705::EntityAccessDenied::Reason
+ Google::Ads::AdWords::v201705::EntityCountLimitExceeded
+ Google::Ads::AdWords::v201705::EntityCountLimitExceeded::Reason
+ Google::Ads::AdWords::v201705::EntityNotFound
+ Google::Ads::AdWords::v201705::EntityNotFound::Reason
+ Google::Ads::AdWords::v201705::EnumValuePair
+ Google::Ads::AdWords::v201705::ErrorList
+ Google::Ads::AdWords::v201705::Estimate
+ Google::Ads::AdWords::v201705::EstimateRequest
+ Google::Ads::AdWords::v201705::ExemptionRequest
+ Google::Ads::AdWords::v201705::ExpandedDynamicSearchAd
+ Google::Ads::AdWords::v201705::ExpandedTextAd
+ Google::Ads::AdWords::v201705::ExplorerAutoOptimizerSetting
+ Google::Ads::AdWords::v201705::ExpressionRuleUserList
+ Google::Ads::AdWords::v201705::ExtensionFeedItem
+ Google::Ads::AdWords::v201705::ExtensionSetting
+ Google::Ads::AdWords::v201705::ExtensionSetting::Platform
+ Google::Ads::AdWords::v201705::ExtensionSettingError
+ Google::Ads::AdWords::v201705::ExtensionSettingError::Reason
+ Google::Ads::AdWords::v201705::Feed
+ Google::Ads::AdWords::v201705::Feed::Origin
+ Google::Ads::AdWords::v201705::Feed::Status
+ Google::Ads::AdWords::v201705::Feed::Type
+ Google::Ads::AdWords::v201705::FeedAttribute
+ Google::Ads::AdWords::v201705::FeedAttribute::Type
+ Google::Ads::AdWords::v201705::FeedAttributeOperand
+ Google::Ads::AdWords::v201705::FeedAttributeReferenceError
+ Google::Ads::AdWords::v201705::FeedAttributeReferenceError::Reason
+ Google::Ads::AdWords::v201705::FeedChangeData
+ Google::Ads::AdWords::v201705::FeedError
+ Google::Ads::AdWords::v201705::FeedError::Reason
+ Google::Ads::AdWords::v201705::FeedItem
+ Google::Ads::AdWords::v201705::FeedItem::Status
+ Google::Ads::AdWords::v201705::FeedItemAdGroupTargeting
+ Google::Ads::AdWords::v201705::FeedItemApprovalStatus
+ Google::Ads::AdWords::v201705::FeedItemAttributeError
+ Google::Ads::AdWords::v201705::FeedItemAttributeValue
+ Google::Ads::AdWords::v201705::FeedItemCampaignTargeting
+ Google::Ads::AdWords::v201705::FeedItemDevicePreference
+ Google::Ads::AdWords::v201705::FeedItemError
+ Google::Ads::AdWords::v201705::FeedItemError::Reason
+ Google::Ads::AdWords::v201705::FeedItemGeoRestriction
+ Google::Ads::AdWords::v201705::FeedItemOperation
+ Google::Ads::AdWords::v201705::FeedItemPage
+ Google::Ads::AdWords::v201705::FeedItemPolicyData
+ Google::Ads::AdWords::v201705::FeedItemQualityApprovalStatus
+ Google::Ads::AdWords::v201705::FeedItemQualityDisapprovalReasons
+ Google::Ads::AdWords::v201705::FeedItemReturnValue
+ Google::Ads::AdWords::v201705::FeedItemSchedule
+ Google::Ads::AdWords::v201705::FeedItemScheduling
+ Google::Ads::AdWords::v201705::FeedItemService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::FeedItemService::FeedItemServiceInterfacePort
+ Google::Ads::AdWords::v201705::FeedItemService::RequestHeader
+ Google::Ads::AdWords::v201705::FeedItemService::ResponseHeader
+ Google::Ads::AdWords::v201705::FeedItemService::get
+ Google::Ads::AdWords::v201705::FeedItemService::getResponse
+ Google::Ads::AdWords::v201705::FeedItemService::mutate
+ Google::Ads::AdWords::v201705::FeedItemService::mutateResponse
+ Google::Ads::AdWords::v201705::FeedItemService::query
+ Google::Ads::AdWords::v201705::FeedItemService::queryResponse
+ Google::Ads::AdWords::v201705::FeedItemValidationStatus
+ Google::Ads::AdWords::v201705::FeedMapping
+ Google::Ads::AdWords::v201705::FeedMapping::Status
+ Google::Ads::AdWords::v201705::FeedMappingError
+ Google::Ads::AdWords::v201705::FeedMappingError::Reason
+ Google::Ads::AdWords::v201705::FeedMappingOperation
+ Google::Ads::AdWords::v201705::FeedMappingPage
+ Google::Ads::AdWords::v201705::FeedMappingReturnValue
+ Google::Ads::AdWords::v201705::FeedMappingService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::FeedMappingService::FeedMappingServiceInterfacePort
+ Google::Ads::AdWords::v201705::FeedMappingService::RequestHeader
+ Google::Ads::AdWords::v201705::FeedMappingService::ResponseHeader
+ Google::Ads::AdWords::v201705::FeedMappingService::get
+ Google::Ads::AdWords::v201705::FeedMappingService::getResponse
+ Google::Ads::AdWords::v201705::FeedMappingService::mutate
+ Google::Ads::AdWords::v201705::FeedMappingService::mutateResponse
+ Google::Ads::AdWords::v201705::FeedMappingService::query
+ Google::Ads::AdWords::v201705::FeedMappingService::queryResponse
+ Google::Ads::AdWords::v201705::FeedOperation
+ Google::Ads::AdWords::v201705::FeedPage
+ Google::Ads::AdWords::v201705::FeedReturnValue
+ Google::Ads::AdWords::v201705::FeedService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::FeedService::FeedServiceInterfacePort
+ Google::Ads::AdWords::v201705::FeedService::RequestHeader
+ Google::Ads::AdWords::v201705::FeedService::ResponseHeader
+ Google::Ads::AdWords::v201705::FeedService::get
+ Google::Ads::AdWords::v201705::FeedService::getResponse
+ Google::Ads::AdWords::v201705::FeedService::mutate
+ Google::Ads::AdWords::v201705::FeedService::mutateResponse
+ Google::Ads::AdWords::v201705::FeedService::query
+ Google::Ads::AdWords::v201705::FeedService::queryResponse
+ Google::Ads::AdWords::v201705::FieldPathElement
+ Google::Ads::AdWords::v201705::ForwardCompatibilityError
+ Google::Ads::AdWords::v201705::ForwardCompatibilityError::Reason
+ Google::Ads::AdWords::v201705::FrequencyCap
+ Google::Ads::AdWords::v201705::Function
+ Google::Ads::AdWords::v201705::Function::Operator
+ Google::Ads::AdWords::v201705::FunctionArgumentOperand
+ Google::Ads::AdWords::v201705::FunctionError
+ Google::Ads::AdWords::v201705::FunctionError::Reason
+ Google::Ads::AdWords::v201705::FunctionOperand
+ Google::Ads::AdWords::v201705::FunctionParsingError
+ Google::Ads::AdWords::v201705::FunctionParsingError::Reason
+ Google::Ads::AdWords::v201705::Gender
+ Google::Ads::AdWords::v201705::Gender::GenderType
+ Google::Ads::AdWords::v201705::GeoPoint
+ Google::Ads::AdWords::v201705::GeoRestriction
+ Google::Ads::AdWords::v201705::GeoTargetOperand
+ Google::Ads::AdWords::v201705::GeoTargetTypeSetting
+ Google::Ads::AdWords::v201705::GeoTargetTypeSetting::NegativeGeoTargetType
+ Google::Ads::AdWords::v201705::GeoTargetTypeSetting::PositiveGeoTargetType
+ Google::Ads::AdWords::v201705::IdError
+ Google::Ads::AdWords::v201705::IdError::Reason
+ Google::Ads::AdWords::v201705::IdeaTextFilterSearchParameter
+ Google::Ads::AdWords::v201705::IdeaType
+ Google::Ads::AdWords::v201705::IdeaTypeAttribute
+ Google::Ads::AdWords::v201705::Image
+ Google::Ads::AdWords::v201705::ImageAd
+ Google::Ads::AdWords::v201705::ImageError
+ Google::Ads::AdWords::v201705::ImageError::Reason
+ Google::Ads::AdWords::v201705::IncludeAdultContentSearchParameter
+ Google::Ads::AdWords::v201705::IncomeOperand
+ Google::Ads::AdWords::v201705::IncomeTier
+ Google::Ads::AdWords::v201705::IntegerAttribute
+ Google::Ads::AdWords::v201705::IntegerSetAttribute
+ Google::Ads::AdWords::v201705::InteractionType
+ Google::Ads::AdWords::v201705::InternalApiError
+ Google::Ads::AdWords::v201705::InternalApiError::Reason
+ Google::Ads::AdWords::v201705::IpBlock
+ Google::Ads::AdWords::v201705::Keyword
+ Google::Ads::AdWords::v201705::KeywordAttribute
+ Google::Ads::AdWords::v201705::KeywordEstimate
+ Google::Ads::AdWords::v201705::KeywordEstimateRequest
+ Google::Ads::AdWords::v201705::KeywordMatchType
+ Google::Ads::AdWords::v201705::Label
+ Google::Ads::AdWords::v201705::Label::Status
+ Google::Ads::AdWords::v201705::LabelAttribute
+ Google::Ads::AdWords::v201705::LabelError
+ Google::Ads::AdWords::v201705::LabelError::Reason
+ Google::Ads::AdWords::v201705::LabelOperation
+ Google::Ads::AdWords::v201705::LabelPage
+ Google::Ads::AdWords::v201705::LabelReturnValue
+ Google::Ads::AdWords::v201705::LabelService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::LabelService::LabelServiceInterfacePort
+ Google::Ads::AdWords::v201705::LabelService::RequestHeader
+ Google::Ads::AdWords::v201705::LabelService::ResponseHeader
+ Google::Ads::AdWords::v201705::LabelService::get
+ Google::Ads::AdWords::v201705::LabelService::getResponse
+ Google::Ads::AdWords::v201705::LabelService::mutate
+ Google::Ads::AdWords::v201705::LabelService::mutateResponse
+ Google::Ads::AdWords::v201705::LabelService::query
+ Google::Ads::AdWords::v201705::LabelService::queryResponse
+ Google::Ads::AdWords::v201705::LabelServiceError
+ Google::Ads::AdWords::v201705::LabelServiceError::Reason
+ Google::Ads::AdWords::v201705::Language
+ Google::Ads::AdWords::v201705::LanguageSearchParameter
+ Google::Ads::AdWords::v201705::Level
+ Google::Ads::AdWords::v201705::LevelOfDetail
+ Google::Ads::AdWords::v201705::LinkOperation
+ Google::Ads::AdWords::v201705::LinkStatus
+ Google::Ads::AdWords::v201705::ListError
+ Google::Ads::AdWords::v201705::ListError::Reason
+ Google::Ads::AdWords::v201705::ListOperations
+ Google::Ads::AdWords::v201705::ListOperations::ListOperator
+ Google::Ads::AdWords::v201705::ListReturnValue
+ Google::Ads::AdWords::v201705::Location
+ Google::Ads::AdWords::v201705::LocationCriterion
+ Google::Ads::AdWords::v201705::LocationCriterionService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::LocationCriterionService::LocationCriterionServiceInterfacePort
+ Google::Ads::AdWords::v201705::LocationCriterionService::RequestHeader
+ Google::Ads::AdWords::v201705::LocationCriterionService::ResponseHeader
+ Google::Ads::AdWords::v201705::LocationCriterionService::get
+ Google::Ads::AdWords::v201705::LocationCriterionService::getResponse
+ Google::Ads::AdWords::v201705::LocationCriterionService::query
+ Google::Ads::AdWords::v201705::LocationCriterionService::queryResponse
+ Google::Ads::AdWords::v201705::LocationCriterionServiceError
+ Google::Ads::AdWords::v201705::LocationCriterionServiceError::Reason
+ Google::Ads::AdWords::v201705::LocationExtensionOperand
+ Google::Ads::AdWords::v201705::LocationGroups
+ Google::Ads::AdWords::v201705::LocationSearchParameter
+ Google::Ads::AdWords::v201705::LocationTargetingStatus
+ Google::Ads::AdWords::v201705::LogicalUserList
+ Google::Ads::AdWords::v201705::LogicalUserListOperand
+ Google::Ads::AdWords::v201705::LongAttribute
+ Google::Ads::AdWords::v201705::LongComparisonOperation
+ Google::Ads::AdWords::v201705::LongRangeAttribute
+ Google::Ads::AdWords::v201705::LongValue
+ Google::Ads::AdWords::v201705::ManagedCustomer
+ Google::Ads::AdWords::v201705::ManagedCustomerLabel
+ Google::Ads::AdWords::v201705::ManagedCustomerLabelOperation
+ Google::Ads::AdWords::v201705::ManagedCustomerLabelReturnValue
+ Google::Ads::AdWords::v201705::ManagedCustomerLink
+ Google::Ads::AdWords::v201705::ManagedCustomerOperation
+ Google::Ads::AdWords::v201705::ManagedCustomerPage
+ Google::Ads::AdWords::v201705::ManagedCustomerReturnValue
+ Google::Ads::AdWords::v201705::ManagedCustomerService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::ManagedCustomerService::ManagedCustomerServiceInterfacePort
+ Google::Ads::AdWords::v201705::ManagedCustomerService::RequestHeader
+ Google::Ads::AdWords::v201705::ManagedCustomerService::ResponseHeader
+ Google::Ads::AdWords::v201705::ManagedCustomerService::get
+ Google::Ads::AdWords::v201705::ManagedCustomerService::getPendingInvitations
+ Google::Ads::AdWords::v201705::ManagedCustomerService::getPendingInvitationsResponse
+ Google::Ads::AdWords::v201705::ManagedCustomerService::getResponse
+ Google::Ads::AdWords::v201705::ManagedCustomerService::mutate
+ Google::Ads::AdWords::v201705::ManagedCustomerService::mutateLabel
+ Google::Ads::AdWords::v201705::ManagedCustomerService::mutateLabelResponse
+ Google::Ads::AdWords::v201705::ManagedCustomerService::mutateLink
+ Google::Ads::AdWords::v201705::ManagedCustomerService::mutateLinkResponse
+ Google::Ads::AdWords::v201705::ManagedCustomerService::mutateManager
+ Google::Ads::AdWords::v201705::ManagedCustomerService::mutateManagerResponse
+ Google::Ads::AdWords::v201705::ManagedCustomerService::mutateResponse
+ Google::Ads::AdWords::v201705::ManagedCustomerServiceError
+ Google::Ads::AdWords::v201705::ManagedCustomerServiceError::Reason
+ Google::Ads::AdWords::v201705::ManualCpcBiddingScheme
+ Google::Ads::AdWords::v201705::ManualCpmBiddingScheme
+ Google::Ads::AdWords::v201705::Media
+ Google::Ads::AdWords::v201705::Media::MediaType
+ Google::Ads::AdWords::v201705::Media::MimeType
+ Google::Ads::AdWords::v201705::Media::Size
+ Google::Ads::AdWords::v201705::MediaBundle
+ Google::Ads::AdWords::v201705::MediaBundleError
+ Google::Ads::AdWords::v201705::MediaBundleError::Reason
+ Google::Ads::AdWords::v201705::MediaError
+ Google::Ads::AdWords::v201705::MediaError::Reason
+ Google::Ads::AdWords::v201705::MediaPage
+ Google::Ads::AdWords::v201705::MediaService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::MediaService::MediaServiceInterfacePort
+ Google::Ads::AdWords::v201705::MediaService::RequestHeader
+ Google::Ads::AdWords::v201705::MediaService::ResponseHeader
+ Google::Ads::AdWords::v201705::MediaService::get
+ Google::Ads::AdWords::v201705::MediaService::getResponse
+ Google::Ads::AdWords::v201705::MediaService::query
+ Google::Ads::AdWords::v201705::MediaService::queryResponse
+ Google::Ads::AdWords::v201705::MediaService::upload
+ Google::Ads::AdWords::v201705::MediaService::uploadResponse
+ Google::Ads::AdWords::v201705::Media_Size_DimensionsMapEntry
+ Google::Ads::AdWords::v201705::Media_Size_StringMapEntry
+ Google::Ads::AdWords::v201705::Member
+ Google::Ads::AdWords::v201705::MessageFeedItem
+ Google::Ads::AdWords::v201705::MinuteOfHour
+ Google::Ads::AdWords::v201705::MobileAppCategory
+ Google::Ads::AdWords::v201705::MobileApplication
+ Google::Ads::AdWords::v201705::MobileDevice
+ Google::Ads::AdWords::v201705::MobileDevice::DeviceType
+ Google::Ads::AdWords::v201705::Money
+ Google::Ads::AdWords::v201705::MoneyAttribute
+ Google::Ads::AdWords::v201705::MoneyWithCurrency
+ Google::Ads::AdWords::v201705::MonthlySearchVolume
+ Google::Ads::AdWords::v201705::MonthlySearchVolumeAttribute
+ Google::Ads::AdWords::v201705::MoveOperation
+ Google::Ads::AdWords::v201705::MultiplierError
+ Google::Ads::AdWords::v201705::MultiplierError::Reason
+ Google::Ads::AdWords::v201705::MutateLinkResults
+ Google::Ads::AdWords::v201705::MutateManagerResults
+ Google::Ads::AdWords::v201705::MutateMembersError
+ Google::Ads::AdWords::v201705::MutateMembersError::Reason
+ Google::Ads::AdWords::v201705::MutateMembersOperand
+ Google::Ads::AdWords::v201705::MutateMembersOperation
+ Google::Ads::AdWords::v201705::MutateMembersReturnValue
+ Google::Ads::AdWords::v201705::MutateResult
+ Google::Ads::AdWords::v201705::NegativeAdGroupCriterion
+ Google::Ads::AdWords::v201705::NegativeCampaignCriterion
+ Google::Ads::AdWords::v201705::NetworkSearchParameter
+ Google::Ads::AdWords::v201705::NetworkSetting
+ Google::Ads::AdWords::v201705::NewEntityCreationError
+ Google::Ads::AdWords::v201705::NewEntityCreationError::Reason
+ Google::Ads::AdWords::v201705::NoStatsPage
+ Google::Ads::AdWords::v201705::NotEmptyError
+ Google::Ads::AdWords::v201705::NotEmptyError::Reason
+ Google::Ads::AdWords::v201705::NotWhitelistedError
+ Google::Ads::AdWords::v201705::NotWhitelistedError::Reason
+ Google::Ads::AdWords::v201705::NullError
+ Google::Ads::AdWords::v201705::NullError::Reason
+ Google::Ads::AdWords::v201705::NullStatsPage
+ Google::Ads::AdWords::v201705::NumberKey
+ Google::Ads::AdWords::v201705::NumberRuleItem
+ Google::Ads::AdWords::v201705::NumberRuleItem::NumberOperator
+ Google::Ads::AdWords::v201705::NumberValue
+ Google::Ads::AdWords::v201705::OAuthInfo
+ Google::Ads::AdWords::v201705::OfflineCallConversionError
+ Google::Ads::AdWords::v201705::OfflineCallConversionError::Reason
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeed
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeedOperation
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeedReturnValue
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::OfflineCallConversionFeedServiceInterfacePort
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::RequestHeader
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::ResponseHeader
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::mutate
+ Google::Ads::AdWords::v201705::OfflineCallConversionFeedService::mutateResponse
+ Google::Ads::AdWords::v201705::OfflineConversionError
+ Google::Ads::AdWords::v201705::OfflineConversionError::Reason
+ Google::Ads::AdWords::v201705::OfflineConversionFeed
+ Google::Ads::AdWords::v201705::OfflineConversionFeedOperation
+ Google::Ads::AdWords::v201705::OfflineConversionFeedReturnValue
+ Google::Ads::AdWords::v201705::OfflineConversionFeedService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::OfflineConversionFeedService::OfflineConversionFeedServiceInterfacePort
+ Google::Ads::AdWords::v201705::OfflineConversionFeedService::RequestHeader
+ Google::Ads::AdWords::v201705::OfflineConversionFeedService::ResponseHeader
+ Google::Ads::AdWords::v201705::OfflineConversionFeedService::mutate
+ Google::Ads::AdWords::v201705::OfflineConversionFeedService::mutateResponse
+ Google::Ads::AdWords::v201705::Operand
+ Google::Ads::AdWords::v201705::OperatingSystemVersion
+ Google::Ads::AdWords::v201705::OperatingSystemVersion::OperatorType
+ Google::Ads::AdWords::v201705::Operation
+ Google::Ads::AdWords::v201705::OperationAccessDenied
+ Google::Ads::AdWords::v201705::OperationAccessDenied::Reason
+ Google::Ads::AdWords::v201705::Operator
+ Google::Ads::AdWords::v201705::OperatorError
+ Google::Ads::AdWords::v201705::OperatorError::Reason
+ Google::Ads::AdWords::v201705::OrderBy
+ Google::Ads::AdWords::v201705::Page
+ Google::Ads::AdWords::v201705::PageFeed
+ Google::Ads::AdWords::v201705::PageOnePromotedBiddingScheme
+ Google::Ads::AdWords::v201705::PageOnePromotedBiddingScheme::StrategyGoal
+ Google::Ads::AdWords::v201705::Paging
+ Google::Ads::AdWords::v201705::PagingError
+ Google::Ads::AdWords::v201705::PagingError::Reason
+ Google::Ads::AdWords::v201705::Parent
+ Google::Ads::AdWords::v201705::Parent::ParentType
+ Google::Ads::AdWords::v201705::PendingInvitation
+ Google::Ads::AdWords::v201705::PendingInvitationSelector
+ Google::Ads::AdWords::v201705::PerformanceTarget
+ Google::Ads::AdWords::v201705::PerformanceTargetError
+ Google::Ads::AdWords::v201705::PerformanceTargetError::Reason
+ Google::Ads::AdWords::v201705::PerformanceTargetStatus
+ Google::Ads::AdWords::v201705::Placement
+ Google::Ads::AdWords::v201705::PlacesLocationFeedData
+ Google::Ads::AdWords::v201705::PlacesOfInterestOperand
+ Google::Ads::AdWords::v201705::PlacesOfInterestOperand::Category
+ Google::Ads::AdWords::v201705::Platform
+ Google::Ads::AdWords::v201705::PlatformCampaignEstimate
+ Google::Ads::AdWords::v201705::PolicyApprovalStatus
+ Google::Ads::AdWords::v201705::PolicyData
+ Google::Ads::AdWords::v201705::PolicySummaryDenormalizedStatus
+ Google::Ads::AdWords::v201705::PolicySummaryReviewState
+ Google::Ads::AdWords::v201705::PolicyTopicConstraint
+ Google::Ads::AdWords::v201705::PolicyTopicConstraint::PolicyTopicConstraintType
+ Google::Ads::AdWords::v201705::PolicyTopicEntry
+ Google::Ads::AdWords::v201705::PolicyTopicEntryType
+ Google::Ads::AdWords::v201705::PolicyTopicEvidence
+ Google::Ads::AdWords::v201705::PolicyTopicEvidenceType
+ Google::Ads::AdWords::v201705::PolicyViolationError
+ Google::Ads::AdWords::v201705::PolicyViolationError::Part
+ Google::Ads::AdWords::v201705::PolicyViolationKey
+ Google::Ads::AdWords::v201705::Predicate
+ Google::Ads::AdWords::v201705::Predicate::Operator
+ Google::Ads::AdWords::v201705::PreferredContent
+ Google::Ads::AdWords::v201705::PriceExtensionPriceQualifier
+ Google::Ads::AdWords::v201705::PriceExtensionPriceUnit
+ Google::Ads::AdWords::v201705::PriceExtensionType
+ Google::Ads::AdWords::v201705::PriceFeedItem
+ Google::Ads::AdWords::v201705::PriceTableRow
+ Google::Ads::AdWords::v201705::ProductAd
+ Google::Ads::AdWords::v201705::ProductAdwordsGrouping
+ Google::Ads::AdWords::v201705::ProductAdwordsLabels
+ Google::Ads::AdWords::v201705::ProductBiddingCategory
+ Google::Ads::AdWords::v201705::ProductBiddingCategoryData
+ Google::Ads::AdWords::v201705::ProductBrand
+ Google::Ads::AdWords::v201705::ProductCanonicalCondition
+ Google::Ads::AdWords::v201705::ProductCanonicalCondition::Condition
+ Google::Ads::AdWords::v201705::ProductChannel
+ Google::Ads::AdWords::v201705::ProductChannelExclusivity
+ Google::Ads::AdWords::v201705::ProductCustomAttribute
+ Google::Ads::AdWords::v201705::ProductDimension
+ Google::Ads::AdWords::v201705::ProductDimensionType
+ Google::Ads::AdWords::v201705::ProductLegacyCondition
+ Google::Ads::AdWords::v201705::ProductOfferId
+ Google::Ads::AdWords::v201705::ProductPartition
+ Google::Ads::AdWords::v201705::ProductPartitionType
+ Google::Ads::AdWords::v201705::ProductScope
+ Google::Ads::AdWords::v201705::ProductType
+ Google::Ads::AdWords::v201705::ProductTypeFull
+ Google::Ads::AdWords::v201705::ProgressStats
+ Google::Ads::AdWords::v201705::PromotionExtensionDiscountModifier
+ Google::Ads::AdWords::v201705::PromotionExtensionOccasion
+ Google::Ads::AdWords::v201705::PromotionFeedItem
+ Google::Ads::AdWords::v201705::Proximity
+ Google::Ads::AdWords::v201705::Proximity::DistanceUnits
+ Google::Ads::AdWords::v201705::QualityInfo
+ Google::Ads::AdWords::v201705::QueryError
+ Google::Ads::AdWords::v201705::QueryError::Reason
+ Google::Ads::AdWords::v201705::QuotaCheckError
+ Google::Ads::AdWords::v201705::QuotaCheckError::Reason
+ Google::Ads::AdWords::v201705::Range
+ Google::Ads::AdWords::v201705::RangeError
+ Google::Ads::AdWords::v201705::RangeError::Reason
+ Google::Ads::AdWords::v201705::RateExceededError
+ Google::Ads::AdWords::v201705::RateExceededError::Reason
+ Google::Ads::AdWords::v201705::ReadOnlyError
+ Google::Ads::AdWords::v201705::ReadOnlyError::Reason
+ Google::Ads::AdWords::v201705::RealTimeBiddingSetting
+ Google::Ads::AdWords::v201705::RegionCodeError
+ Google::Ads::AdWords::v201705::RegionCodeError::Reason
+ Google::Ads::AdWords::v201705::RejectedError
+ Google::Ads::AdWords::v201705::RejectedError::Reason
+ Google::Ads::AdWords::v201705::RelatedToQuerySearchParameter
+ Google::Ads::AdWords::v201705::RelatedToUrlSearchParameter
+ Google::Ads::AdWords::v201705::RelationshipType
+ Google::Ads::AdWords::v201705::RelativeDate
+ Google::Ads::AdWords::v201705::RemarketingSettings
+ Google::Ads::AdWords::v201705::ReportDefinition::ReportType
+ Google::Ads::AdWords::v201705::ReportDefinitionError
+ Google::Ads::AdWords::v201705::ReportDefinitionError::Reason
+ Google::Ads::AdWords::v201705::ReportDefinitionField
+ Google::Ads::AdWords::v201705::ReportDefinitionService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::ReportDefinitionService::ReportDefinitionServiceInterfacePort
+ Google::Ads::AdWords::v201705::ReportDefinitionService::RequestHeader
+ Google::Ads::AdWords::v201705::ReportDefinitionService::ResponseHeader
+ Google::Ads::AdWords::v201705::ReportDefinitionService::getReportFields
+ Google::Ads::AdWords::v201705::ReportDefinitionService::getReportFieldsResponse
+ Google::Ads::AdWords::v201705::RequestContextOperand
+ Google::Ads::AdWords::v201705::RequestContextOperand::ContextType
+ Google::Ads::AdWords::v201705::RequestError
+ Google::Ads::AdWords::v201705::RequestError::Reason
+ Google::Ads::AdWords::v201705::RequestType
+ Google::Ads::AdWords::v201705::RequiredError
+ Google::Ads::AdWords::v201705::RequiredError::Reason
+ Google::Ads::AdWords::v201705::ResponsiveDisplayAd
+ Google::Ads::AdWords::v201705::ReviewFeedItem
+ Google::Ads::AdWords::v201705::RichMediaAd
+ Google::Ads::AdWords::v201705::RichMediaAd::AdAttribute
+ Google::Ads::AdWords::v201705::RichMediaAd::RichMediaAdType
+ Google::Ads::AdWords::v201705::Rule
+ Google::Ads::AdWords::v201705::RuleBasedUserList
+ Google::Ads::AdWords::v201705::RuleBasedUserList::PrepopulationStatus
+ Google::Ads::AdWords::v201705::RuleItem
+ Google::Ads::AdWords::v201705::RuleItemGroup
+ Google::Ads::AdWords::v201705::SearchParameter
+ Google::Ads::AdWords::v201705::SearchVolumeSearchParameter
+ Google::Ads::AdWords::v201705::SeedAdGroupIdSearchParameter
+ Google::Ads::AdWords::v201705::SelectiveOptimization
+ Google::Ads::AdWords::v201705::Selector
+ Google::Ads::AdWords::v201705::SelectorError
+ Google::Ads::AdWords::v201705::SelectorError::Reason
+ Google::Ads::AdWords::v201705::ServiceLink
+ Google::Ads::AdWords::v201705::ServiceLink::LinkStatus
+ Google::Ads::AdWords::v201705::ServiceLinkOperation
+ Google::Ads::AdWords::v201705::ServiceType
+ Google::Ads::AdWords::v201705::ServingStatus
+ Google::Ads::AdWords::v201705::Setting
+ Google::Ads::AdWords::v201705::SettingError
+ Google::Ads::AdWords::v201705::SettingError::Reason
+ Google::Ads::AdWords::v201705::SharedBiddingStrategy
+ Google::Ads::AdWords::v201705::SharedBiddingStrategy::BiddingStrategyStatus
+ Google::Ads::AdWords::v201705::SharedCriterion
+ Google::Ads::AdWords::v201705::SharedCriterionError
+ Google::Ads::AdWords::v201705::SharedCriterionError::Reason
+ Google::Ads::AdWords::v201705::SharedCriterionOperation
+ Google::Ads::AdWords::v201705::SharedCriterionPage
+ Google::Ads::AdWords::v201705::SharedCriterionReturnValue
+ Google::Ads::AdWords::v201705::SharedCriterionService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::SharedCriterionService::RequestHeader
+ Google::Ads::AdWords::v201705::SharedCriterionService::ResponseHeader
+ Google::Ads::AdWords::v201705::SharedCriterionService::SharedCriterionServiceInterfacePort
+ Google::Ads::AdWords::v201705::SharedCriterionService::get
+ Google::Ads::AdWords::v201705::SharedCriterionService::getResponse
+ Google::Ads::AdWords::v201705::SharedCriterionService::mutate
+ Google::Ads::AdWords::v201705::SharedCriterionService::mutateResponse
+ Google::Ads::AdWords::v201705::SharedCriterionService::query
+ Google::Ads::AdWords::v201705::SharedCriterionService::queryResponse
+ Google::Ads::AdWords::v201705::SharedSet
+ Google::Ads::AdWords::v201705::SharedSet::Status
+ Google::Ads::AdWords::v201705::SharedSetError
+ Google::Ads::AdWords::v201705::SharedSetError::Reason
+ Google::Ads::AdWords::v201705::SharedSetOperation
+ Google::Ads::AdWords::v201705::SharedSetPage
+ Google::Ads::AdWords::v201705::SharedSetReturnValue
+ Google::Ads::AdWords::v201705::SharedSetService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::SharedSetService::RequestHeader
+ Google::Ads::AdWords::v201705::SharedSetService::ResponseHeader
+ Google::Ads::AdWords::v201705::SharedSetService::SharedSetServiceInterfacePort
+ Google::Ads::AdWords::v201705::SharedSetService::get
+ Google::Ads::AdWords::v201705::SharedSetService::getResponse
+ Google::Ads::AdWords::v201705::SharedSetService::mutate
+ Google::Ads::AdWords::v201705::SharedSetService::mutateResponse
+ Google::Ads::AdWords::v201705::SharedSetService::query
+ Google::Ads::AdWords::v201705::SharedSetService::queryResponse
+ Google::Ads::AdWords::v201705::SharedSetType
+ Google::Ads::AdWords::v201705::ShoppingBiddingDimensionStatus
+ Google::Ads::AdWords::v201705::ShoppingProductChannel
+ Google::Ads::AdWords::v201705::ShoppingProductChannelExclusivity
+ Google::Ads::AdWords::v201705::ShoppingPurchasePlatform
+ Google::Ads::AdWords::v201705::ShoppingSetting
+ Google::Ads::AdWords::v201705::ShowcaseAd
+ Google::Ads::AdWords::v201705::SimilarUserList
+ Google::Ads::AdWords::v201705::SitelinkFeedItem
+ Google::Ads::AdWords::v201705::SizeLimitError
+ Google::Ads::AdWords::v201705::SizeLimitError::Reason
+ Google::Ads::AdWords::v201705::SizeRange
+ Google::Ads::AdWords::v201705::SoapHeader
+ Google::Ads::AdWords::v201705::SoapResponseHeader
+ Google::Ads::AdWords::v201705::SortOrder
+ Google::Ads::AdWords::v201705::SpendTargetType
+ Google::Ads::AdWords::v201705::StatsEstimate
+ Google::Ads::AdWords::v201705::StatsQueryError
+ Google::Ads::AdWords::v201705::StatsQueryError::Reason
+ Google::Ads::AdWords::v201705::StringAttribute
+ Google::Ads::AdWords::v201705::StringFormatError
+ Google::Ads::AdWords::v201705::StringFormatError::Reason
+ Google::Ads::AdWords::v201705::StringKey
+ Google::Ads::AdWords::v201705::StringLengthError
+ Google::Ads::AdWords::v201705::StringLengthError::Reason
+ Google::Ads::AdWords::v201705::StringRuleItem
+ Google::Ads::AdWords::v201705::StringRuleItem::StringOperator
+ Google::Ads::AdWords::v201705::String_StringMapEntry
+ Google::Ads::AdWords::v201705::StructuredSnippetFeedItem
+ Google::Ads::AdWords::v201705::SystemFeedGenerationData
+ Google::Ads::AdWords::v201705::SystemServingStatus
+ Google::Ads::AdWords::v201705::TargetCpaBiddingScheme
+ Google::Ads::AdWords::v201705::TargetOutrankShareBiddingScheme
+ Google::Ads::AdWords::v201705::TargetRoasBiddingScheme
+ Google::Ads::AdWords::v201705::TargetSpendBiddingScheme
+ Google::Ads::AdWords::v201705::TargetingIdea
+ Google::Ads::AdWords::v201705::TargetingIdeaError
+ Google::Ads::AdWords::v201705::TargetingIdeaError::Reason
+ Google::Ads::AdWords::v201705::TargetingIdeaPage
+ Google::Ads::AdWords::v201705::TargetingIdeaSelector
+ Google::Ads::AdWords::v201705::TargetingIdeaService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::TargetingIdeaService::RequestHeader
+ Google::Ads::AdWords::v201705::TargetingIdeaService::ResponseHeader
+ Google::Ads::AdWords::v201705::TargetingIdeaService::TargetingIdeaServiceInterfacePort
+ Google::Ads::AdWords::v201705::TargetingIdeaService::get
+ Google::Ads::AdWords::v201705::TargetingIdeaService::getResponse
+ Google::Ads::AdWords::v201705::TargetingSetting
+ Google::Ads::AdWords::v201705::TargetingSettingDetail
+ Google::Ads::AdWords::v201705::TempAdUnionId
+ Google::Ads::AdWords::v201705::TemplateAd
+ Google::Ads::AdWords::v201705::TemplateElement
+ Google::Ads::AdWords::v201705::TemplateElementField
+ Google::Ads::AdWords::v201705::TemplateElementField::Type
+ Google::Ads::AdWords::v201705::TemporaryUrl
+ Google::Ads::AdWords::v201705::TextAd
+ Google::Ads::AdWords::v201705::TextLabel
+ Google::Ads::AdWords::v201705::ThirdPartyRedirectAd
+ Google::Ads::AdWords::v201705::ThirdPartyRedirectAd::ExpandingDirection
+ Google::Ads::AdWords::v201705::TimeUnit
+ Google::Ads::AdWords::v201705::TrackingSetting
+ Google::Ads::AdWords::v201705::TrafficEstimatorError
+ Google::Ads::AdWords::v201705::TrafficEstimatorError::Reason
+ Google::Ads::AdWords::v201705::TrafficEstimatorResult
+ Google::Ads::AdWords::v201705::TrafficEstimatorSelector
+ Google::Ads::AdWords::v201705::TrafficEstimatorService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::TrafficEstimatorService::RequestHeader
+ Google::Ads::AdWords::v201705::TrafficEstimatorService::ResponseHeader
+ Google::Ads::AdWords::v201705::TrafficEstimatorService::TrafficEstimatorServiceInterfacePort
+ Google::Ads::AdWords::v201705::TrafficEstimatorService::get
+ Google::Ads::AdWords::v201705::TrafficEstimatorService::getResponse
+ Google::Ads::AdWords::v201705::Trial
+ Google::Ads::AdWords::v201705::TrialAsyncError
+ Google::Ads::AdWords::v201705::TrialAsyncErrorPage
+ Google::Ads::AdWords::v201705::TrialAsyncErrorService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::TrialAsyncErrorService::RequestHeader
+ Google::Ads::AdWords::v201705::TrialAsyncErrorService::ResponseHeader
+ Google::Ads::AdWords::v201705::TrialAsyncErrorService::TrialAsyncErrorServiceInterfacePort
+ Google::Ads::AdWords::v201705::TrialAsyncErrorService::get
+ Google::Ads::AdWords::v201705::TrialAsyncErrorService::getResponse
+ Google::Ads::AdWords::v201705::TrialAsyncErrorService::query
+ Google::Ads::AdWords::v201705::TrialAsyncErrorService::queryResponse
+ Google::Ads::AdWords::v201705::TrialError
+ Google::Ads::AdWords::v201705::TrialError::Reason
+ Google::Ads::AdWords::v201705::TrialOperation
+ Google::Ads::AdWords::v201705::TrialPage
+ Google::Ads::AdWords::v201705::TrialReturnValue
+ Google::Ads::AdWords::v201705::TrialService::ApiExceptionFault
+ Google::Ads::AdWords::v201705::TrialService::RequestHeader
+ Google::Ads::AdWords::v201705::TrialService::ResponseHeader
+ Google::Ads::AdWords::v201705::TrialService::TrialServiceInterfacePort
+ Google::Ads::AdWords::v201705::TrialService::get
+ Google::Ads::AdWords::v201705::TrialService::getResponse
+ Google::Ads::AdWords::v201705::TrialService::mutate
+ Google::Ads::AdWords::v201705::TrialService::mutateResponse
+ Google::Ads::AdWords::v201705::TrialService::query
+ Google::Ads::AdWords::v201705::TrialService::queryResponse
+ Google::Ads::AdWords::v201705::TrialStatus
+ Google::Ads::AdWords::v201705::TypeMaps::AccountLabelService
+ Google::Ads::AdWords::v201705::TypeMaps::AdCustomizerFeedService
+ Google::Ads::AdWords::v201705::TypeMaps::AdGroupAdService
+ Google::Ads::AdWords::v201705::TypeMaps::AdGroupBidModifierService
+ Google::Ads::AdWords::v201705::TypeMaps::AdGroupCriterionService
+ Google::Ads::AdWords::v201705::TypeMaps::AdGroupExtensionSettingService
+ Google::Ads::AdWords::v201705::TypeMaps::AdGroupFeedService
+ Google::Ads::AdWords::v201705::TypeMaps::AdGroupService
+ Google::Ads::AdWords::v201705::TypeMaps::AdParamService
+ Google::Ads::AdWords::v201705::TypeMaps::AdwordsUserListService
+ Google::Ads::AdWords::v201705::TypeMaps::BatchJobOpsService
+ Google::Ads::AdWords::v201705::TypeMaps::BatchJobService
+ Google::Ads::AdWords::v201705::TypeMaps::BiddingStrategyService
+ Google::Ads::AdWords::v201705::TypeMaps::BudgetOrderService
+ Google::Ads::AdWords::v201705::TypeMaps::BudgetService
+ Google::Ads::AdWords::v201705::TypeMaps::CampaignBidModifierService
+ Google::Ads::AdWords::v201705::TypeMaps::CampaignCriterionService
+ Google::Ads::AdWords::v201705::TypeMaps::CampaignExtensionSettingService
+ Google::Ads::AdWords::v201705::TypeMaps::CampaignFeedService
+ Google::Ads::AdWords::v201705::TypeMaps::CampaignGroupPerformanceTargetService
+ Google::Ads::AdWords::v201705::TypeMaps::CampaignGroupService
+ Google::Ads::AdWords::v201705::TypeMaps::CampaignService
+ Google::Ads::AdWords::v201705::TypeMaps::CampaignSharedSetService
+ Google::Ads::AdWords::v201705::TypeMaps::ConstantDataService
+ Google::Ads::AdWords::v201705::TypeMaps::ConversionTrackerService
+ Google::Ads::AdWords::v201705::TypeMaps::CustomerExtensionSettingService
+ Google::Ads::AdWords::v201705::TypeMaps::CustomerFeedService
+ Google::Ads::AdWords::v201705::TypeMaps::CustomerService
+ Google::Ads::AdWords::v201705::TypeMaps::CustomerSyncService
+ Google::Ads::AdWords::v201705::TypeMaps::DataService
+ Google::Ads::AdWords::v201705::TypeMaps::DraftAsyncErrorService
+ Google::Ads::AdWords::v201705::TypeMaps::DraftService
+ Google::Ads::AdWords::v201705::TypeMaps::FeedItemService
+ Google::Ads::AdWords::v201705::TypeMaps::FeedMappingService
+ Google::Ads::AdWords::v201705::TypeMaps::FeedService
+ Google::Ads::AdWords::v201705::TypeMaps::LabelService
+ Google::Ads::AdWords::v201705::TypeMaps::LocationCriterionService
+ Google::Ads::AdWords::v201705::TypeMaps::ManagedCustomerService
+ Google::Ads::AdWords::v201705::TypeMaps::MediaService
+ Google::Ads::AdWords::v201705::TypeMaps::OfflineCallConversionFeedService
+ Google::Ads::AdWords::v201705::TypeMaps::OfflineConversionFeedService
+ Google::Ads::AdWords::v201705::TypeMaps::ReportDefinitionService
+ Google::Ads::AdWords::v201705::TypeMaps::SharedCriterionService
+ Google::Ads::AdWords::v201705::TypeMaps::SharedSetService
+ Google::Ads::AdWords::v201705::TypeMaps::TargetingIdeaService
+ Google::Ads::AdWords::v201705::TypeMaps::TrafficEstimatorService
+ Google::Ads::AdWords::v201705::TypeMaps::TrialAsyncErrorService
+ Google::Ads::AdWords::v201705::TypeMaps::TrialService
+ Google::Ads::AdWords::v201705::Type_AttributeMapEntry
+ Google::Ads::AdWords::v201705::UniversalAppBiddingStrategyGoalType
+ Google::Ads::AdWords::v201705::UniversalAppCampaignAdsPolicyDecisions
+ Google::Ads::AdWords::v201705::UniversalAppCampaignAsset
+ Google::Ads::AdWords::v201705::UniversalAppCampaignSetting
+ Google::Ads::AdWords::v201705::UnknownProductDimension
+ Google::Ads::AdWords::v201705::UploadCallConversion
+ Google::Ads::AdWords::v201705::UploadConversion
+ Google::Ads::AdWords::v201705::UrlData
+ Google::Ads::AdWords::v201705::UrlError
+ Google::Ads::AdWords::v201705::UrlError::Reason
+ Google::Ads::AdWords::v201705::UrlList
+ Google::Ads::AdWords::v201705::UserList
+ Google::Ads::AdWords::v201705::UserListClosingReason
+ Google::Ads::AdWords::v201705::UserListConversionType
+ Google::Ads::AdWords::v201705::UserListConversionType::Category
+ Google::Ads::AdWords::v201705::UserListError
+ Google::Ads::AdWords::v201705::UserListError::Reason
+ Google::Ads::AdWords::v201705::UserListLogicalRule
+ Google::Ads::AdWords::v201705::UserListLogicalRule::Operator
+ Google::Ads::AdWords::v201705::UserListMembershipStatus
+ Google::Ads::AdWords::v201705::UserListOperation
+ Google::Ads::AdWords::v201705::UserListPage
+ Google::Ads::AdWords::v201705::UserListReturnValue
+ Google::Ads::AdWords::v201705::UserListRuleTypeEnums::Enum
+ Google::Ads::AdWords::v201705::UserListType
+ Google::Ads::AdWords::v201705::UserListUploadStatus
+ Google::Ads::AdWords::v201705::UserStatus
+ Google::Ads::AdWords::v201705::VanityPharma
+ Google::Ads::AdWords::v201705::VanityPharmaDisplayUrlMode
+ Google::Ads::AdWords::v201705::VanityPharmaText
+ Google::Ads::AdWords::v201705::Vertical
+ Google::Ads::AdWords::v201705::Video
+ Google::Ads::AdWords::v201705::VideoError
+ Google::Ads::AdWords::v201705::VideoError::Reason
+ Google::Ads::AdWords::v201705::VideoType
+ Google::Ads::AdWords::v201705::VolumeGoalType
+ Google::Ads::AdWords::v201705::Webpage
+ Google::Ads::AdWords::v201705::WebpageCondition
+ Google::Ads::AdWords::v201705::WebpageConditionOperand
+ Google::Ads::AdWords::v201705::WebpageDescriptor
+ Google::Ads::AdWords::v201705::WebpageDescriptorAttribute
+ Google::Ads::AdWords::v201705::WebpageParameter
+ Google::Ads::AdWords::v201705::WebsiteCallMetricsConversion
+ Google::Ads::AdWords::v201705::YouTubeChannel
+ Google::Ads::AdWords::v201705::YouTubeVideo
Google::Ads::Common::AuthError
Google::Ads::Common::AuthHandlerInterface
Google::Ads::Common::CaptchaRequiredError
diff --git a/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild
new file mode 100644
index 000000000000..506a5012360f
--- /dev/null
+++ b/dev-perl/Hash-FieldHash/Hash-FieldHash-0.150.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=GFUJI
+DIST_VERSION=0.15
+DIST_EXAMPLES=( "example/*" "benchmark" )
+inherit perl-module
+
+DESCRIPTION="Lightweight field hash for inside-out objects"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=virtual/perl-XSLoader-0.20.0
+ >=virtual/perl-parent-0.221.0
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-Devel-PPPort-3.190.0
+ >=virtual/perl-ExtUtils-MakeMaker-6.590.0
+ >=virtual/perl-ExtUtils-ParseXS-2.210.0
+ >=dev-perl/Module-Build-0.400.500
+ test? (
+ >=dev-perl/Test-LeakTrace-0.70.0
+ >=virtual/perl-Test-Simple-0.620.0
+ )
+"
+
+src_prepare() {
+ # https://github.com/gfx/p5-Hash-FieldHash/issues/4
+ sed -i -e 's/use builder::MyBuilder;/use lib q[.]; use builder::MyBuilder;/' Build.PL \
+ || die "Can't patch Build.PL for 5.26 dot-in-inc"
+
+ perl-module_src_prepare
+}
diff --git a/dev-perl/Hash-FieldHash/Manifest b/dev-perl/Hash-FieldHash/Manifest
new file mode 100644
index 000000000000..0d3b5e9477f8
--- /dev/null
+++ b/dev-perl/Hash-FieldHash/Manifest
@@ -0,0 +1 @@
+DIST Hash-FieldHash-0.15.tar.gz 29082 SHA256 5c515707a5433796a5697b118ddbf1f216d13c5cd52f2b64292e76f7d9b7e8f1 SHA512 2f42b0e7efdba03b99c9646882afc47130de1989777eb1ceaf8031769a3a11ebdaa841abedea8288b770aa27c44108846d0765f531a35d707e44a8c1f0f8036e WHIRLPOOL ece3b4870d0d2df552e383a8931984b4cb66c38f47c23fed10dc787f8c09703404fba52ec9e31aa9d4bdb09225e85b7d86b9f6541be5954170158212935d1bc3
diff --git a/dev-perl/Hash-FieldHash/metadata.xml b/dev-perl/Hash-FieldHash/metadata.xml
new file mode 100644
index 000000000000..4316a0690215
--- /dev/null
+++ b/dev-perl/Hash-FieldHash/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ perl@gentoo.org
+ Gentoo Perl Project
+
+
+ Hash-FieldHash
+ Hash::FieldHash
+
+
diff --git a/dev-perl/Regexp-Util/Manifest b/dev-perl/Regexp-Util/Manifest
new file mode 100644
index 000000000000..a180399f2386
--- /dev/null
+++ b/dev-perl/Regexp-Util/Manifest
@@ -0,0 +1 @@
+DIST Regexp-Util-0.003.tar.gz 61890 SHA256 aae41abb805bfd8a9af7963360bed6ef62c0e6ef6c36655cba565317df63c106 SHA512 27501c4e7017e2470cd24f2b8bd8b94cc3acd266500851c5ee1f4bbe3af56285be3eeaacee95b45606bee01cead4f0a30eb7c10260d93b3e98bc432d211be2f0 WHIRLPOOL a48a778826bb7111fac7321fa5219a3461f50a3f03df86686492a251450370217f62c56e4251907a5589c10e7f3e0b026c3e3deaae907850dab7884d24caf3a7
diff --git a/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild b/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild
new file mode 100644
index 000000000000..b6e584d2a3f1
--- /dev/null
+++ b/dev-perl/Regexp-Util/Regexp-Util-0.3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TOBYINK
+DIST_VERSION=0.003
+inherit perl-module
+
+DESCRIPTION="General purpose utilities for working with Regular Expressions"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.170.0
+ virtual/perl-ExtUtils-Constant
+ test? (
+ >=virtual/perl-Test-Simple-0.920.0
+ )
+"
diff --git a/dev-perl/Regexp-Util/metadata.xml b/dev-perl/Regexp-Util/metadata.xml
new file mode 100644
index 000000000000..7fe93a63a336
--- /dev/null
+++ b/dev-perl/Regexp-Util/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ perl@gentoo.org
+ Gentoo Perl Project
+
+
+ Regexp-Util
+ Regexp::Util
+
+
diff --git a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
index 1b9e7aac0979..7217eb39c34d 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.640.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Test strings and data structures and show differences if not ok"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
IUSE="test"
PERL_RM_FILES=(
"t/boilerplate.t"
diff --git a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
index 4b8d38caae8d..62157e572c5b 100644
--- a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Most commonly needed test functions and features"
SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Type-Tie/Manifest b/dev-perl/Type-Tie/Manifest
new file mode 100644
index 000000000000..0773a1f4a3e6
--- /dev/null
+++ b/dev-perl/Type-Tie/Manifest
@@ -0,0 +1 @@
+DIST Type-Tie-0.009.tar.gz 18579 SHA256 565d9ec0a7f93095d5e68a8794a25c0b27e292007e04fdb77793f477da1463f3 SHA512 2c416cd22d1d4a7ec902470d0801d479a54f312d456982e51671ba7391d127297471f0f753df5cafef4b6e01c983cd9f8f69c99f03f571aad5c89036c642a6c6 WHIRLPOOL cf545fc739976646f843e5b6fcadce3cd269da2741fe748da9f9573a604a163cccd7027d4b67ba136ee3620101fa6896ed6e41344031e87706400028e6351500
diff --git a/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild b/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild
new file mode 100644
index 000000000000..1d354fa20d61
--- /dev/null
+++ b/dev-perl/Type-Tie/Type-Tie-0.9.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TOBYINK
+DIST_VERSION=0.009
+inherit perl-module
+
+DESCRIPTION="Tie a variable to a type constraint"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+
+RDEPEND="
+ !minimal? (
+ dev-perl/Hash-FieldHash
+ )
+ >=dev-perl/Exporter-Tiny-0.26.0
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.170.0
+ test? (
+ dev-perl/Test-Fatal
+ dev-perl/Test-Requires
+ >=virtual/perl-Test-Simple-0.960.0
+ )
+"
diff --git a/dev-perl/Type-Tie/metadata.xml b/dev-perl/Type-Tie/metadata.xml
new file mode 100644
index 000000000000..93509246583d
--- /dev/null
+++ b/dev-perl/Type-Tie/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ perl@gentoo.org
+ Gentoo Perl Project
+
+
+ Type-Tie
+ Type::Tie
+ Type::Tie::ARRAY
+ Type::Tie::BASE
+ Type::Tie::HASH
+ Type::Tie::SCALAR
+
+
diff --git a/dev-perl/Type-Tiny/Manifest b/dev-perl/Type-Tiny/Manifest
index cf35564ee3bb..60fb1aa33d91 100644
--- a/dev-perl/Type-Tiny/Manifest
+++ b/dev-perl/Type-Tiny/Manifest
@@ -1 +1,2 @@
DIST Type-Tiny-1.000005.tar.gz 249419 SHA256 42ed36c011825aa1e6995a4e8638621a1b2103a0970b15764ca3919368042365 SHA512 5817ee937384cccbea71fa69f8c2202d721c648a18eedf089529fbb956b2d050b889606e69c8bc3e1d94fb6f638b6cac01394b5534f17a8be6cdf82d69b965b6 WHIRLPOOL 8ac0914d07fbc186c3dcc2cdb7cc9f6288a940818958a148d6ed898849f5e4456d34fa7cd29bdd5315a1f941b2ce0e74a0f2ab9f0d15c7216ec0481a9bf88774
+DIST Type-Tiny-1.002000.tar.gz 264748 SHA256 f37d6d6656b4f8df7b595a253e44b234fe4cd0f3eabf0528067d6651993f4bca SHA512 da9e150011f898bd2af2adafb12124505b651f7b41e4cd9177bcf8e4148f7a7732014292f9f2099bc0b2582f4ee1809009cabe74df8002d182eceb855f6d446a WHIRLPOOL 1c279846cfb650a76e02a1f9108117d3997654f1a79775dd9448fde36e5a494cbcddd7964774e4e338032b9a1b466b0552c4011168e470f2d4a4110ba8b7f490
diff --git a/dev-perl/Type-Tiny/Type-Tiny-1.2.0.ebuild b/dev-perl/Type-Tiny/Type-Tiny-1.2.0.ebuild
new file mode 100644
index 000000000000..f32e44b2d09e
--- /dev/null
+++ b/dev-perl/Type-Tiny/Type-Tiny-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=TOBYINK
+DIST_VERSION=1.002000
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="tiny, yet Moo(se)-compatible type constraint"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test minimal"
+
+# Test rdep for Test::TypeTiny
+RDEPEND="
+ !=dev-perl/Exporter-Tiny-0.26.0
+ >=virtual/perl-Test-Simple-1.1.10
+ !minimal? (
+ >=dev-perl/Devel-LexAlias-0.50.0
+ dev-perl/Devel-StackTrace
+ >=dev-perl/Ref-Util-XS-0.116.0
+ >=dev-perl/Regexp-Util-0.3.0
+ virtual/perl-Scalar-List-Utils
+ dev-perl/Type-Tie
+ >=dev-perl/Type-Tiny-XS-0.11.0
+ )
+"
+DEPEND="${RDEPEND}
+ >=virtual/perl-ExtUtils-MakeMaker-6.170.0
+ >=virtual/perl-CPAN-Meta-Requirements-2.0.0
+ test? (
+ dev-perl/Test-Warnings
+ )
+"
diff --git a/dev-perl/Type-Tiny/metadata.xml b/dev-perl/Type-Tiny/metadata.xml
index 2b9a936fc0a1..3f0cbb681fdf 100644
--- a/dev-perl/Type-Tiny/metadata.xml
+++ b/dev-perl/Type-Tiny/metadata.xml
@@ -5,4 +5,42 @@
perl@gentoo.org
Gentoo Perl Project
+
+ Type-Tiny
+ Devel::TypeTiny::Perl56Compat
+ Devel::TypeTiny::Perl58Compat
+ Error::TypeTiny
+ Error::TypeTiny::Assertion
+ Error::TypeTiny::Compilation
+ Error::TypeTiny::WrongNumberOfParameters
+ Eval::TypeTiny
+ Reply::Plugin::TypeTiny
+ Test::TypeTiny
+ Type::Coercion
+ Type::Coercion::FromMoose
+ Type::Coercion::Union
+ Type::Library
+ Type::Params
+ Type::Parser
+ Type::Registry
+ Type::Tiny
+ Type::Tiny::Class
+ Type::Tiny::Duck
+ Type::Tiny::Enum
+ Type::Tiny::Intersection
+ Type::Tiny::Role
+ Type::Tiny::Union
+ Type::Utils
+ Types::Common::Numeric
+ Types::Common::String
+ Types::Standard
+ Types::Standard::ArrayRef
+ Types::Standard::CycleTuple
+ Types::Standard::Dict
+ Types::Standard::HashRef
+ Types::Standard::Map
+ Types::Standard::ScalarRef
+ Types::Standard::Tuple
+ Types::TypeTiny
+
diff --git a/dev-python/bottleneck/bottleneck-1.0.0.ebuild b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
index 691f620eccfa..3a9f09cbd62a 100644
--- a/dev-python/bottleneck/bottleneck-1.0.0.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/B/${MY_PN}/${MY_P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-python/dbusmock/dbusmock-0.16.7.ebuild b/dev-python/dbusmock/dbusmock-0.16.7.ebuild
index 7eebfd8ebe4f..03a741d4db04 100644
--- a/dev-python/dbusmock/dbusmock-0.16.7.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.16.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
IUSE="test"
RDEPEND="
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index 694f92b8ef85..0d9b3fe020f4 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1 +1,2 @@
DIST dj-database-url-0.4.0.tar.gz 4015 SHA256 858312abb7b330ea875733a65806a36ad04d7b8451c6ce8835118a2fa10d6870 SHA512 eea9a095f135adf7a197db949cb1ca067ff920c73fe62f510da4decd92aad7e0051bbabee4b92f0848ffc23ce6ee87ddaf0fb284b0cfba78ba0e3b5a367cccf6 WHIRLPOOL ff56f7666aee983286a1faeabcbb4815e88857f1f10d2919963f7ac07b95916f363859ea22f284180e9828eb95e3a3c70c3e25eb614450c1ef0e463ee924a892
+DIST dj-database-url-0.4.2.tar.gz 4268 SHA256 a6832d8445ee9d788c5baa48aef8130bf61fdc442f7d9a548424d25cd85c9f08 SHA512 d18fe4e0cd4073689759c302c22e0f128d4ed1103af99a1db4dbe645fdea601837131a3f8d215143dabda64903aaeeb4706bd2082810f904cc8e74b564c5f2e3 WHIRLPOOL 08327f681e870c308a47f943be54a20c4c85cfc9c4c33f0d0473c96c31f55e7369621b601b98e94ff7318a7ffe47e77a75b02dc3546dc0831fe36d35c5d83aab
diff --git a/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
new file mode 100644
index 000000000000..0d4fc785818f
--- /dev/null
+++ b/dev-python/dj-database-url/dj-database-url-0.4.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Use Database URLs in your Django Application"
+HOMEPAGE="
+ https://pypi.python.org/pypi/dj-database-url
+ https://github.com/kennethreitz/dj-database-url"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Not contained in the tarball
+RESTRICT=test
+
+python_test() {
+ "${PYTHON}" test_dj_database_url.py || die
+}
diff --git a/dev-python/django-celery/Manifest b/dev-python/django-celery/Manifest
index 0ae1d7890879..f7af4997ca85 100644
--- a/dev-python/django-celery/Manifest
+++ b/dev-python/django-celery/Manifest
@@ -1,2 +1 @@
-DIST django-celery-3.1.16.tar.gz 77411 SHA256 07a9c650a1f20e040cf5fffd0bcd920a81d0734915130d898c0325c5fafb2ec4 SHA512 8bada03237f2b6f45484fe15e985d4763944fe19b3ac7271a6b9d53058c13d903b0aba070cd813741e2a1a2c6c1d17b335f8712ca70c377d45892471ef7a59bc WHIRLPOOL a707ce0e31407e9a452d4930e93207dea31f22365a1c827dc917d9dc34d6a5c48f2bfc0aab41ce3b5a92877200265630e6fc17f7e7c80e0aac2ceb76a272a483
DIST django-celery-3.1.17.tar.gz 79615 SHA256 254a95b0a4386df1fd949823942f6312c80fba3c88c5efad79cad8648bc5feb5 SHA512 fa68c85ee0eea778c5921c0373f3e7547bc644cd11d83e659fdf9bf4a80e317faca12ad3941225b073609a4716c5b9574d85c5c7063cff0fdb3deb0f1b86d225 WHIRLPOOL 6f01ab8aa28723720cd2ba516c9b2ecc30c28efe69fbdc72ddb18ed0fd2cfdaede6146133ec4a59f311e223a7146a7a190eaf8d9a6d8d831e46cafe668699fff
diff --git a/dev-python/django-celery/django-celery-3.1.16.ebuild b/dev-python/django-celery/django-celery-3.1.16.ebuild
deleted file mode 100644
index 897bfad07781..000000000000
--- a/dev-python/django-celery/django-celery-3.1.16.ebuild
+++ /dev/null
@@ -1,60 +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_4} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Celery Integration for Django"
-HOMEPAGE="http://celeryproject.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples test"
-
-# Python testsuite fails when built against dev-python/django-1.8.5
-# with ValueError: save() prohibited to prevent data loss due to
-# unsaved related object 'interval'.
-
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-RDEPEND=">=dev-python/celery-3.1.15[${PYTHON_USEDEP}]
- >dev-python/django-1.4[${PYTHON_USEDEP}]
- <=dev-python/django-1.7.11[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/django-nose[${PYTHON_USEDEP}]
- >=dev-python/coverage-3.0[${PYTHON_USEDEP}]
- dev-python/nose-cover3[${PYTHON_USEDEP}]
- dev-python/mock[${PY2_USEDEP}]
- dev-python/python-memcached[${PY2_USEDEP}] )
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinxcontrib-issuetracker[${PY2_USEDEP}]
- dev-python/python-memcached[${PY2_USEDEP}]
- )"
-
-PY27_REQUSE="$(python_gen_useflags 'python2*')"
-REQUIRED_USE="
- doc? ( ${PY27_REQUSE} )"
-
-PATCHES=( "${FILESDIR}/${P}-py3-test-failures.patch" )
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- # https://github.com/celery/django-celery/issues/342
- "${PYTHON}" tests/manage.py test
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/.build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/django-celery/django-celery-3.1.17.ebuild b/dev-python/django-celery/django-celery-3.1.17.ebuild
index 3f4179fc30de..3092cb13fc84 100644
--- a/dev-python/django-celery/django-celery-3.1.17.ebuild
+++ b/dev-python/django-celery/django-celery-3.1.17.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
PYTHON_REQ_USE="sqlite(+)"
inherit distutils-r1 eutils
@@ -20,7 +21,8 @@ IUSE="doc examples test"
# with ValueError: save() prohibited to prevent data loss due to
# unsaved related object 'interval'.
-RDEPEND=">=dev-python/celery-3.1.15[${PYTHON_USEDEP}]
+RDEPEND="
+ >=dev-python/celery-3.1.15[${PYTHON_USEDEP}]
>dev-python/django-1.4[${PYTHON_USEDEP}]
=dev-python/nose-1.2.1[${PYTHON_USEDEP}]
+ dev-python/django[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ >=dev-python/dj-database-url-0.3.0[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ ./runtests.sh --verbose || die
+}
diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest
index 1f4605cd0d3b..ec83ae99768e 100644
--- a/dev-python/django-openstack-auth/Manifest
+++ b/dev-python/django-openstack-auth/Manifest
@@ -1 +1 @@
-DIST django_openstack_auth-1.3.1.tar.gz 75165 SHA256 99c6e92170656eade430d31f79ddf60e66355ff7b84caf038ab1ecc879cff9ba SHA512 cf9b4a1c526f237a23dadab4a7e6a2bd1f80a8d6d89d9b83f4d0fb6fc4df80aba68ad344662fbeaddeca2ca8ec36856af1074da383368d85d56460ed199609aa WHIRLPOOL b99b9381ce9eb1357939b750a40f86373fcbbe411d90a23e15f2d1e77dcfab45e58ac69e4e774228dc1b0dc3d3a0649e451efc0f271e904a4241b06c80b4d8bd
+DIST django_openstack_auth-3.2.0.tar.gz 69837 SHA256 e2a2970ddc73504afab477784c81f57c8c5c81daba55b0df30e1908acf5dd052 SHA512 43e8d19d73c934935f73b6dcb5a5ffbb0ca49c2c7dc892cadd9a04af94091e39bf35f1833d33474f7aeee9a94040424f6ee43c5fd355d8ad971c0b4ff971d4de WHIRLPOOL c7f3ca7a9ff016c8e8043d9a63f9092cb302b2db7b8c50d3d89b7384ace4a7e3a6dc9d594cc9f8e9993eafbdd91b01cd7e90a0a9caa3c987526f2c3b8a655802
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild
deleted file mode 100644
index 51d681d06a7d..000000000000
--- a/dev-python/django-openstack-auth/django-openstack-auth-1.3.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend"
-HOMEPAGE="http://django_openstack_auth.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz"
-S="${WORKDIR}/django_openstack_auth-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
- >=dev-python/pbr-0.11[${PYTHON_USEDEP}]
- =dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- =dev-python/Babel-1.3[${PYTHON_USEDEP}]
- >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
- >=dev-python/mock-1.0[${PYTHON_USEDEP}]
- >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] )
- ${CDEPEND}
- doc? ( ${CDEPEND} )"
-RDEPEND="
- >=dev-python/django-1.4.2[${PYTHON_USEDEP}]
- =dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- # Avoid warning in doc build due to missed file
- if use doc; then
- mkdir doc/source/_static || die
- fi
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- # under sphinx-1.3.1 the build outputs a harmless warning about change of
- # html_theme setting in conf.py. priot versions will have the right setting
- if use doc; then
- sphinx-build -b html -c doc/source/ doc/source/ doc/source/html || die
- fi
-}
-
-python_test() {
- "${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/source/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-3.2.0.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-3.2.0.ebuild
new file mode 100644
index 000000000000..9c8336ae2761
--- /dev/null
+++ b/dev-python/django-openstack-auth/django-openstack-auth-3.2.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN=${PN//-/_}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend"
+HOMEPAGE="http://django_openstack_auth.readthedocs.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-2.0[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/hacking-0.12.0[${PYTHON_USEDEP}]
+ =dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+ >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0[${PYTHON_USEDEP}]
+ >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] )
+ ${CDEPEND}
+ doc? ( ${CDEPEND} )
+ "
+RDEPEND="
+ >=dev-python/django-1.8[${PYTHON_USEDEP}]
+ =dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+ # Avoid warning in doc build due to missed file
+ if use doc; then
+ mkdir doc/source/_static || die
+ fi
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ # under sphinx-1.3.1 the build outputs a harmless warning about change of
+ # html_theme setting in conf.py. priot versions will have the right setting
+ if use doc; then
+ sphinx-build -b html -c doc/source/ doc/source/ doc/source/html || die
+ fi
+}
+
+python_test() {
+ "${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/source/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 14ca8126dfdb..1868a76dbee7 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,8 +1,9 @@
-DIST Django-1.10.tar.gz 7691063 SHA256 46b868d68e5fd69dd9e05a0a7900df91786097e30b2aa6f065dd7fa3b22f7005 SHA512 e85ded03a1aee2390c105a3d723c708d41a157d46b413004954ecef426a014892468bd4157066a552954d569880597d3cd4cdfc372065cad7796b39374db88fc WHIRLPOOL 402e27484ac8b95cdb7a4262485a55a5ac4bb71b40e80d79f442d47ebfa286d423af9fbc5ba3ac98f143de9d0048c14e9450d9dc130ab28b052a5a3191fa08e8
+DIST Django-1.10.7.tar.gz 7737654 SHA256 593d779dbc2350a245c4f76d26bdcad58a39895e87304fe6d725bbdf84b5b0b8 SHA512 2b16de21a1c966942f0d912bde4f5be7004f250e5ce3c56a5ac462f81f82e911da19fa0aeb9058670d663caecc1016ce4bcd93c1fa058675150caa33cfeb0e3b WHIRLPOOL 0b3f9fffe9f6fa3c803cabc7e9b1e4f2f100f4ae08a98bd6d90841d743edad4ff19df162b6ace9442fe03ba2bf47193fb8a36cfbba12bac84b69b93937f3b863
+DIST Django-1.11.2.tar.gz 7865109 SHA256 3c5b070482df4f9e5750539dc1824d353729ee423fd410c579b8cd3dea5b0617 SHA512 0f1187fd03064b966241d6ed1a869d6f155af2598a7b9c8b2f902585265cb6df7236817e5f14907c362ce7420d08e881ff9461f14d673485be3b3e5c3d980e8e WHIRLPOOL 278865760b80956e48d37bf7e3f7d68860aaf72ff3a1383ce7d40dd9b67426236b4f4cc0e7cbb352871a40d668325bf698d48b598e059bbfed8f407674bd9cc8
DIST Django-1.4.22.tar.gz 7802249 SHA256 d0e2c9d772fcab2cf9c09e1c05e711cf5fe5eb93225762b29f0739d65e0d1784 SHA512 03e833d95d8ffacf8cb753b8b8c15edc145830add322ad166c574a9a7428ed308082ffea7a73bcdb7315f489270fd84a38d1a8b12c090dfb9d68da5d281cef68 WHIRLPOOL 7c3999e05c31772b74dcca981b052d5e13621897490166f3c022bfd6db2d542c2eb7afb16b4fd4536a49b4834fc62e61010ad10949af1269c4363f1ef6ea7c9e
DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d39b0241e62c1f03c668ddd6ced SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d WHIRLPOOL a3d17e364b0f90ff3a059afbfb57fdb9988ad777048f3caa30244d7ae6b0c87f42e1e5af5bdcda8f09c713518e0fb2471e1e4da3a988f37e45e6bca7678ecafa
DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
DIST Django-1.7.11.tar.gz 7586798 SHA256 2039144fce8f1b603d03fa5a5643578df1ad007c4ed41a617f02a3943f7059a1 SHA512 2e3415295ee6b590e366b09adb261baccb750519b9bcef1bb09bd52a2db705c8082bfc13440c621a5f41dd4f9bd626792eba4a572e78de3b7caf93c951c406ee WHIRLPOOL 8797862021c6acdfcba5752f6f5f2d567a564812fc5089678a9d00b9d8f1cb13c03bd0cb9b369b68ce1d1f1dc1522f05d41778f5181aef9c7d49783afc280e7c
-DIST Django-1.8.14.tar.gz 7293650 SHA256 5282c48b90fbb29507299f592215378e849a2808f485e4144626e66715d5464d SHA512 19d7b37f1a85f54c2dd41bbdf9854f9e5cce81100f73f7bcb93e8b00e128104a23e9c7bfcbd2aa06d3fe7aa494eaef34d88dea924e749d0116e7c5ad97484a04 WHIRLPOOL 8d6800ec06857edf1da640b16deaa2adade3da6682defc149c0411f5eb2c6aeb55f76b6422e19de177c48d07be3db0278beb6a14610df4a8179b9437bbe662c6
+DIST Django-1.8.18.tar.gz 7297986 SHA256 c7611cdd5e2539a443b7960c7cafd867d986c2720a1b44808deaa60ce3da50c7 SHA512 41959c1012feec579dc991129976a655bc2f1ff7298bd05951c925b3d0a86a67cc32bf8a78273236b3db05cc1eb841a7aba5091bd06a072dd73c55eb0f7ecee8 WHIRLPOOL c0a563f767878f6cea24246730933fd5e3ae489c343c4c36d13a711b8f77d91007b516d6e40646d3520a79abfdc6e187826b94047cbdc0c2bad0427172506e7f
DIST Django-1.8.9.tar.gz 7288701 SHA256 fc012d8507201a628e877202bb7800799152285f69aa0d42a7c506a96fbbd2e3 SHA512 3423d11a6f97ca4518a7105fabfc872783d92f2ce4733739bc6dd7d53c97d7450c7343a8e77c2094ce6342b1647445d2ddef5deb2d3b35b5c0ba4679726f0a48 WHIRLPOOL 96cdd8cb557c8ae75d40516e2c88a4a63fb0f070e3614732786a4e7904f22404a1d189ae00b03527be9242c4b61646ce5093cb6535567ba0f23042a1b6e9a320
-DIST Django-1.9.9.tar.gz 7493187 SHA256 e340fb9d534aeb543280e46c3b85e6e1049029a4e6ba5571375b11c914bfde8c SHA512 5f8e353ad3143a17dac95bf913838b6c265c9540d6d9b8345538ca551a4086c4458e16f550ff7ef2ea447119dfa14a4230c30ec122068698c442a9846cf1794a WHIRLPOOL b538e685183f040ae48c98b0585b3ac644cb8927d4eff0e84adbcff02522acbf6f5bf50d7a26cf7055b1e9777210ae4f31e8398dc6c343ee3b142651fc949693
+DIST Django-1.9.13.tar.gz 7498364 SHA256 c007dba5086061f7d0f4d88a3bc4016d881a7eede86d6c1c4fdbbaadddd53f1d SHA512 bf642d5c342dd523ceb7a580213255ddf91a24bd5506355325b72c0eb91774d120ddb89d728a4b432ef0a587f8448e915c3217adcaa8ff5aa816873fa01ae7c0 WHIRLPOOL 048c874a09052d1efa6c4ef591d5920e29b22d95ff46e6b92db36d12870f560fd55fff0f26df8ccc67b62abe3f63d53fdc3c30d32483cfc3f2e87df2527b638a
diff --git a/dev-python/django/django-1.9.9.ebuild b/dev-python/django/django-1.10.7.ebuild
similarity index 96%
rename from dev-python/django/django-1.9.9.ebuild
rename to dev-python/django/django-1.10.7.ebuild
index 91467140923b..0358f425c772 100644
--- a/dev-python/django/django-1.9.9.ebuild
+++ b/dev-python/django/django-1.10.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
PYTHON_REQ_USE='sqlite?,threads(+)'
WEBAPP_NO_AUTO_INSTALL="yes"
diff --git a/dev-python/django/django-1.10.ebuild b/dev-python/django/django-1.11.2.ebuild
similarity index 95%
rename from dev-python/django/django-1.10.ebuild
rename to dev-python/django/django-1.11.2.ebuild
index 91467140923b..59405e57d07f 100644
--- a/dev-python/django/django-1.10.ebuild
+++ b/dev-python/django/django-1.11.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
PYTHON_REQ_USE='sqlite?,threads(+)'
WEBAPP_NO_AUTO_INSTALL="yes"
@@ -30,6 +30,7 @@ IUSE="doc sqlite test"
RDEPEND=""
DEPEND="${RDEPEND}
+ dev-python/pytz[${PYTHON_USEDEP}]
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
test? (
@@ -37,7 +38,6 @@ DEPEND="${RDEPEND}
dev-python/docutils[${PYTHON_USEDEP}]
dev-python/numpy[$(python_gen_usedep 'python*')]
dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
)"
diff --git a/dev-python/django/django-1.4.22.ebuild b/dev-python/django/django-1.4.22.ebuild
index 1354a556e3e2..987a81234ed6 100644
--- a/dev-python/django/django-1.4.22.ebuild
+++ b/dev-python/django/django-1.4.22.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=""
IUSE="sqlite test"
RDEPEND=""
diff --git a/dev-python/django/django-1.7.11.ebuild b/dev-python/django/django-1.7.11.ebuild
index 4533a5fda8ed..a5b531b97eb1 100644
--- a/dev-python/django/django-1.7.11.ebuild
+++ b/dev-python/django/django-1.7.11.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=""
IUSE="doc sqlite test"
RDEPEND=""
diff --git a/dev-python/django/django-1.8.14.ebuild b/dev-python/django/django-1.8.18.ebuild
similarity index 96%
rename from dev-python/django/django-1.8.14.ebuild
rename to dev-python/django/django-1.8.18.ebuild
index 10b78d3209a4..b09305246082 100644
--- a/dev-python/django/django-1.8.14.ebuild
+++ b/dev-python/django/django-1.8.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
PYTHON_REQ_USE='sqlite?,threads(+)'
WEBAPP_NO_AUTO_INSTALL="yes"
diff --git a/dev-python/django/django-1.9.13.ebuild b/dev-python/django/django-1.9.13.ebuild
new file mode 100644
index 000000000000..396bb4ced48d
--- /dev/null
+++ b/dev-python/django/django-1.9.13.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+ https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
+ mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+ "
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+ test? (
+ $(python_gen_impl_dep sqlite)
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/numpy[$(python_gen_usedep 'python*')]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9-bashcomp.patch
+)
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+python_prepare_all() {
+ # Prevent d'loading in the doc build
+ sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ if use doc; then
+ rm -fr docs/_build/html/_sources || die
+ local HTML_DOCS=( docs/_build/html/. )
+ fi
+
+ insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+ doins -r django/contrib/admin/static/admin/.
+ distutils-r1_python_install_all
+}
+
+src_install() {
+ distutils-r1_src_install
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog "Additional Backend support can be enabled via"
+ optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+ optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ echo ""
+ elog "Other features can be enhanced by"
+ optfeature "GEO Django" sci-libs/gdal[geos]
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" dev-python/pillow
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+ echo ""
+ elog "A copy of the admin media is available to webapp-config for installation in a"
+ elog "webroot, as well as the traditional location in python's site-packages dir"
+ elog "for easy development."
+ webapp_pkg_postinst
+}
diff --git a/dev-python/freezegun/freezegun-0.3.9.ebuild b/dev-python/freezegun/freezegun-0.3.9.ebuild
index 2bbc4fe85565..a782d8873da1 100644
--- a/dev-python/freezegun/freezegun-0.3.9.ebuild
+++ b/dev-python/freezegun/freezegun-0.3.9.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
inherit distutils-r1
@@ -23,5 +23,5 @@ DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
python_test() {
- nosetests || die
+ nosetests -v || die
}
diff --git a/dev-python/gevent/gevent-1.2.1.ebuild b/dev-python/gevent/gevent-1.2.1.ebuild
index 6fe7f83bb2bc..8d9af07ca111 100644
--- a/dev-python/gevent/gevent-1.2.1.ebuild
+++ b/dev-python/gevent/gevent-1.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index 8c74ec6ad434..2d02f8928a8c 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,4 +1,5 @@
DIST hacking-0.10.3.tar.gz 41119 SHA256 6368126562604370c6781710030ee3880ba365530304c8b6eb301f9714f9522a SHA512 020f58220d6c3d09dcc1b0ab886796087c9fe4e9eccae1e331f6f2056b5b106ffa4ba2545af086cf4ee53e21bcc124fef203c7bac36456ac86f09b4c6ff07417 WHIRLPOOL 4ec7d4eb74d3db356476d3b5940dec0b09e52ce7edffdb41e9dcaf1ebc2c455bf945c57847d3b45c30827900eb036b7a3593b49c2dd8c406d6971d520ced58d3
+DIST hacking-0.13.0.tar.gz 49171 SHA256 0402905b392c428d62bee2095fa6b789ca39c69d3b8ccf33bad219ddb4c03ce8 SHA512 ca3fe0bef1c6348ee9497c136d002b04c9f67a766192d88456b749ff860528a887636b1f3db23fec336749dbf3e5bb413a1effd2261e42929d5826e54336e314 WHIRLPOOL df61e75cce0b28b25f26e78e3e7d8d896635ed389b0fd003ae86fc95ab527738a410db7e08b374b09bd7c8a3b7d7485b7ec3cf17503d058d0a4173f32b05b7f7
DIST hacking-0.8.1.tar.gz 51800 SHA256 65390ea60215e4222d9ddbc1241a0f3e05644e4f55b305e69755ed8eab3decb5 SHA512 9055d57dd39bc1653cd7c8773ea4ca7f9b206e8495c137570c3456dab45373b51d6f25dcd4413b5f78b7c4740f5c89d21534ee982dee542c7674bd825c96b91a WHIRLPOOL d35e577c0790fe989a2141264afe67b4d1478bf2f08edcbea62515764e10938f364f5d57b3d8d66dba2125246c9eb1afc2a9b67ad4d91bb6d1346eb382a420ac
DIST hacking-0.9.2.tar.gz 43956 SHA256 2a584e5bf185ee19517d4e72a852b729578aab3822ae345534e1f35338582ba4 SHA512 76aa59b4cdfb8036d6471e35cba43d502de3a72edc3883a05822063cbb92eaa072cef3144d21ee82ac763c3385c65bc9dec4b66fda5a5a2090191ba5b6388d41 WHIRLPOOL 718d790fdc0a405166f3ff194bcfa4d68cb311557eb092630716a14018aca7ac94e43f3305fd66195dbd15c35322c8a9bf25e9dd08ac5ff1964800c140ddf17f
DIST hacking-0.9.6.tar.gz 43287 SHA256 aba204f93beb3aa60732bfe910116c9fa9756efd58f00aea66ee856e07199f50 SHA512 e4225754a85ff474b724130a0c3d6a6b9c480a953ea35a18833378cf2a5df4687819f510b50a95f42890cc69836033a8af933bc0a5a4e330ae94532bcee189b4 WHIRLPOOL fdb3de41229e8cc6f4ec5b5b3fe59546bc6e8f49de349241545f134ba10095fd7f7d6ef418f5193654618f28db092159246f9a37db2b3c0a443618882557df2b
diff --git a/dev-python/hacking/hacking-0.13.0.ebuild b/dev-python/hacking/hacking-0.13.0.ebuild
new file mode 100644
index 000000000000..374b2fbf63b4
--- /dev/null
+++ b/dev-python/hacking/hacking-0.13.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Nova API"
+HOMEPAGE="https://github.com/openstack-dev/hacking"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-1.6[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+ =dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+ =dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
+ ~dev-python/mccabe-0.2.1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+ # Prevent d'loading and correct ?typo to oslosphinx in conf.py
+ sed -e 's:intersphinx_mapping:#&:' \
+ -e 's:oslosphinx:oslo.sphinx:' \
+ -i doc/source/conf.py || die
+ # relax deps
+ rm *requirements.txt hacking.egg-info/requires.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && sphinx-build -b html -c doc/source/ doc/source/ doc/source/html
+}
+
+python_test() {
+ testr init || die "testr init died"
+ testr run || die "testsuite failed under ${EPYTHON}"
+ flake8 "${PN}"/tests || die "flake8 drew error on a run over ${PN}/tests folder"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/source/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/isodate/isodate-0.5.4.ebuild b/dev-python/isodate/isodate-0.5.4.ebuild
index 4fd84aa58322..010f2ab8921a 100644
--- a/dev-python/isodate/isodate-0.5.4.ebuild
+++ b/dev-python/isodate/isodate-0.5.4.ebuild
@@ -13,21 +13,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
python_test() {
- local testfile
- pushd "${BUILD_DIR}"/lib/ || die
- for test in ${PN}/tests/test_*.py; do
- if ! "${PYTHON}" "${testfile}"; then
- die "Test ${testfile} failed under ${EPYTHON}"
- fi
- done
-
- # Give some order to the output salad.
- einfo "Testsuite passed under ${EPYTHON}";
- einfo ""
+ ${EPYTHON} -m unittest discover -v -s "${BUILD_DIR}/lib" || die "Testing failed with ${EPYTHON}"
}
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 37c08200ab24..85e30ba3e891 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,4 +1,5 @@
DIST keystoneauth1-2.12.3.tar.gz 176768 SHA256 921e31ebe93e97f771a228296a40559ed1ab96797f589af0e9ac1189ee21364b SHA512 85c35f6c39135176a5a0393fe56d006f5929fbec6a08f8ba03ea39ce458a8d9dde6ffdbce724bcbedfb72e7a895c9ad003d46b23884692eefa773ca9a085446a WHIRLPOOL 7ff4b2f2aef099d0d0e3720e2553b5fc91dff6a80f3335583a07afcf7708dcdae0a7386ffd782932a04b739697677b6aced5b5cadf2f2ebc141c5dc0db0240d4
DIST keystoneauth1-2.18.0.tar.gz 184966 SHA256 075a9ca7a8877c5885fa2487699015e45260c4e6be119683effe0ad2ab1255d2 SHA512 71c584de03f89c7e469368221847a8d32cc0ceed5afbc4eafcf886ccbbbad225587e073a7d7f36c8f3768f391e7a3b9d54454f587018b8dbf385dc676a5fee6b WHIRLPOOL 4c1ba1f93d50a55ee547621416a424c68cff1d537f4b133fb2bc4673267c2e5b1b2c242ee90746774fce41d3a1cb3b8630ea4c4a4d62e21dd76ae15b84c4a617
+DIST keystoneauth1-2.20.0.tar.gz 187746 SHA256 6bb45250f2e716302f9572f3f5440baf4b7339a93e0ea33c38ac501294da9b2e SHA512 43d949e46f743905e6987df9f923f222bf4b5622fd395c66da4dbed626d3ba80787a9e77340caf53018c7e277366851ffbfac0812c0f75f6c9c4755eebd852fb WHIRLPOOL a7c2f38a99e69d5885f8420f1a0c06249630487f9c833015366bc90ce6c372a0aac2c2bb8104610fa0a5e9fd21d4a60ecb1fd5851c77d1787845d2a7780680ea
DIST keystoneauth1-2.4.1.tar.gz 150586 SHA256 61a2f4cf374b55f10a0d8250a532ccb93dff2ea81994ced15b2a34af055d4e78 SHA512 f9e8fcea7b23001b907d643d5bf67fc4779c8729cca213b3240ef988eda9de1212b15c2031f6fd8b431aafac85e773346eda71e0b414fe967728611b6817fb05 WHIRLPOOL 42644ede5c0db10ffe77ef106d78764dcb49d455dbc09e3660160b9d7a9eb3453118f6777469f9779e2fca34eb9e09cf3ef759f2f27cc38b8dca8520b9febd43
DIST keystoneauth1-2.4.2.tar.gz 151213 SHA256 c8be35bdf5c773c385a0b9b773ec55c44c9c3ea7587179d15b2d4352ae2cbe57 SHA512 dd3b0907c554606489081b970ad248efe52aa6593cb8584ac1d4e3b05075b6a60b8c5f159c00f5668eb0938dbed655e7135ac9b7d3d6017f2f280f69b9080122 WHIRLPOOL b0b79a431b90aa78852a2a76c5f3a72081975c8f5b7e2174ded010c560f3ec205ae702722cd32cea33876f478009400e626b8a7ef750bdb15b9b7a93d7b71189
diff --git a/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild b/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild
new file mode 100644
index 000000000000..472260f11c93
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-2.20.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Authenticating to an OpenStack-based cloud"
+HOMEPAGE="https://github.com/openstack/keystoneauth"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="${CDEPEND}
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+ >=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.13.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}1-${PV}"
diff --git a/dev-python/keystoneauth/metadata.xml b/dev-python/keystoneauth/metadata.xml
index 8068da268b62..89e7da464756 100644
--- a/dev-python/keystoneauth/metadata.xml
+++ b/dev-python/keystoneauth/metadata.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index a3f3381a1c96..558722a3eb40 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,4 +1,2 @@
-DIST libvirt-python-2.5.0.tar.gz 172329 SHA256 f4fd787ad26b4cd4b32afa65b6248c344ef48edffeb42c892c7adb4866f656d1 SHA512 2ff94ff12c20d9d0e5be8b571bc33fb1641e9940c6b49cdee37244c941674b12e1c980f9e0c73f4db52c91579ab19f92cea0c2e79a97abc67ee3309028661bb6 WHIRLPOOL 78712a122edfd4ce32e73332c8311e6b661be843f10ab30d3d85d426a266ddddbe36d30bfc09e63016189b8ffffe729119884d0d4acb05844b2bef37f8fadd63
-DIST libvirt-python-3.1.0.tar.gz 174378 SHA256 f36a62ace3b815ef1f14a760a5feee31bd502bed0daf92ab75d21d516123a218 SHA512 33b8cff940a66c658b104ef2129d88eff11f2c70fc5f92d448e4963a205c978d3dd218068339dcaa20fabdd666a30e887262d17dd1f5b98cc8566ba2d8276400 WHIRLPOOL a4f3f6268d1ec2aef0f3d9d522183067524e0a7f319e57703cdb640b8b3258730731e8eecb923c8fe270fed77db8c3127776953a7587095c4040cdbd75a08523
DIST libvirt-python-3.2.0.tar.gz 174713 SHA256 ac85dd8dec332f308e5e0e40889be0d2f10b5d6917f00f0c474405ad25dc003d SHA512 d13cb0fb46844cab512931fbb85225bdd99c44eba0761caaeb13a40f8bf18700d5836f4e24300370810ee103b4f391699db13ae0523e5625a566a9c5b41d12d5 WHIRLPOOL 9c7d1dd4a92da276f5368b80d31c11032ae0ce2ea337e21f830d433d5e7ec90759484720264a3c494f4881c8b10ce11dfbf20da0c5b89f75c0bff61cc508a065
DIST libvirt-python-3.3.0.tar.gz 179552 SHA256 e0bb7dcb98bef4933bb9d5e6e944388cdb002515eb9053a42447e89e4642fe57 SHA512 3d90e99abe813f2ba684c24631d8e8cd6a5b44564351ae3f0b75d426f80d046c00ed6358273b68ad751707a93666564dfecfb7fb7d93d2c27c71a344542fe793 WHIRLPOOL dab0e88aecc007f41505d20bc9886b9508cab7d19211f426cad7e2c65da720b4a236acbd3acd77bb35d7e3a98431764f5722035cc2f62c813864a76d42b8b73e
diff --git a/dev-python/libvirt-python/libvirt-python-2.5.0-r1.ebuild b/dev-python/libvirt-python/libvirt-python-2.5.0-r1.ebuild
deleted file mode 100644
index 58a22133cfd1..000000000000
--- a/dev-python/libvirt-python/libvirt-python-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
- SRC_URI=""
- KEYWORDS=""
- RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
- SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="amd64 x86"
- RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
- esetup.py test
-}
-
-python_install_all() {
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-3.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.1.0.ebuild
deleted file mode 100644
index 7361e9b767d2..000000000000
--- a/dev-python/libvirt-python/libvirt-python-3.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
- SRC_URI=""
- KEYWORDS="amd64 x86"
- RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
- SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="amd64 x86"
- RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
- esetup.py test
-}
-
-python_install_all() {
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/libvirt-python/libvirt-python-3.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-3.3.0.ebuild
index f93eb35e154c..7361e9b767d2 100644
--- a/dev-python/libvirt-python/libvirt-python-3.3.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-3.3.0.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
SRC_URI=""
- KEYWORDS=""
+ KEYWORDS="amd64 x86"
RDEPEND="app-emulation/libvirt:=[-python(-)]"
else
SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
RDEPEND="app-emulation/libvirt:0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index b2c11b175f5d..0afe01bbc9ab 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,2 +1,3 @@
DIST Mako-1.0.0.tar.gz 470006 SHA256 a3cd72cfef507204b50f74ffcbfcfde7e856437891d3f6cfe780866986d006fe SHA512 81a6b7637e26d561350a591e3490e7140db218ae7f6b43fec8fca5b767fc6e57d0e8cc901d28fecb9863b2170c824a35c578a94579f991359fa0873f62ec578a WHIRLPOOL aa27b63e3832f03120312fbfec939b05606081e67a5cb4c9a056c27259631c2e159cf7506292d44e2c17c5950d7e4255d19f4beba78502bdbb52fbf11e1a872c
DIST Mako-1.0.3.tar.gz 565224 SHA256 7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d WHIRLPOOL 4ac07778b58d8b4c95853a07dcb8755e560cb7225f68b606582ef9883fe632caead44d4a56ae1662b42f0ecdee2117942b3c500385558aa8f9763a3ce755b583
+DIST Mako-1.0.6.tar.gz 575112 SHA256 48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf WHIRLPOOL dd0c12f2b8fe6f65907df662de73117eb11afee015f3acd2c70c8522456a7c52761a1bfe8247ce9e88a4ca704008a120be95893f3c3b1b0e410c1a244af011ba
diff --git a/dev-python/mako/files/pygments-exception.patch b/dev-python/mako/files/pygments-exception.patch
new file mode 100644
index 000000000000..0d2faca4f688
--- /dev/null
+++ b/dev-python/mako/files/pygments-exception.patch
@@ -0,0 +1,32 @@
+From 8eaf6b7ea92018202a886e1d919e2c6b0d307c99 Mon Sep 17 00:00:00 2001
+From: Mike Bayer
+Date: Mon, 22 May 2017 22:30:54 -0400
+Subject: [PATCH] - exception test fixes for more recent pygments
+
+Change-Id: Ibdfe5b2f2f3d1426921bcadf6740ae065ed0833b
+---
+ test/test_exceptions.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/test_exceptions.py b/test/test_exceptions.py
+index 8321b25..bcaae3b 100644
+--- a/test/test_exceptions.py
++++ b/test/test_exceptions.py
+@@ -91,7 +91,7 @@ def test_utf8_html_error_template_pygments(self):
+ assert "".encode(sys.getdefaultencoding(),
+ 'htmlentityreplace') in html_error
+ else:
+- assert 'u''\
++ assert '''\
+ 'привет'\
+ ''}'.encode(
+ sys.getdefaultencoding(),
+@@ -220,7 +220,7 @@ def test_utf8_format_exceptions_pygments(self):
+ assert ''привет'' in \
+ l.get_template("foo.html").render().decode('utf-8')
+ else:
+- assert 'u'прив'\
++ assert ''прив'\
+ 'ет'' in \
+ l.get_template("foo.html").render().decode('utf-8')
+
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
index 204acfa316af..d9c90b77195f 100644
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/mako/mako-1.0.6.ebuild b/dev-python/mako/mako-1.0.6.ebuild
new file mode 100644
index 000000000000..2cc45b623373
--- /dev/null
+++ b/dev-python/mako/mako-1.0.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+ )"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/pygments-exception.patch" )
+
+python_test() {
+ nosetests "${S}"/test || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ rm -rf doc/build || die
+
+ use doc && local HTML_DOCS=( doc/. )
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Caching support" dev-python/beaker
+ for v in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 0.7.3-r2 $v; then
+ ewarn "dev-python/beaker is no longer hard dependency of ${P}"
+ ewarn "If you rely on it, you should add beaker to your world"
+ ewarn "file:"
+ ewarn "# emerge --noreplace beaker"
+ break
+ fi
+ done
+}
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index fde7fcea9760..78018b44cefc 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,2 +1,3 @@
DIST matplotlib-1.4.3.tar.gz 49933525 SHA256 5b9544472d9d6ab3d47423bdb5a0e64fdf913e505c1c083f25283dd0362bc0b6 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5 WHIRLPOOL 160ca48ecb44db58f1c56bd6e89592c5d1badd8e434fc25d32aa6d4d7a346ae7c7444d1c8e0c2ca2bf5c3246fd56cd93856ec7b1e3e51f5e471b9b55a0f2c1ad
DIST matplotlib-1.5.3.tar.gz 51606089 SHA256 a0a5dc39f785014f2088fed2c6d2d129f0444f71afbb9c44f7bdf1b14d86ebbc SHA512 553be9f661a1923d8ec7504a11dd3317e5ffb429c19339c58047715f4c28358d6d2ac38d46bd27ecd1dcf7159f157aab80d90713fbc4071e2e395bbf11ee6385 WHIRLPOOL 7e2b0472bb7d913e78260da95c93c3243562e76352790318286e5d194f88ac05a9f51fa029a7b0ad17bbbbd0dc9658769fe6301b544ec03f1ab5c205835ea894
+DIST matplotlib-2.0.2.tar.gz 53879938 SHA256 0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1 SHA512 39d68aee87fac2c246cdee7941ffaae1b8d586fa75c351bc94f963def66df32c3aba13fa0be94e1f8d21f06e068565b1a79c6d4f65589d8dd23cd48b32ab474f WHIRLPOOL 5ab8f9edb4591205d61bd47c5125520c0d24b8ce44e0041b99a5a0c692ffd3ff581cd6e092d18a64ddf6fb4f43ace6ee8c2bce19f5acd01d022d8a46e472b2df
diff --git a/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch b/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch
new file mode 100644
index 000000000000..b6450a83fed0
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.0.2-freetype-spurious-failure.patch
@@ -0,0 +1,27 @@
+diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
+index 5e738ad9b..78b3f8169 100644
+--- a/lib/matplotlib/testing/decorators.py
++++ b/lib/matplotlib/testing/decorators.py
+@@ -266,7 +266,7 @@ class ImageComparisonTest(CleanupTest):
+
+ yield do_test, fignum, actual_fname, expected_fname
+
+-def image_comparison(baseline_images=None, extensions=None, tol=0,
++def image_comparison(baseline_images=None, extensions=None, tol=20,
+ freetype_version=None, remove_text=False,
+ savefig_kwarg=None, style='_classic_test'):
+ """
+diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py
+index 39f5d7ef1..7681e5cb9 100644
+--- a/lib/matplotlib/tests/test_mathtext.py
++++ b/lib/matplotlib/tests/test_mathtext.py
+@@ -159,7 +159,8 @@ for fonts, chars in font_test_specs:
+
+ def make_set(basename, fontset, tests, extensions=None):
+ def make_test(filename, test):
+- @image_comparison(baseline_images=[filename], extensions=extensions)
++ @image_comparison(baseline_images=[filename], extensions=extensions,
++ tol=40)
+ def single_test():
+ matplotlib.rcParams['mathtext.fontset'] = fontset
+ fig = plt.figure(figsize=(5.25, 0.75))
diff --git a/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch b/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch
new file mode 100644
index 000000000000..ab1181bd0176
--- /dev/null
+++ b/dev-python/matplotlib/files/matplotlib-2.0.2-nose-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
+index 530c889a9..8231c2bb8 100644
+--- a/lib/matplotlib/__init__.py
++++ b/lib/matplotlib/__init__.py
+@@ -1609,7 +1609,7 @@ def test(verbosity=1):
+
+ # store the old values before overriding
+ plugins = _get_extra_test_plugins()
+- plugins.extend([plugin() for plugin in nose.plugins.builtin.plugins])
++ plugins.extend(nose.plugins.builtin.plugins)
+
+ manager = PluginManager(plugins=[x() for x in plugins])
+ config = nose.config.Config(verbosity=verbosity, plugins=manager)
diff --git a/dev-python/matplotlib/matplotlib-2.0.2.ebuild b/dev-python/matplotlib/matplotlib-2.0.2.ebuild
new file mode 100644
index 000000000000..2e703e5dcb60
--- /dev/null
+++ b/dev-python/matplotlib/matplotlib-2.0.2.ebuild
@@ -0,0 +1,257 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 flag-o-matic virtualx toolchain-funcs
+
+DESCRIPTION="Pure python plotting library with matlab like syntax"
+HOMEPAGE="http://matplotlib.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+# Main license: matplotlib
+# Some modules: BSD
+# matplotlib/backends/qt4_editor: MIT
+# Fonts: BitstreamVera, OFL-1.1
+LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo doc excel examples gtk2 gtk3 latex pyside qt4 qt5 test tk wxwidgets"
+
+PY2_FLAGS="|| ( $(python_gen_useflags python2_7) )"
+REQUIRED_USE="
+ doc? ( ${PY2_FLAGS} )
+ excel? ( ${PY2_FLAGS} )
+ gtk2? ( ${PY2_FLAGS} )
+ wxwidgets? ( ${PY2_FLAGS} )
+ test? (
+ cairo latex qt5 tk wxwidgets
+ || ( gtk2 gtk3 )
+ )"
+
+# #456704 -- a lot of py2-only deps
+PY2_USEDEP=$(python_gen_usedep python2_7)
+COMMON_DEPEND="
+ dev-python/cycler[${PYTHON_USEDEP}]
+ dev-python/functools32[${PY2_USEDEP}]
+ >=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
+ dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10[${PYTHON_USEDEP}]
+ dev-python/subprocess32[${PY2_USEDEP}]
+ media-fonts/stix-fonts
+ media-libs/freetype:2
+ media-libs/libpng:0
+ media-libs/qhull
+ cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
+ gtk2? (
+ dev-libs/glib:2=
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:2
+ dev-python/pygtk[${PY2_USEDEP}] )
+ wxwidgets? ( >=dev-python/wxpython-2.8:*[${PY2_USEDEP}] )"
+
+# internal copy of pycxx highly patched
+# dev-python/pycxx
+
+DEPEND="${COMMON_DEPEND}
+ dev-python/versioneer[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ virtual/pkgconfig
+ doc? (
+ app-text/dvipng
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/mock[${PY2_USEDEP}]
+ dev-python/numpydoc[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/xlwt[${PYTHON_USEDEP}]
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-latexrecommended
+ media-gfx/graphviz[cairo]
+ )
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ >=dev-python/nose-0.11.1[${PYTHON_USEDEP}]
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ >=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
+ excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
+ gtk3? (
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ x11-libs/gtk+:3[introspection] )
+ latex? (
+ virtual/latex-base
+ app-text/ghostscript-gpl
+ app-text/dvipng
+ app-text/poppler[utils]
+ dev-texlive/texlive-fontsrecommended
+ dev-texlive/texlive-latexextra
+ dev-texlive/texlive-xetex
+ )
+ pyside? ( dev-python/pyside[X,${PYTHON_USEDEP}] )
+ qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )
+ qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
+ "
+
+# A few C++ source files are written to srcdir.
+# Other than that, the ebuild shall be fit for out-of-source build.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${P}-nose-fixes.patch
+ "${FILESDIR}"/${P}-freetype-spurious-failure.patch
+)
+
+pkg_setup() {
+ unset DISPLAY # bug #278524
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+use_setup() {
+ local uword="${2:-${1}}"
+ if use ${1}; then
+ echo "${uword} = True"
+ echo "${uword}agg = True"
+ else
+ echo "${uword} = False"
+ echo "${uword}agg = False"
+ fi
+}
+
+python_prepare_all() {
+# Generates test failures, but fedora does it
+# local PATCHES=(
+# "${FILESDIR}"/${P}-unbundle-pycxx.patch
+# "${FILESDIR}"/${P}-unbundle-agg.patch
+# )
+# rm -r agg24 CXX || die
+# rm -r agg24 || die
+
+# cat > lib/${PN}/externals/six.py <<-EOF
+# from __future__ import absolute_import
+# from six import *
+# EOF
+
+ sed \
+ -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
+ -i lib/matplotlib/{mathtext,fontconfig_pattern}.py \
+ || die "sed pyparsing failed"
+
+ sed \
+ -e "s:/usr/:${EPREFIX}/usr/:g" \
+ -i setupext.py || die
+
+ export XDG_RUNTIME_DIR="${T}/runtime-dir"
+ mkdir "${XDG_RUNTIME_DIR}" || die
+ chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ append-flags -fno-strict-aliasing
+ append-cppflags -DNDEBUG # or get old trying to do triangulation
+ tc-export PKG_CONFIG
+}
+
+python_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+
+ # create setup.cfg (see setup.cfg.template for any changes).
+
+ # common switches.
+ cat > "${BUILD_DIR}"/setup.cfg <<- EOF || die
+ [directories]
+ basedirlist = "${EPREFIX}/usr"
+ [provide_packages]
+ pytz = False
+ dateutil = False
+ [packages]
+ tests = $(usex test True False)
+ [gui_support]
+ agg = True
+ $(use_setup cairo)
+ $(use_setup gtk3)
+ $(use_setup pyside)
+ $(use_setup qt4)
+ $(use_setup qt5)
+ $(use_setup tk)
+ EOF
+
+ if use gtk3 && use cairo; then
+ echo "gtk3cairo = True" >> "${BUILD_DIR}"/setup.cfg || die
+ else
+ echo "gtk3cairo = False" >> "${BUILD_DIR}"/setup.cfg || die
+ fi
+
+ if python_is_python3; then
+ cat >> "${BUILD_DIR}"/setup.cfg <<- EOF || die
+ gtk = False
+ gtkagg = False
+ wx = False
+ wxagg = False
+ EOF
+ else
+ cat >> "${BUILD_DIR}"/setup.cfg <<-EOF || die
+ $(use_setup gtk2 gtk)
+ $(use_setup wxwidgets wx)
+ EOF
+ fi
+}
+
+wrap_setup() {
+ local -x MPLSETUPCFG=${BUILD_DIR}/setup.cfg
+ unset DISPLAY
+
+ # Note: remove build... if switching to out-of-source build
+ "${@}" build --build-lib="${BUILD_DIR}"/build/lib
+}
+
+python_compile() {
+ wrap_setup distutils-r1_python_compile
+}
+
+python_compile_all() {
+ if use doc; then
+ cd doc || die
+
+ # necessary for in-source build
+ local -x PYTHONPATH="${BUILD_DIR}"/build/lib:${PYTHONPATH}
+
+ VARTEXFONTS="${T}"/fonts \
+ "${EPYTHON}" ./make.py --small html || die
+ fi
+}
+
+python_test() {
+ wrap_setup distutils_install_for_testing
+
+ virtx "${EPYTHON}" -c "import sys, matplotlib as m; sys.exit(0 if m.test(verbosity=2) else 1)"
+}
+
+python_install() {
+ wrap_setup distutils-r1_python_install
+
+ # mpl_toolkits namespace
+ python_moduleinto mpl_toolkits
+ python_domodule lib/mpl_toolkits/__init__.py
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+
+ distutils-r1_python_install_all
+
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/networkx/files/1.11-sphinx-pngmath.patch b/dev-python/networkx/files/1.11-sphinx-pngmath.patch
new file mode 100644
index 000000000000..d43e4275a40b
--- /dev/null
+++ b/dev-python/networkx/files/1.11-sphinx-pngmath.patch
@@ -0,0 +1,14 @@
+Drop pngmath extenstion from sphinx config
+
+Bug: https://bugs.gentoo.org/594626
+
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -74,7 +74,6 @@ def cd(newpath):
+ 'sphinx.ext.intersphinx',
+ 'sphinx.ext.mathjax',
+ 'sphinx.ext.napoleon',
+- 'sphinx.ext.pngmath',
+ 'sphinx.ext.todo',
+ 'sphinx.ext.viewcode',
+ #'sphinxcontrib.bibtex',
diff --git a/dev-python/networkx/networkx-1.11.ebuild b/dev-python/networkx/networkx-1.11.ebuild
index f92e3513a853..b9580300abd0 100644
--- a/dev-python/networkx/networkx-1.11.ebuild
+++ b/dev-python/networkx/networkx-1.11.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc examples test"
-REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags -2) ) )"
COMMON_DEPEND="
dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -32,7 +32,7 @@ DEPEND="
test? (
${COMMON_DEPEND}
dev-python/nose[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'media-gfx/pydot[${PYTHON_USEDEP}]' python2_7)
+ $(python_gen_cond_dep 'media-gfx/pydot[${PYTHON_USEDEP}]' -2)
)"
RDEPEND="
>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
@@ -43,9 +43,9 @@ RDEPEND="
dev-python/pyyaml[${PYTHON_USEDEP}]
)"
-pkg_setup() {
- use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
-}
+PATCHES=(
+ "${FILESDIR}"/1.11-sphinx-pngmath.patch
+)
python_prepare_all() {
# Avoid d'loading of file objects.inv from 2 sites of python docs
@@ -54,11 +54,8 @@ python_prepare_all() {
}
python_compile_all() {
- # https://github.com/networkx/networkx/issues/1263
if use doc; then
- sed \
- -e "s:^\t\./:\t${PYTHON} :g" \
- -i doc/Makefile || die
+ python_setup -2
emake -C doc html
fi
}
diff --git a/dev-python/nnpy/Manifest b/dev-python/nnpy/Manifest
index f7d2c0defea7..de54e2c03ed2 100644
--- a/dev-python/nnpy/Manifest
+++ b/dev-python/nnpy/Manifest
@@ -1,2 +1,3 @@
DIST nnpy-1.2.tar.gz 3781 SHA256 0b3a894dd0be0f5b6f967e3cacf5ec3399e4fbc9ef83fdc3e7c6b17fa3284094 SHA512 ae88d52289c1b4e9853e81342aec94feee004f46e6b5801764ed1fc50f7e249cf45b8d24e85ae9f69003304052505cd9242f43ee33de42ab4f862b3f9cb20b3f WHIRLPOOL 09ab1e11bea3f163d78860ac69e604bb176f17e1e3049af139627e6baa4572bd9d40f38a29b0eb5a352e5279504652994003d84eb8f3a5c248f0fe96aad4c4ee
DIST nnpy-1.3.tar.gz 4384 SHA256 50daf80693f355096a4926e8b5a8ec5f216a3ca28f0eb14ff819b218a3691f4e SHA512 66ec80169f4c107f2c9ea870153824a84f5bfdecbb0b40a455061a926b43ff61a723b4e62d9b0e9f5361cf6b486f706a5ff111681bbb4083180988337416e0f6 WHIRLPOOL 76ef6210c028cd83bb98fb89e452bec82a7b6cfb3a19bac37e8306a18b2e4d9f1a801624e3db31b525a831ad2ddee5d3dd87017eebeb20241e323037ab688e0d
+DIST nnpy-1.4.1.tar.gz 4826 SHA256 2b947d097b19e9d4182d77f542dccb93da543a325b2eb616cc9e0e90cfed50a9 SHA512 26e1393fdca77cc9385eff0622f9a5b4987eeca533c57478ba873a1ea96f312a2d535fd3eaa883c47746157a9d692b4b0f6c52d51ea5b4fea5fb885cfdadc2a2 WHIRLPOOL bb3082484ac0f2829ad39a0592c8944827bdb30cd097fc73e020570d770513d802608732e14ae47a565669060388e20d7684631d6d0da83da4dd48fba123f373
diff --git a/dev-python/nnpy/files/py3.patch b/dev-python/nnpy/files/py3.patch
new file mode 100644
index 000000000000..8a39044bb7f1
--- /dev/null
+++ b/dev-python/nnpy/files/py3.patch
@@ -0,0 +1,19 @@
+commit 98ee46a4034ca94d6123b854e79f1dc3f35fff4a
+Author: Alexis Ballier
+Date: Sat Jun 3 19:55:10 2017 +0200
+
+ Fix tests under python3.
+
+diff --git a/nnpy/tests.py b/nnpy/tests.py
+index ba2a3fe..7f9f6e0 100644
+--- a/nnpy/tests.py
++++ b/nnpy/tests.py
+@@ -17,7 +17,7 @@ class Tests(unittest.TestCase):
+ poller = nnpy.PollSet((sub, nnpy.POLLIN))
+ self.assertEqual(len(poller.poll()), 1)
+ self.assertEqual(poller.poll()[0], 1)
+- self.assertEqual(sub.recv(), 'FLUB')
++ self.assertEqual(sub.recv().decode(), 'FLUB')
+ self.assertEqual(pub.get_statistic(nnpy.STAT_MESSAGES_SENT), 1)
+ pub.close()
+ sub.shutdown(sub_conn)
diff --git a/dev-python/nnpy/nnpy-1.4.1.ebuild b/dev-python/nnpy/nnpy-1.4.1.ebuild
new file mode 100644
index 000000000000..7f1153859ae0
--- /dev/null
+++ b/dev-python/nnpy/nnpy-1.4.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="cffi-based Python bindings for nanomsg"
+HOMEPAGE="https://github.com/nanomsg/nnpy"
+SRC_URI="https://github.com/nanomsg/nnpy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE=""
+
+DEPEND="
+ dev-python/cffi:=[${PYTHON_USEDEP}]
+ dev-libs/nanomsg:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/py3.patch" )
+
+python_test() {
+ PYTHONPATH="${S}:${PYTHONPATH}" "${PYTHON}" "${S}/nnpy/tests.py" || die
+}
diff --git a/dev-python/numpy/numpy-1.10.4.ebuild b/dev-python/numpy/numpy-1.10.4.ebuild
index 33c19563a582..4622631ac293 100644
--- a/dev-python/numpy/numpy-1.10.4.ebuild
+++ b/dev-python/numpy/numpy-1.10.4.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
# It appears the docs haven't been upgraded, still @ 1.8.1
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc lapack test"
RDEPEND="
diff --git a/dev-python/oct2py/oct2py-3.6.0.ebuild b/dev-python/oct2py/oct2py-3.6.0.ebuild
index 652d50bb9dae..f9761144b630 100644
--- a/dev-python/oct2py/oct2py-3.6.0.ebuild
+++ b/dev-python/oct2py/oct2py-3.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 5256fe1b1ec6..2cb740375582 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1 +1,2 @@
DIST oslo.policy-1.18.0.tar.gz 64504 SHA256 414e9a63b1976ad90b2c5ad0897f74bc269c3f5ce0c6c21448d23c4797cc76ff SHA512 e7d92d420a54da82988aaa481dc889fba1c954097895fa62fd232f2d129c9050541b6d2f63e59718420ee8b5a35039be4deb46a184fb1a1107b7239a58a299b8 WHIRLPOOL 797f287a57bfd957feb9f0d3845d790bdd73ac1e87ee774fb497286ce0c93aa9af442c0fe93c26afd80583570a6336dffad554c1e4e867acfbde4a3c3c78f2e1
+DIST oslo.policy-1.23.0.tar.gz 68316 SHA256 a84e850072731ab26ce7f74a5732c0cf0f9e6a287c2ff906481d7ba04d9e1101 SHA512 0caea31db52c25a753f78bce27fbcabf6a2d6e1e44aeeff8fd8d70d260bfb54dc584fa2c8920009b399231fdb96aff249c9f913316f41a19677aa28a7bffa0c3 WHIRLPOOL b5046a3a2b03cb39295e2e4c2064c24c533cf75ed52f81dff21a1213b0bed23d40b6231ab355f2ca820351016ec58f849e2a043511f48b8a3cf2a5bdfe0f4945
diff --git a/dev-python/oslo-policy/oslo-policy-1.23.0.ebuild b/dev-python/oslo-policy/oslo-policy-1.23.0.ebuild
new file mode 100644
index 000000000000..851b07173555
--- /dev/null
+++ b/dev-python/oslo-policy/oslo-policy-1.23.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="Support for RBAC policy enforcement across all OpenStack services"
+HOMEPAGE="https://pypi.python.org/pypi/oslo.policy"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.policy/oslo.policy-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.13.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/oslo.policy-${PV}"
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index c7d4b01cb048..80b1bf9ae5b6 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -2,3 +2,4 @@ DIST pandas-0.16.2.tar.gz 4931751 SHA256 e01853dfe111f3aea005315573400b7216ddbab
DIST pandas-0.17.0.tar.gz 6508621 SHA256 320d4fdf734b82adebc8fde9d8ca4b05fe155a72b6f7aa95d76242da8748d6a4 SHA512 bae6964e263c7ff6cac722cdfe23081f23c357d9bc39a670b5627bef4630c236a58aa8c0393eae921721bf7049c8e5266b4dea71dd957da5d89dafc14a04797b WHIRLPOOL d654eb2f9ffbfedbde60e4a6e6ce6f54650a8a68b4d20035744aa55111525d6bba4dae2ccbfce65acf71bb200e2e6029c7f6c9bcc9d0c582d808444738baedb1
DIST pandas-0.17.1.tar.gz 6674479 SHA256 cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837 SHA512 9d9f9064585b1f3551625e0c8f4eedaaa1253790c2a5cb28e58e70eb805cc18f9770d793aa748cbd76798488ff60efdd01eb4b21daf5ad8f1dc4d9c050487234 WHIRLPOOL 5238575bd64b8d38db4f9a0ea987a7f78ffd1821e5a22bad65c84c407feca3af6f3b536a0a2f337291aa04e94c86fdb40382dad4ce50f8a33a5e26d655c628c2
DIST pandas-0.19.1.tar.gz 8360233 SHA256 2509feaeda72fce03675e2eccd2284bb1cadb6a0737008a5e741fe2431d47421 SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f WHIRLPOOL 700c0d819ab62134baf56430b7fa8840636ea377d00397341d33ec5f13474d9eeefea245aede80a80f7c16348ef811788947e5fe0020c9770005c74dd1288ef3
+DIST pandas-0.20.1.tar.gz 10307434 SHA256 42707365577ef69f7c9c168ddcf045df2957595a9ee71bc13c7997eecb96b190 SHA512 d477a815914c825efd6430f7eb19f3f9115c1c4ab03000ca6d4f64023f7b5f53eff512792fea2d8b33c7febb3667fc3a3de55f11eeb453f285cae40e6b473707 WHIRLPOOL fca35c7178441e3cfe990740aecba923d8b3d56d70fa7b0285b09305a0d2f7a6ad01bb906d6d92748a038a3841cda783f01f75f93b67f15c53c9854a43819841
diff --git a/dev-python/pandas/pandas-0.20.1.ebuild b/dev-python/pandas/pandas-0.20.1.ebuild
new file mode 100644
index 000000000000..3195714ae4b9
--- /dev/null
+++ b/dev-python/pandas/pandas-0.20.1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc -minimal full-support test X"
+
+MINIMAL_DEPEND="
+ >dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ !=dev-python/numexpr-2.1[${PYTHON_USEDEP}]"
+OPTIONAL_DEPEND="
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/blosc[${PYTHON_USEDEP}]
+ dev-python/boto[${PYTHON_USEDEP}]
+ >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+ || ( dev-python/html5lib[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] )
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ || ( >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}] dev-python/xlsxwriter[${PYTHON_USEDEP}] )
+ >=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+ dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+ dev-python/rpy[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/statsmodels[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
+ dev-python/xlrd[${PYTHON_USEDEP}]
+ dev-python/xlwt[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ X? (
+ || (
+ dev-python/PyQt4[${PYTHON_USEDEP}]
+ dev-python/pyside[${PYTHON_USEDEP}]
+ dev-python/pygtk[$(python_gen_usedep python2_7)]
+ )
+ || (
+ x11-misc/xclip
+ x11-misc/xsel
+ )
+ )
+ "
+
+DEPEND="${MINIMAL_DEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/cython-0.23[${PYTHON_USEDEP}]
+ doc? (
+ ${VIRTUALX_DEPEND}
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+ >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/rpy[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+ dev-python/xlrd[${PYTHON_USEDEP}]
+ dev-python/xlwt[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ x11-misc/xclip
+ )
+ test? (
+ ${VIRTUALX_DEPEND}
+ ${RECOMMENDED_DEPEND}
+ ${OPTIONAL_DEPEND}
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/pymysql[${PYTHON_USEDEP}]
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ x11-misc/xclip
+ x11-misc/xsel
+ )"
+# dev-python/statsmodels invokes a circular dep
+# hence rm from doc? ( ), again
+RDEPEND="
+ ${MINIMAL_DEPEND}
+ !minimal? ( ${RECOMMENDED_DEPEND} )
+ full-support? ( ${OPTIONAL_DEPEND} )"
+
+python_prepare_all() {
+ # Prevent un-needed download during build
+ sed \
+ -e "/^ 'sphinx.ext.intersphinx',/d" \
+ -i doc/source/conf.py || die
+
+ # https://github.com/pydata/pandas/issues/11299
+ sed \
+ -e 's:testOdArray:disable:g' \
+ -i pandas/tests/io/json/test_ujson.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ # To build docs the need be located in $BUILD_DIR,
+ # else PYTHONPATH points to unusable modules.
+ if use doc; then
+ cd "${BUILD_DIR}"/lib || die
+ cp -ar "${S}"/doc . && cd doc || die
+ LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
+ fi
+}
+
+python_test() {
+ local test_pandas='not network and not disabled'
+ [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+ pushd "${BUILD_DIR}"/lib > /dev/null
+ "${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+ PYTHONPATH=. MPLCONFIGDIR=. \
+ virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
+ popd > /dev/null
+}
+
+python_install_all() {
+ if use doc; then
+ dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+ einfo "An initial build of docs is absent of references to statsmodels"
+ einfo "due to circular dependency. To have them included, emerge"
+ einfo "statsmodels next and re-emerge pandas with USE doc"
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+ optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" >=dev-python/numexpr-2.1
+ optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
+ optfeature "for msgpack compression using ``blosc``" dev-python/blosc
+ optfeature "necessary for Amazon S3 access" dev-python/boto
+ optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags >=dev-python/google-api-python-client-1.2.0
+ optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+ optfeature "Plotting support" dev-python/matplotlib
+ optfeature "Needed for Excel I/O" >=dev-python/openpyxl-1.6.1 dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+ optfeature "necessary for HDF5-based storage" >=dev-python/pytables-3.2.1
+ optfeature "R I/O support" dev-python/rpy
+ optfeature "Needed for parts of :mod:`pandas.stats`" dev-python/statsmodels
+ optfeature "SQL database support" >=dev-python/sqlalchemy-0.8.1
+ optfeature "miscellaneous statistical functions" sci-libs/scipy
+ optfeature "necessary to use ~pandas.io.clipboard.read_clipboard support" dev-python/PyQt4 dev-python/pyside dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pandas/pandas-9999.ebuild b/dev-python/pandas/pandas-9999.ebuild
index 5ca059ca7e38..e0274323a5e5 100644
--- a/dev-python/pandas/pandas-9999.ebuild
+++ b/dev-python/pandas/pandas-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads(+)"
@@ -63,7 +63,7 @@ OPTIONAL_DEPEND="
DEPEND="${MINIMAL_DEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+ >=dev-python/cython-0.23[${PYTHON_USEDEP}]
doc? (
${VIRTUALX_DEPEND}
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
@@ -101,7 +101,14 @@ RDEPEND="
python_prepare_all() {
# Prevent un-needed download during build
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+ sed \
+ -e "/^ 'sphinx.ext.intersphinx',/d" \
+ -i doc/source/conf.py || die
+
+ # https://github.com/pydata/pandas/issues/11299
+ sed \
+ -e 's:testOdArray:disable:g' \
+ -i pandas/tests/io/json/test_ujson.py || die
distutils-r1_python_prepare_all
}
@@ -122,7 +129,7 @@ python_test() {
pushd "${BUILD_DIR}"/lib > /dev/null
"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
PYTHONPATH=. MPLCONFIGDIR=. \
- virtx nosetests --verbosity=3 -A "${test_pandas}" pandas.io.tests.json.test_ujson.NumpyJSONTests
+ virtx nosetests --verbosity=3 -A "${test_pandas}" pandas
popd > /dev/null
}
diff --git a/dev-python/pip/pip-9.0.1-r1.ebuild b/dev-python/pip/pip-9.0.1-r1.ebuild
index d61d52cba7c1..29526cd1fb64 100644
--- a/dev-python/pip/pip-9.0.1-r1.ebuild
+++ b/dev-python/pip/pip-9.0.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
# Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/protorpc/Manifest b/dev-python/protorpc/Manifest
deleted file mode 100644
index 6b5a508aed3a..000000000000
--- a/dev-python/protorpc/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST protorpc-0.10.0.tar.gz 116667 SHA256 9c612f2898cfd769feae6257b0dcf01e0aff29d5d0a2207c3fade4d49434aa4f SHA512 39932f365f25f73b0badfb868e4be13d24a57aa2388ee8802da46420aa8af053a0f26f51c97599dd5a221e66d0b99ff2743d8dccbe03c42fdbaa9e5f9c8e8fa6 WHIRLPOOL 41ad941b97a90cfac7438bb3ed062ad448f8938ecf5a58d9968cc48cdce73b59e7bdc541ad6b61196c249cd6b13b9e3daab59498b3093b4a7743248baacdbba7
-DIST protorpc-0.11.1.tar.gz 117047 SHA256 b81d5594541fdc3d51f9ce75096db0ddb566df840d8609ffe11e5a84574c0b88 SHA512 6f9b64a54bbb10bfa16d0caef8ead49f68cdc6efc3fa21e231cadc01bb3f8a217fc0fe3d77da5140b46e5edfeef4b27c5f05a92ad2d3090627940130df2e51e0 WHIRLPOOL 724f171772305896e231e7701aae4e0a3c06dda49acdb48cd3d54a7b1677ff4850f29d8ef45d225e59ab3bc208f271a28723ec6d62af58b4031c95cbe13ffb5e
diff --git a/dev-python/protorpc/protorpc-0.10.0.ebuild b/dev-python/protorpc/protorpc-0.10.0.ebuild
deleted file mode 100644
index 135a7914e0d4..000000000000
--- a/dev-python/protorpc/protorpc-0.10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Protocol RPC"
-HOMEPAGE="https://github.com/google/protorpc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/protorpc/protorpc-0.11.1.ebuild b/dev-python/protorpc/protorpc-0.11.1.ebuild
deleted file mode 100644
index 135a7914e0d4..000000000000
--- a/dev-python/protorpc/protorpc-0.11.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Protocol RPC"
-HOMEPAGE="https://github.com/google/protorpc"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyodbc/Manifest b/dev-python/pyodbc/Manifest
index aab0ca4e5477..56c1bc7191bd 100644
--- a/dev-python/pyodbc/Manifest
+++ b/dev-python/pyodbc/Manifest
@@ -1,2 +1,3 @@
DIST pyodbc-3.0.10.tar.gz 68798 SHA256 a66d4f347f036df49a00addf38ca6769ad52f61acdb931c95bc3a9245d8f2b58 SHA512 4e275f2dfd17b3cbb3ee4c019f8a394bb849b032edab7ae5e9c6d4d6a4933e606ab46284c89b98d39cd553e82263d86dc0bee1260cd2fafb53cf19a918096647 WHIRLPOOL 58dd10b9f5eaef3d077dcb434016710047097406744baa2883758d96d510c38c0ae71ee8abb9cfae1737506fb29744fc6c275fd3ecad2c0371f484dc31432a81
DIST pyodbc-3.0.7.zip 85722 SHA256 d8355f2d43b10386070e8564aa973119fdb6e10864e1bbd73f3224cd3baab351 SHA512 35d4b17324c60f15bc8647961fff0fa74afa02e37e1019a399add468cfd96e0403f2f7259f3c0164e4c7cabce67de7c300c9950602d9293b0b94a84d2ed02ffe WHIRLPOOL 3da4ecf3706a7cfbe8f11e7f3b1891160e02f7331abea6b407cc5809faa8604f291163f3d3342d7bcf5daa54b1f95aca0b397a5412b7bcdb198810f4fcd59eff
+DIST pyodbc-4.0.16.tar.gz 204168 SHA256 6fd7f100983e700ded8a103391429e43f0b814dc2dc028b904b1798000e72d96 SHA512 53f80ee7333210a1e20e89aa17ca7c2b57363826ac09069213454951ae35f8de689535c05b2278783e8b4a71d178860c3e1efebf51980343a59a9b190e41dda5 WHIRLPOOL 638e026d6c8bfd32be77e89c90762c89153331744e53a0b9582c49fbaf9d9f440ffa2a19a46dd5fc269c968fc2dc6e876e6791bcb718084423e3dbfd132c60d2
diff --git a/dev-python/pyodbc/pyodbc-4.0.16.ebuild b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
new file mode 100644
index 000000000000..88343266e081
--- /dev/null
+++ b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="python ODBC module to connect to almost any database"
+HOMEPAGE="https://github.com/mkleehammer/pyodbc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mssql"
+
+RDEPEND=">=dev-db/unixODBC-2.3.0
+ mssql? ( >=dev-db/freetds-0.64[odbc] )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_configure_all() {
+ append-cxxflags -fno-strict-aliasing
+}
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index bfae0a2371ab..9d2fbd54ac91 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,2 +1,3 @@
DIST pysnmp-4.3.3.tar.gz 403779 SHA256 c837d35cbb2c1e067b7b8ed752d962481ef8d7ff11e4cdd8bfb0840c4a786318 SHA512 4b3e4a1785a852eb0b03266d2efbc586c01030f4653482bfea91b64a78098554589e76d38fe43c6b2d734ea3624a42878a2e3b6b7cfbf883e8bf8ad07ff43f81 WHIRLPOOL f04c9f6eece5d31bb4941cfdbfa3216fb5a65b2b2b1b097bd72ca500506262c0458d6d774b99c766f2016fb46ea50bc9a8b741825f820a0a7970dac7ac934977
DIST pysnmp-4.3.5.tar.gz 404793 SHA256 38253fe95cea33f352fb36e85f3c2874043401724300c4888df74835161169d2 SHA512 0878ff1b42a28aaea9ed97137971d606457ae392b701eb7a2f6fd5eb59349e7d2ca1193a3d468ad83ee3eb91cd74ec160c7d90ef750164a717c0ae57fcef5784 WHIRLPOOL 5bfc88686232bdad59208984588418b3811d6d92dc58a0d5e0a18364eb44d99032981a5ee65a3f9fdbf7947e2bd6038763d44880ab19e59ff4611df824e06134
+DIST pysnmp-4.3.7.tar.gz 424464 SHA256 fd0e139bf3768eaaa1e2b339c23c19a74c8086fe4307252e2e5b4c3a070d89db SHA512 c6c5f8927b9e142cfd0731ad2e2fc0b9e479b9e2e177acdd2e49e9e8744dd248a0dc79e05066389ad16ca869a88abc44cde1e987fa5ec2ee92f5d2ffb02c8560 WHIRLPOOL 590ac6f51407ba9f66ee108d7dccbe6d362a0b0f57bf2fba1c0d30b7e02a8006f80e8c8a98f88435722fe1928e919967eecd0c628a632e23e1ff212a8c22b254
diff --git a/dev-python/pysnmp/pysnmp-4.3.7.ebuild b/dev-python/pysnmp/pysnmp-4.3.7.ebuild
new file mode 100644
index 000000000000..0b3d4e9fa7d7
--- /dev/null
+++ b/dev-python/pysnmp/pysnmp-4.3.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python SNMP library"
+HOMEPAGE="http://pysnmp.sf.net/ https://pypi.python.org/pypi/pysnmp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc examples"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+ >=dev-python/pyasn1-0.2.3[${PYTHON_USEDEP}]
+ dev-python/pycrypto[${PYTHON_USEDEP}]
+"
+
+python_compile_all() {
+ default
+
+ if use doc; then
+ touch docs/source/conf.py
+ emake -C docs html
+ fi
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/* )
+ docinto examples
+ use examples && dodoc -r examples/* docs/mibs
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ elog "You may also be interested in the following packages: "
+ elog "dev-python/pysnmp-apps - example programs using pysnmp"
+ elog "dev-python/pysnmp-mibs - IETF and other mibs"
+ elog "net-libs/libsmi - to dump MIBs in python format"
+}
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 00db4d4253ef..40a89125a0fe 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,4 @@
DIST python-caja-1.12.0.tar.xz 265720 SHA256 5418ffcc5c4a33c15348a0f10ded161d26fd1dfb46b3f68b2c6e3d2d1a7ba975 SHA512 fbec1a7f5e560cda2b3bba41dcd93c0484f2b7b7527577a2b2114c84019203df92c136fecbbe6c889785c610035a582f1912ad7da9bb1258ada661b56edf4be7 WHIRLPOOL fdf60f678762480f0a9e5532dad08fddead1f3551b2c74d82889b597389cdf37351f9b82bdcf0420dd0505167cb890a75dda3ae5268ba502717cf020a8b922fd
DIST python-caja-1.14.0.tar.xz 279432 SHA256 441506e2fd32f77adf1d81dc9748ae27b2123c6a39dc0407932c0f10b11a02ac SHA512 835d9c1df112746fb3ecfe2e661e0c36814f3e2b21c763450354ce9bc0119d055b6773efa64d252ea8a618ec6c36e2d9cbfca698ffa6652cad0b94a499167497 WHIRLPOOL 66df5024c8e47d8973c562a5144dd872adaf02e7ba15ff0c2c4115f33dec1ee5916469d0d28458779800d9543510c557bf629feb8ba9c5360a1ff8f09b811e92
DIST python-caja-1.16.0.tar.xz 280956 SHA256 14a86d174be0af753c24425469b56432ea3fbc46d954bf06ab679613f15c0ce4 SHA512 ce82fbd6d1127df33153920fbf703f77be2e1dabeb6ba33275fb1b1ba5d8aabc96222cf42280844237f0e182b0eccf764fd8ea33a8de96e844eeb0d5ef0cd5de WHIRLPOOL af036fc96a0a7b9bf322da3c3f1474331cfeaa4ef5d51fbb4eb93a318641ed90c6330487e65b818a3101f4b74db4d9c88308d0ae3336920e23be935864582432
+DIST python-caja-1.18.0.tar.xz 282504 SHA256 45b565de9ec06c05a6f65a49099645f3e82baf588b640c23adb4ab5676474403 SHA512 3836daaa4102da10d2601bc52dd8b8336459172a8ac1275f8d5f945e37cbb41f89e7a1ff737484dd4f5374ca00a0a3c6601fe28a48d7895f8efcaf793695fbcb WHIRLPOOL fbe204dfac8315b3eebe3fa223f26e5f9330e2b83dfcc791c1774d5bf11ab1ef0123dabedeaeeafec747bb6e0b8156878e6c79b18bde33dc47c24cffcad55fce
diff --git a/dev-python/python-caja/python-caja-1.18.0.ebuild b/dev-python/python-caja/python-caja-1.18.0.ebuild
new file mode 100644
index 000000000000..f30cc7c52d15
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.18.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Python bindings for the Caja file manager"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ dev-libs/glib:2
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=mate-base/caja-1.17.1[introspection]
+ x11-libs/gtk+:3"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc
+ dev-util/gtk-doc-am
+ virtual/pkgconfig:*
+ doc? ( app-text/docbook-xml-dtd:4.1.2 )"
+
+src_install() {
+ mate_src_install
+
+ # Keep the directory for systemwide extensions.
+ keepdir /usr/share/python-caja/extensions/
+
+ # The HTML documentation generation is broken and commented out by upstream.
+ #
+ #if use doc ; then
+ # insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+ # doins -r docs/html/*
+ #fi
+}
diff --git a/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild b/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild
index 887e81bbb147..a14875cfb361 100644
--- a/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
RDEPEND="app-crypt/gnupg"
DEPEND="${RDEPEND}"
diff --git a/dev-python/python-memcached/python-memcached-1.58.ebuild b/dev-python/python-memcached/python-memcached-1.58.ebuild
index 15b5d2eda05c..979976df4e01 100644
--- a/dev-python/python-memcached/python-memcached-1.58.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.58.ebuild
@@ -3,12 +3,14 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
inherit distutils-r1
DESCRIPTION="Pure python memcached client"
-HOMEPAGE="http://www.tummy.com/Community/software/python-memcached/ https://pypi.python.org/pypi/python-memcached"
+HOMEPAGE="
+ http://www.tummy.com/Community/software/python-memcached/
+ https://pypi.python.org/pypi/python-memcached"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="OSL-2.0"
@@ -16,7 +18,8 @@ SLOT="0"
KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
test? (
net-misc/memcached
dev-python/nose[${PYTHON_USEDEP}]
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index aa4860213680..8eeef5522135 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1 +1,2 @@
DIST python-nbxmpp-0.5.3.tar.gz 1514066 SHA256 b79a6b25a2ed7ac792600544778238b27cf6eef6c8eab79b0bfa46df0c3a9935 SHA512 a55ce4c05683d46c12cf085c5436ba544044f0ab71ad7c87dbb25cba02c28109089131b617ff51191d294efe50e80171dd2305ead4052bec921b0ad5ad920e20 WHIRLPOOL 96d078df5972dde5704dac9fcac31c9ae734c06583c381f5d18d43fca26ae790cebc114991e07b916be35a5dcb24d9ccaad9fe69f22b9bd16099d5d248aea487
+DIST python-nbxmpp-0.5.6.tar.gz 1330311 SHA256 061f3dcc25f80a1033864d47f6b0efe5bfdc32eafbea79a407943f5beadf552c SHA512 1ae90dc6d7117e8fae837975dbc4b84a848caef451c8ef99fb106148a12e29429255d0595c0eee26cb185d01e42a84ddb7636f41d4ee259fedf26cf0d956a43c WHIRLPOOL e0cb0d5766a26d7dcb034f6f6181772aa333604a7e8fa96884b62a232b6a5e7cf28d99f36362692040309d6ba9d7ec466113ef72c0d23927d8de0368612981fa
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
new file mode 100644
index 000000000000..d46f49ff6305
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="http://python-nbxmpp.gajim.org/"
+SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.gz?ref=nbxmpp-${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
diff --git a/dev-python/python3-openid/Manifest b/dev-python/python3-openid/Manifest
index 86efff64b506..3dd7d84911a2 100644
--- a/dev-python/python3-openid/Manifest
+++ b/dev-python/python3-openid/Manifest
@@ -1 +1,2 @@
DIST python3-openid-3.0.4_p1.tar.gz 306465 SHA256 eb78cb2288805ee1c51eeaa8941c61be796ac1126e1ca0a2c49dc7582b0c0407 SHA512 6e710dc47c3c1d4f31937b8a4dcf546cdb06128ffddbc3b2e2a2a9e09a8a3a7122326ba2137a92269f58a29f1b264c2e942610098f91f237d45f5ff0887faea0 WHIRLPOOL 8812d4fd0c0ffd3e40f4f8414463f05cf62b37d388039a5287ac412c452a8e7cb142accafdfbd9e32d36cde3d4a6d96954742b542fdc92168d31574de185c152
+DIST python3-openid-3.1.0.tar.gz 299326 SHA256 628d365d687e12da12d02c6691170f4451db28d6d68d050007e4a40065868502 SHA512 9c96efd16191ddb6ddb12c4885a2cce523244d04e70f9418144d0124ef142fd7b6578cd2a01e949995d7dedf0b96cbb3b17d1d3a29db5da8934f7fa875ad8e9c WHIRLPOOL 1b46810f625d0e5a3018b2dd2c1df938bb3df41c3316d04910d1e3ed24e747e0066829782bd978f92a20291a02f1562beb40e498fe1d3f928828cc2b708ce199
diff --git a/dev-python/python3-openid/python3-openid-3.1.0.ebuild b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
new file mode 100644
index 000000000000..1484171e99bd
--- /dev/null
+++ b/dev-python/python3-openid/python3-openid-3.1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 port of the python-openid library"
+HOMEPAGE="https://github.com/necaris/python3-openid https://pypi.python.org/pypi/python3-openid"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/defusedxml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ )
+"
+
+python_test() {
+ ${EPYTHON} -m unittest -v openid.test.test_suite || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pytz/pytz-2017.2.ebuild b/dev-python/pytz/pytz-2017.2.ebuild
index 4c34ef3b2a01..cf13683bb01c 100644
--- a/dev-python/pytz/pytz-2017.2.ebuild
+++ b/dev-python/pytz/pytz-2017.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index d90b87bd0509..4fd9987f332a 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,2 +1,2 @@
DIST pyzmq-14.4.1.tar.gz 995366 SHA256 cb4a59875fdc26315045d800bac008b8e10a4cf2d72ac9af2fc45ef6ac8f330a SHA512 4b71677e4bfa771177a34dbff59cf6dfd54310a8996689a3d62902aaba35c7cf2ad6b7da806f9e189ad4b89fcefe9cbb3e192788eecd5d2c269e8a980b4d50fa WHIRLPOOL f6c093023b4494e1f9293a81ac86dcc55ff05f7ae10bb9677ff4fffd2e38fefe2462eb241c74b1ee283958a8546b128585c78c644dae544aa38f4b9c1f3e3ad8
-DIST pyzmq-15.2.0.tar.gz 1078561 SHA256 2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec SHA512 28541b095b5486b662fe33a24994af5a465989a2391091ec8b693579124fdd600c3b0721853377c7551430d55b13c9116a1eebdced74678598d78c01fa7431c7 WHIRLPOOL 2ef08e72f1d35336118191a914068aa1b2b77cea92c197f902ffdf679c80b7bd6bf025ab1dc267f9adc65c38213499631441b5f69a5c2296d7cb4d723867499c
+DIST pyzmq-16.0.2.tar.gz 1026531 SHA256 0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96 WHIRLPOOL 69db3fc02c16bf16631a56b8cd0a0cd6befa0a8a7251eb72cc53c7cb252dd65304e03b25f27215dc6ed1792ac001b07d2539e40724be0fe0292620f78327161a
diff --git a/dev-python/pyzmq/pyzmq-15.2.0.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
similarity index 74%
rename from dev-python/pyzmq/pyzmq-15.2.0.ebuild
rename to dev-python/pyzmq/pyzmq-16.0.2.ebuild
index 2a65a9f94779..da979058e579 100644
--- a/dev-python/pyzmq/pyzmq-15.2.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
PYTHON_REQ_USE="threads(+)"
-inherit distutils-r1 toolchain-funcs
+inherit flag-o-matic distutils-r1 toolchain-funcs
DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
HOMEPAGE="http://www.zeromq.org/bindings:python https://pypi.python.org/pypi/pyzmq"
@@ -15,24 +15,26 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
+IUSE="doc test"
-PY2_USEDEP=$(python_gen_usedep python2_7)
RDEPEND="
>=net-libs/zeromq-4.1.2:=
dev-python/py[${PYTHON_USEDEP}]
dev-python/cffi:=[${PYTHON_USEDEP}]
- dev-python/gevent[${PY2_USEDEP}]"
+ $(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
+"
DEPEND="${RDEPEND}
dev-python/cython[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
+ www-servers/tornado[${PYTHON_USEDEP}]
+ )
doc? (
>=dev-python/sphinx-1.3[${PYTHON_USEDEP}]
dev-python/numpydoc[${PYTHON_USEDEP}]
)"
-PATCHES=( "${FILESDIR}/pyzmq-cython-0.24.patch" )
-
python_prepare_all() {
# Prevent un-needed download during build
sed -e "/'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
@@ -41,6 +43,7 @@ python_prepare_all() {
python_configure_all() {
tc-export CC
+ append-cppflags -DZMQ_BUILD_DRAFT_API=1
}
python_compile_all() {
@@ -54,13 +57,10 @@ python_compile() {
}
python_test() {
- # suite reports error in absence of gevent under py3 but is designed to continue
- # rather than exit making py3 apt for the test phase
- nosetests -svw "${BUILD_DIR}/lib/" || die
+ ${EPYTHON} -m pytest -v "${BUILD_DIR}/lib" || die
}
python_install_all() {
- use examples && local EXAMPLES=( examples/. )
use doc && local HTML_DOCS=( docs/build/html/. )
distutils-r1_python_install_all
}
diff --git a/dev-python/scripttest/scripttest-1.3.0.ebuild b/dev-python/scripttest/scripttest-1.3.0.ebuild
index c3f711901973..89c29e8fb7f9 100644
--- a/dev-python/scripttest/scripttest-1.3.0.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
inherit distutils-r1
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index cf85bec0d76e..9bd087251c40 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1 +1 @@
-DIST 1.5.5.tar.gz 12066 SHA256 eb9085b7125b2f33e3f33770733cdc470a3404c40e6a251cc8b624e5e25c295c SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a WHIRLPOOL a50fe5c5abbd77dbcb4c19815d974ab22f620a5075ef954b4a30f8294671d7ddd1666c0222c05162377e5c48e6380e01674acd0a7454f38095171000da43b82e
+DIST sphinxcontrib-blockdiag-1.5.5.tar.gz 12066 SHA256 eb9085b7125b2f33e3f33770733cdc470a3404c40e6a251cc8b624e5e25c295c SHA512 4c007e2c394bf90ff84a000cf44ec1d50b39286a32929c89a64320299a70f10e44da35d942e7bb8697a9d61eb6a551f74bd15349cf0b439369aaaf12d175635a WHIRLPOOL a50fe5c5abbd77dbcb4c19815d974ab22f620a5075ef954b4a30f8294671d7ddd1666c0222c05162377e5c48e6380e01674acd0a7454f38095171000da43b82e
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
index fca6bb924070..c2d09ca7e7df 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-1.5.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A sphinx extension for embedding block diagrams using blockdiag"
HOMEPAGE="https://github.com/blockdiag/sphinxcontrib-blockdiag"
-SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${PV}.tar.gz"
+SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-python/subprocess32/Manifest b/dev-python/subprocess32/Manifest
new file mode 100644
index 000000000000..4df47ced9da1
--- /dev/null
+++ b/dev-python/subprocess32/Manifest
@@ -0,0 +1 @@
+DIST subprocess32-3.2.7.tar.gz 54240 SHA256 1e450a4a4c53bf197ad6402c564b9f7a53539385918ef8f12bdf430a61036590 SHA512 d897d6a48824991e2a63ea417ca15222f28c3a4117c9bba8cbb4eceabfba9769acce1166aafa7aee8a025d6ebe7e133ce0dd617f90cb07e11bdb73dc1e21dec6 WHIRLPOOL 41226d999895439a089a319e8b805468d1913ec098d5f92705076ae707efb59c8a92f56e1068927065c5c1060ad84388fbaaf575a6e5c4d12a2b2b1e588f3e0a
diff --git a/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch b/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch
new file mode 100644
index 000000000000..50e4a511fc4b
--- /dev/null
+++ b/dev-python/subprocess32/files/subprocess32-3.2.7-sandbox-test-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/test_subprocess32.py b/test_subprocess32.py
+index c312949..000f7d6 100644
+--- a/test_subprocess32.py
++++ b/test_subprocess32.py
+@@ -538,7 +538,8 @@ class ProcessTestCase(BaseTestCase):
+ [sys.executable, "-c",
+ 'import os; '
+ 'print([k for k in os.environ.keys() '
+- ' if ("VERSIONER" not in k and "__CF" not in k)])'],
++ ' if ("VERSIONER" not in k and "__CF" not in k and '
++ ' "LD_PRELOAD" not in k and "SANDBOX_" not in k)])'],
+ stdout=subprocess.PIPE, env={})
+ try:
+ stdout, stderr = p.communicate()
diff --git a/dev-python/protorpc/metadata.xml b/dev-python/subprocess32/metadata.xml
similarity index 69%
rename from dev-python/protorpc/metadata.xml
rename to dev-python/subprocess32/metadata.xml
index e4f893e4cc4b..d06e7b26e195 100644
--- a/dev-python/protorpc/metadata.xml
+++ b/dev-python/subprocess32/metadata.xml
@@ -6,7 +6,7 @@
Python
- google/protorpc
- protorpc
+ subprocess32
+ google/python-subprocess32
diff --git a/dev-python/subprocess32/subprocess32-3.2.7.ebuild b/dev-python/subprocess32/subprocess32-3.2.7.ebuild
new file mode 100644
index 000000000000..452ae88d7ab1
--- /dev/null
+++ b/dev-python/subprocess32/subprocess32-3.2.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A backport of the subprocess module from Python 3.2/3.3 for use on 2.x"
+HOMEPAGE="https://github.com/google/python-subprocess32"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+PATCHES=( "${FILESDIR}"/${P}-sandbox-test-fix.patch )
+
+python_test() {
+ "${PYTHON}" test_subprocess32.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
new file mode 100644
index 000000000000..04b6e2c949c4
--- /dev/null
+++ b/dev-python/urwid/files/urwid-1.3.1-test-vterm-EINTR.patch
@@ -0,0 +1,52 @@
+From f68f2cf089cfd5ec45863baf59a91d5aeb0cf5c3 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Sat, 3 Jun 2017 14:53:51 -0400
+Subject: [PATCH] test_vterm: handle EINTR when reading from pipe
+
+Fixes: https://github.com/urwid/urwid/issues/230
+---
+ urwid/tests/test_vterm.py | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/urwid/tests/test_vterm.py b/urwid/tests/test_vterm.py
+index 4dadfcc..075c653 100644
+--- a/urwid/tests/test_vterm.py
++++ b/urwid/tests/test_vterm.py
+@@ -18,6 +18,7 @@
+ #
+ # Urwid web site: http://excess.org/urwid/
+
++import errno
+ import os
+ import sys
+ import unittest
+@@ -28,7 +29,6 @@
+ from urwid import signals
+ from urwid.compat import B
+
+-
+ class DummyCommand(object):
+ QUITSTRING = B('|||quit|||')
+
+@@ -41,12 +41,20 @@ def __call__(self):
+ stdout.write(B('\x1bc'))
+
+ while True:
+- data = os.read(self.reader, 1024)
++ data = self.read(1024)
+ if self.QUITSTRING == data:
+ break
+ stdout.write(data)
+ stdout.flush()
+
++ def read(self, size):
++ while True:
++ try:
++ return os.read(self.reader, size)
++ except OSError as e:
++ if e.errno != errno.EINTR:
++ raise
++
+ def write(self, data):
+ os.write(self.writer, data)
+
diff --git a/dev-python/urwid/urwid-1.3.1.ebuild b/dev-python/urwid/urwid-1.3.1.ebuild
index 97ffb55b69f0..5b3241b701bd 100644
--- a/dev-python/urwid/urwid-1.3.1.ebuild
+++ b/dev-python/urwid/urwid-1.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
DEPEND="
@@ -22,7 +22,10 @@ DEPEND="
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
"
-PATCHES=( "${FILESDIR}"/${PN}-1.1.0-sphinx.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.0-sphinx.patch
+ "${FILESDIR}"/urwid-1.3.1-test-vterm-EINTR.patch
+)
python_compile_all() {
if use doc ; then
diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild
index 940530e15cab..8ae91407db7c 100644
--- a/dev-qt/assistant/assistant-4.8.7.ebuild
+++ b/dev-qt/assistant/assistant-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
+ KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
fi
IUSE="webkit"
diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild
index 4558cc0f7f4d..fa3792775f23 100644
--- a/dev-qt/designer/designer-4.8.7.ebuild
+++ b/dev-qt/designer/designer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
DESIGNER_PLUGINS="declarative phonon qt3support webkit"
diff --git a/dev-qt/linguist/linguist-4.8.7.ebuild b/dev-qt/linguist/linguist-4.8.7.ebuild
index 9618ac06a126..77e399dc0546 100644
--- a/dev-qt/linguist/linguist-4.8.7.ebuild
+++ b/dev-qt/linguist/linguist-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
DESCRIPTION="Graphical tool for translating Qt applications"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
index 3fc375227b45..6cafb15825f5 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="Qt screen magnifier"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
+ KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
fi
IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
index 58c82a23fd53..578d1f630b68 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE=""
diff --git a/dev-qt/qt3support/qt3support-4.8.7.ebuild b/dev-qt/qt3support/qt3support-4.8.7.ebuild
index a74c84b8a250..d1941fdec6d7 100644
--- a/dev-qt/qt3support/qt3support-4.8.7.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="The Qt3Support module for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="+accessibility"
diff --git a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
index ef677cea50af..a7276146f106 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="The network bearer plugins for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="connman networkmanager"
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
index 7606cf61314f..e384674860c2 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r2.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="+glib iconv icu libressl qt3support ssl"
diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
index 35b3db9c0a40..16e9dd306302 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="The DBus module for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
index 7aefc21a2d14..7aa923223a7c 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="The Declarative module for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="+accessibility qt3support webkit"
diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
index b8d5351271e3..f3e687084a1e 100644
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="The GUI module for the Qt toolkit"
SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
diff --git a/dev-qt/qthelp/qthelp-4.8.7.ebuild b/dev-qt/qthelp/qthelp-4.8.7.ebuild
index 1f65f4767957..4facf8b4486f 100644
--- a/dev-qt/qthelp/qthelp-4.8.7.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI+="
)"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
+ KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
fi
IUSE="compat doc"
diff --git a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
index 14d3c4de4f32..92b6dac2f1ce 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="The OpenGL module for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="egl qt3support"
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild
index e8325c88d7f2..20de94ca2064 100644
--- a/dev-qt/qtscript/qtscript-4.8.7.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="The QtScript module for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="+jit"
diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
index 72630510d8c9..a52792919abc 100644
--- a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib qt4-build-multilib
DESCRIPTION="The SQL module for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
index 7da7cb4c3379..b4948a670b74 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="The SVG module for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE="+accessibility"
diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild
index d4120cfe6820..816c74a5a683 100644
--- a/dev-qt/qttest/qttest-4.8.7.ebuild
+++ b/dev-qt/qttest/qttest-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
index f1767d22b92e..b619409183c2 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
DESCRIPTION="Translation files for the Qt toolkit"
if [[ ${QT4_BUILD_TYPE} == release ]]; then
- KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
fi
IUSE=""
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
new file mode 100644
index 000000000000..a5c3072a4777
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
@@ -0,0 +1,144 @@
+From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen
+Date: Wed, 29 Mar 2017 17:42:18 +0200
+Subject: [PATCH] Fix build with GCC 7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but
+earlier compilers did.
+
+Task-number:QTBUG-59776
+Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3
+Reviewed-by: Michael Brüning
+---
+ .../mojo/public/cpp/bindings/interface_ptr_info.h | 2 +-
+ .../third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++
+ chromium/v8/src/objects-body-descriptors.h | 2 +-
+ chromium/v8/src/objects-inl.h | 19 +++++++++++++++++++
+ chromium/v8/src/objects.h | 16 ++--------------
+ 5 files changed, 25 insertions(+), 16 deletions(-)
+
+diff --git a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
+index 5bd29d5..c94a5ac 100644
+--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
++++ b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
+@@ -34,7 +34,7 @@ class InterfacePtrInfo {
+
+ InterfacePtrInfo& operator=(InterfacePtrInfo&& other) {
+ if (this != &other) {
+- handle_ = other.handle_.Pass();
++ handle_ = std::move(other.handle_);
+ version_ = other.version_;
+ other.version_ = 0u;
+ }
+--
+2.7.4
+From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen
+Date: Wed, 29 Mar 2017 15:53:00 +0200
+Subject: [PATCH 1/1] Fix build with GCC 7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes a few problems with using undeclared functions and ambigious
+code.
+
+Task-number: QTBUG-59776
+Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c
+Reviewed-by: Michael Brüning
+---
+ chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++
+ .../third_party/pdfium/fpdfsdk/javascript/global.cpp | 8 ++++----
+ chromium/v8/src/objects-body-descriptors.h | 2 +-
+ chromium/v8/src/objects-inl.h | 18 ++++++++++++++++++
+ chromium/v8/src/objects.h | 16 ++--------------
+ 5 files changed, 27 insertions(+), 19 deletions(-)
+
+diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
+index e85c72f..6f94cd6 100644
+--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
++++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
+@@ -542,6 +542,8 @@ inline LinkedHashSet& LinkedHashSet::operator=(LinkedHas
+ return *this;
+ }
+
++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
++
+ template
+ inline void LinkedHashSet::swap(LinkedHashSet& other)
+ {
+diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
+index 91cb888..a1c3634 100644
+--- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
++++ b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
+@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
+
+ template
+ static inline void IterateBody(HeapObject* obj, int object_size) {
+- IterateBody(obj);
++ IterateBody(obj);
+ }
+ };
+
+diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h b/src/3rdparty/chromium/v8/src/objects-inl.h
+index 58441d3..4c486ea 100644
+--- a/src/3rdparty/chromium/v8/src/objects-inl.h
++++ b/src/3rdparty/chromium/v8/src/objects-inl.h
+@@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) {
+ }
+
+
++template
++inline uint32_t HashTable::Hash(Key key) {
++ if (Shape::UsesSeed) {
++ return Shape::SeededHash(key, GetHeap()->HashSeed());
++ } else {
++ return Shape::Hash(key);
++ }
++}
++
++template
++inline uint32_t HashTable::HashForObject(Key key, Object* object) {
++ if (Shape::UsesSeed) {
++ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
++ } else {
++ return Shape::HashForObject(key, object);
++ }
++}
++
+ bool ObjectHashTableShape::IsMatch(Handle