Fix #532246 -- remove all optional support for editors, plugins, IDES, etc.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538

3 files changed, 35 insertions, 46 deletions

diff --git a/dev-lang/go/ChangeLog b/dev-lang/go/ChangeLog
index eebf27bfedf8..c136fda75490 100644
--- a/dev-lang/go/ChangeLog
+++ b/dev-lang/go/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/go
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.55 2014/12/11 06:24:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/ChangeLog,v 1.56 2014/12/11 17:03:50 williamh Exp $
+
+  11 Dec 2014; William Hubbs <williamh@gentoo.org> go-1.4.ebuild:
+  Fix #532246 -- remove all optional support for editors, plugins, IDES, etc.
 
 *go-1.4 (11 Dec 2014)
 
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 6f87670d8616..94874f201654 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX go-1.2-no-Werror.patch 230 SHA256 65d38b9485da2ff9417a2c44a81b6e52cc9bd2727b27e7add10d48a63805d4a3 SHA512 3cf139723e6ff0cbf7aaf76295fe4208f2062f2d4086e36d05cad83919217b5355e0e79b0b515a06a578389301bd07b062cb58b98fc0f9e4badf190cd1c34826 WHIRLPOOL 589b081bccf4afa015abe615c9d14b05ee2d2562b9473f8587456cfa8205a20483298f987d6bcf02630d17c2fbf3cc461e246ecc8e7602a89fc975ff3eefe172
 DIST go1.3.3.src.tar.gz 10049379 SHA256 1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff SHA512 159872b7764986eba6641a5ebaf3aed3d6066bcd384672068354359099e52035b25bc819582d022ef8d7d91e244269cb38917e13c4d3eac8581831d41b2bac2b WHIRLPOOL 512db88e8503020fefc70acec7745b4fca0b8f4c4e20f95992633db3ac6a5db395d9e15d17b4fa8e385a6b88c8e03462a287e2750a5667596807b2131dfa137c
 DIST go1.4.src.tar.gz 10911274 SHA256 3ae9f67e45a5ca7004b28808da8b1367d328a371d641ddbe636c0fb0ae0ffdae SHA512 5bcaec5e62aaeb7da7148c24b5d176e7756ad9cbdd4cbe848b53ac9bcf93cf162bde81cba79af82c075e4ffd0ce51ddc68186de88064b8b3fda04cc9dcef65c5 WHIRLPOOL ab7b4251ac0ceab0e64e9b9102a02a9b92c1cd056554ecf23e82b40508227c9f7a72d2f676409ab9b100707cc97c1ff30f3e71a458592ab4c53313565dcaf86e
 EBUILD go-1.3.3.ebuild 3490 SHA256 7fd4dd70898e47f5df5cfbfae891a97bad4f611870dcde23f94076da05e9116b SHA512 0adb62fc8767a9150f77ee12f66287b0e4ca714c30aac0376d29165f1bc8bd69c552d039899fd5b23f546e1018af955962a7544ff1fe643bd9b534ddfdfb8540 WHIRLPOOL d98a579558fe6112165c74a0f3ef46f6c181f8642222025f22f14a721a2f37ce5968c63c08dcfd2d1f0c58e57d1900d0af822f77f2b45915ec5cecdeced266bf
-EBUILD go-1.4.ebuild 3558 SHA256 4d81890d732daf5601329514ce65eabaf34ddf321b3dd12b57b8840f4bd617b6 SHA512 44de9fe01c0219b258f0be859dcb6fa983516b8d4e323ed972e20ccb4f5fc2dad2bacfbbb34c3ceba5a243d35f38b54ede220fed0ef1be72e0362fe25215789d WHIRLPOOL d8a7f3b0a3167946baf9ce86c658b32fd0c13268502702c0dccccca634fba46433974404b8df5e618ae2cf98093fc6ef1456aadfc2eb2310b4c50519c0c358d3
+EBUILD go-1.4.ebuild 3142 SHA256 d53857d9398e0e83fac2dd9028c04d9866fafe507a63534c53efdcab7b206e95 SHA512 af922851a93a339c7493d7847db3f4dc8c56b28cd6218bd12e49e346243e5a202d560b7c6b81bd14ff2ff7d1cb76da97a0dfe08e9c5f3a229c2ef4eee74c3e3b WHIRLPOOL 5bbad17c6cd6de907720ca0f5c3665c7bd588dad0a600c4af4c98da1bd7acd2ef267479f60696f5d7b78b71df91744009c44b47fd010ff66cf9df328326f16d3
 EBUILD go-9999.ebuild 2683 SHA256 3107f2b143c840800510169f9fc6c6b83e7d8886f4a7781215337a2d732458c9 SHA512 cdd9033b75a0fba02b8adc475d350d1854fbc98164003edd1103e87859bb214fff9aff15a7646c26b4c7fdca16484c6ad0863e5608e14a7bdc4747da6ee61e71 WHIRLPOOL c6fd488e5e46e6e770325450023b2ee4e59132044700d458dc534342550e4edf0887800971e93611b63bb861ebd4a4621db726e9a64819384786bb2a1b731164
-MISC ChangeLog 7195 SHA256 947eb2f909b32f14257a733d3add81ef1105feac1a97a44e218931af2a2ea1d4 SHA512 c55a1e28ca6deb1fc54de2fa2c310cc979acffe8b7244d4dc4e72d11cb3a782a982c3d9bf00488e6706d6737cebaa6376f29823518af300073b03a407c7ad258 WHIRLPOOL ba80f3bf9ca0b1889cd490c82e67555436a8c6f2e0b08eccde779219abfe83fea9e55e533964ea7b73cc3f3b60b3d61eec3247cdd43a9cc9ca4e05d8f5d6721f
+MISC ChangeLog 7341 SHA256 6524673fdeb83323f9c460aa4cace720fe02335abf333f2004487994e9f56302 SHA512 ba5fb81bdd9e9155d8562b409024803a7f8ce0124e7b4f331d21f1f4d3e8d21d03f07e0879c6dec62b90e003afc1186234c672fa7631210959550dd1ad034ae6 WHIRLPOOL 4597140d4387e353c46d5d6595c4250b78036f1022956815c88eee4f96eb0bdf60bfbe13f12da2fa99717730856c8ac8824668034bb31ca824fd08a754682103
 MISC metadata.xml 448 SHA256 d53ad6b454d72353e0308a91a989a1a3345ae97c0199748dee1862576ad4476a SHA512 0c5fb551437353e87f87c91e576ef224b770f686700150c19e7f34e6903ba26910293bb74db9732a220006b873113662464646dd96e61503e4aa90cc84e14f75 WHIRLPOOL b3846a0fad8844ad7ec961b512cb12a9d588bfac28b2dc53798399ac8628ccbf6c06c5666b03eabef05b0acb0cea04d563252eaaa893341c5b3fe59475ffdab5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEAREIAAYFAlSJzoEACgkQblQW9DDEZTjkYwCeLAAtMMMAmOEc0wwKELPnhzz/
+Xu4AnjSQR5nU+iG7EZnpZqGBRzauGC+q
+=7Bwa
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/go/go-1.4.ebuild b/dev-lang/go/go-1.4.ebuild
index 1cc556c99c13..ada7bf8a6db8 100644
--- a/dev-lang/go/go-1.4.ebuild
+++ b/dev-lang/go/go-1.4.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.ebuild,v 1.1 2014/12/11 06:24:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.ebuild,v 1.2 2014/12/11 17:03:50 williamh Exp $
 
 EAPI=5
 
 export CTARGET=${CTARGET:-${CHOST}}
 
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils
+inherit eutils toolchain-funcs
 
 if [[ ${PV} = 9999 ]]; then
 	EHG_REPO_URI="https://go.googlecode.com/hg"
@@ -22,12 +22,10 @@ HOMEPAGE="http://www.golang.org"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="emacs vim-syntax zsh-completion"
+IUSE=""
 
 DEPEND=""
-RDEPEND="emacs? ( virtual/emacs )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	zsh-completion? ( app-shells/gentoo-zsh-completions )"
+RDEPEND=""
 
 # The tools in /usr/lib/go should not cause the multilib-strict check to fail.
 QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
@@ -61,11 +59,6 @@ src_compile()
 
 	cd src
 	./make.bash || die "build failed"
-	cd ..
-
-	if use emacs; then
-		elisp-compile misc/emacs/*.el
-	fi
 }
 
 src_test()
@@ -88,38 +81,18 @@ src_install()
 	# installing the doc and src directories.
 	# [1] http://code.google.com/p/go/issues/detail?id=2775
 	doins -r doc include lib pkg src
-
-	# the bash completions appear to be gone from the release tarball
-	#dobashcomp misc/bash/go
-	#bashcomp_alias go {5,6,8}{g,l} gccgo gofmt
-
-	if use emacs; then
-		elisp-install ${PN} misc/emacs/*.el misc/emacs/*.elc
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r misc/vim/ftdetect
-		doins -r misc/vim/ftplugin
-		doins -r misc/vim/syntax
-		doins -r misc/vim/plugin
-		doins -r misc/vim/indent
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/zsh/go
-	fi
-
 	fperms -R +x /usr/lib/go/pkg/tool
 }
 
-pkg_postinst()
+pkg_preinst()
 {
-	if use emacs; then
-		elisp-site-regen
-	fi
+	has_version '<dev-lang/go-1.4' &&
+		export had_support_files=true ||
+		export had_support_files=false
+}
 
+pkg_postinst()
+{
 	# If the go tool sees a package file timestamped older than a dependancy it
 	# will rebuild that file.  So, in order to stop go from rebuilding lots of
 	# packages for every build we need to fix the timestamps.  The compiler and
@@ -134,11 +107,14 @@ pkg_postinst()
 		${REPLACING_VERSIONS} != ${PV} ]]; then
 		elog "Release notes are located at http://golang.org/doc/go${PV}"
 	fi
-}
 
-pkg_postrm()
-{
-	if use emacs; then
-		elisp-site-regen
+	if $had_support_files; then
+		ewarn
+		ewarn "All editor support, IDE support, shell completion"
+		ewarn "support, etc has been removed from the go package"
+		ewarn "upstream."
+		ewarn "For more information on which support is available, see"
+		ewarn "the following URL:"
+		ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
 	fi
 }