Add multilib support. Update license. Drop old ebuild.

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

4 files changed, 52 insertions, 35 deletions

diff --git a/dev-cpp/atkmm/ChangeLog b/dev-cpp/atkmm/ChangeLog
index dd4385cd2c43..021daa52d1be 100644
--- a/dev-cpp/atkmm/ChangeLog
+++ b/dev-cpp/atkmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/atkmm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/ChangeLog,v 1.46 2014/06/20 14:44:48 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/ChangeLog,v 1.47 2015/03/06 05:04:40 tetromino Exp $
+
+*atkmm-2.22.7-r1 (06 Mar 2015)
+
+  06 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -atkmm-2.22.6.ebuild, atkmm-2.22.7.ebuild, +atkmm-2.22.7-r1.ebuild:
+  Add multilib support. Update license. Drop old ebuild.
 
   20 Jun 2014; Agostino Sarubbo <ago@gentoo.org> atkmm-2.22.7.ebuild:
   Stable for arm, wrt bug #508862
diff --git a/dev-cpp/atkmm/atkmm-2.22.6.ebuild b/dev-cpp/atkmm/atkmm-2.22.6.ebuild
deleted file mode 100644
index 057b57cd5175..000000000000
--- a/dev-cpp/atkmm/atkmm-2.22.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.6.ebuild,v 1.9 2012/05/04 03:44:58 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="C++ interface for the ATK library"
-HOMEPAGE="http://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND=">=dev-cpp/glibmm-2.24:2[doc?]
-	>=dev-libs/atk-1.12
-	dev-libs/libsigc++:2
-	!<dev-cpp/gtkmm-2.22.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable doc documentation)"
-}
diff --git a/dev-cpp/atkmm/atkmm-2.22.7-r1.ebuild b/dev-cpp/atkmm/atkmm-2.22.7-r1.ebuild
new file mode 100644
index 000000000000..2e3ef03858d5
--- /dev/null
+++ b/dev-cpp/atkmm/atkmm-2.22.7-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.7-r1.ebuild,v 1.1 2015/03/06 05:04:40 tetromino Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+#GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for the ATK library"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc"
+
+COMMON_DEPEND="
+	>=dev-cpp/glibmm-2.36.0:2[doc?,${MULTILIB_USEDEP}]
+	>=dev-libs/atk-2.8.0[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${COMMON_DEPEND}
+	!<dev-cpp/gtkmm-2.22.0
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtkmmlibs-20140508
+		!app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		$(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-cpp/atkmm/atkmm-2.22.7.ebuild b/dev-cpp/atkmm/atkmm-2.22.7.ebuild
index 41f61e495d78..ce29d3166cba 100644
--- a/dev-cpp/atkmm/atkmm-2.22.7.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.22.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/atkmm/atkmm-2.22.7.ebuild,v 1.13 2014/06/20 14:44:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/atkmm/atkmm-2.22.7.ebuild,v 1.14 2015/03/06 05:04:40 tetromino Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2
 DESCRIPTION="C++ interface for the ATK library"
 HOMEPAGE="http://www.gtkmm.org"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"