dev-libs/boost-static: remove unneeded code and set strict version dependency with...

diff --git a/dev-libs/boost-static/boost-static-1.90.0-r2.ebuild b/dev-libs/boost-static/boost-static-1.90.0-r2.ebuild
index fb9b4178bab98a48e4400649f6ebacd0c68826b0..486258a0bb793a2112bff056f8d648b492ec0ab9 100644 (file)
--- a/dev-libs/boost-static/boost-static-1.90.0-r2.ebuild
+++ b/dev-libs/boost-static/boost-static-1.90.0-r2.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-       dev-libs/boost[static-libs]
+       ~dev-libs/boost-"${PV}"[static-libs]
        context? ( dev-libs/boost[context] )
        debug? ( dev-libs/boost[debug] )
        doc? ( dev-libs/boost[doc] )
@@ -365,46 +365,6 @@ multilib_src_install() {
                --includedir="${ED}"/usr/include \
                --libdir="${ED}"/usr/$(get_libdir) \
                "${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
-
-       # boost's build system truely sucks for not having a destdir.  Because for
-       # this reason we are forced to build with a prefix that includes the
-       # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-       # DESTROOT instread of the actual EPREFIX.  There is no way out of here
-       # but to do it the dirty way of manually setting the right install_names.
-       if [[ ${CHOST} == *-darwin* ]]; then
-               einfo "Working around completely broken build-system(tm)"
-               local d
-               for d in "${ED}"/usr/lib/*.dylib; do
-                       if [[ -f ${d} ]]; then
-                               # fix the "soname"
-                               ebegin "  correcting install_name of ${d#${ED}}"
-                               install_name_tool -id "/${d#${D}}" "${d}"
-                               eend $?
-                               # fix references to other libs
-                               # these paths look like this:
-                               # bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/
-                               #  threadapi-pthread/threading-multi/visibility-hidden/
-                               #  libboost_thread.dylib
-                               refs=$(otool -XL "${d}" | \
-                                       sed -e '1d' -e 's/^\t//' | \
-                                       grep "libboost_" | \
-                                       cut -f1 -d' ')
-                               local r
-                               for r in ${refs}; do
-                                       # strip path prefix from references, so we obtain
-                                       # something like libboost_thread.dylib.
-                                       local r_basename=${r##*/}
-
-                                       ebegin "    correcting reference to ${r_basename}"
-                                       install_name_tool -change \
-                                               "${r}" \
-                                               "${EPREFIX}/usr/lib/${r_basename}" \
-                                               "${d}"
-                                       eend $?
-                               done
-                       fi
-               done
-       fi
 }
 
 multilib_src_install_all() {

diff --git a/dev-libs/boost-static/boost-static-1.91.0-r1.ebuild b/dev-libs/boost-static/boost-static-1.91.0-r1.ebuild
index 1231a6dd7ab2a465c1e3f5c791f07cc5d19e4881..f0102f8b8c3779b55e208c804b1c7ed7bdd658b4 100644 (file)
--- a/dev-libs/boost-static/boost-static-1.91.0-r1.ebuild
+++ b/dev-libs/boost-static/boost-static-1.91.0-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-       dev-libs/boost[static-libs]
+       ~dev-libs/boost-"${PV}"[static-libs]
        context? ( dev-libs/boost[context] )
        debug? ( dev-libs/boost[debug] )
        doc? ( dev-libs/boost[doc] )
@@ -371,46 +371,6 @@ multilib_src_install() {
                --includedir="${ED}"/usr/include \
                --libdir="${ED}"/usr/$(get_libdir) \
                "${OPTIONS[@]}" install || die "Installation of Boost libraries failed"
-
-       # boost's build system truely sucks for not having a destdir.  Because for
-       # this reason we are forced to build with a prefix that includes the
-       # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
-       # DESTROOT instread of the actual EPREFIX.  There is no way out of here
-       # but to do it the dirty way of manually setting the right install_names.
-       if [[ ${CHOST} == *-darwin* ]]; then
-               einfo "Working around completely broken build-system(tm)"
-               local d
-               for d in "${ED}"/usr/lib/*.dylib; do
-                       if [[ -f ${d} ]]; then
-                               # fix the "soname"
-                               ebegin "  correcting install_name of ${d#${ED}}"
-                               install_name_tool -id "/${d#${D}}" "${d}"
-                               eend $?
-                               # fix references to other libs
-                               # these paths look like this:
-                               # bin.v2/libs/thread/build/gcc-12.1/gentoorelease/pch-off/
-                               #  threadapi-pthread/threading-multi/visibility-hidden/
-                               #  libboost_thread.dylib
-                               refs=$(otool -XL "${d}" | \
-                                       sed -e '1d' -e 's/^\t//' | \
-                                       grep "libboost_" | \
-                                       cut -f1 -d' ')
-                               local r
-                               for r in ${refs}; do
-                                       # strip path prefix from references, so we obtain
-                                       # something like libboost_thread.dylib.
-                                       local r_basename=${r##*/}
-
-                                       ebegin "    correcting reference to ${r_basename}"
-                                       install_name_tool -change \
-                                               "${r}" \
-                                               "${EPREFIX}/usr/lib/${r_basename}" \
-                                               "${d}"
-                                       eend $?
-                               done
-                       fi
-               done
-       fi
 }
 
 multilib_src_install_all() {