From d1c16c7882def317616626c781b35052efa97afe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 6 Jan 2018 10:49:41 +0100 Subject: [PATCH] dev-python/twisted: Clean old up --- dev-python/twisted/Manifest | 1 - dev-python/twisted/twisted-16.6.0-r1.ebuild | 164 ----------------- dev-python/twisted/twisted-17.5.0-r1.ebuild | 186 -------------------- 3 files changed, 351 deletions(-) delete mode 100644 dev-python/twisted/twisted-16.6.0-r1.ebuild delete mode 100644 dev-python/twisted/twisted-17.5.0-r1.ebuild diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest index 8e0b7839b1c5..2d7cf02be58b 100644 --- a/dev-python/twisted/Manifest +++ b/dev-python/twisted/Manifest @@ -1,5 +1,4 @@ DIST Twisted-16.6.0.tar.bz2 2979747 BLAKE2B 898e0a0fa3ae8547a801b09118423ec8ad80727dd6d034e3f8a151f084eff5a3fc560f2eb9e76c452a14ec90b36d93e14d3bbb388010c3c5c01fd1c4d5ca16bb SHA512 0b8de0ec7f64457f76c396fced64b366b8e63c6e000a5edc6c6388cd917fb2f95711918cd8edda39e0aa77e2cd32b5d775d23630a5ad10fc013c18f8316300cf DIST Twisted-17.1.0.tar.bz2 2997334 BLAKE2B 54bd9813fb265f3561be7bc42a3ca6fc36aa5f8553ff0f40fd4ba7939947015632ef91c011a088b511d9f3f262aa0a785467ad3e4fab00cc97cb85bdbd93a726 SHA512 e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966 -DIST Twisted-17.5.0.tar.bz2 2993816 BLAKE2B d4338cf5e1c13183aa93479d7fe4a9f7f592841c955dcd0545b8ae8821d6f23da174b7f479f3df81ca8790bc4f56841b82516e38b794f3a12a69b8b499c66895 SHA512 0fd10e5db7c87daf0d2225cec9929f1040f0c67e9605bfb1a5bc84db8b825e943cfa08e094c32c25c680bddc6587bfdc525a994ad7b785396e5ddb2621649379 DIST Twisted-17.9.0.tar.bz2 3019243 BLAKE2B a79fade6c84a99303df803ad80f02c63562e7064d5b79db39c08bd0ac9a62d61f1388932b36348aa106aa409a51b2d49dc0eb5b1007ce10f196a34c2f963b8e5 SHA512 0fb854db1044bfdb208594a379a0f8df0193326a9974e193266e82113488d49220648d4a50b323fa144654e94976f5848e1d60efed13ab2668b02cc795720345 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03 diff --git a/dev-python/twisted/twisted-16.6.0-r1.ebuild b/dev-python/twisted/twisted-16.6.0-r1.ebuild deleted file mode 100644 index 8851aa261252..000000000000 --- a/dev-python/twisted/twisted-16.6.0-r1.ebuild +++ /dev/null @@ -1,164 +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(+)" -TWISTED_PN="Twisted" -#DISTUTILS_IN_SOURCE_BUILD="yes" - -inherit eutils flag-o-matic twisted-r1 - -DESCRIPTION="An asynchronous networking framework written in Python" -SRC_URI="http://twistedmatrix.com/Releases/${TWISTED_PN}" -SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2" - -# 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 ~ia64 ~mips ~ppc ~ppc64 ~x86" -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" -) - -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 - - # create 'Twisted' egg wrt bug #299736 - #local egg=( Twisted_Core*.egg-info ) - #[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found" - #ln -s "${egg[0]}" "${egg[0]/_Core/}" || die - - # own the dropin.cache so we don't leave orphans - touch twisted/plugins/dropin.cache || die -} - -python_install_all() { - distutils-r1_python_install_all - - newconfd "${FILESDIR}/twistd.conf" twistd - newinitd "${FILESDIR}/twistd.init" twistd -} - -pkg_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 -} - -pkg_postrm(){ - # pre portage-2.3.2 release workaround for bug 595028 - cd "${HOME}" - _distutils-r1_run_foreach_impl twisted-r1_update_plugin_cache -} diff --git a/dev-python/twisted/twisted-17.5.0-r1.ebuild b/dev-python/twisted/twisted-17.5.0-r1.ebuild deleted file mode 100644 index 78bd82450ae2..000000000000 --- a/dev-python/twisted/twisted-17.5.0-r1.ebuild +++ /dev/null @@ -1,186 +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 ~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-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 -} -- 2.26.2