Version bump and add native multilib support. Drop old. Update license.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

5 files changed, 73 insertions, 60 deletions

diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index df4c860cefd6..c3400230e30e 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libsigc++
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.205 2015/03/03 06:36:17 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.206 2015/03/05 23:06:14 tetromino Exp $
+
+*libsigc++-2.4.1 (05 Mar 2015)
+
+  05 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libsigc++-1.2.7.ebuild, -libsigc++-2.3.1.ebuild, libsigc++-2.4.0.ebuild,
+  +libsigc++-2.4.1.ebuild:
+  Version bump and add native multilib support. Drop old. Update license.
 
   02 Mar 2015; Yixun Lan <dlan@gentoo.org> libsigc++-2.4.0.ebuild:
   add arm64 support, tested on A53 board
diff --git a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
index 8ae80095df4d..de6c31f06d1d 100644
--- a/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
+++ b/dev-libs/libsigc++/libsigc++-1.2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.7.ebuild,v 1.11 2014/12/02 22:38:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-1.2.7.ebuild,v 1.12 2015/03/05 23:06:14 tetromino Exp $
 
 EAPI=5
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ inherit autotools gnome2 eutils
 DESCRIPTION="Typesafe callback system for standard C++"
 HOMEPAGE="http://libsigc.sourceforge.net/"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2 LGPL-2.1+"
 SLOT="1.2"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
 IUSE=""
diff --git a/dev-libs/libsigc++/libsigc++-2.3.1.ebuild b/dev-libs/libsigc++/libsigc++-2.3.1.ebuild
deleted file mode 100644
index bc30b8c2ec5e..000000000000
--- a/dev-libs/libsigc++/libsigc++-2.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.3.1.ebuild,v 1.14 2013/04/13 20:55:15 ago Exp $
-
-EAPI="4"
-
-inherit eutils gnome.org flag-o-matic
-
-DESCRIPTION="Typesafe callback system for standard C++"
-HOMEPAGE="http://libsigc.sourceforge.net/"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-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"
-
-# Needs mm-common for eautoreconf
-src_prepare() {
-	# 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
-}
-
-src_configure() {
-	filter-flags -fno-exceptions
-
-	econf \
-		$(use_enable doc documentation) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README NEWS TODO"
-	default
-
-	if ! use static-libs ; then
-		prune_libtool_files
-	fi
-
-	if use doc ; then
-		dohtml -r docs/reference/html/* docs/images/*
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-libs/libsigc++/libsigc++-2.4.0.ebuild b/dev-libs/libsigc++/libsigc++-2.4.0.ebuild
index 792848682d5f..6c2ac38feb21 100644
--- a/dev-libs/libsigc++/libsigc++-2.4.0.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.4.0.ebuild,v 1.11 2015/03/03 06:36:17 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.4.0.ebuild,v 1.12 2015/03/05 23:06:14 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit eutils gnome2 flag-o-matic
 DESCRIPTION="Typesafe callback system for standard C++"
 HOMEPAGE="http://libsigc.sourceforge.net/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
diff --git a/dev-libs/libsigc++/libsigc++-2.4.1.ebuild b/dev-libs/libsigc++/libsigc++-2.4.1.ebuild
new file mode 100644
index 000000000000..d4e3c5fa8e23
--- /dev/null
+++ b/dev-libs/libsigc++/libsigc++-2.4.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.4.1.ebuild,v 1.1 2015/03/05 23:06:14 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs test"
+
+RDEPEND="abi_x86_32? (
+	!<=app-emulation/emul-linux-x86-cpplibs-20140508-r1
+	!app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] )
+"
+DEPEND="sys-devel/m4"
+# Needs mm-common for eautoreconf
+
+src_prepare() {
+	# 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)
+}
+
+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
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}