diff options
69 files changed, 283 insertions, 2806 deletions
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest index df3d85b7bc51..10c2218aa13a 100644 --- a/app-emulation/ganeti/Manifest +++ b/app-emulation/ganeti/Manifest @@ -2,5 +2,4 @@ DIST ganeti-2.15.2.tar.gz 4723007 BLAKE2B d49d2ed9df515514a99d42303799e5ffc751eb DIST ganeti-2.15_2.15.2-11.debian.tar.xz 67652 BLAKE2B d10f83a59a1c2d05fa6704dfdc46867f0e3eed276086de9ad2e86def1e7894012b89f3f9c111076c37ef37b857967e4bae5cf769eaabf5907b3a42bc806b4472 SHA512 1c992b9842f1a8492eeaaab8950939c96cc03abf679234211753b92f4753278b086a0a77e2e32b912d4a69635c11e8305d350cda8285734d706cce741d897aa3 DIST ganeti-2.16.0~rc1.tar.gz 4794934 BLAKE2B 867d7d48e98d4490db8279b83b44006e0afc1a421592d523db2d04b4b04636090686773ef890c89df41f0311cbf3c4d5a2c314c39c4429f50b07a7a6d1a9616f SHA512 a4bed40e48ecd8ee1f3f8137faf28aea38ffb8955f48bbd233be17660035679fa27d0ef6f8fe20507d34ca9e1dd594e564c9c53412364b6cc05dc8ed2f5602be DIST ganeti-2.17.0~beta1.tar.gz 4880091 BLAKE2B bd094ac421b8b49abcd7643641aa4c2d62aa2f8a4ab55289711cef8c47cc32634bf06b99adbf9383de3945766112a1838d2191dfb51013dc4fba81676e264e64 SHA512 d836444ea5696c9689ee0fae56192720ef79b2a4a8962c031abacc7ef02ebbb9e9cdadd15aa5d315c2d3da6cbe5043b6c22b9ed94fd13883b5dfa23e08a2867e -DIST ganeti_2.15.2-4.debian.tar.xz 42440 BLAKE2B 5c329baa90bd801a3e4b550da0a4c8bb59f3d17801ff0d66a35ae0383f34a5c1cc7f3d6d67a5e07157085290019b22c6b5349224ed43b5ec40fbdc37ded77e88 SHA512 e405f54996236fe5166c89190c529256899458594d30e4daee85a9381400e618bc8cc578c43a166ed6d868ed3c5118e4bddc5103b596db89a504de3ba3a1f403 DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4d312c23392f428e1e0452f17f48140b6df5193447dd0fa1b5185d6866cfe48c8eb3dd6d22f01f930499471eab7044ca9b7268 SHA512 4501bc058b65adee6285c3d0dcf76ee8bfc4759af6bb11b0414503c6990c7d09942f3cc8e08d270e76bcf13211cc113f44304393dadd2bb8588d9b15230538af diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild deleted file mode 100644 index c1a37b6d764d..000000000000 --- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild +++ /dev/null @@ -1,331 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=(python2_7) -PYTHON_REQ_USE="ipv6(+)?" - -inherit user autotools bash-completion-r1 python-single-r1 versionator - -MY_PV="${PV/_rc/~rc}" -MY_PV="${MY_PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -SERIES="$(get_version_component_range 1-2)" - -DEBIAN_PATCH=4 -SRC_URI=" - http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz - mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz -" -KEYWORDS="amd64 x86" -PATCHES=( - "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch - "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8 - "${WORKDIR}"/debian/patches/relax-deps - "${WORKDIR}"/debian/patches/zlib-0.6-compatibility - "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5 - "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 -) - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://www.ganeti.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="drbd haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands" - -REQUIRED_USE="|| ( kvm xen lxc ) - test? ( ipv6 ) - kvm? ( || ( amd64 x86 ) ) - ${PYTHON_REQUIRED_USE}" - -USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" -GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" - -DEPEND=" - dev-libs/openssl:0 - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - dev-python/bitarray[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/fdsend[${PYTHON_USEDEP}] - || ( - net-misc/iputils[arping] - net-analyzer/arping - ) - net-analyzer/fping - net-misc/bridge-utils - net-misc/curl[ssl] - net-misc/openssh - net-misc/socat - sys-apps/iproute2 - sys-fs/lvm2 - >=sys-apps/baselayout-2.0 - dev-lang/ghc:0= - dev-haskell/cabal:0= - dev-haskell/cabal-install:0= - >=dev-haskell/mtl-2.1.1:0= - >=dev-haskell/old-time-1.1.0.0:0= - >=dev-haskell/random-1.0.1.1:0= - haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) - >=dev-haskell/transformers-0.3.0.0:0= - - >=dev-haskell/attoparsec-0.10.1.1:0= - <dev-haskell/attoparsec-0.14:0 - >=dev-haskell/base64-bytestring-1.0.0.1:0= - <dev-haskell/base64-bytestring-1.1:0= - >=dev-haskell/crypto-4.2.4:0= - <dev-haskell/crypto-4.3:0= - >=dev-haskell/curl-1.3.7:0= - <dev-haskell/curl-1.4:0= - >=dev-haskell/hinotify-0.3.2:0= - <dev-haskell/hinotify-0.4:0= - >=dev-haskell/hslogger-1.1.4:0= - <dev-haskell/hslogger-1.3:0= - >=dev-haskell/json-0.5:0= - >=dev-haskell/lens-3.10:0= - >=dev-haskell/lifted-base-0.2.0.3:0= - <dev-haskell/lifted-base-0.3:0= - >=dev-haskell/monad-control-0.3.1.3:0= - <dev-haskell/monad-control-1.1:0= - >=dev-haskell/network-2.3.0.13:0= - <dev-haskell/network-2.7:0= - >=dev-haskell/parallel-3.2.0.2:3= - <dev-haskell/parallel-3.3:3= - >=dev-haskell/temporary-1.1.2.3:0= - <dev-haskell/temporary-1.3:0= - >=dev-haskell/regex-pcre-0.94.2:0= - <dev-haskell/regex-pcre-0.95:0= - >=dev-haskell/transformers-base-0.4.1:0= - <dev-haskell/transformers-base-0.5:0= - >=dev-haskell/utf8-string-0.3.7:0= - >=dev-haskell/zlib-0.5.3.3:0= - <dev-haskell/zlib-0.7:0= - - >=dev-haskell/psqueue-1.1:0= - <dev-haskell/psqueue-1.2:0= - >=dev-haskell/snap-core-0.8.1:0= - <dev-haskell/snap-core-0.10:0= - >=dev-haskell/snap-server-0.8.1:0= - <dev-haskell/snap-server-0.10:0= - >=dev-haskell/case-insensitive-0.4.0.1 - - dev-haskell/vector:0= - xen? ( >=app-emulation/xen-3.0 ) - kvm? ( - dev-python/psutil - app-emulation/qemu - ) - lxc? ( app-emulation/lxc ) - drbd? ( sys-cluster/drbd-utils ) - rbd? ( sys-cluster/ceph ) - ipv6? ( net-misc/ndisc6 ) - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" -DEPEND+=" - sys-devel/m4 - app-text/pandoc - <=dev-python/sphinx-1.3.5[${PYTHON_USEDEP}] - media-fonts/urw-fonts - media-gfx/graphviz - >=dev-haskell/test-framework-0.6:0= - <dev-haskell/test-framework-0.9:0= - >=dev-haskell/test-framework-hunit-0.2.7:0= - <dev-haskell/test-framework-hunit-0.4:0= - >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= - <dev-haskell/test-framework-quickcheck2-0.4:0= - test? ( - dev-python/mock - dev-python/pyyaml - dev-haskell/haddock:0= - >=dev-haskell/hunit-1.2.4.2:0= - <dev-haskell/hunit-1.3:0= - >=dev-haskell/quickcheck-2.4.2:2= - <dev-haskell/quickcheck-2.8.3:2= - sys-apps/fakeroot - >=net-misc/socat-1.7 - dev-util/shelltestrunner - )" - -PATCHES+=( - "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch" - "${FILESDIR}/${PN}-2.11-add-pgrep.patch" - "${FILESDIR}/${PN}-2.15-daemon-util.patch" - "${FILESDIR}/${PN}-2.9-disable-root-tests.patch" - "${FILESDIR}/${PN}-2.9-skip-cli-test.patch" - "${FILESDIR}/${PN}-2.10-rundir.patch" - "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch" - "${FILESDIR}/${PN}-2.11-tests.patch" - "${FILESDIR}/${PN}-lockdir.patch" - "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch" - "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch" - "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch" - "${FILESDIR}/${PN}-2.13-process_unittest.patch" - "${FILESDIR}/${PN}-2.15-python-mock.patch" - "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch" - "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch" - "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch" - "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch" -) - -S="${WORKDIR}/${MY_P}" - -QA_WX_LOAD=" - usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d - usr/lib*/${PN}/${SERIES}/usr/bin/htools -" - -pkg_setup () { - local user - python-single-r1_pkg_setup - - if use multiple-users; then - for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do - enewgroup ${user} - enewuser ${user} -1 -1 -1 ${user} - done - fi -} - -src_prepare() { - local testfile - if has_version '>=dev-lang/ghc-7.10'; then - # Breaks the build on 7.8 - PATCHES+=( - "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch - ) - fi - eapply "${PATCHES[@]}" - # Upstream commits: - # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb - # 24618882737fd7c189adf99f4acc767d48f572c3 - sed -i \ - -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \ - cabal/ganeti.template.cabal - # Neuter -Werror - sed -i \ - -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \ - Makefile.am - - # not sure why these tests are failing - # should remove this on next version bump if possible - for testfile in test/py/import-export_unittest.bash; do - printf '#!/bin/bash\ntrue\n' > "${testfile}" - done - - # take the sledgehammer approach to bug #526270 - grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' - - eapply_user - - [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh - rm autotools/missing - eautoreconf -} - -src_configure () { - # this is kind of a hack to work around the removal of the qemu-kvm wrapper - local kvm_arch - - if use amd64; then - kvm_arch=x86_64 - elif use x86; then - kvm_arch=i386 - elif use kvm; then - die "Could not determine qemu system to use for kvm" - fi - - econf --localstatedir=/var \ - --sharedstatedir=/var \ - --disable-symlinks \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/${PN}/os \ - $(use_enable restricted-commands) \ - $(use_enable test haskell-tests) \ - $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \ - $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ - $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \ - $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \ - $(use_enable syslog) \ - $(use_enable monitoring) \ - $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ - $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \ - --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \ - --enable-socat-escape \ - --enable-socat-compress -} - -src_install () { - emake V=1 DESTDIR="${D}" install - - newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} - newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} - - if use kvm; then - newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - fi - - # ganeti installs it's own docs in a generic location - rm -rf "${D}"/{usr/share/doc/${PN},run} - - sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion - newbashcomp doc/examples/bash_completion gnt-instance - bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \ - h{space,check,scan,info,ail,arep,roller,squeeze,bal} \ - gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster} - - use monitoring && bashcomp_alias gnt-instance mon-collector - - dodoc INSTALL UPGRADE NEWS README doc/*.rst - - docinto html - dodoc -r doc/html/* doc/css/*.css - - docinto examples - dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf - - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - insinto /etc/cron.d - newins doc/examples/ganeti.cron ${PN} - - insinto /etc/logrotate.d - newins doc/examples/ganeti.logrotate ${PN} - - # need to dodir rather than keepdir here (bug #552482) - dodir /var/lib/${PN} - - keepdir /var/log/${PN}/ - keepdir /usr/share/${PN}/${SERIES}/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ - - dosym ${SERIES} "/usr/share/${PN}/default" - dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" - - python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} -} - -pkg_postinst() { - if use multiple-users; then - elog "You have enable multiple user support, the users for this must" - elog "be created. You can use the provided tool for this, which is" - elog "located at:" - elog " /usr/$(get_libdir)/${PN}/tools/users-setup" - fi -} - -src_test () { - PATH="${S}/scripts:${S}/src:${PATH}" \ - TMPDIR="/tmp" \ - GANETI_MASTER="$(hostname -f)" \ - emake check || die "emake check failed" -} diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild deleted file mode 100644 index 646ff4ff3a53..000000000000 --- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild +++ /dev/null @@ -1,340 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=(python2_7) -PYTHON_REQ_USE="ipv6(+)?" - -inherit user autotools bash-completion-r1 python-single-r1 versionator - -MY_PV="${PV/_rc/~rc}" -MY_PV="${MY_PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -SERIES="$(get_version_component_range 1-2)" - -DEBIAN_PATCH=4 -SRC_URI=" - http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz - mirror://ubuntu/pool/universe/${PN:0:1}/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.xz -" -KEYWORDS="~amd64 ~x86" -PATCHES=( - "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch - "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8 - "${WORKDIR}"/debian/patches/relax-deps - "${WORKDIR}"/debian/patches/zlib-0.6-compatibility - "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5 - "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 -) - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://www.ganeti.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands" - -REQUIRED_USE="|| ( kvm xen lxc ) - test? ( ipv6 ) - kvm? ( || ( amd64 x86 ) ) - ${PYTHON_REQUIRED_USE}" - -USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" -GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" - -DEPEND=" - dev-libs/openssl:0 - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - dev-python/bitarray[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/fdsend[${PYTHON_USEDEP}] - || ( - net-misc/iputils[arping] - net-analyzer/arping - ) - net-analyzer/fping - net-misc/bridge-utils - net-misc/curl[ssl] - net-misc/openssh - net-misc/socat - sys-apps/iproute2 - sys-fs/lvm2 - >=sys-apps/baselayout-2.0 - dev-lang/ghc:0= - dev-haskell/cabal:0= - dev-haskell/cabal-install:0= - >=dev-haskell/mtl-2.1.1:0= - >=dev-haskell/old-time-1.1.0.0:0= - >=dev-haskell/random-1.0.1.1:0= - haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) - >=dev-haskell/transformers-0.3.0.0:0= - - >=dev-haskell/attoparsec-0.10.1.1:0= - <dev-haskell/attoparsec-0.14:0 - >=dev-haskell/base64-bytestring-1.0.0.1:0= - <dev-haskell/base64-bytestring-1.1:0= - >=dev-haskell/crypto-4.2.4:0= - <dev-haskell/crypto-4.3:0= - >=dev-haskell/curl-1.3.7:0= - <dev-haskell/curl-1.4:0= - >=dev-haskell/hinotify-0.3.2:0= - <dev-haskell/hinotify-0.4:0= - >=dev-haskell/hslogger-1.1.4:0= - <dev-haskell/hslogger-1.3:0= - >=dev-haskell/json-0.5:0= - >=dev-haskell/lens-3.10:0= - >=dev-haskell/lifted-base-0.2.0.3:0= - <dev-haskell/lifted-base-0.3:0= - >=dev-haskell/monad-control-0.3.1.3:0= - <dev-haskell/monad-control-1.1:0= - >=dev-haskell/network-2.3.0.13:0= - <dev-haskell/network-2.7:0= - >=dev-haskell/parallel-3.2.0.2:3= - <dev-haskell/parallel-3.3:3= - >=dev-haskell/temporary-1.1.2.3:0= - <dev-haskell/temporary-1.3:0= - >=dev-haskell/regex-pcre-0.94.2:0= - <dev-haskell/regex-pcre-0.95:0= - >=dev-haskell/transformers-base-0.4.1:0= - <dev-haskell/transformers-base-0.5:0= - >=dev-haskell/utf8-string-0.3.7:0= - >=dev-haskell/zlib-0.5.3.3:0= - <dev-haskell/zlib-0.7:0= - - >=dev-haskell/psqueue-1.1:0= - <dev-haskell/psqueue-1.2:0= - >=dev-haskell/snap-core-0.8.1:0= - <dev-haskell/snap-core-0.10:0= - >=dev-haskell/snap-server-0.8.1:0= - <dev-haskell/snap-server-0.10:0= - >=dev-haskell/case-insensitive-0.4.0.1 - - dev-haskell/vector:0= - xen? ( >=app-emulation/xen-3.0 ) - kvm? ( - dev-python/psutil - app-emulation/qemu - ) - lxc? ( app-emulation/lxc ) - drbd? ( sys-cluster/drbd-utils ) - rbd? ( sys-cluster/ceph ) - ipv6? ( net-misc/ndisc6 ) - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" -DEPEND+=" - sys-devel/m4 - app-text/pandoc - dev-python/sphinx[${PYTHON_USEDEP}] - media-fonts/urw-fonts - media-gfx/graphviz - >=dev-haskell/test-framework-0.6:0= - <dev-haskell/test-framework-0.9:0= - >=dev-haskell/test-framework-hunit-0.2.7:0= - <dev-haskell/test-framework-hunit-0.4:0= - >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= - <dev-haskell/test-framework-quickcheck2-0.4:0= - test? ( - dev-python/mock - dev-python/pyyaml - dev-haskell/haddock:0= - >=dev-haskell/hunit-1.2.4.2:0= - <dev-haskell/hunit-1.3:0= - >=dev-haskell/quickcheck-2.4.2:2= - <dev-haskell/quickcheck-2.8.3:2= - sys-apps/fakeroot - >=net-misc/socat-1.7 - dev-util/shelltestrunner - )" - -PATCHES+=( - "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch" - "${FILESDIR}/${PN}-2.11-add-pgrep.patch" - "${FILESDIR}/${PN}-2.15-daemon-util.patch" - "${FILESDIR}/${PN}-2.9-disable-root-tests.patch" - "${FILESDIR}/${PN}-2.9-skip-cli-test.patch" - "${FILESDIR}/${PN}-2.10-rundir.patch" - "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch" - "${FILESDIR}/${PN}-2.11-tests.patch" - "${FILESDIR}/${PN}-lockdir.patch" - "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch" - "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch" - "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch" - "${FILESDIR}/${PN}-2.13-process_unittest.patch" - "${FILESDIR}/${PN}-2.15-python-mock.patch" - "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch" - "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch" - "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch" - "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch" - "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch" -) - -S="${WORKDIR}/${MY_P}" - -QA_WX_LOAD=" - usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d - usr/lib*/${PN}/${SERIES}/usr/bin/htools -" - -pkg_setup () { - local user - python-single-r1_pkg_setup - - if use multiple-users; then - for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do - enewgroup ${user} - enewuser ${user} -1 -1 -1 ${user} - done - fi -} - -src_prepare() { - local testfile - if has_version '>=dev-lang/ghc-7.10'; then - # Breaks the build on 7.8 - PATCHES+=( - "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch - ) - fi - if use experimental; then - ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!" - PATCHES+=( - # QEMU Agent accepted upstream for 2.16, not yet in a tagged release - # backport available for 2.15, but refused upstream due to RPC breakage. - "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch - ) - fi - eapply "${PATCHES[@]}" - # Upstream commits: - # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb - # 24618882737fd7c189adf99f4acc767d48f572c3 - sed -i \ - -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \ - cabal/ganeti.template.cabal - # Neuter -Werror - sed -i \ - -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \ - Makefile.am - - # not sure why these tests are failing - # should remove this on next version bump if possible - for testfile in test/py/import-export_unittest.bash; do - printf '#!/bin/bash\ntrue\n' > "${testfile}" - done - - # take the sledgehammer approach to bug #526270 - grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' - - eapply_user - - [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh - rm autotools/missing - eautoreconf -} - -src_configure () { - # this is kind of a hack to work around the removal of the qemu-kvm wrapper - local kvm_arch - - if use amd64; then - kvm_arch=x86_64 - elif use x86; then - kvm_arch=i386 - elif use kvm; then - die "Could not determine qemu system to use for kvm" - fi - - econf --localstatedir=/var \ - --sharedstatedir=/var \ - --disable-symlinks \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/${PN}/os \ - $(use_enable restricted-commands) \ - $(use_enable test haskell-tests) \ - $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \ - $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ - $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \ - $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \ - $(use_enable syslog) \ - $(use_enable monitoring) \ - $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ - $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \ - --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \ - --enable-socat-escape \ - --enable-socat-compress -} - -src_install () { - emake V=1 DESTDIR="${D}" install - - newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} - newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} - - if use kvm; then - newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - fi - - # ganeti installs it's own docs in a generic location - rm -rf "${D}"/{usr/share/doc/${PN},run} - - sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion - newbashcomp doc/examples/bash_completion gnt-instance - bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \ - h{space,check,scan,info,ail,arep,roller,squeeze,bal} \ - gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster} - - use monitoring && bashcomp_alias gnt-instance mon-collector - - dodoc INSTALL UPGRADE NEWS README doc/*.rst - - docinto html - dodoc -r doc/html/* doc/css/*.css - - docinto examples - dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf - - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - insinto /etc/cron.d - newins doc/examples/ganeti.cron ${PN} - - insinto /etc/logrotate.d - newins doc/examples/ganeti.logrotate ${PN} - - # need to dodir rather than keepdir here (bug #552482) - dodir /var/lib/${PN} - - keepdir /var/log/${PN}/ - keepdir /usr/share/${PN}/${SERIES}/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ - - dosym ${SERIES} "/usr/share/${PN}/default" - dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" - - python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} -} - -pkg_postinst() { - if use multiple-users; then - elog "You have enable multiple user support, the users for this must" - elog "be created. You can use the provided tool for this, which is" - elog "located at:" - elog " /usr/$(get_libdir)/${PN}/tools/users-setup" - fi -} - -src_test () { - PATH="${S}/scripts:${S}/src:${PATH}" \ - TMPDIR="/tmp" \ - GANETI_MASTER="$(hostname -f)" \ - emake check || die "emake check failed" -} diff --git a/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild deleted file mode 100644 index 22e58cde08e7..000000000000 --- a/app-emulation/ganeti/ganeti-2.15.2-r7.ebuild +++ /dev/null @@ -1,365 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=(python2_7) -PYTHON_REQ_USE="ipv6(+)?" - -inherit user autotools bash-completion-r1 python-single-r1 - -MY_PV="${PV/_rc/~rc}" -MY_PV="${MY_PV/_beta/~beta}" -MY_P="${PN}-${MY_PV}" -SERIES="$(ver_cut 1-2)" - -DEBIAN_PATCH=11 -SRC_URI=" - http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz - mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz -" -KEYWORDS="~amd64 ~x86" -PATCHES=( - "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch - "${WORKDIR}"/debian/patches/Makefile.am-use-C.UTF-8 - "${WORKDIR}"/debian/patches/relax-deps - "${WORKDIR}"/debian/patches/zlib-0.6-compatibility - "${WORKDIR}"/debian/patches/fix_FTBFS_with_sphinx-1.3.5 - "${WORKDIR}"/debian/patches/fix_ftbfs_with_sphinx_1.4 - "${WORKDIR}"/debian/patches/use-proper-cabal-dev.patch - "${WORKDIR}"/debian/patches/0001-Drop-dependency-on-MonadCatchIO-transformers.patch - "${WORKDIR}"/debian/patches/0001-GHC-8-support.patch - "${WORKDIR}"/debian/patches/ghc8-fixes - "${WORKDIR}"/debian/patches/snap-server-1.0-compat - "${WORKDIR}"/debian/patches/non-DSA-SSH-key-support.patch - "${WORKDIR}"/debian/patches/fix-ssh-key-renewal-on-single-node-clusters.patch - "${WORKDIR}"/debian/patches/set-defaults-for-ssh-type-bits.patch - "${WORKDIR}"/debian/patches/use-hv-class-to-check-for-migration.patch - "${WORKDIR}"/debian/patches/do-not-specify-socat-ssl-method.patch - "${WORKDIR}"/debian/patches/fix-ftbfs-with-sphinx-1.5.patch - "${WORKDIR}"/debian/patches/fix-failover-from-dead-node.patch - "${WORKDIR}"/debian/patches/fix-cpu-affinity.patch - "${WORKDIR}"/debian/patches/fix-fcntl-i386.patch - "${WORKDIR}"/debian/patches/fix-ovf-test-path.patch - "${WORKDIR}"/debian/patches/fix-qa-ssconf-race.patch - "${WORKDIR}"/debian/patches/relax-sphinx-version-check.patch - #"${WORKDIR}"/debian/patches/THH-2.12.patch - "${WORKDIR}"/debian/patches/sphinx-1.7.patch - "${WORKDIR}"/debian/patches/ca-use-sha256-md.patch - "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat.patch - "${WORKDIR}"/debian/patches/impexpd-fix-certificate-verification-with-new-socat-2.patch -) - -DESCRIPTION="Ganeti is a virtual server management software tool" -HOMEPAGE="http://www.ganeti.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands" - -REQUIRED_USE="|| ( kvm xen lxc ) - test? ( ipv6 ) - kvm? ( || ( amd64 x86 ) ) - ${PYTHON_REQUIRED_USE}" - -USER_PREFIX="${GANETI_USER_PREFIX:-"gnt-"}" -GROUP_PREFIX="${GANETI_GROUP_PREFIX:-"${USER_PREFIX}"}" - -DEPEND=" - dev-libs/openssl:0 - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - dev-python/pycurl[${PYTHON_USEDEP}] - dev-python/ipaddr[${PYTHON_USEDEP}] - dev-python/bitarray[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/fdsend[${PYTHON_USEDEP}] - || ( - net-misc/iputils[arping] - net-analyzer/arping - ) - net-analyzer/fping - net-misc/bridge-utils - net-misc/curl[ssl] - net-misc/openssh - net-misc/socat - sys-apps/iproute2 - >=sys-fs/lvm2-2.02.181 - >=sys-apps/baselayout-2.0 - >=dev-lang/ghc-8.0:0= - <dev-lang/ghc-8.1:0= - dev-haskell/cabal:0= - dev-haskell/cabal-install:0= - !<app-emulation/ganeti-instance-image-0.6-r1 - >=dev-haskell/mtl-2.1.1:0= - >=dev-haskell/old-time-1.1.0.0:0= - >=dev-haskell/random-1.0.1.1:0= - haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) - >=dev-haskell/transformers-0.3.0.0:0= - - >=dev-haskell/attoparsec-0.10.1.1:0= - <dev-haskell/attoparsec-0.14:0 - >=dev-haskell/base64-bytestring-1.0.0.1:0= - <dev-haskell/base64-bytestring-1.1:0= - >=dev-haskell/crypto-4.2.4:0= - <dev-haskell/crypto-4.3:0= - >=dev-haskell/curl-1.3.7:0= - <dev-haskell/curl-1.4:0= - >=dev-haskell/hinotify-0.3.2:0= - <dev-haskell/hinotify-0.4:0= - >=dev-haskell/hslogger-1.1.4:0= - <dev-haskell/hslogger-1.3:0= - >=dev-haskell/json-0.5:0= - >=dev-haskell/lens-3.10:0= - >=dev-haskell/lifted-base-0.2.0.3:0= - <dev-haskell/lifted-base-0.3:0= - >=dev-haskell/monad-control-1.0.1.0:0= - <dev-haskell/monad-control-1.0.2:0= - >=dev-haskell/network-2.3.0.13:0= - <dev-haskell/network-2.7:0= - >=dev-haskell/parallel-3.2.0.2:3= - <dev-haskell/parallel-3.3:3= - >=dev-haskell/temporary-1.1.2.3:0= - <dev-haskell/temporary-1.3:0= - >=dev-haskell/regex-pcre-0.94.2:0= - <dev-haskell/regex-pcre-0.95:0= - >=dev-haskell/transformers-base-0.4:0= - <dev-haskell/transformers-base-0.5:0= - >=dev-haskell/utf8-string-0.3.7:0= - >=dev-haskell/zlib-0.5.3.3:0= - <dev-haskell/zlib-0.7:0= - - >=dev-haskell/psqueue-1.1:0= - <dev-haskell/psqueue-1.2:0= - >=dev-haskell/snap-core-1.0.1:0= - <dev-haskell/snap-core-1.1:0= - >=dev-haskell/snap-server-1.0.1:0= - <dev-haskell/snap-server-1.1:0= - >=dev-haskell/case-insensitive-0.4.0.1 - - dev-haskell/vector:0= - xen? ( >=app-emulation/xen-3.0 ) - kvm? ( - dev-python/psutil - app-emulation/qemu - ) - lxc? ( app-emulation/lxc ) - drbd? ( sys-cluster/drbd-utils ) - rbd? ( sys-cluster/ceph ) - ipv6? ( net-misc/ndisc6 ) - ${PYTHON_DEPS}" -RDEPEND="${DEPEND} - !app-emulation/ganeti-htools" -DEPEND+=" - sys-devel/m4 - app-text/pandoc - dev-python/sphinx[${PYTHON_USEDEP}] - media-fonts/urw-fonts - media-gfx/graphviz - >=dev-haskell/test-framework-0.6:0= - <dev-haskell/test-framework-0.9:0= - >=dev-haskell/test-framework-hunit-0.2.7:0= - <dev-haskell/test-framework-hunit-0.4:0= - >=dev-haskell/test-framework-quickcheck2-0.2.12.1:0= - <dev-haskell/test-framework-quickcheck2-0.4:0= - test? ( - dev-python/mock - dev-python/pyyaml - dev-haskell/haddock:0= - >=dev-haskell/hunit-1.2.4.2:0= - <dev-haskell/hunit-1.3:0= - >=dev-haskell/quickcheck-2.4.2:2= - <dev-haskell/quickcheck-2.8.3:2= - sys-apps/fakeroot - >=net-misc/socat-1.7 - dev-util/shelltestrunner - )" - -PATCHES+=( - "${FILESDIR}/${PN}-2.12-start-stop-daemon-args.patch" - "${FILESDIR}/${PN}-2.11-add-pgrep.patch" - "${FILESDIR}/${PN}-2.15-daemon-util.patch" - "${FILESDIR}/${PN}-2.9-disable-root-tests.patch" - "${FILESDIR}/${PN}-2.9-skip-cli-test.patch" - "${FILESDIR}/${PN}-2.10-rundir.patch" - "${FILESDIR}/${PN}-2.12-qemu-enable-kvm.patch" - "${FILESDIR}/${PN}-2.11-tests.patch" - "${FILESDIR}/${PN}-lockdir.patch" - "${FILESDIR}/${PN}-2.11-dont-nest-libdir.patch" - "${FILESDIR}/${PN}-2.11-dont-print-man-help.patch" - "${FILESDIR}/${PN}-2.11-daemon-util-tests.patch" - "${FILESDIR}/${PN}-2.13-process_unittest.patch" - "${FILESDIR}/${PN}-2.15-python-mock.patch" - "${FILESDIR}/${PN}-2.15.2-remove-sandbox-failing-tests.patch" - "${FILESDIR}/${PN}-2.15-noded-must-run-as-root.patch" - "${FILESDIR}/${PN}-2.15-kvmd-run-as-daemon-user.patch" - "${FILESDIR}/${PN}-2.15-dont-invert-return-values-for-man-warnings.patch" - "${FILESDIR}/${PN}-2.15-respect-HFLAGS.patch" - "${FILESDIR}/ganeti-2.15.2-bdev_py.patch" -) - -S="${WORKDIR}/${MY_P}" - -QA_WX_LOAD=" - usr/lib*/${PN}/${SERIES}/usr/sbin/ganeti-*d - usr/lib*/${PN}/${SERIES}/usr/bin/htools -" - -pkg_setup () { - local user - python-single-r1_pkg_setup - - if use multiple-users; then - for user in gnt-{masterd,confd,luxid,rapi,daemons,admin}; do - enewgroup ${user} - enewuser ${user} -1 -1 -1 ${user} - done - fi -} - -src_prepare() { - local testfile - if has_version '>=dev-lang/ghc-7.10'; then - # Breaks the build on 7.8 - PATCHES+=( - "${WORKDIR}"/debian/patches/ghc-7.10-compatibility.patch - ) - fi - if use experimental; then - ewarn "Experimental patches have been applied! RPC between daemons with different patches applied may cause breakage!" - PATCHES+=( - # QEMU Agent accepted upstream for 2.16, not yet in a tagged release - # backport available for 2.15, but refused upstream due to RPC breakage. - "${FILESDIR}"/0001-kvm-use_guest_agent-QEMU-Guest-Agent-sup.stable-2.15.patch - ) - fi - eapply "${PATCHES[@]}" - # Upstream commits: - # 4c3c2ca2a97a69c0287a3d23e064bc17978105eb - # 24618882737fd7c189adf99f4acc767d48f572c3 - sed -i \ - -e '/QuickCheck/s,< 2.8,< 2.8.3,g' \ - cabal/ganeti.template.cabal - # Neuter -Werror - sed -i \ - -e '/^if DEVELOPER_MODE/,/^endif/s/-Werror//' \ - Makefile.am - - # not sure why these tests are failing - # should remove this on next version bump if possible - for testfile in test/py/import-export_unittest.bash; do - printf '#!/bin/bash\ntrue\n' > "${testfile}" - done - - # take the sledgehammer approach to bug #526270 - grep -lr '/bin/sh' "${S}" | xargs -r -- sed -i 's:/bin/sh:/bin/bash:g' - - eapply_user - - [[ ${PV} =~ [9]{4,} ]] && ./autogen.sh - rm autotools/missing - eautoreconf -} - -src_configure () { - # this is kind of a hack to work around the removal of the qemu-kvm wrapper - local kvm_arch - - if use amd64; then - kvm_arch=x86_64 - elif use x86; then - kvm_arch=i386 - elif use kvm; then - die "Could not determine qemu system to use for kvm" - fi - - econf --localstatedir=/var \ - --sharedstatedir=/var \ - --disable-symlinks \ - --with-ssh-initscript=/etc/init.d/sshd \ - --with-export-dir=/var/lib/ganeti-storage/export \ - --with-os-search-path=/usr/share/${PN}/os \ - $(use_enable restricted-commands) \ - $(use_enable test haskell-tests) \ - $(usex multiple-users "--with-default-user=" "" "gnt-daemons" "") \ - $(usex multiple-users "--with-user-prefix=" "" "${USER_PREFIX}" "") \ - $(usex multiple-users "--with-default-group=" "" "gnt-daemons" "") \ - $(usex multiple-users "--with-group-prefix=" "" "${GROUP_PREFIX}" "") \ - $(use_enable syslog) \ - $(use_enable monitoring) \ - $(usex kvm '--with-kvm-path=' '' "/usr/bin/qemu-system-${kvm_arch}" '') \ - $(usex haskell-daemons "--enable-confd=haskell" '' '' '') \ - --with-haskell-flags="-optl -Wl,-z,relro -optl -Wl,--as-needed" \ - --enable-socat-escape \ - --enable-socat-compress -} - -src_install () { - emake V=1 DESTDIR="${D}" install - - newinitd "${FILESDIR}"/ganeti.initd-r3 ${PN} - newconfd "${FILESDIR}"/ganeti.confd-r2 ${PN} - - if use kvm; then - newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff - newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff - fi - - # ganeti installs it's own docs in a generic location - rm -rf "${D}"/{usr/share/doc/${PN},run} - - sed -i "s:/usr/$(get_libdir)/${PN}/tools/burnin:burnin:" doc/examples/bash_completion - newbashcomp doc/examples/bash_completion gnt-instance - bashcomp_alias gnt-instance burnin ganeti-{cleaner,confd} \ - h{space,check,scan,info,ail,arep,roller,squeeze,bal} \ - gnt-{os,job,filter,debug,storage,group,node,network,backup,cluster} - - use monitoring && bashcomp_alias gnt-instance mon-collector - - dodoc INSTALL UPGRADE NEWS README doc/*.rst - - docinto html - dodoc -r doc/html/* doc/css/*.css - - docinto examples - dodoc doc/examples/{ganeti.cron,gnt-config-backup} doc/examples/*.ocf - - docinto examples/hooks - dodoc doc/examples/hooks/{ipsec,ethers} - - insinto /etc/cron.d - newins doc/examples/ganeti.cron ${PN} - - insinto /etc/logrotate.d - newins doc/examples/ganeti.logrotate ${PN} - - # need to dodir rather than keepdir here (bug #552482) - dodir /var/lib/${PN} - - keepdir /var/log/${PN}/ - keepdir /usr/share/${PN}/${SERIES}/os/ - keepdir /var/lib/ganeti-storage/{export,file,shared}/ - - dosym ${SERIES} "/usr/share/${PN}/default" - dosym ${SERIES} "/usr/$(get_libdir)/${PN}/default" - - python_fix_shebang "${ED}" "${D}"/usr/"$(get_libdir)"/${PN}/${SERIES} -} - -pkg_postinst() { - if use multiple-users; then - elog "You have enable multiple user support, the users for this must" - elog "be created. You can use the provided tool for this, which is" - elog "located at:" - elog " /usr/$(get_libdir)/${PN}/tools/users-setup" - fi -} - -src_test () { - PATH="${S}/scripts:${S}/src:${PATH}" \ - TMPDIR="/tmp" \ - GANETI_MASTER="$(hostname -f)" \ - emake check || die "emake check failed" -} diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild index 579f39cb3711..33cb8d9e495f 100644 --- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild +++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild @@ -17,7 +17,7 @@ SRC_URI=" http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz " -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" PATCHES=( "${FILESDIR}"/ganeti-2.15-use-balloon-device.patch "${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 67a9c399e6fc..13f2fe3e255c 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -2,10 +2,8 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 -DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d -DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild deleted file mode 100644 index b1a2ab2e5ecc..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_A="apache-${P}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.5" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.6" -RDEPEND=">=virtual/jre-1.6" - -S="${WORKDIR}/${MY_P}" - -java_prepare() { - cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml" - rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die - find -name '*.jar' -delete || die -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild deleted file mode 100644 index 9b931baf0d49..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_A="apache-${P}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="3.1" -KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.7" -RDEPEND=">=virtual/jre-1.7" - -S="${WORKDIR}/${MY_P}/" - -src_prepare() { - default - - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" - rm -fR */*/build.xml - einfo "Removing bundled jars and classes" - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + - - java-pkg-2_src_prepare -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax/servlet/ -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild deleted file mode 100644 index d66f7a815533..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_A="apache-${PN}-${PV}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4.0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" - -S="${WORKDIR}/${MY_P}/" - -src_prepare() { - default - - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" - rm -fR */*/build.xml - einfo "Removing bundled jars and classes" - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + - - java-pkg-2_src_prepare -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax/servlet/ -} diff --git a/dev-python/Babel/Babel-2.7.0.ebuild b/dev-python/Babel/Babel-2.7.0.ebuild index 94515713987a..42b0b5512da0 100644 --- a/dev-python/Babel/Babel-2.7.0.ebuild +++ b/dev-python/Babel/Babel-2.7.0.ebuild @@ -15,37 +15,25 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="doc test" +IUSE="test" RESTRICT="!test? ( test )" RDEPEND="dev-python/pytz[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}]" DEPEND="${DEPEND} - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) test? ( dev-python/freezegun[${PYTHON_USEDEP}] dev-python/pytest[${PYTHON_USEDEP}] )" -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs python_prepare_all() { # Make the tests use implementation-specific datadir, # because they try to write in it. sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \ -i tests/messages/test_frontend.py || die - sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - emake -C docs html - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { local -x TZ=UTC diff --git a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild index 6a247bcf6e23..cc737b11e313 100644 --- a/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild +++ b/dev-python/atomicwrites/atomicwrites-1.2.1.ebuild @@ -13,35 +13,9 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc" -# TODO: remove impl limiters when sphinx is py38 -BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') - ) -" +BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme distutils_enable_tests pytest - -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - sphinx-build docs docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} diff --git a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild index b69e44f57ae2..cd052cc5e1bc 100644 --- a/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild +++ b/dev-python/backports-unittest-mock/backports-unittest-mock-1.5-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="doc test" +IUSE="test" RDEPEND=" dev-python/backports[${PYTHON_USEDEP}] @@ -26,12 +26,6 @@ RDEPEND=" " BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep ' - >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}] - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.5.2[${PYTHON_USEDEP}] - ') - ) test? ( ${RDEPEND} >=dev-python/pytest-2.8[${PYTHON_USEDEP}] @@ -42,12 +36,9 @@ S="${WORKDIR}/${MY_PN}-${PV}" RESTRICT="!test? ( test )" -python_check_deps() { - use doc || return 0 - has_version ">=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]" && \ - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \ - has_version ">=dev-python/sphinx-1.5.2[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + '>=dev-python/jaraco-packaging-3.2' \ + '>=dev-python/rst-linker-1.9' python_prepare_all() { # avoid a setuptools_scm dependency @@ -58,14 +49,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - cd docs || die - sphinx-build . _build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # Override pytest options to skip flake8 pytest -vv --override-ini="addopts=--doctest-modules" \ diff --git a/dev-python/bandit/bandit-0.13.2-r1.ebuild b/dev-python/bandit/bandit-0.13.2-r1.ebuild index dc6f06cdebde..b1bc77be8ed4 100644 --- a/dev-python/bandit/bandit-0.13.2-r1.ebuild +++ b/dev-python/bandit/bandit-0.13.2-r1.ebuild @@ -14,6 +14,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 x86" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=" >=dev-python/pbr-1.3.0[${PYTHON_USEDEP}] @@ -33,10 +34,6 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}] !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] )" RDEPEND=" ${CDEPEND} diff --git a/dev-python/bandit/bandit-1.0.1.ebuild b/dev-python/bandit/bandit-1.0.1.ebuild index 6058577e0916..d6617bf5f6d4 100644 --- a/dev-python/bandit/bandit-1.0.1.ebuild +++ b/dev-python/bandit/bandit-1.0.1.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" DEPEND=" @@ -31,11 +32,6 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] - !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}] dev-python/beautifulsoup:4[${PYTHON_USEDEP}] )" RDEPEND=" diff --git a/dev-python/bandit/bandit-1.1.0.ebuild b/dev-python/bandit/bandit-1.1.0.ebuild index 8e2af33e9380..e8d34d5f304b 100644 --- a/dev-python/bandit/bandit-1.1.0.ebuild +++ b/dev-python/bandit/bandit-1.1.0.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" DEPEND=" @@ -31,11 +32,6 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] - !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}] dev-python/beautifulsoup:4[${PYTHON_USEDEP}] >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] )" diff --git a/dev-python/bandit/bandit-1.2.0.ebuild b/dev-python/bandit/bandit-1.2.0.ebuild index bfcfbbc51e87..ba40f9ff0209 100644 --- a/dev-python/bandit/bandit-1.2.0.ebuild +++ b/dev-python/bandit/bandit-1.2.0.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" DEPEND=" @@ -31,9 +32,6 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - <dev-python/sphinx-1.4[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] dev-python/beautifulsoup:4[${PYTHON_USEDEP}] >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] )" diff --git a/dev-python/bandit/bandit-1.3.0.ebuild b/dev-python/bandit/bandit-1.3.0.ebuild index 660cd4fe99d2..d87cf46e7cc4 100644 --- a/dev-python/bandit/bandit-1.3.0.ebuild +++ b/dev-python/bandit/bandit-1.3.0.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" DEPEND=" @@ -31,9 +32,6 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - <dev-python/sphinx-1.4[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] dev-python/beautifulsoup:4[${PYTHON_USEDEP}] >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] >=dev-python/pylint-1.4.5[${PYTHON_USEDEP}] diff --git a/dev-python/bandit/bandit-1.4.0.ebuild b/dev-python/bandit/bandit-1.4.0-r1.ebuild index b917c728b8bb..ff899eb719ce 100644 --- a/dev-python/bandit/bandit-1.4.0.ebuild +++ b/dev-python/bandit/bandit-1.4.0-r1.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 ~s390 x86" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" DEPEND=" @@ -31,9 +32,6 @@ DEPEND=" >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}] - <dev-python/sphinx-1.4[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] dev-python/beautifulsoup:4[${PYTHON_USEDEP}] >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] >=dev-python/pylint-1.4.5[${PYTHON_USEDEP}] diff --git a/dev-python/bandit/bandit-1.5.1.ebuild b/dev-python/bandit/bandit-1.5.1-r1.ebuild index 2057f9a8a933..a3935e218c53 100644 --- a/dev-python/bandit/bandit-1.5.1.ebuild +++ b/dev-python/bandit/bandit-1.5.1-r1.ebuild @@ -15,6 +15,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm64 ~s390 ~x86" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]" DEPEND=" diff --git a/dev-python/click/click-7.0-r1.ebuild b/dev-python/click/click-7.0-r1.ebuild index 07ee5ff2a7c9..e96f58fb321b 100644 --- a/dev-python/click/click-7.0-r1.ebuild +++ b/dev-python/click/click-7.0-r1.ebuild @@ -14,38 +14,16 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc examples" +IUSE="examples" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep ' - >=dev-python/docutils-0.14[${PYTHON_USEDEP}] - dev-python/pallets-sphinx-themes[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.7.5-r1[${PYTHON_USEDEP}] - ') - )" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +distutils_enable_sphinx docs \ + '>=dev-python/docutils-0.14' \ + dev-python/pallets-sphinx-themes distutils_enable_tests pytest -python_check_deps() { - use doc || return 0 - has_version ">=dev-python/docutils-0.14[${PYTHON_USEDEP}]" && \ - has_version "dev-python/pallets-sphinx-themes[${PYTHON_USEDEP}]" && \ - has_version ">=dev-python/sphinx-1.7.5-r1[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} - python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) use examples && dodoc -r examples distutils-r1_python_install_all } diff --git a/dev-python/cssselect/cssselect-1.0.3.ebuild b/dev-python/cssselect/cssselect-1.0.3.ebuild index 80aef78e55b9..eb7e80a7db75 100644 --- a/dev-python/cssselect/cssselect-1.0.3.ebuild +++ b/dev-python/cssselect/cssselect-1.0.3.ebuild @@ -16,34 +16,12 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="doc test" +IUSE="test" RESTRICT="!test? ( test )" DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) test? ( dev-python/lxml[${PYTHON_USEDEP}] )" +distutils_enable_sphinx docs distutils_enable_tests unittest - -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # prevent non essential d'load of files in doc build - sed -e 's:intersphinx_:#&:' -i docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc ; then - esetup.py build_sphinx - fi -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/cython/cython-0.29.14-r1.ebuild b/dev-python/cython/cython-0.29.14-r1.ebuild index 156744a5c09a..55b4818f31ed 100644 --- a/dev-python/cython/cython-0.29.14-r1.ebuild +++ b/dev-python/cython/cython-0.29.14-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="doc emacs test" +IUSE="emacs test" RESTRICT="!test? ( test )" RDEPEND=" @@ -24,7 +24,6 @@ RDEPEND=" " BDEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ 'python3*') @@ -36,12 +35,7 @@ PATCHES=( SITEFILE=50cython-gentoo.el -python_check_deps() { - if use doc; then - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" || return ${?} - fi - return 0 -} +distutils_enable_sphinx docs python_compile() { if ! python_is_python3; then @@ -57,8 +51,6 @@ python_compile() { python_compile_all() { use emacs && elisp-compile Tools/cython-mode.el - - use doc && emake -C docs html } python_test() { @@ -71,7 +63,6 @@ python_test() { python_install_all() { local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt ) - use doc && local HTML_DOCS=( docs/build/html/. ) distutils-r1_python_install_all if use emacs; then diff --git a/dev-python/execnet/execnet-1.7.1.ebuild b/dev-python/execnet/execnet-1.7.1.ebuild index e691e40e3ad0..4bbb2505e6e6 100644 --- a/dev-python/execnet/execnet-1.7.1.ebuild +++ b/dev-python/execnet/execnet-1.7.1.ebuild @@ -14,27 +14,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="doc" RDEPEND=">=dev-python/apipkg-1.4[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - ') - )" + dev-python/setuptools[${PYTHON_USEDEP}]" PATCHES=( "${FILESDIR}/execnet-1.7.1-tests.patch" ) +distutils_enable_sphinx doc distutils_enable_tests pytest -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - python_prepare_all() { # Remove doctest that access an i'net site rm doc/example/test_info.rst || die @@ -51,15 +42,3 @@ python_prepare_all() { distutils-r1_python_prepare_all } - -python_compile_all() { - if use doc; then - sed -i -e 's:^intersphinx_mapping:disabled_&:' \ - doc/conf.py || die - - sphinx-build -b html -d doc/_build/doctrees doc \ - doc/_build/html || die - - HTML_DOCS+=( "doc/_build/html/." ) - fi -} diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild index df4778024021..3cfa93664536 100644 --- a/dev-python/flask/flask-1.1.1.ebuild +++ b/dev-python/flask/flask-1.1.1.ebuild @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0" -IUSE="doc examples test" +IUSE="examples test" RESTRICT="!test? ( test )" RDEPEND="dev-python/click[${PYTHON_USEDEP}] @@ -32,7 +32,6 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}] >=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" PATCHES=( @@ -40,20 +39,7 @@ PATCHES=( "${FILESDIR}/flask-1.1.1-py38.patch" ) -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} +distutils_enable_sphinx docs python_test() { PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \ @@ -62,7 +48,6 @@ python_test() { python_install_all() { use examples && dodoc -r examples - use doc && HTML_DOCS=( docs/_build/html/. ) distutils-r1_python_install_all } diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild index 6c634728d160..ab417690d6fe 100644 --- a/dev-python/flask/flask-9999.ebuild +++ b/dev-python/flask/flask-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) inherit distutils-r1 @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0" -IUSE="doc examples test" +IUSE="examples test" RESTRICT="!test? ( test )" RDEPEND="dev-python/click[${PYTHON_USEDEP}] @@ -32,23 +32,9 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}] >=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} +distutils_enable_sphinx docs python_test() { PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \ @@ -57,7 +43,6 @@ python_test() { python_install_all() { use examples && dodoc -r examples - use doc && HTML_DOCS=( docs/_build/html/. ) distutils-r1_python_install_all } diff --git a/dev-python/future/future-0.17.1.ebuild b/dev-python/future/future-0.17.1.ebuild index 0aee1d1a9313..a1b80c57871a 100644 --- a/dev-python/future/future-0.17.1.ebuild +++ b/dev-python/future/future-0.17.1.ebuild @@ -14,33 +14,21 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" +distutils_enable_sphinx docs \ + dev-python/sphinx-bootstrap-theme distutils_enable_tests pytest # TODO: make numpy unconditional when it supports py3.8 BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}] - ' python{2_7,3_{5,6,7}}) - ) test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ python{2_7,3_{5,6,7}}) ) " -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]" -} - python_prepare_all() { - sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die # tests requiring network access rm tests/test_future/test_requests.py || die sed -i -e 's:test.*request_http:_&:' \ @@ -48,10 +36,3 @@ python_prepare_all() { distutils-r1_python_prepare_all } - -python_compile_all() { - if use doc; then - sphinx-build docs/ docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} diff --git a/dev-python/future/future-0.18.2.ebuild b/dev-python/future/future-0.18.2.ebuild index d5b55ddea8d2..91b1a6a29af8 100644 --- a/dev-python/future/future-0.18.2.ebuild +++ b/dev-python/future/future-0.18.2.ebuild @@ -17,16 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ IUSE="doc" distutils_enable_tests pytest +distutils_enable_sphinx docs \ + dev-python/sphinx-bootstrap-theme # TODO: make numpy unconditional when it supports py3.8 -BDEPEND=" +BDEPEND+=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}] - ') - ) test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ python{2_7,3_{5,6,7}}) @@ -37,12 +33,6 @@ PATCHES=( "${FILESDIR}"/${P}-tests.patch ) -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]" -} - python_prepare_all() { sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die # tests requiring network access @@ -52,10 +42,3 @@ python_prepare_all() { distutils-r1_python_prepare_all } - -python_compile_all() { - if use doc; then - sphinx-build docs/ docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} diff --git a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild index 49b20e3409bd..206a2329c1f9 100644 --- a/dev-python/gmpy/gmpy-2.0.8-r1.ebuild +++ b/dev-python/gmpy/gmpy-2.0.8-r1.ebuild @@ -18,7 +18,7 @@ S="${WORKDIR}"/${MY_P} LICENSE="LGPL-3+" SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc mpir" +IUSE="mpir" RDEPEND=" >=dev-libs/mpc-1.0.2:= @@ -27,18 +27,14 @@ RDEPEND=" mpir? ( sci-libs/mpir:= )" DEPEND="${RDEPEND}" BDEPEND=" - app-arch/unzip - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )" + app-arch/unzip" PATCHES=( "${FILESDIR}"/${P}-fix-mpir-types.patch "${FILESDIR}"/gmpy-2.0.8-test-exit-status.patch ) -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs python_prepare_all() { distutils-r1_python_prepare_all @@ -60,13 +56,6 @@ python_compile() { distutils-r1_python_compile } -python_compile_all() { - if use doc; then - emake -C docs html - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { cd test || die "${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}" diff --git a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild index 9c6d5ccab1dc..85100202b3a1 100644 --- a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild +++ b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc test" +IUSE="test" RDEPEND=" dev-python/zipp[${PYTHON_USEDEP}] @@ -29,29 +29,17 @@ BDEPEND=" $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6}}) dev-python/packaging[${PYTHON_USEDEP}] ) - doc? ( - $(python_gen_any_dep '>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) " PATCHES=( "${FILESDIR}/importlib_metadata-0.23-py38.patch" ) +distutils_enable_sphinx "${PN}/docs" \ + '>=dev-python/rst-linker-1.9' distutils_enable_tests unittest -python_check_deps() { - if use doc; then - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" || return ${?} - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" || return ${?} - fi - return 0 -} - python_prepare_all() { - sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die - # avoid a setuptools_scm dependency sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \ @@ -59,10 +47,3 @@ python_prepare_all() { distutils-r1_python_prepare_all } - -python_compile_all() { - if use doc; then - sphinx-build ${PN}/docs docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} diff --git a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild index 5bb9da703f89..d9847a4bfa73 100644 --- a/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild +++ b/dev-python/jaraco-classes/jaraco-classes-2.0-r1.ebuild @@ -16,7 +16,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}] @@ -24,11 +25,6 @@ RDEPEND=" " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep ' - >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}] - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}]') - ) test? ( ${RDEPEND} >=dev-python/pytest-2.8[${PYTHON_USEDEP}] @@ -37,14 +33,9 @@ DEPEND=" S="${WORKDIR}/${MY_PN}-${PV}" -RESTRICT="!test? ( test )" - -python_check_deps() { - use doc || return 0 - has_version ">=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]" && \ - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + ">=dev-python/jaraco-packaging-3.2" \ + ">=dev-python/rst-linker-1.9" python_prepare_all() { # avoid a setuptools_scm dependency @@ -55,14 +46,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - cd docs || die - sphinx-build . _build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # Avoid ImportMismatchError, override pytest options to skip flake8 pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \ diff --git a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild index 348372445e08..b90ba6298d75 100644 --- a/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild +++ b/dev-python/jaraco-functools/jaraco-functools-2.0-r1.ebuild @@ -11,11 +11,13 @@ MY_PN="${PN/-/.}" DESCRIPTION="Additional functions used by other projects by developer jaraco" HOMEPAGE="https://github.com/jaraco/jaraco.functools" SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}] @@ -23,13 +25,6 @@ RDEPEND=" $(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7) " DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}] - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}]' - ) - ) test? ( ${RDEPEND} >=dev-python/pytest-2.8[${PYTHON_USEDEP}] @@ -39,19 +34,11 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] ) " -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_PN}-${PV}" - PATCHES=( "${FILESDIR}/${P}-fix-py37-tests.patch" ) -python_check_deps() { - use doc || return 0 - - has_version ">=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]" && \ - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + ">=dev-python/jaraco-packaging-3.2" \ + ">=dev-python/rst-linker-1.9" python_prepare_all() { # avoid a setuptools_scm dependency @@ -62,14 +49,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - cd docs || die - sphinx-build . _build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # Override pytest options to skip flake8 PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \ diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild index e3e5f83ada4f..79852d7bffa4 100644 --- a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild +++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild @@ -11,11 +11,13 @@ MY_PN="${PN/-/.}" DESCRIPTION="Tools to supplement packaging Python releases" HOMEPAGE="https://github.com/jaraco/jaraco.packaging" SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-python/importlib_metadata[${PYTHON_USEDEP}] @@ -24,28 +26,14 @@ RDEPEND=" " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') - ) test? ( ${RDEPEND} >=dev-python/pytest-2.8[${PYTHON_USEDEP}] ) " -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -python_check_deps() { - use doc || return 0 - - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + ">=dev-python/rst-linker-1.9" python_prepare_all() { # avoid a setuptools_scm dependency @@ -56,14 +44,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - cd docs || die - sphinx-build . _build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # Skip one test which requires network access # Override pytest options to skip flake8 diff --git a/dev-python/jinja/jinja-2.10.3-r1.ebuild b/dev-python/jinja/jinja-2.10.3-r1.ebuild index 39131f10d5a9..f021773e3385 100644 --- a/dev-python/jinja/jinja-2.10.3-r1.ebuild +++ b/dev-python/jinja/jinja-2.10.3-r1.ebuild @@ -17,20 +17,18 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="doc examples test" +IUSE="examples test" RESTRICT="!test? ( test )" CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] !dev-python/jinja:compat" RDEPEND="${CDEPEND} dev-python/markupsafe[${PYTHON_USEDEP}]" -BDEPEND="${CDEPEND} - doc? ( - dev-python/sphinx - dev-python/sphinx-issues - dev-python/pallets-sphinx-themes - )" +BDEPEND="${CDEPEND}" +distutils_enable_sphinx docs \ + dev-python/sphinx-issues \ + dev-python/pallets-sphinx-themes distutils_enable_tests pytest # XXX: handle Babel better? @@ -64,12 +62,7 @@ python_compile() { wrap_opts distutils-r1_python_compile } -python_compile_all() { - use doc && emake -C docs html -} - python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) if use examples ; then docinto examples dodoc -r examples/. diff --git a/dev-python/more-itertools/more-itertools-5.0.0.ebuild b/dev-python/more-itertools/more-itertools-5.0.0.ebuild index 09e0597e6387..6ce8521b0fef 100644 --- a/dev-python/more-itertools/more-itertools-5.0.0.ebuild +++ b/dev-python/more-itertools/more-itertools-5.0.0.ebuild @@ -14,30 +14,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc" RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]" BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') - ) " +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme distutils_enable_tests unittest - -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" -} - -python_compile_all() { - if use doc; then - sphinx-build docs docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} diff --git a/dev-python/more-itertools/more-itertools-7.0.0.ebuild b/dev-python/more-itertools/more-itertools-7.0.0.ebuild index dee2705781ee..c0fc2414cc48 100644 --- a/dev-python/more-itertools/more-itertools-7.0.0.ebuild +++ b/dev-python/more-itertools/more-itertools-7.0.0.ebuild @@ -14,29 +14,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc" BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') - ) " +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme distutils_enable_tests unittest - -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" -} - -python_compile_all() { - if use doc; then - sphinx-build docs docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} diff --git a/dev-python/olefile/olefile-0.46.ebuild b/dev-python/olefile/olefile-0.46.ebuild index a78fc2a6f0b8..bd4044fe5ca6 100644 --- a/dev-python/olefile/olefile-0.46.ebuild +++ b/dev-python/olefile/olefile-0.46.ebuild @@ -14,21 +14,6 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="BSD-2" SLOT="0" KEYWORDS="alpha amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="doc" - -BDEPEND=" - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )" +distutils_enable_sphinx doc distutils_enable_tests unittest - -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_compile_all() { - if use doc; then - emake -C doc html - HTML_DOCS=( doc/_build/html/. ) - fi -} diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild index 0ab2053bdfb4..b799abf97aeb 100644 --- a/dev-python/pillow/pillow-6.2.1.ebuild +++ b/dev-python/pillow/pillow-6.2.1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="HPND" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" +IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" REQUIRED_USE="test? ( jpeg tiff )" RESTRICT="!test? ( test )" @@ -35,23 +35,14 @@ RDEPEND=" zlib? ( sys-libs/zlib:0= )" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') - ) test? ( dev-python/pytest[${PYTHON_USEDEP}] media-gfx/imagemagick[png] ) " -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme python_configure_all() { # It's important that these flags are also passed during the install phase @@ -82,10 +73,6 @@ python_configure_all() { tc-export PKG_CONFIG } -python_compile_all() { - use doc && emake -C docs html -} - src_test() { virtx distutils-r1_src_test } @@ -102,7 +89,6 @@ python_install() { } python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) if use examples ; then docinto example dodoc docs/example/* diff --git a/dev-python/pycadf/pycadf-2.6.0.ebuild b/dev-python/pycadf/pycadf-2.6.0.ebuild index 6a47de4706be..9892dce0aad1 100644 --- a/dev-python/pycadf/pycadf-2.6.0.ebuild +++ b/dev-python/pycadf/pycadf-2.6.0.ebuild @@ -14,6 +14,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86" IUSE="doc test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] @@ -26,8 +27,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}] ) doc? ( >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] diff --git a/dev-python/pycadf/pycadf-2.7.0.ebuild b/dev-python/pycadf/pycadf-2.7.0.ebuild index 14407f3c22b6..0bba6096d5c4 100644 --- a/dev-python/pycadf/pycadf-2.7.0.ebuild +++ b/dev-python/pycadf/pycadf-2.7.0.ebuild @@ -14,6 +14,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86" IUSE="doc test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] @@ -26,8 +27,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/subunit-1.0.0[${PYTHON_USEDEP}] >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}] ) doc? ( >=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}] diff --git a/dev-python/pycadf/pycadf-2.9.0.ebuild b/dev-python/pycadf/pycadf-2.9.0-r1.ebuild index 4096e06f15d4..1427cbb70aae 100644 --- a/dev-python/pycadf/pycadf-2.9.0.ebuild +++ b/dev-python/pycadf/pycadf-2.9.0-r1.ebuild @@ -14,6 +14,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86" IUSE="doc test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] @@ -26,8 +27,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}] >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}] ) doc? ( >=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}] diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild index 04253a224e2b..41ee50f5a5eb 100644 --- a/dev-python/pygments/pygments-2.4.2.ebuild +++ b/dev-python/pygments/pygments-2.4.2.ebuild @@ -13,31 +13,22 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Pygments is a syntax highlighting package written in Python" HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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="doc test" +IUSE="test" RESTRICT="!test? ( test )" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) test? ( dev-python/nose[${PYTHON_USEDEP}] virtual/ttf-fonts )" -S="${WORKDIR}/${MY_P}" - -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_compile_all() { - use doc && emake -C doc html -} +distutils_enable_sphinx doc python_test() { cp -r -l tests "${BUILD_DIR}"/ || die @@ -46,8 +37,6 @@ python_test() { } python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all newbashcomp external/pygments.bashcomp pygmentize } diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild index 751bbcc01bcb..fde3dc7c660d 100644 --- a/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild +++ b/dev-python/pyopenssl/pyopenssl-19.1.0.ebuild @@ -18,23 +18,18 @@ HOMEPAGE=" https://github.com/pyca/pyopenssl " SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} LICENSE="Apache-2.0" 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" +IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/six-1.5.2[${PYTHON_USEDEP}] >=dev-python/cryptography-2.8[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') - ) test? ( virtual/python-cffi[${PYTHON_USEDEP}] dev-python/flaky[${PYTHON_USEDEP}] @@ -42,13 +37,8 @@ DEPEND="${RDEPEND} >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )" -S=${WORKDIR}/${MY_P} - -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx doc \ + dev-python/sphinx_rtd_theme python_prepare_all() { # Requires network access @@ -56,15 +46,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - use doc && emake -C doc html -} - python_test() { TZ=UTC pytest -vv || die "Testing failed with ${EPYTHON}" # Fixes bug #627530 } - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild index 2325d26c8f7c..64f8f963b205 100644 --- a/dev-python/pyserial/pyserial-3.4.ebuild +++ b/dev-python/pyserial/pyserial-3.4.ebuild @@ -13,28 +13,21 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="doc examples" +IUSE="examples" -DEPEND=" +BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( dev-python/sphinx ) " -# Usual avoid d'loading un-needed objects.inv file -PATCHES=( "${FILESDIR}"/mapping.patch ) - DOCS=( CHANGES.rst README.rst ) -python_compile_all() { - use doc && emake -C documentation html -} +distutils_enable_sphinx documentation --no-autodoc python_test() { "${EPYTHON}" test/run_all_tests.py loop:// -v || die "Testing failed with ${EPYTHON}" } python_install_all() { - use doc && local HTML_DOCS=( documentation/_build/html/. ) distutils-r1_python_install_all if use examples; then dodoc -r examples diff --git a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild index 10e7f1f4e01c..2f7b6ae71063 100644 --- a/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild +++ b/dev-python/pytest-cov/pytest-cov-2.8.1.ebuild @@ -14,16 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/py-1.4.22[${PYTHON_USEDEP}] >=dev-python/pytest-3.6[${PYTHON_USEDEP}] >=dev-python/coverage-4.4[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]') - ) " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] @@ -35,24 +32,13 @@ DEPEND=" ) " -RESTRICT="!test? ( test )" - PATCHES=( # Bug 597708 "${FILESDIR}/${PN}-2.8.1-disable-broken-tests.patch" ) -python_check_deps() { - use doc || return 0 - local dep - for dep in dev-python/sphinx dev-python/sphinx-py3doc-enhanced-theme; do - has_version ${dep}[${PYTHON_USEDEP}] || return ${?} - done -} - -python_compile_all() { - use doc && sphinx-build -b html docs _build/html -} +distutils_enable_sphinx docs \ + dev-python/sphinx-py3doc-enhanced-theme python_test() { distutils_install_for_testing @@ -60,8 +46,3 @@ python_test() { PYTEST_PLUGINS=${PN/-/_} \ pytest -vv || die "Tests failed under ${EPYTHON}" } - -python_install_all() { - use doc && HTML_DOCS=( _build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2.ebuild b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r1.ebuild index 4a7fd8fdb1d6..463e8e7c7119 100644 --- a/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2.ebuild +++ b/dev-python/python-ceilometerclient/python-ceilometerclient-2.6.2-r1.ebuild @@ -14,6 +14,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" DEPEND=" @@ -24,13 +25,8 @@ DEPEND=" >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] <dev-python/fixtures-2.0[${PYTHON_USEDEP}] >=dev-python/mock-1.2[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] - !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}] >=dev-python/reno-1.8.0[${PYTHON_USEDEP}] >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] )" diff --git a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild b/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild index 45ddeb215af2..6f756660db26 100644 --- a/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild +++ b/dev-python/python-troveclient/python-troveclient-1.3.0.ebuild @@ -21,11 +21,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] ${CDEPEND} test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] diff --git a/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild b/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild index 68fe06af62aa..d05497238be2 100644 --- a/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild +++ b/dev-python/python-troveclient/python-troveclient-2.5.0.ebuild @@ -20,13 +20,8 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] ${CDEPEND} test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] - !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}] >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] >=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] diff --git a/dev-python/service_identity/service_identity-18.1.0.ebuild b/dev-python/service_identity/service_identity-18.1.0.ebuild index e582acd01e68..73195bd293e5 100644 --- a/dev-python/service_identity/service_identity-18.1.0.ebuild +++ b/dev-python/service_identity/service_identity-18.1.0.ebuild @@ -15,7 +15,6 @@ S=${WORKDIR}/${P/_/-} LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" # TODO: upstream made pyopenssl optional RDEPEND=" @@ -24,26 +23,7 @@ RDEPEND=" >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] dev-python/attrs[${PYTHON_USEDEP}]" BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )" + dev-python/setuptools[${PYTHON_USEDEP}]" +distutils_enable_sphinx docs distutils_enable_tests pytest - -python_check_deps() { - use doc || return 0 - - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # Prevent un-needed download during build - sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - emake -C docs html - HTML_DOCS=( docs/_build/html/. ) - fi -} diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest index 6572f49ed9c5..eb30947ca403 100644 --- a/dev-python/sphinx/Manifest +++ b/dev-python/sphinx/Manifest @@ -1,4 +1,2 @@ -DIST Sphinx-1.2.2.tar.gz 3143671 BLAKE2B a21b2a060363ac86832a6a28a623ed410ff0bb39ca3c9c58618ade88f4305996e54c559bb588c518597e31a73fc16e0c37fc57950eb077179f03715dfee72729 SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c -DIST Sphinx-1.2.3.tar.gz 3200548 BLAKE2B 42033c59e6e38247af12c78cb4f69c73b1dfa883aa8a9e6c180bb74de666b45faef24a55c0bfd3aa1f22bf3e632e0e95016eb1bea54e8b5ebc7df78756763b5c SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8 DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c507d6e51393a4b2c4c56563b9a12e3ea3f85d214c6bdbc7834be107384fe9029d09a73da207fd9699c4b77ab8 SHA512 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b diff --git a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild deleted file mode 100644 index bc26f5542538..000000000000 --- a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{5,6} pypy ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 eutils versionator - -MY_PN="Sphinx" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Python documentation generator" -HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc latex test" - -# Split the jinja dep to allow different slots to satisfy it -RDEPEND=" - <dev-python/docutils-0.13[${PYTHON_USEDEP}] - >=dev-python/jinja-2.3[${PYTHON_USEDEP}] - >=dev-python/pygments-1.2[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - latex? ( - dev-texlive/texlive-latexextra - app-text/dvipng - )" -DEPEND="${DEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_compile() { - distutils-r1_python_compile - - # Generate the grammar. It will be caught by install somehow. - # Note that the tests usually do it for us. However, I don't want - # to trust USE=test really running all the tests, especially - # with FEATURES=test-fail-continue. - pushd "${BUILD_DIR}"/lib > /dev/null || die - "${PYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed." - popd > /dev/null || die -} - -python_compile_all() { - use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - - if $(python_is_python3); then - 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die - fi - - nosetests -w "${BUILD_DIR}"/tests -v \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all -} - -replacing_python_eclass() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 1.1.3-r4 ${pv}; then - return 0 - fi - done - - return 1 -} - -pkg_preinst() { - if replacing_python_eclass; then - # the old python.eclass ebuild will want to remove our pickles... - backup_pickle() { - # array to enable filename expansion - local pickle_name=( - "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle - ) - - local dest=${ROOT}${pickle_name[0]#${D}}.backup - - eumask_push 022 - mkdir -p "${dest%/*}" || die - eumask_pop - - cp -p -v "${pickle_name[0]}" "${dest}" \ - || die "Unable to backup grammar pickle from overwriting" - } - - python_foreach_impl backup_pickle - fi -} - -pkg_postinst() { - if replacing_python_eclass; then - local warned - - restore_pickle() { - local backup_name=( - "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup - ) - local dest=${backup_name[0]%.backup} - - mv -v "${backup_name[0]}" "${dest}" \ - || die "Unable to restore grammar pickle backup" - } - - python_foreach_impl restore_pickle - - [[ ${warned} ]] && ewarn "Please try rebuilding the package." - fi -} diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild deleted file mode 100644 index 2a318009d255..000000000000 --- a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 eutils versionator - -MY_PN="Sphinx" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Python documentation generator" -HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.org/project/Sphinx/" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc latex test" - -# Portage has only >= minimum required versions of all rdeps making -# setting of version borders unnecessary -RDEPEND=" - <dev-python/docutils-0.13[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - latex? ( - dev-texlive/texlive-latexextra - app-text/dvipng - )" -DEPEND="${DEPEND} - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_compile() { - distutils-r1_python_compile - - # Generate the grammar. It will be caught by install somehow. - # Note that the tests usually do it for us. However, I don't want - # to trust USE=test really running all the tests, especially - # with FEATURES=test-fail-continue. - pushd "${BUILD_DIR}"/lib > /dev/null || die - "${PYTHON}" -m sphinx.pycode.__init__ \ - || die "Grammar generation failed." - popd > /dev/null || die -} - -python_compile_all() { - use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html -} - -python_test() { - cp -r -l tests "${BUILD_DIR}"/ || die - - if $(python_is_python3); then - 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die - fi - - nosetests -w "${BUILD_DIR}"/tests -v \ - || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - - distutils-r1_python_install_all -} - -replacing_python_eclass() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 1.1.3-r4 ${pv}; then - return 0 - fi - done - - return 1 -} - -pkg_preinst() { - if replacing_python_eclass; then - # the old python.eclass ebuild will want to remove our pickles... - backup_pickle() { - # array to enable filename expansion - local pickle_name=( - "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle - ) - - local dest=${ROOT}${pickle_name[0]#${D}}.backup - - eumask_push 022 - mkdir -p "${dest%/*}" || die - eumask_pop - - cp -p -v "${pickle_name[0]}" "${dest}" \ - || die "Unable to backup grammar pickle from overwriting" - } - - python_foreach_impl backup_pickle - fi -} - -pkg_postinst() { - if replacing_python_eclass; then - local warned - - restore_pickle() { - local backup_name=( - "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup - ) - local dest=${backup_name[0]%.backup} - - mv -v "${backup_name[0]}" "${dest}" \ - || die "Unable to restore grammar pickle backup" - } - - python_foreach_impl restore_pickle - - [[ ${warned} ]] && ewarn "Please try rebuilding the package." - fi -} diff --git a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild b/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild index 790a01e6ab8c..f4bd9a7b00c4 100644 --- a/dev-python/tempest-lib/tempest-lib-1.0.0.ebuild +++ b/dev-python/tempest-lib/tempest-lib-1.0.0-r1.ebuild @@ -14,6 +14,7 @@ LICENSE="Apache-2.0" SLOT="0" KEYWORDS="amd64 ~arm64 x86" IUSE="test" +RESTRICT="!test? ( test )" CDEPEND=" >=dev-python/pbr-1.6[${PYTHON_USEDEP}] @@ -36,11 +37,6 @@ DEPEND=" test? ( ${RDEPEND} >=dev-python/coverage-3.6[${PYTHON_USEDEP}] >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] - <dev-python/sphinx-1.3[${PYTHON_USEDEP}] - >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] - !~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}] >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] diff --git a/dev-python/tempora/tempora-1.14.1-r1.ebuild b/dev-python/tempora/tempora-1.14.1-r1.ebuild index 067df96ad32f..abe49400046e 100644 --- a/dev-python/tempora/tempora-1.14.1-r1.ebuild +++ b/dev-python/tempora/tempora-1.14.1-r1.ebuild @@ -11,11 +11,13 @@ MY_PN="${PN/-/.}" DESCRIPTION="Objects and routines pertaining to date and time" HOMEPAGE="https://github.com/jaraco/tempora" SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" >=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}] @@ -23,12 +25,6 @@ RDEPEND=" dev-python/six[${PYTHON_USEDEP}] " BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep ' - >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}] - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') - ) test? ( ${RDEPEND} >=dev-python/pytest-2.8[${PYTHON_USEDEP}] @@ -37,16 +33,9 @@ BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] ) " -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -python_check_deps() { - use doc || return 0 - has_version ">=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]" && \ - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + ">=dev-python/jaraco-packaging-3.2" \ + ">=dev-python/rst-linker-1.9" python_prepare_all() { # avoid a setuptools_scm dependency @@ -57,13 +46,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - sphinx-build docs docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # Override pytest options to skip flake8 PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \ diff --git a/dev-python/urllib3/urllib3-1.24.2.ebuild b/dev-python/urllib3/urllib3-1.24.2.ebuild index b1598117c52b..cf59c0ffa92f 100644 --- a/dev-python/urllib3/urllib3-1.24.2.ebuild +++ b/dev-python/urllib3/urllib3-1.24.2.ebuild @@ -15,9 +15,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" +IUSE="test" RESTRICT="!test? ( test )" -#RESTRICT="test" RDEPEND=" >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] @@ -37,15 +36,9 @@ DEPEND=" dev-python/pytest[${PYTHON_USEDEP}] >=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})] ) - doc? ( - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) " -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs python_prepare_all() { # skip appengine tests @@ -54,13 +47,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - emake -C docs SPHINXOPTS= html - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # FIXME: get tornado ported case ${EPYTHON} in diff --git a/dev-python/urllib3/urllib3-1.25.7.ebuild b/dev-python/urllib3/urllib3-1.25.7.ebuild index 5795ab0d02a3..036868ec5be8 100644 --- a/dev-python/urllib3/urllib3-1.25.7.ebuild +++ b/dev-python/urllib3/urllib3-1.25.7.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="brotli doc test" +IUSE="brotli test" RESTRICT="!test? ( test )" RDEPEND=" @@ -39,15 +39,9 @@ BDEPEND=" >=dev-python/trustme-0.5.3[${PYTHON_USEDEP}] >=www-servers/tornado-4.2.1[$(python_gen_usedep python{2_7,3_{5,6,7}})] ) - doc? ( - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) " -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs python_prepare_all() { # tests requiring a route to be present @@ -70,13 +64,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - emake -C docs SPHINXOPTS= html - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # FIXME: get tornado ported case ${EPYTHON} in diff --git a/dev-python/virtualenv/virtualenv-16.7.7.ebuild b/dev-python/virtualenv/virtualenv-16.7.7.ebuild index 0c593103eb94..a060296f7646 100644 --- a/dev-python/virtualenv/virtualenv-16.7.7.ebuild +++ b/dev-python/virtualenv/virtualenv-16.7.7.ebuild @@ -20,15 +20,10 @@ LICENSE="MIT" #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" SLOT="0" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" BDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - dev-python/towncrier[${PYTHON_USEDEP}] - ') - ) test? ( >=dev-python/pip-19.3.1-r1[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] @@ -43,9 +38,6 @@ BDEPEND=">=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}] DOCS=( docs/index.rst docs/changes.rst ) -# uncomment if line above is removed -RESTRICT="!test? ( test )" - PATCHES=( "${FILESDIR}/virtualenv-16.7.7-tests.patch" @@ -53,30 +45,9 @@ PATCHES=( "${FILESDIR}/virtualenv-16.7.7-tests-internet.patch" ) -python_check_deps() { - use doc || return 0 - - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" && \ - has_version "dev-python/towncrier[${PYTHON_USEDEP}]" -} - -python_compile_all() { - if use doc; then - sed -i -e 's:^intersphinx_mapping:disabled_&:' \ - docs/conf.py || die - - sphinx-build -b html -d docs/_build/doctrees docs \ - docs/_build/html || die - - HTML_DOCS+=( "docs/_build/html/." ) - fi -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) - distutils-r1_python_install_all -} +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme \ + dev-python/towncrier python_test() { cp "${S}"/LICENSE.txt "${BUILD_DIR}"/lib || \ diff --git a/dev-python/webtest/webtest-2.0.33.ebuild b/dev-python/webtest/webtest-2.0.33.ebuild index 192dfb7318f4..c9df5a13b440 100644 --- a/dev-python/webtest/webtest-2.0.33.ebuild +++ b/dev-python/webtest/webtest-2.0.33.ebuild @@ -13,11 +13,13 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Helper to test WSGI applications" HOMEPAGE="https://pypi.org/project/WebTest/" SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" # nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest RDEPEND=" @@ -28,10 +30,6 @@ RDEPEND=" DEPEND="${RDEPEND} app-arch/unzip dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - ') - ) test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/pyquery[${PYTHON_USEDEP}] dev-python/pastedeploy[${PYTHON_USEDEP}] @@ -40,31 +38,11 @@ DEPEND="${RDEPEND} $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 ) )" -S="${WORKDIR}/${MY_P}" - -RESTRICT="!test? ( test )" - PATCHES=( "${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch" ) -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # Prevent un-needed d'loading during doc build - sed -i -e 's:^intersphinx_mapping:disabled_&: ; s:^templates_path:#&:' \ - docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - sphinx-build docs html || die - fi -} +distutils_enable_sphinx docs python_test() { distutils_install_for_testing @@ -72,8 +50,3 @@ python_test() { local -x PYTHONPATH= nosetests -v || die "Tests fail with ${EPYTHON}" } - -python_install_all() { - use doc && local HTML_DOCS=( html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/zipp/zipp-0.6.0-r1.ebuild b/dev-python/zipp/zipp-0.6.0-r1.ebuild index 0088457fca8f..019614500c35 100644 --- a/dev-python/zipp/zipp-0.6.0-r1.ebuild +++ b/dev-python/zipp/zipp-0.6.0-r1.ebuild @@ -14,35 +14,26 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc test" +IUSE="test" RDEPEND="dev-python/more-itertools[${PYTHON_USEDEP}]" BDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] test? ( ${RDEPEND} - $(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6,7}}) - $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6,7}}) - $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6,7}}) - ) - doc? ( - $(python_gen_any_dep ' - >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}] - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') + $(python_gen_cond_dep ' + dev-python/contextlib2[${PYTHON_USEDEP}] + dev-python/pathlib2[${PYTHON_USEDEP}] + dev-python/unittest2[${PYTHON_USEDEP}] + ' pypy{,3} python{2_7,3_{5,6,7}}) ) " -distutils_enable_tests pytest +distutils_enable_sphinx docs \ + ">=dev-python/jaraco-packaging-3.2" \ + ">=dev-python/rst-linker-1.9" -python_check_deps() { - if use doc; then - has_version ">=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]" || return ${?} - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" || return ${?} - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" || return ${?} - fi -} +distutils_enable_tests pytest python_prepare_all() { sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die @@ -50,10 +41,3 @@ python_prepare_all() { setup.cfg || die distutils-r1_python_prepare_all } - -python_compile_all() { - if use doc; then - sphinx-build docs docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 63e77bf014c1..f44f0aee9c21 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -232,6 +232,102 @@ fi # } # @CODE +# @FUNCTION: distutils_enable_sphinx +# @USAGE: <subdir> [--no-autodoc | <plugin-pkgs>...] +# @DESCRIPTION: +# Set up IUSE, BDEPEND, python_check_deps() and python_compile_all() for +# building HTML docs via dev-python/sphinx. python_compile_all() will +# append to HTML_DOCS if docs are enabled. +# +# This helper is meant for the most common case, that is a single Sphinx +# subdirectory with standard layout, building and installing HTML docs +# behind USE=doc. It assumes it's the only consumer of the three +# aforementioned functions. If you need to use a custom implemention, +# you can't use it. +# +# If your package uses additional Sphinx plugins, they should be passed +# (without PYTHON_USEDEP) as <plugin-pkgs>. The function will take care +# of setting appropriate any-of dep and python_check_deps(). +# +# If no plugin packages are specified, the eclass will still utilize +# any-r1 API to support autodoc (documenting source code). +# If the package uses neither autodoc nor additional plugins, you should +# pass --no-autodoc to disable this API and simplify the resulting code. +# +# This function must be called in global scope. Take care not to +# overwrite the variables set by it. If you need to extend +# python_compile_all(), you can call the original implementation +# as sphinx_compile_all. +distutils_enable_sphinx() { + debug-print-function ${FUNCNAME} "${@}" + [[ ${#} -ge 1 ]] || die "${FUNCNAME} takes at least one arg: <subdir>" + + _DISTUTILS_SPHINX_SUBDIR=${1} + shift + _DISTUTILS_SPHINX_PLUGINS=( "${@}" ) + + local deps autodoc=1 d + for d; do + if [[ ${d} == --no-autodoc ]]; then + autodoc= + else + deps+=" + ${d}[\${PYTHON_USEDEP}]" + fi + done + + if [[ ! ${autodoc} && -n ${deps} ]]; then + die "${FUNCNAME}: do not pass --no-autodoc if external plugins are used" + fi + if [[ ${autodoc} ]]; then + deps="$(python_gen_any_dep " + dev-python/sphinx[\${PYTHON_USEDEP}] + ${deps}")" + + python_check_deps() { + use doc || return 0 + local p + for p in dev-python/sphinx "${_DISTUTILS_SPHINX_PLUGINS[@]}"; do + has_version "${p}[${PYTHON_USEDEP}]" || return 1 + done + } + else + deps="dev-python/sphinx" + fi + + sphinx_compile_all() { + use doc || return + + local confpy=${_DISTUTILS_SPHINX_SUBDIR}/conf.py + [[ -f ${confpy} ]] || + die "${confpy} not found, distutils_enable_sphinx call wrong" + + if [[ ${_DISTUTILS_SPHINX_PLUGINS[0]} == --no-autodoc ]]; then + if grep -F -q 'sphinx.ext.autodoc' "${confpy}"; then + die "distutils_enable_sphinx: --no-autodoc passed but sphinx.ext.autodoc found in ${confpy}" + fi + else + if ! grep -F -q 'sphinx.ext.autodoc' "${confpy}"; then + die "distutils_enable_sphinx: sphinx.ext.autodoc not found in ${confpy}, pass --no-autodoc" + fi + fi + + build_sphinx "${_DISTUTILS_SPHINX_SUBDIR}" + } + python_compile_all() { sphinx_compile_all; } + + IUSE+=" doc" + if [[ ${EAPI} == [56] ]]; then + DEPEND+=" doc? ( ${deps} )" + else + BDEPEND+=" doc? ( ${deps} )" + fi + + # we need to ensure successful return in case we're called last, + # otherwise Portage may wrongly assume sourcing failed + return 0 +} + # @FUNCTION: distutils_enable_tests # @USAGE: <test-runner> # @DESCRIPTION: diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 44337c687aad..4f3ac66f2150 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -1343,6 +1343,31 @@ python_export_utf8_locale() { return 0 } +# @FUNCTION: build_sphinx +# @USAGE: <directory> +# @DESCRIPTION: +# Build HTML documentation using dev-python/sphinx in the specified +# <directory>. Takes care of disabling Intersphinx and appending +# to HTML_DOCS. +# +# If <directory> is relative to the current directory, care needs +# to be taken to run einstalldocs from the same directory +# (usually ${S}). +build_sphinx() { + debug-print-function ${FUNCNAME} "${@}" + [[ ${#} -eq 1 ]] || die "${FUNCNAME} takes 1 arg: <directory>" + + local dir=${1} + + sed -i -e 's:^intersphinx_mapping:disabled_&:' \ + "${dir}"/conf.py || die + # not all packages include the Makefile in pypi tarball + sphinx-build -b html -d "${dir}"/_build/doctrees "${dir}" \ + "${dir}"/_build/html || die + + HTML_DOCS+=( "${dir}/_build/html/." ) +} + # -- python.eclass functions -- _python_check_dead_variables() { diff --git a/net-libs/quiche/quiche-0.1.0.ebuild b/net-libs/quiche/quiche-0.1.0.ebuild index 8736c5d257b0..d1aa05dee417 100644 --- a/net-libs/quiche/quiche-0.1.0.ebuild +++ b/net-libs/quiche/quiche-0.1.0.ebuild @@ -133,7 +133,7 @@ if [[ ${PV} == *9999 ]] ; then else CRATES+=" ${P//_/-}" SRC_URI="$(cargo_crate_uris ${CRATES})" - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" S="${WORKDIR}/${P//_/-}" fi diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index d6371f5ea880..3257d4f54616 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -7,6 +7,12 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Michał Górny <mgorny@gentoo.org> (2019-11-25) +# Requires old version of dev-python/sphinx that's being removed. +~dev-python/fabric-2.3.1 doc +<dev-python/hacking-1.1.0 doc +<dev-python/pycadf-2.7.0 doc + # Michał Górny <mgorny@gentoo.org> (2019-11-09) # eMovix is being removed. kde-apps/k3b emovix diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild index e7b9119d36b6..8949f24212b0 100644 --- a/sys-apps/portage/portage-2.3.79.ebuild +++ b/sys-apps/portage/portage-2.3.79.ebuild @@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" SLOT="0" IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 7dc6cfad66cc..9700ba5d8a81 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -94,6 +94,9 @@ DIST genpatches-4.9-206.extras.tar.xz 17352 BLAKE2B 462793f456de370da66948d1d0cc DIST genpatches-4.9-207.base.tar.xz 3512600 BLAKE2B 0368ac2b37caf1260d0304d3968d3109f33336b280b7dafcb761f687e8a179146a4c9f571b8dcd4b6581e499caf904f71068e42b67e9f078db6303c0671d3a15 SHA512 e5d548b5afc3b9bf4f46801e2244e34baa7276331b6c87a018ab5cd8439df196ed6b4f1aafc007fe2731cd6eeafec012858a280760acff07b58eaa7f18fd5183 DIST genpatches-4.9-207.experimental.tar.xz 106368 BLAKE2B a43c63e641c5f3108fd3bcbe46e04fdfcc79a190a7b9a9a7aa85a9595c338c4211f899e28f40ae1e4b5e07b5487814f6c1f0df8a7bfa0de2db65d03e78095dc1 SHA512 e0224638c0bad277af47a7f763698f8b4f096f1d00cc6e6bca83c0316629bf2c2ee51acb01b542f983f52a87909ac81bfda0ee67ccab842e7fbbb487ec9c4942 DIST genpatches-4.9-207.extras.tar.xz 17364 BLAKE2B aadfeabdce6f334aa17cd9050b6a51a1bdc63e048634ca99d10e5418ef4bffc187554b9c237d2859a8ae9c6dc897d47df3d0842ca5cd093f11000eb2790a7638 SHA512 fd81605f4b89b740ec1833d199ccf0f800dfe9e7f6d58531bf6ee8c2ba23771695b8d878da11eaff4a648a9a3ce408ed2b7622349b08469990712091be34cf8e +DIST genpatches-4.9-208.base.tar.xz 3556800 BLAKE2B e2b1669a938b4283a1a2f10f21ca7420b5d9195124e19ee07fa797b174b5ca8f6fb82fa11763f6dc9278cee248c62ea7dd6a53917746165b26312d3848fe28ee SHA512 bd71eed8091e2329af51d06535b544a807b11f03512b4d94cf063021e007a1a5ce982b056d4667268a1fb8a0b86aab8b29854161002d89ba05445e1fdb6c2b88 +DIST genpatches-4.9-208.experimental.tar.xz 106404 BLAKE2B 44fdfc1fcaa908d7a3be59e2d6778322af8a72c7a475fa02548a4eabe13e5ad1fab275b7de8c1e766f4c1d9f0258ebf0062864b8e29acbe79e637054fa5009c7 SHA512 bd2e0bfb5be072fe5e2535aabb50b51e0ac522f6d22e6c48afdc4af4eab411bf5596c5ec4cd70de005eac2124b88bbf9041937bc4191693d9c5bdfeb222bf038 +DIST genpatches-4.9-208.extras.tar.xz 17360 BLAKE2B 95edefd4d14829086b477b1c8995b19a1a5a801c357f7736688eb28ef1e12788b6ba0d5c7fa592fae378348c718779b0f85dc04f963d98cd47833c9433d74637 SHA512 44caaefb6836314b2f5db4723726415d5ab9254d5aad54aa1f72fbd3adfa055c77aa9c0494ab87468c55223704f161b4b73f4ac23b57793f0e4b2028a35c3442 DIST genpatches-5.3-10.base.tar.xz 316072 BLAKE2B 741a8fd2521e8864769cb85ebfea80ee8a15c13f0b7e2011a1e46bd35f5e34f3172d39700e0e4f214e5f32d1940fbe7abbe46e6c6eb99986d8b7141a54f70658 SHA512 3fe07ea3d905464c43e58bc4f13596c7ab9f9eb73b25c8d1f550cad534e6659901e09e9716bae048f41dc01d992832d0b105af87b25b6020936b60a102bf833b DIST genpatches-5.3-10.experimental.tar.xz 6144 BLAKE2B 8f182a7c9a64020edd2a59db60467395f8abafacc2f6cc07ab0f587b2e595eb9c0ba762e8bac238cbad03f8831712417a019c0272b82b5f26aef84057aef3ec6 SHA512 ae33f0975affa27eab98af872fc6200297827f60cf5a63152c95d5e36f179dfa8423c44e2497c9f2be1127621856514e17dd0fd15876d4cc6979533acc1a4471 DIST genpatches-5.3-10.extras.tar.xz 1736 BLAKE2B 2274a8fd0a697367633f2281af657ce8a5dfc892e6ff338a39185bc28a8ddad3b667a8f5fe466eeae08b16edfa5832474eb3857109960529406ca80c5ef8d59d SHA512 4c4caeaadc406a2b202f302683f343d49e9469af9667021b663dbcfccdaa6869287393e03ab39d38202d5e140cde68122d7005124e61e63957a119218d0b4384 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.203.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.203.ebuild new file mode 100644 index 000000000000..32619cba97a1 --- /dev/null +++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.203.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="208" + +inherit kernel-2 +detect_version +detect_arch + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches" +IUSE="experimental" + +DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}" + +pkg_postinst() { + kernel-2_pkg_postinst + einfo "For more info on this patchset, and how to report problems, see:" + einfo "${HOMEPAGE}" +} + +pkg_postrm() { + kernel-2_pkg_postrm +} diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 08ee3206a9dd..939f324b27c6 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,5 +1,4 @@ DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 -DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch deleted file mode 100644 index e049d77141e4..000000000000 --- a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch +++ /dev/null @@ -1,259 +0,0 @@ -diff --git a/build.xml b/build.xml -index 179802b..49ac8c0 100644 ---- a/build.xml -+++ b/build.xml -@@ -727,24 +727,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - <!-- Servlet 3.1 Implementation JAR File --> -+<!-- - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" - manifest="${tomcat.manifests}/servlet-api.jar.manifest" - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" /> -- -+--> - <!-- JSP 2.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> -+--> - - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" /> -+--> - - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" -@@ -836,9 +841,9 @@ - filesId="files.jasper-el" /> - - <!-- Re-packaged Apache Commons DBCP 2--> -- <jarIt jarfile="${tomcat-dbcp.jar}" -+<!-- <jarIt jarfile="${tomcat-dbcp.jar}" - filesDir="${tomcat.classes}" -- filesId="files.tomcat-dbcp" /> -+ filesId="files.tomcat-dbcp" /> --> - - <!-- i18n JARs --> - <jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar" -@@ -1030,9 +1035,9 @@ - - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" - description="Default. Builds a working Tomcat instance"> -- -+<!-- - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -- -+--> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> -@@ -1092,7 +1097,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1128,7 +1133,7 @@ - </javac> - </target> - -- <target name="build-tomcat-jdbc" depends="package"> -+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1143,7 +1148,7 @@ - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> - </target> - -- <target name="build-tomcat-jdbc-src"> -+ <target name="build-tomcat-jdbc-src" unless="noget"> - <!-- build the jdbc-pool source jar--> - <echo message="Building Tomcat JDBC pool src JAR"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1246,9 +1251,11 @@ - - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.embed}" /> -+--> - <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> - - <!-- Note the meta-inf below will work as long as there is only one JAR -@@ -1629,7 +1636,7 @@ - - <target name="extras-webservices-prepare" - depends="extras-prepare" -- description="Prepare to build web services extras package"> -+ description="Prepare to build web services extras package" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${jaxrpc-lib.loc}"/> -@@ -1793,6 +1800,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - <target name="javadoc" depends="dist-source,extras-webservices-prepare" - description="Create the Tomcat javadoc" > -+<!-- - <javadoc packagenames="javax.servlet.*" - excludepackagenames="javax.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -1857,6 +1865,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+--> - <javadoc packagenames="javax.websocket.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1897,9 +1906,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <path refid="tomcat.webservices.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> -+<!-- - <link href="../servletapi"/> - <link href="../jspapi"/> - <link href="../elapi"/> -+--> - <link href="../websocketapi"/> - <link href="http://docs.oracle.com/javase/7/docs/api/"/> - <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2629,7 +2640,7 @@ skip.installer property in build.properties" /> - </target> - - <target name="download-compile" -- description="Download components necessary to compile" > -+ description="Download components necessary to compile" unless="noget" > - - <!-- Download Commons Daemon --> - <antcall target="downloadgz-2"> -@@ -2655,7 +2666,7 @@ skip.installer property in build.properties" /> - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2733,7 +2744,7 @@ skip.installer property in build.properties" /> - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2788,13 +2799,13 @@ skip.installer property in build.properties" /> - - <!-- =============== Utility Targets to support downloads ================ --> - -- <target name="setproxy" if="${proxy.use}"> -+ <target name="setproxy" if="${proxy.use}" unless="noget"> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - -- <target name="testexist"> -+ <target name="testexist" unless="noget"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> -@@ -2916,7 +2927,7 @@ skip.installer property in build.properties" /> - </sequential> - </macrodef> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2933,7 +2944,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2958,7 +2969,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2974,7 +2985,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -2998,7 +3009,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" /> - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3041,7 +3052,7 @@ skip.installer property in build.properties" /> - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="trydownload.check" depends="setproxy"> -+ <target name="trydownload.check" depends="setproxy" unless="noget"> - <condition property="trydownload.run"> - <and> - <not> -@@ -3052,7 +3063,7 @@ skip.installer property in build.properties" /> - </condition> - </target> - -- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> - <!-- Downloads a file if not yet downloaded and the source URL is available --> - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> - </target> -@@ -3063,7 +3074,7 @@ skip.installer property in build.properties" /> - - <target name="ide-eclipse" - depends="download-compile, extras-webservices-prepare, download-test-compile" -- description="Prepares the source tree to be built in Eclipse"> -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - <!-- Copy the sample project files into the root directory --> - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> diff --git a/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch deleted file mode 100644 index a4bcbeb949bc..000000000000 --- a/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch +++ /dev/null @@ -1,278 +0,0 @@ -diff --git a/build.xml b/build.xml -index b3b299f..40bf4f8 100644 ---- a/build.xml -+++ b/build.xml -@@ -752,6 +752,7 @@ - addOSGi="true" /> - - <!-- Servlet 4.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${servlet-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.servlet-api" -@@ -759,21 +760,23 @@ - notice="${tomcat.manifests}/servlet-api.jar.notice" - license="${tomcat.manifests}/servlet-api.jar.license" - addOSGi="true" /> -- -+--> - <!-- JSP 2.3 Implementation JAR File --> -+<!-- - <jarIt jarfile="${jsp-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.jsp-api" - manifest="${tomcat.manifests}/jsp-api.jar.manifest" - addOSGi="true" /> -- -+--> - <!-- EL 3.0 Implementation JAR File --> -+<!-- - <jarIt jarfile="${el-api.jar}" - filesDir="${tomcat.classes}" - filesId="files.el-api" - manifest="${tomcat.manifests}/el-api.jar.manifest" - addOSGi="true" /> -- -+--> - <!-- WebSocket 1.1 API JAR File --> - <jarIt jarfile="${websocket-api.jar}" - filesDir="${tomcat.classes}" -@@ -879,10 +882,10 @@ - addOSGi="true" /> - - <!-- Re-packaged Apache Commons DBCP 2--> -- <jarIt jarfile="${tomcat-dbcp.jar}" -+<!-- <jarIt jarfile="${tomcat-dbcp.jar}" - filesDir="${tomcat.classes}" - filesId="files.tomcat-dbcp" -- addOSGi="true" /> -+ addOSGi="true" /> --> - - <!-- i18n JARs --> - <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar" -@@ -1124,9 +1127,9 @@ - - <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" - description="Default. Builds a working Tomcat instance"> -- -+<!-- - <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> -- -+--> - <!-- Copy scripts --> - <copy todir="${tomcat.build}/bin"> - <fileset dir="bin"> -@@ -1186,7 +1189,7 @@ - <exclude name="${jdt.jar.filename}"/> - </fileset> - </delete> -- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -+<!-- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> --> - - <!-- Add sources for examples --> - <antcall target="examples-sources" /> -@@ -1222,7 +1225,7 @@ - </javac> - </target> - -- <target name="build-tomcat-jdbc" depends="package"> -+ <target name="build-tomcat-jdbc" depends="package" unless="noget"> - <!-- build the jdbc-pool jar and source jar--> - <echo message="Building Tomcat JDBC pool libraries"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1237,7 +1240,7 @@ - <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/> - </target> - -- <target name="build-tomcat-jdbc-src"> -+ <target name="build-tomcat-jdbc-src" unless="noget"> - <!-- build the jdbc-pool source jar--> - <echo message="Building Tomcat JDBC pool src JAR"/> - <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" -@@ -1340,9 +1343,11 @@ - - <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" /> - <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" /> -+<!-- - <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}" - failonerror="false"/> - <copy file="${jdt.jar}" todir="${tomcat.embed}" /> -+--> - <copy file="${annotations-api.jar}" todir="${tomcat.embed}" /> - - <!-- Note the meta-inf below will work as long as there is only one JAR -@@ -1849,11 +1854,12 @@ - </copy> - - <!-- Source bundles for native components --> -+<!-- - <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" - file="${tomcat-native.tar.gz}" /> - <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" - file="${commons-daemon.native.src.tgz}" /> -- -+--> - <!-- platform README files --> - <echo append="false" file="${tomcat.dist}/bin/x64/README"> - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1863,6 +1869,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - <target name="javadoc" depends="dist-source" - description="Create the Tomcat javadoc" > -+<!-- - <javadoc packagenames="javax.servlet.*" - excludepackagenames="javax.servlet.jsp.*" - sourcepath="${tomcat.dist}/src/java" -@@ -1924,6 +1931,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <path location="${ant.core.lib}"/> - </classpath> - </javadoc> -+--> - <javadoc packagenames="javax.websocket.*" - sourcepath="${tomcat.dist}/src/java" - destdir="${tomcat.dist}/webapps/docs/websocketapi" -@@ -1962,9 +1970,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - <path refid="compile.classpath"/> - <path location="${ant.core.lib}"/> - </classpath> -+<!-- - <link href="../servletapi"/> - <link href="../jspapi"/> - <link href="../elapi"/> -+--> - <link href="../websocketapi"/> - <link href="http://docs.oracle.com/javase/8/docs/api/"/> - <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2686,7 +2696,7 @@ skip.installer property in build.properties" /> - </target> - - <target name="download-compile" -- description="Download components necessary to compile" > -+ description="Download components necessary to compile" unless="noget" > - - <!-- Download Commons Daemon --> - <antcall target="downloadgz-2"> -@@ -2741,7 +2751,7 @@ skip.installer property in build.properties" /> - </target> - - <target name="download-test-compile" -- description="Download additional components for the tests" > -+ description="Download additional components for the tests" unless="noget"> - - <antcall target="downloadfile"> - <param name="sourcefile" value="${junit.loc}"/> -@@ -2819,7 +2829,7 @@ skip.installer property in build.properties" /> - </target> - - <target name="download-dist" -- description="Download additional components for a distribution" > -+ description="Download additional components for a distribution" unless="noget"> - - <antcall target="downloadfile-2"> - <param name="sourcefile.1" value="${tomcat-native.loc.1}"/> -@@ -2874,13 +2884,13 @@ skip.installer property in build.properties" /> - - <!-- =============== Utility Targets to support downloads ================ --> - -- <target name="setproxy" if="${proxy.use}"> -+ <target name="setproxy" if="${proxy.use}" unless="noget"> - <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" - proxyuser="${proxy.user}" proxypassword="${proxy.password}" /> - <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/> - </target> - -- <target name="testexist"> -+ <target name="testexist" unless="noget"> - <echo message="Testing for ${destfile}"/> - <available file="${destfile}" property="exist"/> - </target> -@@ -3002,7 +3012,7 @@ skip.installer property in build.properties" /> - </sequential> - </macrodef> - -- <target name="downloadgz" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadgz" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3019,7 +3029,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadgz-2" unless="exist" depends="testexist"> -+ <target name="downloadgz-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3044,7 +3054,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}.tar.gz"/> - </target> - -- <target name="downloadzip" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadzip" unless="noget" depends="testexist,setproxy"> - <!-- Download and extract the package --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3060,7 +3070,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}"/> - </target> - -- <target name="downloadzip-2" unless="exist" depends="testexist"> -+ <target name="downloadzip-2" unless="noget" depends="testexist"> - <!-- Download and extract the package from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3084,7 +3094,7 @@ skip.installer property in build.properties" /> - <delete file="${temp.file}"/> - </target> - -- <target name="downloadfile" unless="exist" depends="testexist,setproxy"> -+ <target name="downloadfile" unless="noget" depends="testexist,setproxy"> - <!-- Download the file --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3099,7 +3109,7 @@ skip.installer property in build.properties" /> - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="downloadfile-2" unless="exist" depends="testexist"> -+ <target name="downloadfile-2" unless="noget" depends="testexist"> - <!-- Download the file from the two alternative locations --> - <local name="temp.file"/> - <mkdir dir="${base.path}"/> -@@ -3127,7 +3137,7 @@ skip.installer property in build.properties" /> - <move file="${temp.file}" tofile="${destfile}"/> - </target> - -- <target name="trydownload.check" depends="setproxy"> -+ <target name="trydownload.check" depends="setproxy" unless="noget"> - <condition property="trydownload.run"> - <and> - <not> -@@ -3138,7 +3148,7 @@ skip.installer property in build.properties" /> - </condition> - </target> - -- <target name="trydownload" if="trydownload.run" depends="trydownload.check"> -+ <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget"> - <!-- Downloads a file if not yet downloaded and the source URL is available --> - <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" /> - </target> -@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" /> - - <target name="ide-eclipse" - depends="download-compile, download-test-compile" -- description="Prepares the source tree to be built in Eclipse"> -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - <!-- Copy the sample project files into the root directory --> - <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/> -@@ -3167,7 +3177,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - <target name="ide-intellij" - depends="download-compile, download-test-compile" -- description="Creates project directory .idea for IntelliJ IDEA"> -+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> - - <copy todir="${tomcat.home}/.idea"> - <fileset dir="${tomcat.home}/res/ide-support/idea"/> diff --git a/www-servers/tomcat/tomcat-8.5.46.ebuild b/www-servers/tomcat/tomcat-8.5.46.ebuild deleted file mode 100644 index 0437014fa017..000000000000 --- a/www-servers/tomcat/tomcat-8.5.46.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source test" - -inherit eutils java-pkg-2 java-ant-2 prefix user - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="8.5" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.5" -SAPI_SLOT="3.1" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.7" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-core-1.9.13 - >=virtual/jdk-1.7 - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # Remove bundled servlet-api - rm -rv java/javax/{el,servlet} || die - - eapply "${FILESDIR}/${PN}-8.5.40-build.xml.patch" - - # For use of catalina.sh in netbeans - sed -i -e "/^# ----- Execute The Requested Command/ a\ - CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ - bin/catalina.sh || die - - java-pkg-2_src_prepare -} - -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" - -# revisions of the scripts -IM_REV="-r2" -INIT_REV="-r1" - -src_compile() { - EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" - java-pkg-2_src_compile -} - -src_test() { - java-pkg-2_src_test -} - -src_install() { - local dest="/usr/share/${PN}-${SLOT}" - - java-pkg_jarinto "${dest}"/bin - java-pkg_dojar output/build/bin/*.jar - exeinto "${dest}"/bin - doexe output/build/bin/*.sh - - java-pkg_jarinto "${dest}"/lib - java-pkg_dojar output/build/lib/*.jar - - dodoc RELEASE-NOTES RUNNING.txt - use doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - insinto "${dest}"/webapps - doins -r output/build/webapps/{host-manager,manager,ROOT} - use extra-webapps && doins -r output/build/webapps/{docs,examples} - - ### Config ### - - # create "logs" directory in $CATALINA_BASE - # and set correct perms, see #458890 - dodir "${dest}"/logs - fperms 0750 "${dest}"/logs - - # replace the default pw with a random one, see #92281 - local randpw="$(pwgen -s -B 15 1)" - sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die - - # prepend gentoo.classpath to common.loader, see #453212 - sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die - - insinto "${dest}" - doins -r output/build/conf - - ### rc ### - - cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die - eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} - sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die - - insinto "${dest}"/gentoo - doins "${T}"/tomcat.conf - exeinto "${dest}"/gentoo - newexe "${T}"/tomcat${INIT_REV}.init tomcat.init - newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash -} - -pkg_postinst() { - elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" - elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat." - elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" - - elog "To manage Tomcat instances, run:" - elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" - - ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" - ewarn "from upstream binary if you need it. Gentoo Bug # 144276" - - einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and" - einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." -} |