jlec 15/03/23 12:07:50
Modified: rb_libtorrent-1.0.2.ebuild
rb_libtorrent-0.16.19.ebuild
rb_libtorrent-0.16.17-r2.ebuild
rb_libtorrent-1.0.3.ebuild metadata.xml ChangeLog
Log:
Fix python stuff, bug #542434
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.3 net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild?r1=1.2&r2=1.3
Index: rb_libtorrent-1.0.2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rb_libtorrent-1.0.2.ebuild 15 Nov 2014 08:33:02 -0000 1.2
+++ rb_libtorrent-1.0.2.ebuild 23 Mar 2015 12:07:50 -0000 1.3
@@ -1,12 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild,v 1.2
2014/11/15 08:33:02 hwoarang Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.2.ebuild,v 1.3
2015/03/23 12:07:50 jlec Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
-inherit multilib python-r1
+inherit autotools-utils multilib distutils-r1
MY_P=${P/rb_/}
MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -23,59 +26,47 @@
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND=">=dev-libs/boost-1.53:=[threads]
- >=sys-devel/libtool-2.2
+RDEPEND="
+ >=dev-libs/boost-1.53:=[threads]
sys-libs/zlib
examples? ( !net-p2p/mldonkey )
+ ssl? ( dev-libs/openssl:0= )
python? (
${PYTHON_DEPS}
dev-libs/boost[python,${PYTHON_USEDEP}]
- )
- ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/libtool-2.2"
-src_prepare() {
- use python && python_copy_sources
-}
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
src_configure() {
- local myconf=(
+ local myeconfargs=(
--disable-silent-rules # bug 441842
+ --with-boost-libdir=/usr/$(get_libdir)
$(use_enable debug)
$(use_enable test tests)
$(use_enable examples)
$(use_enable ssl encryption)
- $(use_enable static-libs static)
- --with-boost-libdir=/usr/$(get_libdir)
+ $(use_enable python python-binding)
+ $(usex debug "--enable-logging=verbose" "")
)
+ autotools-utils_src_configure
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_configure
+}
- use debug && myconf+=( --enable-logging=verbose )
-
- econf "${myconf[@]}" --disable-python-binding
- if use python; then
- python_configure() {
- run_in_build_dir econf "${myconf[@]}"
--enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
- }
-
- python_foreach_impl python_configure
- fi
+src_compile() {
+ autotools-utils_src_compile
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_compile
}
src_install() {
- emake DESTDIR="${D}" install
+ use doc && HTML_DOCS=( docs/. )
- if use python; then
- python_install() {
- emake -C "${BUILD_DIR}"/bindings/python \
- DESTDIR="${D}" install
- }
-
- python_foreach_impl python_install
- fi
-
- use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
- dodoc ChangeLog AUTHORS NEWS README
- if use doc; then
- dohtml docs/*
- fi
+ autotools-utils_src_install
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_install
}
1.2 net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild?r1=1.1&r2=1.2
Index: rb_libtorrent-0.16.19.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rb_libtorrent-0.16.19.ebuild 17 Mar 2015 20:30:26 -0000 1.1
+++ rb_libtorrent-0.16.19.ebuild 23 Mar 2015 12:07:50 -0000 1.2
@@ -1,12 +1,15 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild,v
1.1 2015/03/17 20:30:26 hwoarang Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.19.ebuild,v
1.2 2015/03/23 12:07:50 jlec Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
-inherit multilib python-r1 versionator
+inherit autotools-utils multilib distutils-r1
MY_P=${P/rb_/}
MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -20,12 +23,14 @@
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="debug doc examples python ssl static-libs test"
-RESTRICT="test"
-RDEPEND=">=dev-libs/boost-1.48:=[threads]
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/boost-1.48:=[threads]
sys-libs/zlib
examples? ( !net-p2p/mldonkey )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( dev-libs/openssl:0= )
python? (
${PYTHON_DEPS}
dev-libs/boost[python,${PYTHON_USEDEP}]
@@ -33,51 +38,33 @@
DEPEND="${RDEPEND}
>=sys-devel/libtool-2.2"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
-src_prepare() {
- use python && python_copy_sources
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.16.17-python.patch )
src_configure() {
- local myconf=(
+ local myeconfargs=(
--disable-silent-rules # bug 441842
+ --with-boost-libdir=/usr/$(get_libdir)
$(use_enable debug)
$(use_enable test tests)
$(use_enable examples)
$(use_enable ssl encryption)
- $(use_enable static-libs static)
- --with-boost-libdir=/usr/$(get_libdir)
+ $(use_enable python python-binding)
+ $(usex debug "--enable-logging=verbose" "")
)
+ autotools-utils_src_configure
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_configure
+}
- use debug && myconf+=( --enable-logging=verbose )
-
- econf "${myconf[@]}" --disable-python-binding
-
- if use python; then
- python_configure() {
- run_in_build_dir econf "${myconf[@]}"
--enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
- }
-
- python_foreach_impl python_configure
- fi
+src_compile() {
+ autotools-utils_src_compile
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_compile
}
src_install() {
- emake DESTDIR="${D}" install
+ use doc && HTML_DOCS=( docs/. )
- if use python; then
- python_install() {
- emake -C "${BUILD_DIR}"/bindings/python \
- DESTDIR="${D}" install
- }
-
- python_foreach_impl python_install
- fi
-
- use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
- dodoc ChangeLog AUTHORS NEWS README
- if use doc; then
- dohtml docs/*
- fi
+ autotools-utils_src_install
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_install
}
1.4 net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild?r1=1.3&r2=1.4
Index: rb_libtorrent-0.16.17-r2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rb_libtorrent-0.16.17-r2.ebuild 17 Mar 2015 20:08:16 -0000 1.3
+++ rb_libtorrent-0.16.17-r2.ebuild 23 Mar 2015 12:07:50 -0000 1.4
@@ -1,12 +1,15 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild,v
1.3 2015/03/17 20:08:16 hwoarang Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.16.17-r2.ebuild,v
1.4 2015/03/23 12:07:50 jlec Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
-inherit multilib python-r1 versionator
+inherit autotools-utils multilib distutils-r1
MY_P=${P/rb_/}
MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -20,12 +23,14 @@
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="debug doc examples python ssl static-libs test"
-RESTRICT="test"
-RDEPEND=">=dev-libs/boost-1.48:=[threads]
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/boost-1.48:=[threads]
sys-libs/zlib
examples? ( !net-p2p/mldonkey )
- ssl? ( dev-libs/openssl:= )
+ ssl? ( dev-libs/openssl:0= )
python? (
${PYTHON_DEPS}
dev-libs/boost[python,${PYTHON_USEDEP}]
@@ -33,51 +38,33 @@
DEPEND="${RDEPEND}
>=sys-devel/libtool-2.2"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
-src_prepare() {
- use python && python_copy_sources
-}
+PATCHES=( "${FILESDIR}"/${P}-python.patch )
src_configure() {
- local myconf=(
+ local myeconfargs=(
--disable-silent-rules # bug 441842
+ --with-boost-libdir=/usr/$(get_libdir)
$(use_enable debug)
$(use_enable test tests)
$(use_enable examples)
$(use_enable ssl encryption)
- $(use_enable static-libs static)
- --with-boost-libdir=/usr/$(get_libdir)
+ $(use_enable python python-binding)
+ $(usex debug "--enable-logging=verbose" "")
)
+ autotools-utils_src_configure
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_configure
+}
- use debug && myconf+=( --enable-logging=verbose )
-
- econf "${myconf[@]}" --disable-python-binding
-
- if use python; then
- python_configure() {
- run_in_build_dir econf "${myconf[@]}"
--enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
- }
-
- python_foreach_impl python_configure
- fi
+src_compile() {
+ autotools-utils_src_compile
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_compile
}
src_install() {
- emake DESTDIR="${D}" install
+ use doc && HTML_DOCS=( docs/. )
- if use python; then
- python_install() {
- emake -C "${BUILD_DIR}"/bindings/python \
- DESTDIR="${D}" install
- }
-
- python_foreach_impl python_install
- fi
-
- use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
- dodoc ChangeLog AUTHORS NEWS README
- if use doc; then
- dohtml docs/*
- fi
+ autotools-utils_src_install
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_install
}
1.4 net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild?r1=1.3&r2=1.4
Index: rb_libtorrent-1.0.3.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rb_libtorrent-1.0.3.ebuild 3 Mar 2015 22:24:13 -0000 1.3
+++ rb_libtorrent-1.0.3.ebuild 23 Mar 2015 12:07:50 -0000 1.4
@@ -1,12 +1,15 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild,v 1.3
2015/03/03 22:24:13 hwoarang Exp $
+# $Header:
/var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-1.0.3.ebuild,v 1.4
2015/03/23 12:07:50 jlec Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
PYTHON_REQ_USE="threads"
+DISTUTILS_OPTIONAL=true
+AUTOTOOLS_AUTORECONF=true
-inherit eutils multilib python-r1
+inherit autotools-utils multilib distutils-r1
MY_P=${P/rb_/}
MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -23,60 +26,47 @@
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND=">=dev-libs/boost-1.53:=[threads]
+RDEPEND="
+ >=dev-libs/boost-1.53:=[threads]
sys-libs/zlib
examples? ( !net-p2p/mldonkey )
+ ssl? ( dev-libs/openssl:0= )
python? (
${PYTHON_DEPS}
dev-libs/boost[python,${PYTHON_USEDEP}]
- )
- ssl? ( dev-libs/openssl:= )"
+ )"
DEPEND="${RDEPEND}
>=sys-devel/libtool-2.2"
-src_prepare() {
- use python && python_copy_sources
- epatch_user
-}
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-python.patch )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
src_configure() {
- local myconf=(
+ local myeconfargs=(
--disable-silent-rules # bug 441842
+ --with-boost-libdir=/usr/$(get_libdir)
$(use_enable debug)
$(use_enable test tests)
$(use_enable examples)
$(use_enable ssl encryption)
- $(use_enable static-libs static)
- --with-boost-libdir=/usr/$(get_libdir)
+ $(use_enable python python-binding)
+ $(usex debug "--enable-logging=verbose" "")
)
+ autotools-utils_src_configure
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_configure
+}
- use debug && myconf+=( --enable-logging=verbose )
-
- econf "${myconf[@]}" --disable-python-binding
- if use python; then
- python_configure() {
- run_in_build_dir econf "${myconf[@]}"
--enable-python-binding --with-boost-python=boost_python-${EPYTHON#python}
- }
-
- python_foreach_impl python_configure
- fi
+src_compile() {
+ autotools-utils_src_compile
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_compile
}
src_install() {
- emake DESTDIR="${D}" install
+ use doc && HTML_DOCS=( docs/. )
- if use python; then
- python_install() {
- emake -C "${BUILD_DIR}"/bindings/python \
- DESTDIR="${D}" install
- }
-
- python_foreach_impl python_install
- fi
-
- use static-libs || find "${D}" -name '*.la' -exec rm -f {} +
- dodoc ChangeLog AUTHORS NEWS README
- if use doc; then
- dohtml docs/*
- fi
+ autotools-utils_src_install
+ use python && cd "${BUILD_DIR}"/bindings/python &&
distutils-r1_src_install
}
1.7 net-libs/rb_libtorrent/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/metadata.xml?rev=1.7&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/metadata.xml?rev=1.7&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/metadata.xml?r1=1.6&r2=1.7
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml 23 Sep 2012 10:00:23 -0000 1.6
+++ metadata.xml 23 Mar 2015 12:07:50 -0000 1.7
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>net-p2p</herd>
- <maintainer>
- <email>hwoar...@gentoo.org</email>
- <name>Markos Chandras</name>
- </maintainer>
- <upstream>
- <remote-id type="google-code">libtorrent</remote-id>
- </upstream>
+ <herd>net-p2p</herd>
+ <maintainer>
+ <email>hwoar...@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">libtorrent</remote-id>
+ </upstream>
</pkgmetadata>
1.191 net-libs/rb_libtorrent/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/ChangeLog?rev=1.191&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/ChangeLog?rev=1.191&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/rb_libtorrent/ChangeLog?r1=1.190&r2=1.191
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- ChangeLog 17 Mar 2015 20:30:26 -0000 1.190
+++ ChangeLog 23 Mar 2015 12:07:50 -0000 1.191
@@ -1,6 +1,13 @@
# ChangeLog for net-libs/rb_libtorrent
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.190
2015/03/17 20:30:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.191
2015/03/23 12:07:50 jlec Exp $
+
+ 23 Mar 2015; Justin Lecher <j...@gentoo.org>
+ +files/rb_libtorrent-0.16.17-python.patch,
+ +files/rb_libtorrent-1.0.2-python.patch, metadata.xml,
+ rb_libtorrent-0.16.17-r2.ebuild, rb_libtorrent-0.16.19.ebuild,
+ rb_libtorrent-1.0.2.ebuild, rb_libtorrent-1.0.3.ebuild:
+ Fix python stuff, bug #542434
*rb_libtorrent-0.16.19 (17 Mar 2015)
