Version bump, drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 252 insertions, 247 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index db56cf8a9ac2..ec17dc0b105f 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.681 2013/10/17 20:44:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.682 2013/10/18 16:50:09 pacho Exp $
+
+*gtk+-3.8.6 (18 Oct 2013)
+
+  18 Oct 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/gtk+-3.8.6-skip-filechooser-test.patch, +gtk+-3.8.6.ebuild,
+  -gtk+-2.24.21.ebuild:
+  Version bump, drop old
 
   17 Oct 2013; Markus Meier <maekke@gentoo.org> gtk+-3.6.3-r3.ebuild:
   arm stable, bug #476364
diff --git a/x11-libs/gtk+/files/gtk+-3.8.6-skip-filechooser-test.patch b/x11-libs/gtk+/files/gtk+-3.8.6-skip-filechooser-test.patch
new file mode 100644
index 000000000000..32d934c9f987
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.8.6-skip-filechooser-test.patch
@@ -0,0 +1,23 @@
+--- gtk/tests/filechooser.c.orig	2013-10-18 18:26:11.247696989 +0200
++++ gtk/tests/filechooser.c	2013-10-18 18:27:31.927762072 +0200
+@@ -1603,20 +1603,6 @@
+       NULL,			/* final_current_folder */
+       FOLDER_NAME_2		/* final_filename */
+     },
+-    {
+-      "select-folder-dialog-4",
+-      GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+-      FOLDER_NAME,		/* initial_current_folder */
+-      NULL,			/* initial_filename */
+-      TRUE,			/* open_dialog */
+-      BUTTON,			/* what_to_tweak */
+-      NULL,			/* tweak_current_folder */
+-      FOLDER_NAME_2,		/* tweak_filename */
+-      GTK_RESPONSE_ACCEPT,	/* dialog_response */
+-      FALSE,			/* unselect_all */
+-      NULL,			/* final_current_folder */
+-      FOLDER_NAME_2		/* final_filename */
+-    },
+ 
+     /* Unselection tests */
+     {
diff --git a/x11-libs/gtk+/gtk+-2.24.21.ebuild b/x11-libs/gtk+/gtk+-2.24.21.ebuild
deleted file mode 100644
index df4965eb1aea..000000000000
--- a/x11-libs/gtk+/gtk+-2.24.21.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.21.ebuild,v 1.2 2013/10/07 16:41:48 tetromino Exp $
-
-EAPI="5"
-inherit eutils flag-o-matic gnome2-utils gnome.org multilib virtualx autotools readme.gentoo
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-COMMON_DEPEND="
-	!aqua? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		>=x11-libs/cairo-1.6:=[X,svg]
-		x11-libs/gdk-pixbuf:2[X,introspection?]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6:=[aqua,svg]
-		x11-libs/gdk-pixbuf:2[introspection?]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.34:2
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	cups? ( net-print/cups:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	!<gnome-base/gail-1000
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	dev-libs/gobject-introspection-common
-	>=dev-util/gtk-doc-am-1.11
-	test? (
-		x11-themes/hicolor-icon-theme
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
-"
-
-# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
-# Add blocker against old gtk-builder-convert to be sure we maintain both
-# in sync.
-RDEPEND="${COMMON_DEPEND}
-	!<dev-util/gtk-builder-convert-${PV}
-	!<x11-libs/vte-0.28.2-r201:0
-"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
-edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
-[Filechooser Settings]
-StartupMode=cwd"
-
-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."
-}
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-}
-
-src_prepare() {
-	gnome2_environment_reset
-
-	# Fix building due to moved definition, upstream bug #704766
-	epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch
-
-	# marshalers code was pre-generated with glib-2.31, upstream bug #671763
-	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
-		perf/marshalers.c || die
-
-	# Stop trying to build unmaintained docs, bug #349754
-	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
-	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	if ! use test; then
-		# don't waste time building tests
-		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
-		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
-	else
-		# 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"
-
-		# Cannot work because glib is too clever to find real user's home
-		# gentoo bug #285687, upstream bug #639832
-		# XXX: /!\ Pay extra attention to second sed when bumping /!\
-		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
-			|| die "failed to disable recentmanager test (1)"
-		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
-			|| die "failed to disable recentmanager test (2)"
-		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
-			|| die "failed to disable recentmanager test (3)"
-
-		# Skip tests known to fail
-		# https://bugzilla.gnome.org/show_bug.cgi?id=646609
-		sed -e '/g_test_add_func.*test_text_access/s:^://:' \
-			-i "${S}/gtk/tests/testing.c" || die
-
-		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
-		sed -i -e 's:pltcheck.sh:$(NULL):g' \
-			gtk/Makefile.am || die
-
-		# UI tests require immodules already installed; bug #413185
-		if ! has_version 'x11-libs/gtk+:2'; then
-			ewarn "Disabling UI tests because this is the first install of"
-			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
-			ewarn "has been installed."
-			sed '/g_test_add_func.*ui-tests/ d' \
-				-i gtk/tests/testing.c || die "sed 2 failed"
-		fi
-	fi
-
-	if ! use examples; then
-		# don't waste time building demos
-		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
-	fi
-
-	epatch_user
-
-	eautoreconf
-	# Use elibtoolize in place of eautoreconf when it will be dropped
-	#elibtoolize
-}
-
-src_configure() {
-	# Passing --disable-debug is not recommended for production use
-	econf \
-		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
-		$(usex aqua "" --with-xinput) \
-		$(usex debug --enable-debug=yes "") \
-		$(use_enable cups cups auto) \
-		$(use_enable introspection) \
-		$(use_enable xinerama) \
-		--disable-papi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-}
-
-src_install() {
-	default
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto /etc/gtk-2.0
-	doins "${T}"/gtkrc
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
-	done
-
-	# dev-util/gtk-builder-convert split off into a separate package, #402905
-	rm "${ED}"usr/bin/gtk-builder-convert
-
-	prune_libtool_files --modules
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed"
-
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
-		elog "aware location. Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
-	fi
-
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
-		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
-		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
-	fi
-
-	# pixbufs are now handled by x11-libs/gdk-pixbuf
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
-	fi
-
-	# two checks needed since we dropped multilib conditional
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
-		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
-		elog "Removing deprecated file."
-		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
-	fi
-
-	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
-		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
-		elog "to do that you can use qfile from portage-utils:"
-		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
-	fi
-
-	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 gtkrc."
-	fi
-
-	readme.gentoo_print_elog
-}
diff --git a/x11-libs/gtk+/gtk+-3.8.6.ebuild b/x11-libs/gtk+/gtk+-3.8.6.ebuild
new file mode 100644
index 000000000000..7dd444a6d483
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.8.6.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.8.6.ebuild,v 1.1 2013/10/18 16:50:09 pacho Exp $
+
+EAPI="5"
+inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
+
+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="aqua colord cups debug examples +introspection packagekit test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# 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
+		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-1.0
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	>=dev-libs/glib-2.35.3:2
+	>=x11-libs/pango-1.32.4[introspection?]
+	>=dev-libs/atk-2.7.5[introspection?]
+	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1: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}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	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
+	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() {
+	gnome2_environment_reset
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
+	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
+
+	# This files shouldn't be in tarball, upstream bug #709974
+	rm -f gtk/gtkdbusgenerated.{h,c} || die
+
+	if use test; then
+		# 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 -f tests/a11y/pickers.{ui,txt} || die "rm failed"
+
+		# Skip failing tests, upstream bug #698448
+		epatch "${FILESDIR}/${PN}-3.8.6-skip-filechooser-test.patch"
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=710467
+		rm -f tests/a11y/buttons.{ui,txt} || die
+	else
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.am
+		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
+		strip_builddir SRC_SUBDIRS demos Makefile.in
+	fi
+}
+
+src_configure() {
+	# Passing --disable-debug is not recommended for production use
+	# 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 \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(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-gtk-doc \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+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.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
+		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
+	Xemake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	prune_libtool_files --modules
+
+	# 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
+}