Version bump, mainly a bug fix and maintenance release. Remove old versions

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

7 files changed, 14 insertions, 234 deletions

diff --git a/gnustep-apps/terminal/ChangeLog b/gnustep-apps/terminal/ChangeLog
index b85ac4aaac2e..cba66874e454 100644
--- a/gnustep-apps/terminal/ChangeLog
+++ b/gnustep-apps/terminal/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/terminal
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/ChangeLog,v 1.27 2012/06/07 18:38:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/ChangeLog,v 1.28 2012/06/07 23:17:04 voyageur Exp $
+
+*terminal-0.9.8 (07 Jun 2012)
+
+  07 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -terminal-0.9.5_pre20060324-r1.ebuild, -terminal-0.9.5.ebuild,
+  -files/terminal-0.9.5_pre20060324-gnustep-base1.15.patch,
+  -files/terminal-0.9.5_pre20060324-size_t.patch,
+  -files/terminal-0.9.5_pre20060324-solaris.patch, -terminal-0.9.6.ebuild,
+  +terminal-0.9.8.ebuild:
+  Version bump, mainly a bug fix and maintenance release. Remove old versions
 
   07 Jun 2012; Michael Weber <xmw@gentoo.org> terminal-0.9.7.ebuild:
   ppc stable (bug 397049)
diff --git a/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-gnustep-base1.15.patch b/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-gnustep-base1.15.patch
deleted file mode 100644
index e58968ef7cef..000000000000
--- a/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-gnustep-base1.15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Terminal/TerminalViewPrefs.m.orig	2007-12-10 10:54:08.000000000 +0100
-+++ Terminal/TerminalViewPrefs.m	2007-12-10 10:54:12.000000000 +0100
-@@ -15,6 +15,7 @@
- #include <AppKit/NSColorPanel.h>
- #include <AppKit/NSColorWell.h>
- #include <AppKit/NSFont.h>
-+#include <AppKit/NSFontManager.h>
- #include <AppKit/NSGraphics.h>
- #include <AppKit/NSImage.h>
- #include <AppKit/NSTextField.h>
diff --git a/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-size_t.patch b/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-size_t.patch
deleted file mode 100644
index aededf2b7e1e..000000000000
--- a/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-size_t.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Terminal/TerminalParser_Linux.h
-+++ Terminal/TerminalParser_Linux.h
-@@ -31,7 +31,7 @@
- 	int utf_count;
- 
- 	unsigned char input_buf[16];
--	int input_buf_len;
-+	size_t input_buf_len;
- 
- #define TITLE_BUF_SIZE 255
- 	char title_buf[TITLE_BUF_SIZE+1];
---- Terminal/TerminalParser_Linux.m
-+++ Terminal/TerminalParser_Linux.m
-@@ -1118,9 +1118,9 @@
- 			screen_char_t ch;
- 
- 			char *inp;
--			int in_size;
-+			size_t in_size;
- 			char *outp;
--			int out_size;
-+			size_t out_size;
- 			int char_width;
- 
- 			int ret;
-@@ -1211,10 +1211,10 @@
- 	if (iconv_input_state)
- 	{
- 		unsigned int *inp;
--		int insize;
-+		size_t insize;
- 		char *outp;
- 		char buf[16+1];
--		int outsize;
-+		size_t outsize;
- 		int ret;
- 	
- 		for (i=0;i<l;i++)
diff --git a/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-solaris.patch b/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-solaris.patch
deleted file mode 100644
index 678205859a96..000000000000
--- a/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-solaris.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- GNUmakefile
-+++ GNUmakefile
-@@ -44,7 +44,10 @@
- 	\
- 	Label.m
- 
--Terminal_LDFLAGS = -lutil
-+ifeq ($(findstring gnu, $(GNUSTEP_TARGET_OS)), gnu)
-+	# for forkpty on Linux
-+	Terminal_LDFLAGS = -lutil
-+endif
- 
- Terminal_LOCALIZED_RESOURCE_FILES = Localizable.strings
- Terminal_LANGUAGES = English Swedish German French Spanish Hungarian Turkish \
---- TerminalView.m
-+++ TerminalView.m
-@@ -38,9 +38,11 @@
- #include <fcntl.h>
- #ifndef freebsd
- #ifndef __NetBSD__
-+#if !defined(solaris2)
- #  include <pty.h>
- #endif
- #endif
-+#endif
- 
- #include <Foundation/NSBundle.h>
- #include <Foundation/NSDebug.h>
-@@ -1692,6 +1692,91 @@
- 	master_fd=-1;
- }
- 
-+#if defined(solaris2)
-+#include <stdlib.h> 
-+#include <unistd.h> 
-+#include <fcntl.h> 
-+#include <sys/ioctl.h> 
-+#include <sys/stream.h> 
-+#include <sys/stropts.h> 
-+#include <sys/syscall.h>
-+#include <stdio.h>
-+#include <errno.h>
-+
-+#define forkpty my_forkpty
-+
-+/**
-+ * fork_pty() remplacement for Solaris, it ignores the last two
-+ * arguments for the moment.
-+ * http://bugs.mysql.com/bug.php?id=22429
-+ */ 
-+static int my_forkpty (int *amaster, 
-+		char *name, 
-+		void *unused1, 
-+		void *unused2) 
-+{ 
-+	int master, slave; 
-+	char *slave_name; 
-+	pid_t pid; 
-+
-+	master = open("/dev/ptmx", O_RDWR); 
-+	if (master < 0) 
-+		return -1; 
-+
-+	if (grantpt(master) < 0) { 
-+		close (master); 
-+		return -1; 
-+	} 
-+
-+	if (unlockpt(master) < 0) { 
-+		close (master); 
-+		return -1; 
-+	} 
-+
-+	slave_name = ptsname(master); 
-+	if (slave_name == NULL) { 
-+		close (master); 
-+		return -1; 
-+	} 
-+
-+	slave = open(slave_name, O_RDWR); 
-+	if (slave < 0) { 
-+		close (master); 
-+		return -1; 
-+	} 
-+
-+	if (ioctl(slave, I_PUSH, "ptem") < 0 ||
-+			ioctl(slave, I_PUSH, "ldterm") < 0) 
-+	{ 
-+		close (slave); 
-+		close (master); 
-+		return -1; 
-+	} 
-+
-+	if (amaster) 
-+		*amaster = master; 
-+
-+	if (name) 
-+		strcpy (name, slave_name); 
-+
-+	pid = fork(); 
-+	switch (pid) { 
-+		case -1: /* Error */ 
-+			return -1; 
-+		case 0: /* Child */ 
-+			close(master); 
-+			dup2(slave, STDIN_FILENO); 
-+			dup2(slave, STDOUT_FILENO); 
-+			dup2(slave, STDERR_FILENO); 
-+			return 0; 
-+		default: /* Parent */ 
-+			close (slave); 
-+			return pid; 
-+	} 
-+
-+	return -1; 
-+}
-+#endif
- 
- -(void) runProgram: (NSString *)path
- 	withArguments: (NSArray *)args
diff --git a/gnustep-apps/terminal/terminal-0.9.5.ebuild b/gnustep-apps/terminal/terminal-0.9.5.ebuild
deleted file mode 100644
index 4c3c11338438..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.5.ebuild,v 1.2 2011/08/05 11:55:22 ssuominen Exp $
-
-EAPI=2
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="http://savannah.nongnu.org/download/gap/${P/t/T}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!x11-terms/terminal" #376257
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.5_pre20060324-size_t.patch
-	# Correct link command for --as-needed
-	sed -i -e "s/Terminal_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die "sed failed"
-}
diff --git a/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild b/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild
deleted file mode 100644
index f977b925d44b..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild,v 1.7 2011/08/05 11:55:22 ssuominen Exp $
-
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!x11-terms/terminal" #376257
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# on Solaris -lutil doesn't exist, which hence doesn't provide forkpty
-	epatch "${FILESDIR}"/${P}-solaris.patch
-	epatch "${FILESDIR}"/${P}-size_t.patch
-	epatch "${FILESDIR}"/${P}-gnustep-base1.15.patch
-	# Correct link command for --as-needed
-	sed -i -e "s/Terminal_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die "sed failed"
-}
diff --git a/gnustep-apps/terminal/terminal-0.9.6.ebuild b/gnustep-apps/terminal/terminal-0.9.8.ebuild
index b288d5e57163..e191406e6c4f 100644
--- a/gnustep-apps/terminal/terminal-0.9.6.ebuild
+++ b/gnustep-apps/terminal/terminal-0.9.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.6.ebuild,v 1.2 2011/08/05 11:55:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/terminal-0.9.8.ebuild,v 1.1 2012/06/07 23:17:04 voyageur Exp $
 
-EAPI=2
+EAPI=4
 
 inherit gnustep-2
 
@@ -19,8 +19,3 @@ IUSE=""
 
 RDEPEND="!x11-terms/terminal" #376257
 DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Correct link command for --as-needed
-	sed -i -e "s/Terminal_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die "sed failed"
-}