Version bump. Removed old

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

5 files changed, 32 insertions, 144 deletions

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index 0ad241f58030..5df4863a476d 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/dash
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.127 2014/11/01 19:18:17 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.128 2015/01/04 21:47:14 polynomial-c Exp $
+
+*dash-0.5.8.2 (04 Jan 2015)
+
+  04 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> -dash-0.5.7.3-r1.ebuild,
+  -dash-0.5.8.1.ebuild, -dash-0.5.8.1-r1.ebuild, +dash-0.5.8.2.ebuild:
+  Version bump. Removed old.
 
 *dash-0.5.8.1-r2 (01 Nov 2014)
 
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index a45c389cacd4..708047989ab2 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -6,30 +6,28 @@ AUX dash-0.5.8.1-dumb-echo.patch 1172 SHA256 38a620b2aa52c78d6379e0dbeda2476f01f
 AUX dash-0.5.8.1-eval-warnx.patch 241 SHA256 13840812b0e03039c4061fac9bfd01106e53ce51e9bfb794c8c4015e6f3033e9 SHA512 fc44b181f236927e3e15f79c8304f212a55d332acfe981a526e957ff27b8ee56f128e1a5c805045218918f7f6d32945ea2d5b099e988f34cf2f56ad061d654ce WHIRLPOOL 6687f231588d3a47f236b1a4ccbba38f5fccf53e441789e789176c4f73dcabe11298c0ae3da6a09a8e51d23766607ee80a88c239223ba4d7372403a7b1159ad9
 DIST dash-0.5.7.tar.gz 223794 SHA256 ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39 SHA512 77ad016fa5fb3fcb0d940b29d3fa914f546d79cdf2221ed47e4dec6d3a005b25d2d32ee1fdd4f662a7a84274572b72235b82e4c39995c7ca0bb049a7d88595b5 WHIRLPOOL cc11d46a76aa201cb02c4f58e6b1b77fe859d34d7f8b6e6320263a2446dc4d229549823e6628875e0caa21a90fe3743026ba5809ba1a78788d8dd9c94207aa48
 DIST dash-0.5.8.tar.gz 223028 SHA256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f SHA512 3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8 WHIRLPOOL df79b1cf81cdbba0d7556175510d1f4d7294185c91a10cc0a8d4a9f940e2c26c681e377103b5f4e5291211b4555340433eae10144cb778d2d4e65e6ab54c98a3
-DIST dash_0.5.7-3.diff.gz 41631 SHA256 ee6aa93c49487e699286347ee5709efdfd7e040b02c85b467e629bb457cdfee7 SHA512 db82213a0e9ab96139931586e59ca9cc17d819a6f7897cb2e86106fe414f868164bcb1353296e2d7d30582ab2ea4c8d441ba4f46c08028e9a875674f001f83f1 WHIRLPOOL ac368be55af0effb746b0d7fd3ab80eb1a1adf15542862ba1ddabc27e46554ed62d0f858076efe71a6a166738f0692d70f36234f154f6b3965fc1e9422a11117
 DIST dash_0.5.7-4.diff.gz 42834 SHA256 649d97aa0c48dc0db73c08d7e89a004b9d413279a823388161940342016284f0 SHA512 6b53684deebb9ac8ac0f42fa25ff5cad7f717b01473bdb29e968ea2cf3753f83013d70dcea4d4d3e7906b09760f086b10acaff0ebb3445bd392d8276fb865224 WHIRLPOOL efa53e58c6223ef8d9b84780ef873d2a268fc1f40f879f5c731cf37717050b2333a01eb01a44d55e58c14e1c78c6e6d41b4652278311d72657089632358a9aab
 DIST dash_0.5.8-1.diff.gz 41661 SHA256 d751769cc1ef8b825a177e782f1cd3e35bde7c268107fa4febf8d235e12c64d9 SHA512 38e5c4d5b5525b6d1749f6fe6a810fde3233d3412b8cf3bb1f07db162c0d0a8bcbb39c79df846e4b2c43dbea00820fd935a4af707a6ac161b1daa710ae2417b4 WHIRLPOOL a4612fca6f29f17e80ea531699f5fab22837b9ee20b8a73776258e9bf087821d0d9e494c12fd76b657ad112478912074666e61d008664c2daab0cf7b3a25cb95
-EBUILD dash-0.5.7.3-r1.ebuild 1635 SHA256 d289c590d3b2f77b78a7f089cf3fc666367beab35cf290482fbcf44e8349d125 SHA512 95bd5f723b7c917e8c3e5b1f5df6fa3af1446089e22764726aca6c2b023b7a5748343b8681de72900bee542bdba2f6de973a7c4750e24065b38ad469df08454a WHIRLPOOL 43e8c28bc3584aacd76cb2c80b43b67584930401cce12e9a2aba8df3357d87a76194f0f9c59cffe343ed12012bcf53f61173eb4c860efda8d4fa42a56c2e9139
+DIST dash_0.5.8-2.diff.gz 41715 SHA256 00168a934864c26cae9a51367fe7ea013ece2d4844ff8bd6893fc00a8fa7b38c SHA512 f067ca162cc463a60b5bcd7926bd6ab1f6cb1757e9cd7894cbf7ba5849b6d9af5381b8ec7264c503db544242690db067b6c034041e262ff93d237f1c06e50e56 WHIRLPOOL 1c904df104c6026d3ec53843fb67563d88dd8a4babb779b369ccd037e1774d722a85ad92c184d713cd7a440be4885c7e739da17f038fcf88545afc527ddabb3f
 EBUILD dash-0.5.7.4.ebuild 1701 SHA256 369733cc09e7beebccdb9cb7639721ef670cd6d4d5c4acce83d2b2be3a07427d SHA512 2ef36acf69fe5515e29d5f7cc98384b93e7975c2437cb8ec56a7c63b0cf316d8bd3667ac4e0e378d8985036bb4f1bd186b287cb553a43a853327d15f0069448e WHIRLPOOL 7dc4ac9620543a35ad7c1e16c3c5664e9354feeb11fd6efabe9cfe48433ea6d90fe46942b612ddd7400eb0559362c7180ffc9b64eef9932bfdb31e69632f10f3
-EBUILD dash-0.5.8.1-r1.ebuild 1909 SHA256 5d7d2f8c92f528a7cb518eecbcae0abc572e3435cecb822ff493c004a4e0d3c4 SHA512 e9d598fc80ca9eaddc05bdad50ec49c88377f92290b2bd3ef59e4a963a1c077dac99d1a6bb0fe1e9d51d40fc0f060ec720c397c55a9bb292b8b1ed86233d6957 WHIRLPOOL a8153d828cfbca06b27197090598da988a3933a7904ea91c4f046e05a3309f692077bc1f89071eed5241d5a2526c721f3d5e9bb9a18532ca2b4ce916427cc905
 EBUILD dash-0.5.8.1-r2.ebuild 1900 SHA256 da776d66bc89bf0811b24325da0498c3054c61b0365c86da19b3bf9413a9c2c1 SHA512 3fe3ded66f7e46db6d0885ab495245f854615592b04bc65e1080fefc0752fa3c4ff5c3afad3c0d72f8231371f8a7ef105545b02371d94532122488580d3ae1fa WHIRLPOOL c26ea21e2aac45b52ce6230ff79717ee6cd9995c1751140bdbc8fa455e159b7ae39752766b10c02b95ee1785d6df8eae550d32f9cdb084b0ccae86bc9540cf14
-EBUILD dash-0.5.8.1.ebuild 1718 SHA256 541f0a54eaef5b00f63561d130a79069aacfe6d539a386c966a032f84c57b19e SHA512 7221e8bcf643b92872122745cd94dfbc16f40ec2a666ca0c8721ad4415ee3eff3965ac49bb9e718c744a3d2857376b7f96dacebef08f80a463ffbb2bd3b09e59 WHIRLPOOL b2305d18c8bbc65fda8f63e5e2bb5ff339bbd0f2949a676e96b6a0c964189b276b0acfb304dc1eddf4544cf2d5776afbd0923edeb836a7b0b4f70f7a4fbfb224
-MISC ChangeLog 17063 SHA256 eae4831704660884686ed4d29a260b880ede37ad5f6b1663d2eb7ebe035aace5 SHA512 50ff6ae10fa6a2c56e8fd2b161421f00bd920715329d4484ea3f7107041e93743b9ce6ee1da8fb734e56394bba1bd72b3585b5b90b053ae165ec35c8f9aca7f4 WHIRLPOOL 66e84c58a6898768b92492a4599391768e995113761d06c4de95b4b1caaa52bd648fc0b49ef446d00412d3220db19bfbbd50d59ea02d23ccffaa547de19a2251
+EBUILD dash-0.5.8.2.ebuild 1903 SHA256 27d13b9ebfa4d49377c06f0f54c890c3b6f38a2c28506ac53154523f7aefc88f SHA512 5e2a824c31402c5f9e9f5d20fef0b344f2a642f49fc414dca8aff96725fb206ee0399b9f029e03a91f22af34f6417c6a94366240a296c2a0526ba1a3c9293d6d WHIRLPOOL 7044bd3a687b42281d725bd544fb288485fed839eb720fb147de1ea82db8d2c12c5245717f8cafd03d8c8bf8c70f329d7a7a1544bca19286e132dd36826f2cf1
+MISC ChangeLog 17278 SHA256 75aa3d2d2cd23d1d5cfc835b47b5f0a820c351a1a159e31e3ae40d865a007914 SHA512 c52364b52dffd3369ff4ec1c53e2809b9370f437df47707a05e6b60742116542487fc0a176b030bbf5d2e177fcce9ae8715a9273763f940606f6f1095c31c821 WHIRLPOOL 119db73979ff0fe7f751ec24e1db9c7166de956190bf1ab51e1c459ab61b1af1e32b86be5fdad086524e48582b2341c6020c1eb25969fe80b76723e061eee3d5
 MISC metadata.xml 243 SHA256 993fdb79c93960c7504ae6bd3a41c266d501fc535ce291310c899f7ec02d5a89 SHA512 84daa02e03e46d74c588d3e3a4bba66b32122f3e903799272bb3a41ce3eb43a301b1cfb69828348005aaeedf84317cf5e913ed0434d5a5c4d038562dba4c85ea WHIRLPOOL 52ed699028813630102a2aafdf579e97c1740c95f683afb31160ec8c2f8adb8cc185e5957461f9fb0223f69fb96f16b634cce3d16c7796a9dbac677aa12f4543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVTH7AAoJEPGu1DbS6WIA5BIP/RJDN1CUIz6/MFzOar/sgZnq
-mW3q5URHhYOoCQ1b6D3xHYNcFtMJs2vFc7YwQRoKG5jvFTZFG2MSMRjCqNFTAKPp
-Xm1LFvY/d2rSDzUTQVbMV4ZzNysj60lm0hp1sbtdGEwcpgEw1XnY7DI6GlSEXmtC
-iGqYcifivsUuAWwglXSDzkmmQ2/ZyzbdGmUZAl50LHeUBGB1uNdzfpCzVB6iav6K
-nsoPVxB9vDXJE2lw0jIJthVx03qvOsfVUyhpBr/kEMzzO8MhejD0fPa9T3oIYD1z
-hm9MdLLvNSwYeS245bYRbrFceK4/2ddnl6t73/NWXXpfnBUaaN1E3s0bHjL7LGFh
-nic5IoJj0HzgdXc1yTEIlwWJIFFqiErumnmuY9CIM/ZlsUx0OLSY//Q5tojfoask
-yc9NMoABvWvwC9tAzi8KFPiKCwjVIyWHXqDz1Y9rFOhW5mwSbRUlpCDdyYM2Qytt
-6sMKwjoUSh4iyQhZABZoZZdG7ctfmqN4R6JcIuo9CU+fOoCZLKVfCphgPr1G9+69
-3tXVlMfgheQblPa6nPu2lUR0N8EmMfFz+fuJRQdlpYfEvC54cloeoB1RifspAHPk
-pPCsuJdJJ2/GGpZyvQbKiq7t1orFIE69cwXkyX3nyz3t8pWZ+8S8xf/UALyLAqbs
-p5D02ksXwLN3bmobCh67
-=lQEl
+iQIcBAEBCAAGBQJUqbTkAAoJEPiazRVxLXTFqmEQAJRmyYJtEkjpatwAjYxZLgNA
+mSQOb1PCUnYZhU/tZH2Bxs5ZcLN9rJGxgpmBfLRmH1P+F3M34Y+vp5sSMKpFBmI9
+7TihUJpMZbOcBItBMPcFmDV6ODNxTV/xINkoxX5rkIvoL+UpciWG8KY8JESPHD4b
+IedHVUyqWDCcm91q3/IoBz8Ygsfo5ZGcPbF/fwa7LOyGIKe7f1NcCnAd5C+1iu8k
+pCEWAW8sMQCp72dIVw59e/lJUaBNvEja3bubkdkbeUeExr1MJJZ2n7bjAzSDFDD3
+oC07FzBn10IXJ6NGkPd4z4CHINRk3eobX89vCSr6PxIcO+oeeKXur6g8TJoTYkG4
+5W9x9f/1nA8K8A3tFlmnGMPV9XTfNhGsjvhdEw1pjFXKaB3QfeV27fJfQ5bP+67e
+TLfFPW/GauBtROvI5bRzTGUL+gIj6LHXi9UvbTWthx4oBFDgUF6sn04Djd4HeqDZ
+D1Wb2FcZa3ZRtEYSaNvH/2LZsbohkphFGhvi9UTUEVOV/81WLcgc3PIcV19FBPm+
+xk3g7zMiJrWH4vsXRVMQmferXh6LqP3h9U5PKmS4Ehkav2MUiI53SltpkMtELyvY
+1Kq1t6pPG8nKxbNPIVibyMIjtC4qVcJ5/+1GDoJ9Ge3fa0EJX1NBfn9VQtUyaBUt
+IxroDknGZBy7+rPEV9JP
+=RLaE
 -----END PGP SIGNATURE-----
diff --git a/app-shells/dash/dash-0.5.7.3-r1.ebuild b/app-shells/dash/dash-0.5.7.3-r1.ebuild
deleted file mode 100644
index 46af6f298e3a..000000000000
--- a/app-shells/dash/dash-0.5.7.3-r1.ebuild
+++ /dev/null
@@ -1,58 +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/dash/dash-0.5.7.3-r1.ebuild,v 1.13 2014/01/18 02:27:02 vapier Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DEB_PV=${PV%.*}
-DEB_PATCH=${PV##*.}
-DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}"
-MY_P="${PN}-${DEB_PV}"
-
-DESCRIPTION="DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
-	mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="libedit static"
-
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${DEB_PF}.diff
-	epatch */debian/diff/*
-	epatch "${FILESDIR}"/${PN}-0.5.5.1-octal.patch #337329
-
-	# Fix the invalid sort
-	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
-
-	# Use pkg-config for libedit linkage
-	sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" configure.ac
-
-	# May as well, as the debian patches force this anyway
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# Do not pass --enable-glob due to #443552.
-	econf \
-		--bindir=/bin \
-		--enable-fnmatch \
-		$(use_with libedit)
-}
-
-src_install() {
-	default
-	dodoc */debian/changelog
-}
diff --git a/app-shells/dash/dash-0.5.8.1.ebuild b/app-shells/dash/dash-0.5.8.1.ebuild
deleted file mode 100644
index 66c02cbf79f6..000000000000
--- a/app-shells/dash/dash-0.5.8.1.ebuild
+++ /dev/null
@@ -1,58 +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/dash/dash-0.5.8.1.ebuild,v 1.1 2014/10/02 09:15:35 polynomial-c Exp $
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DEB_PV=${PV%.*}
-DEB_PATCH=${PV##*.}
-DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}"
-MY_P="${PN}-${DEB_PV}"
-
-DESCRIPTION="DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
-	mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libedit static"
-
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${DEB_PF}.diff
-	epatch */debian/diff/*
-	epatch "${FILESDIR}"/${PN}-0.5.5.1-octal.patch #337329
-
-	# Fix the invalid sort
-	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
-
-	# Use pkg-config for libedit linkage
-	sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" configure.ac
-
-	# May as well, as the debian patches force this anyway
-	eautoreconf
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# Do not pass --enable-glob due to #443552.
-	econf \
-		--bindir="${EPREFIX}"/bin \
-		--enable-fnmatch \
-		$(use_with libedit)
-}
-
-src_install() {
-	default
-	dodoc */debian/changelog
-}
diff --git a/app-shells/dash/dash-0.5.8.1-r1.ebuild b/app-shells/dash/dash-0.5.8.2.ebuild
index c0fab83ddb83..f0bf5d39c67d 100644
--- a/app-shells/dash/dash-0.5.8.1-r1.ebuild
+++ b/app-shells/dash/dash-0.5.8.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.8.1-r1.ebuild,v 1.1 2014/10/31 19:25:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.8.2.ebuild,v 1.1 2015/01/04 21:47:14 polynomial-c Exp $
 
 EAPI="4"
 
-inherit autotools eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 DEB_PV=${PV%.*}
 DEB_PATCH=${PV##*.}
@@ -31,20 +31,20 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	epatch "${WORKDIR}"/${DEB_PF}.diff
 	epatch */debian/diff/*
-	epatch "${FILESDIR}"/${PN}-0.5.5.1-octal.patch #337329
+	epatch "${FILESDIR}"/${PN}-0.5.8.1-dumb-echo.patch #337329 #527848
 	epatch "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch
 
 	# Fix the invalid sort
 	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
 
 	# Use pkg-config for libedit linkage
-	sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" configure.ac
-
-	# May as well, as the debian patches force this anyway
-	eautoreconf
+	sed -i \
+		-e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
+		configure || die
 }
 
 src_configure() {
+	append-cppflags -DJOBS=$(usex libedit 1 0)
 	use static && append-ldflags -static
 	# Do not pass --enable-glob due to #443552.
 	# Autotools use $LINENO as a proxy for extended debug support