| 1 |
prometheanfire 13/12/23 00:01:03 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: puppet-3.3.2-r1.ebuild |
| 5 |
Removed: puppet-3.3.0.ebuild puppet-3.3.1.ebuild |
| 6 |
Log: |
| 7 |
adding systemd support for bug 489860 |
| 8 |
|
| 9 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.179 app-admin/puppet/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.179&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.179&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.178&r2=1.179 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v |
| 21 |
retrieving revision 1.178 |
| 22 |
retrieving revision 1.179 |
| 23 |
diff -u -r1.178 -r1.179 |
| 24 |
--- ChangeLog 19 Nov 2013 10:07:26 -0000 1.178 |
| 25 |
+++ ChangeLog 23 Dec 2013 00:01:03 -0000 1.179 |
| 26 |
@@ -1,6 +1,12 @@ |
| 27 |
# ChangeLog for app-admin/puppet |
| 28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.178 2013/11/19 10:07:26 nimiux Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.179 2013/12/23 00:01:03 prometheanfire Exp $ |
| 31 |
+ |
| 32 |
+*puppet-3.3.2-r1 (23 Dec 2013) |
| 33 |
+ |
| 34 |
+ 23 Dec 2013; Matthew Thode <prometheanfire@g.o> +files/tmpfiles.d, |
| 35 |
+ +puppet-3.3.2-r1.ebuild, -puppet-3.3.0.ebuild, -puppet-3.3.1.ebuild: |
| 36 |
+ adding systemd support for bug 489860 |
| 37 |
|
| 38 |
19 Nov 2013; Chema Alonso <nimiux@g.o> puppet-3.2.4.ebuild: |
| 39 |
Stable for amd64 wrt bug #486002 |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 app-admin/puppet/puppet-3.3.2-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-3.3.2-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-3.3.2-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: puppet-3.3.2-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2013 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.3.2-r1.ebuild,v 1.1 2013/12/23 00:01:03 prometheanfire Exp $ |
| 53 |
|
| 54 |
EAPI="5" |
| 55 |
|
| 56 |
USE_RUBY="ruby19" |
| 57 |
|
| 58 |
inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator |
| 59 |
|
| 60 |
DESCRIPTION="A system automation and configuration management software" |
| 61 |
HOMEPAGE="http://puppetlabs.com/" |
| 62 |
SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz" |
| 63 |
|
| 64 |
LICENSE="Apache-2.0 GPL-2" |
| 65 |
SLOT="0" |
| 66 |
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" |
| 67 |
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs" |
| 68 |
|
| 69 |
ruby_add_rdepend " |
| 70 |
dev-ruby/hiera |
| 71 |
>=dev-ruby/facter-1.6.2 |
| 72 |
augeas? ( dev-ruby/ruby-augeas ) |
| 73 |
diff? ( dev-ruby/diff-lcs ) |
| 74 |
doc? ( dev-ruby/rdoc ) |
| 75 |
ldap? ( dev-ruby/ruby-ldap ) |
| 76 |
shadow? ( dev-ruby/ruby-shadow ) |
| 77 |
sqlite3? ( dev-ruby/sqlite3 ) |
| 78 |
virtual/ruby-ssl" |
| 79 |
|
| 80 |
DEPEND="${DEPEND} |
| 81 |
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) |
| 82 |
emacs? ( virtual/emacs ) |
| 83 |
xemacs? ( app-editors/xemacs )" |
| 84 |
RDEPEND="${RDEPEND} |
| 85 |
ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) |
| 86 |
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
| 87 |
selinux? ( |
| 88 |
sys-libs/libselinux[ruby] |
| 89 |
sec-policy/selinux-puppet |
| 90 |
) |
| 91 |
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
| 92 |
>=app-portage/eix-0.18.0" |
| 93 |
|
| 94 |
SITEFILE="50${PN}-mode-gentoo.el" |
| 95 |
|
| 96 |
pkg_setup() { |
| 97 |
enewgroup puppet |
| 98 |
enewuser puppet -1 -1 /var/lib/puppet puppet |
| 99 |
} |
| 100 |
|
| 101 |
all_ruby_compile() { |
| 102 |
if use emacs ; then |
| 103 |
elisp-compile ext/emacs/puppet-mode.el |
| 104 |
fi |
| 105 |
|
| 106 |
if use xemacs ; then |
| 107 |
# Create a separate version for xemacs to be able to install |
| 108 |
# emacs and xemacs in parallel. |
| 109 |
mkdir ext/xemacs |
| 110 |
cp ext/emacs/* ext/xemacs/ |
| 111 |
xemacs-elisp-compile ext/xemacs/puppet-mode.el |
| 112 |
fi |
| 113 |
} |
| 114 |
|
| 115 |
each_ruby_install() { |
| 116 |
${RUBY} install.rb --destdir="${D}" install || die |
| 117 |
} |
| 118 |
|
| 119 |
all_ruby_install() { |
| 120 |
#systemd stuffs |
| 121 |
insinto /usr/lib/systemd/system |
| 122 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppetagent.service" |
| 123 |
insinto /usr/lib/tmpfiles.d |
| 124 |
newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
| 125 |
|
| 126 |
newinitd "${FILESDIR}"/puppet.init-r1 puppet |
| 127 |
|
| 128 |
# Initial configuration files |
| 129 |
insinto /etc/puppet |
| 130 |
|
| 131 |
# Location of log and data files |
| 132 |
keepdir /var/log/puppet |
| 133 |
fowners -R puppet:puppet /var/log/puppet |
| 134 |
|
| 135 |
if use minimal ; then |
| 136 |
rm "${ED}/etc/puppet/auth.conf" |
| 137 |
else |
| 138 |
insinto /usr/lib/systemd/system |
| 139 |
doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service" |
| 140 |
newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster |
| 141 |
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
| 142 |
|
| 143 |
insinto /etc/puppet |
| 144 |
|
| 145 |
keepdir /etc/puppet/manifests |
| 146 |
keepdir /etc/puppet/modules |
| 147 |
|
| 148 |
keepdir /var/lib/puppet/ssl |
| 149 |
keepdir /var/lib/puppet/facts |
| 150 |
keepdir /var/lib/puppet/files |
| 151 |
fowners -R puppet:puppet /var/lib/puppet |
| 152 |
fi |
| 153 |
|
| 154 |
if use emacs ; then |
| 155 |
elisp-install ${PN} ext/emacs/puppet-mode.el* |
| 156 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 157 |
fi |
| 158 |
|
| 159 |
if use xemacs ; then |
| 160 |
xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* |
| 161 |
xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 162 |
fi |
| 163 |
|
| 164 |
if use ldap ; then |
| 165 |
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
| 166 |
fi |
| 167 |
|
| 168 |
# ext and examples files |
| 169 |
for f in $(find ext examples -type f) ; do |
| 170 |
docinto "$(dirname ${f})"; dodoc "${f}" |
| 171 |
done |
| 172 |
} |
| 173 |
|
| 174 |
pkg_postinst() { |
| 175 |
elog |
| 176 |
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
| 177 |
elog "cause puppet to hang while installing packages." |
| 178 |
elog |
| 179 |
elog "Portage Puppet module with Gentoo-specific resources:" |
| 180 |
elog "http://forge.puppetlabs.com/gentoo/portage" |
| 181 |
elog |
| 182 |
|
| 183 |
if [ \ |
| 184 |
-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ |
| 185 |
-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ |
| 186 |
-f "${EPREFIX}/etc/puppet/puppetca.conf" \ |
| 187 |
] ; then |
| 188 |
elog |
| 189 |
elog "Please remove deprecated config files." |
| 190 |
elog " /etc/puppet/puppetca.conf" |
| 191 |
elog " /etc/puppet/puppetd.conf" |
| 192 |
elog " /etc/puppet/puppetmasterd.conf" |
| 193 |
elog |
| 194 |
fi |
| 195 |
|
| 196 |
if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then |
| 197 |
elog |
| 198 |
elog "If you're upgrading from 2.x then we strongly suggest you to read:" |
| 199 |
elog "http://docs.puppetlabs.com/guides/upgrading.html" |
| 200 |
elog |
| 201 |
fi |
| 202 |
|
| 203 |
use emacs && elisp-site-regen |
| 204 |
use xemacs && xemacs-elisp-site-regen |
| 205 |
} |
| 206 |
|
| 207 |
pkg_postrm() { |
| 208 |
use emacs && elisp-site-regen |
| 209 |
use xemacs && xemacs-elisp-site-regen |
| 210 |
} |
Archives