old

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

6 files changed, 8 insertions, 345 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/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
-}