Add multilib support. Update license.

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

3 files changed, 86 insertions, 5 deletions

diff --git a/dev-cpp/libglademm/ChangeLog b/dev-cpp/libglademm/ChangeLog
index 10c9930e0741..e3bc9711d802 100644
--- a/dev-cpp/libglademm/ChangeLog
+++ b/dev-cpp/libglademm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/libglademm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v 1.89 2014/12/02 22:29:02 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/ChangeLog,v 1.90 2015/03/06 05:07:33 tetromino Exp $
+
+*libglademm-2.6.7-r1 (06 Mar 2015)
+
+  06 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libglademm-2.6.7.ebuild, +libglademm-2.6.7-r1.ebuild:
+  Add multilib support. Update license.
 
   02 Dec 2014; Pacho Ramos <pacho@gentoo.org> libglademm-2.6.7.ebuild:
   Update ebuild
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild
new file mode 100644
index 000000000000..fa65562d29d8
--- /dev/null
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild,v 1.1 2015/03/06 05:07:33 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ bindings for libglade"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2.6.4-r1:2.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/gtkmm-2.24.3:2.4[${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.34.1:2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtkmmlibs-20140508
+		!app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# we will control install manually in install
+	sed -i 's/^\(SUBDIRS =.*\)docs\(.*\)$/\1\2/' Makefile.am Makefile.in || \
+		die "sed Makefile.{am,in} failed (1)"
+
+	# don't waste time building the examples
+	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+		Makefile.am Makefile.in || die "sed Makefile.{am,in} failed (2)"
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure
+}
+
+multilib_src_compile() {
+	gnome2_src_compile
+
+	if multilib_is_native_abi && use doc; then
+		emake -C "docs/reference" all || die "emake doc failed"
+	fi
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use doc ; then
+		dohtml -r docs/reference/html/*
+	fi
+
+	if use examples; then
+		emake -C "${S}/examples" distclean || die "examples clean up failed"
+		find "${S}/examples" -name "Makefile*" -delete \
+			|| die "examples cleanup failed"
+		insinto "/usr/share/doc/${PF}"
+		doins -r examples || die "doins failed"
+	fi
+}
diff --git a/dev-cpp/libglademm/libglademm-2.6.7.ebuild b/dev-cpp/libglademm/libglademm-2.6.7.ebuild
index 114279dcdcf0..5b9895d5e5ee 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.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-cpp/libglademm/libglademm-2.6.7.ebuild,v 1.12 2014/12/02 22:29:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7.ebuild,v 1.13 2015/03/06 05:07:33 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="C++ bindings for libglade"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="doc examples"