diff options
| -rw-r--r-- | app-emulation/libvirt/libvirt-1.2.21-r2.ebuild | 2 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-1.3.1-r1.ebuild | 2 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-1.3.4.ebuild | 2 | ||||
| -rw-r--r-- | app-emulation/libvirt/libvirt-9999.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/pyudev/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/pyudev/pyudev-0.20.0.ebuild | 62 | ||||
| -rw-r--r-- | eclass/ghc-package.eclass | 12 | ||||
| -rw-r--r-- | eclass/haskell-cabal.eclass | 26 |
8 files changed, 100 insertions, 9 deletions
diff --git a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild index 4e35a3a66b02..f7869587d333 100644 --- a/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild +++ b/app-emulation/libvirt/libvirt-1.2.21-r2.ebuild @@ -59,7 +59,7 @@ RDEPEND=" dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 - >=net-libs/gnutls-1.0.25 + >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode diff --git a/app-emulation/libvirt/libvirt-1.3.1-r1.ebuild b/app-emulation/libvirt/libvirt-1.3.1-r1.ebuild index a41045352972..a0220273a821 100644 --- a/app-emulation/libvirt/libvirt-1.3.1-r1.ebuild +++ b/app-emulation/libvirt/libvirt-1.3.1-r1.ebuild @@ -59,7 +59,7 @@ RDEPEND=" dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 - >=net-libs/gnutls-1.0.25 + >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode diff --git a/app-emulation/libvirt/libvirt-1.3.4.ebuild b/app-emulation/libvirt/libvirt-1.3.4.ebuild index 67b638a29544..33cda7bfc530 100644 --- a/app-emulation/libvirt/libvirt-1.3.4.ebuild +++ b/app-emulation/libvirt/libvirt-1.3.4.ebuild @@ -59,7 +59,7 @@ RDEPEND=" dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 - >=net-libs/gnutls-1.0.25 + >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index c1021649edfa..64ac0ca65c1f 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -59,7 +59,7 @@ RDEPEND=" dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/netcat6-1.0-r2 - >=net-libs/gnutls-1.0.25 + >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode diff --git a/dev-python/pyudev/Manifest b/dev-python/pyudev/Manifest index 25e94a81d30b..584ff00fb106 100644 --- a/dev-python/pyudev/Manifest +++ b/dev-python/pyudev/Manifest @@ -1,2 +1,3 @@ DIST pyudev-0.16.1.tar.gz 74953 SHA256 765d1c14bd9bd031f64e2612225621984cb2bbb8cbc0c03538bcc4c735ff1c95 SHA512 7f62c6794027411583f874bdf746de457f19048955867d30008bc1ee0d30040a97f73b9e52ae3645d469fc401128703d4e703e294b85481e927ffaba27e45e6a WHIRLPOOL 4c366a1eed92bf274ef84eab6242beb09cd6e906556f6ccb24113fafec2dcc47b8da94487505473fc6f7b39539cdc2809cef2d07a1ab8c0616fc73efba9b2e1a DIST pyudev-0.19.0.tar.gz 96556 SHA256 5abcbd03e4965110d1fedcbdd5532974cb4638ceef34337aa2d5758eceb54ad3 SHA512 7faee69e8e3512e27b0d9271191d4b2906652b2c7f3a803be026a10499d184c1fc41db80624dec9f33ee890d71a695214c6bfd47f6cc41b979f71f619836f3f8 WHIRLPOOL 6b496f0f977b97247a13ba4f9f8efe24624d932c6cfc7616922473d8839a90500f60d3b238bbab4a9c9cdd6c5997606ee41de63669e3b2fa868d1b6f28ae492b +DIST pyudev-0.20.0.tar.gz 93217 SHA256 14d85bc9611dbf798732996cb7107858f58a3a1b9d246e4063c7a20ade65842a SHA512 e86a776a2b6d29f206cdd0057c6f9b1e705d981ec8c2de49259887647856531af68238b80751102a3ffc8cea6f234cc520d62c8bc2da686e453ed010da3ebb02 WHIRLPOOL 8344c668c1cc2e7971a67d0e628e3ce96254648ad06b48f260dd4ee54e3e205e533e59b692169b38dd656c08d8cd615d0c7c518b5c2a785553b8c6468e70520c diff --git a/dev-python/pyudev/pyudev-0.20.0.ebuild b/dev-python/pyudev/pyudev-0.20.0.ebuild new file mode 100644 index 000000000000..d4561cfc253d --- /dev/null +++ b/dev-python/pyudev/pyudev-0.20.0.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit distutils-r1 + +DESCRIPTION="Python binding to libudev" +HOMEPAGE="http://pyudev.readthedocs.org https://github.com/pyudev/pyudev" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="pygobject pyqt4 pyside test" + +RDEPEND="virtual/udev + dev-python/six[${PYTHON_USEDEP}] + pygobject? ( dev-python/pygobject:2[$(python_gen_usedep 'python2*')] ) + pyqt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) + pyside? ( dev-python/pyside[$(python_gen_usedep '!(python3_3)')] )" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/pytest-2.8[${PYTHON_USEDEP}] + )" + +DOCS=( CHANGES.rst README.rst ) + +PATCHES=( + "${FILESDIR}/${PN}-0.19.0-skip-non-deterministic-test.patch" +) + +REQUIRED_USE="pygobject? ( || ( $(python_gen_useflags 'python2*') ) ) + pyside? ( $(python_gen_useflags '!(python3_3)') )" + +python_prepare_all() { + if use test; then + ewarn "If your PORTAGE_TMPDIR is longer in length then '/var/tmp/'," + ewarn "change it to /var/tmp to ensure tests will pass." + fi + + # tests are known to pass then fail on alternate runs + # tests: fix run_path + sed -i -e "s|== \('/run/udev'\)|in (\1,'/dev/.udev')|g" \ + tests/test_core.py || die + + # test needs needs newer dev-cpp/gccxml + rm -f tests/test_libudev.py + + distutils-r1_python_prepare_all +} + +python_test() { + py.test || die "Tests fail with ${EPYTHON}" +} diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index 5466c0b5b20d..ccc6d6ffd84b 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -62,6 +62,16 @@ ghc-getghcpkgbin() { fi } +# @FUNCTION: ghc-host-prefix +# @DESCRIPTION: +# Returns root of installed ghc. +# Some helpers (like best_version) require reference +# host system as they are tied to compiler bing executed. +ghc-host-root() { + has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= + echo "${EPREFIX}/" +} + # @FUNCTION: ghc-version # @DESCRIPTION: # returns upstream version of ghc @@ -85,7 +95,7 @@ ghc-pm-version() { local pm_ghc_p if [[ -z "${_GHC_PM_VERSION_CACHE}" ]]; then - pm_ghc_p=$(best_version dev-lang/ghc) + pm_ghc_p=$(ROOT=$(ghc-host-root) best_version dev-lang/ghc) _GHC_PM_VERSION_CACHE="PM:${pm_ghc_p#dev-lang/ghc-}" fi echo "${_GHC_PM_VERSION_CACHE}" diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 373507995f36..a568bf4337b1 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -59,6 +59,13 @@ inherit eutils ghc-package multilib multiprocessing # linking 'setup' faster. : ${GHC_BOOTSTRAP_FLAGS:=} +# @ECLASS-VARIABLE: CABAL_EXTRA_TEST_FLAGS +# @DESCRIPTION: +# User-specified additional parameters passed to 'setup test'. +# example: /etc/portage/make.conf: +# CABAL_EXTRA_TEST_FLAGS="-v3 --show-details=streaming" +: ${CABAL_EXTRA_TEST_FLAGS:=} + # @ECLASS-VARIABLE: CABAL_DEBUG_LOOSENING # @DESCRIPTION: # Show debug output for 'cabal_chdeps' function if set. @@ -118,8 +125,7 @@ if [[ -n "${CABAL_USE_HSCOLOUR}" ]]; then fi if [[ -n "${CABAL_USE_HOOGLE}" ]]; then - # enabled only in ::haskell - CABAL_USE_HOOGLE= + IUSE="${IUSE} hoogle" fi if [[ -n "${CABAL_USE_ALEX}" ]]; then @@ -169,7 +175,7 @@ cabal-version() { else # We ask portage, not ghc, so that we only pick up # portage-installed cabal versions. - _CABAL_VERSION_CACHE="$(ghc-extractportageversion dev-haskell/cabal)" + _CABAL_VERSION_CACHE="$(ROOT=$(ghc-host-root) ghc-extractportageversion dev-haskell/cabal)" fi fi echo "${_CABAL_VERSION_CACHE}" @@ -602,13 +608,25 @@ haskell-cabal_src_compile() { } haskell-cabal_src_test() { + local cabaltest=() + pushd "${S}" > /dev/null || die if cabal-is-dummy-lib; then einfo ">>> No tests for dummy library: ${CATEGORY}/${PF}" else einfo ">>> Test phase [cabal test]: ${CATEGORY}/${PF}" - set -- test "$@" + + # '--show-details=streaming' appeared in Cabal-1.20 + if ./setup test --help | grep -q -- "'streaming'"; then + cabaltest+=(--show-details=streaming) + fi + + set -- test \ + "${cabaltest[@]}" \ + ${CABAL_TEST_FLAGS} \ + ${CABAL_EXTRA_TEST_FLAGS} \ + "$@" echo ./setup "$@" ./setup "$@" || die "cabal test failed" fi |