From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 04AD41396D9 for ; Tue, 7 Nov 2017 12:50:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56B5BE0CB8; Tue, 7 Nov 2017 12:50:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27D35E0CB8 for ; Tue, 7 Nov 2017 12:50:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31B8533BF0B for ; Tue, 7 Nov 2017 12:50:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 979909810 for ; Tue, 7 Nov 2017 12:50:20 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1510059015.c75e9d17844d466093d64db626d319d063deb417.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/fish/Manifest app-shells/fish/files/fish-2.5.0-honor-linguas.patch app-shells/fish/fish-2.4.0.ebuild app-shells/fish/fish-2.5.0.ebuild X-VCS-Directories: app-shells/fish/files/ app-shells/fish/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c75e9d17844d466093d64db626d319d063deb417 X-VCS-Branch: master Date: Tue, 7 Nov 2017 12:50:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eb9d154c-771a-4ac3-b651-de7ba16e4e08 X-Archives-Hash: 9633088c4e5fcd6adff68aa62c2683ea commit: c75e9d17844d466093d64db626d319d063deb417 Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 7 12:50:03 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Nov 7 12:50:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75e9d17 app-shells/fish: Removed old. Package-Manager: Portage-2.3.13, Repoman-2.3.4 app-shells/fish/Manifest | 2 - .../fish/files/fish-2.5.0-honor-linguas.patch | 32 ---------- app-shells/fish/fish-2.4.0.ebuild | 64 ------------------- app-shells/fish/fish-2.5.0.ebuild | 72 ---------------------- 4 files changed, 170 deletions(-) diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index 4ecff87b779..84fd66c268e 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,4 +1,2 @@ -DIST fish-2.4.0.tar.gz 3455874 SHA256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5 SHA512 b27a2291c284fda7a12b3cd5dcba8dfcbf2738f50de40d9aac1500afa3bd98be04b4f67d7e6d3bb2f808c11a8c2dd6b1b5cc2dfe3e8e0e7d1bc88f8d8994d57b WHIRLPOOL abb9c31237a33553b25920fe3284f4ca90941aed2b8f1ec4b69fdb4231f7b2585f0292bc647ffe3acf88f6b01ac61931f615fa9a56ede35a8182e3a69aa11861 -DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 SHA512 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d WHIRLPOOL a16d5f75e95573f2b766527fb124d99083a7ab84522a4826cd5b3aaf3a73ae6728f30defbd0598698b496f279f686eddcb4e81779767e89888037abe0b908849 DIST fish-2.6.0.tar.gz 3575346 SHA256 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1 WHIRLPOOL 3316c1bd8778a1eba5b7b65edf28495ec89ec01ba3d0bc26cbc64ce69bfcd73a538c9a5463c9385f55689e3e680241d37e36bfec309f87c6ee98934f74fd7aa4 DIST fish-2.7b1.tar.gz 5760393 SHA256 326dbea5d0f20eba54fa0b0c5525e58b4a39ebd8c52c14cfffc5f4d6cdf55385 SHA512 75e9351eb8179d9a21915d6cbc8d042f595e9fd3120f2ab7ad503fde5d59c9d965cc01ec599c89d7e6c9b3ef3e175b91e6c750427e146a0649434ee121a7c17c WHIRLPOOL 3ec2707d4bd2d8726c969e7aadd665d29adc89d1e6e78918a509c275ec289c1cfbdab4e6271b15ad2bd47a292dff00c312ed0735e1ef34ae66dcbf5c8c6bcae1 diff --git a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch b/app-shells/fish/files/fish-2.5.0-honor-linguas.patch deleted file mode 100644 index 843036d6e5d..00000000000 --- a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 35e63ae..b73c612 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -195,11 +195,16 @@ ifeq ($(shell uname), Darwin) - endif - - # --# All translation message catalogs -+# All translation message catalogs, filter files based on LINGUAS. - # - TRANSLATIONS_SRC := $(wildcard po/*.po) --ifdef HAVE_GETTEXT -+ifeq ($(HAVE_GETTEXT), 1) - TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) -+ifdef LINGUAS -+ TRANSLATIONS_ALL := $(TRANSLATIONS) -+ TRANSLATIONS_WANTED = $(patsubst %,po/%.gmo,$(LINGUAS)) -+ TRANSLATIONS = $(filter $(TRANSLATIONS_WANTED),$(TRANSLATIONS_ALL)) -+endif - else - TRANSLATIONS := - endif -@@ -764,7 +769,7 @@ uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show - .PHONY: uninstall - - install-translations: $(TRANSLATIONS) | show-HAVE_GETTEXT --ifdef HAVE_GETTEXT -+ifeq ($(HAVE_GETTEXT), 1) - @echo "Installing translations..." - $v for i in $(TRANSLATIONS); do \ - $(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/`basename $$i .gmo`/LC_MESSAGES; \ diff --git a/app-shells/fish/fish-2.4.0.ebuild b/app-shells/fish/fish-2.4.0.ebuild deleted file mode 100644 index e4b272b5639..00000000000 --- a/app-shells/fish/fish-2.4.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) - -DESCRIPTION="fish is the Friendly Interactive SHell" -HOMEPAGE="http://fishshell.com/" -SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="X" - -DEPEND="sys-libs/ncurses:0= - sys-devel/bc - sys-devel/gettext - X? ( x11-misc/xsel )" - -RDEPEND="${DEPEND}" - -src_configure() { - # Set things up for fish to be a default shell. - # It has to be in /bin in case /usr is unavailable. - # Also, all of its utilities have to be in /bin. - econf \ - docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --bindir="${EPREFIX}"/bin -} - -src_test() { - if has_version ~${CATEGORY}/${P} ; then - emake test - else - ewarn "The test suite only works when the package is already installed" - fi -} - -pkg_postinst() { - elog "fish is now installed on your system." - elog "To run fish, type 'fish' in your terminal." - elog - elog "To use fish as your login shell:" - elog "* add the line '${EPREFIX}/bin/${PN}'" - elog "* to the file '${EPREFIX}/etc/shells'." - elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'." - elog - elog "To set your colors, run 'fish_config'" - elog "To scan your man pages for completions, run 'fish_update_completions'" - elog "To autocomplete command suggestions press Ctrl + F or right arrow key." - elog - elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the" - elog "browser of your choice to get acces to ${PN}'s help system:" - elog " BROWSER=\"/usr/bin/firefox\"" - elog - elog "In order to get lzma and xz support for man-page completion please" - elog "emerge one of the following packages:" - elog " dev-python/backports-lzma" - elog " >=dev-lang/python-3.3" - elog - elog "Have fun!" -} diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.5.0.ebuild deleted file mode 100644 index 6d94ff16ddf..00000000000 --- a/app-shells/fish/fish-2.5.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="fish is the Friendly Interactive SHell" -HOMEPAGE="http://fishshell.com/" -SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="nls" - -RDEPEND=" - >=dev-libs/libpcre2-10.21[pcre32] - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - sys-devel/bc - nls? ( sys-devel/gettext ) -" - -PATCHES=( "${FILESDIR}/${P}-honor-linguas.patch" ) - -src_configure() { - # Set things up for fish to be a default shell. - # It has to be in /bin in case /usr is unavailable. - # Also, all of its utilities have to be in /bin. - econf \ - docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --bindir="${EPREFIX}"/bin \ - --without-included-pcre2 \ - $(use_with nls gettext) -} - -src_test() { - if has_version ~${CATEGORY}/${P} ; then - emake test - else - ewarn "The test suite only works when the package is already installed" - fi -} - -pkg_postinst() { - elog "fish is now installed on your system." - elog "To run fish, type 'fish' in your terminal." - elog - elog "It is advised not to set fish as a default login shell." - elog "see bug #545830 for more details." - elog "Executing fish using ~/.bashrc is an alternative" - elog "see https://wiki.gentoo.org/wiki/Fish#Caveats for details" - elog - elog "To set your colors, run 'fish_config'" - elog "To scan your man pages for completions, run 'fish_update_completions'" - elog "To autocomplete command suggestions press Ctrl + F or right arrow key." - elog - elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the" - elog "browser of your choice to get acces to ${PN}'s help system:" - elog " BROWSER=\"/usr/bin/firefox\"" - elog - elog "In order to get lzma and xz support for man-page completion please" - elog "emerge one of the following packages:" - elog " dev-python/backports-lzma" - elog " >=dev-lang/python-3.3" - elog - elog "If you have issues with cut'n'paste in X-terminals, install the" - elog "x11-misc/xsel package." - elog - elog "Have fun!" -}