Change libXpm dep to libXext. gvim links to libXpm, then its weird link.sh script 'optimizes' the links to remove all the ones it won't run without, so links in the compilation don't necessarily translate to links in the final binary.

Package-Manager: portage-2.0.53

4 files changed, 15 insertions, 8 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index fe1a5fcb9ad5..e7c18ffeb461 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.167 2005/12/14 04:36:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.168 2005/12/14 05:07:18 spyderous Exp $
+
+  14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; gvim-6.4.ebuild,
+  gvim-7.0_alpha20051207.ebuild:
+  Change libXpm dep to libXext. gvim links to libXpm, then its weird link.sh
+  script 'optimizes' the links to remove all the ones it won't run without, so
+  links in the compilation don't necessarily translate to links in the final
+  binary.
 
   14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; gvim-6.4.ebuild,
   gvim-7.0_alpha20051207.ebuild:
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index b76bd2fb0613..9c2d2731a2ae 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,4 +1,4 @@
-MD5 1b643d6cf03fe7f8c03fae58218520e3 ChangeLog 23810
+MD5 e182de03be09591dadca50df1695e92c ChangeLog 24159
 MD5 f06702e38dc279aee7ca16c7283d67cb files/digest-gvim-6.4 200
 MD5 82c6d6400445f99a8d7d6382e22752a2 files/digest-gvim-7.0_alpha20051207 162
 MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200
@@ -6,6 +6,6 @@ MD5 bbd46fbd80747c453693e4f2e258f106 files/gvim.desktop 845
 MD5 5fedc57d438147906375b2ef60daa4b9 files/gvim.xpm 1371
 MD5 823c8bb76c4568a8ddb7a17accd057e7 files/gvimrc 780
 MD5 a3137e1d3f7ae220a1db3dde70cafb9c files/gvimrc-r1 1050
-MD5 1c4a6862618692b1b919d649cfaddfc3 gvim-6.4.ebuild 1151
-MD5 2a3bf25b736a2ee581dec7240c9dfa1f gvim-7.0_alpha20051207.ebuild 1071
+MD5 ed5aa531d4f1094a4561c210a1aee152 gvim-6.4.ebuild 1152
+MD5 f0952e21467438d1a44ab4f1162c1330 gvim-7.0_alpha20051207.ebuild 1072
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
diff --git a/app-editors/gvim/gvim-6.4.ebuild b/app-editors/gvim/gvim-6.4.ebuild
index f99efd28931a..84e531511570 100644
--- a/app-editors/gvim/gvim-6.4.ebuild
+++ b/app-editors/gvim/gvim-6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.4.ebuild,v 1.10 2005/12/14 04:36:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-6.4.ebuild,v 1.11 2005/12/14 05:07:18 spyderous Exp $
 
 inherit vim
 
@@ -24,7 +24,7 @@ IUSE="gnome gtk motif nls"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXpm virtual/x11 )
+	|| ( x11-libs/libXext virtual/x11 )
 	gtk? (
 		>=x11-libs/gtk+-2.6
 		virtual/xft
diff --git a/app-editors/gvim/gvim-7.0_alpha20051207.ebuild b/app-editors/gvim/gvim-7.0_alpha20051207.ebuild
index 7e54e90a8551..c7bf4a37bf07 100644
--- a/app-editors/gvim/gvim-7.0_alpha20051207.ebuild
+++ b/app-editors/gvim/gvim-7.0_alpha20051207.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20051207.ebuild,v 1.3 2005/12/14 04:36:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0_alpha20051207.ebuild,v 1.4 2005/12/14 05:07:19 spyderous Exp $
 
 inherit vim
 
@@ -22,7 +22,7 @@ IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXpm virtual/x11 )
+	|| ( x11-libs/libXext virtual/x11 )
 	!aqua? (
 		gtk? (
 			>=x11-libs/gtk+-2.6