Removed vulnerable versions

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

4 files changed, 19 insertions, 172 deletions

diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index 2ba4173abf84..9ecbcdf3baf5 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/fish
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.72 2014/12/03 09:57:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.73 2014/12/06 09:32:54 polynomial-c Exp $
+
+  06 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -fish-2.1.0-r2.ebuild,
+  -fish-2.1.0-r3.ebuild:
+  Removed vulnerable versions.
 
   03 Dec 2014; Agostino Sarubbo <ago@gentoo.org> fish-2.1.1.ebuild:
   Stable for ppc, wrt bug #509044
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 80795ea04bb8..96777741f89a 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -2,28 +2,24 @@
 Hash: SHA256
 
 AUX fish-2.1.0-tinfo.patch 1037 SHA256 eb6c44ec4d5ece0dbe305112504083f011b3999c274fc86786a7bf9c5ee967b4 SHA512 8ec3c9a003f30a4e05685de1492bc3a795dbbdb1cd5ab95769fc3a8f9df478e15f64a12730e71ed4d2485867c0a59268620ef3ef08982d0a481282f9a20d59a8 WHIRLPOOL e594423661107afb10b09acac4026c58ad708eac27ae3781dd4056a8ddc29d7b12fba66709fc0077f5645905907b00a849515e9a0e3c98a035920177363f46ec
-DIST fish-2.1.0-docdir.patch 1925 SHA256 9a6ed852cd58a9d8a24ac2c222026f1e6f6aa7bb8e515b5a1aa64414dedb81b5 SHA512 724120855bbb4cd6c9db440ff9b001a92c01a67f75c86be95fc890c52d3802f6857c27ee989f183a39aa5aace576fce72e9e36c6b7f0457f1ba4c9d6f54efb6f WHIRLPOOL ca31e6560bd36147184443b84ad96987003cfb486d14fccb74f19a88489f355814ed2ac136b4fcc14e5fb9986b069a395ef4e60aa0a30a0ce55d893499711003
-DIST fish-2.1.0.tar.gz 1707921 SHA256 af527af9d145df5675ca3031c1a87007d4f4753a1cde49da88f4eb883a1cf044 SHA512 cd8a678df948baefafbf54a14ece7b52fff6620939d82ba0d0f4cd8ad1ae59842a847231de8465a4471e48fb86866f1113bba4ec9cd6433851bb538b1f965075 WHIRLPOOL 45cf56f2711380764065963a374f7613d83f07c8c2bc7e9724c5f2bfb55720989d52dad2bba85354013de98af58c10dad64a2cbc2b6f409f997f2ed8a2720881
 DIST fish-2.1.1.tar.gz 1681744 SHA256 b7e4d3c3d55fc3859edcb20462fcf0d14ab26e920eddcd503072e8105284d924 SHA512 c6b41a7514d684bc165bdf03edd0f07b0cdfbcc827a3bcc6e9105bbf6b94a60962bd7fffaf5f9c44c450da3d4b6af4bdcf72fbbaaa043851c631d8c2a1344dd6 WHIRLPOOL c6bcbfea35d68f99903633f06a436cf982f6fc01123cebbb4342be1b3f3be106c0ac144d24b2069bf34bc7e3540d26526a8ef8b74e4f27255525ad0d7cb70774
-EBUILD fish-2.1.0-r2.ebuild 2347 SHA256 ccc834c91865be589c9d5976df4a85048a9bab859c1404f9c608539cea170e70 SHA512 ccb416a1e043329e41bbe4b2cc9b1030ddb9d0461ad33d10cb0cd3a801b40f751cfa79086f6eb56aa18fe57cb5d5442294ceadba0a5de485d83055731b8143b3 WHIRLPOOL da6a55b754909190ba7529c7aa8d0d1f2c8fc59e412f1a29d25f7c0bee93a26f0a774ef7a4c1cbe163324270f96a110bdf824ba45e379c795d7a63faec761df9
-EBUILD fish-2.1.0-r3.ebuild 2397 SHA256 3a02301f8bdc3f21388689626ccafafd3a89944e6cd432b0790345aba58763ac SHA512 f76a2e48b54a006f6a2ae4dcdecf87d5cfdfde61071810cf4facd50e7e4ff52de6e8eeb0f2fbe826b00aca518f1638cf15e1153ffba650f04359db25b2637660 WHIRLPOOL 554cc5e68cccb872dadf1f479957199658fae3fd519309bc956548813ab69b0733d264a0079ad5320998c2f0e32b06caf7db7c12dd21059ba2be42dbcecc3308
 EBUILD fish-2.1.1.ebuild 2234 SHA256 15464fbd019168e2ab0d4c70a6968a98dac7626000d7720116c6b664e87fed9f SHA512 e52c71c5409404ea339058b606d6183a7e4bd7062667b702ffcacf8aa914fdb06a414c295e8113ba8f7ac04201e851266b1510318261da4b0f08da33a12936ba WHIRLPOOL f5594c5333b3ad0371a70c1d47f3bae9d02f66b17ccefc25cfcff2802201c8008c3e7c5a6fc15980a9f64d2ee63d61d553c3e422f31e5bf2e6a6a609b60fb3a1
-MISC ChangeLog 12895 SHA256 40943317ff60a4a5b296dd1e10cd4c814946703b97c6abf65926907fe9db1462 SHA512 76f9dcb3906706419b17f91e02e8cb0830493b9e8e1df01a41cefef9205f5fa4eaa141c09f3a0397c1994da1c4659edfe058eab4ac530c6a1b13f8a3a2b9090d WHIRLPOOL da0dcdb16bd2c4f45f79c7d5bedfbcebf22dfeda691fff91590eb06a709bd3f9ce61d7cf309b43b4722eb85f26ba9f6a566a4222037800bcb13f2799ff2b5ec5
+MISC ChangeLog 13038 SHA256 388d55d93cae80404251e09c997e826791643aa4e2188811d937c0e6f520b947 SHA512 0333f71a799381b24c87e3ea3a7f05fda602d59ac4912d1a81a51a9e42128abf497d050d8b3e03ea6ef84e376f1a524ac6a96ae2a0e09391db65c2db24fe7528 WHIRLPOOL 7a923bb55366fa6d1716f9ca1fddd3c55035e6911be227cc7742994aba0ece0da3df9e9d4906afab5d3d48feca4007a235dacfd9e0a897a79078b6781689ea3e
 MISC metadata.xml 237 SHA256 97e2852866e146fd242be6cddceb93aebc2b28056cdafa3ff688a0cfc97a5065 SHA512 d21eed02cc15021ad5f18c4c932afdf4d6cfbb64a243764b61914aac9e57f6089ebb9e3a37e136e5bb7bf4f28d29bba49279d52a75acc3a6f921c770213758a5 WHIRLPOOL 92462bf73803127a88d9e2a02503d36efd2b8f1c938f3f2c00145db02871ea9ce241eba371138b6ab80c4774f858250b5eba08886ff355c0f212bfbc2cda3d9f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUft5+AAoJELp701BxlEWf+2MP/3CAgdd9DIyzh8EE1NKGItNF
-mlCJdm0qDJPYy3hEKHThtWyJh6wyQH8AnqrF9X1QvzR0v9LMcYrDA9UBy8DdgfqF
-lxzXHQIROkQ+coghmdEnjs24WsNBRD0K7IY/SEtSwk4YVzhiEYr1BHEQmFvOzkuW
-vtBhvltS100y2ErhXM/btZEzkGbne6OnfRL1CcYJYCqJIyUhd3aHyl6z+CWaqkP1
-ZrFARyfXF0GMbiL+XmbLYhAGE/QVUkkyrjcNHI4378EnZJkjTSEAIrir0RJNlco3
-QhPz1yPNb0jyVFRmdyIzbAIDmfCJLUqV77MZMjb8JnH6+9sVNewN8Xzwg9G1GgTd
-TfG4ollSVqxdpGTU0CFUXZtbDdkoJod+ibYcUK0G8d5tWTKpZhJZKdzEHnsuvcRA
-ir2eqolQpn0flKM1yhVIMBHfZ1bSM4fH9KV3nYe/Hq64MDnBRvId/HPFX3ETE0U+
-SzlhUXIf928Ii+qnB4YVsU/xJtkNwRAWmucb6EXKV1pk3AyH/T53K/w7gJCG/LYV
-XtIBOZqLkNSWFM1Vn7/F1SbdRQ7Npms13J8knkeSg4DdYm89biEN6NWLwvrZysKL
-awp++AzY4q59HaP/1eLXoQcOuw5QqXoMc/zKqZEKG7OAC5S/L2IRkvilcx0jhLLb
-B7RzrPPJ7a9tE7H+5Q1I
-=Og+h
+iQIcBAEBCAAGBQJUgs1HAAoJEPiazRVxLXTFss8P/ilxkbE3aRyx5zXyyXL9a6BB
+pZrLAm5MS2XYc707sV+3FVbyp1DJLczYt/QFecRqOpWbhN+jhfKPZdmQ8yKfs7hg
+EhhvwXz18FsPmiWEttACQf/ld2qGAxm+/Rpc/NK32yvX9UwhltQ68yBZJvSMyjHv
+aJ+T+Ts4YiPZFlG/77vThgojwsgqCcDtGY9RBVUzUy8IOY/7AcQvBEAHTXLXFDI+
+zbNiABhCHOabhnyzD75EetFng1unX3x/mvlBlt5nsCyH+/LHpz4F/hPhoGF4H63H
+ompUDc0Ho5vfs8PxH3mp9/w+cbc+zvqSyri8jwewMZERZdj6HB1mpGEIhI/mSCzg
+sYIHJd5yhImmlQj1/q57zeHr56O15gI5uogM7BfU55XJ7PILW8gSMFGvgmj86kqr
+z7nu1jOdn9jgXYfkWXCwHD2y+4jZd/UFkipZbs7mxktR86OeRtYcsvhuQN7Qixy8
+0CgkAt2Zo77lo5wrC1nszfeb1XM+Oya+U0A2dB/6Y5RYAaafbnkuz1cLim+xNaXQ
+nHoE5y+5riLiN+KcMRBmJg8v0LwHVklgtn8M+PWnA+73cURL5b/xMuzYL4s6nU2j
+cDaJurRBZ9Vxetg7VtKfMT5ur0HJsbhpFgBUiRS9uo0stoj8/UrZ/kFNAyJ+s7UL
+qUBWNx8z2SffWOaWH/FN
+=NSYj
 -----END PGP SIGNATURE-----
diff --git a/app-shells/fish/fish-2.1.0-r2.ebuild b/app-shells/fish/fish-2.1.0-r2.ebuild
deleted file mode 100644
index 65a9c63669d6..000000000000
--- a/app-shells/fish/fish-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r2.ebuild,v 1.5 2014/08/09 12:12:09 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit base autotools
-
-DESCRIPTION="fish is the Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz
-	https://github.com/fish-shell/fish-shell/commit/9a3643501607bff8b314977931916081dd39646a.patch -> ${P}-docdir.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="X"
-
-DEPEND="sys-libs/ncurses
-	sys-devel/bc
-	sys-devel/gettext
-	X? ( x11-misc/xsel )"
-
-# fish can add man-page completions from lzma and xz compressed man pages
-# through a python script. That's why we depend on python here (bug #490478)
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-docdir.patch #489934
-
-	eautoreconf
-}
-
-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.1.0-r3.ebuild b/app-shells/fish/fish-2.1.0-r3.ebuild
deleted file mode 100644
index ee998d40ab08..000000000000
--- a/app-shells/fish/fish-2.1.0-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-2.1.0-r3.ebuild,v 1.1 2014/03/03 00:45:14 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit base autotools
-
-DESCRIPTION="fish is the Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz
-	https://github.com/fish-shell/fish-shell/commit/9a3643501607bff8b314977931916081dd39646a.patch -> ${P}-docdir.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="X"
-
-DEPEND="sys-libs/ncurses
-	sys-devel/bc
-	sys-devel/gettext
-	X? ( x11-misc/xsel )"
-
-# fish can add man-page completions from lzma and xz compressed man pages
-# through a python script. That's why we depend on python here (bug #490478)
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-docdir.patch #489934
-	epatch "${FILESDIR}"/${P}-tinfo.patch #459768
-
-	eautoreconf
-}
-
-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!"
-}