From 74d4c08659c27a4d0733966470505b56319424ee Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 12 May 2017 17:32:33 -0400 Subject: net-p2p/pybitmessage: new revision to fix audio dependencies. In v0.6.2, I had an "and" dependency on a few audio tools that should have been an "or" dependency. Thanks to Dmitri Bogomolov for catching the mistake and suggesting the correct fix. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- net-p2p/pybitmessage/pybitmessage-0.6.2-r1.ebuild | 78 +++++++++++++++++++++++ net-p2p/pybitmessage/pybitmessage-0.6.2.ebuild | 78 ----------------------- 2 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 net-p2p/pybitmessage/pybitmessage-0.6.2-r1.ebuild delete mode 100644 net-p2p/pybitmessage/pybitmessage-0.6.2.ebuild (limited to 'net-p2p') diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.2-r1.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.2-r1.ebuild new file mode 100644 index 000000000000..b5c33b4c51d6 --- /dev/null +++ b/net-p2p/pybitmessage/pybitmessage-0.6.2-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +# See https://github.com/Bitmessage/PyBitmessage/pull/952 for +# why ipv6 is needed at the moment. +PYTHON_REQ_USE="ipv6,sqlite" + +inherit distutils-r1 gnome2-utils + +MY_PN="PyBitmessage" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="P2P communications protocol" +HOMEPAGE="https://bitmessage.org/" +SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/v${PV}.tar.gz + -> ${P}.tar.gz" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl ncurses opencl qt4 sound" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" + +# Some of these can be determined from src/depends.py. +# The sound deps were found in src/bitmessageqt/__init__.py. +# And src/openclpow.py imports numpy directly, so throw that in too. +# +# All of the dependencies that are behind USE flags are detected +# and enabled automagically, so maybe it would be better if we +# required them unconditionally? +RDEPEND="${DEPEND} + dev-python/msgpack[${PYTHON_USEDEP}] + !libressl? ( dev-libs/openssl:0[-bindist] ) + libressl? ( dev-libs/libressl ) + ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] ) + opencl? ( + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pyopencl[${PYTHON_USEDEP}] + ) + qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) + sound? ( || ( + media-sound/gst123 + media-sound/alsa-utils + media-sound/mpg123 + ) )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}/noninteractive-build.patch") + +src_install () { + distutils-r1_src_install + dodoc README.md + doman man/pybitmessage.1.gz + + if use qt4 ; then + newicon -s 24 desktop/icon24.png "${PN}.png" + newicon -s scalable desktop/can-icon.svg "${PN}.svg" + domenu "desktop/${PN}.desktop" + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.2.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.2.ebuild deleted file mode 100644 index 93db12aefd7e..000000000000 --- a/net-p2p/pybitmessage/pybitmessage-0.6.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -# See https://github.com/Bitmessage/PyBitmessage/pull/952 for -# why ipv6 is needed at the moment. -PYTHON_REQ_USE="ipv6,sqlite" - -inherit distutils-r1 gnome2-utils - -MY_PN="PyBitmessage" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="P2P communications protocol" -HOMEPAGE="https://bitmessage.org/" -SRC_URI="https://github.com/Bitmessage/${MY_PN}/archive/v${PV}.tar.gz - -> ${P}.tar.gz" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl ncurses opencl qt4 sound" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" - -# Some of these can be determined from src/depends.py. -# The sound deps were found in src/bitmessageqt/__init__.py. -# And src/openclpow.py imports numpy directly, so throw that in too. -# -# All of the dependencies that are behind USE flags are detected -# and enabled automagically, so maybe it would be better if we -# required them unconditionally? -RDEPEND="${DEPEND} - dev-python/msgpack[${PYTHON_USEDEP}] - !libressl? ( dev-libs/openssl:0[-bindist] ) - libressl? ( dev-libs/libressl ) - ncurses? ( dev-python/pythondialog[${PYTHON_USEDEP}] ) - opencl? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pyopencl[${PYTHON_USEDEP}] - ) - qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] ) - sound? ( - media-sound/alsa-utils - media-sound/gst123 - media-sound/mpg123 - )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/noninteractive-build.patch") - -src_install () { - distutils-r1_src_install - dodoc README.md - doman man/pybitmessage.1.gz - - if use qt4 ; then - newicon -s 24 desktop/icon24.png "${PN}.png" - newicon -s scalable desktop/can-icon.svg "${PN}.svg" - domenu "desktop/${PN}.desktop" - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} -- cgit v1.2.3-18-g5258