Add new version for Gnome 2.30

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 214 insertions, 5 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 8764f3c9b880..400a95459801 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.457 2010/06/04 19:45:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.458 2010/06/13 15:43:44 pacho Exp $
+
+*gtk+-2.20.1-r1 (13 Jun 2010)
+
+  13 Jun 2010; Pacho Ramos <pacho@gentoo.org> +gtk+-2.20.1-r1.ebuild:
+  Add new version for Gnome 2.30.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> gtk+-2.18.9.ebuild:
   x86 stable, bug #314899
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 0fd95a3c5e3d..805823d148a8 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -20,17 +20,19 @@ DIST gtk+-2.16.6.tar.bz2 18518781 RMD160 1048704042ffbbabe0de60278f49f8b7700f2d1
 DIST gtk+-2.18.6.tar.bz2 18137401 RMD160 1e9b36cd2de8a472a3e550a1995978a3b783e455 SHA1 6190838c6c5e5cd3b0499d2a59ae06e517598bc9 SHA256 5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d
 DIST gtk+-2.18.7.tar.bz2 18304767 RMD160 0ac304503a23eb6911254a64218e3fe6aed9ff69 SHA1 92a40180ef4a097a867dc2eca1f209328581c5b3 SHA256 602d4f8098e1620231788770e1d9b520d5824da3f01d86e3b4fb59f1d67e1464
 DIST gtk+-2.18.9.tar.bz2 18194639 RMD160 4499af3cef1c53cddda989f35aaf2e030aab5bcf SHA1 1f50dbc0de230e1b3df7d461bdfaeceedcc5f65b SHA256 5dcd8c406acbb8779c0b081a089fa87dfd7ab4d7d4c6075db478997ce96aa9b4
+DIST gtk+-2.20.1.tar.bz2 19089076 RMD160 bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361 SHA1 a80953b4e81c6a5bc2a986852f7fe60c8704cc02 SHA256 0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.16.6.ebuild 4831 RMD160 9075d2db529208d4bb9fbf49f3662d268e39a525 SHA1 66db2a66ad200ad7e2d740bcc898dc4d850841dc SHA256 78efc032b7dc0f442f132ffe1223288522b3cf2c7f13ab0f788a9ae9e5909d93
 EBUILD gtk+-2.18.6.ebuild 5680 RMD160 a3bd7b9ca61f298d0164a53cde2c5e220d669836 SHA1 b18587878f3796d51d8f6a4244d4c915165959fe SHA256 7572ae590585f2ef94ad73f2ddf605c1ba8a1b16f3457b70abbd1f69d1348d77
 EBUILD gtk+-2.18.7.ebuild 5883 RMD160 1f8f3ad8ba596d2ace059cad8d838af8f569ceb7 SHA1 2658f1b41c1648c312d1b5de24c6190be1d1447f SHA256 3f392441329741992c57cb4d39240b47d55d1b03402399ebe0628541e94049df
 EBUILD gtk+-2.18.9.ebuild 5911 RMD160 9962654dbda4b4b9bbbae60224c3f2f6f5f0e529 SHA1 d326d6e98f51cdc05f3a5c5944b4e40b94705dc3 SHA256 a18900545cf91cea1bd7552659ad5512de87ab1e714f1730f2871ed4e6289b19
-MISC ChangeLog 67234 RMD160 711dae296f4db38ecd6f04dc011e4300181d52b2 SHA1 1165bb38dea24db9f636bc93b8521b26d950d7b1 SHA256 d0bb48d8602fcf75d694a20d6f10769aa6f53ebaea2c136d1738aaf51b9744b4
+EBUILD gtk+-2.20.1-r1.ebuild 6296 RMD160 e19c2fc18f47355ec1d0e1dc7d7420fdeb317478 SHA1 8f4a5fd52cfbe952bd3ee116d0ed044a3172f6ec SHA256 0145ed396c899822123df374c42f6990c6141f6a480692f586e93d44dc577843
+MISC ChangeLog 67369 RMD160 7e15cc66200dfa873bfc87fa9019559d2133fc16 SHA1 656ebf372bdcf6815c0e1faf74978e5ed12cf0dc SHA256 6b70f0ae7d38bf5be20f6db173a3e6d346ed05028012d82209bce3ffb44eec48
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwJV2cACgkQkKaRLQcq0GJlTwCeO5oRHbVov3ssJ4+C5BMjqzi3
-NSMAnA7TT9mJ87ZNqWASM42eaBX0aDqb
-=RK2V
+iEYEARECAAYFAkwU/LUACgkQCaWpQKGI+9SXHACcDAWAma8dH/YoHs6V7YW8XK91
+HfsAnjMTJTyceHrfo6nTbTMqutCDPMLk
+=jkQw
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
new file mode 100644
index 000000000000..359af51eca78
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild,v 1.1 2010/06/13 15:43:44 pacho Exp $
+
+EAPI="3"
+
+inherit gnome.org flag-o-matic eutils libtool virtualx
+
+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 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cups debug doc jpeg jpeg2k tiff test vim-syntax xinerama"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+RDEPEND="!aqua? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		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]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.6[aqua,svg]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.23.6
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.29.2
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.43-r2:0
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r9:0 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.9.2 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	x86-interix? (
+		sys-libs/itx-bind
+	)
+	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 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_prepare() {
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+	# add correct framework linking options, for aqua
+	epatch "${FILESDIR}/${PN}-2.18.5-macosx-aqua.patch"
+
+	# Remove the definition of libpixbufloader_gdip_png_la_*
+	epatch "${FILESDIR}/${P}-libpixbufloader-warning.patch"
+
+	# Redraw if GtkRange is a GtkScale and value is drawn.
+	epatch "${FILESDIR}/${P}-gtkrange.patch"
+
+	# Fix upstream "table cells do not implement action interface"
+	epatch "${FILESDIR}/${P}-gail_cell_type.patch"
+
+	# Upstream bg 608218: GtkOffscreenWindow causes bad window with GtkEntry
+	epatch "${FILESDIR}/${P}-GtkOffscreenWindow.patch"
+
+	# fix a 64-bit crasher in libpng 1.4 (upstream bug #617878)
+	epatch "${FILESDIR}/${P}-libpng-fix.patch"
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	# 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"
+
+	if use x86-interix; then
+		# activate the itx-bind package...
+		append-flags "-I${EPREFIX}/usr/include/bind"
+		append-ldflags "-L${EPREFIX}/usr/lib/bind"
+	fi
+
+	elibtoolize
+}
+
+src_configure() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc) \
+		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
+		$(use_with tiff libtiff) \
+		$(use_enable xinerama) \
+		$(use_enable cups cups auto) \
+		--disable-introspection \
+		--disable-papi \
+		--with-libpng"
+	if use aqua; then
+		myconf="${myconf} --with-gdktarget=quartz"
+	else
+		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
+	fi
+
+	# 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() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR}
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	insinto ${GTK2_CONFDIR}
+	doins "${T}"/gtkrc
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
+	doenvd "${T}"/50gtk2
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${ED%/}/etc/gtk-2.0/gtk.immodules"
+
+	# 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
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${EROOT%/}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${EROOT%/}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${EROOT%/}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > 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
+
+	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."
+}