Version bump. Removed old

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

3 files changed, 28 insertions, 24 deletions

diff --git a/app-text/dos2unix/ChangeLog b/app-text/dos2unix/ChangeLog
index ce64ce75e90e..0a073eea2b1a 100644
--- a/app-text/dos2unix/ChangeLog
+++ b/app-text/dos2unix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/dos2unix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.137 2014/04/18 09:54:09 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/ChangeLog,v 1.138 2014/08/04 19:28:43 polynomial-c Exp $
+
+*dos2unix-6.0.6 (04 Aug 2014)
+
+  04 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> -dos2unix-6.0.4.ebuild,
+  +dos2unix-6.0.6.ebuild:
+  Version bump. Removed old.
 
 *dos2unix-6.0.5 (18 Apr 2014)
 
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index acbf78c5224d..6044b21124d9 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -5,27 +5,27 @@ AUX dos2unix-5.2-makefile.patch 675 SHA256 dab1edb13438d598f77e8b73ac2a34def7475
 AUX dos2unix-5.3.1-fix_debug_build.patch 912 SHA256 459c06a2a12c8c5db20fcc7ec62bdfef42473db941c092447beba63503b96857 SHA512 c23b670704df16866838dc25d214e4b187839813a889b0366da6186d9f253a51e4324956867ed996105a03abc6b076befdc693db4fe84e714f43236f2a73a6c2 WHIRLPOOL 6558020da91d24115ea137c3dfc6f1f097b77bc49d849828767d7002fba4ce049789d3172a157941c5f32b3cbd1fbf5206c1aba0ca69c641ed9fa0428b3a2597
 AUX dos2unix-6.0.4-pod-encoding.patch 881 SHA256 bf24c886989fc82d6f45175e3b974485e871014926ade7ab37c6cc6519df6a6a SHA512 9cfec00be898f63608031cd8306783143c1fceda715041cbc1e65795fae867cd096cd6d5ff122cc75f85493817a757acd6a405860dc1a8f66c8ec15dea684b12 WHIRLPOOL dff3e02f740b9ee45190c1da0e8655fcf06bfd0d7e88cc93e775a40553583d452598768b8feb50d762571e39968a084ccadfd1186248a16c174c4bebc47d9f67
 DIST dos2unix-6.0.3.tar.gz 77227 SHA256 f5268c5b28a1983537210c72b3fd43f4aad17a8dacb6727b615b56dca2ef9a04 SHA512 00cce5d7fe7c1fcb81b973a1119aa956a0dd648b775a0cc1692270acec7e9b4caefb1c179e5bdf2834cad60622ffdf2a93ff4db5634f39f0545d63e394a03af2 WHIRLPOOL 925082691597946dce07f2b3bfbcae7bd0d944a4868d3d489cf7025fd5a055965fc76c269a62b025eaedb61741a5cc3c70612de547e47030034ea94d79bf9940
-DIST dos2unix-6.0.4.tar.gz 84848 SHA256 66bd224d4a7fbe13a3b61aa7083b5ef74cf6448a3670606c669f46a84bb9b37a SHA512 6b7e84e42325462205439cb347c14b287be708d6ea5a776ab0875ff00cfb95b9a0379a99c23764e098931dad6b725f064561f433f60e7621eec1b07571cbc651 WHIRLPOOL 2274bad6393a4544e984f3e30afa81c2d880833a465157ced2c95c6f392b7fcca61f41db4ddc1f1421a2067c89726304d129272db13a82032fff96ca5d205329
 DIST dos2unix-6.0.5.tar.gz 326460 SHA256 fd3320aeaf6a163e70c462137959cf3e5af2bb22b0674f931f8744b0215d858f SHA512 8e882fb100357dd38ebe253f059517ca03dfe5579c14a704b6aeed862346edab37af84de4bc5cddd3f87fbb50c8e9930e338b5a9cd345b77708d23bc70154af3 WHIRLPOOL 321648b099e876488ee8aaffef807e8cded6a7168fe80180ba0198bb7249f45b23352138df85e0ca08ced3d55bdcc90470b7aa190f704f21a043224215550d52
+DIST dos2unix-6.0.6.tar.gz 339149 SHA256 8abbd4e9a630ef649f5ff359df10786c50b302c1b6515cf99bd787adea23d276 SHA512 6affdcdc34b1f0c8b1bab46ed63af73a62abf80d64b44e951e354d05b420dbdf32a918a1bca5b427120927e1ec3fe5553cf9b7bf000de30d955ff760b6b66e45 WHIRLPOOL dbdf70a0c7dc4b5714184f333c49e438dda22f20cfc8a65ad9dcc662ccc8c01c928097a10e7932d98f398deb408d6168286b86dc550f77c6540806e3e0302d65
 EBUILD dos2unix-6.0.3.ebuild 1496 SHA256 e1d7ebb511a4ac9ca45cdcb4ddf35aa390e2fa31106474f4c71137ff7220c115 SHA512 252c45d6baf1f0bf8fb522231ce1fdea1db529ff5bf2cae9d1030f06c8fc5164c45664da2c64f664d8a560da35bafcfc0225297127b0089c463c1044947299d0 WHIRLPOOL ed8852917aa690becf6bbf339eed9c94f6604b02675c1ece829d3ea52b136ba9e8d2fc816d424b8b4fffd2cdeed8275717b789aa66b323d0baaf1a4f08d8282f
-EBUILD dos2unix-6.0.4.ebuild 1547 SHA256 31d3b5f0d50819b27a2ad5ca2a0018ad68f87861f046a2a17ffb0b90444ded25 SHA512 f65ea53cd583dcb407dc1a6d72bf2cea7576736c0f6c94d4b65fad1aa85bc8302fc0c1b6880327ecdd3cc48aeefa5ab713f3034fef1657e5010978c04aeb5cf6 WHIRLPOOL fe601e710d8170de6649fdd1f95591cd99a608653f899dd59a9501024e2ad9bf1182c5e272a0b395f6973c9d8fb7938b054394d34741a6d8992c7874b7535978
 EBUILD dos2unix-6.0.5.ebuild 1481 SHA256 89d3490befe51d4af211561233d32139c8e655200f8c220dd0c3db90833f73d6 SHA512 018dfe22b1837370396e4d29eb674a30796b9f1b1f2c803c7f40dd85d8bb6d08f14d0abbfdc292911a05f69e8f977e033e8419302e4ef1ec443d9d0bc8a638b7 WHIRLPOOL 79b77621ddebbd40254d8dd97ea320140f9755018c9a5d66623ece3bf2722bbec0761525908bc85d5377fa21af13a10b8f41041e4a9cbd8b03de29485e1649d5
-MISC ChangeLog 16413 SHA256 d880dc8a05305bbbf5477d52dac2d2556209be45fe0d60c9f57631714f4909ae SHA512 041267cf9b0a66680452d5ccafd4c5222e30fdcc19028eedee5098297a20e040344c838893380f274b096b81726e3da51b0ca96efc96ed6c6541680a37f60d5c WHIRLPOOL 06b964e286257fe9adf30570cdd43aa82d54817fa13d7943e6f07b6eb81ed446f83a6b262d1a8a40878dc00bf4515d5a721e73da943081c9fd0599dd1798c2fe
+EBUILD dos2unix-6.0.6.ebuild 1481 SHA256 beef0ffb97624e50ddd787e4fca7fdbe02650a5c9f77b3b6ad0ca15f760c8177 SHA512 51790c71c12f3e619f0b5ae12da181a398f1895852b37824664d6242b3010577aaa41f5ca0e7ad506b7476a9c1d9761ed5fc72b63aef080eba14dc6522894bd8 WHIRLPOOL 45a6cd78bfe8d86f1a47669398bd1b7968bde789d91629561c73a175d7b17fce9959267b71692580e2fb434782968b98a56302c38b081b7993fb849b8896c6ef
+MISC ChangeLog 16578 SHA256 f0adc0fa9c6cecf06935a3f2cd3a75d982ef99ae46a3429b897367259749f3be SHA512 7f9339fdb616bb1b4265c3bde7d7fb267953c9970041e647872b05eafe7cc6985a947b4c9fdfb875e7ac14981c3fb5f681a81a43adf2df2df1492768728a62b2 WHIRLPOOL 5133bca666f4ca907214012512eb6e8e0af5617db390daad0c7fecb3be99181df5fdcef1cc7ed3c8e976e0253a86223408db1835fea9a41a0ac0e41b1ab18dc3
 MISC metadata.xml 166 SHA256 064eb80cc86913e2a47d1088f1b0ebd5b64b5dab1c73d38b8501cd77891cfbbf SHA512 3fc05bf28a906b223e9bb5baeac755dd7e4edb755b5a6c054c3e4d46d294f28df948e1195e71d5a836783daefafa53fe1417aacc0ba17dd49e9b10d51e99c275 WHIRLPOOL 814a3f6a650e4373ac90ba43969b8dab3215f5da936ef5e180fe134adc05a571dc1390c80be173797c421de7f22488b19979353f7aa52536bbfcf6e0541bf748
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTUPZCAAoJEPiazRVxLXTFQDoP/3UyrgoLEAosIR+v7LpV3+ez
-GGN1ZNtKHbJb2eMc34qEISdD8/bjxeQHSun7DVKvSrFiKVT1Qv1WespMMj/74bwb
-BxUDk87QfXSDMJECchqXBmhH6htrQUgdg0qm7/JpaCqH5a3WapUidZFffkN+whWl
-tCZizqNflk+QKMNRsadqbDT85CLBA72gAel6aFaFTNOR2DPRRTsk0FJ41Dvd1PHq
-z/sOk9UdOB0bOzgA9jgkS/qxEJQYTNxfbSGDdiw4yDLSzrRUbjphPs2iKRcS5hGD
-N8gcpQnWz/Dy9mVLX7yLbjIq630tMeGN8hTqlyrhrU9wWixux490S9uCyk/HxDjW
-cYdRfLMrFldKbziGzVuW8qnI1MRDxbcqFMnjHwdkeBfyQcO6PVNxzy7C1fD6tS7l
-IktTnMh6+idiTwb/N8XWMQlwq6sD9pyxciYH0QyQD3Xzcl0ktDhSiH5CS0Gsijim
-8A4W+K5bm4HN8WWrF8s8EYt2Jgf0psfZN/9SeXvOww8/ThnfzNvFziLK41DG71D6
-ys8ZWXq/0UBlcFVJ08xakJ3aEeq4kzyovZ1UtMVa4mZHPV4X7eXrU78WFouG0vUZ
-9ySHixXEWiAo0oSoSLLcPBvVYQeHbx1I/7UeIJfp/IWXZYPPe401P81rTkSjo3WA
-pgIbMpPSnA7TqIxbirpt
-=epFl
+iQIcBAEBCAAGBQJT397sAAoJEPiazRVxLXTFM3EQAIk5Fu5bjZTYYLuzLk1+f73G
+LsZ0OWg9613J1/2LdV/onEBGP8dhPQt8sj34vz9hwPby1gP/zeqPYAxksbn7nMdU
+cEpuDr8XxucbOvTEcQQRJnylE+hDS8EamrTfyH2RcrQgobT82sQQ0qt42IXOQQzq
+wAq8t1iN1lqSSC3ZtfMAHEJ4gXS73EWUBZmrkh1TqP3L8+b5QL/NB7kTSht9yYhc
+DP8ONUxsBMGu2ZctPCIL5XAqrvdnqNnLOZVSrqaEiTpyC76qhZ7yGWpmpMnUqsfg
+3x/UIIkyFG46bOjvmoQd7mcXHvO0NUIbXnOpeWoDG/gPwQBbyhmZhQ5Ly5Vg1MeG
+SfJ/a+sDcsbW4Qk51yCGBZoc6BzbC/Mp8roMiylTOod7XhwG71XzLOBE7yjLsyGa
+v0RSgLWcpvjG3isRA8m+63KLkcyoe3yQ0eHsNB+JqZfQpjWCeukpH5gK92pfYCD/
+LjMKLeqg1aoK9ebSzrDboIICBR51B2ipBU1GuSYcBuVBjQlBxrI2d2x3zZVme5Or
+Hro8uizSKF7LIw4CLV2DZQeaqosz/bLBqwY12OujPmpaAHm7WIbO+CjXRrrCRG7X
+bBRBcp8oDXlfDEuBClqjLBWNBiEatf0EMoQLx2vXk5QEST5li7bwvXaklg6tvDzS
+RILNYHiBtt8/wQdWfju4
+=jMlg
 -----END PGP SIGNATURE-----
diff --git a/app-text/dos2unix/dos2unix-6.0.4.ebuild b/app-text/dos2unix/dos2unix-6.0.6.ebuild
index 361b54eacc2b..79ca02b608a9 100644
--- a/app-text/dos2unix/dos2unix-6.0.4.ebuild
+++ b/app-text/dos2unix/dos2unix-6.0.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.4.ebuild,v 1.2 2014/01/08 18:40:39 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-6.0.6.ebuild,v 1.1 2014/08/04 19:28:43 polynomial-c Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils toolchain-funcs
 
@@ -27,8 +27,6 @@ DEPEND="
 	dev-lang/perl"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-pod-encoding.patch
-
 	sed \
 		-e '/^LDFLAGS/s|=|+=|' \
 		-e '/CFLAGS_OS \+=/d' \
@@ -52,10 +50,10 @@ lintl() {
 
 src_compile() {
 	emake prefix="${EPREFIX}/usr" \
-		$(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=")
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
 }
 
 src_install() {
 	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(use nls || echo "ENABLE_NLS=") install
+		$(usex nls "" "ENABLE_NLS=") install
 }