commit: 936aa888f16230e1a7cf8e4f192241b902cc6f3d Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Tue Nov 15 23:54:28 2016 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Wed Nov 23 07:59:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936aa888
dev-libs/libsigc++: properly disable benchmarking Also make boost dependency a multilib one Upstream bug logged: https://bugzilla.gnome.org/show_bug.cgi?id=774732 Gentoo-Bug: 599764 Package-Manager: portage-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/2842 Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> ...libsigc++-2.10.0-make-disable-benchmarks-work.patch | 18 ++++++++++++++++++ dev-libs/libsigc++/libsigc++-2.10.0.ebuild | 10 +++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch b/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch new file mode 100644 index 00000000..2c9a62a --- /dev/null +++ b/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch @@ -0,0 +1,18 @@ +--- a/configure ++++ b/configure +@@ -1480,6 +1480,7 @@ + --enable-benchmark=yes|no + + ++ + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +@@ -17799,8 +17800,7 @@ + + # Check whether --enable-benchmark was given. + if test "${enable_benchmark+set}" = set; then : +- enableval=$enable_benchmark; enable_benchmark=yes +- ++ enableval=$enable_benchmark; + fi diff --git a/dev-libs/libsigc++/libsigc++-2.10.0.ebuild b/dev-libs/libsigc++/libsigc++-2.10.0.ebuild index d1d2ff7..2e98bb0 100644 --- a/dev-libs/libsigc++/libsigc++-2.10.0.ebuild +++ b/dev-libs/libsigc++/libsigc++-2.10.0.ebuild @@ -16,10 +16,13 @@ IUSE="doc static-libs test" RDEPEND="" DEPEND="sys-devel/m4 doc? ( app-doc/doxygen ) - test? ( dev-libs/boost )" + test? ( dev-libs/boost[${MULTILIB_USEDEP}] )" # Needs mm-common for eautoreconf src_prepare() { + # properly interpret --{enable,disable}-benchmark configure option (bug 599764) + eapply "${FILESDIR}"/${P}-make-disable-benchmarks-work.patch + # don't waste time building examples sed -i 's|^\(SUBDIRS =.*\)examples\(.*\)$|\1\2|' \ Makefile.am Makefile.in || die "sed examples failed" @@ -51,8 +54,5 @@ multilib_src_install_all() { # Note: html docs are installed into /usr/share/doc/libsigc++-2.0 # We can't use /usr/share/doc/${PF} because of links from glibmm etc. docs - if use doc ; then - insinto /usr/share/doc/${PF} - doins -r examples - fi + use doc && dodoc -r examples }
