summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-08-05 08:45:42 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-08-05 08:45:42 +0000
commit29a0ad494a84029ad8ed19b94b31c144545cc579 (patch)
tree1f3a5ecdb72354e47dc95f37307a6e2931184a15 /x11-libs/gtk+extra
parentThis is part of dev-embedded/gpsim itself. Blockers will handle uninstalling. (diff)
downloadhistorical-29a0ad494a84029ad8ed19b94b31c144545cc579.tar.gz
historical-29a0ad494a84029ad8ed19b94b31c144545cc579.tar.bz2
historical-29a0ad494a84029ad8ed19b94b31c144545cc579.zip
old
Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/gtk+extra')
-rw-r--r--x11-libs/gtk+extra/ChangeLog9
-rw-r--r--x11-libs/gtk+extra/Manifest34
-rw-r--r--x11-libs/gtk+extra/files/gtk+extra-2.1.2-build.patch246
-rw-r--r--x11-libs/gtk+extra/files/gtk+extra-2.1.2-gtk+-2.21.patch28
-rw-r--r--x11-libs/gtk+extra/files/gtk+extra-2.1.2-itementry-crash.patch17
-rw-r--r--x11-libs/gtk+extra/files/gtk+extra-2.1.2-marshal.patch11
-rw-r--r--x11-libs/gtk+extra/gtk+extra-2.1.2-r1.ebuild42
7 files changed, 29 insertions, 358 deletions
diff --git a/x11-libs/gtk+extra/ChangeLog b/x11-libs/gtk+extra/ChangeLog
index 3c7d52ffd289..74f7d0fce756 100644
--- a/x11-libs/gtk+extra/ChangeLog
+++ b/x11-libs/gtk+extra/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for x11-libs/gtk+extra
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.42 2012/05/05 03:52:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/ChangeLog,v 1.43 2012/08/05 08:45:41 ssuominen Exp $
+
+ 05 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+ -gtk+extra-2.1.2-r1.ebuild, -files/gtk+extra-2.1.2-build.patch,
+ -files/gtk+extra-2.1.2-gtk+-2.21.patch,
+ -files/gtk+extra-2.1.2-itementry-crash.patch,
+ -files/gtk+extra-2.1.2-marshal.patch:
+ old
05 May 2012; Jeff Horelick <jdhore@gentoo.org> gtk+extra-2.1.2-r1.ebuild,
gtk+extra-3.0.1.ebuild:
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
index d54266c47124..c8486eb95788 100644
--- a/x11-libs/gtk+extra/Manifest
+++ b/x11-libs/gtk+extra/Manifest
@@ -1,13 +1,21 @@
-AUX gtk+extra-2.1.2-build.patch 6704 RMD160 b9b8788ed4f347ecb99d785e225813d4b0693966 SHA1 f748a07694869d984be9673408f49ad3bb4242da SHA256 8ecf5526f9ddc04aa58db561eb1e70cfe91540ddf215db0e761135e0bbdb7932
-AUX gtk+extra-2.1.2-gtk+-2.21.patch 990 RMD160 6057209dc703bfb12d12fd3ed7b01aaee2b0c9e7 SHA1 2af3d99e6404b239fb720af39b2a3ffc91d5cf6b SHA256 634dc1f16b85a2902106280fb92f358c5a5fa41c04377d9f7f419e64228d8575
-AUX gtk+extra-2.1.2-itementry-crash.patch 665 RMD160 66964cef9b7dc5997c52be25651d7ecfb4aa61b7 SHA1 c4fb6d7f0534455de6de38aefda8aaa760d9452c SHA256 672149d0061ec2e62c13c5e215afcd9575cfbe6e8f9d345122fcf1c566d34fab
-AUX gtk+extra-2.1.2-marshal.patch 536 RMD160 14602c8e5f6598104c17e3265183281868eb4e69 SHA1 0ee01e2da7ccc6331c6d5e6a4e93c5504bb4399e SHA256 9cfb93fe3e4098ded71987be5e7c363da7c286956751c07da851c8e142300c4c
-AUX gtk+extra-3.0.1-fix-configure.patch 4906 RMD160 180ec1d095680923683df2f7c246bd1b2efa37a4 SHA1 65c5501114e23a7f23c08ecb9e4a69cc197c3e78 SHA256 c7e7f4186d941244ee3a8e299f2372bb0cc2ed66b02a1e3e809dc29b9a324937
-AUX gtk+extra-3.0.1-gunicode.h.patch 377 RMD160 6d1467e8ad7515d43440ace99dcc481b071fe3f6 SHA1 f1ff19162a349b1d00f502b5dfe603e1c9280bcb SHA256 a05ad52b6f701e58c6938884440dd380ecbfa482fef6355ed457fb6d642f44b9
-DIST gtk+extra-2.1.2.tar.gz 1274946 RMD160 e14bfc2a055fdef0d037b494018ca25047cc3c9e SHA1 1b6cccbf89a79c8fe551d77c84dbf21a82c69f07 SHA256 bfc9603e2023ea071f2661ecc29e52c94b1beed6b69deae45b466df7f5b2ce55
-DIST gtk+extra-3.0.1.tar.gz 1378220 RMD160 e8bd1f6d4c5e50beb653b96801b84a049d1fb111 SHA1 ae976fc6809807639d08069119c4ded9e8d38438 SHA256 11ab4a9210a5ff454f1310ee9e93a12422aff524e3c699afe268ec574df7b6d8
-DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
-EBUILD gtk+extra-2.1.2-r1.ebuild 1069 RMD160 e7466de631f209a04ccb4bd9598a650e30913b6d SHA1 59a225de647d791f81d18546646f9bf013f13d06 SHA256 73daf064d34b5a98da7f1f600267d7a7551e8841489fa616182051ba22ce71dc
-EBUILD gtk+extra-3.0.1.ebuild 1421 RMD160 1ab5c8f9307124e92754264bbb5820f650912c0f SHA1 b31c1bfcc59bc33dcbbdd71f3a6a28ac058c9844 SHA256 023610edddeaca84b368777b8e75e7b989254e02b4f6cd7fbb2dbf76434ece2d
-MISC ChangeLog 6561 RMD160 5839a72c455b43bf0c007dd2bf49f2614933dde7 SHA1 90ee780388b3201cf16e688ac777581c91a2c320 SHA256 e25e056c57165031dadf84c1868fbec1649874d43570e27f82b9db57d9757525
-MISC metadata.xml 274 RMD160 8af80b495a9229fed210308d7c40add13039ca68 SHA1 c35820b2533d8a834e346c4fd21e1c2552915ed9 SHA256 624a014a9903b5d6808bad7691e52c0fe3cece7d11062be9b81681d30730f659
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gtk+extra-3.0.1-fix-configure.patch 4906 SHA256 c7e7f4186d941244ee3a8e299f2372bb0cc2ed66b02a1e3e809dc29b9a324937 SHA512 271eca0f821723c6c6cef62aeb2748aa90ed0787a69d7136cae33d9cf06827904922d2d4d25963441ddbc5e058352a742be25f6bb8cc79a9bdf9688502e851eb WHIRLPOOL d7907abb14159fe6551794c9aba1f80fdaa7cf18c022cab2fdc46d6e87eb1f8f5d923701b0074aa63a537e307b614154afe8d0d0f941aea55eaa219f3095f34a
+AUX gtk+extra-3.0.1-gunicode.h.patch 377 SHA256 a05ad52b6f701e58c6938884440dd380ecbfa482fef6355ed457fb6d642f44b9 SHA512 bcf9a2adb081196bb61f9c89810d77d1e3ed94d039ddf8b6968f06409b9e25dd64e13bedd6a19d1a5c85100b2f3c6b9061c72c7d22db50e1c51e15e305d0d94b WHIRLPOOL 06ca578c8d35b184fef9fa36a84d3059923a1f20cb3932e42479a9dc083bb626598316253f4f803c00ec5908909b921a2414b82b19d9be28f839eeed05f1955a
+DIST gtk+extra-3.0.1.tar.gz 1378220 SHA256 11ab4a9210a5ff454f1310ee9e93a12422aff524e3c699afe268ec574df7b6d8 SHA512 446d7fc75bee27962ad6a0feadd3eedc5aa5afc97ccfe77946d4f5cca0b693ca5097c4ae909281d7cbd9e66761a5295e6a022eb91fd04062cb00459fddec94b7 WHIRLPOOL bde439d504052bfa220d7b6b0b3e612e65e39969ba581afa008e936f26c8c3dd2ce767bb692ced99af954a340fffecfd96baeacae05b37a4dd5ca8dab7183f4a
+DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
+EBUILD gtk+extra-3.0.1.ebuild 1421 SHA256 023610edddeaca84b368777b8e75e7b989254e02b4f6cd7fbb2dbf76434ece2d SHA512 c1ad8df747fd9751a4cc2582149ca031233a18a5ba6f50b5057a72efb20068d304e8ecb6e7aa9c1ed5fc1ad1ff9e08623f7cf16a0415e66e77847f3763bf65cc WHIRLPOOL b229a9f85d484da66ca4b8e7c3956f4792db05d26eeb96d50329aab8fa45a3dd718fb23b996b89a9cd0f81b17ba1366c08a8bf40dbc4db90d4b6537739e142ef
+MISC ChangeLog 6821 SHA256 3a5cc896c6af228e9558c5c18c483952035d80f505f625f7d20a509c976a8703 SHA512 2779e20262924a5959eb532796988f8d1f917124229f27cd9694c9abc63cbe231eb2ee49f0752f475efe29a74cbca1fa1e2f008f9f4af0d04c1df756c4d411e0 WHIRLPOOL 538603859ac052d48ee8b534c77e0b15fa7f83bd3068f7c0c456a92d8c92378e0026ed214fb546159df3a94bad8e53c26a736bd77edb96cf7342ac5bfa653c48
+MISC metadata.xml 274 SHA256 624a014a9903b5d6808bad7691e52c0fe3cece7d11062be9b81681d30730f659 SHA512 782696ed4afd8be42b405479308e2dbabc89bdf2fd28f789ff72894b7af395b8157f72642e09cb392bbe078c689635b0ef92935bcb70e32b0fdb14ae1392d48b WHIRLPOOL ec3101f5aac04d41ea11f68d0ab52f0d0e7ad9332586d1d7bc9021844d3c30863ec1a430a877dbb3d94c37b4d3ca45f727e23a978a3b84ccc685905e9c30dfcf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJQHjK4AAoJEEdUh39IaPFNwHUH/A7eetwokUmnS4Kx1Xhfh9JH
+mggbTr4oQVNHDS1/wDqJ7wLimfcM84tskvVEpot4U8Tq77di37ZDiR7F5VDPdbpk
+mY182keVwqbw5eL+3I96pjmOO7pJ9t5lTXIx+/Jhk/Gp08r7ollgjVw+mbyRDTjc
+hVwVYj72G54JEfwl6LZYkUp+q7QcrrySv89dwN5oWXSDUL2EHeKdCurZofPTioHO
+QhFlMuqIHqSBlsvKWpdLhTDGgcI8HPf7pC+4Bz0dwMD3+HKtTyRYZsJJ8UHX9OPF
+YxpGkcWSzbVSzBHJaWp5Ezut4xNqTABNham35Mcd4ikTjrMKbNjWjcKuFnksWEs=
+=M3WD
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-build.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-build.patch
deleted file mode 100644
index 9d931226db00..000000000000
--- a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-build.patch
+++ /dev/null
@@ -1,246 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -30,10 +30,10 @@
- AC_SUBST(GTK_EXTRA_VERSION)
-
- # libtool versioning
--LT_CURRENT=`expr $GTK_EXTRA_MICRO_VERSION - $GTK_EXTRA_INTERFACE_AGE`
--LT_REVISION=$GTK_EXTRA_INTERFACE_AGE
--LT_AGE=`expr $GTK_EXTRA_BINARY_AGE - $GTK_EXTRA_INTERFACE_AGE`
--LIBGTKEXTRA_SO_VERSION=$LT_CURRENT:$LT_REVISION:$LT_AGE
-+LTCURRENT=`expr $GTK_EXTRA_MICRO_VERSION - $GTK_EXTRA_INTERFACE_AGE`
-+LTREVISION=$GTK_EXTRA_INTERFACE_AGE
-+LTAGE=`expr $GTK_EXTRA_BINARY_AGE - $GTK_EXTRA_INTERFACE_AGE`
-+LIBGTKEXTRA_SO_VERSION=$LTCURRENT:$LTREVISION:$LTAGE
- AC_SUBST(LIBGTKEXTRA_SO_VERSION)
-
- # For automake
---- gtkextra/Makefile.am
-+++ gtkextra/Makefile.am
-@@ -54,7 +54,9 @@
- -version-info $(LIBGTKEXTRA_SO_VERSION) \
- -export-dynamic \
- -rpath $(libdir) \
-- $(no_undefined) \
-+ $(no_undefined)
-+
-+LDADD = \
- $(GTK_LIBS)
-
- #
-@@ -63,97 +65,97 @@
-
-
- gtkextra_public_h_sources = \
-- gtkbordercombo.h \
-- gtkcharsel.h \
-- gtkcheckitem.h \
-- gtkcolorcombo.h \
-- gtkcombobutton.h \
-- gtkdirtree.h \
-- gtkextra.h \
-- gtkextrafeatures.h \
-- gtkextraicons.h \
-- gtkextra-marshal.h \
-- gtkextratypebuiltins.h \
-- gtkfilelist.h \
-- gtkfileicons.h \
-- gtkfontcombo.h \
-- gtkiconfilesel.h \
-- gtkiconlist.h \
-- gtkitementry.h \
-- gtkplot.h \
-- gtkplotarray.h \
-- gtkplot3d.h \
-- gtkplotdt.h \
-- gtkplotpolar.h \
-- gtkplotdata.h \
-- gtkplotpixmap.h \
-- gtkplotbar.h \
-- gtkplotbox.h \
-- gtkplotbubble.h \
-- gtkplotcandle.h \
-- gtkplotflux.h \
-- gtkplotsurface.h \
-- gtkplotcsurface.h \
-- gtkplotcanvas.h \
-- gtkplotpc.h \
-- gtkplotgdk.h \
-- gtkplotps.h \
-- gtkplotprint.h \
-- gtkplotsegment.h \
-- gtkpsfont.h \
-- gtksheet.h \
-- gtktogglecombo.h \
-- gtkplotcanvasline.h \
-- gtkplotcanvasrectangle.h \
-- gtkplotcanvasellipse.h \
-- gtkplotcanvastext.h \
-- gtkplotcanvaspixmap.h \
-- gtkplotcanvasplot.h
-+ gtkbordercombo.h \
-+ gtkcharsel.h \
-+ gtkcheckitem.h \
-+ gtkcolorcombo.h \
-+ gtkcombobutton.h \
-+ gtkdirtree.h \
-+ gtkextra.h \
-+ gtkextrafeatures.h \
-+ gtkextraicons.h \
-+ gtkextra-marshal.h \
-+ gtkextratypebuiltins.h \
-+ gtkfilelist.h \
-+ gtkfileicons.h \
-+ gtkfontcombo.h \
-+ gtkiconfilesel.h \
-+ gtkiconlist.h \
-+ gtkitementry.h \
-+ gtkplot.h \
-+ gtkplotarray.h \
-+ gtkplot3d.h \
-+ gtkplotdt.h \
-+ gtkplotpolar.h \
-+ gtkplotdata.h \
-+ gtkplotpixmap.h \
-+ gtkplotbar.h \
-+ gtkplotbox.h \
-+ gtkplotbubble.h \
-+ gtkplotcandle.h \
-+ gtkplotflux.h \
-+ gtkplotsurface.h \
-+ gtkplotcsurface.h \
-+ gtkplotcanvas.h \
-+ gtkplotpc.h \
-+ gtkplotgdk.h \
-+ gtkplotps.h \
-+ gtkplotprint.h \
-+ gtkplotsegment.h \
-+ gtkpsfont.h \
-+ gtksheet.h \
-+ gtktogglecombo.h \
-+ gtkplotcanvasline.h \
-+ gtkplotcanvasrectangle.h \
-+ gtkplotcanvasellipse.h \
-+ gtkplotcanvastext.h \
-+ gtkplotcanvaspixmap.h \
-+ gtkplotcanvasplot.h
-
- gtkextra_c_sources = \
-- gtkbordercombo.c \
-- gtkcharsel.c \
-- gtkcheckitem.c \
-- gtkcolorcombo.c \
-- gtkcombobutton.c \
-- gtkdirtree.c \
-- gtkextra.c \
-- gtkextra-marshal.c \
-- gtkextratypebuiltins.c \
-- gtkfilelist.c \
-- gtkfontcombo.c \
-- gtkiconlist.c \
-- gtkitementry.c \
-- gtkiconfilesel.c \
-- gtkplot.c \
-- gtkplotarray.c \
-- gtkplot3d.c \
-- gtkplotdt.c \
-- gtkplotpolar.c \
-- gtkplotdata.c \
-- gtkplotpixmap.c \
-- gtkplotbar.c \
-- gtkplotbox.c \
-- gtkplotbubble.c \
-- gtkplotcandle.c \
-- gtkplotflux.c \
-- gtkplotsurface.c \
-- gtkplotcsurface.c \
-- gtkplotcanvas.c \
-- gtkplotpc.c \
-- gtkplotgdk.c \
-- gtkplotps.c \
-- gtkplotprint.c \
-- gtkplotsegment.c \
-- gtkpsfont.c \
-- gtksheet.c \
-- gtktogglecombo.c \
-- gtkplotcanvasline.c \
-- gtkplotcanvasrectangle.c \
-- gtkplotcanvasellipse.c \
-- gtkplotcanvastext.c \
-- gtkplotcanvaspixmap.c \
-- gtkplotcanvasplot.c
-+ gtkbordercombo.c \
-+ gtkcharsel.c \
-+ gtkcheckitem.c \
-+ gtkcolorcombo.c \
-+ gtkcombobutton.c \
-+ gtkdirtree.c \
-+ gtkextra.c \
-+ gtkextra-marshal.c \
-+ gtkextratypebuiltins.c \
-+ gtkfilelist.c \
-+ gtkfontcombo.c \
-+ gtkiconlist.c \
-+ gtkitementry.c \
-+ gtkiconfilesel.c \
-+ gtkplot.c \
-+ gtkplotarray.c \
-+ gtkplot3d.c \
-+ gtkplotdt.c \
-+ gtkplotpolar.c \
-+ gtkplotdata.c \
-+ gtkplotpixmap.c \
-+ gtkplotbar.c \
-+ gtkplotbox.c \
-+ gtkplotbubble.c \
-+ gtkplotcandle.c \
-+ gtkplotflux.c \
-+ gtkplotsurface.c \
-+ gtkplotcsurface.c \
-+ gtkplotcanvas.c \
-+ gtkplotpc.c \
-+ gtkplotgdk.c \
-+ gtkplotps.c \
-+ gtkplotprint.c \
-+ gtkplotsegment.c \
-+ gtkpsfont.c \
-+ gtksheet.c \
-+ gtktogglecombo.c \
-+ gtkplotcanvasline.c \
-+ gtkplotcanvasrectangle.c \
-+ gtkplotcanvasellipse.c \
-+ gtkplotcanvastext.c \
-+ gtkplotcanvaspixmap.c \
-+ gtkplotcanvasplot.c
-
- gtkextra_private_h_sources = \
- icons.h \
-@@ -169,7 +171,7 @@
- gtkextrafeatures.h.in \
- gtkextra-marshal.list
-
--INCLUDES = -I$(top_buildir) -I$(top_srcdir) $(GTK_CFLAGS)
-+INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(GTK_CFLAGS)
-
- # target platform:
- lib_LTLIBRARIES = $(gtkextratargetlib)
-@@ -197,13 +199,13 @@
- $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers}
-
- $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list
-- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
-- && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
-- || ( rm -f gtkextra-marshal.tmp && exit 1 )
-+ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \
-+ && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \
-+ || ( rm -f gtkextra-marshal.tmp && exit 1 )
- $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h
-- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
-- && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
-- || ( rm -f gtkextra-marshal.tmp && exit 1 )
-+ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \
-+ && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \
-+ || ( rm -f gtkextra-marshal.tmp && exit 1 )
-
-
- $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources)
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-gtk+-2.21.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-gtk+-2.21.patch
deleted file mode 100644
index 50b2a8e628ea..000000000000
--- a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-gtk+-2.21.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- gtkextra/gtkitementry.c
-+++ gtkextra/gtkitementry.c
-@@ -131,7 +131,9 @@
- static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry,
- gboolean include_preedit);
- static void gtk_entry_queue_draw (GtkEntry *entry);
-+#if GTK_CHECK_VERSION(2,21,0) == 0
- static void gtk_entry_reset_im_context (GtkEntry *entry);
-+#endif
- static void gtk_entry_recompute (GtkEntry *entry);
- static void gtk_entry_get_cursor_locations (GtkEntry *entry,
- CursorType type,
-@@ -1754,6 +1756,7 @@
- gdk_window_invalidate_rect (entry->text_area, NULL, FALSE);
- }
-
-+#if GTK_CHECK_VERSION(2,21,0) == 0
- static void
- gtk_entry_reset_im_context (GtkEntry *entry)
- {
-@@ -1763,6 +1766,7 @@
- gtk_im_context_reset (entry->im_context);
- }
- }
-+#endif
-
- static void
- gtk_entry_get_cursor_locations (GtkEntry *entry,
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-itementry-crash.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-itementry-crash.patch
deleted file mode 100644
index 56a9786161db..000000000000
--- a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-itementry-crash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- gtkextra/gtkitementry.c 2011-02-02 13:36:17.402632207 +1100
-+++ gtkextra/gtkitementry.c 2011-02-02 17:20:26.305418034 +1100
-@@ -778,11 +778,12 @@
- memcpy (entry->text + index, new_text, new_text_length);
- #endif //GTK_TYPE_ENTRY_BUFFER
-
-- ientry->item_n_bytes += new_text_length;
-- entry->text_length += n_chars;
-+ if (new_text_length + *position > ientry->item_n_bytes)
-+ ientry->item_n_bytes = new_text_length + *position;
-
- /* NUL terminate for safety and convenience */
- entry->text[ientry->item_n_bytes] = '\0';
-+ entry->text_length = strlen(entry->text);
-
- if (entry->current_pos > *position)
- entry->current_pos += n_chars;
diff --git a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-marshal.patch b/x11-libs/gtk+extra/files/gtk+extra-2.1.2-marshal.patch
deleted file mode 100644
index 5790fbbb7a70..000000000000
--- a/x11-libs/gtk+extra/files/gtk+extra-2.1.2-marshal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtkextra/gtkcolorcombo.c
-+++ gtkextra/gtkcolorcombo.c
-@@ -146,7 +146,7 @@
- GTK_CLASS_TYPE(object_class),
- GTK_SIGNAL_OFFSET(GtkColorComboClass,
- changed),
-- gtkextra_VOID__INT_BOXED,
-+ gtkextra_VOID__BOXED_BOXED,
- GTK_TYPE_NONE,
- 2, GTK_TYPE_INT, GDK_TYPE_COLOR);
-
diff --git a/x11-libs/gtk+extra/gtk+extra-2.1.2-r1.ebuild b/x11-libs/gtk+extra/gtk+extra-2.1.2-r1.ebuild
deleted file mode 100644
index fa5663d4ad1c..000000000000
--- a/x11-libs/gtk+extra/gtk+extra-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+extra/gtk+extra-2.1.2-r1.ebuild,v 1.6 2012/05/05 03:52:24 jdhore Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="Useful Additional GTK+ widgets"
-HOMEPAGE="http://gtkextra.sourceforge.net"
-SRC_URI="mirror://sourceforge/gtkextra/${P}.tar.gz"
-
-LICENSE="FDL-1.1 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE="static-libs"
-
-RDEPEND="x11-libs/gtk+:2
- dev-libs/glib:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-marshal.patch \
- "${FILESDIR}"/${P}-gtk+-2.21.patch \
- "${FILESDIR}"/${P}-itementry-crash.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- $(use_enable static-libs static) \
- --with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog README || die
- find "${ED}" -name '*.la' -exec rm -f '{}' + || die
-}