Bump to version 1.1.1

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B0A72FD2)

2 files changed, 63 insertions, 2 deletions

diff --git a/app-admin/r10k/ChangeLog b/app-admin/r10k/ChangeLog
index aa7e1147b26c..b8a734820bb5 100644
--- a/app-admin/r10k/ChangeLog
+++ b/app-admin/r10k/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/r10k
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/r10k/ChangeLog,v 1.5 2013/11/24 08:56:21 vikraman Exp $
+# 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 $
+
+*r10k-1.1.1 (04 Jan 2014)
+
+  04 Jan 2014; Vikraman <vikraman@gentoo.org> +r10k-1.1.1.ebuild, metadata.xml:
+  Bump to version 1.1.1
 
   24 Nov 2013; Vikraman <vikraman@gentoo.org> metadata.xml:
   Add rubyforge upstream for euscan
diff --git a/app-admin/r10k/r10k-1.1.1.ebuild b/app-admin/r10k/r10k-1.1.1.ebuild
new file mode 100644
index 000000000000..4430128df3e8
--- /dev/null
+++ b/app-admin/r10k/r10k-1.1.1.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.1.ebuild,v 1.1 2014/01/04 13:59:00 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."
+}