Version bump from the GNUstep overlay

Package-Manager: portage-2.1.3.9

10 files changed, 215 insertions, 86 deletions

diff --git a/gnustep-apps/terminal/ChangeLog b/gnustep-apps/terminal/ChangeLog
index 8c2f354d3933..4785a6d3cf98 100644
--- a/gnustep-apps/terminal/ChangeLog
+++ b/gnustep-apps/terminal/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnustep-apps/terminal
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/ChangeLog,v 1.14 2007/08/22 16:56:18 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/terminal/ChangeLog,v 1.15 2007/09/10 18:31:28 voyageur Exp $
+
+*terminal-0.9.5_pre20060324-r1 (10 Sep 2007)
+
+  10 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/terminal-0.9.5_pre20060324-size_t.patch,
+  +files/terminal-0.9.5_pre20060324-solaris.patch,
+  -terminal-0.9.5_pre20050315.ebuild, -terminal-0.9.5_pre20060324.ebuild,
+  +terminal-0.9.5_pre20060324-r1.ebuild:
+  Version bump from the GNUstep overlay
+  Remove old versions
 
   22 Aug 2007; Christoph Mende <angelos@gentoo.org>
   terminal-0.9.5_pre20060324.ebuild:
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
index 49ec99ac7622..b1c05bb576a7 100644
--- a/gnustep-apps/terminal/Manifest
+++ b/gnustep-apps/terminal/Manifest
@@ -1,32 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-EBUILD terminal-0.9.5_pre20050315.ebuild 834 RMD160 b4dfb70b6bbaa35a90d6c2accac827cbb2aa1a06 SHA1 752f1b9249934c5172cdcbfb1472f585f62aceba SHA256 da58b7a47f43361f29ffbbf229f86cd09d891307e88dfc64cc8dd88549a06f11
-MD5 e1fb2a389b1e0fe45efd9f99fc6d7819 terminal-0.9.5_pre20050315.ebuild 834
-RMD160 b4dfb70b6bbaa35a90d6c2accac827cbb2aa1a06 terminal-0.9.5_pre20050315.ebuild 834
-SHA256 da58b7a47f43361f29ffbbf229f86cd09d891307e88dfc64cc8dd88549a06f11 terminal-0.9.5_pre20050315.ebuild 834
-EBUILD terminal-0.9.5_pre20060324.ebuild 850 RMD160 554683c56ddeed1f60f58eb867b5f11ebcae512b SHA1 a4f6a043a4aca1e6ed8fa4eec6fc2a2f854ce012 SHA256 b08aa0c80672bc17db6d45e0fbf82d5f438ec12cda4bd4aa75e91ca509866c5a
-MD5 cc92e28da051aabeb0083dbc8015a05f terminal-0.9.5_pre20060324.ebuild 850
-RMD160 554683c56ddeed1f60f58eb867b5f11ebcae512b terminal-0.9.5_pre20060324.ebuild 850
-SHA256 b08aa0c80672bc17db6d45e0fbf82d5f438ec12cda4bd4aa75e91ca509866c5a terminal-0.9.5_pre20060324.ebuild 850
-MISC ChangeLog 3457 RMD160 b73a5bf886300e50844c1b8eee66c985a6be51cf SHA1 1d73c5ab6fda7a1a5c2bfda46e79ef55f9a7e624 SHA256 ac533f284136e0c4fd982b98177a815fd3394faa8c78edf8081f36d0d7fc611b
-MD5 ea91255b167c8acb164655b2cda9409e ChangeLog 3457
-RMD160 b73a5bf886300e50844c1b8eee66c985a6be51cf ChangeLog 3457
-SHA256 ac533f284136e0c4fd982b98177a815fd3394faa8c78edf8081f36d0d7fc611b ChangeLog 3457
+AUX terminal-0.9.5_pre20060324-size_t.patch 724 RMD160 6fecfd58e5d109e35bd96ac31f21f0b026df982d SHA1 fd54041589b3c9b565a20c152e71ba2343be8b72 SHA256 4134baf8a415dd9b46274f6be7ab0663c1ee150be3dc0b56d876228f19cc6ab5
+MD5 f9d1f7007ac5fa1bb37e44349fdf66b0 files/terminal-0.9.5_pre20060324-size_t.patch 724
+RMD160 6fecfd58e5d109e35bd96ac31f21f0b026df982d files/terminal-0.9.5_pre20060324-size_t.patch 724
+SHA256 4134baf8a415dd9b46274f6be7ab0663c1ee150be3dc0b56d876228f19cc6ab5 files/terminal-0.9.5_pre20060324-size_t.patch 724
+AUX terminal-0.9.5_pre20060324-solaris.patch 2270 RMD160 a1183a07a9f9b55586b32cec1ef6686ad86c8dee SHA1 f439e3687c477a0c6d0a77a79777d6de4fb1f786 SHA256 7c5687b7ca3231bbfd91daf6a29233e203fbaab72558d8a46c9b6e17653b57d8
+MD5 b4dec75ddfe9db4eea15d8a86103fe39 files/terminal-0.9.5_pre20060324-solaris.patch 2270
+RMD160 a1183a07a9f9b55586b32cec1ef6686ad86c8dee files/terminal-0.9.5_pre20060324-solaris.patch 2270
+SHA256 7c5687b7ca3231bbfd91daf6a29233e203fbaab72558d8a46c9b6e17653b57d8 files/terminal-0.9.5_pre20060324-solaris.patch 2270
+DIST terminal-0.9.5_pre20060324.tar.bz2 64141 RMD160 c38df5e80b705c349370165db7ff49398894e167 SHA1 1f3e550314c8648004391dafa99d14b2e330ad2d SHA256 7a893eaefcfa80b89fbf083899d7b6ebc85ce6e3559d62b946a7b8ca685680e4
+EBUILD terminal-0.9.5_pre20060324-r1.ebuild 673 RMD160 82362221a5e4b2b069e7e136570ed0990293a6fc SHA1 f6c13dc5a039ba4df87e3d9cf68bd9d8c57aedbe SHA256 40a98040ef16f49f9dfc99bb0bd5567b47a6ee7423ca6fdd6db9ae4517258f49
+MD5 18787b8791397bae2a7a8a992536eb87 terminal-0.9.5_pre20060324-r1.ebuild 673
+RMD160 82362221a5e4b2b069e7e136570ed0990293a6fc terminal-0.9.5_pre20060324-r1.ebuild 673
+SHA256 40a98040ef16f49f9dfc99bb0bd5567b47a6ee7423ca6fdd6db9ae4517258f49 terminal-0.9.5_pre20060324-r1.ebuild 673
+MISC ChangeLog 3838 RMD160 886be8c5e0fbdd4e26805f87ae05102957428380 SHA1 c61ecf0b318845e612a854ee79fcc4dc5a14c88b SHA256 7b8c399490085d68ac41cd95a61823f54d6f241fe5799ba27eb5fabb84cd3cd0
+MD5 b1e9bbecde4bbb6becd947377ceab425 ChangeLog 3838
+RMD160 886be8c5e0fbdd4e26805f87ae05102957428380 ChangeLog 3838
+SHA256 7b8c399490085d68ac41cd95a61823f54d6f241fe5799ba27eb5fabb84cd3cd0 ChangeLog 3838
 MISC metadata.xml 306 RMD160 ef0ef7e6ae9a78330b131dd9fad394234f5e71a0 SHA1 b58bdb99fa625354e973f32d756019f62cb56021 SHA256 1cc3d55bb1dfc32ff10d088c87c7575b01995c2df075a28be159d75eaa6f780f
 MD5 a2c324214d774ac36ba35cf62ede14fb metadata.xml 306
 RMD160 ef0ef7e6ae9a78330b131dd9fad394234f5e71a0 metadata.xml 306
 SHA256 1cc3d55bb1dfc32ff10d088c87c7575b01995c2df075a28be159d75eaa6f780f metadata.xml 306
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-terminal-0.9.5_pre20050315 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-terminal-0.9.5_pre20050315 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-terminal-0.9.5_pre20050315 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-terminal-0.9.5_pre20060324 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-terminal-0.9.5_pre20060324 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-terminal-0.9.5_pre20060324 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFGzGq4KhnDs22gwa8RAoCCAKCWU0/Rd9q9t4UTNdAbFN15kk7SmwCgnc99
-ejybFVEImNseBB4QvYODU0o=
-=m+p/
------END PGP SIGNATURE-----
+MD5 b717893952577a4ddd08e2ed9170ba57 files/digest-terminal-0.9.5_pre20060324-r1 280
+RMD160 41b9a446cf4fff2c676f6383faea84005c901c77 files/digest-terminal-0.9.5_pre20060324-r1 280
+SHA256 6846213fa2f08baf52cf87c83ad109afa5869edc1e94501d05e868aa44c7ffa2 files/digest-terminal-0.9.5_pre20060324-r1 280
diff --git a/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20050315 b/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20050315
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20050315
+++ /dev/null
diff --git a/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324 b/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324
+++ /dev/null
diff --git a/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324-r1 b/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324-r1
new file mode 100644
index 000000000000..54fae14c7d94
--- /dev/null
+++ b/gnustep-apps/terminal/files/digest-terminal-0.9.5_pre20060324-r1
@@ -0,0 +1,3 @@
+MD5 306072aee8ffaa4eb496181a82cbf981 terminal-0.9.5_pre20060324.tar.bz2 64141
+RMD160 c38df5e80b705c349370165db7ff49398894e167 terminal-0.9.5_pre20060324.tar.bz2 64141
+SHA256 7a893eaefcfa80b89fbf083899d7b6ebc85ce6e3559d62b946a7b8ca685680e4 terminal-0.9.5_pre20060324.tar.bz2 64141
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
new file mode 100644
index 000000000000..aededf2b7e1e
--- /dev/null
+++ b/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-size_t.patch
@@ -0,0 +1,38 @@
+--- 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
new file mode 100644
index 000000000000..678205859a96
--- /dev/null
+++ b/gnustep-apps/terminal/files/terminal-0.9.5_pre20060324-solaris.patch
@@ -0,0 +1,120 @@
+--- 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_pre20050315.ebuild b/gnustep-apps/terminal/terminal-0.9.5_pre20050315.ebuild
deleted file mode 100644
index e9617a19eeef..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.5_pre20050315.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 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_pre20050315.ebuild,v 1.3 2006/03/25 23:02:30 grobian Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="cvs.savannah.nongnu.org:/sources/backbone"
-ECVS_USER="anoncvs"
-ECVS_PASS="anoncvs"
-ECVS_AUTH="pserver"
-ECVS_MODULE="System"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/cvs.savannah.nongnu.org-backbone"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}/Applications/${PN/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-DEPEND="${GS_DEPEND}"
-RDEPEND="${GS_RDEPEND}"
-
-egnustep_install_domain "System"
diff --git a/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild b/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild
new file mode 100644
index 000000000000..a32ca3555197
--- /dev/null
+++ b/gnustep-apps/terminal/terminal-0.9.5_pre20060324-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2007 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.1 2007/09/10 18:31:28 voyageur 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"
+
+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
+}
diff --git a/gnustep-apps/terminal/terminal-0.9.5_pre20060324.ebuild b/gnustep-apps/terminal/terminal-0.9.5_pre20060324.ebuild
deleted file mode 100644
index 185ac27b0ec8..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.5_pre20060324.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 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.ebuild,v 1.3 2007/08/22 16:56:18 angelos Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="cvs.savannah.nongnu.org:/sources/backbone"
-ECVS_USER="anoncvs"
-ECVS_PASS="anoncvs"
-ECVS_AUTH="pserver"
-ECVS_MODULE="System"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/cvs.savannah.nongnu.org-backbone"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}/Applications/${PN/t/T}
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-DEPEND="${GS_DEPEND}"
-RDEPEND="${GS_RDEPEND}"
-
-egnustep_install_domain "System"