From a82d114183b2b95bee1deef5fd0de54fdd8e953c Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Tue, 25 Jul 2017 21:26:37 +0000 Subject: dev-python/twisted: Rev bump, adds dev-python/incremental to RDEPEND for binpkgs Fixes bug 626168 Package-Manager: Portage-2.3.6, Repoman-2.3.1 --- dev-python/twisted/twisted-16.6.0-r2.ebuild | 181 --------------------------- dev-python/twisted/twisted-16.6.0-r3.ebuild | 183 +++++++++++++++++++++++++++ dev-python/twisted/twisted-17.1.0-r1.ebuild | 182 --------------------------- dev-python/twisted/twisted-17.1.0-r2.ebuild | 184 +++++++++++++++++++++++++++ dev-python/twisted/twisted-17.5.0-r1.ebuild | 186 ++++++++++++++++++++++++++++ dev-python/twisted/twisted-17.5.0.ebuild | 184 --------------------------- 6 files changed, 553 insertions(+), 547 deletions(-) delete mode 100644 dev-python/twisted/twisted-16.6.0-r2.ebuild create mode 100644 dev-python/twisted/twisted-16.6.0-r3.ebuild delete mode 100644 dev-python/twisted/twisted-17.1.0-r1.ebuild create mode 100644 dev-python/twisted/twisted-17.1.0-r2.ebuild create mode 100644 dev-python/twisted/twisted-17.5.0-r1.ebuild delete mode 100644 dev-python/twisted/twisted-17.5.0.ebuild (limited to 'dev-python') diff --git a/dev-python/twisted/twisted-16.6.0-r2.ebuild b/dev-python/twisted/twisted-16.6.0-r2.ebuild deleted file mode 100644 index 0ba782a66711..000000000000 --- a/dev-python/twisted/twisted-16.6.0-r2.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{4,5,6}) -PYTHON_REQ_USE="threads(+)" - -inherit eutils flag-o-matic distutils-r1 versionator - -TWISTED_PN="Twisted" -TWISTED_P="${TWISTED_PN}-${PV}" -TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}") - -DESCRIPTION="An asynchronous networking framework written in Python" -HOMEPAGE="http://www.twistedmatrix.com/" -SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}" -SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 - https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz" - -# Dropped keywords due to new deps not keyworded -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86" - -LICENSE="MIT" -SLOT="0" -IUSE="conch crypt http2 serial +soap test" - -RDEPEND=">=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}] - conch? ( - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] - ) - crypt? ( - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - >=dev-python/idna-0.6[${PYTHON_USEDEP}] - ) - serial? ( dev-python/pyserial[${PYTHON_USEDEP}] ) - soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) ) - http2? ( - >=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}] - =dev-python/priority-1.1.0[${PYTHON_USEDEP}] - =dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - !dev-python/twisted-core - !dev-python/twisted-conch - !dev-python/twisted-lore - !dev-python/twisted-mail - !dev-python/twisted-names - !dev-python/twisted-news - !dev-python/twisted-pair - !dev-python/twisted-runner - !dev-python/twisted-words - !dev-python/twisted-web -" -DEPEND=" - >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] - test? ( - dev-python/gmpy[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] - dev-python/pyserial[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable. - "${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch" - "${FILESDIR}/test_main.patch" - "${FILESDIR}/utf8_overrides.patch" - "${FILESDIR}/${PN}-16.6.0-test-fixes.patch" -) - -S=${WORKDIR}/${TWISTED_P} - -python_prepare_all() { - # disable tests that don't work in our sandbox - # and other test failures due to our conditions - if use test ; then - # Remove since this is an upstream distribution test for making releases - rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED" - fi - distutils-r1_python_prepare_all -} - -python_compile() { - if ! python_is_python3; then - # Needed to make the sendmsg extension work - # (see http://twistedmatrix.com/trac/ticket/5701 ) - local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - fi - - distutils-r1_python_compile -} - -python_test() { - distutils_install_for_testing - - export EMERGE_TEST_OVERRIDE=1 - export UTF8_OVERRIDES=1 - # workaround for the eclass not installing the entry points - # in the test environment. copy the old 16.3.2 start script - # to run the tests with - cp "${FILESDIR}"/trial "${TEST_DIR}" - - pushd "${TEST_DIR}" > /dev/null || die - - if ! "${TEST_DIR}"/trial twisted; then - die "Tests failed with ${EPYTHON}" - fi - # due to an anomoly in the tests, python doesn't return the correct form - # of the escape sequence. So run those test separately with a clean python interpreter - export UTF8_OVERRIDES=0 - if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then - die "DaemonizeTests failed with ${EPYTHON}" - fi - if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then - die "SafeStrTests failed with ${EPYTHON}" - fi - - popd > /dev/null || die -} - -python_install() { - distutils-r1_python_install - - cd "${D%/}$(python_get_sitedir)" || die - - # own the dropin.cache so we don't leave orphans - touch twisted/plugins/dropin.cache || die - - python_doscript "${WORKDIR}"/twisted-regen-cache -} - -python_install_all() { - distutils-r1_python_install_all - - newconfd "${FILESDIR}/twistd.conf" twistd - newinitd "${FILESDIR}/twistd.init" twistd -} - -python_postinst() { - twisted-regen-cache || die -} - -pkg_postinst() { - python_foreach_impl python_postinst - - einfo "Install complete" - if use test ; then - einfo "" - einfo "Some tests have been disabled during testing due to" - einfo "known incompatibilities with the emerge sandboxes and/or" - einfo "not runnable as the root user." - einfo "For a complete test suite run on the code." - einfo "Run the tests as a normal user for each python it is installed to." - einfo " ie: $ python3.6 /usr/bin/trial twisted" - einfo "There are a few known python-2.7 errors due to some unicode issues" - einfo "which are different in Gentoo installed python-2.7" - fi -} - -python_postrm() { - rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die -} - -pkg_postrm(){ - # if we're removing the last version, remove the cache file - if [[ ! ${REPLACING_VERSIONS} ]]; then - python_foreach_impl python_postrm - fi -} diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild new file mode 100644 index 000000000000..2ae2e0c005e9 --- /dev/null +++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_{4,5,6}) +PYTHON_REQ_USE="threads(+)" + +inherit eutils flag-o-matic distutils-r1 versionator + +TWISTED_PN="Twisted" +TWISTED_P="${TWISTED_PN}-${PV}" +TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}") + +DESCRIPTION="An asynchronous networking framework written in Python" +HOMEPAGE="http://www.twistedmatrix.com/" +SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}" +SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz" + +# Dropped keywords due to new deps not keyworded +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 x86" + +LICENSE="MIT" +SLOT="0" +IUSE="conch crypt http2 serial +soap test" + +RDEPEND=" + >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] + >=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}] + conch? ( + dev-python/pyasn1[${PYTHON_USEDEP}] + >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] + >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] + ) + crypt? ( + >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + >=dev-python/idna-0.6[${PYTHON_USEDEP}] + ) + serial? ( dev-python/pyserial[${PYTHON_USEDEP}] ) + soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) ) + http2? ( + >=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}] + =dev-python/priority-1.1.0[${PYTHON_USEDEP}] + =dev-python/constantly-15.1.0[${PYTHON_USEDEP}] + !dev-python/twisted-core + !dev-python/twisted-conch + !dev-python/twisted-lore + !dev-python/twisted-mail + !dev-python/twisted-names + !dev-python/twisted-news + !dev-python/twisted-pair + !dev-python/twisted-runner + !dev-python/twisted-words + !dev-python/twisted-web +" +DEPEND=" + >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] + test? ( + dev-python/gmpy[${PYTHON_USEDEP}] + dev-python/pyasn1[${PYTHON_USEDEP}] + >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] + >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + dev-python/idna[${PYTHON_USEDEP}] + dev-python/pyserial[${PYTHON_USEDEP}] + >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable. + "${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch" + "${FILESDIR}/test_main.patch" + "${FILESDIR}/utf8_overrides.patch" + "${FILESDIR}/${PN}-16.6.0-test-fixes.patch" +) + +S=${WORKDIR}/${TWISTED_P} + +python_prepare_all() { + # disable tests that don't work in our sandbox + # and other test failures due to our conditions + if use test ; then + # Remove since this is an upstream distribution test for making releases + rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED" + fi + distutils-r1_python_prepare_all +} + +python_compile() { + if ! python_is_python3; then + # Needed to make the sendmsg extension work + # (see http://twistedmatrix.com/trac/ticket/5701 ) + local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + fi + + distutils-r1_python_compile +} + +python_test() { + distutils_install_for_testing + + export EMERGE_TEST_OVERRIDE=1 + export UTF8_OVERRIDES=1 + # workaround for the eclass not installing the entry points + # in the test environment. copy the old 16.3.2 start script + # to run the tests with + cp "${FILESDIR}"/trial "${TEST_DIR}" + + pushd "${TEST_DIR}" > /dev/null || die + + if ! "${TEST_DIR}"/trial twisted; then + die "Tests failed with ${EPYTHON}" + fi + # due to an anomoly in the tests, python doesn't return the correct form + # of the escape sequence. So run those test separately with a clean python interpreter + export UTF8_OVERRIDES=0 + if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then + die "DaemonizeTests failed with ${EPYTHON}" + fi + if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then + die "SafeStrTests failed with ${EPYTHON}" + fi + + popd > /dev/null || die +} + +python_install() { + distutils-r1_python_install + + cd "${D%/}$(python_get_sitedir)" || die + + # own the dropin.cache so we don't leave orphans + touch twisted/plugins/dropin.cache || die + + python_doscript "${WORKDIR}"/twisted-regen-cache +} + +python_install_all() { + distutils-r1_python_install_all + + newconfd "${FILESDIR}/twistd.conf" twistd + newinitd "${FILESDIR}/twistd.init" twistd +} + +python_postinst() { + twisted-regen-cache || die +} + +pkg_postinst() { + python_foreach_impl python_postinst + + einfo "Install complete" + if use test ; then + einfo "" + einfo "Some tests have been disabled during testing due to" + einfo "known incompatibilities with the emerge sandboxes and/or" + einfo "not runnable as the root user." + einfo "For a complete test suite run on the code." + einfo "Run the tests as a normal user for each python it is installed to." + einfo " ie: $ python3.6 /usr/bin/trial twisted" + einfo "There are a few known python-2.7 errors due to some unicode issues" + einfo "which are different in Gentoo installed python-2.7" + fi +} + +python_postrm() { + rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die +} + +pkg_postrm(){ + # if we're removing the last version, remove the cache file + if [[ ! ${REPLACING_VERSIONS} ]]; then + python_foreach_impl python_postrm + fi +} diff --git a/dev-python/twisted/twisted-17.1.0-r1.ebuild b/dev-python/twisted/twisted-17.1.0-r1.ebuild deleted file mode 100644 index 6ec72680b3c5..000000000000 --- a/dev-python/twisted/twisted-17.1.0-r1.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{4,5,6}) -PYTHON_REQ_USE="threads(+)" - -inherit eutils flag-o-matic distutils-r1 versionator - -TWISTED_PN="Twisted" -TWISTED_P="${TWISTED_PN}-${PV}" -TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}") - -DESCRIPTION="An asynchronous networking framework written in Python" -HOMEPAGE="http://www.twistedmatrix.com/" -SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}" -SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 - https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz" - -# Dropped keywords due to new deps not keyworded -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" - -LICENSE="MIT" -SLOT="0" -IUSE="conch crypt http2 serial +soap test" - -RDEPEND=">=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}] - conch? ( - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] - ) - crypt? ( - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - >=dev-python/idna-0.6[${PYTHON_USEDEP}] - ) - serial? ( dev-python/pyserial[${PYTHON_USEDEP}] ) - soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) ) - http2? ( - >=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}] - =dev-python/priority-1.1.0[${PYTHON_USEDEP}] - =dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/automat-0.3.0[${PYTHON_USEDEP}] - !dev-python/twisted-core - !dev-python/twisted-conch - !dev-python/twisted-lore - !dev-python/twisted-mail - !dev-python/twisted-names - !dev-python/twisted-news - !dev-python/twisted-pair - !dev-python/twisted-runner - !dev-python/twisted-words - !dev-python/twisted-web -" -DEPEND=" - >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] - test? ( - dev-python/gmpy[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] - dev-python/pyserial[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable. - "${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch" - "${FILESDIR}/test_main.patch" - "${FILESDIR}/utf8_overrides.patch" - "${FILESDIR}/${PN}-16.6.0-test-fixes.patch" -) - -S=${WORKDIR}/${TWISTED_P} - -python_prepare_all() { - # disable tests that don't work in our sandbox - # and other test failures due to our conditions - if use test ; then - # Remove since this is an upstream distribution test for making releases - rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED" - fi - distutils-r1_python_prepare_all -} - -python_compile() { - if ! python_is_python3; then - # Needed to make the sendmsg extension work - # (see http://twistedmatrix.com/trac/ticket/5701 ) - local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - fi - - distutils-r1_python_compile -} - -python_test() { - distutils_install_for_testing - - export EMERGE_TEST_OVERRIDE=1 - export UTF8_OVERRIDES=1 - # workaround for the eclass not installing the entry points - # in the test environment. copy the old 16.3.2 start script - # to run the tests with - cp "${FILESDIR}"/trial "${TEST_DIR}" - - pushd "${TEST_DIR}" > /dev/null || die - - if ! "${TEST_DIR}"/trial twisted; then - die "Tests failed with ${EPYTHON}" - fi - # due to an anomoly in the tests, python doesn't return the correct form - # of the escape sequence. So run those test separately with a clean python interpreter - export UTF8_OVERRIDES=0 - if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then - die "DaemonizeTests failed with ${EPYTHON}" - fi - if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then - die "SafeStrTests failed with ${EPYTHON}" - fi - - popd > /dev/null || die -} - -python_install() { - distutils-r1_python_install - - cd "${D%/}$(python_get_sitedir)" || die - - # own the dropin.cache so we don't leave orphans - touch twisted/plugins/dropin.cache || die - - python_doscript "${WORKDIR}"/twisted-regen-cache -} - -python_install_all() { - distutils-r1_python_install_all - - newconfd "${FILESDIR}/twistd.conf" twistd - newinitd "${FILESDIR}/twistd.init" twistd -} - -python_postinst() { - twisted-regen-cache || die -} - -pkg_postinst() { - python_foreach_impl python_postinst - - einfo "Install complete" - if use test ; then - einfo "" - einfo "Some tests have been disabled during testing due to" - einfo "known incompatibilities with the emerge sandboxes and/or" - einfo "not runnable as the root user." - einfo "For a complete test suite run on the code." - einfo "Run the tests as a normal user for each python it is installed to." - einfo " ie: $ python3.6 /usr/bin/trial twisted" - einfo "There are a few known python-2.7 errors due to some unicode issues" - einfo "which are different in Gentoo installed python-2.7" - fi -} - -python_postrm() { - rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die -} - -pkg_postrm(){ - # if we're removing the last version, remove the cache file - if [[ ! ${REPLACING_VERSIONS} ]]; then - python_foreach_impl python_postrm - fi -} diff --git a/dev-python/twisted/twisted-17.1.0-r2.ebuild b/dev-python/twisted/twisted-17.1.0-r2.ebuild new file mode 100644 index 000000000000..13b750e8a743 --- /dev/null +++ b/dev-python/twisted/twisted-17.1.0-r2.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_{4,5,6}) +PYTHON_REQ_USE="threads(+)" + +inherit eutils flag-o-matic distutils-r1 versionator + +TWISTED_PN="Twisted" +TWISTED_P="${TWISTED_PN}-${PV}" +TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}") + +DESCRIPTION="An asynchronous networking framework written in Python" +HOMEPAGE="http://www.twistedmatrix.com/" +SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}" +SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz" + +# Dropped keywords due to new deps not keyworded +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86" + +LICENSE="MIT" +SLOT="0" +IUSE="conch crypt http2 serial +soap test" + +RDEPEND=" + >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] + >=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}] + conch? ( + dev-python/pyasn1[${PYTHON_USEDEP}] + >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] + >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] + ) + crypt? ( + >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + >=dev-python/idna-0.6[${PYTHON_USEDEP}] + ) + serial? ( dev-python/pyserial[${PYTHON_USEDEP}] ) + soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) ) + http2? ( + >=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}] + =dev-python/priority-1.1.0[${PYTHON_USEDEP}] + =dev-python/constantly-15.1.0[${PYTHON_USEDEP}] + >=dev-python/automat-0.3.0[${PYTHON_USEDEP}] + !dev-python/twisted-core + !dev-python/twisted-conch + !dev-python/twisted-lore + !dev-python/twisted-mail + !dev-python/twisted-names + !dev-python/twisted-news + !dev-python/twisted-pair + !dev-python/twisted-runner + !dev-python/twisted-words + !dev-python/twisted-web +" +DEPEND=" + >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] + test? ( + dev-python/gmpy[${PYTHON_USEDEP}] + dev-python/pyasn1[${PYTHON_USEDEP}] + >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] + >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + dev-python/idna[${PYTHON_USEDEP}] + dev-python/pyserial[${PYTHON_USEDEP}] + >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable. + "${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch" + "${FILESDIR}/test_main.patch" + "${FILESDIR}/utf8_overrides.patch" + "${FILESDIR}/${PN}-16.6.0-test-fixes.patch" +) + +S=${WORKDIR}/${TWISTED_P} + +python_prepare_all() { + # disable tests that don't work in our sandbox + # and other test failures due to our conditions + if use test ; then + # Remove since this is an upstream distribution test for making releases + rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED" + fi + distutils-r1_python_prepare_all +} + +python_compile() { + if ! python_is_python3; then + # Needed to make the sendmsg extension work + # (see http://twistedmatrix.com/trac/ticket/5701 ) + local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + fi + + distutils-r1_python_compile +} + +python_test() { + distutils_install_for_testing + + export EMERGE_TEST_OVERRIDE=1 + export UTF8_OVERRIDES=1 + # workaround for the eclass not installing the entry points + # in the test environment. copy the old 16.3.2 start script + # to run the tests with + cp "${FILESDIR}"/trial "${TEST_DIR}" + + pushd "${TEST_DIR}" > /dev/null || die + + if ! "${TEST_DIR}"/trial twisted; then + die "Tests failed with ${EPYTHON}" + fi + # due to an anomoly in the tests, python doesn't return the correct form + # of the escape sequence. So run those test separately with a clean python interpreter + export UTF8_OVERRIDES=0 + if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then + die "DaemonizeTests failed with ${EPYTHON}" + fi + if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then + die "SafeStrTests failed with ${EPYTHON}" + fi + + popd > /dev/null || die +} + +python_install() { + distutils-r1_python_install + + cd "${D%/}$(python_get_sitedir)" || die + + # own the dropin.cache so we don't leave orphans + touch twisted/plugins/dropin.cache || die + + python_doscript "${WORKDIR}"/twisted-regen-cache +} + +python_install_all() { + distutils-r1_python_install_all + + newconfd "${FILESDIR}/twistd.conf" twistd + newinitd "${FILESDIR}/twistd.init" twistd +} + +python_postinst() { + twisted-regen-cache || die +} + +pkg_postinst() { + python_foreach_impl python_postinst + + einfo "Install complete" + if use test ; then + einfo "" + einfo "Some tests have been disabled during testing due to" + einfo "known incompatibilities with the emerge sandboxes and/or" + einfo "not runnable as the root user." + einfo "For a complete test suite run on the code." + einfo "Run the tests as a normal user for each python it is installed to." + einfo " ie: $ python3.6 /usr/bin/trial twisted" + einfo "There are a few known python-2.7 errors due to some unicode issues" + einfo "which are different in Gentoo installed python-2.7" + fi +} + +python_postrm() { + rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die +} + +pkg_postrm(){ + # if we're removing the last version, remove the cache file + if [[ ! ${REPLACING_VERSIONS} ]]; then + python_foreach_impl python_postrm + fi +} diff --git a/dev-python/twisted/twisted-17.5.0-r1.ebuild b/dev-python/twisted/twisted-17.5.0-r1.ebuild new file mode 100644 index 000000000000..0e907ac6fc3e --- /dev/null +++ b/dev-python/twisted/twisted-17.5.0-r1.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_{4,5,6}) +PYTHON_REQ_USE="threads(+)" + +inherit eutils flag-o-matic distutils-r1 versionator + +TWISTED_PN="Twisted" +TWISTED_P="${TWISTED_PN}-${PV}" +TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}") + +DESCRIPTION="An asynchronous networking framework written in Python" +HOMEPAGE="http://www.twistedmatrix.com/" +SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}" +SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz" + +# Dropped keywords due to new deps not keyworded +#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86" + +LICENSE="MIT" +SLOT="0" +IUSE="conch crypt http2 serial +soap test" + +RDEPEND=" + >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] + >=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}] + conch? ( + dev-python/pyasn1[${PYTHON_USEDEP}] + >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] + >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] + ) + crypt? ( + >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + >=dev-python/idna-0.6[${PYTHON_USEDEP}] + ) + serial? ( dev-python/pyserial[${PYTHON_USEDEP}] ) + soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) ) + http2? ( + >=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}] + =dev-python/priority-1.1.0[${PYTHON_USEDEP}] + =dev-python/constantly-15.1.0[${PYTHON_USEDEP}] + >=dev-python/automat-0.3.0[${PYTHON_USEDEP}] + >=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}] + !dev-python/twisted-core + !dev-python/twisted-conch + !dev-python/twisted-lore + !dev-python/twisted-mail + !dev-python/twisted-names + !dev-python/twisted-news + !dev-python/twisted-pair + !dev-python/twisted-runner + !dev-python/twisted-words + !dev-python/twisted-web +" +DEPEND=" + >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] + test? ( + dev-python/gmpy[${PYTHON_USEDEP}] + dev-python/pyasn1[${PYTHON_USEDEP}] + >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] + >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + dev-python/idna[${PYTHON_USEDEP}] + dev-python/pyserial[${PYTHON_USEDEP}] + >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable. + "${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch" + "${FILESDIR}/test_main.patch" + "${FILESDIR}/utf8_overrides.patch" + "${FILESDIR}/${PN}-16.6.0-test-fixes.patch" +) + +S=${WORKDIR}/${TWISTED_P} + +python_prepare_all() { + # disable tests that don't work in our sandbox + # and other test failures due to our conditions + if use test ; then + # Remove since this is an upstream distribution test for making releases + rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED" + fi + distutils-r1_python_prepare_all +} + +python_compile() { + if ! python_is_python3; then + # Needed to make the sendmsg extension work + # (see http://twistedmatrix.com/trac/ticket/5701 ) + local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" + local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" + fi + + distutils-r1_python_compile +} + +python_test() { + distutils_install_for_testing + + export EMERGE_TEST_OVERRIDE=1 + export UTF8_OVERRIDES=1 + unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE + # workaround for the eclass not installing the entry points + # in the test environment. copy the old 16.3.2 start script + # to run the tests with + cp "${FILESDIR}"/trial "${TEST_DIR}" + + pushd "${TEST_DIR}" > /dev/null || die + + if ! "${TEST_DIR}"/trial twisted; then + die "Tests failed with ${EPYTHON}" + fi + # due to an anomoly in the tests, python doesn't return the correct form + # of the escape sequence. So run those test separately with a clean python interpreter + export UTF8_OVERRIDES=0 + if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then + die "DaemonizeTests failed with ${EPYTHON}" + fi + if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then + die "SafeStrTests failed with ${EPYTHON}" + fi + + popd > /dev/null || die +} + +python_install() { + distutils-r1_python_install + + cd "${D%/}$(python_get_sitedir)" || die + + # own the dropin.cache so we don't leave orphans + touch twisted/plugins/dropin.cache || die + + python_doscript "${WORKDIR}"/twisted-regen-cache +} + +python_install_all() { + distutils-r1_python_install_all + + newconfd "${FILESDIR}/twistd.conf" twistd + newinitd "${FILESDIR}/twistd.init" twistd +} + +python_postinst() { + twisted-regen-cache || die +} + +pkg_postinst() { + python_foreach_impl python_postinst + + einfo "Install complete" + if use test ; then + einfo "" + einfo "Some tests have been disabled during testing due to" + einfo "known incompatibilities with the emerge sandboxes and/or" + einfo "not runnable as the root user." + einfo "For a complete test suite run on the code." + einfo "Run the tests as a normal user for each python it is installed to." + einfo " ie: $ python3.6 /usr/bin/trial twisted" + einfo "There are a few known python-2.7 errors due to some unicode issues" + einfo "which are different in Gentoo installed python-2.7" + fi +} + +python_postrm() { + rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die +} + +pkg_postrm(){ + # if we're removing the last version, remove the cache file + if [[ ! ${REPLACING_VERSIONS} ]]; then + python_foreach_impl python_postrm + fi +} diff --git a/dev-python/twisted/twisted-17.5.0.ebuild b/dev-python/twisted/twisted-17.5.0.ebuild deleted file mode 100644 index 8a044e18ca19..000000000000 --- a/dev-python/twisted/twisted-17.5.0.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{4,5,6}) -PYTHON_REQ_USE="threads(+)" - -inherit eutils flag-o-matic distutils-r1 versionator - -TWISTED_PN="Twisted" -TWISTED_P="${TWISTED_PN}-${PV}" -TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}") - -DESCRIPTION="An asynchronous networking framework written in Python" -HOMEPAGE="http://www.twistedmatrix.com/" -SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}" -SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2 - https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz" - -# Dropped keywords due to new deps not keyworded -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86" - -LICENSE="MIT" -SLOT="0" -IUSE="conch crypt http2 serial +soap test" - -RDEPEND=">=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}] - conch? ( - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] - ) - crypt? ( - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - >=dev-python/idna-0.6[${PYTHON_USEDEP}] - ) - serial? ( dev-python/pyserial[${PYTHON_USEDEP}] ) - soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) ) - http2? ( - >=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}] - =dev-python/priority-1.1.0[${PYTHON_USEDEP}] - =dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - >=dev-python/automat-0.3.0[${PYTHON_USEDEP}] - >=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}] - !dev-python/twisted-core - !dev-python/twisted-conch - !dev-python/twisted-lore - !dev-python/twisted-mail - !dev-python/twisted-names - !dev-python/twisted-news - !dev-python/twisted-pair - !dev-python/twisted-runner - !dev-python/twisted-words - !dev-python/twisted-web -" -DEPEND=" - >=dev-python/incremental-16.10.1[${PYTHON_USEDEP}] - test? ( - dev-python/gmpy[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - >=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] - dev-python/pyserial[${PYTHON_USEDEP}] - >=dev-python/constantly-15.1.0[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable. - "${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch" - "${FILESDIR}/test_main.patch" - "${FILESDIR}/utf8_overrides.patch" - "${FILESDIR}/${PN}-16.6.0-test-fixes.patch" -) - -S=${WORKDIR}/${TWISTED_P} - -python_prepare_all() { - # disable tests that don't work in our sandbox - # and other test failures due to our conditions - if use test ; then - # Remove since this is an upstream distribution test for making releases - rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED" - fi - distutils-r1_python_prepare_all -} - -python_compile() { - if ! python_is_python3; then - # Needed to make the sendmsg extension work - # (see http://twistedmatrix.com/trac/ticket/5701 ) - local -x CFLAGS="${CFLAGS} -fno-strict-aliasing" - local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" - fi - - distutils-r1_python_compile -} - -python_test() { - distutils_install_for_testing - - export EMERGE_TEST_OVERRIDE=1 - export UTF8_OVERRIDES=1 - unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE - # workaround for the eclass not installing the entry points - # in the test environment. copy the old 16.3.2 start script - # to run the tests with - cp "${FILESDIR}"/trial "${TEST_DIR}" - - pushd "${TEST_DIR}" > /dev/null || die - - if ! "${TEST_DIR}"/trial twisted; then - die "Tests failed with ${EPYTHON}" - fi - # due to an anomoly in the tests, python doesn't return the correct form - # of the escape sequence. So run those test separately with a clean python interpreter - export UTF8_OVERRIDES=0 - if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then - die "DaemonizeTests failed with ${EPYTHON}" - fi - if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then - die "SafeStrTests failed with ${EPYTHON}" - fi - - popd > /dev/null || die -} - -python_install() { - distutils-r1_python_install - - cd "${D%/}$(python_get_sitedir)" || die - - # own the dropin.cache so we don't leave orphans - touch twisted/plugins/dropin.cache || die - - python_doscript "${WORKDIR}"/twisted-regen-cache -} - -python_install_all() { - distutils-r1_python_install_all - - newconfd "${FILESDIR}/twistd.conf" twistd - newinitd "${FILESDIR}/twistd.init" twistd -} - -python_postinst() { - twisted-regen-cache || die -} - -pkg_postinst() { - python_foreach_impl python_postinst - - einfo "Install complete" - if use test ; then - einfo "" - einfo "Some tests have been disabled during testing due to" - einfo "known incompatibilities with the emerge sandboxes and/or" - einfo "not runnable as the root user." - einfo "For a complete test suite run on the code." - einfo "Run the tests as a normal user for each python it is installed to." - einfo " ie: $ python3.6 /usr/bin/trial twisted" - einfo "There are a few known python-2.7 errors due to some unicode issues" - einfo "which are different in Gentoo installed python-2.7" - fi -} - -python_postrm() { - rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die -} - -pkg_postrm(){ - # if we're removing the last version, remove the cache file - if [[ ! ${REPLACING_VERSIONS} ]]; then - python_foreach_impl python_postrm - fi -} -- cgit v1.2.3