Version bump, many bugsfixes and translation updates, per bug #306187. Thanks to LeBarJack for tests.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

3 files changed, 191 insertions, 2 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f11a2556e5f3..14a0a6a0073c 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # 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.441 2010/01/19 18:52:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.442 2010/02/23 09:22:26 mrpouet Exp $
+
+*gtk+-2.18.7 (23 Feb 2010)
+
+  23 Feb 2010; Romain Perier <mrpouet@gentoo.org> +gtk+-2.18.7.ebuild:
+  Version bump, many bugsfixes and translation updates, per bug #306187.
+  Thanks to LeBarJack for tests.
 
   19 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> gtk+-2.18.5.ebuild,
   gtk+-2.18.6.ebuild:
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 3da515da9417..52511c05d7a6 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -29,6 +29,7 @@ DIST gtk+-2.14.7.tar.bz2 17475873 RMD160 2ed6451d3de050e9b2423f6509d15e39ba69a6a
 DIST gtk+-2.16.6.tar.bz2 18518781 RMD160 1048704042ffbbabe0de60278f49f8b7700f2d1f SHA1 f69cb48311d60664bac7cf68351c175c7a214ae6 SHA256 18e0f9792028e6cc5108447678f17d396f9a2cdfec1e6ab5dca98cb844f954af
 DIST gtk+-2.18.5.tar.bz2 18126480 RMD160 712098237fc31dcb99189645f0320aa165855577 SHA1 ddb004f0f92f7c8e3b84237e05fcf0ef5affc79c SHA256 4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4
 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
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.12.11.ebuild 4958 RMD160 940e8c7b465316386f7878590a274ce3b74b4593 SHA1 db01e240a5e17bc78c616c47f27b2bab8bbb0f23 SHA256 ac75435bc30144c72351b7075140719deeb9ba78bb1ae575d453ed337706e9d7
 EBUILD gtk+-2.12.12.ebuild 4964 RMD160 96178ab4ded53396ba6c17fa8ed6d8d858046e61 SHA1 c8a3e1340574f3603f1a4ff335be2bbac802c20b SHA256 712d43258904b8254aab79598c1d9d25a92f5b8e671fdc3ce39063b60a352ca9
@@ -36,5 +37,6 @@ EBUILD gtk+-2.14.7-r2.ebuild 4837 RMD160 d4756b6e99afefee642f0939e645c9382983e1d
 EBUILD gtk+-2.16.6.ebuild 4831 RMD160 9075d2db529208d4bb9fbf49f3662d268e39a525 SHA1 66db2a66ad200ad7e2d740bcc898dc4d850841dc SHA256 78efc032b7dc0f442f132ffe1223288522b3cf2c7f13ab0f788a9ae9e5909d93
 EBUILD gtk+-2.18.5.ebuild 5684 RMD160 0def12d4c0c32ccb7054109b3551b884fb729a60 SHA1 bd0e71c796cde19ebbf6056ab9726694fbaedf05 SHA256 6aeca6febb61ddb2680ea25241cab9cf1b072287429dfab965c15950c88a2886
 EBUILD gtk+-2.18.6.ebuild 5692 RMD160 194712c1e934c371b3eda479adb00e376c220ac3 SHA1 f6dde43679e0f762f96e1ed943f27cb7b4591549 SHA256 fa6c5c35e2fad70815f8df6ca936e850e6c03715f5f1342545c8f90a86388dab
-MISC ChangeLog 64619 RMD160 13cf7588976792088e4a0f3c11be8ffd8c33884f SHA1 fa15db9c85451cf02d7b858ad2af822262bcaaa3 SHA256 7c30e138085f37c5799d917f03b4193e54169a6ab5747e4075192423e2be3c45
+EBUILD gtk+-2.18.7.ebuild 5690 RMD160 2e72274bb8aaeaea9f80c832b44f21eeca48de97 SHA1 c87bb663c4cce6e62453582143fa429037b614a1 SHA256 f06aaad542f58cfe812f4f3da1e3445528f3334250018218aa1252af5798a1b8
+MISC ChangeLog 64823 RMD160 9ee9ec805b0c2080e22be57bd7e9538f20fc82b0 SHA1 59012681a82bc10bcb4669db881d0062042a8a1b SHA256 40249a19eadfc10d05e4cb75d406646c0d72b78d9584e360e8fc750befcad883
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
diff --git a/x11-libs/gtk+/gtk+-2.18.7.ebuild b/x11-libs/gtk+/gtk+-2.18.7.ebuild
new file mode 100644
index 000000000000..6b11d7b90c96
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.18.7.ebuild
@@ -0,0 +1,181 @@
+# 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.18.7.ebuild,v 1.1 2010/02/23 09:22:26 mrpouet Exp $
+
+EAPI="2"
+
+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"
+
+# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken
+# 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.2
+		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.21.3
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.13
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
+	jpeg? ( >=media-libs/jpeg-6b-r2:0 )
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		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 )"
+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}
+}
+
+pkg_setup() {
+	use prefix || EPREFIX=
+}
+
+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"
+
+	# -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"
+	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-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 "${D%/}${EPREFIX}/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 :" "${D%/}${EPREFIX}"/usr/lib/pkgconfig/$i || die "sed failed"
+	done
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	if [ -d "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}" ]; then
+		gtk-query-immodules-2.0  > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+		gdk-pixbuf-query-loaders > "${ROOT%/}${EPREFIX}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
+	else
+		ewarn "The destination path ${ROOT%/}${EPREFIX}${GTK2_CONFDIR} doesn't exist;"
+		ewarn "to complete the installation of GTK+, please create the"
+		ewarn "directory and then manually run:"
+		ewarn "  cd ${ROOT%/}${EPREFIX}${GTK2_CONFDIR}"
+		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+		ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+	fi
+
+	if [ -e "${ROOT%/}${EPREFIX}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${ROOT%/}${EPREFIX}"/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."
+}