New revision, including a patch for bug #91617 (no lazy bindings for a setgid binary). Cleaning old ebuilds/patches.

(Portage version: 2.0.51.22-r2)

10 files changed, 43 insertions, 121 deletions

diff --git a/x11-libs/vte/ChangeLog b/x11-libs/vte/ChangeLog
index b244a3dd30da..c68656d3618d 100644
--- a/x11-libs/vte/ChangeLog
+++ b/x11-libs/vte/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/vte
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.77 2005/07/11 23:11:04 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/ChangeLog,v 1.78 2005/07/20 21:51:45 leonardop Exp $
+
+*vte-0.11.13-r2 (20 Jul 2005)
+
+  20 Jul 2005; Leonardo Boshell <leonardop@gentoo.org>
+  vte-0.11.13-r2.ebuild, files/vte-no_lazy_bindings.patch:
+  Added patch to avoid lazy bindings in gnome-pty-helper, as it's a setgid
+  binary. See bug #91617.
 
   11 Jul 2005; Stephen P. Becker <geoman@gentoo.org> vte-0.11.12.ebuild,
   vte-0.11.13-r1.ebuild:
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 2281062145d9..5a4dfcb83284 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -1,17 +1,15 @@
-MD5 d0c57ce50e880834f9c24e229ac26232 vte-0.11.11-r3.ebuild 1074
-MD5 feb3ddbf7088e92fe5662bdbeae17118 vte-0.11.12.ebuild 943
-MD5 00cf4dc1e2ecab5e9973f68840f2fed4 vte-0.11.13-r1.ebuild 1111
-MD5 ddd6e7926bc9e07a4cda867cbae55525 vte-0.11.11-r2.ebuild 881
-MD5 3e44539848e57907d28517c740ac02d0 vte-0.11.13.ebuild 1025
 MD5 e4c0c98c1de346792807d9563908dcfd ChangeLog 9051
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234
-MD5 76c3c0d2bc006fe4de452fd3f0c26e45 files/digest-vte-0.11.11-r2 64
-MD5 76c3c0d2bc006fe4de452fd3f0c26e45 files/digest-vte-0.11.11-r3 64
+MD5 00cf4dc1e2ecab5e9973f68840f2fed4 vte-0.11.13-r1.ebuild 1111
+MD5 feb3ddbf7088e92fe5662bdbeae17118 vte-0.11.12.ebuild 943
+MD5 a97341f7f25a9dbc0aaf009055efa6ea vte-0.11.13-r2.ebuild 1306
+MD5 ddd6e7926bc9e07a4cda867cbae55525 vte-0.11.11-r2.ebuild 881
 MD5 41b41aaa36ba84805514d34f2d9b491f files/digest-vte-0.11.13-r1 64
 MD5 f8d6220ac03de9b337c4b0ec5243f55f files/vte-0.11.13-memory_fix.patch 7661
-MD5 a7aa4ac7847db18d6ffa62fd957f152e files/vte-0.11.11-vtemodule.patch 445
+MD5 41b41aaa36ba84805514d34f2d9b491f files/digest-vte-0.11.13-r2 64
+MD5 76c3c0d2bc006fe4de452fd3f0c26e45 files/digest-vte-0.11.11-r2 64
+MD5 31acc289fb190f9bdd0285147233eee0 files/vte-no_lazy_bindings.patch 419
 MD5 38c957d83d560c18819204fe28c3c1ae files/vte-0.11.11-spaces.patch 15370
+MD5 a7aa4ac7847db18d6ffa62fd957f152e files/vte-0.11.11-vtemodule.patch 445
+MD5 3805528034f3d01fa27e24f600618c0d files/vte-line-scroll.patch 2234
 MD5 18e062a775ab3d1b9bb67830755399e4 files/digest-vte-0.11.12 64
-MD5 41b41aaa36ba84805514d34f2d9b491f files/digest-vte-0.11.13 64
-MD5 e88adf7f30513086f097d4940e99d03e files/vte-0.11.11-row_fix.patch 697
diff --git a/x11-libs/vte/files/digest-vte-0.11.11-r3 b/x11-libs/vte/files/digest-vte-0.11.11-r3
deleted file mode 100644
index d80d9702c408..000000000000
--- a/x11-libs/vte/files/digest-vte-0.11.11-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d7a3674df5b8be7f1adffa981c1fc3d vte-0.11.11.tar.bz2 888405
diff --git a/x11-libs/vte/files/digest-vte-0.11.13-r1 b/x11-libs/vte/files/digest-vte-0.11.13-r1
deleted file mode 100644
index ab46fcf06fb0..000000000000
--- a/x11-libs/vte/files/digest-vte-0.11.13-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5eb73c7de433fb6e53ac4378df9d23b5 vte-0.11.13.tar.bz2 952108
diff --git a/x11-libs/vte/files/digest-vte-0.11.13 b/x11-libs/vte/files/digest-vte-0.11.13-r2
index ab46fcf06fb0..ab46fcf06fb0 100644
--- a/x11-libs/vte/files/digest-vte-0.11.13
+++ b/x11-libs/vte/files/digest-vte-0.11.13-r2
diff --git a/x11-libs/vte/files/vte-0.11.11-row_fix.patch b/x11-libs/vte/files/vte-0.11.11-row_fix.patch
deleted file mode 100644
index cf89ff195b0b..000000000000
--- a/x11-libs/vte/files/vte-0.11.11-row_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-? .vte.c.swp
-? diff
-? diff2
-Index: vte.c
-===================================================================
-RCS file: /cvs/gnome/vte/src/vte.c,v
-retrieving revision 1.404
-diff -u -3 -p -r1.404 vte.c
---- vte.c	2 May 2004 06:43:01 -0000	1.404
-+++ vte.c	17 Aug 2004 21:08:50 -0000
-@@ -705,11 +705,11 @@ vte_terminal_scroll_region(VteTerminal *
- 		if (delta > 0) {
- 			vte_invalidate_cells(terminal,
- 					     0, terminal->column_count,
--					     0, delta);
-+					     row, delta);
- 		} else {
- 			vte_invalidate_cells(terminal,
- 					     0, terminal->column_count,
--					     terminal->row_count + delta,
-+					     row + terminal->row_count + delta,
- 					     -delta);
- 		}
- 		repaint = FALSE;
diff --git a/x11-libs/vte/files/vte-no_lazy_bindings.patch b/x11-libs/vte/files/vte-no_lazy_bindings.patch
new file mode 100644
index 000000000000..a93480c9d04f
--- /dev/null
+++ b/x11-libs/vte/files/vte-no_lazy_bindings.patch
@@ -0,0 +1,12 @@
+--- vte-0.11.12/gnome-pty-helper/Makefile.am.orig	2005-05-05 17:14:21.000000000 -0400
++++ vte-0.11.12/gnome-pty-helper/Makefile.am	2005-05-05 17:14:42.000000000 -0400
+@@ -1,7 +1,8 @@
+ libexec_PROGRAMS = gnome-pty-helper
+ 
+ AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@
+-AM_LDFLAGS = @LDFLAGS@ @GLIB_LIBS@
++LAZYLDFLAGS = -Wl,-z,now
++AM_LDFLAGS = @LDFLAGS@ @GLIB_LIBS@ $(LAZYLDFLAGS)
+ 
+ gnome_pty_helper_SOURCES = \
+ 	gnome-pty.h \
diff --git a/x11-libs/vte/vte-0.11.11-r3.ebuild b/x11-libs/vte/vte-0.11.11-r3.ebuild
deleted file mode 100644
index 706a02642dfe..000000000000
--- a/x11-libs/vte/vte-0.11.11-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.11.11-r3.ebuild,v 1.3 2005/01/31 03:35:46 fserb Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Xft powered terminal widget"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64"
-IUSE="doc python"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=x11-libs/pango-1.2
-	python? ( >=dev-python/pygtk-2
-		>=dev-lang/python-2.2 )"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-0.6 )
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS README HACKING INSTALL NEWS TODO ChangeLog"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}-spaces.patch
-	# Apply the, shift-<up,down> scroll one
-	# line at a time patch.
-	epatch ${FILESDIR}/${PN}-line-scroll.patch
-	# add scroll draw fix (#73443)
-	# patch from http://bugzilla.gnome.org/show_bug.cgi?id=122150
-	epatch ${FILESDIR}/${P}-row_fix.patch
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-vtemodule.patch
-}
diff --git a/x11-libs/vte/vte-0.11.13-r1.ebuild b/x11-libs/vte/vte-0.11.13-r2.ebuild
index bd2d7306e831..f198ed7348c6 100644
--- a/x11-libs/vte/vte-0.11.13-r1.ebuild
+++ b/x11-libs/vte/vte-0.11.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.11.13-r1.ebuild,v 1.2 2005/07/11 23:11:04 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.11.13-r2.ebuild,v 1.1 2005/07/20 21:51:45 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -33,10 +33,22 @@ $(use_enable static)"
 src_unpack() {
 	unpack ${A}
 	cd ${S}/src
+
 	# Apply the, shift-<up,down> scroll one
 	# line at a time patch.
 	epatch ${FILESDIR}/${PN}-line-scroll.patch
+
+	cd ${S}
 	# Reduce memory use. See bug #96702.
 	epatch ${FILESDIR}/${P}-memory_fix.patch
-	cd ${S}
+	# Resolve all symbols at execution time for gnome-pty-helper. See bug
+	# #91617.
+	epatch ${FILESDIR}/${PN}-no_lazy_bindings.patch
+
+	cd gnome-pty-helper
+	WANT_AUTOMAKE=1.9
+	einfo "Running aclocal"
+	aclocal || die "Aclocal failed"
+	einfo "Running automake"
+	automake || die "Automake failed"
 }
diff --git a/x11-libs/vte/vte-0.11.13.ebuild b/x11-libs/vte/vte-0.11.13.ebuild
deleted file mode 100644
index 7b6190356846..000000000000
--- a/x11-libs/vte/vte-0.11.13.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/vte/vte-0.11.13.ebuild,v 1.1 2005/06/14 01:34:28 leonardop Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Xft powered terminal widget"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc python static"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2.2
-	>=x11-libs/pango-1.1
-	>=media-libs/freetype-2.0.2
-	media-libs/fontconfig
-	sys-libs/ncurses
-	python? ( >=dev-python/pygtk-2.4
-		>=dev-lang/python-2.2 )
-	virtual/x11"
-
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-0.6 )
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-G2CONF="${G2CONF} $(use_enable debug debugging) $(use_enable python) \
-$(use_enable static)"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/src
-	# Apply the, shift-<up,down> scroll one
-	# line at a time patch.
-	epatch ${FILESDIR}/${PN}-line-scroll.patch
-	cd ${S}
-}