Version bump. Cleanup 1.5, as 1.6 is nearly the same

Package-Manager: portage-2.1.13.1/cvs/Linux x86_64

3 files changed, 13 insertions, 22 deletions

diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
index f661115bff2f..75fec0bd8058 100644
--- a/sys-apps/etckeeper/ChangeLog
+++ b/sys-apps/etckeeper/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/etckeeper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.25 2013/07/29 20:45:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.26 2013/07/29 22:32:42 mrueg Exp $
+
+*etckeeper-1.6 (29 Jul 2013)
+
+  29 Jul 2013; Manuel Rüger <mrueg@gentoo.org> +etckeeper-1.6.ebuild,
+  -etckeeper-1.5.ebuild:
+  Version bump. Cleanup 1.5, as 1.6 is nearly the same
 
 *etckeeper-1.5 (29 Jul 2013)
 
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 2dc96961192f..ef655711dbda 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,24 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 99etckeeper 60 SHA256 237108fb8d1b16ba51410acea5963991de7a2eef9db7594d67a7f725772da16f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f WHIRLPOOL d41e2caa2b1ec0cd57defb10ff01f2acd3c7d043d19c90bb3b18573d957e0f7a2f21f56390d30e9306272ab45cd7407219a63f53c369cf84016008ef94a6ad2e
 AUX bashrc 116 SHA256 ed9584cd6fdc180dbd3c3d332b07f0287698c9a5602664b8442fea2743141e5a SHA512 8ea8195aa7d65370382c05c92951157b133914d946eec17da4cec32e469130553bdffd91261ce571f5cd31577d5381818ab2deb3f1e6ac872f054dd2798ceb0e WHIRLPOOL b15d4a65c31d7243993204619b2b4d9b1f4bcf539abf43d20fc8fce9d9eabd928a466b5139e66c35430f0e9c9c103344b4ceffa328a4374a7d45dbef0cb4e672
 AUX etckeeper-1.4-gentoo.patch 2219 SHA256 df979ae8a1fe6c2ad3c54d3ff748003a448137eb09485e1f32e107cb4d83b7f8 SHA512 8b59a0297db1a7608e53fe5f18dd2c2f4433747b72a9aad57cb8481ecd41e9c6e5be4ab0fab6c772f86bc5f0b738f79cfd7d9105648845d86672e4d4134bbd0b WHIRLPOOL f94de64bd77f7337773112b84c1fcb5be268b9077d58ab47caab60427e71e18fdd6dc9b8e12f695d5deb8aad84e25ea3f4bc44940b74ae48a1519003cd8443a1
 AUX etckeeper-1.5-gentoo.patch 2189 SHA256 81215c363c8ac2a5b1b3777bbab017bd99f8152dc159cd6ac822b11e25792038 SHA512 cea8e68f9b6342f593f5ab64875aca5b709043a76057896fa1ab5940496e2d9df7f85e75e38ee7305538c5c81a469529e6cb6af5d401750bca6f298bc82fc4c9 WHIRLPOOL da4872cc882ee16c5503b8c34ae28cdd4dcd21971143aad1e08ee7c4ef906ea2a12e146edbf9ce2a300739a3a8e71e9508f9c3800a5264c9f977c5d7e93d1cb1
 DIST etckeeper-1.4.tar.gz 47314 SHA256 05d03c688ebbfb7543aaeac044fa980ff56b38b81cb68aabd827d82334f0d4c3 SHA512 b93e2850e4f4510d78e6f280d680a3ee9ad1fa9123c7dd1bb2db2c4dfeb71549a42c83931631850545c99f8b23d2c74c6f107c58aea025fe6e804917f293fcb5 WHIRLPOOL ba69f987bb08272f07dcc70435c5a7f7d4f4a0fc44eea82775ae2911278196d77e1e7f63ee8473d77e157e4b1b75c7377e7df6041e1978f641be39a59b1c27c8
-DIST etckeeper-1.5.tar.gz 47666 SHA256 18a2fce5cccd8ba2becd45747b7a3dac0ecfea12561d0ec2afee1e043925b015 SHA512 9b113460ade1802c69d4551ea7026da7bf04292b8b4765f8cb9d0ea43f40bf7b4c6b2d43c2001520c4f091ecd206a371427cc7446496e0f3e314649064deefd4 WHIRLPOOL 2e98136f879a63c09d00b2537791d053f7e95bfd28842fbf12f840c8840bec0b6071066516d3337fbefa68df6f2a0d163487ca44174d61c9c3b59ba33162df8f
+DIST etckeeper-1.6.tar.gz 47684 SHA256 5fb2f101949937512a02459cd1845ce54e54bbdd8e74baabed8f09f380015254 SHA512 8d1b982bb8fcd94267ed84a202f4d2d75cccbe6d5df0ff6c5073b2ae6fbe204a82c78b5b841b596ba60dcf14feae6a09dab93408a1488ba5165d5ff172beec2a WHIRLPOOL 00235500c133348b917ac1b0b0d902751168c2d4ba825c65bcad257839dcddfefd77a6a21678e44405e09a8b254fc06488f0393bd6f87b641645f324ad0ceb99
 EBUILD etckeeper-1.4.ebuild 1887 SHA256 4a59e410442959e0fea2e5cf10dc0d7c6d2b10330246ddf52a81def01c99cb9d SHA512 773d5116bf55cc112704800e95fecfa75873981c544fa526146db81a0155b05f9f7fec198ea9f289775b8d3d530afa052786c2217025ef78771d57b47825c944 WHIRLPOOL 2672713026000198719e235666197a797e7789fd42b7d8dc1c3932afc8a7cbbc3f9e40c0712d160e32591972e4e45edf9e0fd6e735d020805df8e0eedde06fd7
-EBUILD etckeeper-1.5.ebuild 1894 SHA256 b337d9474f6559e36c27663666dbf2d1065975073c8ada9c4ad67eb7eb7a88a6 SHA512 7eb1358987267f863ae6d844d58171f060aa31bcdd1a764194ec4c93205a28ae83253a4bfed34c3a692233c277b5ff840d725ad06e50fdee15e336007d0f9a71 WHIRLPOOL a93eea632156d3659a721c8260b0939f269b879d35eb9f6041ec120507d595b3f24cbd931fad4303452a3679d9ac920cff387a17711ac60f88757d9c5e5cbe54
-MISC ChangeLog 3344 SHA256 2fd10992d31bd9272732079dd97c9d682101162b1045edb3bd9e7f14d32bd739 SHA512 2ab41b266afd307813e34d782106152eba8551597d95fce6f42a02bd4825240b2d6938b506c885151f99bf2d3a875ed5a31aaec4ba82c15f54d3c6069e9f2c17 WHIRLPOOL faee157e028a72b9aed6340009be6ce2ebebc110797bc51ae33c25030316364f5fad7777040cfbeb8b6510381b2e388c062d509cc67420df45bc2ec43846b7ab
+EBUILD etckeeper-1.6.ebuild 1894 SHA256 35dd13e30da7901cf52d525ce24c0274e714dcfd8c54c13b4da886eceee7c77f SHA512 c066ce3e9e3354aaa552a381fcca604e5aeda13fd54b74e2eab8986ed17af6a1b0ec102102a238dd0e91081f7d0bfed5c4b1627aece0766a2db436cc6be1cb5e WHIRLPOOL 3c1038041568c663e7b42e2405c89047c64c4867460ac04e9d18d2f24af31bc2164d359cc81a6110d58893440891b66aa978a33626942dc46aab2f018f590acc
+MISC ChangeLog 3523 SHA256 8f78b24dc258b9872cf1a26b99ce794996af747a5c1ab4cd738914e16d06da98 SHA512 ba5acb1f985206a1e1bd42a3c8e8de7d6e800d32132c5fbc9216d6241e24fcb351a46b15231ebc2018855cbbb0866030acd8e30f5b56159238c2865a036a4dae WHIRLPOOL 67053a49fcfbdd53f328a6d48932035e692ba3f32a6120fffaa4349682350788dcd251016a405340a1df5b8aa3fe002ff7422ff0baac07688b0285d23dd83a47
 MISC metadata.xml 976 SHA256 48bd7af76b5aad30f38c79884de21e36ce849f84c138152087595dbd8832ff06 SHA512 ffb60b75d294ca6d92002db677c97fc58022039b4b1f4446f30b0ae0c4a3998aa2c731010f4d745bb7b2205ed2dcb640820029f8178cda1bd34909c36f5385e7 WHIRLPOOL 8979b25b455077f7342da36fbcf719cc4276441f687afe94a87dca9ab69d4d6b60c960ef705a7109ef43fad98b7210753359d89c596a9d46910be9c009390ff9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQEcBAEBCAAGBQJR9tRlAAoJEFpvPKfnPDWzpYIH/1ClJ5wm11P0JYRh8VkvSzDV
-dpRD61V+YbiUmnf5V1TCiIb044dYWETIUiv4NIoI2oA3gwPmzEAhMvSEBnt+2AyT
-uMaVLYqNoHeA433cI/kZIY8/yTR0xlOpSmOiqjL+3xUurwoEbX7XxY18wsxVh6oY
-ykr8tuW4WjbDAjbtxFK4CL4uswI1VVu9+MwiLoI1YRrgoWWdLPaLtOiI354gpyV0
-Kty1BPfV4PVmD8s/scAlo+5TNc/Vu7qKM4RpGHqKsSjk8dqBkyKDwcPRHplyvxZa
-8gYqEMNOG7Tc0Yyk96qZhmlnip0A2i3EFIAsQSl4/MZryjTJYTmdNfuRJ/dFHgY=
-=/nQR
------END PGP SIGNATURE-----
diff --git a/sys-apps/etckeeper/etckeeper-1.5.ebuild b/sys-apps/etckeeper/etckeeper-1.6.ebuild
index bdd1afcaed3a..94017cb71368 100644
--- a/sys-apps/etckeeper/etckeeper-1.5.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-1.5.ebuild,v 1.1 2013/07/29 20:45:23 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-1.6.ebuild,v 1.1 2013/07/29 22:32:42 mrueg Exp $
 
 EAPI=5
 
@@ -18,8 +18,7 @@ SLOT="0"
 IUSE="bazaar cron"
 REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
 
-VCS_DEPEND="
-	dev-vcs/git
+VCS_DEPEND="dev-vcs/git
 	dev-vcs/mercurial
 	dev-vcs/darcs"
 DEPEND="bazaar? ( dev-vcs/bzr )"
@@ -30,7 +29,7 @@ RDEPEND="${DEPEND}
 	!bazaar? ( || ( ${VCS_DEPEND} ) )"
 
 src_prepare(){
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-1.5-gentoo.patch
 }
 
 src_compile() {