Add multilib support, update license, install docs where other *mm packages expect them (bug #443950)

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

4 files changed, 87 insertions, 11 deletions

diff --git a/dev-cpp/cairomm/ChangeLog b/dev-cpp/cairomm/ChangeLog
index 2a23cd4a68a0..4cfd8575d85a 100644
--- a/dev-cpp/cairomm/ChangeLog
+++ b/dev-cpp/cairomm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-cpp/cairomm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/ChangeLog,v 1.63 2013/09/29 11:05:31 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/ChangeLog,v 1.64 2015/03/06 05:03:55 tetromino Exp $
+
+*cairomm-1.10.0-r1 (06 Mar 2015)
+
+  06 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  cairomm-1.10.0.ebuild, +cairomm-1.10.0-r1.ebuild:
+  Add multilib support, update license, install docs where other *mm packages
+  expect them (bug #443950)
 
   29 Sep 2013; Pacho Ramos <pacho@gentoo.org> cairomm-1.10.0.ebuild:
   Fix docs installation patch, #443950 by Chris Mayo
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 3bc4ce98262d..f58e59793949 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -2,13 +2,26 @@
 Hash: SHA256
 
 DIST cairomm-1.10.0.tar.gz 1089577 SHA256 068d96c43eae7b0a3d98648cbfc6fbd16acc385858e9ba6d37b5a47e4dba398f SHA512 974b1c078c8d7b82f8d026e384811c016fa95cb62942fc12717edd993cb1660bc004bee5f8ce31c0540ef8d4105a2d86cd461ed3f5e996fd3faf65dfb37ac9e2 WHIRLPOOL 4fdea4df681b340729b64241baa84bc2171e6d98e2d277f13c8e51cee121bf7d3adef85e3d189d6e549213694a08ee72dafb2744c63377599491addcf609b447
-EBUILD cairomm-1.10.0.ebuild 1460 SHA256 9970b325c5df550fe252267f4f24be679ffdaab7d8419211e7ddb2935122d2ef SHA512 9f22b77294480066c9cf08a45ae23875e38cfd9c80bd626bddf535f953814ecb6bde1f28b27750fa6c63b7c940f12eb703447068486a3246aa02eca59623b721 WHIRLPOOL 654040529e8b2c57af766cb813ae610ecd1bb1885d1f9f79128175cf5e7edebaac7f8332e86416a3d9587338be3282c6a5ed509b33f4cd614ad3234ac64e0bfe
-MISC ChangeLog 7665 SHA256 e46af179f0f84f18a474053486c495767375c910e876f9012d4518f403f022c8 SHA512 2258748327375a7d002c0546af4eb72c7ac485918e0d3fb8bce40223c7b64b13984c160829f0705adba76c04207e61c51eb8c02c982b11751bd9c322fdafbf5d WHIRLPOOL 645c261f89d4aedf840f3b70a35f2b8254ae53d53fc886bcd7abfda99653093245d88b4ebb8aad5e0a17bc274c61624aea1dce27f6f36f4edb5737a13a2ac306
+EBUILD cairomm-1.10.0-r1.ebuild 1615 SHA256 7661c6a1b389616bd574cce4edd90ab8fde487f946c1c74671ff70a18fa4cf3a SHA512 96be9a7516b83439f4fe02b69a8fa2a854d2d47b966f39a3d8aff516e345271e3428ead6c5460e43c1ac380ef22a1e4070d752b354b716cd1a252d50eb5283a6 WHIRLPOOL 8c33dc5bdedbb331b1bebb50e53d676e03abd07dc6fd1aa327952cbee20f309c2270698673c0a4f81e5c1332c57e62d3c833d9477fe4457483407ef2a44ceaf9
+EBUILD cairomm-1.10.0.ebuild 1466 SHA256 90a40fd2b5dec09cddeb483d430a011937d590e7572f0c6f0f25f7d288c38a8f SHA512 77bca4530d71dcb6d67e3f512a56deb6739261230a8da0572b261d48d59a98533d3661eba33e13f31fcb4fd1642c938713f678738e94c689e31f5aa970374988 WHIRLPOOL 381050b7e29e9ef672b39fa84417bd1e05627f5dcddb7463218be521371133b2300c5a15f8b5c2b871ec10b1e89b35ac671df9fcf7d5f062998a271bb5cf4757
+MISC ChangeLog 7921 SHA256 32132ac3c5bcc6aa9c5a7ac05d7fc5242fe9e954b6b232308134e182b275c280 SHA512 ebc8955f70f20f0590a5be1162c5716d56360f49041185fc24864bbcd6d3a0de31583b8feb6250bdc5c8b5bd76e7aebb043e0be1994ca4a3ee7240cd746485dd WHIRLPOOL 65e03ae8d71786d04fb9f37274ffc59eb8f65389284898f33dd7e348044f18363bddb63b0e0f9a1116e0781748987e6e23aa1d5a9b8e2afaaba6c6a293a9c28c
 MISC metadata.xml 208 SHA256 69ef7f5652bec39fc0f3997de5517448b92d43ba6236e14492c70abcd67b5d9b SHA512 cca475a9a363519c600709ab205b1271283cb62d014af55c6dadcd3a87eb85b68f727edc7d247aa7cb37b8fd9cfb299046b2dfad24e8d71af72460175276375f WHIRLPOOL cf3598e745b02aaaf29c320be010ec3445eb12d02412be8ccfc124cb17c8b2f6c0faaf1cbdbd816d5be8a3bc40c5d7b471531e8e3bddf3b7f1fd01a177580f9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlJICXwACgkQCaWpQKGI+9RdjgCeN3iBhDvknYzfCou0c7Yp8uV0
-mMcAnix6fT4CGOySTW5rqsuNclk31dhu
-=ObML
+iQJ8BAEBCABmBQJU+TVCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN4zAQAJJVDCA02tFFdcRdIHXxTCdx
+GavQz5E7zXkhUlQeKX8s+h+OIT10ukh7fVrPYqkgsudHRYpB1DzgcxCG/Z655D9N
+Py18mU9u63UVM0jsBhUb+77huxQfordNlkrw5uhQf02QdzNtdUb6scLPnnoTG9KJ
+wWpJeKolAsv/LSEhaYrSvvd02frJ6jcuGclymLVtXXTus6ar3LRA/pzt5omiya1N
+6Pm1H9v0NNs9NKRfh6mH3+pfsMol2RRuugz+OSzj/jYmTlJOlhTFkY+BVUQS+M8u
+poLOAVRbryqs8U7n1CX+SeM+8ziy2BjJZgGo4z44AKwSXcG6/qfIVGXaP3qOtjR+
+bxMKoZ1GqqgFhV97hBu1Hnal7n/I0Dw92ttZhYW54Qb+cBhQzaJFYuDXyuREI2Fd
++hQqw7KygS8PLa+OAYNikP90WW615mIs3/qVoMur05LotOl0+IJrv4gzG8SbVMEk
+I0BbZTzotpWgqLD+WXrZwYcplk1nKDlP1XJEDe1/PSo82mbDdJZh1dPm8RJfHc/s
+kWaPWQpXeFnI/5gf0vLgkZ+fBxX89n8nd6vDeg8KolcuX3VDJT05aJJoANRCHjla
+yVbDtB3kLm6+orgCtiq/hMZfIp4cG1MP317H894a1fpi8vzKw4F3Nf0IvAJni0vA
+8F12IGlVmhyQeUfG+Oc2
+=BtcC
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/cairomm/cairomm-1.10.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..8fd23327e477
--- /dev/null
+++ b/dev-cpp/cairomm/cairomm-1.10.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/cairomm-1.10.0-r1.ebuild,v 1.1 2015/03/06 05:03:55 tetromino Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 multilib-minimal
+
+DESCRIPTION="C++ bindings for the Cairo vector graphics library"
+HOMEPAGE="http://cairographics.org/cairomm"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc +svg"
+
+# FIXME: svg support is automagic
+COMMON_DEPEND="
+	>=x11-libs/cairo-1.12.10[svg?,${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2: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-libs/libxslt
+		media-gfx/graphviz )
+"
+
+src_prepare() {
+	# don't waste time building examples because they are marked as "noinst"
+	sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die
+
+	# don't waste time building tests
+	# they require the boost Unit Testing framework, that's not in base boost
+	sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		--disable-tests \
+		$(multilib_native_use_enable doc documentation)
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
diff --git a/dev-cpp/cairomm/cairomm-1.10.0.ebuild b/dev-cpp/cairomm/cairomm-1.10.0.ebuild
index 7db9ef924522..1a5c841dee44 100644
--- a/dev-cpp/cairomm/cairomm-1.10.0.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 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/cairomm/cairomm-1.10.0.ebuild,v 1.9 2013/09/29 11:05:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/cairomm-1.10.0.ebuild,v 1.10 2015/03/06 05:03:55 tetromino Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ DESCRIPTION="C++ bindings for the Cairo vector graphics library"
 HOMEPAGE="http://cairographics.org/cairomm"
 SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="doc +svg"