net-libs/rb_libtorrent: fix miscellaneous issues

Gentoo-Bug: https://bugs.gentoo.org/581274
Closes: https://github.com/gentoo/gentoo/pull/1394

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild
index 9476aa4b2b306ee24a5ddcad0daa8e0c3b6e4a4b..6a517b90ea4239fc1f8311cb7993ee0a3a4994c5 100644 (file)
--- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild
@@ -43,6 +43,10 @@ RESTRICT="test"
 src_prepare() {
        default
 
+       # make sure lib search dir points to the main `S` dir and not to python copies
+       sed -i "s|-L[^ ]*/src/\.libs|-L${S}/src/.libs|" \
+               -- 'bindings/python/link_flags.in' || die
+
        # needed or else eautoreconf fails
        mkdir build-aux && cp {m4,build-aux}/config.rpath || die
 
@@ -80,7 +84,7 @@ src_compile() {
        default
 
        python_compile() {
-               cd "${BUILD_DIR}/../bindings/python" || return 1
+               cd "${BUILD_DIR}/../bindings/python" || die
                distutils-r1_python_compile
        }
        use python && distutils-r1_src_compile
@@ -92,7 +96,7 @@ src_install() {
        default
 
        python_install() {
-               cd "${BUILD_DIR}/../bindings/python" || return 1
+               cd "${BUILD_DIR}/../bindings/python" || die
                distutils-r1_python_install
        }
        use python && distutils-r1_src_install