version bump that should solve problems in #8331 #53911 and #54548

5 files changed, 126 insertions, 4 deletions

diff --git a/dev-util/gcvs/ChangeLog b/dev-util/gcvs/ChangeLog
index b8928e0e892b..4c9b51e96b8c 100644
--- a/dev-util/gcvs/ChangeLog
+++ b/dev-util/gcvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/gcvs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/gcvs/ChangeLog,v 1.8 2004/06/25 02:32:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gcvs/ChangeLog,v 1.9 2004/10/17 20:22:52 liquidx Exp $
+
+*gcvs-1.0 (17 Oct 2004)
+
+  17 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/gcvs-1.0-gentoo.patch, +gcvs-1.0.ebuild:
+  version bump with patch for gcc3.4, removed make_configure and use autoconf
+  (#8331,#53911), thanks to Daren Hayward <drak@vodafone.net>
 
 *gcvs-1.0_beta3-r1 (24 Jul 2002)
 
diff --git a/dev-util/gcvs/Manifest b/dev-util/gcvs/Manifest
index fe1796e4612d..a174e78726ad 100644
--- a/dev-util/gcvs/Manifest
+++ b/dev-util/gcvs/Manifest
@@ -1,7 +1,10 @@
-MD5 e594f0558d344ec47d43bca1260d4211 gcvs-1.0_beta3.ebuild 1445
-MD5 7651e920c2802d206983450b10fd614e gcvs-1.0_beta3-r1.ebuild 1547
 MD5 df33a91ac811b2c5f5fac8dcef8faf5c ChangeLog 937
+MD5 7651e920c2802d206983450b10fd614e gcvs-1.0_beta3-r1.ebuild 1547
+MD5 e594f0558d344ec47d43bca1260d4211 gcvs-1.0_beta3.ebuild 1445
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 6a7336f5073178e653bb3a6be16991d9 files/digest-gcvs-1.0_beta3-r1 63
+MD5 d3cb3dca07700f60c615e941f7c2c0c2 gcvs-1.0.ebuild 1550
 MD5 6a7336f5073178e653bb3a6be16991d9 files/digest-gcvs-1.0_beta3 63
+MD5 6a7336f5073178e653bb3a6be16991d9 files/digest-gcvs-1.0_beta3-r1 63
 MD5 25b3544a50e02eadc90e1d04c456d417 files/gcvs-1.0b3-gcc3-gentoo.patch 515
+MD5 8529b8c76ecb8a2304a02cc925185f1e files/gcvs-1.0-gentoo.patch 1465
+MD5 b46de350733aa42dc126b049b44ec87a files/digest-gcvs-1.0 61
diff --git a/dev-util/gcvs/files/digest-gcvs-1.0 b/dev-util/gcvs/files/digest-gcvs-1.0
new file mode 100644
index 000000000000..a823953f779d
--- /dev/null
+++ b/dev-util/gcvs/files/digest-gcvs-1.0
@@ -0,0 +1 @@
+MD5 42eff200593eabfbef3a7e9157d76999 gcvs-1.0.tar.gz 2917708
diff --git a/dev-util/gcvs/files/gcvs-1.0-gentoo.patch b/dev-util/gcvs/files/gcvs-1.0-gentoo.patch
new file mode 100644
index 000000000000..62ccae5d2a84
--- /dev/null
+++ b/dev-util/gcvs/files/gcvs-1.0-gentoo.patch
@@ -0,0 +1,47 @@
+diff -ur gcvs-1.0.orig/cvsunix/configure gcvs-1.0/cvsunix/configure
+--- gcvs-1.0.orig/cvsunix/configure	2004-07-28 14:00:07.945635808 +0000
++++ gcvs-1.0/cvsunix/configure	2004-07-28 13:30:37.855407104 +0000
+@@ -392,6 +392,9 @@
+   -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+     ;;
+ 
++  *=*)
++  ;;
++
+   *)
+     if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+       echo "configure: warning: $ac_option: invalid host type" 1>&2
+
+diff -ur gcvs-1.0.orig/common/UCvsFolders.cpp gcvs-1.0/common/UCvsFolders.cpp
+--- gcvs-1.0.orig/common/UCvsFolders.cpp	2002-08-02 15:05:02.000000000 +0000
++++ gcvs-1.0/common/UCvsFolders.cpp	2004-07-28 13:40:57.947995768 +0000
+@@ -828,7 +828,7 @@
+ 		if(fileView != 0L)
+ 		{
+ 			ASSERT(fileView->IsKindOf(URUNTIME_CLASS(UCvsFiles)));
+-			fileView->ResetView(path);
++			fileView->ResetView(&path);
+ 		}
+ 	}
+ 
+diff -ur gcvs-1.0.orig/common/UCvsFiles.cpp gcvs-1.0/common/UCvsFiles.cpp
+--- gcvs-1.0.orig/common/UCvsFiles.cpp	2002-08-13 11:46:40.000000000 +0000
++++ gcvs-1.0/common/UCvsFiles.cpp	2004-07-28 13:43:03.452666144 +0000
+@@ -1214,7 +1214,7 @@
+ {
+ 	UStr uppath, filename;
+ 	SplitPath(m_path, uppath, filename);
+-	ResetView(uppath, true);
++	ResetView(&uppath, true);
+ 	return 0;
+ }
+ 
+@@ -1895,7 +1895,7 @@
+ 	fullpath << (*data)[EntnodeData::kName];
+ 	if(data->GetType() == ENT_SUBDIR)
+ 	{
+-		ResetView(fullpath, true);
++		ResetView(&fullpath, true);
+ 	}
+ 	else
+ 	{
diff --git a/dev-util/gcvs/gcvs-1.0.ebuild b/dev-util/gcvs/gcvs-1.0.ebuild
new file mode 100644
index 000000000000..02dbd632e9a0
--- /dev/null
+++ b/dev-util/gcvs/gcvs-1.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gcvs/gcvs-1.0.ebuild,v 1.1 2004/10/17 20:22:52 liquidx Exp $
+
+inherit eutils
+
+MY_P=${P/eta/}
+MY_P=${MY_P/_/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="GUI frontend for CVS from the CVSGUI project"
+SRC_URI="mirror://sourceforge/cvsgui/${MY_P}.tar.gz"
+HOMEPAGE="http://cvsgui.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc"
+IUSE=""
+
+DEPEND="=x11-libs/gtk+-1.2*
+	>=dev-lang/tcl-8.3.3
+	dev-lang/perl
+	sys-devel/bison
+	=dev-util/glademm-0.6*"
+
+RDEPEND="${DEPEND}
+	>=dev-util/cvs-1.11-r1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	aclocal && autoconf && automake || die
+	epatch ${FILESDIR}/${P}-gentoo.patch || die
+}
+
+src_compile() {
+
+	./configure --prefix=/usr --host=${CHOST} || die
+
+	# Ladies and Gentlemen... The following is pure evil...
+	export HOME=${S}
+	# Yes, thats right... the build process ends up trying to create
+	# something in root's home directory... why?  they use glade,
+	# a full blown gnome gui application to generate source code...
+
+	# more evil... without this it builds its own copy of cvs
+	# which of course installs itself on top of the real cvs package
+	mv Makefile Makefile.old
+	sed 's|cvsunix||g' Makefile.old > Makefile
+
+	emake all || die
+
+}
+
+src_install () {
+
+	make prefix=${D}/usr install
+
+	# note: html docs ignored because they focus on the mac and windows
+	# version and seem to be of questionable use with gcvs
+
+	dodoc AUTHORS COPYING ChangeLog INSTALL README
+
+
+}