Add multilib support.

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

diff --git a/dev-cpp/glibmm/ChangeLog b/dev-cpp/glibmm/ChangeLog
index b3d95fce61f445d4415f99227e07eb1a3d04ad09..c03ce28bee527cb51873360899f95f8e8c6e59dd 100644 (file)
--- a/dev-cpp/glibmm/ChangeLog
+++ b/dev-cpp/glibmm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/glibmm
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.229 2014/12/21 12:18:54 eva Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/ChangeLog,v 1.230 2015/03/06 05:03:05 tetromino Exp $
+
+*glibmm-2.42.0-r1 (06 Mar 2015)
+
+  06 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +glibmm-2.42.0-r1.ebuild:
+  Add multilib support.
 
 *glibmm-2.42.0 (21 Dec 2014)
 

diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 2042f50edcf9cdcd92841c5bcef84fb7143066dd..067f487301ce35e40532aec15f0a3d4f49c3d9c2 100644 (file)
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -4,13 +4,26 @@ Hash: SHA256
 DIST glibmm-2.40.0.tar.xz 5645840 SHA256 34f320fad7e0057c63863706caa802ae0051b21523bed91ec33baf8421ca484f SHA512 3a51b3e311ba59505b3c452afdfdf456f184c39651d81317ff62f942d309f8707306cc68c69c20f7534f585036086088159414c7e75de59ab2684c4850559cb9 WHIRLPOOL 876ac86023e41b281408bf5435e32cd7674c2db1f92910508a082c8b316651b9e612de431ff767bffe4cd0613bb03a040e7569198cf3dc607f572cbcf5198bb2
 DIST glibmm-2.42.0.tar.xz 6031860 SHA256 985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397 SHA512 63bac04bf288d90f40d8bd08d16e147a42e2293a99998fabdc83bf1ef8a50197e44d95c1608f93fe7f2a1a791dd624dffb2db4426d3eaf32ce0f75ddac3559fb WHIRLPOOL 644b9446907066b20695ae9d848633b73aa30adff43d7c08f7afe002670cfac96a7e98d9669d35721c1f41fd2efb1ebc03d84ae1bdd3147f32e5a70ad3d099ea
 EBUILD glibmm-2.40.0.ebuild 1643 SHA256 12d4c968ea10a73f7567233f6295ad1a51233f870eeca6cb2029e54ff4009de6 SHA512 c9217edfa3c37875b898e6c0a3cf6c1b30d0a82a36d7ea34a5cd34cb3566799429e71d2325498fe094d3d2e389d0abd20f3f77b15728f55fe281f4fafa012db4 WHIRLPOOL b1aa97f8ae88ab407c6f1fb7c22b5e3235675ff2d7064ea99193c3bd8bb154391626bd81babaa2151b24d57db13f19b59aed3ec497f3f8b02e696757721fcef4
+EBUILD glibmm-2.42.0-r1.ebuild 2113 SHA256 a055e471d9203980f1ee328a89d752556c98357602be9ad2346a903740f93821 SHA512 4286c91b780b29b2408655ab4b341bf746cb08e68e0a85f08a3d3495a41bddfed9a658d48d36bd725c98ea7bcbd5b947598161ee82c17b75c9b8f0ca60a27818 WHIRLPOOL 37ef190f2eff97d9f9a7afdcf9edbce0b69c43ae9fb03ad1f2ecf99773e6f46ae464eb8803dacd716b1791a5eeccf03b142326fa84bc507dc92565e5faaff08f
 EBUILD glibmm-2.42.0.ebuild 1779 SHA256 bc4a8bcfb3a15ac24b6cf9b17fd4fc6863094ea9169b25e2011e11095afdd5f8 SHA512 016237e52f99e603dfe91f6435917449e83f47995ca6985d8cf0828118fd0f301c4ad4a1f7011257c133c5d439eb44ac9016bfb04107a38a19a236a42c5fe32b WHIRLPOOL 9e25ae638b28f7f6900d2f3935a70ecb6b1f20a9ae1d1335ceded1241da99988120d10941fea74bd712c1d0f1020957ab189194e48aa54c009b44b86d95dc538
-MISC ChangeLog 27932 SHA256 2e2fa651da0a70ad13a3c5a6870c9dd7131e1faba4e41f7e660d7a4799400000 SHA512 e1efb152dda75dcbb0b03e3ab8b9fcad00a1614dea0c6b19603baa8ba07fb3d92c60cadfb9bdbdc008f8cb046fac5e7a5c49422992a21884a99608294c32cd80 WHIRLPOOL 014a582ccdbde50c172ec796a2f600aa530f361eaad10dcb7e2d73f70df7c57f3cd244df22baf5a8a281ec589a46fcf0f13ea1b9df59bc9b4927fffcd25c7a26
+MISC ChangeLog 28083 SHA256 7ba224d02758fb9b589d8bba249ddd1938c2c558fbd3020d0ed9f2ca25472473 SHA512 f5987a85228799f07248214bbb3e1c2f1ea34566bfc3372faba3d41fc2e01c6f46504ecc635af69540c0b65b334246f5d8d560bd544e0801cac25d78189a4b23 WHIRLPOOL 387e77f23ee8039d793ea6d350081957193482af5d1c79a331df11f95f05d5633c20e0c8898b06baa5473856a2710270d20b29820e5fce3911086d1417c459e9
 MISC metadata.xml 161 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 SHA512 22fe7471187a068f45de295adc5349f8f01d16d06562f8edfceb5dacb604d98b0e3cadc23f7d0b164f6429769b71961bc5d9088a41f1ca4a968e4be37ac6ef1b WHIRLPOOL 92db96c310438550f7073b19fb34f6d5d7e478b04b43bff8a2815374ce50c2fa7291018c4131d48face3f3f0a66e0a3d2a778c42550a1fbfedb386db48a4bf05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlSWuq8ACgkQ1fmVwcYIWAZsmQCg39Mw2qqKfmVJe8obaJ+O/oG0
-uzIAn3kqji8VkO/h/C8CWyKSYjP1TOYU
-=nJfV
+iQJ8BAEBCABmBQJU+TURXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyNUdAP/ivNAHv9zyxbJtd0OFlw/NR6
+X6DOvb/qWE0hqhxgNOZHHFzpSMEp4ZU/w3uEY8QMJRdAw8VQAfiKKnWkLzpOGwjA
+YONZNiyP9I0RUiV/vr/uonSTom+wDvs6/E33EstQbeTmXupv/ODp3bNKtKZb3r3c
+jnqNRrCbYPv4/CHowEl+qGpqg7R7KlPaoigP/Wb4GRjXhVnJkCwPaCkEkREYSjLf
+LFxEeMbM1nKyr4lQJuCr29d2709O98nscqRfO6vObxMJSQs7R4Tdr+QLMvK5frNo
+WUaE3LiIZGUwREn3VRQznUzu9xnIIwo2GR7tep9HIUVBjd9bGocGAwF6i4cRXkc7
+qyijyKACUgMvjeQbpXrfWaVfBp2TEDFnYz9JXX3X46qqrQ1/EJPwSDNg+uScdZsV
+F862YQ0XMR121vaz+jjpXzBGIuO9kAJiKSgJvGTLzfliy7hrp0sCeQV7MdYOxirj
+yEgWcy/RGY8GsOzSiWN+9G2iv26duOsU/1Ior2ercYkaPCYj1wt8nYM8KZI/ihyZ
+ep3u2qVaLsclxnBKS3kcOorjed/YCkrGrm3nX+VUvIgjGOlBbD3W7i5WWvdV//8c
+1Xgir9Lji58m5dvWgQjGdRjukMTLtWmI90B3TUy5BUQZHjWVdQLM9DCJzrinoxpG
+ZIAIAo0KBw8o7+HYua9T
+=ef0d
 -----END PGP SIGNATURE-----

diff --git a/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild b/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild
new file mode 100644 (file)
index 0000000..3817961
--- /dev/null
+++ b/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glibmm/glibmm-2.42.0-r1.ebuild,v 1.1 2015/03/06 05:03:05 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="C++ interface for glib2"
+HOMEPAGE="http://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc debug examples test"
+
+COMMON_DEPEND="
+       >=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+       >=dev-libs/glib-2.42: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
+       doc? ( app-doc/doxygen )
+"
+# dev-cpp/mm-common needed for eautoreconf
+
+src_prepare() {
+       if ! use test; then
+               # don't waste time building tests
+               sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
+                       -i Makefile.am Makefile.in || die "sed 1 failed"
+       fi
+
+       if ! use examples; then
+               # don't waste time building examples
+               sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
+                       -i Makefile.am Makefile.in || die "sed 2 failed"
+       fi
+
+       # Test fails with IPv6 but not v4, upstream bug #720073
+       sed -e 's:giomm_tls_client/test::' \
+               -i tests/Makefile.{am,in} || die
+
+       gnome2_src_prepare
+}
+
+multilib_src_configure() {
+       ECONF_SOURCE="${S}" gnome2_src_configure \
+               $(use_enable debug debug-refcounting) \
+               $(multilib_native_use_enable doc documentation) \
+               --enable-deprecated-api
+}
+
+multilib_src_test() {
+       cd tests
+       default
+
+       for i in */test; do
+               ${i} || die "Running tests failed at ${i}"
+       done
+}
+
+multilib_src_install() {
+       gnome2_src_install
+}
+
+multilib_src_install_all() {
+       einstalldocs
+
+       if ! use doc && ! use examples; then
+               rm -fr "${ED}usr/share/doc/glibmm*"
+       fi
+
+       if use examples; then
+               find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+               dodoc -r examples
+       fi
+}