Version bump. Removed old

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

diff --git a/sys-apps/which/ChangeLog b/sys-apps/which/ChangeLog
index 4ce6a9139d0775b6fbba93ae8879634799bf8822..baeb0bd699bbe6663064dc7ca5387ead4f2e952a 100644 (file)
--- a/sys-apps/which/ChangeLog
+++ b/sys-apps/which/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/which
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.58 2014/11/15 08:08:56 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.59 2015/03/21 12:28:37 polynomial-c Exp $
+
+*which-2.21 (21 Mar 2015)
+
+  21 Mar 2015; Lars Wendler <polynomial-c@gentoo.org> -which-2.19.ebuild,
+  -which-2.20.ebuild, +which-2.21.ebuild,
+  -files/which-2.19-remove-readline.patch, -files/which-gentoo.patch:
+  Version bump. Removed old.
 
   15 Nov 2014; Mike Frysinger <vapier@gentoo.org> which-2.20-r1.ebuild:
   Update HOMEPAGE/SRC_URI #515528 by Manfred Knick.

diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index c9dfe328e60cbf49acbd59f0b349878fa35cd5f5..b5e4ed1714d8ec9f87eab64dae02f789e43541e4 100644 (file)
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,29 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX which-2.19-remove-readline.patch 367 SHA256 f6f5ca5ee6d108b8e3c8bba090df203a9e35919c3c2fed47d7235b21aeeaf4ae SHA512 83959ee7733775fbe232a485ba7be930d5fe88fdd1049098d397085fe41fa515a5a636ed6e0a1d4e927c20579cc3366067b321ce215282b7334f29b54659f450 WHIRLPOOL 8cf5f71e9579fe5c688b1a423e7867ba8e2e0f84f3ce6849dd870da7ac8abd7d18e0b51a6de3d1dcc29619a9936a5a1a5ad40d212d3e17de63a27ede734fe3eb
-AUX which-gentoo.patch 340 SHA256 8b53ab961fe5d275451900313b64bffa407378ab0619220bb6229072035d3a8e SHA512 7fb0adba1f3b75bcc741704dbca0130d61c3009dddced9edaca094be4090cb0986e9554b166ad976acce414a944f57960a2b774ea8c5af914c8334603ecd4497 WHIRLPOOL a700ebe9e081fc4d34dc6e70bd32de3521bf1a44bdf8dc318de3f38a6004a83d37b47d2a58f79f986e1b60ae70e1b6856498b0c8b42ddc6676d8c9db29bf1a69
-DIST which-2.19.tar.gz 132810 SHA256 7d79b874f65118ac846a0deb31a8fbd6816cd81e74930299c82103765d45cd52 SHA512 15cfade28ddb5e09ab485387b7389dd40c9b008828743f46a92b8c1f50e7ea925577eeb8fc5eaa5cf86a75b9fda56b834cc6a7c266b9db34b7fcec03d36e8200 WHIRLPOOL 91fae9438c54d3a485d0cfe73e80e772b67a42c711c8478a234aad41d7713c5d96ccd79b7083c81d9e143cb820a45b964af789b242e903d26abf057eb2a2db9c
 DIST which-2.20.tar.gz 135372 SHA256 d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8 SHA512 29445cd6072814d3a6179b53b8f9e7e3fc8a27b77315f2a04171e177397b91ff80a97db8806fc6b1f08dab8cbca6f208d9d7845858268b121b3af396a4a9062e WHIRLPOOL 35ca3dfc47e6112a2827188b979bc19d369f69f5841dca445039036e6fa5423b0e4e9efddd370f92da16a3873523bf37f7bdf68b748fc78e5b7991290875c49d
-EBUILD which-2.19.ebuild 797 SHA256 2f4d079705a963d1b7e570730f2450c50d7a344fae8e78f93149f7f46615016e SHA512 a438d7df1e7dfe46ad8e3c72953fe33d62bfd20160435a90b5bb1248face917404640c43cd329bbb6e6575cc1f0a48db95d15c6784c96175e821c124e83e0e44 WHIRLPOOL d38752db49d82e2831fc72b24d63bdfc774d5f7231543ce4d1b5c6f09939d83945c2881316a192a10f704528465a1d22169e50679cbe2c2431a49ff191b0913d
+DIST which-2.21.tar.gz 149305 SHA256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61 WHIRLPOOL e1712d2f2b48467300f5947d0a72c0cf759bc33001661ba41cd57cefe21cb9974cc318748d76ff73c71fb869c4d7a445973ad95777ab380f673c85095360fd57
 EBUILD which-2.20-r1.ebuild 866 SHA256 3d390352a2789090c5e8dc64b653cac6e09078126ff9e8f554fb4ef50e4d3651 SHA512 c209a2594edf1092e0749839acfa0eb44c1ee9b1beba34007037fa831e08ebf55c2d9a38bcccbf646aa99b3b4734e9363c9df3d5e29dbf54565fcdbc9387ecce WHIRLPOOL 78c546e15f3d27270374f40a687895c168434fd4422d392995a28f7ea0e0506f8b74e12e12cd9b59a528e749efaf20ac02387fb8bd6d6957e57a284bc6c5c2c1
-EBUILD which-2.20.ebuild 826 SHA256 90e5e134dd417110433bb8800f1f0828d33ad1b21497421588270d5241a5cce8 SHA512 8ce53bb04081a8e62440456e3bd2d4ce974b3fa76c21b02b72dd04cefbaf796db80ad227bc029c26c3e99b3512ea7ad9b948298c5896dd0c369a1c25fb7b313a WHIRLPOOL 3a886cafe79b8712ad68d319d759d2214cd886ef9aff5207a5937f6b453c23cfd461596e82c9fa55e989db77a46a6c2908af6883038829f3c734341cd871377e
-MISC ChangeLog 5834 SHA256 bde8d08eaec6da40c798918c4b4095f2c0191f84b636123805874eb914212704 SHA512 5dcb55eb3a548f8cf56f1c2513909bea0042714587b835824c02234d5dd880613eb6b3c8a4c3e44f4b082df783d469349a7fa55d17dbce2a58f6348fc84f55ad WHIRLPOOL 9434dd4b432cc956c58f57c24dfbc3783ae6535266265714408b91435236071fb68ac8604dbe8be41e150cf9801057fbac83ace642e8566b8fce1571f5a376d0
+EBUILD which-2.21.ebuild 881 SHA256 af798a9e191dab5233958458a441ce15b15249af6627e96d0c6923db9786e802 SHA512 f77e3ac9d533e5a9da10c8c33fe63656b21e1bb9448549c170966ebb687ac4aa6678dc7e2ec38a77b4c838f799a335bb8884f9b15aefde771bb99f73ad0af035 WHIRLPOOL eedf1fe5dfe7821f1ad0377abcbbea315e64c0fece9615e060564149487b5691ced072c09739ea95df9a60c6fe6cc5d6edaae7327b49ac90937d1931458a467d
+MISC ChangeLog 6083 SHA256 35b22ff565712767e514c94500a653f01263f27054ce4e26760c7b3a0c6389cb SHA512 94f51ab2182652d46bf6280966ae9a663ba990fdb9506a379d29146ce6cc9d68c6c173ce8599352abaa6baa041ea9af5b4557c2ff988542d90281753bd93ea14 WHIRLPOOL 7c0c7f7a840df07298d88175cea8b90da04e92b403201dde48969d393a9e30ac417d2daf485f0286879f14ea0e00e24041d4bc3f61d254dee285f1cdd7e694ca
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUZwoaAAoJEPGu1DbS6WIAC5gP/RMeLNY9kCZUpn7AVp67jOFh
-CAAeFAOM5DFZsgnAOIXgsICECS0sQSDXfOGRzQ0HVxO3/XFN4ZHZ0GzxlEz6BLMZ
-YFC0MOcLXHUGULQN8GrIfF+Ws7nnMX8ek68+vmhN+nMrktTK1sMnFPiZJQ/1j6Zo
-2MTUxcUKMH6VCsFfekfLvYtyB36SK5ENfUyFPLsbkjCbrX5NvJbaFg5Iv/SWc60p
-VXW3Tl5JIIhoHO7jB9ehfgaNunnoDp5Xlb79/dEPdwlqegrN7KSCVCxyBZe2iNRb
-uqQaLoXltB5rQGTYzWNtwkAgbXQ/vXtqx6OO8fr4Xj8CCmei1h+zRwY9Cus3Ef31
-bTCAIE2l/Goqrjabo6ZOohmsEBvy7g3/e/652Ol6kZH5HfRLKZgdnMdFJUlJIwT8
-vlIWt8TAFhbSRmvzib0cBe1dWZuOPGCeK1DJX17oboNNVR4iVi4OL7d94Vjihm/U
-DINiijZgsBMrM5PsA4QzXacPCjXwkfVLfdt9j0O1X87Npm0/mFhsS5z4KLD/pC4V
-m4NxWY9tppS2HZJxyd/rfEWdU/h2UCIKXYA/MGKD72Ae6pyyC4pg123n1hm2T4iM
-zSINbQV3ODkZRDuVqt5J/e7/TXk5iWok0qxSeDKdXeoySWorV7Gkbrjt3hMbbsTs
-WPsRKrrTQb3htX+FHHDY
-=9Irv
+iQIcBAEBCAAGBQJVDWP2AAoJEPiazRVxLXTFtCAP/Ax7IYaFutx+r0me0rP/Wgle
+eHWi5LAQtANzNu0cmqn3uZeceKFRXtCvg2ihxV8WHcFpE6AfFM966uTkXv+GVx7c
+oZquMJ088wtUKbPw1C+nw6W5MENdTcMxe5WOQtyNFI/LZzIMNoAWj5yCdLF9PPxe
+IkHyGdhqKSy/nfLBGVga7IVY+GPuRscB63rh5EAE6prBZsgi57xnYA7i33E9d7gd
+xi+9iIb8kXoZQnmXMonWoLpt1v9tmLFprsZLkeDH+6ClDKf0kA4d9jPEaZ2my+dF
+9Nzo+PHi8PoaWcIiox8uqdnJ5sa3JPdIuFM/EbsjLLan1vcL2wzN9vjrZbcl7l82
+I4mQ0rJpK6x3UKAvqdopIQLuRa2e0BAEypXU5th3hUKrlu1bWEWV/Ic2PuVP7ieE
+BDsjW7qWClXzeTnwOet5cYDOVOtAD54ruXJJiXjjOVUzy+53SzVTo5w4seab6cdK
+zQJpQbLkXCq/557M3meBTmb5PjfCyCGBuc7h9h9bljdvhTL+OiRikbfJRfa32bFC
+GrH+DxQ0VrwQd4h6MCFIAFSAs8WjQe9ajbVm7HcitCePvAwA8qw24Gyx/UgLoEyI
+eRf5FIU/q4LlsqW7cZfYdjM+aV7MWdYerzEedYwTFQS/MemacPJngk+WcFQmWNS3
+whK1sfYNcoQAep/Nb3Wm
+=KR1p
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/which/files/which-2.19-remove-readline.patch b/sys-apps/which/files/which-2.19-remove-readline.patch
deleted file mode 100644 (file)
index cef1813..0000000
--- a/sys-apps/which/files/which-2.19-remove-readline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://bugs.gentoo.org/207151
-
-readline isnt actually used in this package, so drop the include
-
---- which-2.19/tilde/xmalloc.h
-+++ which-2.19/tilde/xmalloc.h
-@@ -23,12 +23,6 @@
- #if !defined (_XMALLOC_H_)
- #define _XMALLOC_H_
- 
--#if defined (READLINE_LIBRARY)
--#  include "rlstdc.h"
--#else
--#  include <readline/rlstdc.h>
--#endif
--
- #ifndef PTR_T
- 
- #ifdef __STDC__

diff --git a/sys-apps/which/files/which-gentoo.patch b/sys-apps/which/files/which-gentoo.patch
deleted file mode 100644 (file)
index 3422b50..0000000
--- a/sys-apps/which/files/which-gentoo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r -C2 which-2.12.orig/which.texinfo which-2.12/which.texinfo
-*** which-2.13.orig/which.texinfo      Thu Jul  6 07:26:39 2000
---- which-2.13/which.texinfo   Fri Aug  3 17:23:52 2001
-***************
-*** 9,12 ****
---- 9,16 ----
-  
-  @ifinfo
-+ @direntry
-+ * which: (which).            show full path of commands.
-+ @end direntry
-+ 
-  @format
-  

diff --git a/sys-apps/which/which-2.19.ebuild b/sys-apps/which/which-2.19.ebuild
deleted file mode 100644 (file)
index 52afe0e..0000000
--- a/sys-apps/which/which-2.19.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.19.ebuild,v 1.9 2008/03/29 15:28:11 ranger Exp $
-
-inherit eutils
-
-DESCRIPTION="Prints out location of specified executables that are in your path"
-HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
-SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}"/which-gentoo.patch
-       epatch "${FILESDIR}"/which-2.19-remove-readline.patch
-}
-
-src_install() {
-       emake install DESTDIR="${D}" || die
-       dodoc AUTHORS EXAMPLES NEWS README*
-}

diff --git a/sys-apps/which/which-2.20.ebuild b/sys-apps/which/which-2.20.ebuild
deleted file mode 100644 (file)
index 2a90708..0000000
--- a/sys-apps/which/which-2.20.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.20.ebuild,v 1.11 2013/02/17 20:15:47 zmedico Exp $
-
-DESCRIPTION="Prints out location of specified executables that are in your path"
-HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
-SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_install() {
-       emake install DESTDIR="${D}" || die
-       dodoc AUTHORS EXAMPLES NEWS README*
-}

diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
new file mode 100644 (file)
index 0000000..140ab7f
--- /dev/null
+++ b/sys-apps/which/which-2.21.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.21.ebuild,v 1.1 2015/03/21 12:28:37 polynomial-c Exp $
+
+EAPI="4"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Prints out location of specified executables that are in your path"
+HOMEPAGE="https://carlowood.github.io/which/"
+SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+       append-lfs-flags
+}
+
+src_configure() {
+       tc-export AR
+       default
+}