x11-libs/gtk+-{3.10.8-r1,3.12.2-r1}: revbump/merge

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

5 files changed, 22 insertions, 258 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 066faba..0447d9e 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.718 2014/05/14 13:36:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.720 2014/06/01 14:17:33 pacho Exp $
+
+  01 Jun 2014; Pacho Ramos <pacho@gentoo.org> -gtk+-3.12.1.ebuild:
+  drop old
+
+*gtk+-3.12.2 (31 May 2014)
+
+  31 May 2014; Pacho Ramos <pacho@gentoo.org> +gtk+-3.12.2.ebuild:
+  Version bump
 
 *gtk+-2.24.23-r1 (14 May 2014)
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index e14857e..855aa8c 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -21,11 +21,9 @@ AUX gtk+-3.8.6-skip-filechooser-test.patch 795 SHA256 1b900fc9501024170f2bfc48e3
 AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb
 AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
 DIST gtk+-3.10.8.tar.xz 14187652 SHA256 5fd28b35ab475d521751fa6ae91318bf58f69cd34e71363f24e23d3ea406b684 SHA512 b96ef832fb76c0d35f8e9a2db48c4d65229dda5a5755f8f0010e3d5731322dc8a6a01d9d0ee10e93e19b5102ad8025286cf7f1caa9466279d1daf9ec52d98b34 WHIRLPOOL 554e1e34a55103be0cfa8d0af00026dd3dc1b4a8666ba99e298ff2004b2da4971a57ddf891110b825f75aa57967c5fbc338c2752ad9b393d1515b8ad148ac79d
-DIST gtk+-3.12.1.tar.xz 14731512 SHA256 719aae5fdb560f64cadb7e968c8c85c0823664de890c9f765ff4c0efeb0277cd SHA512 e7306be21b44855e43af30a4c6314417e7a586c31a66ab40c3fcf9ed16d0223ed1b83daf651c65b49b8c492c4b40745a3cd4b06b2bdf781493a0de89f9998125 WHIRLPOOL 02ddb1302c1641906ff39cb24f898f871b8565cb5ed7302e7192a5953555e74ac4ac3d47ea61e78241b2e3a27ff98b1f8e85d456c3b9245195ba7fa46d13d8a7
-DIST gtk+-3.8.7.tar.xz 13847376 SHA256 9cb4400922fcd7b71bf899036dd3d09cdcc61af8e5a0f302121c1686c7d67c89 SHA512 cbcf205188baafdeff3e58bd54a4b4f3a55e4d98938cb56f973825eebdb7a5eeb3337aee97dcff85e059520d2cfd830b01b02b36252f225291045973df5e1207 WHIRLPOOL fff4ba16809a2262e939a44c3b6d182108b47ad1d2f0a6d99d5a4e9018b0a51c8c043c171291b22048aa67970d2cbeb0859cd35546e3b50933aca657d9ed4d29
-EBUILD gtk+-3.10.8-r1.ebuild 7405 SHA256 eb42332791f0aef728a9214e6b43fb886df2f14039596a90add8fa792d0785de SHA512 e729399d138028b4a96676d8e056778a5bb49ba65f39804f5378a5b711f2c23789fb08e7135d0d08d4d194caa630667d6c33737cafb54a1a4978436788bd9eb4 WHIRLPOOL 00ec46d53206102a00fbc867ab970ce761c72c9678aa77a6323615743ebe297d7629bd94cdfe481bee188e520f42432172e127d770178600f677291896616d06
-EBUILD gtk+-3.12.1-r1.ebuild 7433 SHA256 b576693e7573bf6226a531d56823cb438958d3d24915cc676e6af0698fd3f3cd SHA512 5791b888408a8f87d91846fa491ffc0fd071a111cc47708068bdbddfa88b35964277a206d4611997ee1badbbfc3d69e74e60b2a180b7fa4fada479039bd222f7 WHIRLPOOL 1137faecc920b4cb6bbe5ec81cdad47318b62936d32d3fe577c3a114b11af941697c96b846f8372963f4d21a433429fc55968155c1a8ff2daa99730e81e53656
-EBUILD gtk+-3.8.7-r1.ebuild 7922 SHA256 c6d9ef100d44c5b46b6a512c5bf3f8aa05d0dd5a2556b63ac4a0aa0ca6e477ab SHA512 0ac51aa6d8ca15eede4648ae6ab78fa9ccede987995d997465e02c155e61d77f423e4ad36b36b2b85b48b37a9a0fccb6ad98bcf44e8807215bc67b384a9c7f31 WHIRLPOOL f1bbebfa7481921275aca856c3f097db27a63031fc3aa98750809aa424dc225a293028f8e3af2b45112b4423bf8a2f98892b2f69a746fcf25d27d742a8087c18
-MISC ChangeLog 13886 SHA256 a4e4c723fb5526cd72045312964553dc1197b0876a1f047c4c155381f41626f6 SHA512 c49ac634226e2aa88e8abf9e337066873e5732ae6afe901caac3c6daa86f7288ba44fbe6cdeb6b8c62e3beb7aff93769c6f6b8ba636fd5097f2ec97f1235150a WHIRLPOOL 6de3b9ea913e6322d8cff0e896c630b2dfff94611f1a0a89c2d3f7b5a3135ca8dd0035e3de8fa263e760b934edddeec1c7862a89a6d3618961a585966f54cd06
+DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
+EBUILD gtk+-3.10.8-r1.ebuild 7405 SHA256 573504efe962099c3d91981f662fc4baaf1cb12df97fcf9a5f83a0a764fc9c05 SHA512 268231ccb99fa8feeeb251347ab2d255edf142f74fe2c72d8dc7b9d416f0bc6acfae0afc3ab82cbe489a8c7154b1ab1a01ecb581b88037001c7aee560510b62a WHIRLPOOL c63daa5de6e66c334e8fcd5ab4094766c274c2772e2fff81bba12163fa44beabca87c2e737d240d2e7d1ff3e332682ff3c675fed14c086b19ccc6edea50c636e
+EBUILD gtk+-3.12.2-r1.ebuild 7475 SHA256 f857bbb24a43b2e08e392f9dea96936ebda5d0160c4b97ddcd470b3768e4dea7 SHA512 23a3f23c49ea503286b3141b7ebf17e2c05e4cadc47ad9644de878c86d72a509c0d57cc6b967ade26a291f4d33f1eaf3bcd6c5ea11a538d4a7e06beac25f7363 WHIRLPOOL 7a7c1028fea698e0d1fb1fb37352161b12a77b7e7146a36c536dcd3ca4cd1869704ce943f61c085aa6dcb35f63c6873df60a60b54df76560301828e9d52c1666
+MISC ChangeLog 14075 SHA256 f95e7911d346970c3e8041ada1158d6194daec8013686b57f7b112e14d1780bd SHA512 8afe64622ff6483de17dea82214e04bebaa85939d7711bf4b6b7e21d354670922e5ee9ab46e4b805bfa8e52f64087a8533d60dab338ce56b2c353cb9a6389439 WHIRLPOOL 718eb64e4721a7771daa39257c5f3e7b4c54a08e415beaf38caf3e3247f14a1bacc795f7cd235238e78d0f6fc25d835189e90f06c5e990bd233eeaa2e1035205
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 848 SHA256 cfb2904b37626135ebeb5e4be0626a51e68d64e211414eefde98b738631d82f0 SHA512 7c0cfa1f2b09ca41911e4f6ccad76becd4f6edf4c5c1a9e3e60eb423b907f08d15c2bfbef378773b9428232d1e7c20bd250eec0b327d073f4de41f815ce92226 WHIRLPOOL 786c7b8987736aaa4fa7b637b84f81e56765f435c77d65aa0afe9409d4bc6c191cf04ad4bab4d7c7b704a2762c828346f1042b408234b38c145abb21df0fbd21
diff --git a/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild b/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild
index 234a8aa..4a62832 100644
--- a/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.10.8-r1.ebuild
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
 	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
 		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)
 "
diff --git a/x11-libs/gtk+/gtk+-3.12.1-r1.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
index 2cd1585..047985a 100644
--- a/x11-libs/gtk+/gtk+-3.12.1-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
@@ -21,7 +21,8 @@ SLOT="3"
 IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
-	xinerama? ( X )"
+	xinerama? ( X )
+"
 
 KEYWORDS="~amd64"
 
@@ -39,10 +40,9 @@ COMMON_DEPEND="
 	x11-misc/shared-mime-info
 
 	cloudprint? (
-		>=net-libs/rest-0.7
-		>=dev-libs/json-glib-1.0
-	)
-	colord? ( >=x11-misc/colord-0.1.9[${MULTILIB_USEDEP}] )
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
 	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-1.39[${MULTILIB_USEDEP}] )
 	wayland? (
@@ -64,7 +64,7 @@ COMMON_DEPEND="
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
 	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+		!<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
 		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)
 "
@@ -73,7 +73,7 @@ DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt[${MULTILIB_USEDEP}]
 	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/gtk-doc-am-1.20
 	sys-devel/gettext[${MULTILIB_USEDEP}]
 	virtual/pkgconfig
 	X? (
@@ -140,7 +140,7 @@ src_configure() {
 	# grok so well during install (// between $EPREFIX and usr ...)
 	gnome2-multilib_src_configure \
 		$(use_enable aqua quartz-backend) \
-		$(use_enable cloud-print) \
+		$(use_enable cloudprint) \
 		$(use_enable colord) \
 		$(use_enable cups cups auto) \
 		$(usex debug --enable-debug=yes "") \
diff --git a/x11-libs/gtk+/gtk+-3.8.7-r1.ebuild b/x11-libs/gtk+/gtk+-3.8.7-r1.ebuild
deleted file mode 100644
index d74ec2b..0000000
--- a/x11-libs/gtk+/gtk+-3.8.7-r1.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-inherit eutils flag-o-matic gnome.org gnome2-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="~amd64"
-
-# 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
-# at-spi2-atk dependency needed due https://mail.gnome.org/archives/desktop-devel-list/2012-June/msg00035.html
-COMMON_DEPEND="
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
-		x11-libs/libXrender[${MULTILIB_USEDEP}]
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
-		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
-		x11-libs/libXdamage[${MULTILIB_USEDEP}]
-		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
-	)
-	wayland? (
-		>=dev-libs/wayland-1.0[${MULTILIB_USEDEP}]
-		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
-		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
-	)
-	>=dev-libs/glib-2.35.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.32.4[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.7.5[introspection?,${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	x11-misc/shared-mime-info
-	colord? ( >=x11-misc/colord-0.1.9[${MULTILIB_USEDEP}] )
-	cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32[${MULTILIB_USEDEP}] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	app-text/docbook-xml-dtd:4.1.2
-	dev-libs/libxslt[${MULTILIB_USEDEP}]
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	X? (
-		x11-proto/xextproto[${MULTILIB_USEDEP}]
-		x11-proto/xproto[${MULTILIB_USEDEP}]
-		x11-proto/inputproto[${MULTILIB_USEDEP}]
-		x11-proto/damageproto[${MULTILIB_USEDEP}]
-		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
-	)
-	>=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 )"
-
-MULTILIB_WRAPPED_EXECUTABLES=(
-       /usr/bin/gtk-query-immodules-3.0
-)
-
-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
-	# This needs dev-util/gdbus-codegen in DEPEND
-	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
-
-	epatch_user
-}
-
-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 ...)
-	gnome2-multilib_src_configure \
-		$(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@
-}
-
-ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test
-my_abi_pre_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,${MULTILIB_USEDEP}]"; 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 1
-	fi
-
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check
-	return 1
-}
-
-ehook gnome2-multilib-global-post_src_install my_global_post_install
-my_global_post_install() {
-	insinto /etc/gtk-3.0
-	doins "${FILESDIR}"/settings.ini
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
-
-	prune_libtool_files --modules
-}
-
-ehook gnome2-multilib-per-abi-post_src_install my_per_abi_post_install
-my_per_abi_post_install() {
-	# 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
-
-	multilib_foreach_abi abi_pkg_postinst
-}
-
-abi_pkg_postinst() {
-	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
-}