commit: df256741b0c9edf087964f30704aaa42abedc85a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 16:12:47 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 03:42:56 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df256741
dev-libs/libsigc++: Bump to EAPI=8
- Rename IUSE=doc → IUSE=gtk-doc since it installs devhelp files
- Drop IUSE=static-libs
- Drop IUSE=examples
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...{libsigc++-2.10.7.ebuild => libsigc++-2.10.7-r1.ebuild} | 14 +++++---------
.../{libsigc++-3.2.0.ebuild => libsigc++-3.2.0-r1.ebuild} | 10 +++++-----
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
b/dev-libs/libsigc++/libsigc++-2.10.7-r1.ebuild
similarity index 80%
rename from dev-libs/libsigc++/libsigc++-2.10.7.ebuild
rename to dev-libs/libsigc++/libsigc++-2.10.7-r1.ebuild
index 628e4bd5f2db..1b019eb376d7 100644
--- a/dev-libs/libsigc++/libsigc++-2.10.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.10.7-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit flag-o-matic gnome.org meson-multilib
DESCRIPTION="Typesafe callback system for standard C++"
@@ -11,20 +11,19 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
LICENSE="LGPL-2.1+"
SLOT="2"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
+IUSE="gtk-doc test"
RESTRICT="!test? ( test )"
DEPEND="test? ( dev-libs/boost[${MULTILIB_USEDEP}] )"
BDEPEND="sys-devel/m4
- doc? ( app-doc/doxygen[dot] )"
+ gtk-doc? ( app-doc/doxygen[dot] )"
multilib_src_configure() {
filter-flags -fno-exceptions #84263
local -a emesonargs=(
- -Ddefault_library=$(usex static-libs both shared)
$(meson_use test benchmark)
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
-Dbuild-examples=false
)
meson_src_configure
@@ -33,8 +32,5 @@ multilib_src_configure() {
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
- docinto examples
- dodoc examples/*.cc
- fi
+ :;
}
diff --git a/dev-libs/libsigc++/libsigc++-3.2.0.ebuild
b/dev-libs/libsigc++/libsigc++-3.2.0-r1.ebuild
similarity index 89%
rename from dev-libs/libsigc++/libsigc++-3.2.0.ebuild
rename to dev-libs/libsigc++/libsigc++-3.2.0-r1.ebuild
index d0c96ac1460c..2b4f40bbfad0 100644
--- a/dev-libs/libsigc++/libsigc++-3.2.0.ebuild
+++ b/dev-libs/libsigc++/libsigc++-3.2.0-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit gnome.org flag-o-matic meson-multilib
DESCRIPTION="Typesafe callback system for standard C++"
@@ -11,11 +11,11 @@ HOMEPAGE="https://libsigcplusplus.github.io/libsigcplusplus/
LICENSE="LGPL-2.1+"
SLOT="3"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
+IUSE="gtk-doc test"
RESTRICT="!test? ( test )"
BDEPEND="
- doc? (
+ gtk-doc? (
app-doc/doxygen[dot]
dev-lang/perl
dev-libs/libxslt
@@ -35,7 +35,7 @@ multilib_src_configure() {
local emesonargs=(
-Dbuild-examples=false
- $(meson_native_use_bool doc build-documentation)
+ $(meson_native_use_bool gtk-doc build-documentation)
)
meson_src_configure
}
@@ -43,5 +43,5 @@ multilib_src_configure() {
multilib_src_install_all() {
# Note: html docs are installed into /usr/share/doc/libsigc++-3.0
# We can't use /usr/share/doc/${PF} because of links from glibmm etc.
docs
- use examples && dodoc -r examples
+ :;
}
