Version bump, also fix bug 158179

Package-Manager: portage-2.1.2_rc4-r9

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 4f96ea13af8364e7e35c09b16a69924860b32882..7f8050fd81ddccaafd22320eead77c5b80f9950d 100644 (file)
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.295 2007/01/10 02:19:17 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.296 2007/01/14 17:22:40 leio Exp $
+
+*gtk+-2.10.7 (14 Jan 2007)
+
+  14 Jan 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/gtk+-2.10.7-textview-fix.patch, +gtk+-2.10.7.ebuild:
+  Version bump, also fix bug 158179
 
   10 Jan 2007; Mart Raudsepp <leio@gentoo.org> -gtk+-1.2.10-r11.ebuild:
   Remove old gtk1 revision

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 29b5b12cf804bbdaf868a47fa7ab21d83324afc0..994e854a0627d934656f7647664ef3917a34c296 100644 (file)
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -17,6 +17,10 @@ AUX gtk+-2-xpm_loader.patch 920 RMD160 08e77b9df95557e874a193dd45aad84835a2c281
 MD5 cd1c96c0a81026a3af29449389e455d5 files/gtk+-2-xpm_loader.patch 920
 RMD160 08e77b9df95557e874a193dd45aad84835a2c281 files/gtk+-2-xpm_loader.patch 920
 SHA256 ee01227c6dae5041040aac8d43c16b689cca197ea1fca62401e5011623ee832c files/gtk+-2-xpm_loader.patch 920
+AUX gtk+-2.10.7-textview-fix.patch 937 RMD160 32e9a321151742e29dc15f891c91218bfd94fe49 SHA1 adeb81cfde35424e107a04250d58dcb413adfd57 SHA256 9f251fe7d50a7e9280d331bece4956ceb12044ac64a01cc6effcb28ec672baae
+MD5 4af2fc5215284f8bf11c5fe9f71c3c9c files/gtk+-2.10.7-textview-fix.patch 937
+RMD160 32e9a321151742e29dc15f891c91218bfd94fe49 files/gtk+-2.10.7-textview-fix.patch 937
+SHA256 9f251fe7d50a7e9280d331bece4956ceb12044ac64a01cc6effcb28ec672baae files/gtk+-2.10.7-textview-fix.patch 937
 AUX gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 SHA1 5be2ba7cdac1bf48fdca5dc49d2adf96480452f0 SHA256 f4b916c7d26ba60b5d5af63ff694a5203f0dcd31b7310fb375c324fc1df72e05
 MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
 RMD160 f2557ee984df766bce0b5e5ea8c41962a2ccff13 files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
@@ -40,6 +44,7 @@ SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 files/gt
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
 DIST gtk+-2.10.6.tar.bz2 14561124 RMD160 929386610a634e82b7ddb10f43930b27194fa67b SHA1 aad6e1ef964d8acb8a04942b8dd2e00a9db56450 SHA256 ca98edcea2034ab36c1024121a44d047de192d282127c8f8b77d14afba0ca468
+DIST gtk+-2.10.7.tar.bz2 14955229 RMD160 130af39787b146166846f44b104ea0c3683d0578 SHA1 784a7ecc75767306efe1f200a1251968f944143e SHA256 3daead5f578ec2a3752997e6048eb3ecdce208cee560f7289dd9d069ca623276
 DIST gtk+-2.6-smoothscroll-r5.patch.bz2 3758 RMD160 b1db44f5055cef48239f69620e0bc13b1dccc139 SHA1 4ee4af7ebb1e013b14afeac94e8bd14b12badd58 SHA256 1322ed086c0b7353c5a28f23fe422ab23fd553ca8f3047b47fe5ae9a69c6c5eb
 DIST gtk+-2.6.1-lib64.patch.bz2 6047 RMD160 0ce3bf05fe59910ea019b4157dd1066367df2af6 SHA1 4a83215ef6a420db5f8080288567437941f72daf SHA256 fe171fc78e10f49ff69c2db424b816a331e21f362aef55b8624031c53ebcfc72
 DIST gtk+-2.6.10.tar.bz2 11521380 RMD160 5bb2e4de406e0e6ccf5c66ec48f6ba3e5b0911ff SHA1 9ba627683e0dc4bceb5fb900c1ee687638d95fcd SHA256 d408b606c8dd414dfbf220ccc168a0bc85a419945439796792a5357a96ff02af
@@ -53,6 +58,10 @@ EBUILD gtk+-2.10.6.ebuild 4213 RMD160 8da78b250d71afcb67a1c19fd22bfda6dfde2ff5 S
 MD5 6a921b1351508252ca5d484ae1d4738f gtk+-2.10.6.ebuild 4213
 RMD160 8da78b250d71afcb67a1c19fd22bfda6dfde2ff5 gtk+-2.10.6.ebuild 4213
 SHA256 83ef0fbf6d980fe819a1e6f334ee9a47b47003166121ea37d3732e38aaf33349 gtk+-2.10.6.ebuild 4213
+EBUILD gtk+-2.10.7.ebuild 4344 RMD160 dd7f00d0a07e21ffcd17ee66adf6dba6d3fee558 SHA1 c5a3815cb3d26e1e7314232b1c30bd5b7e95d14c SHA256 0967e6bc016716310fd50be163243fd6a4c307b1518f329fa7718b36667bc63f
+MD5 47a93282e83d0ec61aaa5df9a1d0588b gtk+-2.10.7.ebuild 4344
+RMD160 dd7f00d0a07e21ffcd17ee66adf6dba6d3fee558 gtk+-2.10.7.ebuild 4344
+SHA256 0967e6bc016716310fd50be163243fd6a4c307b1518f329fa7718b36667bc63f gtk+-2.10.7.ebuild 4344
 EBUILD gtk+-2.6.10-r1.ebuild 3455 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba SHA1 4c472888cd0f1dc1b43c3e4c3167e2941ae1c39e SHA256 d58bd7ffe27a02b4c4cf71dd16dcc6c7116723b36df0d15519846b19549ade2e
 MD5 16ca62398139ea671319657720b6fc8b gtk+-2.6.10-r1.ebuild 3455
 RMD160 63997fee767bbb4ddc7d978374c7d9fbe73bf6ba gtk+-2.6.10-r1.ebuild 3455
@@ -65,10 +74,10 @@ EBUILD gtk+-2.8.20-r1.ebuild 4092 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe7
 MD5 cd6eb30366994c8450fa9359d2d4fcd5 gtk+-2.8.20-r1.ebuild 4092
 RMD160 63a741c0bbf75fe549277f5cad36d2b21d7afe71 gtk+-2.8.20-r1.ebuild 4092
 SHA256 10933d9f04fc0124a446e88fd29892fdb9c2c737b0604d74eae3df8bc4d8b4e1 gtk+-2.8.20-r1.ebuild 4092
-MISC ChangeLog 41776 RMD160 dcb02d0d098a77587a4ac87910bbf7781bdbfc62 SHA1 a2da74a6e09a19fd96045ef64b2021d058d84a94 SHA256 29d297662ecb2d1b0e7e0e48ca073ff5651afea036ceac52f61833539a795f99
-MD5 595ca76f2a070da61b1a6b800e4f114f ChangeLog 41776
-RMD160 dcb02d0d098a77587a4ac87910bbf7781bdbfc62 ChangeLog 41776
-SHA256 29d297662ecb2d1b0e7e0e48ca073ff5651afea036ceac52f61833539a795f99 ChangeLog 41776
+MISC ChangeLog 41950 RMD160 6ae657f47a2367dc465ff9f2de80822b3c6ecb17 SHA1 7c723385bf7c9ad820509b14974a9b9009006b65 SHA256 24e083c7fe01bf11a47ad184a0be82c684f4d19b6b6992ad4aef4385d7a4dfae
+MD5 22818ef2f9032cf9ec7b1b58e89662da ChangeLog 41950
+RMD160 6ae657f47a2367dc465ff9f2de80822b3c6ecb17 ChangeLog 41950
+SHA256 24e083c7fe01bf11a47ad184a0be82c684f4d19b6b6992ad4aef4385d7a4dfae ChangeLog 41950
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
 MD5 58b5c1a403ab43f5160c44c32761cbe0 metadata.xml 424
 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 metadata.xml 424
@@ -79,6 +88,9 @@ SHA256 4bd7f7ef31547e6dabca532b07bc6be7e37c96d234abd2818afbb85d725aed47 files/di
 MD5 c8326ddbc6cc256207f438f1907fc185 files/digest-gtk+-2.10.6 244
 RMD160 52d7da5456f30a8fef7f96c0eca54f3c6c63a260 files/digest-gtk+-2.10.6 244
 SHA256 55bbe220e1f771910fc8c1bbaae3a8a5d984af059306f8904ed77a0e76e1947b files/digest-gtk+-2.10.6 244
+MD5 b481b67d1bae232fb2772db23a21395a files/digest-gtk+-2.10.7 244
+RMD160 2d68d26bab77ff8d03c6764c0108315db2f0b8b1 files/digest-gtk+-2.10.7 244
+SHA256 9e73127b8282101f4e1005e145b8eaaddcd52924f7148e3eb47ffeb894fcfc7d files/digest-gtk+-2.10.7 244
 MD5 4db8c558f465f191df15e6d4b6198e6b files/digest-gtk+-2.6.10-r1 774
 RMD160 b07163c72c7096fb0f6fae53857bfce45994af49 files/digest-gtk+-2.6.10-r1 774
 SHA256 219aadd2affc04b82e80378f93bc4acbb03123573cc4e16c2f3366c20e4854cf files/digest-gtk+-2.6.10-r1 774
@@ -91,7 +103,7 @@ SHA256 87a06d8202ce31cb65090a54522b8c4cd3021dd5d5d42ff53ff22f754f9b2b97 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFpE0wkeYb6olFHJcRAnC0AKD5mijPk3l1LLuA4Zz1HYfOCTlabQCePIxK
-9v7Sr1Wqpbw8T059xWR/TOk=
-=lNIV
+iD8DBQFFqmbdkeYb6olFHJcRAuNgAJ0RM2TU3dj05+qNDg2dgrxzlNACuwCgq5I1
+ZhBOqBcBLAi+/f+WNIT4XQc=
+=zXqP
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+/files/digest-gtk+-2.10.7 b/x11-libs/gtk+/files/digest-gtk+-2.10.7
new file mode 100644 (file)
index 0000000..7f6d663
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.10.7
@@ -0,0 +1,3 @@
+MD5 acb0c10be4495928db68d2279e34f20c gtk+-2.10.7.tar.bz2 14955229
+RMD160 130af39787b146166846f44b104ea0c3683d0578 gtk+-2.10.7.tar.bz2 14955229
+SHA256 3daead5f578ec2a3752997e6048eb3ecdce208cee560f7289dd9d069ca623276 gtk+-2.10.7.tar.bz2 14955229

diff --git a/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch b/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch
new file mode 100644 (file)
index 0000000..b6ff18f
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.10.7-textview-fix.patch
@@ -0,0 +1,23 @@
+Don't crash in GtkSourceView/gedit with "Display line numbers"
+http://bugzilla.gnome.org/show_bug.cgi?id=393813
+
+--- /trunk/gtk/gtktextview.c   2007/01/07 05:34:40     17100
++++ trunk/gtk/gtktextview.c    2007/01/07 07:19:07     17101
+@@ -8182,7 +8182,7 @@
+                                    width, 0);
+           /* if the widget is already realized we need to realize the child manually */
+           if (GTK_WIDGET_REALIZED (text_view))
+-            text_window_realize (*winp, GTK_WIDGET (text_view)->window);
++            text_window_realize (*winp, GTK_WIDGET (text_view));
+         }
+       else
+         {
+@@ -8222,7 +8222,7 @@
+ 
+           /* if the widget is already realized we need to realize the child manually */
+           if (GTK_WIDGET_REALIZED (text_view))
+-            text_window_realize (*winp, GTK_WIDGET (text_view)->window);
++            text_window_realize (*winp, GTK_WIDGET (text_view));
+         }
+       else
+         {

diff --git a/x11-libs/gtk+/gtk+-2.10.7.ebuild b/x11-libs/gtk+/gtk+-2.10.7.ebuild
new file mode 100644 (file)
index 0000000..ce4d3e4
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.10.7.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.7.ebuild,v 1.1 2007/01/14 17:22:40 leio Exp $
+
+inherit gnome.org flag-o-matic eutils autotools 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"
+IUSE="debug doc jpeg tiff xinerama"
+
+RDEPEND="x11-libs/libXrender
+       x11-libs/libX11
+       x11-libs/libXi
+       x11-libs/libXt
+       x11-libs/libXext
+       x11-libs/libXcursor
+       x11-libs/libXrandr
+       x11-libs/libXfixes
+       xinerama? ( x11-libs/libXinerama )
+       >=dev-libs/glib-2.12.1
+       >=x11-libs/pango-1.12.0
+       >=dev-libs/atk-1.10.1
+       >=x11-libs/cairo-1.2.0
+       media-libs/fontconfig
+       x11-misc/shared-mime-info
+       >=media-libs/libpng-1.2.1
+       jpeg? ( >=media-libs/jpeg-6b-r2 )
+       tiff? ( >=media-libs/tiff-3.5.7 )"
+
+DEPEND="${RDEPEND}
+       sys-devel/autoconf
+       >=dev-util/pkgconfig-0.9
+       =sys-devel/automake-1.7*
+       x11-proto/xextproto
+       x11-proto/xproto
+       x11-proto/inputproto
+       xinerama? ( x11-proto/xineramaproto )
+       doc? (
+                       >=dev-util/gtk-doc-1.4
+                       ~app-text/docbook-xml-dtd-4.1.2
+                )"
+
+RESTRICT="confcache"
+
+pkg_setup() {
+       if ! built_with_use x11-libs/cairo X; then
+               einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
+               die "cairo needs the X flag set"
+       fi
+}
+
+set_gtk2_confdir() {
+       # An arch specific config directory is used on multilib systems
+       has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+       use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+       GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Optionalize xinerama support
+       epatch "${FILESDIR}"/${PN}-2.8.10-xinerama.patch
+
+       # 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
+
+       # and this line is just here to make building emul-linux-x86-gtklibs a bit
+       # easier, so even this should be amd64 specific.
+       if use x86 && [ "$(get_libdir)" == "lib32" ]; then
+               epatch "${FILESDIR}"/${PN}-2.8.0-multilib.patch
+       fi
+
+       # Don't crash in GtkSourceView/gedit with "Display line numbers"
+       epatch "${FILESDIR}/${P}-textview-fix.patch"
+
+       # -O3 and company cause random crashes in applications. Bug #133469
+       replace-flags -O3 -O2
+       strip-flags
+
+       use ppc64 && append-flags -mminimal-toc
+
+       # remember, eautoreconf applies elibtoolize.
+       # if you remove this, you should manually run elibtoolize
+       export WANT_AUTOMAKE=1.7
+       cp aclocal.m4 old_macros.m4
+       AT_M4DIR="."
+       eautoreconf
+
+       epunt_cxx
+}
+
+src_compile() {
+       # png always on to display icons (foser)
+       local myconf="$(use_enable doc gtk-doc) \
+               $(use_with jpeg libjpeg) \
+               $(use_with tiff libtiff) \
+               $(use_enable xinerama) \
+               --with-libpng \
+               --with-gdktarget=x11 \
+               --with-xinput"
+
+       # Passing --disable-debug is not recommended for production use
+       use debug && myconf="${myconf} --enable-debug=yes"
+
+       econf ${myconf} || die "configure failed"
+
+       emake || die "compile failed"
+}
+
+src_test() {
+       Xmake check || die
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "Installation failed"
+
+       set_gtk2_confdir
+       dodir ${GTK2_CONFDIR}
+       keepdir ${GTK2_CONFDIR}
+
+       # see bug #133241
+       echo 'gtk-fallback-icon-theme = "gnome"' > ${D}/${GTK2_CONFDIR}/gtkrc
+
+       # Enable xft in environment as suggested by <utx@gentoo.org>
+       dodir /etc/env.d
+       echo "GDK_USE_XFT=1" > ${D}/etc/env.d/50gtk2
+
+       dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_postinst() {
+       set_gtk2_confdir
+
+       if [ -d "${ROOT}${GTK2_CONFDIR}" ]; then
+               gtk-query-immodules-2.0  > ${ROOT}${GTK2_CONFDIR}/gtk.immodules
+               gdk-pixbuf-query-loaders > ${ROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+       else
+               ewarn "The destination path ${ROOT}${GTK2_CONFDIR} doesn't exist;"
+               ewarn "to complete the installation of GTK+, please create the"
+               ewarn "directory and then manually run:"
+               ewarn "  cd ${ROOT}${GTK2_CONFDIR}"
+               ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
+               ewarn "  gdk-pixbuf-query-loaders > gdk-pixbuf.loaders"
+       fi
+
+       if [ -e /usr/lib/gtk-2.0/2.[^1]* ]; then
+               elog "You need to rebuild ebuilds that installed into" /usr/lib/gtk-2.0/2.[^1]*
+               elog "to do that you can use qfile from portage-utils:"
+               elog "emerge -va1 \$(qfile -qC /usr/lib/gtk-2.0/2.[^1]*)"
+       fi
+}