x11-libs/gtk+, x11-themes/gnome-themes-standard, at-spi2-*: now in gx86

Sync live ebuilds with gx86.

3 files changed, 22 insertions, 252 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index d3607634..da4d9d44 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,3 @@
 AUX gtk+-3.3.18-fallback-theme.patch 2841 SHA256 a552218132b903835a480881803e29be678a311d3a653b8111eba1fd0ea04922 SHA512 2be5cd482625292780e88c6be5ec3e2932a1b3187ac57f2a0bbb37ebdeb9b34e56481a4ca74fc7af088389fb68dbb748e8e2cffc984052695fa6032bff0556cb WHIRLPOOL 8ae2ea9175a6ad5e0cfa6f8e018bd9ddb580548f496a81360ca302cc9d4d7cf70f5cb86f52967ee770e71f530b238d7b070b8aa61ffd040990ef0cb7b1811804
 AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
-DIST gtk+-3.5.18.tar.xz 13224216 SHA256 2dc6779e447332b4963d4ef3ac673e590aaced5ea4e71998c063dc43dd866fad SHA512 af8ed53a5ec9eae9a1157c77d34715811fe13df609947dbeb283b794de6ed7a0ef797e718f25abc9e8ee881ba8762e1453e3a75c61dc92c8b6349f5ee07b172e WHIRLPOOL 6b92826757c99cce2e7c2dee98f45a55a80f7db08ff1f78ce43367259e9fa8c87534af0892cc35c676353a13fe8fe2b2e5744deae827f536d0d5433ec3dadc9b
-EBUILD gtk+-3.5.18.ebuild 7187 SHA256 0c44ca85fab1f183dd594e0e4161ba5e44542496fdb2ef697b073a6f3b1470d5 SHA512 5e20eb8681d71d81673fdefa70ae3748bbafa0c649a70024d4bdd9232aa3169ae67025cb333834c0422da38425bca024ad15e36cee25222664c948866ec4449c WHIRLPOOL cafc414069142b5df8d09ec56d2c5ae27f26fa72f63e08a58964387ed6f43db75154acea0708c1c0653dc41b4d4f98eef9037f7cc6bb1c177bde9128bfd113f7
-EBUILD gtk+-9999.ebuild 7187 SHA256 0c44ca85fab1f183dd594e0e4161ba5e44542496fdb2ef697b073a6f3b1470d5 SHA512 5e20eb8681d71d81673fdefa70ae3748bbafa0c649a70024d4bdd9232aa3169ae67025cb333834c0422da38425bca024ad15e36cee25222664c948866ec4449c WHIRLPOOL cafc414069142b5df8d09ec56d2c5ae27f26fa72f63e08a58964387ed6f43db75154acea0708c1c0653dc41b4d4f98eef9037f7cc6bb1c177bde9128bfd113f7
+EBUILD gtk+-9999.ebuild 7015 SHA256 4c42ce905b4afbebcc541fb60c1de3e02eca56020dece5e60143755ecc8fa35f SHA512 dae3b6135a5d804e157d48bcc550f270259a51cb9e87c9b8d6ccdfdb73bdd1602b98b5fabdc8d6dff570e0ad1e5da909d112427ebb8b0489f2bc4bd8dc7e0061 WHIRLPOOL 7ebcf42e4902014084889dceb03e1e30b0ddb5ab2002c4d873d058ee5f1ee8be23abaebaf1599dbb8b67f5eec5cff4461eefa0aba1818c144d349ca0d6ae145a
diff --git a/x11-libs/gtk+/gtk+-3.5.18.ebuild b/x11-libs/gtk+/gtk+-3.5.18.ebuild
deleted file mode 100644
index 972753c2..00000000
--- a/x11-libs/gtk+/gtk+-3.5.18.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r2.ebuild,v 1.1 2011/12/15 23:46:04 tetromino Exp $
-
-EAPI="4"
-
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="3"
-# NOTE: This gtk+ has multi-gdk-backend support, see:
-#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
-#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
-# I tried this and got it all compiling, but the end result is unusable as it
-# horribly mixes up the backends -- grobian
-IUSE="accessibility aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	xinerama? ( X )"
-
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-# FIXME: introspection data is built against system installation of gtk+:3
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="X? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXi-1.3
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-libs/libXinerama )
-	)
-	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
-		x11-libs/cairo[opengl]
-		x11-libs/libxkbcommon
-	)
-	>=dev-libs/glib-2.33.1
-	>=x11-libs/pango-1.30[introspection?]
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2.5.3[introspection?]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-		xinerama? ( x11-proto/xineramaproto )
-	)
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
-# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
-# >=xorg-server-1.11.4 needed for
-#  http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	!<x11-libs/vte-0.31.0:2.90
-	packagekit? ( app-admin/packagekit-base )
-	X? ( !<x11-base/xorg-server-1.11.4 )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-strip_builddir() {
-	local rule=$1
-	shift
-	local directory=$1
-	shift
-	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
-		|| die "Could not strip director ${directory} from build."
-}
-
-src_prepare() {
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
-	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
-
-	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
-	if [[ ${CHOST} == *-solaris* ]]; then
-		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
-	fi
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	# FIXME: multiple reftests fail when run from portage (but succeed when
-	# run from a manual compile in a temp directory)
-	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
-		-i tests/Makefile.* || die "sed 3 failed"
-
-	# Test results depend on the list of mounted filesystems!
-	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
-	fi
-
-	[[ ${PV} = 9999 ]] && gnome2_src_prepare
-}
-
-src_configure() {
-	# TODO: --enable-wayland-cairo-gl
-	local myconf="$(use_enable aqua quartz-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		--disable-papi
-		--enable-gtk2-dependency"
-
-	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
-	# need libdir here to avoid a double slash in a path that libtool doesn't
-	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_test() {
-	# Tests require a new gnome-themes-standard, but adding it to DEPEND
-	# would result in circular dependencies.
-	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-	if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
-		ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
-		ewarn "is not installed. Please re-run tests after installing the"
-		ewarn "required version of gnome-themes-standard."
-		return 0
-	fi
-	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	# Remove unneeded *.la files
-	find "${D}" -name '*.la' -exec rm -f {} +
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 972753c2..5e41dc2a 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r2.ebuild,v 1.1 2011/12/15 23:46:04 tetromino Exp $
+# $Header: $
 
 EAPI="4"
 
-inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
+inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -12,14 +12,14 @@ fi
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="3"
 # NOTE: This gtk+ has multi-gdk-backend support, see:
 #  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
 #  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
-IUSE="accessibility aqua colord cups debug doc examples +introspection packagekit test vim-syntax wayland X xinerama"
+IUSE="aqua colord cups debug doc egl examples +introspection packagekit test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
@@ -27,13 +27,14 @@ REQUIRED_USE="
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 # Use gtk+:2 for gtk-update-icon-cache
 COMMON_DEPEND="X? (
+		>=app-accessibility/at-spi2-atk-2.5.3
 		x11-libs/libXrender
 		x11-libs/libX11
 		>=x11-libs/libXi-1.3
@@ -47,14 +48,13 @@ COMMON_DEPEND="X? (
 		xinerama? ( x11-libs/libXinerama )
 	)
 	wayland? (
-		dev-libs/wayland
-		media-libs/mesa[egl,wayland]
-		x11-libs/cairo[opengl]
+		>=dev-libs/wayland-0.95
+		media-libs/mesa[egl?,wayland]
 		x11-libs/libxkbcommon
+		egl? ( x11-libs/cairo[opengl] )
 	)
 	>=dev-libs/glib-2.33.1
 	>=x11-libs/pango-1.30[introspection?]
-	>=app-accessibility/at-spi2-atk-2.5.3
 	>=dev-libs/atk-2.5.3[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
 	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
@@ -65,6 +65,9 @@ COMMON_DEPEND="X? (
 	cups? ( >=net-print/cups-1.2 )
 	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
 DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
 	virtual/pkgconfig
 	X? (
 		x11-proto/xextproto
@@ -74,9 +77,7 @@ DEPEND="${COMMON_DEPEND}
 		xinerama? ( x11-proto/xineramaproto )
 	)
 	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
+	doc? ( >=dev-util/gtk-doc-1.11 )
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
@@ -105,14 +106,9 @@ src_prepare() {
 	replace-flags -O3 -O2
 	strip-flags
 
-	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
+	# https://bugzilla.gnome.org/show_bug.cgi?id=654108
 	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
-	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
-	if [[ ${CHOST} == *-solaris* ]]; then
-		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
-	fi
-
 	# Non-working test in gentoo's env
 	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
 		-i gtk/tests/testing.c || die "sed 1 failed"
@@ -143,7 +139,6 @@ src_prepare() {
 }
 
 src_configure() {
-	# TODO: --enable-wayland-cairo-gl
 	local myconf="$(use_enable aqua quartz-backend)
 		$(use_enable colord)
 		$(use_enable cups cups auto)
@@ -159,8 +154,11 @@ src_configure() {
 		$(use_enable X xrandr)
 		$(use_enable xinerama)
 		--disable-papi
+		--enable-man
 		--enable-gtk2-dependency"
 
+	use wayland && myconf="${myconf} $(use_enable egl wayland-cairo-gl)"
+
 	# Passing --disable-debug is not recommended for production use
 	use debug && myconf="${myconf} --enable-debug=yes"
 
@@ -173,8 +171,8 @@ src_test() {
 	# Tests require a new gnome-themes-standard, but adding it to DEPEND
 	# would result in circular dependencies.
 	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
-	if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
-		ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk3]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk3]"
 		ewarn "is not installed. Please re-run tests after installing the"
 		ewarn "required version of gnome-themes-standard."
 		return 0
@@ -195,7 +193,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
-	find "${D}" -name '*.la' -exec rm -f {} +
+	prune_libtool_files --all
 
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do