Version bump to 1.1.3.

Package-Manager: portage-2.2.8_p25/cvs/Linux i686
Manifest-Sign-Key: 0xB0A72FD2

3 files changed, 70 insertions, 5 deletions

diff --git a/app-admin/r10k/ChangeLog b/app-admin/r10k/ChangeLog
index b8a734820bb5..a46cf0eff158 100644
--- a/app-admin/r10k/ChangeLog
+++ b/app-admin/r10k/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/r10k
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/ChangeLog,v 1.6 2014/01/04 13:59:00 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/ChangeLog,v 1.7 2014/02/05 02:03:28 vikraman Exp $
+
+*r10k-1.1.3 (05 Feb 2014)
+*r10k-1.1.1-r1 (05 Feb 2014)
+
+  05 Feb 2014; Vikraman Choudhury <vikraman@gentoo.org> +r10k-1.1.1-r1.ebuild,
+  +r10k-1.1.3.ebuild:
+  Version bump to 1.1.3.
 
 *r10k-1.1.1 (04 Jan 2014)
 
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 256ef557563a..bd2575dc335f 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST r10k-1.1.0.gem 23552 SHA256 3b6bb90fd0a767f0f3412b3f940781d3071804118baccacc618da39c4009247d SHA512 7bb33894c582e82c173d4f3e725663b2a6c30824795a1b188ced89719a3184d65c00a0f059e8558f07d97a6728ca293e2949ebc4ca6656b007dcd0b93b76324f WHIRLPOOL 5d517f08541298f2966315e16c3c673c014e9aa4c31c0a9a7488341f4e5e044f6bf08417a063a4985ad2421dfd09eadf4c3746d2bac1200b7b85743bbf432bfe
 DIST r10k-1.1.1.gem 24576 SHA256 ef10b1b3224c314bba02ecaaf368c5de4efbe91d4b5190accbc515da0f054bd8 SHA512 6fb587c94a3fad35a86c900c462e8a6cf56e9d03edefe5c7fc502cbebb2f4414a895d8478a7670072cbe613158f01aede116ce6bf83a22f844201ad0eae435fa WHIRLPOOL 5a684227f3647584a5c75ee886aec28d395cb49bd7cf5851f087ea275a2f7744c572546bafa66d8bfe7366dcb4ea755e5e90ae01796cb5db2237f540a827a2d6
+DIST r10k-1.1.3.gem 30720 SHA256 4b4732046a7478f28668dd3db08ce2527bb45c6da83ec0c604f16d09fce9b91a SHA512 9ddb06c3535c4d5f4f0d8156ddf7671f248283874ef7fab4a2e9d00534e6d165e1b7a32937ecef8043a7fb8ff1143a9dd7bc388f0d7c810de86bc369a22fb502 WHIRLPOOL ea9b3a291cc581c719c2852a0d5f268be2389ed783368a0b20c6dc81b047d5725c60956de3282a353dfefd034a4be2eadaceba1a79ee9c0c16b3afaca3be2ac8
 EBUILD r10k-1.1.0.ebuild 865 SHA256 c399124396a6128e6650513dac82ed24ed98470fa5561a04580b70d9a41ad38f SHA512 b5696500bfc88e46611759db2f88c4fcffa7417d0a2bed700080bc4d20e377109337889cabbecf08a1e530cbf663c690a30046d228baff97b5aec359ee270063 WHIRLPOOL 3992c84e9bf894160d708907f2f3aa5bb63db484e2bfbe6632e138090e6683ba49b39bb0a6fa473a06c99bb0737ed49b0cd3dbb18ef4488b28ad87d8e864894d
 EBUILD r10k-1.1.1.ebuild 1912 SHA256 01ee2f9020af84046e821937aa7dd896636ffa0fd9ba9b76141808f6e37f480b SHA512 5d7e980f3ca03f5a8dba0dbfabc2ee1a4312292c4a9231d77a0370e7ed2044ada24c8eaba3f68faab1d6e03bad7a0b6bb3c17942b32f6ef0c55fa8f15bf3f7d7 WHIRLPOOL 2a359ace389db0ea30459c075250b9fc57bc4546f6f5e62cc803612576d739549a3f2a914f2d09da354086f1684394917cd382d56edb67846589087ac52c6266
-MISC ChangeLog 896 SHA256 be63d1cbfbfb2cb6053ee7a6b74cec0e46997fc2e999794c8657a48834f00a7e SHA512 025ebd8748030fe4aca34c37df249da30777801042a1ffe61001a1828d839a5dbf732e99f23332d4e325f76bc5c263d1ab879772038c7b4c2c142630bb04ff59 WHIRLPOOL 260ff1f3a26663cc1c8dddb72e687e8eede204f0c8fee85e51724f172f9261f59eb929e41ff55a233061db523eed27e060007c519c5afbbb7bb5907140c735d2
+EBUILD r10k-1.1.3.ebuild 1912 SHA256 d3f3d7afcf524cde1d0de8352fd5f03921e7283ca3c4bada3511139035bf75be SHA512 d5a8020f5a3b51fb2a916cf963b89320f6aa7cb93c0e93c5e119459e2e75320d46ba6b9aa941cf827593d080b214723179e32f28bdf03833f9a39009dafb300e WHIRLPOOL c92f821d9c3cfa99743bce11514388b7e7e38c451d43648dab02e1634f5943cb6f3ae0b821bee88a822ede6b7e27d0a75c0802cc7f67e5e7920f08938def99ee
+MISC ChangeLog 1079 SHA256 0916da4da44c013b9013ca825f6d4a257a1354d48e850e35e15838657b6461e9 SHA512 0429d86ddcb77f712ac091f29454db481ac6aee088cd7f39912a0518e9fc098f0176c2c4207775e1af6aed9d8a5ab56778e8570cff5a5d839cd7b9f2da2a6993 WHIRLPOOL daf638aad69f4bec9d213289042b205d5712af569d4a21402f39a9df33cbbd7ed03a8b81d183e04c0866ed1cdeaf22796335de364c56c2141da03978d2a44555
 MISC metadata.xml 632 SHA256 1a57c1a088c094b7a4d0e0297e7a1e91348d9bfcabe05fa46becaf723d55c817 SHA512 86fe543e55b889cb1fa653a68ae159ca42dec71807046c10e26a28f433f121e0dbf7de87dc312377e53e21df2a1f77be9928fddcdd974813761d1048ca04c67a WHIRLPOOL 59f0397740455357e07d462d92c9108c3d5a71101092c0c7afc2a458cf63c92839f016304519080c119f79614c58d73fd62a156f4db23a03d8d877ee79902ee1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLIE6wACgkQR91UhLCnL9JzoAD9F7udfhkBMp2VnwJW9BvsOgr9
-FwM2kjT4+KgZ/kF8S+0A/jHs6ylYtZ9aKRrF1qhL7d47k6kLxm9g5Dk0wdR+5DMk
-=goMB
+iF4EAREIAAYFAlLxm+AACgkQR91UhLCnL9KBSgEA644Z8I7a9ZJFagPBj5QRXKkH
+98wMRpxFtR2QdpdAjOABAMzJ3KXWjpZVQ7Yih2+OAIt6GD2/GHeI+lx5yG5XUqGl
+=YRLw
 -----END PGP SIGNATURE-----
diff --git a/app-admin/r10k/r10k-1.1.3.ebuild b/app-admin/r10k/r10k-1.1.3.ebuild
new file mode 100644
index 000000000000..19ecdc05594d
--- /dev/null
+++ b/app-admin/r10k/r10k-1.1.3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/r10k-1.1.3.ebuild,v 1.1 2014/02/05 02:03:28 vikraman Exp $
+
+EAPI=5
+
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="http://github.com/adrienthebo/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+git"
+
+ruby_add_bdepend "test? ( =dev-ruby/rspec-2.14* )"
+
+ruby_add_rdepend "
+	>=dev-ruby/colored-1.2
+	=dev-ruby/cri-2.4*
+	>=dev-ruby/systemu-2.5.2
+	<dev-ruby/systemu-2.6.0
+	>=dev-ruby/log4r-1.1.10
+	dev-ruby/json"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+	sed -i 's/json_pure/json/' "${WORKDIR}/all/metadata" || die "metadata fix failed"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you are upgrading from 1.1.0 and are using multiple sources, please read"
+	ewarn "this. (If not, feel free to continue with your regularly scheduled day.)"
+	ewarn
+	ewarn "GH-48 (https://github.com/adrienthebo/r10k/issues/48) introduced the ability"
+	ewarn "for environments to be prefixed with the source name so that multiple sources"
+	ewarn "installed into the same directory would not overwrite each other. However"
+	ewarn "prefixing was automatically enabled and would break existing setups where"
+	ewarn "multiple sources were cloned into different directories."
+	ewarn
+	ewarn "Because this introduced a breaking change, SemVer dictates that the automatic"
+	ewarn "prefixing has to be rolled back. Prefixing can be enabled but always defaults"
+	ewarn "to off. If you are relying on this behavior you will need to update your r10k.yaml"
+	ewarn "to enable prefixing on a per-source basis."
+	ewarn
+	ewarn "Please see the issue (https://github.com/adrienthebo/r10k/issues/48) for more"
+	ewarn "information."
+}