| 1 |
prometheanfire 15/04/28 20:02:57 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: puppet-4.0.0-r1.ebuild |
| 5 |
Removed: puppet-3.7.2.ebuild puppet-3.7.1.ebuild |
| 6 |
puppet-2.7.24.ebuild puppet-3.6.2.ebuild |
| 7 |
puppet-2.7.25.ebuild puppet-4.0.0.ebuild |
| 8 |
Log: |
| 9 |
fixing bug 547378 |
| 10 |
|
| 11 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.216 app-admin/puppet/ChangeLog |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.216&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.216&content-type=text/plain |
| 18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.215&r2=1.216 |
| 19 |
|
| 20 |
Index: ChangeLog |
| 21 |
=================================================================== |
| 22 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
| 23 |
retrieving revision 1.215 |
| 24 |
retrieving revision 1.216 |
| 25 |
diff -u -r1.215 -r1.216 |
| 26 |
--- ChangeLog 26 Apr 2015 17:21:36 -0000 1.215 |
| 27 |
+++ ChangeLog 28 Apr 2015 20:02:57 -0000 1.216 |
| 28 |
@@ -1,6 +1,14 @@ |
| 29 |
# ChangeLog for app-admin/puppet |
| 30 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 31 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.215 2015/04/26 17:21:36 pacho Exp $ |
| 32 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.216 2015/04/28 20:02:57 prometheanfire Exp $ |
| 33 |
+ |
| 34 |
+*puppet-4.0.0-r1 (28 Apr 2015) |
| 35 |
+ |
| 36 |
+ 28 Apr 2015; Matthew Thode <prometheanfire@g.o> |
| 37 |
+ +puppet-4.0.0-r1.ebuild, -puppet-2.7.24.ebuild, -puppet-2.7.25.ebuild, |
| 38 |
+ -puppet-3.6.2.ebuild, -puppet-3.7.1.ebuild, -puppet-3.7.2.ebuild, |
| 39 |
+ -puppet-4.0.0.ebuild: |
| 40 |
+ fixing bug 547378 |
| 41 |
|
| 42 |
26 Apr 2015; Pacho Ramos <pacho@g.o> puppet-3.7.3.ebuild: |
| 43 |
ppc stable wrt bug #536168 |
| 44 |
|
| 45 |
|
| 46 |
|
| 47 |
1.1 app-admin/puppet/puppet-4.0.0-r1.ebuild |
| 48 |
|
| 49 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.0.0-r1.ebuild?rev=1.1&view=markup |
| 50 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.0.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 51 |
|
| 52 |
Index: puppet-4.0.0-r1.ebuild |
| 53 |
=================================================================== |
| 54 |
# Copyright 1999-2015 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.0.0-r1.ebuild,v 1.1 2015/04/28 20:02:57 prometheanfire Exp $ |
| 57 |
|
| 58 |
EAPI="5" |
| 59 |
|
| 60 |
USE_RUBY="ruby20 ruby21" |
| 61 |
|
| 62 |
RUBY_FAKEGEM_RECIPE_TEST="rspec" |
| 63 |
|
| 64 |
inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator |
| 65 |
|
| 66 |
DESCRIPTION="A system automation and configuration management software" |
| 67 |
HOMEPAGE="http://puppetlabs.com/" |
| 68 |
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
| 69 |
|
| 70 |
LICENSE="Apache-2.0 GPL-2" |
| 71 |
SLOT="0" |
| 72 |
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
| 73 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite3 vim-syntax xemacs" |
| 74 |
|
| 75 |
ruby_add_rdepend " |
| 76 |
dev-ruby/hiera |
| 77 |
>=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6* |
| 78 |
>=dev-ruby/facter-1.6.2 <dev-ruby/facter-3 |
| 79 |
dev-ruby/json |
| 80 |
augeas? ( dev-ruby/ruby-augeas ) |
| 81 |
diff? ( dev-ruby/diff-lcs ) |
| 82 |
doc? ( dev-ruby/rdoc ) |
| 83 |
ldap? ( dev-ruby/ruby-ldap ) |
| 84 |
shadow? ( dev-ruby/ruby-shadow ) |
| 85 |
sqlite3? ( dev-ruby/sqlite3 ) |
| 86 |
virtual/ruby-ssl" |
| 87 |
|
| 88 |
DEPEND="${DEPEND} |
| 89 |
dev-lang/ruby |
| 90 |
emacs? ( virtual/emacs ) |
| 91 |
xemacs? ( app-editors/xemacs )" |
| 92 |
RDEPEND="${RDEPEND} |
| 93 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
| 94 |
selinux? ( |
| 95 |
sys-libs/libselinux[ruby] |
| 96 |
sec-policy/selinux-puppet |
| 97 |
) |
| 98 |
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
| 99 |
>=app-portage/eix-0.18.0" |
| 100 |
|
| 101 |
SITEFILE="50${PN}-mode-gentoo.el" |
| 102 |
|
| 103 |
pkg_setup() { |
| 104 |
enewgroup puppet |
| 105 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
| 106 |
} |
| 107 |
|
| 108 |
all_ruby_prepare() { |
| 109 |
# Avoid spec that require unpackaged json-schema. |
| 110 |
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
| 111 |
|
| 112 |
# Avoid specs that can only run in the puppet.git repository. This |
| 113 |
# should be narrowed down to the specific specs. |
| 114 |
rm spec/integration/parser/compiler_spec.rb || die |
| 115 |
|
| 116 |
# Avoid failing spec that need further investigation. |
| 117 |
rm spec/unit/module_tool/metadata_spec.rb || die |
| 118 |
} |
| 119 |
|
| 120 |
all_ruby_compile() { |
| 121 |
if use emacs ; then |
| 122 |
elisp-compile ext/emacs/puppet-mode.el |
| 123 |
fi |
| 124 |
|
| 125 |
if use xemacs ; then |
| 126 |
# Create a separate version for xemacs to be able to install |
| 127 |
# emacs and xemacs in parallel. |
| 128 |
mkdir ext/xemacs |
| 129 |
cp ext/emacs/* ext/xemacs/ |
| 130 |
xemacs-elisp-compile ext/xemacs/puppet-mode.el |
| 131 |
fi |
| 132 |
} |
| 133 |
|
| 134 |
each_ruby_install() { |
| 135 |
each_fakegem_install |
| 136 |
#${RUBY} install.rb --destdir="${D}" install || die |
| 137 |
} |
| 138 |
|
| 139 |
all_ruby_install() { |
| 140 |
all_fakegem_install |
| 141 |
|
| 142 |
#systemd stuffs |
| 143 |
insinto /usr/lib/systemd/system |
| 144 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
| 145 |
insinto /usr/lib/tmpfiles.d |
| 146 |
newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
| 147 |
|
| 148 |
newinitd "${FILESDIR}"/puppet.init-r1 puppet |
| 149 |
|
| 150 |
insinto /usr/lib/systemd/system |
| 151 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service" |
| 152 |
newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster |
| 153 |
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
| 154 |
|
| 155 |
keepdir /etc/puppetlabs/puppet/modules |
| 156 |
keepdir /etc/puppetlabs/puppet/manifests |
| 157 |
|
| 158 |
keepdir /var/lib/puppet/ssl |
| 159 |
keepdir /var/lib/puppet/facts |
| 160 |
keepdir /var/lib/puppet/files |
| 161 |
fowners -R puppet:puppet /var/lib/puppet |
| 162 |
fperms 0750 /var/lib/puppet |
| 163 |
|
| 164 |
fperms 0750 /etc/puppetlabs |
| 165 |
fperms 0750 /etc/puppetlabs/puppet |
| 166 |
fperms 0750 /etc/puppetlabs/puppet/modules |
| 167 |
fperms 0750 /etc/puppetlabs/puppet/manifests |
| 168 |
fowners -R :puppet /etc/puppetlabs |
| 169 |
|
| 170 |
if use emacs ; then |
| 171 |
elisp-install ${PN} ext/emacs/puppet-mode.el* |
| 172 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 173 |
fi |
| 174 |
|
| 175 |
if use xemacs ; then |
| 176 |
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* |
| 177 |
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 178 |
fi |
| 179 |
|
| 180 |
if use ldap ; then |
| 181 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
| 182 |
fi |
| 183 |
|
| 184 |
# ext and examples files |
| 185 |
for f in $(find ext examples -type f) ; do |
| 186 |
docinto "$(dirname ${f})"; dodoc "${f}" |
| 187 |
done |
| 188 |
} |
| 189 |
|
| 190 |
pkg_postinst() { |
| 191 |
elog |
| 192 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
| 193 |
elog "cause puppet to hang while installing packages." |
| 194 |
elog |
| 195 |
elog "Portage Puppet module with Gentoo-specific resources:" |
| 196 |
elog "http://forge.puppetlabs.com/gentoo/portage" |
| 197 |
elog |
| 198 |
|
| 199 |
if [ \ |
| 200 |
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ |
| 201 |
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ |
| 202 |
-f "${EPREFIX}/etc/puppet/puppetca.conf" \ |
| 203 |
] ; then |
| 204 |
elog |
| 205 |
elog "Please remove deprecated config files." |
| 206 |
elog " /etc/puppet/puppetca.conf" |
| 207 |
elog " /etc/puppet/puppetd.conf" |
| 208 |
elog " /etc/puppet/puppetmasterd.conf" |
| 209 |
elog |
| 210 |
fi |
| 211 |
|
| 212 |
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then |
| 213 |
elog |
| 214 |
elog "If you're upgrading from 2.x then we strongly suggest you to read:" |
| 215 |
elog "http://docs.puppetlabs.com/guides/upgrading.html" |
| 216 |
elog |
| 217 |
fi |
| 218 |
if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then |
| 219 |
elog |
| 220 |
elog "If you're upgrading from 3.x then please move everything in /etc/puppet to" |
| 221 |
elog "/etc/puppetlabs/puppet" |
| 222 |
elog |
| 223 |
fi |
| 224 |
|
| 225 |
use emacs && elisp-site-regen |
| 226 |
use xemacs && xemacs-elisp-site-regen |
| 227 |
} |
| 228 |
|
| 229 |
pkg_postrm() { |
| 230 |
use emacs && elisp-site-regen |
| 231 |
use xemacs && xemacs-elisp-site-regen |
| 232 |
} |
Archives