Add multilib support. Update license. Drop old ebuild.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

5 files changed, 71 insertions, 53 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/Manifest b/dev-cpp/atkmm/Manifest
index a29d32d4b4e7..c290224fd9dd 100644
--- a/dev-cpp/atkmm/Manifest
+++ b/dev-cpp/atkmm/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST atkmm-2.22.6.tar.xz 562892 SHA256 0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6 SHA512 69d5b3b2131658d7ffd5be86bcb0a5966fe9446a7cae1138cb2849d5ccf64f58fc9cc16cc7cb2c5b883bb441966980c8acaa7566d23771f9334919ca27c28942 WHIRLPOOL 92a6afeb9968355bdc423df8017ba061764a02dd2c7adf66ace507eda0a3f1f9e6b79443978323b7a49fc4bf87c2f7becada97a8db6564ff24a8ccffb3504bf7
 DIST atkmm-2.22.7.tar.xz 392184 SHA256 bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b SHA512 8d34f30325b984c829b0354ea9ab85cc7edfdd1b4f160322122637c51542f43aa71f1e80adf1a54f9e2fcdd16172e118b61c3759b296824ab3a6cc3f0d4ffed2 WHIRLPOOL 6bf6dc505b38ad9b7d8c955065c2cf084283d1f57fdc459d1019c60913ee02ae9df5ec6c70e1abb914542d0724f08690a44a0ffa07bcf05409baabd985fbfed5
-EBUILD atkmm-2.22.6.ebuild 793 SHA256 c19f79d912c35dcb8a97ae51bf1d819eff42daec13ae7315ecbdb6c6fec80826 SHA512 dd9d15b3befb88171d0187e46f6ed6fecdcf5d6bde5bc55dda095e35de00c5f6f22fa1765c96a62fe0b2f5edd9b5f71bd2a3200ab173953edd04869e7ac10074 WHIRLPOOL fd6639af4d18a9c6a2d0ff3621ba6a360e443d0739b00b1e297fc7f7f459c2529aaaf83116a8027f48a5ed1aa49fdb0d94840ea6684d175d0dd71df3aac9af6a
-EBUILD atkmm-2.22.7.ebuild 761 SHA256 3b4f6803ba62820cc861ba98bcd0b592944d178b31d52ee56d20f346a0e531e9 SHA512 f6dc0fa23350f4956b9c7254068bad3d6cd78833c63a36541e96bec0f9f87f8342442ae0053b4061d9cc5796a945b344cb37ef0a1b1b8ed94c5b406f3778c350 WHIRLPOOL 15ba6e7ea791d4c55c4deb034996baff26c0e348760309599868b87c32d49e89eae0538d37cfbcf87fe18144f7093984356ce3b119ad6c1080c9dd873c1f0e47
-MISC ChangeLog 5460 SHA256 b0cced5d8ffd1ac466eaf2d48ae2e6281503710cc5b0d70f376c05cb29af35de SHA512 f1c8b2fb4786e2edfdde98e761e4e0cb201a4b531590085e0191cc41f460cee562d2fb77b1d0c5172dbe7b2d0a98b2ffddf367c355a9d379ac3fd5565aae2ded WHIRLPOOL c1f1120cf3f83655767371e21bc5500eab4827c36dde3648bd9afa7e6ae83de17f19e62b57f295cd5b754e1c9f5b5209b5f6b9bb2ee81d03addcc03275d274c1
+EBUILD atkmm-2.22.7-r1.ebuild 1129 SHA256 622b36d58d1187a972c328078795e434bb540a8a6875b95388c3fb2f7bd5ecaf SHA512 948d73185faabf8706cf2a1096ac5d77042f8d7a378405b9e74bf12fd319fd0dd34dea17b3af752a7a55c2926a98feaa47bd6552ffdcef220542fcd71df70a60 WHIRLPOOL 2f5e67ced7e0700e4a09d81edd29194a9a8bf410c49aded2b948b956d97344c7c88067c9b756e5425459f3a421f112644636f39397f7f3841ca3847a436af142
+EBUILD atkmm-2.22.7.ebuild 768 SHA256 ed809c4eac10e3f6b54982620ec8190924d200752b42088e59d4ca4b0bd6ed72 SHA512 08f916af47e926c89e56eed10d7e62602e29c3e4e29e7a9e832169e558da957d042556ae14f9dfbf895d12bf30c85cf6834aaf942ab8d311a592af97abd102d9 WHIRLPOOL ce1f172b17cca7994b0afc4fe6fea008e1e2c95fdccb672c94c17ad69edbdcd1d00b6119e55a23d5f42e3d4d201911a74ac3f24cd8f5849de120fcc79830a657
+MISC ChangeLog 5685 SHA256 2cb19620dd1ef9aa03d44889be453229b7cc8ef524ae83ec8f0c3674e74a17bb SHA512 a340f088ffaad115fb031d318a372b45f8f67ac34cc28bbc309f095ab4bf3f6f6366e4aa6345cf3d6d748cc143c41aea437e1258a20b46f63faba2e3fb380038 WHIRLPOOL 9b595a8bf96dedcbb2b90ac7a428e351dc5878f99853274dd42912b0e0b49654879042a874aaa53d890637ea79ad4e967ae104a81de13a479f387ea5af6fb72b
 MISC metadata.xml 161 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 SHA512 22fe7471187a068f45de295adc5349f8f01d16d06562f8edfceb5dacb604d98b0e3cadc23f7d0b164f6429769b71961bc5d9088a41f1ca4a968e4be37ac6ef1b WHIRLPOOL 92db96c310438550f7073b19fb34f6d5d7e478b04b43bff8a2815374ce50c2fa7291018c4131d48face3f3f0a66e0a3d2a778c42550a1fbfedb386db48a4bf05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTpEjhAAoJELp701BxlEWfJNIP/0zoVTGhSWBakYIwNfy6DmMH
-Wc3O858kosf8EwRYu3PJkghbuXtO2swW0jYFX/A0iMQc1OT/MXI+mYMCu4VVZDj/
-ehhjyHgMOvd9crk01UN1FJUddMdEaaZ5Tkden90ytQ4yZeJ7qVGSU6HOYQPoCzIp
-R8GNS1nxnDluAJckOsgz3qbrbAU6hN6H2983p/fLmLGePu6VHJzawE9v8/R/lTig
-ws3vgxNSUT6gfW4kCvXI4f/tKkmU4CgKsLllJzyVas9yaK5myhzFgGW0wT9eTWYY
-j2dB4XKM3DrFfjUX4T2XKneg/+4ZRSsaxZuDMXLe5usVYE3/wFSV/VPZMt63g3sW
-OckEbUtQ8w+/J0q3OWV4EV02W0wYrECd5F/H5x6HcVpcZ0UaO3hK9AT63oATp7W/
-paUw3tLiAdWrs+UXzfH/P1dEGh+T3Eo6RI/jEgtX5nCtpAnDX5hLRyQp4Rc9E3EB
-pFtArUH8gajZpEB0C0xQ+c/c/onQ0qZLoynBBdySNFmbPlaZX3fKZvBDJ5NwVNFh
-QblW8AO7Lb6iNIEalmo3y5Y1Pq5bRFJaT4BHjg5K9D+MmBru4iE68y/mpjS6m3+O
-m1Um2yUIIigXOy94OqE23ky/gmM1dtrjeJDiInPAqProgIA7aZpbAxkXexBPJDUk
-Vn1LOPZG1tOsqgde2WMZ
-=SV1s
+iQJ8BAEBCABmBQJU+TV0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNwz8QAJOQmXqKXM6V0tRc4Es44slO
+1y9JSsmtlC1rImrOAb31gGqzmWoa1oZiASK+rM3ItQLGovoM1dT9qSevOPlSOyQG
+4Tlt0xP2VtgNkYBfpXy4EzEjoJN6nNNVlfmS5nm/41FiELgeEEI2bc9E2X3lLlzh
+yyxYopI1MntxZZjJpdncOKOTC34V2NkkXpfk6D0coziDjxr3y0JleFJZSUbEDxwD
+0qSRSZ27O5fLkkBpGfDjg/5Cc1qQpGIALK/rINrMclhGT1MC0OSoEAfOU4TA58Ne
+D1Yw4EOP50mKojNVubhq2Sdrx1XRPb2GnZtNIZ/T69h9I3Li78fRE14vOz0FYCn/
+5j7Sa8m9vCCC7TEHb1WM9kd0KqlD7/DUhuMPrjR1mF2TmOZxG5S3Yqv53DFq56Ws
+cbwLOgPUuhbteDA1Xf41WlCRz3kwdxu0ZFL9OJZNs/ZTxXL5vRyEqGMNRDYnYXd/
+K01MdiQZkuJO7vRZzSk9hgU+MX5HsmqIQNTPndgFJQVRpee2pcVus++XRxyWegLT
+ZYURInMzK4s+Lg9vL8ERDkNncYp5t0wnqFFeESImAkbrUd6WYcXN3LlpTCx4EuYd
+uyTWn2HeFF2ubqGhq+B1RG5Xyof8xRqdqUJt2t2BUZ2xYjDTB0pZj8bZ9ONKkANc
+L2X/okXQ2XeSQm/sUgHs
+=Ekz5
 -----END PGP SIGNATURE-----
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"