dev-cpp/gtkmm: drop the accessibility USE flag, always build atkmm instead (fixes bug #247249)

(Portage version: 2.2_rc26/cvs/Linux x86_64)

5 files changed, 22 insertions, 49 deletions

diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog
index 4b8c9aae6f2c..b6269e708168 100644
--- a/dev-cpp/gtkmm/ChangeLog
+++ b/dev-cpp/gtkmm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gtkmm
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.155 2009/03/11 19:34:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.156 2009/03/24 10:11:09 remi Exp $
+
+  24 Mar 2009; Rémi Cardona <remi@gentoo.org> gtkmm-2.12.1.ebuild,
+  gtkmm-2.12.7.ebuild, gtkmm-2.14.1.ebuild, gtkmm-2.14.3.ebuild:
+  drop the accessibility USE flag, always build atkmm instead (fixes bug
+  #247249)
 
   11 Mar 2009; Daniel Gryniewicz <dang@gentoo.org> gtkmm-2.12.1.ebuild,
   gtkmm-2.12.7.ebuild, gtkmm-2.14.1.ebuild, gtkmm-2.14.3.ebuild:
diff --git a/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild b/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild
index 188b1aed78b1..b0eb18bd1f96 100644
--- a/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild,v 1.13 2009/03/11 19:34:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.12.1.ebuild,v 1.14 2009/03/24 10:11:09 remi Exp $
 
 inherit gnome2 autotools
 
@@ -10,13 +10,13 @@ HOMEPAGE="http://www.gtkmm.org"
 LICENSE="LGPL-2.1"
 SLOT="2.4"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="accessibility doc examples"
+IUSE="doc examples"
 
 RDEPEND=">=dev-cpp/glibmm-2.14.1
 	>=x11-libs/gtk+-2.12
 	>=dev-cpp/cairomm-1.1.12
 	>=dev-libs/libsigc++-2.0
-	accessibility? ( >=dev-libs/atk-1.9.1 )"
+	>=dev-libs/atk-1.9.1"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -25,7 +25,7 @@ DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF} \
-			$(use_enable accessibility api-atkmm) \
+			--enable-api-atkmm \
 			$(use_enable doc docs) \
 			$(use_enable examples)
 			$(use_enable examples demos)"
@@ -37,11 +37,3 @@ src_unpack() {
 	# Fix build with gtk+-2.14
 	epatch "${FILESDIR}/${PN}-2.12.7-gtk2_14-compatibility.patch"
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn "If you've changed the accessability USE flag on gtkmm, you've"
-	ewarn "silently broken ABI.  You will have to re-emerge everything that"
-	ewarn "depends on gtkmm.  You can find those packages with either"
-	ewarn "equery d or qdepends -Q"
-}
diff --git a/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild b/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild
index b55172a35f93..e37702d5a85d 100644
--- a/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild,v 1.10 2009/03/11 19:34:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.12.7.ebuild,v 1.11 2009/03/24 10:11:09 remi Exp $
 
 inherit gnome2 eutils
 
@@ -10,13 +10,13 @@ HOMEPAGE="http://www.gtkmm.org"
 LICENSE="LGPL-2.1"
 SLOT="2.4"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="accessibility doc examples test"
+IUSE="doc examples test"
 
 RDEPEND=">=dev-cpp/glibmm-2.14.1
 	>=x11-libs/gtk+-2.12
 	>=dev-cpp/cairomm-1.1.12
 	>=dev-libs/libsigc++-2.0
-	accessibility? ( >=dev-libs/atk-1.9.1 )"
+	>=dev-libs/atk-1.9.1"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -25,7 +25,7 @@ DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable accessibility api-atkmm)
+		--enable-api-atkmm
 		$(use_enable doc docs)
 		$(use_enable examples)
 		$(use_enable examples demos)"
@@ -42,11 +42,3 @@ src_unpack() {
 		sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die "sed failed"
 	fi
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn "If you've changed the accessability USE flag on gtkmm, you've"
-	ewarn "silently broken ABI.  You will have to re-emerge everything that"
-	ewarn "depends on gtkmm.  You can find those packages with either"
-	ewarn "equery d or qdepends -Q"
-}
diff --git a/dev-cpp/gtkmm/gtkmm-2.14.1.ebuild b/dev-cpp/gtkmm/gtkmm-2.14.1.ebuild
index 472ebbd9f597..d4c7fc0af405 100644
--- a/dev-cpp/gtkmm/gtkmm-2.14.1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.14.1.ebuild,v 1.2 2009/03/11 19:34:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.14.1.ebuild,v 1.3 2009/03/24 10:11:09 remi Exp $
 
 inherit gnome2
 
@@ -10,13 +10,13 @@ HOMEPAGE="http://www.gtkmm.org"
 LICENSE="LGPL-2.1"
 SLOT="2.4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility doc examples test"
+IUSE="doc examples test"
 
 RDEPEND=">=dev-cpp/glibmm-2.18
 	>=x11-libs/gtk+-2.14.0
 	>=dev-cpp/cairomm-1.2.2
 	>=dev-cpp/pangomm-2.14.0
-	accessibility? ( >=dev-libs/atk-1.9.1 )"
+	>=dev-libs/atk-1.9.1"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -25,7 +25,7 @@ DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable accessibility api-atkmm)
+		--enable-api-atkmm
 		$(use_enable doc docs)
 		$(use_enable examples)
 		$(use_enable examples demos)"
@@ -39,11 +39,3 @@ src_unpack() {
 		sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die "sed failed"
 	fi
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn "If you've changed the accessability USE flag on gtkmm, you've"
-	ewarn "silently broken ABI.  You will have to re-emerge everything that"
-	ewarn "depends on gtkmm.  You can find those packages with either"
-	ewarn "equery d or qdepends -Q"
-}
diff --git a/dev-cpp/gtkmm/gtkmm-2.14.3.ebuild b/dev-cpp/gtkmm/gtkmm-2.14.3.ebuild
index 14023c2ad911..1178bc9a23ac 100644
--- a/dev-cpp/gtkmm/gtkmm-2.14.3.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.14.3.ebuild,v 1.2 2009/03/11 19:34:01 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.14.3.ebuild,v 1.3 2009/03/24 10:11:09 remi Exp $
 
 inherit gnome2
 
@@ -10,13 +10,13 @@ HOMEPAGE="http://www.gtkmm.org"
 LICENSE="LGPL-2.1"
 SLOT="2.4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="accessibility doc examples test"
+IUSE="doc examples test"
 
 RDEPEND=">=dev-cpp/glibmm-2.18
 	>=x11-libs/gtk+-2.14.0
 	>=dev-cpp/cairomm-1.2.2
 	>=dev-cpp/pangomm-2.14.0
-	accessibility? ( >=dev-libs/atk-1.9.1 )"
+	>=dev-libs/atk-1.9.1"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
@@ -25,7 +25,7 @@ DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
-		$(use_enable accessibility api-atkmm)
+		--enable-api-atkmm
 		$(use_enable doc docs)
 		$(use_enable examples demos)"
 }
@@ -38,11 +38,3 @@ src_unpack() {
 		sed -i 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' Makefile.in || die "sed failed"
 	fi
 }
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	ewarn "If you've changed the accessability USE flag on gtkmm, you've"
-	ewarn "silently broken ABI.  You will have to re-emerge everything that"
-	ewarn "depends on gtkmm.  You can find those packages with either"
-	ewarn "equery d or qdepends -Q"
-}