10 files changed, 81 insertions, 137 deletions
diff --git a/dev-cpp/ETL/ETL-0.04.15.ebuild b/dev-cpp/ETL/ETL-0.04.15.ebuild
deleted file mode 100644
index 99c1e28128c7..000000000000
--- a/dev-cpp/ETL/ETL-0.04.15.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools
-
-DESCRIPTION="ETL is a multi-platform class and template library"
-HOMEPAGE="http://synfig.org"
-SRC_URI="mirror://sourceforge/synfig/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's/CXXFLAGS="`echo $CXXFLAGS | sed s:-g::` $debug_flags"//' \
-		   -e 's/CFLAGS="`echo $CFLAGS | sed s:-g::` $debug_flags"//'     \
-		m4/subs.m4
-
-	eautoreconf
-}
diff --git a/dev-cpp/ETL/Manifest b/dev-cpp/ETL/Manifest
index cb7a593befe6..8ba33ec17510 100644
--- a/dev-cpp/ETL/Manifest
+++ b/dev-cpp/ETL/Manifest
@@ -1,4 +1,3 @@
 DIST ETL-0.04.15.tar.gz 362312 BLAKE2B c2afe67486a9154de559a00680b9409ee6b8b2d3312d8c8777906926c3335d4ead3e6d5da6b11771b359caa56917969fd5be7d12c2337872a41c16997421f923 SHA512 647d03f5660703a326357b0f1bb969c1e00f94c51ae72cf036f6618df1e44c6e379244a1a827b4d3c9545455efd81ff1d97254ee159e0f578f544ab856341e6f
 EBUILD ETL-0.04.15-r1.ebuild 538 BLAKE2B 95f1b26b1ce6e08cad12f443fe8e1e8eeedc013b9c4dee1c791bb189026ab8d8cff95d34423cda686d2972787d59847946690ded79a463d26bc3be67ef0a66c1 SHA512 81c731332335ca77735ecf1efb6a1904699ee8e713894be592e94a49349d8e583d2b11e47b6db0780e428dd32275d22ccda202acc9c15ceaac9cf3e965d10889
-EBUILD ETL-0.04.15.ebuild 568 BLAKE2B 78839f4b6640a1c2ea088ffbb21c556bceb0f54fd7af6a0629b8fc09f6d91edaabf9507919d828290f616622ac61fba3781a4a4c8e3d29595f5cdb84efef8be8 SHA512 923fce80b76bd43033096b887ffd39591d79c2cba6dbf8b1e3789a59559271865c6d3675e4620b28a296af83094cf134674af1b95153d246983a181626332b18
 MISC metadata.xml 322 BLAKE2B f93194ae044574f8c02cdafc05cf99ef8c8b446971ab6ef91f3c6d49429d4f1919234fdef7e566999a4a10170d97933e3f91887f24e57641c31d7f277dc63fcd SHA512 eca4baf7aa303177e49b50b3697edeaec633add9a42adac767ee63a804141d15f07f86bca3d94e13bf6330a6e461ac614c254fbfebdfff86d9aef957443834b6
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index b4e64dcfe082..db65fbcf3fbc 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest
index 611c637d12a0..d30aee4dc493 100644
--- a/dev-cpp/antlr-cpp/Manifest
+++ b/dev-cpp/antlr-cpp/Manifest
@@ -2,7 +2,6 @@ AUX 2.7.7-gcc.patch 402 BLAKE2B be143ebbf062aa2ed59630424e7741ac8105eb3575494639
 AUX 2.7.7-libtool.patch 621 BLAKE2B a0e48b7911bf016dbf1422768cd73e887cded6a9795d8f38d522e3e13b4f0a81f94653d61fb688db4ee1c6d3170035380fc9763b83ae68c28d88ef1902a3b715 SHA512 3f1d68eff40fac13a4f482724456cb8ed801feff71a254871368f22ab98024431c718f3fb35f13da4183bdebe62ece26908a341fe1a945118bf0d78f5d8ea622
 DIST antlr-2.7.7.tar.gz 1816180 BLAKE2B 3a9a51070f8651befeb4d22be344b544e119db34a78522828c2ffc3c481c14b9c7784f0a9997a61f6faedde5b6d1fe12214cfd84fb274f7065f3ffe6a44abf1c SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 DIST antlr-cpp-4.7.2.zip 1494927 BLAKE2B 007aac6655dc3c4e3a0c2073ca9c8c016b46bdf97dca4494d4ea2c44d27a458bfbb09811b3beb0aec1ce2873c3b62ad6789c6a9e3e7ddc62cde51c8357e9123b SHA512 3298b83a06ddd8d8852462401e46fe2eb83d20af4ba14c722cb31b33d929d1c5a4ffb694ee084495a4ae26ed3246b6781ca6045d11253c94efc09729fa001090
-EBUILD antlr-cpp-2.7.7-r1.ebuild 2805 BLAKE2B ad0d241711c2caa164469f22ec16f11f859f3a2f1a6c9cf135f074f330d4d74768101e1034382ac0cc279743f98ace9304fae5222a26434336fd1a15340a63e9 SHA512 8902c329fb6c30a50b8912fb38308baa8165f1d452a6662afd9049feb68e84223aa935d3c0b9f418a50cd8e5969da79f7adc3b2b61164283f9f773ce1f9668ce
-EBUILD antlr-cpp-2.7.7.ebuild 2775 BLAKE2B 0bf429b5ba9fce3e0a23b46837aaecf1570c77fa922f26a4070bd894230d025c45d593d77b105ff328a52c4eec0aacdda33c5f25f262a907e57c435c53a80636 SHA512 ddd74d4cdd861c3718bb96a56cdf1f400dfc0f9ad320656aef8ab508471e9d6472b80e6490113888f689be41a7a192bcf2b56e99a3d3cf10e4ebb8e779ca8e2d
+EBUILD antlr-cpp-2.7.7-r1.ebuild 2804 BLAKE2B c03a8989fc0e0d9ca8409ec82676405f37e2041f1fc9f40d8a823ed5aaea940144b5855d64311f2f9ea29ccc54fbeaa42b958a147eac47c12ce21917a4908422 SHA512 12674af8eed6304c0ebac94e1216bc4ef7c3e2cb8935d21319a4a3a15c3912c3be23b0e9a399cb245a028f370c5f3507856a7cf82e8e3a451ee586fb0f53084e
 EBUILD antlr-cpp-4.7.2.ebuild 634 BLAKE2B fa9d703b482bcf2baaac9af279315f58925cd08d61d0e6ef68f474ca572621819dd5637d272105c6f26d2ffd47970850855e5e8886e2f8cf3bf9a3a6838bf1c2 SHA512 58227e6390bd60e2c9aeca2d652fa35d6a3d2d31042095c7aac79448ac7782113d628fd6f368ed4b98d3543e161e57bccc6417c12fac1a7b6bf82c09fde34716
 MISC metadata.xml 313 BLAKE2B 3ddef83abe4413f33dae4c121c76dfdfab2336d433ef94716eced1df9f669f83883b4174d5a472b06ae8fb16c7179094469fe65258646d7dd9094b5c1673a2a3 SHA512 39988a3826d440aa378b455d18ce23230ba1870bf7b7c64123cfdd09c54b112e8586c87d421a2227370c6b4eae385af46ce3a9e4aab3c676fdfdac360fed8265
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
index 3c9b37ce91b0..c6fa2c9550b5 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.antlr2.org/"
 SRC_URI="https://www.antlr2.org/download/${MY_P}.tar.gz"
 LICENSE="public-domain"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="doc examples static-libs"
 RESTRICT="test" # No tests but test target blows up!
 
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
deleted file mode 100644
index 9c93c56179ec..000000000000
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Upstream only installs a static library. The original antlr ebuild
-# built a shared library manually, which isn't so great either. This
-# ebuild applies libtool instead and therefore an autoreconf is
-# required. A couple of errors concerning tr have been seen but the
-# final result still looks good. This also sidesteps bug #554344 plus
-# the need to call einstall.
-AUTOTOOLS_AUTORECONF=1
-
-inherit eutils autotools-multilib
-
-MY_P="${PN%-cpp}-${PV}"
-DESCRIPTION="The ANTLR 2 C++ Runtime"
-HOMEPAGE="https://www.antlr2.org/"
-SRC_URI="https://www.antlr2.org/download/${MY_P}.tar.gz"
-LICENSE="public-domain"
-SLOT="2"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="doc examples static-libs"
-RESTRICT="test" # No tests but test target blows up!
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND="!dev-java/antlr:0[cxx]"
-
-S="${WORKDIR}/${MY_P}"
-DOCS=( lib/cpp/AUTHORS lib/cpp/ChangeLog lib/cpp/README lib/cpp/TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-{gcc,libtool}.patch
-
-	mv -v configure.in configure.ac || die
-	mv -v aclocal.m4 acinclude.m4 || die
-
-	# These silly test -z lines break badly under recent autoconfs.
-	sed -i '/AC_PATH_PROG/s/test -z "\$[^"]*" *&& *//' configure.ac || die
-
-	# Delete build files from examples.
-	find examples -name Makefile.in -delete || die
-
-	# Fix make invocations. See bug #256880.
-	find -name "*.in" -exec sed -i 's/@MAKE@/$(MAKE)/g' {} + || die
-
-	# Turn Makefile.in files into libtool-style Makefile.am
-	# files. Countable.hpp is actually missing.
-	local HPP=$(grep -E -o "\w+\.hpp" lib/cpp/antlr/Makefile.in | grep -v "Countable\.hpp" | tr "\n" " " || die)
-	local CPP=$(grep -E -o "\w+\.cpp" lib/cpp/src/Makefile.in | tr "\n" " " || die)
-
-	cat <<EOF > lib/cpp/antlr/Makefile.am || die
-antlr_includedir = \$(includedir)/antlr
-antlr_include_HEADERS = ${HPP}
-EOF
-
-	cat <<EOF > lib/cpp/src/Makefile.am || die
-AM_CPPFLAGS = -I\$(abs_top_srcdir)/lib/cpp
-lib_LTLIBRARIES = libantlr.la
-libantlr_la_LDFLAGS = -version-info 2
-libantlr_la_SOURCES = ${CPP}
-EOF
-
-	autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-csharp
-		--enable-cxx
-		--disable-examples
-		--disable-java
-		--disable-python
-		--enable-verbose
-	)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-multilib_src_compile
-
-	if use doc; then
-		cd "${S}/lib/cpp" || die
-		doxygen -u doxygen.cfg || die
-		doxygen doxygen.cfg || die
-	fi
-}
-
-multilib_src_install() {
-	# We only care about the C++ stuff.
-	emake -C lib/cpp install DESTDIR="${D}"
-}
-
-src_install() {
-	autotools-multilib_src_install
-
-	cd "${S}" || die
-	use doc && dohtml -r lib/cpp/gen_doc/html/
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/cpp/*
-	fi
-}
diff --git a/dev-cpp/asio/Manifest b/dev-cpp/asio/Manifest
index b5cf47a392ef..ef240069f298 100644
--- a/dev-cpp/asio/Manifest
+++ b/dev-cpp/asio/Manifest
@@ -5,5 +5,5 @@ DIST asio-1.14.0.tar.bz2 1473195 BLAKE2B e28960d585a1a84c6be7d6205be310bd2baab36
 EBUILD asio-1.10.8.ebuild 895 BLAKE2B 6f3de4ae224765cd3af5863fabb60f22a9ee060839c64cf6c2269f1cad57229914da5351cf90750522faa99fb362021ccc76fb8ea293859aef3e7465081df761 SHA512 648aa85f02271260fdc7c1ba7d6093c5dba3a172e4585d7d8f8e70dedc111d2bbd57093ebb3e8fc2a85008e5981b17a1861e356efd6102689bdc17f015e75e5a
 EBUILD asio-1.12.2.ebuild 958 BLAKE2B fb6ce9c6ef49a612ea07b54ba90cded71442ff09c0093424ff22a7d5a2f7660c32c4d4f104c00908b69c5775fd6f6b041d51cb6d1d03c3f3bc989b0b74c964bd SHA512 84cbfa3082d7931f631f4cf056669e1676c59c7e36090dca77adae9c164e2660da8f9f2e32e1f63e341cdce1f9f4cea8e1028621540c3b4ddbd5a900e02348ac
 EBUILD asio-1.13.0.ebuild 958 BLAKE2B fb6ce9c6ef49a612ea07b54ba90cded71442ff09c0093424ff22a7d5a2f7660c32c4d4f104c00908b69c5775fd6f6b041d51cb6d1d03c3f3bc989b0b74c964bd SHA512 84cbfa3082d7931f631f4cf056669e1676c59c7e36090dca77adae9c164e2660da8f9f2e32e1f63e341cdce1f9f4cea8e1028621540c3b4ddbd5a900e02348ac
-EBUILD asio-1.14.0.ebuild 958 BLAKE2B fb6ce9c6ef49a612ea07b54ba90cded71442ff09c0093424ff22a7d5a2f7660c32c4d4f104c00908b69c5775fd6f6b041d51cb6d1d03c3f3bc989b0b74c964bd SHA512 84cbfa3082d7931f631f4cf056669e1676c59c7e36090dca77adae9c164e2660da8f9f2e32e1f63e341cdce1f9f4cea8e1028621540c3b4ddbd5a900e02348ac
+EBUILD asio-1.14.0.ebuild 952 BLAKE2B adf5074507cb470454f1dc1c1050eef85145a93b6721b6af532b3784e180c47c44c7fb61bbfbd7d46d6aa92ae7a0e949b7d04f5b3d99e6bcb7585c2a6a2d5342 SHA512 5d6c7e597e17b5dd31c3a81f5ae93fd4ef5c3f5d9348c4626c08e03c669cec12647efef1bd0193f91b5101d8310d05c3c8a85fbe0e31c0df9ab8394c4bca6fee
 MISC metadata.xml 321 BLAKE2B e14808aaf0f0d648b8de65363250523777e9e4ae52a47f840af9c22321ea2f8329f6ac82ed5a05e7757d17e1c895428de69e46a60efc465dc2fd6657ebfc24c9 SHA512 a913fd91dff169b361b10efcbe51e2d55822319c06c9fd292d8fe4232ef9bed98541cb55caf37f56b27e9e135ce7ddc449d55f9159a57a8ac993f43f3ba1b751
diff --git a/dev-cpp/asio/asio-1.14.0.ebuild b/dev-cpp/asio/asio-1.14.0.ebuild
index fe556e8cbee7..7b38a8383ce6 100644
--- a/dev-cpp/asio/asio-1.14.0.ebuild
+++ b/dev-cpp/asio/asio-1.14.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc examples libressl ssl test"
 
 RDEPEND="dev-libs/boost
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index b68504ebf6e9..3a811180030e 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -1,7 +1,9 @@
 DIST gtkmm-2.24.5.tar.xz 12022024 BLAKE2B 6b2bca9fe6ad81cd956e1f3cc3140bc503b78386cf3931c8eeac08c8b2a08c73450bdbb703d1febaee67cdf834093ff5e89790f866357190822613a68a596ad3 SHA512 c50e52830977c37181439f4b82a30ac8bead0cf9022d2bec8225f8dc33e08414f863bf67056e1938fae8f888c09a5a6d757acc011fa9331a78caa6bb626dd51e
 DIST gtkmm-3.24.0.tar.xz 12515792 BLAKE2B d1150019b28ecffbf1e2f561e8b691d584dfc893dbc1ef46f1dd33e2c9050ea77e00a1cb7ce1f3832568fd9865c977dbc71a461923c285331372371a5f235369 SHA512 94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac
 DIST gtkmm-3.24.1.tar.xz 12482756 BLAKE2B 238b9224a57b929cf75617de326f47ff15da07a4a68e6ae10903b29f5e1e29f4fbbaab82f7b483fcdb4c27aa25908bf9e80c4362ba3df298073c73530b79bcb0 SHA512 be7144edb0d5d68f761c9e92c197c3b84de045072443222694c1595faebf3390623a390dbec9f7232a70231aca138b1cb4343ab273333b2a6a418af7ec1586ed
+DIST gtkmm-3.24.2.tar.xz 13336236 BLAKE2B 93f3a04b8a2f02323bf6a1161c10eaae2ad9c26d0e235b1658fc7abbb8d48f67abc42739726c4b6657fa59b033b3708ad1428e629538ab5a6fd27590f5311f30 SHA512 c8f9f03d54006a729fdad7563d3be37aa180f9153c222314c1b8cfddc5ab417d184422a1d44f780574248ea52e679f1e360eac67e03f67d29ecf847c0ab19689
 EBUILD gtkmm-2.24.5.ebuild 1529 BLAKE2B 8dc90ebeb2b42386e1b9239a4ac51215c743ca5a6fe14f319c2cee03dbb91895de852c042d2919b355f969f1b9a2fd59652202fb9d1d5240c83a90f8be020c04 SHA512 e2c8dfbc483365e665b8125659b8b7ab9804d799066e2cf4845731c76f1c74fbe806f455029bc169c598a1c25427421b5c5fe0ef6631e38201a09ec39c24d0fb
 EBUILD gtkmm-3.24.0.ebuild 1817 BLAKE2B 625d62406d02940dfc9b8e65a2ac3d5e7818fc94ae5ecbba57010bdda24222290580206793430dc3b90efdd0924770046a4696a30eea693e0c0d6b60891285d9 SHA512 3df49cdea96b24b8541f99d92800b239498eb48d00e858d9fddd7b2224ac9f51a0a00faf33dd6483f7f038e439fc791e5d76c636fb757e79f33b7d022105ef10
 EBUILD gtkmm-3.24.1.ebuild 1818 BLAKE2B 6f8f76249ba5cef62761852b883dc4e501535d22382e3992f3d2602f29ad1156e588e86e80656ecf7bc0b48a04cec56f3c24c890cca7a90e9dffff0e92a33536 SHA512 0202f8265b0e0009d9456456d8bd172d84ce7f2b9b731a2b8e601d6497156d09a802b1ae1bdbbf9b4f573206f5214b8e678c80b2f60e36db91f5d0e06010325f
+EBUILD gtkmm-3.24.2.ebuild 1881 BLAKE2B e2bfa80c14874998b37b05befaf9deef83c1fa0a9b600a67b9ec04ea2eea8b2fc38f772d7f084ffbd80ec06972937b906921d722549ee68476b803265d80ce99 SHA512 1c2bf4e37649d319a9e327d228ef830daa99425a96e84fd1706a81ba4b91cac4e22cfc66fc5e3c963be10c16ee8972499a913210da069eb335856076fee82999
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
new file mode 100644
index 000000000000..718df300c7f2
--- /dev/null
+++ b/dev-cpp/gtkmm/gtkmm-3.24.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2 multilib-minimal virtualx
+
+DESCRIPTION="C++ interface for GTK+"
+HOMEPAGE="https://www.gtkmm.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE="aqua doc test wayland X"
+REQUIRED_USE="|| ( aqua wayland X )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.54.0:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.35.5:2[${MULTILIB_USEDEP}]
+	>=dev-cpp/atkmm-2.24.2[${MULTILIB_USEDEP}]
+	>=dev-cpp/cairomm-1.12.0[${MULTILIB_USEDEP}]
+	>=dev-cpp/pangomm-2.38.2:1.4[${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-2.3.2:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		media-gfx/graphviz
+		dev-libs/libxslt
+		app-doc/doxygen )
+"
+# eautoreconf needs mm-common
+
+RESTRICT="!test? ( test )"
+
+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
+
+	# don't waste time building examples
+	sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
+		|| die "sed 2 failed"
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" gnome2_src_configure \
+		--enable-api-atkmm \
+		$(multilib_native_use_enable doc documentation) \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend)
+}
+
+multilib_src_test() {
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find demos -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
+	find demos -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
+	dodoc -r demos
+}