From 1c21179d3301d32b52969e4d4e49c4242c98e671 Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 29 Oct 2021 09:56:25 +0100 Subject: net-libs/libtorrent-rasterbar: fix setuptools dependency Bug: https://bugs.gentoo.org/789699 Signed-off-by: Sam James --- .../libtorrent-rasterbar-1.2.14-r1.ebuild | 110 +++++++++++++++++++++ .../libtorrent-rasterbar-1.2.14.ebuild | 110 --------------------- .../libtorrent-rasterbar-2.0.4-r2.ebuild | 62 ------------ .../libtorrent-rasterbar-2.0.4-r3.ebuild | 67 +++++++++++++ 4 files changed, 177 insertions(+), 172 deletions(-) create mode 100644 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild delete mode 100644 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild delete mode 100644 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild create mode 100644 net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild (limited to 'net-libs/libtorrent-rasterbar') diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild new file mode 100644 index 000000000000..a554e4fd27ca --- /dev/null +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14-r1.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE="threads(+)" +DISTUTILS_OPTIONAL=true +DISTUTILS_IN_SOURCE_BUILD=true + +inherit autotools distutils-r1 + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" +SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz" + +LICENSE="BSD" +SLOT="0/10" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" +IUSE="debug +dht doc examples python +ssl static-libs test" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/libtorrent-${PV}" + +RDEPEND=" + dev-libs/boost:=[threads(+)] + virtual/libiconv + examples? ( !net-p2p/mldonkey ) + python? ( + ${PYTHON_DEPS} + dev-libs/boost:=[python,${PYTHON_USEDEP}] + ) + ssl? ( + dev-libs/openssl:0= + ) +" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/libtool + python? ( dev-python/setuptools[${PYTHON_USEDEP}] )" + +src_prepare() { + mkdir -p "${S}"/build-aux || die + touch "${S}"/build-aux/config.rpath || die + eautoreconf + + default + + # bug 578026 + # prepend -L${S}/... to ensure bindings link against the lib we just built + sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die + + # prepend -I${S}/... to ensure bindings use the right headers + sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die + + use python && distutils-r1_src_prepare +} + +src_configure() { + + local myeconfargs=( + $(use_enable debug) + $(use_enable debug export-all) + $(use_enable debug logging) + $(use_enable dht) + $(use_enable examples) + $(use_enable ssl encryption) + $(use_enable static-libs static) + $(use_enable test tests) + --with-boost="${ESYSROOT}/usr" + --with-libiconv + --enable-logging + ) + econf "${myeconfargs[@]}" + + if use python; then + python_configure() { + econf "${myeconfargs[@]}" \ + --enable-python-binding \ + --with-boost-python="boost_${EPYTHON/./}" + } + distutils-r1_src_configure + fi +} + +src_compile() { + default + + python_compile() { + cd "${BUILD_DIR}/../bindings/python" || die + distutils-r1_python_compile + } + use python && distutils-r1_src_compile +} + +src_install() { + use doc && HTML_DOCS+=( "${S}"/docs ) + + default + + python_install() { + cd "${BUILD_DIR}/../bindings/python" || die + distutils-r1_python_install + } + use python && distutils-r1_src_install + + find "${D}" -name '*.la' -delete || die +} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild deleted file mode 100644 index c4c0789e0fca..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.14.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_OPTIONAL=true -DISTUTILS_IN_SOURCE_BUILD=true - -inherit autotools flag-o-matic distutils-r1 - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/archive/v${PV}.tar.gz -> libtorrent-${PV}.tar.gz" - -LICENSE="BSD" -SLOT="0/10" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" -IUSE="debug +dht doc examples python +ssl static-libs test" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/libtorrent-${PV}" - -RDEPEND=" - dev-libs/boost:=[threads(+)] - virtual/libiconv - examples? ( !net-p2p/mldonkey ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - ssl? ( - dev-libs/openssl:0= - ) -" -DEPEND="${RDEPEND} - sys-devel/libtool -" - -src_prepare() { - mkdir -p "${S}"/build-aux || die - touch "${S}"/build-aux/config.rpath || die - eautoreconf - - default - - # bug 578026 - # prepend -L${S}/... to ensure bindings link against the lib we just built - sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die - - # prepend -I${S}/... to ensure bindings use the right headers - sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die - - use python && distutils-r1_src_prepare -} - -src_configure() { - - local myeconfargs=( - $(use_enable debug) - $(use_enable debug export-all) - $(use_enable debug logging) - $(use_enable dht) - $(use_enable examples) - $(use_enable ssl encryption) - $(use_enable static-libs static) - $(use_enable test tests) - --with-boost="${ESYSROOT}/usr" - --with-libiconv - --enable-logging - ) - econf "${myeconfargs[@]}" - - if use python; then - python_configure() { - econf "${myeconfargs[@]}" \ - --enable-python-binding \ - --with-boost-python="boost_${EPYTHON/./}" - } - distutils-r1_src_configure - fi -} - -src_compile() { - default - - python_compile() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_compile - } - use python && distutils-r1_src_compile -} - -src_install() { - use doc && HTML_DOCS+=( "${S}"/docs ) - - default - - python_install() { - cd "${BUILD_DIR}/../bindings/python" || die - distutils-r1_python_install - } - use python && distutils-r1_src_install - - find "${D}" -name '*.la' -delete || die -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild deleted file mode 100644 index a90461c46c84..000000000000 --- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{3_8,3_9} ) - -inherit cmake python-single-r1 - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" -SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/2.0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" -IUSE="+dht debug gnutls python ssl test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test ) test" # not yet fixed -DEPEND=" - dev-libs/boost:=[threads(+)] - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-libs/boost[python,${PYTHON_USEDEP}] - ') - ) - ssl? ( - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( dev-libs/openssl:= ) - ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-boost-1.77.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_CXX_STANDARD=14 - -DBUILD_SHARED_LIBS=ON - -Dbuild_examples=OFF - -Ddht=$(usex dht ON OFF) - -Dencryption=$(usex ssl ON OFF) - -Dgnutls=$(usex gnutls ON OFF) - -Dlogging=$(usex debug ON OFF) - -Dpython-bindings=$(usex python ON OFF) - -Dbuild_tests=$(usex test ON OFF) - ) - - # We need to drop the . from the Python version to satisfy Boost's - # FindBoost.cmake module, bug #793038. - use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) - - cmake_src_configure -} diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild new file mode 100644 index 000000000000..787c4093411b --- /dev/null +++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.4-r3.ebuild @@ -0,0 +1,67 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_8,3_9} ) + +inherit cmake python-single-r1 + +DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" +HOMEPAGE="https://libtorrent.org/ https://github.com/arvidn/libtorrent" +SRC_URI="https://github.com/arvidn/libtorrent/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/2.0" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86" +IUSE="+dht debug gnutls python ssl test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RESTRICT="!test? ( test ) test" # not yet fixed +DEPEND=" + dev-libs/boost:=[threads(+)] + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost[python,${PYTHON_USEDEP}] + ') + ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:= ) + ) +" +RDEPEND="${DEPEND}" +BDEPEND="python? ( + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + )" + +PATCHES=( + "${FILESDIR}"/${P}-boost-1.77.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_CXX_STANDARD=14 + -DBUILD_SHARED_LIBS=ON + -Dbuild_examples=OFF + -Ddht=$(usex dht ON OFF) + -Dencryption=$(usex ssl ON OFF) + -Dgnutls=$(usex gnutls ON OFF) + -Dlogging=$(usex debug ON OFF) + -Dpython-bindings=$(usex python ON OFF) + -Dbuild_tests=$(usex test ON OFF) + ) + + # We need to drop the . from the Python version to satisfy Boost's + # FindBoost.cmake module, bug #793038. + use python && mycmakeargs+=( -Dboost-python-module-name="${EPYTHON/./}" ) + + cmake_src_configure +} -- cgit v1.2.3-65-gdbad