diff --git a/Manifest.files.gz b/Manifest.files.gz index cf68cdbd223f..691a59ceddaf 100644 Binary files a/Manifest.files.gz and b/Manifest.files.gz differ diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index 4974091ad2f8..04a1e07b2e09 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest index 3ef61eb628f8..46a057841ae7 100644 --- a/app-crypt/gpgme/Manifest +++ b/app-crypt/gpgme/Manifest @@ -1,2 +1 @@ -DIST gpgme-1.10.0.tar.bz2 1370162 BLAKE2B b421d91a4fcd2e8887dc1a5c276fe1cce66f379741d86dfca751f4863039c39ccaf492c7683d6f6a0de407d2a6056e3496e45e3d472eef36a879e8b903e58c57 SHA512 8ffa348ef4775ed3209486444d54411e28c9a0ff1d7a4315feb0b2856ccd5d110b219100ea41262ca0016af69a1936d79fee0eadf2599c7c5bbeed05d11f7ab5 DIST gpgme-1.11.1.tar.bz2 1419232 BLAKE2B 93980c24e6d692f35105db23a02db891ef022addd583d5bda8e55ec3552dfebb87c9feebb74fdd59fa353a3b08571e51537f8dcaf63af018beff467a848e97e9 SHA512 42fa6f5d6217aaad9b44b969de9603167d179af9a1573342187718ff123cd88c686211c3dc5f2d9cacc20226ab5b8fef85cb66a19ada71d267c397d8ba52cf1a diff --git a/app-crypt/gpgme/gpgme-1.10.0.ebuild b/app-crypt/gpgme/gpgme-1.10.0.ebuild deleted file mode 100644 index c79592443168..000000000000 --- a/app-crypt/gpgme/gpgme-1.10.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 flag-o-matic libtool ltprune qmake-utils toolchain-funcs - -DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use" -HOMEPAGE="http://www.gnupg.org/related_software/gpgme" -SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="1/11" # subslot = soname major version -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp static-libs cxx python qt5" - -COMMON_DEPEND=">=app-crypt/gnupg-2 - >=dev-libs/libassuan-2.0.2:= - >=dev-libs/libgpg-error-1.17:= - python? ( ${PYTHON_DEPS} ) - qt5? ( dev-qt/qtcore:5 )" - #doc? ( app-doc/doxygen[dot] ) -DEPEND="${COMMON_DEPEND} - python? ( dev-lang/swig ) - qt5? ( dev-qt/qttest:5 )" -RDEPEND="${COMMON_DEPEND} - cxx? ( - ! /dev/null || die - top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE} - popd > /dev/null - fi -} - -pkg_setup() { - addpredict /run/user/$(id -u)/gnupg - - local MAX_WORKDIR=66 - if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then - ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests" - SKIP_TESTS=1 - fi -} - -src_prepare() { - default - elibtoolize - - # Make best effort to allow longer PORTAGE_TMPDIR - # as usock limitation fails build/tests - ln -s "${P}" "${WORKDIR}/b" - S="${WORKDIR}/b" -} - -src_configure() { - local languages=() - use common-lisp && languages+=( "cl" ) - use cxx && languages+=( "cpp" ) - if use qt5; then - languages+=( "qt" ) - #use doc || - export DOXYGEN=true - export MOC="$(qt5_get_bindir)/moc" - fi - - econf \ - $([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \ - --enable-languages="${languages[*]}" \ - $(use_enable static-libs static) - - use python && make -C lang/python prepare - - do_python -} - -src_compile() { - default - do_python -} - -src_test() { - [[ -z "${SKIP_TESTS}" ]] || return - - default - if use python; then - test_python() { - emake -C lang/python/tests check \ - PYTHON=${EPYTHON} \ - PYTHONS=${EPYTHON} \ - TESTFLAGS="--python-libdir=${BUILD_DIR}/lib" - } - python_foreach_impl test_python - fi -} - -src_install() { - default - do_python - prune_libtool_files - - # backward compatibility for gentoo - # in the past we had slots - dodir /usr/include/gpgme - dosym ../gpgme.h /usr/include/gpgme/gpgme.h -} diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 4f5442142779..4db79e0931b6 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/libcacard/Manifest b/app-emulation/libcacard/Manifest index 7db72c25cf65..70d0443d1a0e 100644 --- a/app-emulation/libcacard/Manifest +++ b/app-emulation/libcacard/Manifest @@ -1,2 +1,3 @@ DIST libcacard-0.1.2.tar.bz2 276430 BLAKE2B 315d7b0c8dcd3d6b40db4c1586cf149e6681af4e0188bed22cb526d1de79bda4a7b1c5ece894c679c2e7b727b6d05628ba9f8fbc3900503f78f13a029514e15d SHA512 a3622b29fe3a059e069ad6f7da428278a915cec362a6aae3c7cad0d47dfadba67308631435993c0f41cabe92a05874b339518dc503b71b8d86db4976bb6987f6 DIST libcacard-2.5.1.tar.xz 325692 BLAKE2B f6ce08f08f359789886a63d4554e3492e8cb570e5b476dc8185332a951fe03e7b5577856c4c60523ad673577a3a160490aaf943f401796973b0d205ca740f949 SHA512 88e66745f649f52c3fcc7745834d628e76abc21cef1b300e8750e6c0641f65d0e11224da30fa13dea20d6ebe5d36d7a8680d029e15149fddaea43558216ccc21 +DIST libcacard-2.6.0.tar.xz 364828 BLAKE2B 3a07243abb91dab05d89bf073fabb4a0ef7e820765066a8d87e72086b88cc726de77d1fdc5118e05ed47077d76ae0a57ff591a2e4e8623c3484c6cbf00cd025e SHA512 d6dfe6fe6cd2711bf8f71edc134a7caf459fc2a9c4f664ab2f1c28cc9ee8efe7a2d5a15c4dc735956638176e07e22416cad5e8e926aa7cab3fa95ded853f5982 diff --git a/app-emulation/libcacard/libcacard-2.6.0.ebuild b/app-emulation/libcacard/libcacard-2.6.0.ebuild new file mode 100644 index 000000000000..e54815fe8095 --- /dev/null +++ b/app-emulation/libcacard/libcacard-2.6.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +DESCRIPTION="virtual Common Access Card (CAC) library emulator" +HOMEPAGE="https://www.spice-space.org/" +SRC_URI="https://www.spice-space.org/download/libcacard/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="+passthrough static-libs" + +RDEPEND=">=dev-libs/nss-3.13 + >=dev-libs/glib-2.22 + passthrough? ( >=sys-apps/pcsc-lite-1.8 )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + econf \ + $(use_enable passthrough pcsc) \ + $(use_enable static-libs static) +} + +src_install() { + default + dodoc docs/*.txt + use static-libs || find "${ED}"/usr/ -name 'lib*.la' -delete +} diff --git a/app-emulation/libcacard/metadata.xml b/app-emulation/libcacard/metadata.xml index e225897fe918..0fa99318f0a7 100644 --- a/app-emulation/libcacard/metadata.xml +++ b/app-emulation/libcacard/metadata.xml @@ -1,12 +1,11 @@ - - dev-zero@gentoo.org - Tiziano Müller - - + virtualization@gentoo.org Gentoo Virtualization Project + + Enable smartcard passthrough support via sys-apps/pcsc-lite + diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz index d3be2885d4db..95adaa9ed39c 100644 Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest index 6d084d0ff724..56b96c9e98f1 100644 --- a/app-vim/gentoo-syntax/Manifest +++ b/app-vim/gentoo-syntax/Manifest @@ -1,2 +1,3 @@ DIST gentoo-syntax-20160530.tar.gz 18950 BLAKE2B 0e769cb4d67ebf1b4299a1aa0dc1bc1ce942a9e6b4f3528b5499ff83ffe9d165697576901c5ba9cca52de6e26abd0298f1f7a5383cdc0c8ca1dff0de2945080c SHA512 38881c5f16499eb053eb7a5514f6324b2a161f1392a044db0bbaf0cb71a0f17e1edebd4a685ff856a78525fbcb8c6267daa2503cfbc6f94d841cf3f6a25045bd DIST gentoo-syntax-20170225.tar.gz 18939 BLAKE2B 7586b45791e74e69ad6e0607bc0a4d52eba4747a6c4d9933d43db1196ceb57ac6317279c9e86f77c71bdb7379828dd96fe6d63a2933a3660f1639faf1b6df5d5 SHA512 2c01577910eccd413b85c094dbd12bf8445e2f560be1fffc4a4c3130b32587f9c298d8442b5cf12bd7d2950ab8c9e5b95a72f2f41c42c6dc939ffa2c26fd71d5 +DIST gentoo-syntax-20180814.tar.bz2 18337 BLAKE2B e2808ff4bab17378ac9a15270f32edb67c0a8f4a7e17757d9c128e186fe31add967c169aa9e62fd5fc95dfbadeab72e37c34a14a5452b80c0a1ceafd8bdec85a SHA512 a524a324e3bb1656b2dba9333e03bd130d3700791782d98fed57ea6065f398e4ad29f7980ad823940a44cd1f9f58244b8a908ef4aa3c82c0f7c46882005f358e diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20180814.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20180814.ebuild new file mode 100644 index 000000000000..badfc293470c --- /dev/null +++ b/app-vim/gentoo-syntax/gentoo-syntax-20180814.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit vim-plugin + +DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting" +HOMEPAGE="https://github.com/gentoo/gentoo-syntax" +SRC_URI="https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/${P}.tar.bz2" + +LICENSE="vim" +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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="ignore-glep31" + +VIM_PLUGIN_HELPFILES="gentoo-syntax" +VIM_PLUGIN_MESSAGES="filetype" + +src_prepare() { + default + if use ignore-glep31 ; then + for f in ftplugin/*.vim ; do + ebegin "Removing UTF-8 rules from ${f} ..." + sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \ + || die "waah! bad sed voodoo. need more goats." + eend $? + done + fi +} + +pkg_postinst() { + vim-plugin_pkg_postinst + + if [[ -z ${REPLACING_VERSIONS} ]] ; then + if use ignore-glep31 1>/dev/null ; then + ewarn "You have chosen to disable the rules which ensure GLEP 31" + ewarn "compliance. When editing ebuilds, please make sure you get" + ewarn "the character set correct." + fi + fi +} diff --git a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild index 1e9dad4bb4e4..a0f5c7b06870 100644 --- a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild +++ b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild @@ -3,19 +3,16 @@ EAPI=6 -inherit vim-plugin - -if [[ ${PV} == 9999* ]] ; then - EGIT_REPO_URI="https://github.com/gentoo/gentoo-syntax.git" - inherit git-r3 -else - SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi +inherit git-r3 vim-plugin DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting" HOMEPAGE="https://github.com/gentoo/gentoo-syntax" +EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-syntax.git + https://github.com/gentoo/gentoo-syntax.git" + LICENSE="vim" +SLOT="0" +KEYWORDS="" IUSE="ignore-glep31" VIM_PLUGIN_HELPFILES="gentoo-syntax" @@ -41,13 +38,6 @@ pkg_postinst() { ewarn "You have chosen to disable the rules which ensure GLEP 31" ewarn "compliance. When editing ebuilds, please make sure you get" ewarn "the character set correct." - else - elog "Note for developers and anyone else who edits ebuilds:" - elog " This release of gentoo-syntax now contains filetype rules to set" - elog " fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31." - elog " If you find this feature breaks things, please submit a bug and" - elog " assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE" - elog " flag to remove these rules." fi fi } diff --git a/app-vim/gentoo-syntax/metadata.xml b/app-vim/gentoo-syntax/metadata.xml index 374f1cd98d23..9390fa132f30 100644 --- a/app-vim/gentoo-syntax/metadata.xml +++ b/app-vim/gentoo-syntax/metadata.xml @@ -5,6 +5,10 @@ vim@gentoo.org Gentoo Vim Project + + mgorny@gentoo.org + Michał Górny + Remove GLEP 31 (UTF-8 file encodings) settings diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 708b17e17e23..435570756f05 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/gmime/gmime-2.6.23.ebuild b/dev-libs/gmime/gmime-2.6.23.ebuild index e9b4bef636fc..4a089f9280cb 100644 --- a/dev-libs/gmime/gmime-2.6.23.ebuild +++ b/dev-libs/gmime/gmime-2.6.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime SLOT="2.6" LICENSE="LGPL-2.1" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="doc mono smime static-libs test vala" RDEPEND=" diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index c8f76950a4e2..f405455302bb 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -6,8 +6,8 @@ DIST openssl-1.0.2o_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d46735 DIST openssl-1.0.2o_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e DIST openssl-1.1.0-build.patch 3028 BLAKE2B f8cf981ed3717af234ce02fa50f27cdbcbf2b766968a5957fc6f0a4ea997549505fa77398444d7f3b9a75f66048447fe62542b9cb1d5f0268add87c44915a6fd SHA512 b19a912900970052f80c67f28975e793ae9e70ebfc62efae0544e09931079e98c4cd29ce1cc8d937ceca97aff9a12fdc1ff9ce6c2b47fea68c79e7065464a0f0 DIST openssl-1.1.0-ec-curves.patch 2967 BLAKE2B 1c639514445ea85cf731732aa7901b5a03ddb5f637b0483ab2ec6825433ad978723c5a07316db684bdaca4a12fc673b4e049a49c0cd4dbe5f25a5e2bd3b75cf5 SHA512 8fb9c6759ae2077ad3697ba77e85ab3970fd8b3f64b21eb260b4f6333b7ebf2f5a53c7eee311229edfbd96a2b904ec5e5e00dfa5b62cf1105fece13069077bd2 -DIST openssl-1.1.0h.tar.gz 5422717 BLAKE2B 11de1468855c0bb1836fb346c8efdfedd06139a774fc4dbae1b0e95fea7a33aa39b541e3d2d27f83f2b5f4dd3846cca2356020aa6ec81793085842ab78b3a127 SHA512 fb7750fcd98e6126eb5b92e7ed63d811a5cfa3391d98572003d925f6c7b477690df86a9aa1fa6bf6bf33d02c6c7aee6cff50a38faa8911409f310645898fda39 -DIST openssl-1.1.0h_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879 -DIST openssl-1.1.0h_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36bd4570e6df07f246d1d823c7dbbeef492f25cdd0ebfd693f5956732bc84c9d91fc6a22c854fe4b245ecf3890bda SHA512 90cec9d46326cb7216236811c8e963032b6fa7500117cea36f28534eb50a5ab1260c7f9a5c8c490d845236b0769576a8d97bc7471f970e9c5e70cb3408c20dae -DIST openssl-1.1.0h_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 +DIST openssl-1.1.0i.tar.gz 5453234 BLAKE2B ae6bec9c116769d98a77165b96fb7d201fe2ede8ee98e3cb68eba496cc90a5fae38dbcbb68b824c9eeacb25605aa80c3ccca9b4f00725658da3ad646834b0f9d SHA512 4a9d454031f644a3072a980f4ea20df976f6c5c58178549dfa62fd4dcf1417509e3be517d2ccb265c87688836f2993531b142fc5971bac5c41d33060057627df +DIST openssl-1.1.0i_ec_curve.c 18393 BLAKE2B 49dca7ddbc23270e5927454925df7bb18c8d9eb58f79e3a4fbcd8b7fc22fad36e2cb54ff9b63c2beeeea15c0c075a96e4ce8d03991355419af41fa9dc2aed3ad SHA512 ee3e576825bccdf02cede4205ab92c42ae9dd3a8e75ce58617a3a5980a61d144eb3c5197d9dcd378a5d49bf34c4b2f591aa6a619fee92b7a22825d72681ab879 +DIST openssl-1.1.0i_ectest.c 29908 BLAKE2B b398bafd5d5aea71daa9c3e2749dece9e515950e35547a6191d83987907aae73e090a4b552636af4d1ab2b39f7e3b1ea3fde2012c99f068f9c99d247996c1212 SHA512 e4445f8959b040caca6a7494da2026b840f84348df5d4eab47a68570d274333f62fa0c381955093edd86c857dad98595ffa2980c54afdcf2a8d32f32d0c70450 +DIST openssl-1.1.0i_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 DIST openssl-1.1.1-pre8.tar.gz 8334954 BLAKE2B 97cd018908925abd5a4eb660b3488b23efb582dd49dd87504e5522b2e9c5c6500417ef4893590a60ce35cfa316de51bfbf3e448e9cb2a5858ecd8ae72722922d SHA512 33b20f8589e0ba67500993635e1ba7f7f7ce2b6fa1eb8d4d7c44711ff047045dde57ad7e0605377c2b030fc954a3fb9b1f1d68feac2080991ef2b1b72a761041 diff --git a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch b/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch deleted file mode 100644 index e7dfba43f2a5..000000000000 --- a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0732.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ea7abeeabf92b7aca160bdd0208636d4da69f4f4 Mon Sep 17 00:00:00 2001 -From: Guido Vranken -Date: Mon, 11 Jun 2018 19:38:54 +0200 -Subject: [PATCH] Reject excessively large primes in DH key generation. - -CVE-2018-0732 - -Signed-off-by: Guido Vranken - -(cherry picked from commit 91f7361f47b082ae61ffe1a7b17bb2adf213c7fe) - -Reviewed-by: Tim Hudson -Reviewed-by: Matt Caswell -(Merged from https://github.com/openssl/openssl/pull/6457) ---- - crypto/dh/dh_key.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c -index fce9ff47f36..58003d70878 100644 ---- a/crypto/dh/dh_key.c -+++ b/crypto/dh/dh_key.c -@@ -78,10 +78,15 @@ static int generate_key(DH *dh) - int ok = 0; - int generate_new_key = 0; - unsigned l; -- BN_CTX *ctx; -+ BN_CTX *ctx = NULL; - BN_MONT_CTX *mont = NULL; - BIGNUM *pub_key = NULL, *priv_key = NULL; - -+ if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) { -+ DHerr(DH_F_GENERATE_KEY, DH_R_MODULUS_TOO_LARGE); -+ return 0; -+ } -+ - ctx = BN_CTX_new(); - if (ctx == NULL) - goto err; diff --git a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0737.patch b/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0737.patch deleted file mode 100644 index 34c9cc02fa71..000000000000 --- a/dev-libs/openssl/files/openssl-1.1.0h-CVE-2018-0737.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 349a41da1ad88ad87825414752a8ff5fdd6a6c3f Mon Sep 17 00:00:00 2001 -From: Billy Brumley -Date: Wed, 11 Apr 2018 10:10:58 +0300 -Subject: [PATCH] RSA key generation: ensure BN_mod_inverse and BN_mod_exp_mont - both get called with BN_FLG_CONSTTIME flag set. - -CVE-2018-0737 - -Reviewed-by: Rich Salz -Reviewed-by: Matt Caswell -(cherry picked from commit 6939eab03a6e23d2bd2c3f5e34fe1d48e542e787) ---- - crypto/rsa/rsa_gen.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/crypto/rsa/rsa_gen.c b/crypto/rsa/rsa_gen.c -index 9ca5dfe..42b89a8 100644 ---- a/crypto/rsa/rsa_gen.c -+++ b/crypto/rsa/rsa_gen.c -@@ -156,6 +156,8 @@ static int rsa_builtin_keygen(RSA *rsa, int bits, BIGNUM *e_value, - if (BN_copy(rsa->e, e_value) == NULL) - goto err; - -+ BN_set_flags(rsa->p, BN_FLG_CONSTTIME); -+ BN_set_flags(rsa->q, BN_FLG_CONSTTIME); - BN_set_flags(r2, BN_FLG_CONSTTIME); - /* generate p and q */ - for (;;) { --- -2.7.4 - diff --git a/dev-libs/openssl/openssl-1.1.0h-r2.ebuild b/dev-libs/openssl/openssl-1.1.0i.ebuild similarity index 99% rename from dev-libs/openssl/openssl-1.1.0h-r2.ebuild rename to dev-libs/openssl/openssl-1.1.0i.ebuild index 5881fe74d35e..9cbb018e24ca 100644 --- a/dev-libs/openssl/openssl-1.1.0h-r2.ebuild +++ b/dev-libs/openssl/openssl-1.1.0i.ebuild @@ -56,8 +56,6 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - "${FILESDIR}"/${P}-CVE-2018-0737.patch - "${FILESDIR}"/${P}-CVE-2018-0732.patch ) src_prepare() { diff --git a/dev-libs/softhsm/Manifest b/dev-libs/softhsm/Manifest index 100a03a31732..4a3e518a95d7 100644 --- a/dev-libs/softhsm/Manifest +++ b/dev-libs/softhsm/Manifest @@ -1,2 +1 @@ -DIST softhsm-2.3.0.tar.gz 992417 BLAKE2B dcb462a7d50be465c306e2208d2d446879ec093ce3a3233e338ba4df3b29a4f70050cd10ff513bff70ef37f98341230d061d48273a6fc54b668804311cb11bf8 SHA512 ef9ee41aa6eaeeb004d4ff5c78ca6e00895cc47e36551025a4422806eee8eead985cfd28476a867761a810f6957b0759edaac769bcdedf4ad974e426cfefce0f DIST softhsm-2.4.0.tar.gz 1042566 BLAKE2B 01a0f4bdc589847c4a1f860c3e3f572644d874b11d7ab8e149e598fc123b75e898de9a46f73f5f2a107edcaeabdda29e4b9b6d54af5b95ad79a3c7b7b77b8bbf SHA512 f14f65de32206500f708523ee88d8d5e3d1fd40175f1a9cd24c7760c829e2de9dbcb05453022df8186836c49a57e4eae7f2e75ce6a5346a426114f4d610a8a84 diff --git a/dev-libs/softhsm/softhsm-2.3.0.ebuild b/dev-libs/softhsm/softhsm-2.3.0.ebuild deleted file mode 100644 index 52c594d46092..000000000000 --- a/dev-libs/softhsm/softhsm-2.3.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit ltprune - -DESCRIPTION="A software PKCS#11 implementation" -HOMEPAGE="https://www.opendnssec.org/" -SRC_URI="https://www.opendnssec.org/files/source/${P}.tar.gz" - -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="bindist libressl migration-tool test" -SLOT="2" -LICENSE="BSD" - -RDEPEND=" - sys-devel/gcc:=[cxx] - migration-tool? ( dev-db/sqlite:3 ) - !libressl? ( dev-libs/openssl:=[bindist=] ) - libressl? ( dev-libs/libressl ) - !=dev-libs/softhsm-2.0.0:0 -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-util/cppunit ) -" - -DOCS=( - NEWS - README.md -) - -src_configure() { - econf \ - --disable-static \ - --localstatedir="${EROOT}var" \ - --with-crypto-backend=openssl \ - --disable-p11-kit \ - $(use_enable !bindist ecc) \ - $(use_enable !libressl gost) \ - $(use_with migration-tool migrate) -} - -src_install() { - default - prune_libtool_files --modules -} diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 4b2ca146365f..c9139835a13a 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/pgasync/Manifest b/dev-python/pgasync/Manifest deleted file mode 100644 index 4b4633231546..000000000000 --- a/dev-python/pgasync/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pgasync-2.01.tar.gz 22314 BLAKE2B f38dd79aaacc5dcab815a575664c0052a95e2c9ecba6ff5849f787ed7ee3061a8edd60bd67fa2d33c7f01bdd9e1541281f5972ac14b667775fc6cfc814c155d9 SHA512 36916ce3dcebf82367eace8fd689e0d300ffc040250869794191bfb723053050c9766fa5ce251341c317f7fbab418ace4dc36345d5c73eea92c1d04d36e802af diff --git a/dev-python/pgasync/metadata.xml b/dev-python/pgasync/metadata.xml deleted file mode 100644 index 2f5f34d7943f..000000000000 --- a/dev-python/pgasync/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - pgsql-bugs@gentoo.org - PostgreSQL and Related Package Development - - - python@gentoo.org - Python - - diff --git a/dev-python/pgasync/pgasync-2.01-r1.ebuild b/dev-python/pgasync/pgasync-2.01-r1.ebuild deleted file mode 100644 index 272afddb3b93..000000000000 --- a/dev-python/pgasync/pgasync-2.01-r1.ebuild +++ /dev/null @@ -1,31 +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="An asynchronous API to PostgreSQL for twisted" -HOMEPAGE="https://github.com/jamwt/pgasync" -SRC_URI="http://www.jamwt.com/pgasync/files/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc" - -DEPEND="dev-python/twisted-core[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -DOCS="CHANGELOG PKG-INFO README TODO" - -src_install() { - distutils-r1_python_install_all - - if use doc; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest index a69648164b7c..a15160683c9d 100644 --- a/dev-python/psycopg/Manifest +++ b/dev-python/psycopg/Manifest @@ -1,7 +1 @@ -DIST psycopg-1.1.21.tar.gz 213753 BLAKE2B 679b4ba810ad7821c781e169baae1f62b6f926e2c115c88f0055404ecd266ed69beaea6151643984ec2bc5696a79ac02f23adcec727afe4e6b6e657740a1692c SHA512 2681e8b3c4873f69a1a07aa4d3908a42f8e8be9392adbed189fe72c1a601699ac08643d24454622baf4b26153ef3a687f27a941308368e2227cb98ff948322eb -DIST psycopg2-2.5.3.tar.gz 690689 BLAKE2B c1c070fc9acf5270f6bd711d457f162d2e5622a0cb40584d5b24cce441429c460aded278b67dbdf351605d710085c3e04ac63927d736c8d04ea27d21cccdea10 SHA512 88590c37be839e8cf5025b7ac40411c4682269700795c5f8f1b762966d906faf3f1ee85de35fc734a2d10c6a68d7fef569891bd96919bab809b9500625e2a41a -DIST psycopg2-2.6.2.tar.gz 376348 BLAKE2B 279f2fb905c3e3034d89535a8c1de3114ef87cbd7f4b32a54b38150ef1cb845ae9811b3d6f57a5f46042db47e6d5f2563e87c986cdb8a8799fe6d60580180cc3 SHA512 614314b5ab7ab5fa7c5e9c4f861579f90bd73521a9964dcb5a0938f77a9d6dfbea689cef35ad399cda698a45bb736c315912cb5dca85a52132f011d79f4863ac -DIST psycopg2-2.7.3.1.tar.gz 425069 BLAKE2B 4d34859c63217bad08374b0a8d03dbcba7711c1e8034eb106ba27211e85af148f51902e2d1b294e4c0ba4e798f4a64903d9d735605d09bbcb1d291ad23cfb4e0 SHA512 206d4cf62a091927daf4b734e0b3597399fc588cb738366711674fc06c39d68a682981bc4756c356d37c41caba49b5df2b915beace8670c190d7d41e374f1eb5 -DIST psycopg2-2.7.3.2.tar.gz 425107 BLAKE2B 47fe652d5e2e62c765150941d565b9ee896e221ae565e51745645f2723a0070481daf2f0d0d1a1fbd741b5b536c12cdf892becb4d5d4283a26cd324cd02c47c6 SHA512 38460369e339b16e433328e9bd6ccdbb4b03e41d40b9fb453a54513af4ec43f0a72dc795de6eb13d9618e1d5636991d3de7f619459b3f21d070798d497b2776f -DIST psycopg2-2.7.3.tar.gz 425004 BLAKE2B df405ca5b5f5887fbd166523cafd5686a9148b313b7c30a85dbfc5dec42aff426505993f42a18d6d60569deb17a5748a858737a139d74943e66bce8bdd12beb3 SHA512 9e673f47190b12ab31e783a3d2b464231b933cc6ad4f12742c457020aab5db36b83829d84b4e63f793f5567e689081fd9479bfc4634b7bb08c7d873a3f42efc9 DIST psycopg2-2.7.4.tar.gz 425331 BLAKE2B 9d256ea340e4bace53981596d9d42863ddc9c8c079579b0621d8043af34daade05b9cec5465c6b3990f537a4350d9cf60a43062a0aa34db1f39b336296b32d3f SHA512 e78db528a4d3b897e0d8d38755179082dacddfb2d10bda963fc3836548991eaa0d4c1b8f81b329b15f4e685046c39e6f2a352b6c47b1da42af3a262094233034 diff --git a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild b/dev-python/psycopg/psycopg-1.1.21-r1.ebuild deleted file mode 100644 index 84902f8172ed..000000000000 --- a/dev-python/psycopg/psycopg-1.1.21-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools-utils python-r1 - -DESCRIPTION="PostgreSQL database adapter for Python" -HOMEPAGE="http://www.initd.org/software/psycopg" -SRC_URI="http://initd.org/pub/software/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -IUSE="examples" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=">=dev-python/egenix-mx-base-2.0.3[${PYTHON_USEDEP}] - dev-db/postgresql:* - ${PYTHON_DEPS}" -DEPEND="${RDEPEND}" - -src_prepare() { - # fix for bug #134873 - sed -e '1245s/static //' -i cursor.c || die - sed -e 's:$(PY_MOD_DIR):$(D)&/$$mod:' \ - -e '/^CFLAGS/s:-I:-I. &:' \ - -i Makefile.pre.in || die - - autotools-utils_src_prepare -} - -src_configure() { - python_configure() { - local myeconfargs=( - --with-mxdatetime-includes="$(python_get_includedir)/mx" - --with-postgres-includes="/usr/include/postgresql/server" - ) - - autotools-utils_src_configure - - sed -e 's:$(BLDSHARED):& $(LDFLAGS):' \ - -i "${BUILD_DIR}"/Makefile || die - } - python_foreach_impl python_configure -} - -src_compile() { - python_foreach_impl autotools-utils_src_compile \ - OPT="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_test() { - : -} - -src_install () { - python_install() { - dodir "$(python_get_sitedir)" - autotools-utils_src_install - } - - python_foreach_impl python_install - - dodoc RELEASE-1.0 SUCCESS doc/python-taylor.txt - - if use examples; then - dodoc -r doc/examples - docompress -x /usr/share/doc/${PF}/examples - fi -} diff --git a/dev-python/psycopg/psycopg-2.5.3.ebuild b/dev-python/psycopg/psycopg-2.5.3.ebuild deleted file mode 100644 index ac8962ba17d1..000000000000 --- a/dev-python/psycopg/psycopg-2.5.3.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# 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 flag-o-matic - -MY_PN="${PN}2" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="PostgreSQL database adapter for Python" -HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc examples" - -RDEPEND=">=dev-db/postgresql-8.1:*" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -python_compile() { - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - - [[ ${EPYTHON} != python3* ]] && append-flags -fno-strict-aliasing - - distutils-r1_python_compile -} - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-2.4.2-setup.py.patch" - ) - - if use debug; then - sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc -j1 html text -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc doc/{HACKING,SUCCESS} - - if use doc; then - dodoc doc/psycopg2.txt - dohtml -r doc/html/. - fi - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r examples/. - fi -} diff --git a/dev-python/psycopg/psycopg-2.6.2.ebuild b/dev-python/psycopg/psycopg-2.6.2.ebuild deleted file mode 100644 index 7ea236693333..000000000000 --- a/dev-python/psycopg/psycopg-2.6.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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 flag-o-matic - -MY_PN="${PN}2" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="PostgreSQL database adapter for Python" -HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc examples" - -RDEPEND=">=dev-db/postgresql-8.1:*" -DEPEND="${RDEPEND} - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - >=dev-python/python-docs-2.7.6-r1:2.7 - )" - -RESTRICT="test" -# Remove py3.2 entry from intersphinx setting -PATCHES=( "${FILESDIR}/"${PN}-2.4.2-setup.py.patch ) - -S="${WORKDIR}/${MY_P}" - -python_compile() { - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - - ! python_is_python3 && append-flags -fno-strict-aliasing - - distutils-r1_python_compile -} - -python_prepare_all() { - if use debug; then - sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die - fi - - # Source local copy of objects.inv - if use doc; then - local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) - local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" - local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" - local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" - sed -e "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \ - -e "/^ 'py3':/d" -i doc/src/conf.py || die - einfo "conf.py patched" - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc/src -j1 html text -} - -python_install_all() { - if use doc; then - dohtml -r doc/src/_build/html/. - fi - - use examples && local EXAMPLES=( examples/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/psycopg/psycopg-2.7.3.1.ebuild b/dev-python/psycopg/psycopg-2.7.3.1.ebuild deleted file mode 100644 index 8a3497f27e7f..000000000000 --- a/dev-python/psycopg/psycopg-2.7.3.1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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 flag-o-matic - -MY_PN="${PN}2" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="PostgreSQL database adapter for Python" -HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc examples" - -RDEPEND=">=dev-db/postgresql-8.1:*" -DEPEND="${RDEPEND} - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - >=dev-python/python-docs-2.7.6-r1:2.7 - )" - -RESTRICT="test" -# Remove py3.2 entry from intersphinx setting -PATCHES=( ) - -S="${WORKDIR}/${MY_P}" - -python_compile() { - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - - ! python_is_python3 && append-flags -fno-strict-aliasing - - distutils-r1_python_compile -} - -python_prepare_all() { - if use debug; then - sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die - fi - - # Source local copy of objects.inv - if use doc; then - local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) - local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" - local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" - local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" - sed -e "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \ - -e "/^ 'py3':/d" -i doc/src/conf.py || die - einfo "conf.py patched" - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc/src -j1 html text -} - -python_install_all() { - if use doc; then - dohtml -r doc/src/_build/html/. - fi - - use examples && local EXAMPLES=( examples/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/psycopg/psycopg-2.7.3.2.ebuild b/dev-python/psycopg/psycopg-2.7.3.2.ebuild deleted file mode 100644 index 644e9d4faba6..000000000000 --- a/dev-python/psycopg/psycopg-2.7.3.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2018 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 - -MY_PN="${PN}2" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="PostgreSQL database adapter for Python" -HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc examples" - -RDEPEND=">=dev-db/postgresql-8.1:*" -DEPEND="${RDEPEND} - doc? ( - >=dev-python/pygments-2.2[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.6[${PYTHON_USEDEP}] - )" - -RESTRICT="test" - -# Avoid using mxdatetime: https://bugs.gentoo.org/452028 -# Fixes build error with sphinx: https://bugs.gentoo.org/634730 -PATCHES=( - "${FILESDIR}"/psycopg-2.7.3-avoid-mxdatetime.patch - "${FILESDIR}"/psycopg-2.7.3-sphinx-1.6.patch -) - -S="${WORKDIR}/${MY_P}" - -python_compile() { - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - - ! python_is_python3 && append-flags -fno-strict-aliasing - - distutils-r1_python_compile -} - -python_prepare_all() { - if use debug; then - sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc/src html text -} - -python_install_all() { - if use doc; then - dodoc -r doc/src/_build/html - dodoc doc/src/_build/text/* - fi - - 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/psycopg/psycopg-2.7.3.ebuild b/dev-python/psycopg/psycopg-2.7.3.ebuild deleted file mode 100644 index 8e45da307aad..000000000000 --- a/dev-python/psycopg/psycopg-2.7.3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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 flag-o-matic - -MY_PN="${PN}2" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="PostgreSQL database adapter for Python" -HOMEPAGE="http://initd.org/psycopg/ https://pypi.org/project/psycopg2/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="LGPL-3+" -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc examples" - -RDEPEND=">=dev-db/postgresql-8.1:*" -DEPEND="${RDEPEND} - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - >=dev-python/python-docs-2.7.6-r1:2.7 - )" - -RESTRICT="test" -# Remove py3.2 entry from intersphinx setting -PATCHES=( ) - -S="${WORKDIR}/${MY_P}" - -python_compile() { - local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS} - - ! python_is_python3 && append-flags -fno-strict-aliasing - - distutils-r1_python_compile -} - -python_prepare_all() { - if use debug; then - sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die - fi - - # Source local copy of objects.inv - if use doc; then - local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7) - local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}" - local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html" - local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv" - sed -e "s|'http://docs.python.org/', None|'${PYTHON_DOC}', '${PYTHON_DOC_INVENTORY}'|" \ - -e "/^ 'py3':/d" -i doc/src/conf.py || die - einfo "conf.py patched" - fi - - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc/src -j1 html text -} - -python_install_all() { - if use doc; then - dohtml -r doc/src/_build/html/. - fi - - use examples && local EXAMPLES=( examples/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/python-debian/python-debian-0.1.32.ebuild b/dev-python/python-debian/python-debian-0.1.32.ebuild index 03133f9a7a5e..609ae77ac717 100644 --- a/dev-python/python-debian/python-debian-0.1.32.ebuild +++ b/dev-python/python-debian/python-debian-0.1.32.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy ) inherit distutils-r1 diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest index 322c808f62aa..e07e5f121128 100644 --- a/dev-python/spyder/Manifest +++ b/dev-python/spyder/Manifest @@ -1,3 +1,5 @@ DIST spyder-3.2.4.tar.gz 3345797 BLAKE2B 2df946f257fee7e87dd922b6ed3b3c0fa02438560cb7fa4087f25498eb134bfc8c342a0a928be37f08448dfea2917380a8521ead13954091b1854616012ace91 SHA512 46e89c68545695d1e64aaafdd2ed724b152a41088f1bfa645b8c66d8ae6bcc2d86e9830cd3f16edfb8027aad5786dfb67f2a8371839dd515df8ebe34446716e6 DIST spyder-3.2.8.tar.gz 3414627 BLAKE2B 95f85f719eba20eb9fed5183cfac582b040abc93724df512188d14167a1663c5be9906dfc499feda9f8b0d7a713c093dbf98e4f20f732e0e9669397e1b7c8482 SHA512 03dea90632af510cfc8c4cc684068213a54dac9eef671f04c83663dd40eb480a4b818e2d040efa7a78a0d17044018aa76f2931abbf344eb684094fc7a86ddf5e DIST spyder-3.3.0.tar.gz 2782654 BLAKE2B e85ef52109c723d6b1b011f0e81ab3a46d3e0e6ba72fd34a1eda9ed650c9e03532e8fd72e05365367f62035a6f03d6ec32d35314c54438bf639070c7bebfb4d6 SHA512 53a2b438afe245092eda4d202d2453b5b93d6682aafcdb00bf251ddcdb30cee2d81d8adadbe23fa36f64fa5f917b327690cb8f9e2cf5c0da2841b5eda648a26f +DIST spyder-3.3.1.tar.gz 2786730 BLAKE2B d906b5750cb620db41aec514a64d132b9ee5a992047828faffe11af5abd22d0cec7b876dfe79c6d378804373e8db5c661214f5730833e7599bf13b80d4dc16d6 SHA512 91d648a2717b5d5386115ba800fdd98884e609b213007dbaa09c7d16335f1b9ec3d0bc6b32d1677db8c2704e990e70eaa04d6d1efc800008cddfa511105e9c68 +DIST spyder-4.0.0b1.tar.gz 2986758 BLAKE2B 7fa918a569ed26d1d71ea7bce725f1b7d5db54badf3fb7bad1265d93f2ebdf25b1246acefb4f8517a6f34968bf8f12331958afcf72fc3c162e0d06d9dc4d4c72 SHA512 5751434b7ffac4d1e0c535f8a842656c3a306ed3d8a275a06a0eb57d3cd9bb36d01341723159292cba8616fcadc7157387fdb334b2ab0efbc1bb6b920102015a diff --git a/dev-python/spyder/files/spyder-3.3.1-build.patch b/dev-python/spyder/files/spyder-3.3.1-build.patch new file mode 100644 index 000000000000..1561dbdcc1e1 --- /dev/null +++ b/dev-python/spyder/files/spyder-3.3.1-build.patch @@ -0,0 +1,49 @@ +diff -r -U3 spyder-3.3.1.orig/setup.py spyder-3.3.1/setup.py +--- spyder-3.3.1.orig/setup.py 2018-08-10 10:46:02.000000000 +0700 ++++ spyder-3.3.1/setup.py 2018-08-14 19:16:10.921323804 +0700 +@@ -83,12 +83,7 @@ + def get_data_files(): + """Return data_files in a platform dependent manner""" + if sys.platform.startswith('linux'): +- if PY3: +- data_files = [('share/applications', ['scripts/spyder3.desktop']), +- ('share/icons', ['img_src/spyder3.png']), +- ('share/metainfo', ['scripts/spyder3.appdata.xml'])] +- else: +- data_files = [('share/applications', ['scripts/spyder.desktop']), ++ data_files = [('share/applications', ['scripts/spyder.desktop']), + ('share/icons', ['img_src/spyder.png'])] + elif os.name == 'nt': + data_files = [('scripts', ['img_src/spyder.ico', +@@ -112,21 +107,6 @@ + + + #============================================================================== +-# Make Linux detect Spyder desktop file +-#============================================================================== +-class MyInstallData(install_data): +- def run(self): +- install_data.run(self) +- if sys.platform.startswith('linux'): +- try: +- subprocess.call(['update-desktop-database']) +- except: +- print("ERROR: unable to update desktop database", +- file=sys.stderr) +-CMDCLASS = {'install_data': MyInstallData} +- +- +-#============================================================================== + # Main scripts + #============================================================================== + # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows +@@ -210,8 +190,7 @@ + 'Intended Audience :: Science/Research', + 'Intended Audience :: Developers', + 'Topic :: Scientific/Engineering', +- 'Topic :: Software Development :: Widget Sets'], +- cmdclass=CMDCLASS) ++ 'Topic :: Software Development :: Widget Sets']) + + + #============================================================================== diff --git a/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch b/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch new file mode 100644 index 000000000000..2b0f9bc699f3 --- /dev/null +++ b/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch @@ -0,0 +1,49 @@ +diff -r -U3 spyder-4.0.0b1.orig/setup.py spyder-4.0.0b1/setup.py +--- spyder-4.0.0b1.orig/setup.py 2018-08-12 04:35:49.000000000 +0700 ++++ spyder-4.0.0b1/setup.py 2018-08-14 20:25:32.827148778 +0700 +@@ -83,12 +83,7 @@ + def get_data_files(): + """Return data_files in a platform dependent manner""" + if sys.platform.startswith('linux'): +- if PY3: +- data_files = [('share/applications', ['scripts/spyder3.desktop']), +- ('share/icons', ['img_src/spyder3.png']), +- ('share/metainfo', ['scripts/spyder3.appdata.xml'])] +- else: +- data_files = [('share/applications', ['scripts/spyder.desktop']), ++ data_files = [('share/applications', ['scripts/spyder.desktop']), + ('share/icons', ['img_src/spyder.png'])] + elif os.name == 'nt': + data_files = [('scripts', ['img_src/spyder.ico', +@@ -112,21 +107,6 @@ + + + #============================================================================== +-# Make Linux detect Spyder desktop file +-#============================================================================== +-class MyInstallData(install_data): +- def run(self): +- install_data.run(self) +- if sys.platform.startswith('linux'): +- try: +- subprocess.call(['update-desktop-database']) +- except: +- print("ERROR: unable to update desktop database", +- file=sys.stderr) +-CMDCLASS = {'install_data': MyInstallData} +- +- +-#============================================================================== + # Main scripts + #============================================================================== + # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows +@@ -210,8 +190,7 @@ + 'Intended Audience :: Science/Research', + 'Intended Audience :: Developers', + 'Topic :: Scientific/Engineering', +- 'Topic :: Software Development :: Widget Sets'], +- cmdclass=CMDCLASS) ++ 'Topic :: Software Development :: Widget Sets']) + + + #============================================================================== diff --git a/dev-python/spyder/spyder-3.3.1.ebuild b/dev-python/spyder/spyder-3.3.1.ebuild new file mode 100644 index 000000000000..a6d1a67a4d36 --- /dev/null +++ b/dev-python/spyder/spyder-3.3.1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) + +inherit eutils distutils-r1 xdg-utils + +DESCRIPTION="The Scientific PYthon Development EnviRonment" +HOMEPAGE=" + https://www.spyder-ide.org/ + https://github.com/spyder-ide/spyder/ + https://pypi.org/project/spyder/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="hdf5 +webengine webkit" +REQUIRED_USE="webengine? ( !webkit )" + +RDEPEND=" + hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] ) + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/cloudpickle[${PYTHON_USEDEP}] + dev-python/jedi[${PYTHON_USEDEP}] + dev-python/nbconvert[${PYTHON_USEDEP}] + dev-python/pycodestyle[${PYTHON_USEDEP}] + dev-python/pickleshare[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyflakes[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/pylint[${PYTHON_USEDEP}] + dev-python/PyQt5[${PYTHON_USEDEP},svg,webengine?,webkit?] + dev-python/pyzmq[${PYTHON_USEDEP}] + >=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}] + dev-python/qtconsole[${PYTHON_USEDEP}] + dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?] + >=dev-python/rope-0.10.7[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/numpydoc[${PYTHON_USEDEP}] + (9 Jul 2018) -# Hasn’t been updated in years, upstream’s download source is blank, and depends -# on an outdated twisted-core (Bug 660668). Removal after 2018-08-08. -dev-python/pgasync - # Louis Sautier (8 July 2018) # Superseded, respectively by dev-python/setuptools_scm # and dev-python/jaraco-* + dev-python/tempora. diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 7531758c786d..9eef4269702b 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -506,6 +506,7 @@ app-emulation/ganeti:restricted-commands - Enable restricted commands in the nod app-emulation/ganeti:xen - Enable Xen support app-emulation/hyperd:libvirt - Enable support for KVM via libvirt app-emulation/hyperd:xen - Enable support for the Xen Hypervisor +app-emulation/libcacard:passthrough - Enable smartcard passthrough support via sys-apps/pcsc-lite app-emulation/libguestfs:erlang - Build Erlang bindings app-emulation/libguestfs:fuse - Enable image mount support via fuse app-emulation/libguestfs:inspect-icons - Use media-gfx/icoutilsfor acces icon file in image and inspect it @@ -8238,6 +8239,7 @@ sys-fs/udisks:gptfdisk - Pull in sys-apps/gptfdisk for sgdisk command as used by sys-fs/udisks:lvm - Add support for Logical Volume Management via sys-fs/lvm2. sys-fs/udisks:remote-access - Control whether connections from other clients over LAN are allowed sys-fs/udisks:systemd - Support sys-apps/systemd's logind +sys-fs/udisks:vdo - Enable Virtual Data Optimizer support. sys-fs/zfs:kernel-builtin - Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree sys-fs/zfs:rootfs - Enable dependencies required for booting off a pool containing a rootfs sys-fs/zfs:test-suite - Install regression test suite diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 87ffd8e33324..adddc9f32b82 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest index a46369abfcfd..035461c44d08 100644 --- a/sys-apps/fwupd/Manifest +++ b/sys-apps/fwupd/Manifest @@ -1,2 +1,3 @@ DIST fwupd-1.0.8.tar.gz 1584132 BLAKE2B 7744d14a02bd9847c0c1efe8ff8365abccf9d5213150687815d3e1236844ec71dbf161e5f5d7be32103c3613640680b5b2a017f1a60a30df93fc55bf5d765f74 SHA512 11bdc1dd77697b690e849bde59e54cf289cde32f410f9f7e8911a874f0a265b091ac2e335f784f54b64f835f2750a63a74092cc5eaf7a6c70eaa6d06995d131e DIST fwupd-1.1.0.tar.gz 1636214 BLAKE2B 492c33eb54852dd7d73f511dd6e5aa222b35e1898105bbfb291e1095c3968101597185cff2a1889e9da5728fdd0c8d4638e7e2102b12cf7659a1b6612ca0e9b7 SHA512 058d4564cf922b5056f6197261d77b97db7238a1658d69d9b29bec70a44542a5a131071935747e0cc963661a61b242ca98375ed8da920f819d37a706aec0c2ae +DIST fwupd-1.1.1.tar.gz 1669430 BLAKE2B 92073f1e3b6c6b68da48de792d58d218c0b0bfce2a3765c257253d6fb93974dccadc2ae71ab6275d0e9ad6775642eba1e2613ad2a3f11cd4d4225affdedc7561 SHA512 b825b565b6c85bbf703352eb0aff40de8e348c96537316373de718faf82bbdd425ba1b8091d1ab4b5403f2fbe46ceda45a502a5fea4ad3bd51e6cc5a2aad6ddc diff --git a/sys-apps/fwupd/fwupd-1.1.1.ebuild b/sys-apps/fwupd/fwupd-1.1.1.ebuild new file mode 100644 index 000000000000..0b779394a532 --- /dev/null +++ b/sys-apps/fwupd/fwupd-1.1.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Package requires newer meson than eclass provides +MESON_AUTO_DEPEND="no" +PYTHON_COMPAT=( python3_4 python3_5 python3_6 ) + +inherit meson python-single-r1 vala xdg-utils + +DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable" +HOMEPAGE="https://fwupd.org" +SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="colorhug dell doc gpg +man pkcs7 redfish systemd test uefi" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + dell? ( uefi ) +" + +RDEPEND=" + ${PYTHON_DEPS} + app-arch/libarchive:= + dev-db/sqlite + >=dev-libs/appstream-glib-0.7.4:=[introspection] + >=dev-libs/glib-2.45.8:2 + dev-libs/libgpg-error + dev-libs/libgudev:= + >=dev-libs/libgusb-0.2.9[introspection] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] + >=net-libs/libsoup-2.51.92:2.4[introspection] + >=sys-auth/polkit-0.103 + virtual/libelf:0= + colorhug? ( >=x11-misc/colord-1.2.12:0= ) + dell? ( + sys-libs/efivar + >=sys-libs/libsmbios-2.4.0 + ) + gpg? ( + app-crypt/gpgme + dev-libs/libgpg-error + ) + pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) + redfish? ( + dev-libs/json-glib + sys-libs/efivar + ) + systemd? ( >=sys-apps/systemd-211 ) + !systemd? ( >=sys-auth/consolekit-1.0.0 ) + uefi? ( + media-libs/fontconfig + media-libs/freetype + sys-boot/gnu-efi + >=sys-libs/efivar-33 + x11-libs/cairo + ) +" +DEPEND=" + ${RDEPEND} + app-arch/gcab + app-arch/libarchive + >=dev-util/meson-0.41.0 + >=dev-util/ninja-1.7.2 + virtual/pkgconfig + $(vala_depend) + doc? ( dev-util/gtk-doc ) + man? ( app-text/docbook-sgml-utils ) + test? ( net-libs/gnutls[tools] ) +" + +# required for fwupd daemon to run. +# NOT a build time dependency. The build system does not check for dbus. +PDEPEND="sys-apps/dbus" + +src_prepare() { + default + sed -e "s/'--create'/'--absolute-name', '--create'/" \ + -i data/tests/builder/meson.build || die + sed -e "/'-Werror',/d" \ + -i plugins/uefi/efi/meson.build || die + vala_src_prepare +} + +src_configure() { + xdg_environment_reset + local emesonargs=( + -Dconsolekit="$(usex systemd false true)" + -Dgpg="$(usex gpg true false)" + -Dgtkdoc="$(usex doc true false)" + -Dman="$(usex man true false)" + -Dpkcs7="$(usex pkcs7 true false)" + -Dplugin_dell="$(usex dell true false)" + -Dplugin_redfish="$(usex redfish true false)" + -Dplugin_synaptics="$(usex dell true false)" + # requires libtbtfwu which is not packaged (yet?) + -Dplugin_thunderbolt=false + -Dplugin_uefi="$(usex uefi true false)" + -Dsystemd="$(usex systemd true false)" + -Dtests="$(usex test true false)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + doinitd "${FILESDIR}"/${PN} +} + +pkg_postinst() { + elog "In case you are using openrc as init system" + elog "and you're upgrading from Add support for Logical Volume Management via sys-fs/lvm2. Control whether connections from other clients over LAN are allowed Support sys-apps/systemd's logind + Enable Virtual Data Optimizer support. diff --git a/sys-fs/udisks/udisks-2.7.6.ebuild b/sys-fs/udisks/udisks-2.8.0.ebuild similarity index 92% rename from sys-fs/udisks/udisks-2.7.6.ebuild rename to sys-fs/udisks/udisks-2.8.0.ebuild index 30c3252db0b0..a8b3f798e510 100644 --- a/sys-fs/udisks/udisks-2.7.6.ebuild +++ b/sys-fs/udisks/udisks-2.8.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit bash-completion-r1 eutils linux-info systemd udev xdg-utils +inherit bash-completion-r1 linux-info systemd udev xdg-utils DESCRIPTION="Daemon providing interfaces to work with storage devices" HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}. LICENSE="GPL-2" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="acl debug elogind +introspection lvm nls selinux systemd" +IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo" REQUIRED_USE="?? ( elogind systemd )" @@ -19,7 +19,7 @@ COMMON_DEPEND=" >=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 - >=sys-libs/libblockdev-2.14[cryptsetup,lvm?] + >=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?] >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) @@ -87,13 +87,14 @@ src_configure() { $(use_enable lvm lvm2) $(use_enable lvm lvmcache) $(use_enable nls) + $(use_enable vdo) ) econf "${myeconfargs[@]}" } src_install() { default - prune_libtool_files + find "${ED}" -name "*.la" -delete || die keepdir /var/lib/udisks2 #383091 rm -rf "${ED%/}"/usr/share/bash-completion diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz index a0307f989480..49757a8b9d6c 100644 Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest index f5084862c9e2..3e422d1ce559 100644 --- a/sys-process/psmisc/Manifest +++ b/sys-process/psmisc/Manifest @@ -1,2 +1,2 @@ -DIST psmisc-22.21.tar.gz 457702 BLAKE2B 7e81b695546c3dca6e1ade47bd1cd736ad434eb964608ead3e7d5a3b97f6d3d6c927e8e13ee525e716b66067e5a1573c4f0b8434540b9c66aac6e6b8f15bcfde SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae DIST psmisc-23.1.tar.xz 296136 BLAKE2B e53f7b80f1106622d652dad772d4236a62a1eb58e277f078cf0392d5a0bd7963c66805e28f6d1300999f2e2e5dcb692b1ecb3f6d39cefa77ebbc87302cd730be SHA512 f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95 +DIST psmisc-23.2.tar.xz 298784 BLAKE2B 61d1ad385f176cbe3ca0edcdd41ed026ab52aca4190c31551392cf83d0bf293de22899b13238d7ebeb1627013a2dc734ca91ad7a0a313c9d92b7af662728bf21 SHA512 114dc4d9a4d66374ee75cd6c845230c24540aa1d7562253c6fd5695552698afcf3e2ad2d7e9675addc63201f7e6d9e697287c72a638705194155bec508211dc3 diff --git a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch b/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch deleted file mode 100644 index 5c5fd990f9ca..000000000000 --- a/sys-process/psmisc/files/psmisc-22.21-fuser_typo_fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3638cc55b4d08851faba46635d737b24d016665b Mon Sep 17 00:00:00 2001 -From: Brad Jorsch -Date: Fri, 28 Feb 2014 21:55:02 +1100 -Subject: [PATCH] Typo in fuser makes -M on all the time - -Brad found that fuser had the -M option on all the time. -A simple but significant typo caused this, thanks the the patch. - -Bug-Debian: http://bugs.debian.org/740275 - -Signed-off-by: Craig Small ---- - ChangeLog | 4 ++++ - src/fuser.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index fd1cccf..e5f784c 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,7 @@ -+Changes in 22.22 -+================ -+ * Fixed typo in fuser which has -M on Debian #740275 -+ - Changes in 22.21 - ================ - * Missing comma in fuser(1) added Debian #702391 -diff --git a/src/fuser.c b/src/fuser.c -index b485f65..389b302 100644 ---- a/src/fuser.c -+++ b/src/fuser.c -@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[]) - usage(_("No process specification given")); - - /* Check if -M flag was used and if so check mounts */ -- if (opts * OPT_ISMOUNTPOINT) { -+ if (opts & OPT_ISMOUNTPOINT) { - check_mountpoints(&mounts, &names_head, &names_tail); - } - --- -2.2.2 - diff --git a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch b/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch deleted file mode 100644 index 440c5e62e7ed..000000000000 --- a/sys-process/psmisc/files/psmisc-22.21-sysmacros.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 367886e1c49238d1a02721f849564d77a163465b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 7 Mar 2016 14:52:22 -0500 -Subject: [PATCH] fuser: include sysmacros.h for makedev - -BSD/Linux define makedev in the sysmacros.h header. Include it directly -instead of relying on types.h pulling it in for us. ---- - src/fuser.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/fuser.c b/src/fuser.c -index da94d22..380046f 100644 ---- a/src/fuser.c -+++ b/src/fuser.c -@@ -36,6 +36,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.6.2 - diff --git a/sys-process/psmisc/psmisc-22.21-r3.ebuild b/sys-process/psmisc/psmisc-22.21-r3.ebuild deleted file mode 100644 index 1414df7d9b49..000000000000 --- a/sys-process/psmisc/psmisc-22.21-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="A set of tools that use the proc filesystem" -HOMEPAGE="http://psmisc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="ipv6 nls selinux X" - -RDEPEND=">=sys-libs/ncurses-5.7-r7:0= - nls? ( virtual/libintl ) - selinux? ( sys-libs/libselinux )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2.2.6b - nls? ( sys-devel/gettext )" - -DOCS="AUTHORS ChangeLog NEWS README" - -PATCHES=( - "${FILESDIR}/${P}-fuser_typo_fix.patch" - "${FILESDIR}/${P}-sysmacros.patch" -) - -src_prepare() { - epatch "${PATCHES[@]}" -} - -src_configure() { - econf \ - $(use_enable selinux) \ - --disable-harden-flags \ - $(use_enable ipv6) \ - $(use_enable nls) -} - -src_compile() { - # peekfd is a fragile crap hack #330631 - nonfatal emake -C src peekfd || touch src/peekfd{.o,} - emake -} - -src_install() { - default - - use X || rm -f "${ED}"/usr/bin/pstree.x11 - - [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd - [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1 - - # fuser is needed by init.d scripts; use * wildcard for #458250 - dodir /bin - mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die -} diff --git a/sys-process/psmisc/psmisc-23.1.ebuild b/sys-process/psmisc/psmisc-23.2.ebuild similarity index 77% rename from sys-process/psmisc/psmisc-23.1.ebuild rename to sys-process/psmisc/psmisc-23.2.ebuild index e25d09501c93..b30a176a38e0 100644 --- a/sys-process/psmisc/psmisc-23.1.ebuild +++ b/sys-process/psmisc/psmisc-23.2.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=6 DESCRIPTION="A set of tools that use the proc filesystem" HOMEPAGE="http://psmisc.sourceforge.net/" @@ -25,10 +23,10 @@ DOCS=( AUTHORS ChangeLog NEWS README ) src_configure() { local myeconfargs=( - $(use_enable selinux) --disable-harden-flags $(use_enable ipv6) $(use_enable nls) + $(use_enable selinux) ) econf "${myeconfargs[@]}" } @@ -42,12 +40,12 @@ src_compile() { src_install() { default - use X || rm -f "${ED}"/usr/bin/pstree.x11 + use X || rm -f "${ED%/}"/usr/bin/pstree.x11 - [[ -s ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/bin/peekfd - [[ -e ${ED}/usr/bin/peekfd ]] || rm -f "${ED}"/usr/share/man/man1/peekfd.1 + [[ -s ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/bin/peekfd + [[ -e ${ED%/}/usr/bin/peekfd ]] || rm -f "${ED%/}"/usr/share/man/man1/peekfd.1 # fuser is needed by init.d scripts; use * wildcard for #458250 dodir /bin - mv "${ED}"/usr/bin/*fuser "${ED}"/bin || die + mv "${ED%/}"/usr/bin/*fuser "${ED%/}"/bin || die } diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index 600581db03ac..f9d41069b440 100644 Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest index 2c966e3558ed..e73dbede4367 100644 --- a/www-client/opera-developer/Manifest +++ b/www-client/opera-developer/Manifest @@ -1,2 +1,2 @@ -DIST opera-developer_56.0.3026.0_amd64.deb 59316648 BLAKE2B be1cb1abc97b32f9e323b49378d6d626b58aedcb5c529e77cabfebe65cd0e6dfaba0f26a7e90c2910a7468a3958a70cb538aa1ec886c5a60fa8ae77ce9c4b1c1 SHA512 dbc1ddfcc3f6914ab157ba56db60398a73d16e42b5c7a2d6452b0707acdade74060a1832dd2eda28c38c0363340b5185fd50cc01bcc0e7a199d4c154c3fe9817 DIST opera-developer_56.0.3037.0_amd64.deb 55910568 BLAKE2B cdec28a3437084a1fdabdf39ad23db2ca913558c2e73fcb744c22873683b628543312fbf4eb68d5d82fedb4444e88b6016c23f6f4a4f47273e62b9af5f65baa6 SHA512 6a47a2a89d9b54c35df14eb99226685517b27b3adfea482280eb4eb77e1560f7c91a3409f964ed1f708ec680ada14fe6255da6228e83c677bd175144526eb3cf +DIST opera-developer_56.0.3045.0_amd64.deb 56118952 BLAKE2B 670a42c8be66b79ec134dd43e508b872cf68af8273bc87d38d422df5f8ab2f6fbaf6d564cae2334862b5866e1ecaf3e4e937893f18348404a833dcf35d338e08 SHA512 a07fc096a8abfbf4d52de490e98bacc644c3978b44da677dde32183a36d2efe0e2fa4a6d67f2d1bbf10c00381c86d33a91387e0fb4c5d53bd576bbcca4c3e34e diff --git a/www-client/opera-developer/opera-developer-56.0.3026.0.ebuild b/www-client/opera-developer/opera-developer-56.0.3045.0.ebuild similarity index 100% rename from www-client/opera-developer/opera-developer-56.0.3026.0.ebuild rename to www-client/opera-developer/opera-developer-56.0.3045.0.ebuild