Drop 'cxx' as that feature is experimental and not recommended by upstream, bug #438356 by Jordan Evens.

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 41 insertions, 33 deletions

diff --git a/app-office/gnucash/ChangeLog b/app-office/gnucash/ChangeLog
index 1970255efe97..5800b1b2f94e 100644
--- a/app-office/gnucash/ChangeLog
+++ b/app-office/gnucash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/gnucash
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.262 2012/09/19 18:21:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/ChangeLog,v 1.263 2012/10/27 10:17:19 pacho Exp $
+
+*gnucash-2.4.11-r1 (27 Oct 2012)
+
+  27 Oct 2012; Pacho Ramos <pacho@gentoo.org> +gnucash-2.4.11-r1.ebuild,
+  -gnucash-2.4.11.ebuild:
+  Drop 'cxx' as that feature is experimental and not recommended by upstream,
+  bug #438356 by Jordan Evens.
 
   19 Sep 2012; Pacho Ramos <pacho@gentoo.org> gnucash-2.4.10.ebuild,
   gnucash-2.4.11.ebuild:
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index fc3550fd042d..661b3bca72a1 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -5,13 +5,13 @@ AUX gnucash-2.4.11-potfiles-skip.patch 7937 SHA256 7fa39d83e6eedd16474a416b381f1
 DIST gnucash-2.4.10.tar.bz2 9367104 SHA256 52e65623b5ad812b8eeb4c221951e9b0ba3c49e28916acfb7b92566da159e6cc SHA512 e761c8390dee1c0724cbb3f624a5f3010d6b494fa0539f4468265e91f5410c7c6cefab3e267a86edbe14a5963017dca09281a8e88f6747f0103806d6fdb22741 WHIRLPOOL 2a320fae365c27fbaa4c8167f1caa794db79ccfcff1a683afbd95579914fd9643ef1ef90416a629c48b7f8737968118dbd8d7661a7da4debfc5207e3a1439e90
 DIST gnucash-2.4.11.tar.bz2 9408193 SHA256 93c3d66af8d75da66dad814cabeb35aac417018ccc98e833af93b2ab4d7b7761 SHA512 220d0097f39bc359b97da388bbbddb233c6bfb7070cb793ae3a2848e6895fc35891ac72178c8fdaf0e0ac9da730b22c2443783eb3b66a99746488ebf8cbcd41b WHIRLPOOL 1d298051cd59f0b13e5c074de73b29522eb61b4727088851dcb66d8c9a85e08f366d050294325e0a8b7e11b26bdbf784b301828222851fe080555bff82e5731c
 EBUILD gnucash-2.4.10.ebuild 3680 SHA256 e3018f440b6a90874532ba795151bfbaf9eea2e62aa0578f551094af0f387f63 SHA512 a2a9ddbddb1850a479e5ac933c18690a8f1eb58cb8a8c15dc6ecc868a7d2a6e6cea5a22cd9bea347af65d01b0efff063863d97ec9173c8751f6bb4d3a8116a09 WHIRLPOOL 5f5678619070808bfd2d7007449ab80424aa684204a035921d81011b6a5d32cd59efc35c6b77ae24f30f58ea7641903d190cec615d1100435070116980e23935
-EBUILD gnucash-2.4.11.ebuild 3804 SHA256 1116a23de307503afa980be87c8a8dabbb723d7ea3e9e0fa28449ae2c801ec94 SHA512 f85dcffe0cdda1cf0671d30197624b353893c4de9d78d35ad55b050dc4ed8e8a6223b27ee78e735ef4a43b592a90d8dd67a389f59048e4ab72ccc4410bc52a48 WHIRLPOOL bb58075f0568893b328ffee354b1fc2c8ef97058c01b5b027911968c3711932b2fa019b4257e7c2b5e21da4af5af79c44efc73dd2c9797e63de1eac656dd4d20
-MISC ChangeLog 38048 SHA256 dc64570e94953ac8432c3b7490ec14d364e09ef569aedd6c2e5ac67d00b7f109 SHA512 aec9394cadfb3ee5bae09e3218c1024f7cced95b90164cce97e8c7da63c95c037e8267db66fc4c0a8ca8e01ecbcf9696e8793a1ce9c6b331303dc04c16505bc3 WHIRLPOOL 71b7394309fa44925b8351a8273c038c862c6a4fd2320a75c2f82a92e96bf9a1d7bb92ef098f0ebd6914f67f97b926826ae801b58c4130055017c17998d0db2f
+EBUILD gnucash-2.4.11-r1.ebuild 3850 SHA256 2eaa04e5c07e259ae8d996d83932dfcb1179ce56313da99b59f15ebb13586e6c SHA512 36d7bd96f7244fe9ccb7e0848133b9321908ce574d2dc390c69a1a1ce010d23a723c15375fae9fee7f88bd46e98f1a84bc2f386c1796fc1b5da42bab93cec2f7 WHIRLPOOL 9919dfa6d469e063fe22a8e9c562f17610e47ecd550df72eb46547bea29ca409532012651ad37f53914e370ecc23be17d95895c8de9ddd7116a5cc1bba7b5207
+MISC ChangeLog 38291 SHA256 191c15e001aff33d543c432ca4c31d5def1ff9423fbc23913b10e07635fce38d SHA512 e961076058bcf84f9d36d00269aade272322bb658376d97b0d8b46f04cf7ee0936d455c0cff6c6379406ee4583c0248b840bd441455ae9af19059516bf9caef0 WHIRLPOOL dd710a1836b575e0689227a469c17d4f7a4377a3b7348ca1ec3bfdefeb99e4226462854138f66b2ba4b9b39317941a57990ae0adca6485c03d18c2e663e6673b
 MISC metadata.xml 535 SHA256 5696960b05fe025efabc8cffe84f7978a0a1ca23d04a9b0ec4a23b6aaefd0b28 SHA512 82fb3082c0da9bbcb5709b3995108c64bcbdfe27dbf1cdc9c41742fbb639ce1e43145ac3173d24a34ceff7786326df31e8c41d45f5e9e4f58afa148d7f74c007 WHIRLPOOL 5269d16ab092630af504a854da879b29c94699da200b9e85f3181bc1dba151f8483b3e216107922477e4cf7faee4bdd6131d074c7c4879a241788f7fe6ad0238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBaDSIACgkQCaWpQKGI+9SP1ACfYMVoegtchfNHyyZJNnxWKWds
-sZIAnjggQqdQO+Yukc2c+eBzskC9EHrS
-=kgX6
+iEYEAREIAAYFAlCLtLAACgkQCaWpQKGI+9QMSwCfdYJZcG84ICDSc4P+UnwZxPiC
+MGcAnjfPp812mshzUsd5jpjHJ4aaHlr1
+=U6EF
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnucash/gnucash-2.4.11.ebuild b/app-office/gnucash/gnucash-2.4.11-r1.ebuild
index 3c2ed0de41c9..4554e840a201 100644
--- a/app-office/gnucash/gnucash-2.4.11.ebuild
+++ b/app-office/gnucash/gnucash-2.4.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.11.ebuild,v 1.2 2012/09/19 18:21:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-2.4.11-r1.ebuild,v 1.1 2012/10/27 10:17:19 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="chipcard cxx debug +doc hbci mysql ofx postgres python quotes sqlite webkit"
+IUSE="chipcard debug +doc hbci mysql ofx postgres python quotes sqlite webkit"
 
 # FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
 RDEPEND=">=dev-libs/glib-2.13:2
@@ -36,7 +36,6 @@ RDEPEND=">=dev-libs/glib-2.13:2
 	>=x11-libs/gtk+-2.14:2
 	x11-libs/goffice:0.8[gnome]
 	x11-libs/pango
-	cxx? ( dev-cpp/gtkmm:2.4 )
 	ofx? ( >=dev-libs/libofx-0.9.1 )
 	hbci? ( >=net-libs/aqbanking-5[gtk,ofx?]
 		sys-libs/gwenhywfar[gtk]
@@ -62,30 +61,6 @@ DEPEND="${RDEPEND}
 PDEPEND="doc? ( >=app-doc/gnucash-docs-${DOC_VER} )"
 
 pkg_setup() {
-	DOCS="doc/README.OFX doc/README.HBCI"
-
-	if use webkit ; then
-		G2CONF+=" --with-html-engine=webkit"
-	else
-		G2CONF+=" --with-html-engine=gtkhtml"
-	fi
-
-	if use sqlite || use mysql || use postgres ; then
-		G2CONF+=" --enable-dbi"
-	else
-		G2CONF+=" --disable-dbi"
-	fi
-
-	G2CONF+="
-		$(use_enable cxx gtkmm)
-		$(use_enable debug)
-		$(use_enable ofx)
-		$(use_enable hbci aqbanking)
-		$(use_enable python python-bindings)
-		--disable-doxygen
-		--enable-locale-specific-tax
-		--disable-error-on-warning"
-
 	if use python ; then
 		python_set_active_version 2
 		python_pkg_setup
@@ -110,6 +85,32 @@ src_prepare() {
 }
 
 src_configure() {
+	DOCS="doc/README.OFX doc/README.HBCI"
+
+	if use webkit ; then
+		G2CONF+=" --with-html-engine=webkit"
+	else
+		G2CONF+=" --with-html-engine=gtkhtml"
+	fi
+
+	if use sqlite || use mysql || use postgres ; then
+		G2CONF+=" --enable-dbi"
+	else
+		G2CONF+=" --disable-dbi"
+	fi
+
+	G2CONF+="
+		$(use_enable debug)
+		$(use_enable ofx)
+		$(use_enable hbci aqbanking)
+		$(use_enable python python-bindings)
+		--disable-doxygen
+		--enable-locale-specific-tax
+		--disable-error-on-warning"
+
+	# gtkmm is experimental and shouldn't be enabled, upstream bug #684166
+	G2CONF+=" --disable-gtkmm"
+
 	# guile wrongly exports LDFLAGS as LIBS which breaks modules
 	# Filter until a better ebuild is available, bug #202205
 	local GUILE_LIBS=""