summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2012-11-06 22:45:40 +0000
committerTheo Chatzimichos <tampakrap@gentoo.org>2012-11-06 22:45:40 +0000
commit0d777c7a503cbb4b8dd0cbd2c2a1e870e46c1dbd (patch)
tree0ce4e440007cd309f1d5b602e2cc9da7d13437e4 /app-admin
parentInitial commit (diff)
downloadhistorical-0d777c7a503cbb4b8dd0cbd2c2a1e870e46c1dbd.tar.gz
historical-0d777c7a503cbb4b8dd0cbd2c2a1e870e46c1dbd.tar.bz2
historical-0d777c7a503cbb4b8dd0cbd2c2a1e870e46c1dbd.zip
vim-syntax is split to puppet-syntax, bug 417085
Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/puppet/ChangeLog5
-rw-r--r--app-admin/puppet/Manifest14
-rw-r--r--app-admin/puppet/puppet-3.0.1.ebuild8
3 files changed, 11 insertions, 16 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index 41daa7ddbb02..46558de5a8d4 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-admin/puppet
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.128 2012/11/06 22:00:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.129 2012/11/06 22:45:32 tampakrap Exp $
+
+ 06 Nov 2012; Theo Chatzimichos <tampakrap@gentoo.org> puppet-3.0.1.ebuild:
+ vim-syntax is split to puppet-syntax, bug 417085
06 Nov 2012; Christian Ruppert <idl0r@gentoo.org> puppet-2.7.19.ebuild,
puppet-3.0.1.ebuild:
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 4ca8b118df6c..d7a3371a46cf 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -21,17 +21,13 @@ EBUILD puppet-2.7.13.ebuild 4709 SHA256 a5868883dcd5ee74d969c6e084e4dc3121c52609
EBUILD puppet-2.7.18-r1.ebuild 4691 SHA256 75da411e4d9819658aaa11467b9fd9c26ddb4ade1632b9fafd43519186a795f0 SHA512 b6c033a9146688b9ccbfe103d11fbd1d363540bfc571908c827c6310080512c42bd558822fa410cfcc037aec24fcb2c2e029ddf25a0a1c3d65d621f8d633239e WHIRLPOOL 2e1fb89f4650ac06a116b45c4848df9155375070154baaf1272e41a3782aa080206aac8ed1d676b8b0eea39849a4761c4072a79c04a705a873c459d107d60ead
EBUILD puppet-2.7.18.ebuild 4712 SHA256 4172930670e5e1e40e2985824dd99247bf4c6befdc61e0865b3b4cef1317ceac SHA512 6b546e75814a9c8aef2944f89f802ca220c01db3dd970927ae4a12a13ac29e598e4bdb4930fbcf1b66022154959de25423ee2b4779931ae9f245300cc829ceb8 WHIRLPOOL df6770a6dbcd85add1b929ba369aee2ab8181adf2ac818d593c39dc36fcd899de717cf7517da0e09554efd0a5fbb14a0d69a1b587dc4d98bcc5b5d8366a7cf58
EBUILD puppet-2.7.19.ebuild 4786 SHA256 82e95311da20cdc6574abcd1ba32940298d9b4f6b19cfb05782b49f44f69da08 SHA512 fe1d08ac519ae203add0ad2cb1494b04abd1e1d840f8387403d71161484ef03095783e16a30086fe61062341733e082dbfd3956fe66ab91210068d5cd5651e18 WHIRLPOOL ccf5d07362645b6481703a2587f29579d37ef6d80e602396b21788937cf57a09d4680e049658e96e964c463d15390a966b3e321057a12127001a6efbb729ded5
-EBUILD puppet-3.0.1.ebuild 4430 SHA256 fb170f8805cfe7e3aeccd8e49d0d4663792e3191f8d0135310763fa4f605ad2a SHA512 2334269212db95f41ffb8adc795035af3e36bc1f39af4ae5eed94f01c4b3029246b26b4b5f9ff885f7e9f4776d96a78df7edb1dc955672c91052196536b91cec WHIRLPOOL d61fc6a377e11afdcd54ad92cabe0adf237651cb82958351bae176f0792b829d87c3a318e4d228ab59300519e79fa87ce1ab531d881d91b5b72e7c12afcad3ef
-MISC ChangeLog 21182 SHA256 870cc46659abd285171978e8dcef618e175c5f3c6d9b384dde7bc73ebf1d5ad1 SHA512 f0326917355b42c04bc5674b5979c0fb6a49ba9761db32e7fa08058a08c182f19aad8545ad27efa3882b15b5c2f7c9220efd9d8ee7b516a7b96c957162d1613f WHIRLPOOL 037cf721a84265a0286127f12933f013083e091a2d871ca57f24f8a611f215099432866aeb9f9edae9a421e36e0757952325a9fe410bb20ebfbabd45b4f82892
+EBUILD puppet-3.0.1.ebuild 4298 SHA256 88700961a556b7bc251caaabb9b46342e18e0e20f02b7a324e284309070ec115 SHA512 e61376cabe6e99fdebae032009b0f61a500f326e770ecce8ecd0f8bffa68b9518e6ac0c61259c8b83369c901dc4050a5bf07be1e2d61c3c8ac370ea967464688 WHIRLPOOL d6ef70dae469ee6d58c44686f2fd1b991be7bdb026a43cf392ffba620b04a652c0e568429a70a10b986fa82a622a4ef510768bfa79c884121567f5bcca778a05
+MISC ChangeLog 21315 SHA256 ed9e8a1bb43d9187dd172aa81813e82edc55096ff9d3349fd50b3c2845e97c3d SHA512 3c5b54dc92934db86a7c9ec72f698ea0d91ad8e2dae00a983f513b9f6e42a7be841f62ca03ef613a6cd3ec97c5d480639ee0068b84c4f3a811d46087fc462e60 WHIRLPOOL 67338d44d8d2ad9839ffee2a8f7357b1c8e28f0e2c598d81bd853f4322e2d6dfedd97ba1058e9d5810e6af2945c225cf4b63937b1561701f639797c7d62bb8a4
MISC metadata.xml 1171 SHA256 6ab490dd6057a5e66df92b959cbdc20292a6db3966512af8e26a57672f5331e2 SHA512 a9993f649770c28bc2e09d1e779ad31a89ed280ec2168d3f489a13a7b756f77f8fac92f0139d534182a2f97bc74a4772a5ec75f8aaf27e41fa6b3accb97a0be7 WHIRLPOOL 7a0b45535327479cc77d8310658aba051dbba53bd3a4729990e18c2da138424a383bd4688a16e83b972d2646861b7d37328434f3deeafddeb314a5a806798f0d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQmYiRAAoJEMOx0zmdw4Z1YIsIAKR73IE1aUBoKFBENYMrZ2Rv
-0gznC5cebWQA8ITDkMmEuyGXN7rzKqeMpgHjvvK2IJa6UwBgRDOxxjTBpTkXfO/e
-QgcHntHzgVlEcC2ormgSO6b8ez/MyQjO6wOOblThpumI7Iag54RTUUbF4u4MGb4G
-fnfu4oLm3BpRvIEw3Ka4c25XT4qlTMYOolJSbYpN/WcTprRIXj4EWQz3mOI90C2N
-i1Jyp2IcC+94Emz7/uAqR/RTnI5LeGD6f77cOsepz/y6YJd1neSYNkc4IklQxivq
-1sdSX6PvX4mr0XdbjoMzQC0jNVx2BOUAJ1CJdka2L/7ZzsvU/gj6cNG9sX4BXMg=
-=+HqR
+iEYEAREIAAYFAlCZkyMACgkQjDdoMVfcAHj37gCg6RJ5BqUHuPR1GcmAOZZKVMZA
+FX8AoLmzU39KGwuTybUY+RsUXx3os/RD
+=XTYo
-----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/puppet-3.0.1.ebuild b/app-admin/puppet/puppet-3.0.1.ebuild
index 9a94f986de26..6a0b6bd36cf2 100644
--- a/app-admin/puppet/puppet-3.0.1.ebuild
+++ b/app-admin/puppet/puppet-3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1.ebuild,v 1.4 2012/11/06 22:00:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1.ebuild,v 1.5 2012/11/06 22:45:32 tampakrap Exp $
EAPI="4"
@@ -38,6 +38,7 @@ RDEPEND="${RDEPEND}
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"
@@ -107,11 +108,6 @@ all_ruby_install() {
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
fi
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
- insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
- fi
-
# ext and examples files
for f in $(find ext examples -type f) ; do
docinto "$(dirname ${f})"; dodoc "${f}"