[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsigc++/files/, dev-libs/libsigc++/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsigc++/files/, dev-libs/libsigc++/

[Gilles Dartiguelongue]

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
 }

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libsigc++/files/, dev-libs/libsigc++/

[Mart Raudsepp]

commit:     4770b87da10e10445decf11facef212cf0069cc3
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 20:53:49 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 20:53:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4770b87d

dev-libs/libsigc++: remove old

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 dev-libs/libsigc++/Manifest                        |  1 -
 ...igc++-2.10.0-make-disable-benchmarks-work.patch | 18 -------
 dev-libs/libsigc++/libsigc++-2.10.0.ebuild         | 57 ----------------------
 3 files changed, 76 deletions(-)

diff --git a/dev-libs/libsigc++/Manifest b/dev-libs/libsigc++/Manifest
index 023cf505a27..13b5024fdd1 100644
--- a/dev-libs/libsigc++/Manifest
+++ b/dev-libs/libsigc++/Manifest
@@ -1,3 +1,2 @@
 DIST libsigc++-1.2.7.tar.bz2 326205 BLAKE2B b316460178224c0b8177ce9a236c69a8b737bf7356b290b59eaeb60b09285c61d113bfc7de89bd712c3c049a492f5cc36d205ac77816aff73e587e8a42ade520 SHA512 79fd9657219459bce64fc069dbcb054959e324b5d546b5f11acaae5e5bedcc4dca699a21c949e3f6b2ec0dbe1c3dba3981158e5950d0aaba5028445b2ad5740f
-DIST libsigc++-2.10.0.tar.xz 3794612 BLAKE2B 205cd8cedbe25d04108df888c392fe6a14829826cf1b6b7604a03f357788dfa83a5ba213d6365c48965dd16fcd7b545c9e76d4e4d10971cc1c9ccb172ec0400f SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
 DIST libsigc++-2.10.1.tar.xz 4062388 BLAKE2B 3bd988acae78b7d463c966fa5c8da68b35d8a0b0bf4762811b7a9fdf82357b29aaa48d64e19f4cb6bd0f42ee70ad77a64a4905d1ad609dbe11ca8ff7596527c6 SHA512 e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2

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
deleted file mode 100644
index 2c9a62a6b06..00000000000
--- a/dev-libs/libsigc++/files/libsigc++-2.10.0-make-disable-benchmarks-work.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index 82c255add4f..00000000000
--- a/dev-libs/libsigc++/libsigc++-2.10.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 flag-o-matic multilib-minimal
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="http://libsigc.sourceforge.net/"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
-
-RDEPEND=""
-DEPEND="sys-devel/m4
-	doc? ( app-doc/doxygen )
-	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"
-
-	# don't waste time building tests unless USE=test
-	if ! use test ; then
-		sed -i 's|^\(SUBDIRS =.*\)tests\(.*\)$|\1\2|' \
-			Makefile.am Makefile.in || die "sed tests failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	filter-flags -fno-exceptions #84263
-
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable doc documentation) \
-		$(use_enable static-libs static) \
-		$(use_enable test benchmark)
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	# 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
-	use doc && dodoc -r examples
-}