rehauled

7 files changed, 27 insertions, 7 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index dcd65d2606ff..62ccec2c2f6a 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.21 2003/03/15 00:52:12 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.22 2003/03/16 03:14:58 seemant Exp $
+
+  15 Mar 2003; Seemant Kulleen <seemant@gentoo.org> gvim-6.1-r7.ebuild :
+
+  Version bumpd by ryan phillips <rphillips@gentoo.org>.
+
+  Now, the gvim specific patches are applied in src_unpack in the ebuild.
+  Note that in the gentoo patches tarball, there are subdirectories:
+
+  patches-all; patches-vim-core; patches-vim; and patches-gvim.  Each
+  ebuild can specify which (conditional) patches to apply, and those
+  patches should be placed in the correct subdirectory.  Common patches go
+  into the patches-all subdirectory
 
   13 Mar 2003; Seemant Kulleen <seemant@gentoo.org> gvim-6.1-r6.ebuild :
 
diff --git a/app-editors/gvim/files/digest-gvim-6.1-r6 b/app-editors/gvim/files/digest-gvim-6.1-r6
index a5fb23e1e02b..8d205edb620a 100644
--- a/app-editors/gvim/files/digest-gvim-6.1-r6
+++ b/app-editors/gvim/files/digest-gvim-6.1-r6
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
 MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
-MD5 81071e861e9f07b06f18b29ee03769d3 vim-6.1-gentoo-patches.tar.bz2 3572
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/gvim/files/digest-gvim-6.1-r7 b/app-editors/gvim/files/digest-gvim-6.1-r7
index bf792ecf6203..572e12563af2 100644
--- a/app-editors/gvim/files/digest-gvim-6.1-r7
+++ b/app-editors/gvim/files/digest-gvim-6.1-r7
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
 MD5 41036a29f848a33bc2903224f2b4f6e6 vim-6.1-patches-001-390.tar.bz2 714902
-MD5 299d0f3144d0b60c10cfc549affaf065 vim-6.1-gentoo-patches.tar.bz2 108850
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/gvim/gvim-6.1-r7.ebuild b/app-editors/gvim/gvim-6.1-r7.ebuild
index d6dcb6d1e71c..2a3f9b86f34e 100644
--- a/app-editors/gvim/gvim-6.1-r7.ebuild
+++ b/app-editors/gvim/gvim-6.1-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.1-r7.ebuild,v 1.1 2003/03/15 00:52:12 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.1-r7.ebuild,v 1.2 2003/03/16 03:14:58 seemant Exp $
 
 VIMPATCH="390"
 
@@ -34,3 +34,11 @@ DEPEND="dev-util/cscope
 #
 # Please don't re-enable the tclinterp flag without verifying first
 # that the above works.  Thanks.  (08 Sep 2001 agriffis)
+
+src_unpack() {
+	vim_src_unpack
+
+	use gtk2 \
+		&& EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \
+			epatch ${WORKDIR}/gentoo/patches-gvim/*
+}
diff --git a/app-editors/vim-core/files/digest-vim-core-6.1-r4 b/app-editors/vim-core/files/digest-vim-core-6.1-r4
index bbea6f63dc1a..8d205edb620a 100644
--- a/app-editors/vim-core/files/digest-vim-core-6.1-r4
+++ b/app-editors/vim-core/files/digest-vim-core-6.1-r4
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
 MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
-MD5 299d0f3144d0b60c10cfc549affaf065 vim-6.1-gentoo-patches.tar.bz2 108850
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/files/digest-vim-6.1-r19 b/app-editors/vim/files/digest-vim-6.1-r19
index bbea6f63dc1a..8d205edb620a 100644
--- a/app-editors/vim/files/digest-vim-6.1-r19
+++ b/app-editors/vim/files/digest-vim-6.1-r19
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
 MD5 317606a613f68d03f381dba377a20031 vim-6.1-patches-001-300.tar.bz2 407085
-MD5 299d0f3144d0b60c10cfc549affaf065 vim-6.1-gentoo-patches.tar.bz2 108850
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974
diff --git a/app-editors/vim/files/digest-vim-6.1-r20 b/app-editors/vim/files/digest-vim-6.1-r20
index bf792ecf6203..572e12563af2 100644
--- a/app-editors/vim/files/digest-vim-6.1-r20
+++ b/app-editors/vim/files/digest-vim-6.1-r20
@@ -1,4 +1,4 @@
 MD5 7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2 2890049
 MD5 41036a29f848a33bc2903224f2b4f6e6 vim-6.1-patches-001-390.tar.bz2 714902
-MD5 299d0f3144d0b60c10cfc549affaf065 vim-6.1-gentoo-patches.tar.bz2 108850
+MD5 85b1d69bbfcdb88909ee66a6532ff637 vim-6.1-gentoo-patches.tar.bz2 133788
 MD5 ed6742805866d11d6a28267330980ab1 vim-6.1-lang.tar.gz 866974