app-editors/gvim: Drop unnecessary die and use domenu/doicon from eutils.eclass

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

7 files changed, 47 insertions, 49 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 56be3e575cbd..7ace98b816a5 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.416 2013/11/19 10:28:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.417 2013/12/12 07:32:07 jlec Exp $
+
+  12 Dec 2013; Justin Lecher <jlec@gentoo.org> gvim-7.4.22.ebuild,
+  gvim-7.4.41.ebuild, gvim-7.4.52.ebuild, gvim-9999.ebuild, metadata.xml:
+  Drop unnecessary die and use domenu/doicon from eutils.eclass
 
 *gvim-7.4.94 (19 Nov 2013)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 97d9cd602537..8e808f2ecac0 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX gvim-7.1-interix-link.patch 716 SHA256 53459943e62247469f6fbaa30abd36d7629e02bd26bebe3e8947d45b23408bc9 SHA512 f2d5401eef38dcd998e6df4dedb3035d7818aa491049457efeea686b58c7f221003032bbf0837d51fe0545152246ac07fe0bf4a64b10a1b2493146abc023011a WHIRLPOOL d319c29e5bcbbf61dfb4a75f7d9f992b71520314c15056b73505de69c45db41c5b16413d11a94172579c9de56713c65101bbf9427828940c98d24ff8845df870
 AUX gvim-7.1.285-darwin-x11link.patch 388 SHA256 0b935efbedabeab8439d42baa1d07b2f3d5e2964dea9e504ff2a4d4b9f3e6bcd SHA512 5fc5786abfc1258d29f3d37e89696dce8f4f770a889bebc4b287ee777cfb3e933025dfad015c9cd5984fcc355d06db4d95d45af768d2dfc5c76287a3ff5e04cf WHIRLPOOL b0e140078233ae10a944db92fc1268e9f73239ca045a89e5f4ed933859a97a075c20cfa3702b69eff807dfd0a10007c9051ccc272534438ebd7a504d359e1b29
@@ -19,21 +19,27 @@ DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e24610690
 DIST vim-patches-7.4.94.patch.bz2 143772 SHA256 d9d18940bb3ffb8a16dc443d9cc27709e7fad7cf5d6457d5ae8b0b734ffec8ca SHA512 d4aa6a6fb446810e34bdab572d515c271b6953c0d957ae97485e58d0617e586996a46f733087b93e470d4558ff5206c8e82c83df5686a644a27b4e59bdcd9bc5 WHIRLPOOL f7f7bfac3cf619db04bf9122b09c45f59a1146351fc5d950858cdda1a8abe5d57549a3959b45fcd67ce5622ea936997ac2fe716047adf71ed1c95f070cc985f9
 EBUILD gvim-7.3.1214.ebuild 1067 SHA256 d005488811ca107f47fcc78d63d4bc7fcfd17232eaa8f43a553fbe4e14c81b5d SHA512 a0e321432369a986810cd7ac1201247e42c1693331de7e4de234f204b7b943ef8e9cc689bde0122082a984583ce9c36ec5ecf1136df3a8fb451493fde8cef484 WHIRLPOOL 2a3a10f491937a96980f6207c1309ab3df46336d589b812ab2e1748698f19194e7fe44eca07b21f0f88b0297e742372f7eba1337d40add870929b2ee860ab783
 EBUILD gvim-7.3.762.ebuild 958 SHA256 19a7ce0d8ad24047c022c866046ec63aab92efa911e87dea3d83f7e4b33e7dd9 SHA512 3966bd3a5cb514f99cc3ee5718b09a3fcb8eaf2e71c118a255a3ffc496b64d116a5321719a3773d38743b9552408bc2655373753a9e1b8e5f571d848226253e3 WHIRLPOOL 8095463dd1ed4bbace9ef0fbb9a2ce74fc49f1c1f431fc9ce83e8eed4d23c97f1eb54e90575baaa77b928eacf659322076256e511b045896b94e1ec5479fe5ce
-EBUILD gvim-7.4.22.ebuild 12598 SHA256 04f24e7d19c1d8711f6726d7a74f42092de4fc21921bc551b6e8cb7aceff6a3f SHA512 010b40a6dad617f99473c8fb4d95f255b1fd686aee314d764398dcd91e643975438179221a21980664f8f5c3e5fdf86ac9739d90f0dc995f011c5b5ddaae8ae1 WHIRLPOOL aea1f019cb0361d0da575afb1e94b16837a2034dc3389abb52ba0aef2f6a26a2e8c8157f21e6a4500b3bd977d21adc03d80b95f51b35c43e88c008199f942236
-EBUILD gvim-7.4.41.ebuild 12598 SHA256 dbeb49769bc5382ff5b8746dafd0be6526c675e2555d1e878ee121f67b5f5f59 SHA512 e233b0118b549e1e9a7fdc96af616d5a60f684a8126698e14a2d5762bedd264795f2ee48c2cc0763503bf493252c7a17f81842547b13a0dde82c2c2e2d134cd3 WHIRLPOOL e10e419ca131a00c3a7dd3cca665f1935719b23c094ffa56f6a92dc9d8ff2fd31ce08e714435e1c3017a0bb391df14925a18a247bcc0bacb19a94e5f697613d4
-EBUILD gvim-7.4.52.ebuild 12657 SHA256 d9cc1bbf5d1b8498b36a9463ca0425a1542bdc6556ae5b258fa17d50054ab3f0 SHA512 582066f1f66644503db422ab791b4c032cdd7a5f21afc63f5706eccadc367df9af237ecfef36f587b3c06fd9cf0a26e5062b2b22d210dc8376032c95bfb6e953 WHIRLPOOL 7353fe852fa227dadd406cb9bd6eed315065ff781cca11d68ce1157cd7fe1917ec524e82587fe5f6b71ba234c048856f0423591d05d6349f15f1f602132e854e
+EBUILD gvim-7.4.22.ebuild 12495 SHA256 dd9fbb777b6f1f0524e87b41d9b5b63563b66d876d649526341d5208997707d6 SHA512 e6b6e675132d226eaabd792a65eb46f2c2a60e8aaaf38985f9ababc3e1b877109f9272b333d20932c5ee4762ddab4ef679d3041bf5e4b60ddd1915d81da1eb7f WHIRLPOOL a19f1414483eaee8c33996bec49b5721077dd64d15affa0a8d19015050a415909f2e0e925fffcf9e299434df2819e406faa2eb2794085b481288e9c3abdb86f6
+EBUILD gvim-7.4.41.ebuild 12495 SHA256 d4a732664ea7e1efdd72cc3630c75fb82328894843bce1bc9dba37d690771722 SHA512 6646e69756502c62b9a8055a572c7bd2a48e8a12cfe709a71bb776c62f6c3bb584b47a2229f8852d02482c63ca27057a06256aeadb46acf7b81cdee79b63dac0 WHIRLPOOL 73594b3ab8b49aaa1ae246983b969da37642508696e0efb5c9ca2309a7b0c6544cef9e926ad20f0e6d69696986d4d982d899334f13a67362cfff99d4adfe5bdd
+EBUILD gvim-7.4.52.ebuild 12554 SHA256 fc31a40fc34924b6c2c7200d3d72853585bb3ed68b62b0e3c199bb0f2be2b613 SHA512 67e376e3200f619b1be99996dc3953abc0e4ec70bc5706453e2a38271cdc377cbb335be9a78a69a8a31a06a83e69718bf2c940902fd56550ee50861f4369c99f WHIRLPOOL ebac050d468dc5ca09b875fd8a25895172024fc24092a5f31da89d37d078012588575fcac8bf6e3421fd0ffd20392d31517414efa00e3d265830716a506b387c
 EBUILD gvim-7.4.94.ebuild 12197 SHA256 1225ee64245baa6a93740cdd9e7b78654dbdbf5bb3ae2eaccc1d73c7293938e5 SHA512 c4d48591ce86723eabab74c46ad43fbbaeeec61f82cd5ee9a77ddd268d0d4ba537bb0c9ad50440be387e7cf72f9d2912b20c6e3ea0e6f584f72932de3d374991 WHIRLPOOL 07e09d860fa7cde4066e7d8b37caf4a75efdde9ac8a62426f05da133dd2bef7c4472ae0ba8ee16a942c028fca2507bbe5ea291634e9380b6929e2cad590483bb
-EBUILD gvim-9999.ebuild 12196 SHA256 7037d31d8430ca25cbfcdcb7f5312ffbab211c210eadb493c2dabe37fca8127d SHA512 18ce57016ee02e3893b4017851a3db1482d448742c99dbcf3637eeb37615fa764e34b46638dd6f7809e531f42db64a61fd27c722d7033960ca32a6cba684881b WHIRLPOOL 403d6da62a7dd79251d3a1df208f77bc93dc0e04e32b205d7ca782c24aeed03dbf13830bf2f46e0125e426fc00f1fa304a91449f562b6a772dd99d3bfa9eeb05
-MISC ChangeLog 56850 SHA256 93d52c8d5021078ee23c04328bdaac63bc778ca0121f0af16f76a314f11b721c SHA512 2600dbdb69be2d250d33effd67f455821135a00dd3e94d0e66898401b1c82570898324d40997c650164361a6e46acfae044ccc634d7aebeb02184d8e2124c60d WHIRLPOOL 5fdfaf56f50237db554ae9aac713ecd15128bd9214745b00c2f334710702dd668297c7299b31fcb78f8047cdabe8e1d3756d7ff9ed0266497ee011573910698f
-MISC metadata.xml 436 SHA256 65897000698e92fafe106664d0575225d30d9b53d99cc6e700dacfff9669c4ef SHA512 e6f9c61ff5617d95d531d20251a291f427b180fb3d5a034e770ef6a7a3e59317d1e8848763d090ce0db0f8216bf15cb541608076a2aec2e0719fc646f6ab8467 WHIRLPOOL 32c61af86a24117276429c2a932e5c479f4eae02233d156ac214ff3592e46c30866dd4c72f8e7e688c03005e29eb80f60b56d499c6f59239fd195101b1c4cc1d
+EBUILD gvim-9999.ebuild 12093 SHA256 bc7906531ea28cb415b23f49e0eaa1971420c28bc5fa287dd69f7e95abf693b3 SHA512 6d1ba0c7d67c9c19aaa2ba6c331f6c61814b816a6788032d2368a11d57e206388d163d8efbded55c443c32bc49b1108abf2f3f091d65bdf6bf5f8ea2dc4365a3 WHIRLPOOL 381b2d0addfb956810fd9438a3bb23d5f81793775d5a6afc366944abb029f8561932987f21a73060e4f264c98b6a6c19ba25430c6349929ffe35c1d53c3ad2fc
+MISC ChangeLog 57051 SHA256 b51352499dd948b5a89fa1e30d02281198fc472351fdb9d613803c8608ab37ea SHA512 2eb9d051825941d39ef3fbe4a1da5636616b920c85291dc097115e62bfbfbeca69f8787da928fc09f764cc27a093633b6140fb97467e164d082dbf115cc5ed4c WHIRLPOOL 2ecee1f9c8ef438537692144cbf9f3ce00fac6183a30a228618d6366d67d8e29b2d9937d213e326dc506507d806b0899a03f77f3ebaf7fe9d1dedff67c71492a
+MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSiz1cAAoJEEqz6FtPBkyj8G4H/1Or0FhwDLdAU56gYteSG0ft
-d6TvvedJ1Hb1WuXXDF/i14puaXwYK0Gh22pngB+t7aFzEyITw0D93R/Jp9dYZeV7
-UahhFrv2cwUmQ91zeuS6L7jZwxhs6KrxczqzldAlCCoLu57mdK6ps80GNM1Bbv7F
-pi5pWRsKH56FVCea3ZgSmwwH3Kan0szPnj/lVT3MxzDmPF73sRqHo73QU8zDv+jE
-Sv9vSI7EDk4BjKWg8d+gg9LveTSsQzJM8ewZCJhYxJWcMnhdMmq60i4XRVJdro8m
-KyFlrp9B6EK3OFq2/rpzLXhajjB2QTnkXGvjaBb+RLE+pnp7ydSGa+5lwr8zPOk=
-=ph2O
+iQIcBAEBCgAGBQJSqWZ5AAoJELnU8jG9FVirHhMP/RdXqOdTgrct/dI/TO/feyj8
+xCwqEZYNB6rQRkzxBISpYpQhaCfifeHj7vsvwsLTqpiRoe3wieJ820HEljiDqm7a
+PTqps+n/27cNVFPkD9cdPlkVbgF802LQiT9LNDOJxTUx1469FubVjbLkVlFoeSN9
+gbhEG+ZyvKgKt6YgwbYCj001bUMNVq6eJRHX7uISpq+fSO/kkP15F58Qb/1vJYzq
+bV3FgY7jf71U6CVV5h5tDe3V13eCwr0c51ozc0DprVdVE96Al5c3GMM1EwWlRnyB
+rSPTQbhUxl0d6ZrcA+F1beoMCcaE+JLB9nszfjCKxDVwn56LgRbw7u++HlHmSepC
+LTiRPLicbGWUVkZQd7PoqYa9d8SGuSdV0dbPBkG9P2yMHx+ZaaCWG3fl2j4liCmW
+klPVtjKp7uaUjUPicLLzOv5JbErswPG20FNH+iQoHrE68d/cn/PFEtvv5VzYgVf8
+JCl4NgFHk8GWnNiY3M98VlVgugsdWzHjuxOQcw0bIP6DAhn029Fwa8x4fxTTkceD
+mrqRjVDEEK+9Yd+Ant2ACwjftt8Z0kef+OsUWTr98sdy0OG1VhqdvXnCi2z0pDuq
+XkWG+RaLcBz9CDsXh3mAEXY0pG0Ltgr8SAYCaO5wDzCy7qS7OnIX+HGwMa4QG3ju
+bKDUbcVXrIgFt+ghbRLv
+=FnEM
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/gvim-7.4.22.ebuild b/app-editors/gvim/gvim-7.4.22.ebuild
index ce8cd6a243da..b9c09ec9a542 100644
--- a/app-editors/gvim/gvim-7.4.22.ebuild
+++ b/app-editors/gvim/gvim-7.4.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.22.ebuild,v 1.2 2013/10/07 05:38:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.22.ebuild,v 1.3 2013/12/12 07:32:07 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -293,8 +293,7 @@ src_test() {
 	ln -s "${S}"/src/gvim "${S}"/src/testvim
 
 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../testvim nongui \
-		|| die "At least one test failed"
+	emake -j1 VIMPROG=../testvim nongui
 }
 
 # Make convenience symlinks, hopefully without stepping on toes.  Some
@@ -353,10 +352,8 @@ src_install() {
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
 	eprefixify "${ED}"/etc/vim/gvimrc
 
-	insinto /usr/share/applications
-	newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/gvim.xpm
+	domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
 
 	# bash completion script, bug #79018.
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/app-editors/gvim/gvim-7.4.41.ebuild b/app-editors/gvim/gvim-7.4.41.ebuild
index 1ea602a0026f..3fbaca8b70dc 100644
--- a/app-editors/gvim/gvim-7.4.41.ebuild
+++ b/app-editors/gvim/gvim-7.4.41.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.41.ebuild,v 1.2 2013/10/07 05:38:10 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.41.ebuild,v 1.3 2013/12/12 07:32:07 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -293,8 +293,7 @@ src_test() {
 	ln -s "${S}"/src/gvim "${S}"/src/testvim
 
 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../testvim nongui \
-		|| die "At least one test failed"
+	emake -j1 VIMPROG=../testvim nongui
 }
 
 # Make convenience symlinks, hopefully without stepping on toes.  Some
@@ -353,10 +352,8 @@ src_install() {
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
 	eprefixify "${ED}"/etc/vim/gvimrc
 
-	insinto /usr/share/applications
-	newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/gvim.xpm
+	domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
 
 	# bash completion script, bug #79018.
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/app-editors/gvim/gvim-7.4.52.ebuild b/app-editors/gvim/gvim-7.4.52.ebuild
index 1a1f66bd3657..834fd5626885 100644
--- a/app-editors/gvim/gvim-7.4.52.ebuild
+++ b/app-editors/gvim/gvim-7.4.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.52.ebuild,v 1.1 2013/10/15 23:16:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.52.ebuild,v 1.2 2013/12/12 07:32:07 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -295,8 +295,7 @@ src_test() {
 	ln -s "${S}"/src/gvim "${S}"/src/testvim
 
 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../testvim nongui \
-		|| die "At least one test failed"
+	emake -j1 VIMPROG=../testvim nongui
 }
 
 # Make convenience symlinks, hopefully without stepping on toes.  Some
@@ -355,10 +354,8 @@ src_install() {
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
 	eprefixify "${ED}"/etc/vim/gvimrc
 
-	insinto /usr/share/applications
-	newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/gvim.xpm
+	domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
 
 	# bash completion script, bug #79018.
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index e35f0b30e670..a15c766108c3 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.10 2013/11/19 10:28:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.11 2013/12/12 07:32:07 jlec Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -283,8 +283,7 @@ src_test() {
 	ln -s "${S}"/src/gvim "${S}"/src/testvim
 
 	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../testvim nongui \
-		|| die "At least one test failed"
+	emake -j1 VIMPROG=../testvim nongui
 }
 
 # Make convenience symlinks, hopefully without stepping on toes.  Some
@@ -343,10 +342,8 @@ src_install() {
 	newins "${FILESDIR}"/gvimrc-r1 gvimrc
 	eprefixify "${ED}"/etc/vim/gvimrc
 
-	insinto /usr/share/applications
-	newins "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
-	insinto /usr/share/pixmaps
-	doins "${FILESDIR}"/gvim.xpm
+	domenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
 
 	# bash completion script, bug #79018.
 	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index fe574ff96b66..3b459b89e35c 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>vim</herd>
-<use>
-  <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
-  <flag name="netbeans">Include netbeans external editor integration support</flag>
-  <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
-</use>
+  <herd>vim</herd>
+  <use>
+    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+    <flag name="netbeans">Include netbeans external editor integration support</flag>
+    <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
+  </use>
 </pkgmetadata>