prometheanfire    15/07/23 23:03:42

  Modified:             ChangeLog
  Added:                puppet-4.2.1.ebuild
  Removed:              puppet-4.2.0-r1.ebuild
  Log:
  bup, also fixing bug 555314
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
0x33ED3FD25AFC78BA)

Revision  Changes    Path
1.233                app-admin/puppet/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.233&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?rev=1.233&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/ChangeLog?r1=1.232&r2=1.233

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- ChangeLog   19 Jul 2015 08:49:09 -0000      1.232
+++ ChangeLog   23 Jul 2015 23:03:42 -0000      1.233
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.232 
2015/07/19 08:49:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.233 
2015/07/23 23:03:42 prometheanfire Exp $
+
+*puppet-4.2.1 (23 Jul 2015)
+
+  23 Jul 2015; Matthew Thode <prometheanf...@gentoo.org> +puppet-4.2.1.ebuild,
+  -puppet-4.2.0-r1.ebuild:
+  bup, also fixing bug 555314
 
   19 Jul 2015; Jeroen Roovers <j...@gentoo.org> puppet-4.2.0-r1.ebuild:
   Mark ~hppa (bug #553952).



1.1                  app-admin/puppet/puppet-4.2.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild?rev=1.1&content-type=text/plain

Index: puppet-4.2.1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-4.2.1.ebuild,v 1.1 
2015/07/23 23:03:42 prometheanfire Exp $

EAPI="5"

USE_RUBY="ruby20 ruby21"

RUBY_FAKEGEM_RECIPE_TEST="rspec3"

inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator

DESCRIPTION="A system automation and configuration management software."
HOMEPAGE="http://puppetlabs.com/";
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz";

LICENSE="Apache-2.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax 
xemacs"

ruby_add_rdepend "
        dev-ruby/hiera
        >=dev-ruby/rgen-0.6.5 =dev-ruby/rgen-0.6*
        dev-ruby/json
        augeas? ( dev-ruby/ruby-augeas )
        diff? ( dev-ruby/diff-lcs )
        doc? ( dev-ruby/rdoc )
        ldap? ( dev-ruby/ruby-ldap )
        shadow? ( dev-ruby/ruby-shadow )
        sqlite? ( dev-ruby/sqlite3 )
        virtual/ruby-ssl"

DEPEND="${DEPEND}
        dev-lang/ruby
        >=dev-ruby/facter-3.0.0
        emacs? ( virtual/emacs )
        xemacs? ( app-editors/xemacs )"
RDEPEND="${RDEPEND}
        rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
        selinux? (
                sys-libs/libselinux[ruby]
                sec-policy/selinux-puppet
        )
        vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
        >=app-portage/eix-0.18.0"

SITEFILE="50${PN}-mode-gentoo.el"

pkg_setup() {
        enewgroup puppet
        enewuser puppet -1 -1 /var/lib/puppet puppet
}

all_ruby_prepare() {
        # Avoid spec that require unpackaged json-schema.
        rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die

        # Avoid specs that can only run in the puppet.git repository. This
        # should be narrowed down to the specific specs.
        rm spec/integration/parser/compiler_spec.rb || die

        # Avoid failing spec that need further investigation.
        rm spec/unit/module_tool/metadata_spec.rb || die
}

all_ruby_compile() {
        if use emacs ; then
                elisp-compile ext/emacs/puppet-mode.el
        fi

        if use xemacs ; then
                # Create a separate version for xemacs to be able to install
                # emacs and xemacs in parallel.
                mkdir ext/xemacs
                cp ext/emacs/* ext/xemacs/
                xemacs-elisp-compile ext/xemacs/puppet-mode.el
        fi
}

each_ruby_install() {
        each_fakegem_install
#       dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" 
"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
}

all_ruby_install() {
        all_fakegem_install

        # systemd stuffs
        insinto /usr/lib/systemd/system
        doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"

        # tmpfiles stuff
        insinto /usr/lib/tmpfiles.d
        newins "${FILESDIR}/tmpfiles.d" "puppet.conf"

        # openrc init stuff
        newinitd "${FILESDIR}"/puppet.init-4.x puppet
        newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
        newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster

        keepdir /etc/puppetlabs/puppet/ssl

        keepdir /var/lib/puppet/facts
        keepdir /var/lib/puppet/files
        fowners -R puppet:puppet /var/lib/puppet

        fperms 0750 /var/lib/puppet

        fperms 0750 /etc/puppetlabs
        fperms 0750 /etc/puppetlabs/puppet
        fperms 0750 /etc/puppetlabs/puppet/ssl
        fowners -R :puppet /etc/puppetlabs
        fowners -R :puppet /var/lib/puppet

        if use emacs ; then
                elisp-install ${PN} ext/emacs/puppet-mode.el*
                elisp-site-file-install "${FILESDIR}/${SITEFILE}"
        fi

        if use xemacs ; then
                xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
                xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
        fi

        if use ldap ; then
                insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
        fi

        # ext and examples files
        for f in $(find ext examples -type f) ; do
                docinto "$(dirname ${f})"; dodoc "${f}"
        done
}

pkg_postinst() {
        elog
        elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as 
this could"
        elog "cause puppet to hang while installing packages."
        elog
        elog "Portage Puppet module with Gentoo-specific resources:"
        elog "http://forge.puppetlabs.com/gentoo/portage";
        elog

        if [ "$(get_major_version $REPLACING_VERSIONS)" = "3" ]; then
                elog
                elog "If you're upgrading from 3.x then please move everything 
in /etc/puppet to"
                elog "/etc/puppetlabs/puppet"
                elog "Also, puppet now uses config directories for modules and 
manifests."
                elog "See 
https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_agent.html";
                elog "and 
https://docs.puppetlabs.com/puppet/4.0/reference/upgrade_server.html";
                elog "for more information."
                elog
        fi

        use emacs && elisp-site-regen
        use xemacs && xemacs-elisp-site-regen
}

pkg_postrm() {
        use emacs && elisp-site-regen
        use xemacs && xemacs-elisp-site-regen
}




Reply via email to