Fix .desktop file and dependency list for bug #249366 and #285106, respectively

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 27 insertions, 7 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index c490011e48b8..a1ba6db1b3da 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.295 2009/07/26 12:33:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.296 2009/09/25 14:31:30 lack Exp $
+
+  24 Sep 2009; Jim Ramsay <lack@gentoo.org> gvim-7.2.238.ebuild,
+  +files/gvim.desktop-r2:
+  Fix .desktop file and dependency list for bug #249366 and #285106,
+  respectively
 
   26 Jul 2009; Brent Baude <ranger@gentoo.org> gvim-7.2.182.ebuild:
   Marking gvim-7.2.182 ppc64 for bug 257007
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 1e201467387d..d32b14ca205a 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,6 +1,7 @@
 AUX gvim-completion 1200 RMD160 cd8b51301dc544d51d974307c344ffa992e65186 SHA1 64d72bb63150745743fcddc396f425c8721d1af5 SHA256 e3976b6e6732002059129cfbe158ba43b2edc1ccd6e3753d1751211297c95ce8
 AUX gvim.desktop 849 RMD160 ea684b7ab22fc09ddf82eca4731f0cb1c2898f7b SHA1 1852ef02891f632745335e69fb7179a1928cd7fd SHA256 39ee015a712db38422385303ae05e7e652b08cb7405f2a2d4f7e1cb87845978a
 AUX gvim.desktop-r1 852 RMD160 58b9547aaba4d2b51761370567180007678aa049 SHA1 9e414b0c5430f0fd95c2a8b7373ad1aaf564d658 SHA256 ca5bc3dd6a14eefbfa570942766357da05f985bdc516cb7aa0c0ae8a5683c72f
+AUX gvim.desktop-r2 171 RMD160 4e3103d2a05310d8226b7f5103e41252b666ee5d SHA1 9ee9784d15d0976d36b91d181b5af3fda55e8382 SHA256 840e4bcac0b448566e26e53b8292f31a9e187360b6aaf75f37929e43c46f22ce
 AUX gvim.xpm 1371 RMD160 cd38d7371f10f3efcb571ecf7c5630c0fc8a6613 SHA1 f7262c7429c42b7c1ef9cf1eaa6aa12292933525 SHA256 adf603379740f509b0c543f9ac78a3eda7c804958c1a9086c50e7daecd059cc7
 AUX gvimrc-r1 1050 RMD160 dba9e2fe2a603b9b15466f530ba5621875a48b58 SHA1 fe7b7fd22448462813222fc78a14c837c3213a37 SHA256 e395d9311690b0c460784ddde565bd34a35a27534442679b682cb8a23eb7bf3c
 DIST vim-7.0-gentoo-patches-r1.tar.bz2 6749 RMD160 88cead14b07bc3b7113a3e60f2b358caf501c789 SHA1 694d7567a7100478083207a77c0282365e3b4581 SHA256 17934badbe1288149a31ac309c17b579a0c33a409b5928a759620631c4a1ec7c
@@ -26,7 +27,7 @@ EBUILD gvim-7.1.123.ebuild 1191 RMD160 61b16a5a940e565edb81eb59698ca0fba53ec2d2
 EBUILD gvim-7.1.330.ebuild 1197 RMD160 6e1e29c095cc146c75172daeb7af3f0ab28eb685 SHA1 875ed5ab32b83dcb9b6ee3c1f140668891c1592b SHA256 f19b98c7377d6a1da1e9e839b87ddc4d566ca04d59350df6e58634a8c11de387
 EBUILD gvim-7.2.108.ebuild 1197 RMD160 d4a305170fa183615fe76135f961472e6482e55d SHA1 c05d936df65e674c35e8365c6bad1618b5aaf3f4 SHA256 99ad29efb1f7f2a51297201a1d04c1005220ab85a2e94e2f9628a61bdb93b5ec
 EBUILD gvim-7.2.182.ebuild 1194 RMD160 6cd4f9189136108c6e952210089ae853247fee6a SHA1 f13f7bbdc918f3bbbfcbeeb59772a94161229ab5 SHA256 925aca8bf4407e2e222c770586973f81b5cc1240a6121684a44d5bc2a1e3c07f
-EBUILD gvim-7.2.238.ebuild 1220 RMD160 9044e9260245cc13b7113f195c54735632fd8130 SHA1 03e97c9dd81c58faa8527705c1664b045dd8efdd SHA256 bca657ff8a778697871896fd74e5e112a4b43c5563b54ba8d56c413fd7e3d3c3
+EBUILD gvim-7.2.238.ebuild 1269 RMD160 9bd96515e730e391826343f24d6db8e59198897d SHA1 1ce3979ab41adcc70c620fac7bf48499abc51790 SHA256 3d79d4bc3f85376375b85c305805c312800b06db649fe508176986cc2fa44372
 EBUILD gvim-7.2.ebuild 1108 RMD160 e0e52577e9bfa7fc8266c93e3758d77336b0c1e4 SHA1 a645a8628459dd483482465f6b0570899b3e819d SHA256 d518c029e1e0307fc199e591e72e4ef3217e065482c8edf4217a60fde743a7ee
-MISC ChangeLog 40281 RMD160 59cd8cc39420384f8a48709ece17955c827e8d2c SHA1 ca0d947026c8076496ac7dfead3cb018f95ca9f1 SHA256 3535be39445ea4eec623b02539b7726e3fda61587d878f299101a21dddacdc9d
+MISC ChangeLog 40455 RMD160 ebba254e69c794485434a1afd73b0d502b445728 SHA1 e20e36428233f68d2463fe90faac8b28c4e5f99f SHA256 727a19dc4543b94a5f6b20df5df9d2f52ba201242aa4873063475c4c15eb3c92
 MISC metadata.xml 389 RMD160 61d125560aefd4f17d01a23dfdaab8e370551a4d SHA1 150c098bb2a619784b38f24f20f861999e46a1b4 SHA256 40d2b38972733e27a4646a9e61db42c0a581f57930b3efc23b728ef4381d4e66
diff --git a/app-editors/gvim/files/gvim.desktop-r2 b/app-editors/gvim/files/gvim.desktop-r2
new file mode 100644
index 000000000000..45b55d036929
--- /dev/null
+++ b/app-editors/gvim/files/gvim.desktop-r2
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=gVim
+Comment=A highly configurable text editor
+Exec=gvim -f %F
+Icon=gvim
+Terminal=false
+Type=Application
+MimeType=text/plain;
+Categories=Development;
diff --git a/app-editors/gvim/gvim-7.2.238.ebuild b/app-editors/gvim/gvim-7.2.238.ebuild
index d80fc3a17b11..addb0c9f497b 100644
--- a/app-editors/gvim/gvim-7.2.238.ebuild
+++ b/app-editors/gvim/gvim-7.2.238.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.2.238.ebuild,v 1.1 2009/07/22 14:13:15 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.2.238.ebuild,v 1.2 2009/09/25 14:31:30 lack Exp $
 
 inherit vim
 
@@ -8,7 +8,7 @@ VIM_VERSION="7.2"
 VIM_GENTOO_PATCHES="vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
 VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
 GVIMRC_FILE_SUFFIX="-r1"
-GVIM_DESKTOP_SUFFIX="-r1"
+GVIM_DESKTOP_SUFFIX="-r2"
 
 SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
 	ftp://ftp.vim.org/pub/vim/extra/vim-${VIM_VERSION}-lang.tar.gz
@@ -20,7 +20,7 @@ S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="GUI version of the Vim text editor"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="aqua gnome gtk motif nextaw"
-DEPEND="${DEPEND}
+RDEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	x11-libs/libXext
 	!aqua? (
@@ -41,4 +41,9 @@ DEPEND="${DEPEND}
 			)
 		)
 	)"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	!aqua? (
+		gtk? (
+			dev-util/pkgconfig
+		)
+	)"