fix compilation with perl 5.8.2 and remove old ebuilds

12 files changed, 41 insertions, 174 deletions

diff --git a/app-editors/kvim/ChangeLog b/app-editors/kvim/ChangeLog
index 8576c5c06af6..00a7f0bf6f5f 100644
--- a/app-editors/kvim/ChangeLog
+++ b/app-editors/kvim/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-editors/kvim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/ChangeLog,v 1.15 2003/10/03 11:53:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/ChangeLog,v 1.16 2003/11/12 14:30:14 agriffis Exp $
+
+  12 Nov 2003; Aron Griffis <agriffis@gentoo.org> kvim-6.1.141.ebuild,
+  kvim-6.1.141_rc1.ebuild, kvim-6.1.141_rc2.ebuild, files/kvim-6.1.141.patch, 
+  files/kvim-6.1.141_rc1-gcc2fix.patch:
+  Remove old ebuilds (after checking stable KEYWORDS to make sure this won't
+  break anything)
+
+  12 Nov 2003; Aron Griffis <agriffis@gentoo.org> kvim-6.2.14.ebuild,
+  files/kvim-6.2.14-perl582.patch:
+  Fix kvim compilation with perl 5.8.2 by resolving the e_number symbol
+  conflict.
 
   03 Oct 2003; Aron Griffis <agriffis@gentoo.org> kvim-6.2.14.ebuild:
   Stable on alpha
diff --git a/app-editors/kvim/Manifest b/app-editors/kvim/Manifest
index 86a87db67e83..74fa679c7f7e 100644
--- a/app-editors/kvim/Manifest
+++ b/app-editors/kvim/Manifest
@@ -1,13 +1,6 @@
-MD5 3fa03b27283b60410db6c5146cce4d56 ChangeLog 2144
-MD5 7fd153aeeadf13395f1e67fa3f58a813 kvim-6.1.141.ebuild 1382
-MD5 015e59737730434ed42efa79ad04e11d kvim-6.1.141_rc1.ebuild 783
-MD5 f45360910e219490d73b7952b9b984ce kvim-6.1.141_rc2.ebuild 1415
+MD5 0a40ede7693f933697fe7b546e976af0 kvim-6.2.14.ebuild 1766
+MD5 647f9ee0b2f496f71c1913b122782da5 ChangeLog 2620
 MD5 ee78ee9d3852ad2fc2455a227622aefe metadata.xml 173
-MD5 7d5c3119b914bbd4d11c636fa5d46b46 kvim-6.2.14.ebuild 1652
-MD5 f88c2bf9d5e40bfec8bbfaecb5813d7d files/digest-kvim-6.1.141 66
-MD5 cde9e15be8d92c34b6e007ece3806866 files/digest-kvim-6.1.141_rc1 69
-MD5 c6e5d53f69d38db215ca3743c200bc9a files/digest-kvim-6.1.141_rc2 69
-MD5 28777cae6584ddd161133cedd97a6642 files/kvim-6.1.141.patch 1082
-MD5 660d4fea9d8112a4bb35007f494b5a34 files/kvim-6.1.141_rc1-gcc2fix.patch 513
-MD5 e2dea441da69d0dacb672cb8a7dc5c5b files/digest-kvim-6.2.14 65
 MD5 4d2459727266d29b61b856ee4dfc31e0 files/kvim-6.2.14-gcc2.patch 505
+MD5 fb704603c1b2aba318c776935868e006 files/kvim-6.2.14-perl582.patch 862
+MD5 e2dea441da69d0dacb672cb8a7dc5c5b files/digest-kvim-6.2.14 65
diff --git a/app-editors/kvim/files/digest-kvim-6.1.141 b/app-editors/kvim/files/digest-kvim-6.1.141
deleted file mode 100644
index 65bd03ecbaf5..000000000000
--- a/app-editors/kvim/files/digest-kvim-6.1.141
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6be4d954151f29126ba16b486484d33 kvim-6.1.141.tar.bz2 3673487
diff --git a/app-editors/kvim/files/digest-kvim-6.1.141_rc1 b/app-editors/kvim/files/digest-kvim-6.1.141_rc1
deleted file mode 100644
index 1187a39df958..000000000000
--- a/app-editors/kvim/files/digest-kvim-6.1.141_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 579525285fd2da54f16aea8427e0192e kvim-6.1.141rc1.tar.bz2 3651138
diff --git a/app-editors/kvim/files/digest-kvim-6.1.141_rc2 b/app-editors/kvim/files/digest-kvim-6.1.141_rc2
deleted file mode 100644
index c899f0958c2c..000000000000
--- a/app-editors/kvim/files/digest-kvim-6.1.141_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f53e1179c27d1be1030a06daf62dfd3 kvim-6.1.141rc2.tar.bz2 3654975
diff --git a/app-editors/kvim/files/kvim-6.1.141.patch b/app-editors/kvim/files/kvim-6.1.141.patch
deleted file mode 100644
index 0bd8725fafe3..000000000000
--- a/app-editors/kvim/files/kvim-6.1.141.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile.orig	2002-10-01 16:54:21.000000000 +0200
-+++ src/Makefile	2002-10-18 02:22:52.000000000 +0200
-@@ -1401,13 +1401,13 @@
- # - Temporarily move the ./configure script to ./configure.save.  Don't
- #   overwrite it, it's probably the result of an aborted autoconf.
- # - Use sed to change ./config.log to auto/config.log in the configure script.
--auto/configure: configure.in
--	if test ! -f configure.save; then mv configure configure.save; fi
--	autoconf
--	sed -e 's+\./config.log+auto/config.log+' configure > auto/configure
--	chmod 755 auto/configure
--	mv -f configure.save configure
--	-rm -f auto/config.status auto/config.cache
-+#auto/configure: configure.in
-+#	if test ! -f configure.save; then mv configure configure.save; fi
-+#	autoconf
-+#	sed -e 's+\./config.log+auto/config.log+' configure > auto/configure
-+#	chmod 755 auto/configure
-+#	mv -f configure.save configure
-+#	-rm -f auto/config.status auto/config.cache
- 
- # Re-execute this Makefile to include the new auto/config.mk produced by
- # configure Only used when typing "make" with a fresh auto/config.mk.
diff --git a/app-editors/kvim/files/kvim-6.1.141_rc1-gcc2fix.patch b/app-editors/kvim/files/kvim-6.1.141_rc1-gcc2fix.patch
deleted file mode 100644
index 4e0b376c2802..000000000000
--- a/app-editors/kvim/files/kvim-6.1.141_rc1-gcc2fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gui_kde_widget.cc.orig	Thu Aug  1 12:14:08 2002
-+++ src/gui_kde_widget.cc	Thu Aug  1 12:14:17 2002
-@@ -46,7 +46,6 @@
- #include "gui_kde_widget.h"
- 
- extern "C" {
--char_u *alloc(unsigned size);    
- #include "version.h"
- }
- 
-@@ -361,7 +360,7 @@
- 
-     if (QUriDrag::decode(e, urls)) {
- 	n = urls.count();
--        fnames = (char_u **)alloc((n+1) * sizeof(char_u *));
-+        fnames = (char_u **)lalloc((n+1) * sizeof(char_u *), TRUE);
- 	nfiles = 0;
- #if QT_VERSION>=300
- 	QPtrListIterator<char> it(urls);
diff --git a/app-editors/kvim/files/kvim-6.2.14-perl582.patch b/app-editors/kvim/files/kvim-6.2.14-perl582.patch
new file mode 100644
index 000000000000..15115a7800e5
--- /dev/null
+++ b/app-editors/kvim/files/kvim-6.2.14-perl582.patch
@@ -0,0 +1,22 @@
+--- kvim-6.2.14/src/digraph.c.old	2003-06-14 13:38:47.000000000 -0400
++++ kvim-6.2.14/src/digraph.c	2003-11-12 09:12:59.000000000 -0500
+@@ -2175,7 +2175,7 @@
+ 	str = skipwhite(str);
+ 	if (!isdigit(*str))
+ 	{
+-	    EMSG(_(e_number));
++	    EMSG(_(vim_e_number));
+ 	    return;
+ 	}
+ 	n = getdigits(&str);
+--- kvim-6.2.14/src/globals.h.old	2003-06-14 13:38:49.000000000 -0400
++++ kvim-6.2.14/src/globals.h	2003-11-12 09:13:06.000000000 -0500
+@@ -1261,7 +1261,7 @@
+ EXTERN char_u e_nowrtmsg[]	INIT(=N_("E37: No write since last change (add ! to override)"));
+ EXTERN char_u e_null[]		INIT(=N_("E38: Null argument"));
+ #ifdef FEAT_DIGRAPHS
+-EXTERN char_u e_number[]	INIT(=N_("E39: Number expected"));
++EXTERN char_u vim_e_number[]	INIT(=N_("E39: Number expected"));
+ #endif
+ #ifdef FEAT_QUICKFIX
+ EXTERN char_u e_openerrf[]	INIT(=N_("E40: Can't open errorfile %s"));
diff --git a/app-editors/kvim/kvim-6.1.141.ebuild b/app-editors/kvim/kvim-6.1.141.ebuild
deleted file mode 100644
index 7897f8c5cbf4..000000000000
--- a/app-editors/kvim/kvim-6.1.141.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/kvim-6.1.141.ebuild,v 1.12 2003/09/05 23:05:05 msterret Exp $
-
-IUSE="python gpm nls ruby perl"
-
-inherit kde-base
-need-kde 3
-
-S="${WORKDIR}/${P//_}"
-DESCRIPTION="KDE editor based on vim"
-SRC_URI="http://www.freenux.org/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.freehackers.org/${PN}"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc "
-PATCHES="${FILESDIR}/${P}.patch"
-newdepend "~app-editors/vim-core-6.1
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?    ( >=sys-libs/gpm-1.19.3 )
-	perl?   ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby?   ( >=dev-lang/ruby-1.6.4 )"
-
-src_compile() {
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	use gpm    || myconf="$myconf --disable-gpm"
-	myconf="$myconf --enable-gui=kde --with-features=huge --with-cscope \
-		--with-vim-name=kvim --enable-kde-toolbar"
-	kde_src_compile myconf configure
-	cd ${S}
-	# emake does not work
-	make || die
-}
-
-src_install() {
-	dodoc BUGS README.txt README_src.txt TODO kvim.lsm README.kvim README_lang.txt README_unix.txt
-	dobin src/kvim
-	ln -s kvim ${D}/usr/bin/kvimdiff
-}
diff --git a/app-editors/kvim/kvim-6.1.141_rc1.ebuild b/app-editors/kvim/kvim-6.1.141_rc1.ebuild
deleted file mode 100644
index f1b75e1c4ecb..000000000000
--- a/app-editors/kvim/kvim-6.1.141_rc1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/kvim-6.1.141_rc1.ebuild,v 1.7 2003/09/29 21:08:32 mholzer Exp $
-
-inherit kde-base
-need-kde 3
-
-S="${WORKDIR}/${P//_}"
-DESCRIPTION="KDE editor based on vim"
-SRC_URI="http://www.freehackers.org/kvim/dl/kvim-6.1.141rc1.tar.bz2"
-HOMEPAGE="http://www.freehackers.org/kvim/"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-PATCHES="$FILESDIR/${P}-gcc2fix.patch"
-
-myconf="$myconf --enable-gui=kde"
-
-src_compile() {
-	kde_src_compile myconf configure
-	cd $S
-	# emake does not work
-	make || die
-}
-
-src_install() {
-	kde_src_install
-	dodoc BUGS README.txt README_src.txt TODO kvim.lsm IDEAS README.kvim README_lang.txt README_unix.txt
-}
diff --git a/app-editors/kvim/kvim-6.1.141_rc2.ebuild b/app-editors/kvim/kvim-6.1.141_rc2.ebuild
deleted file mode 100644
index 3e6b4ff1b9c1..000000000000
--- a/app-editors/kvim/kvim-6.1.141_rc2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/kvim-6.1.141_rc2.ebuild,v 1.10 2003/09/05 23:05:05 msterret Exp $
-
-IUSE="python gpm nls ruby perl"
-
-inherit kde-base
-need-kde 3
-
-S="${WORKDIR}/${P//_}"
-DESCRIPTION="KDE editor based on vim"
-SRC_URI="http://www.freehackers.org/${PN}/dl/${P//_}.tar.bz2"
-HOMEPAGE="http://www.freehackers.org/${PN}"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-newdepend ">=app-editors/vim-core-6.1
-	dev-util/cscope
-	>=sys-libs/ncurses-5.2-r2
-	gpm?    ( >=sys-libs/gpm-1.19.3 )
-	perl?   ( dev-lang/perl )
-	python? ( dev-lang/python )
-	ruby?   ( >=dev-lang/ruby-1.6.4 )"
-
-src_compile() {
-	use nls    && myconf="--enable-multibyte" || myconf="--disable-nls"
-	use perl   && myconf="$myconf --enable-perlinterp"
-	use python && myconf="$myconf --enable-pythoninterp"
-	use ruby   && myconf="$myconf --enable-rubyinterp"
-	use gpm    || myconf="$myconf --disable-gpm"
-	myconf="$myconf --enable-gui=kde --with-features=huge --with-cscope \
-		--with-vim-name=kvim --enable-kde-toolbar"
-	kde_src_compile myconf configure
-	cd ${S}
-	# emake does not work
-	make || die
-}
-
-src_install() {
-	dodoc BUGS README.txt README_src.txt TODO kvim.lsm README.kvim README_lang.txt README_unix.txt
-	dobin src/kvim
-	ln -s kvim ${D}/usr/bin/kvimdiff
-	#insinto /usr/share/vim
-	#doins ${FILESDIR}/kvimrc
-}
diff --git a/app-editors/kvim/kvim-6.2.14.ebuild b/app-editors/kvim/kvim-6.2.14.ebuild
index fefcbef1132d..8a46af696f6e 100644
--- a/app-editors/kvim/kvim-6.2.14.ebuild
+++ b/app-editors/kvim/kvim-6.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/kvim-6.2.14.ebuild,v 1.4 2003/10/03 11:53:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/kvim/kvim-6.2.14.ebuild,v 1.5 2003/11/12 14:30:14 agriffis Exp $
 
 IUSE="python gpm nls ruby perl"
 
@@ -25,6 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/kvim-6.2.14-gcc2.patch
+	# Resolve conflicting symbol "e_number" between vim and perl 5.8.2
+	epatch ${FILESDIR}/kvim-6.2.14-perl582.patch
 }
 
 src_compile() {