Version bump

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

5 files changed, 18 insertions, 274 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 452927a06107..cba5a0538987 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.158 2012/07/30 14:14:10 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.159 2012/08/24 18:53:16 idl0r Exp $
+
+*cfengine-3.3.5 (24 Aug 2012)
+
+  24 Aug 2012; Christian Ruppert <idl0r@gentoo.org> -cfengine-2.2.10-r3.ebuild,
+  -cfengine-3.1.4.ebuild, -cfengine-3.3.4.ebuild, +cfengine-3.3.5.ebuild:
+  Version bump
 
   30 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
   cfengine-2.2.10-r4.ebuild, cfengine-3.2.4.ebuild:
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 9293760b4e79..4991df938ed7 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -11,20 +11,21 @@ AUX cfenvd.rc6 254 SHA256 de0877e26bbb5cd8eb5da1827308b8fa00c9ce487e61263306c4b5
 AUX cfexecd.rc6 259 SHA256 98735d665038e372be29ac8b173861491dde1d71fad7d0cefddab0fbf99a157c SHA512 7c5798679d2eb9c22bb17dfe526d6b3afdd4d425a43c5c3ff6525a0a403b677564aa9198a0496220d771679e6f52e1dec16e2411584388ff04431b7904ae9a4f WHIRLPOOL ca973d2716ee4b4fe926c4b7370bd77781f9b182e38dd1da948cff4da046ee467d564293bd29979bdafbe70f079e9b9801887261dcd1a9e794699a5ffd8c35c2
 AUX cfservd.rc6 259 SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f SHA512 65390788c0bfa8140ff1ea9d2b89f6037a71709230cf0a839007479305ee420b360e4dc43ecb41f009666a6def4f07c988d15c5f2698bfbec75c4cf0efb3d857 WHIRLPOOL 5cfe286e6d6c950399378a9856d22ae76a40fb44ab784369044eea65fd02cd77170294bcb768c32646f64ee7f2c681055c492f3980a371eb313c2805a9fbf938
 DIST cfengine-2.2.10.tar.gz 2690333 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
-DIST cfengine-3.1.4.tar.gz 1599876 SHA256 b4f2e1f7c1d39d37a78c63cab33899b0e829648283be507d78ffa873ccbe3466
 DIST cfengine-3.2.4.tar.gz 1134299 SHA256 261cd300c0a8e22dfdb215da81633d80f3c4579e659f186f0da3d09fd2e4f272
-DIST cfengine-3.3.4.tar.gz 1253629 SHA256 a76f9fc6f1af22e2eb229c0c73312d32aa11642c023255956e08509fa4d5383d
-EBUILD cfengine-2.2.10-r3.ebuild 3145 SHA256 05e24d9cc9457089d0162c757aa29131d8b4f8cdd39129548a5dbf72dc8736bc SHA512 fbc726ce0d97b5e8c6a5660928c19abb18d0136a2f8bffd1581b2b45cde32bf8e896979bfa0c8f5731b32336a677e336e713f8825e98f9a340b620fb1d89b226 WHIRLPOOL 14179d53dad27515a697a0fbaff660ca3cb84de8e809c79f9751a17b51c08984c082cce8db9479553e59e561a4920f5c6f7bac0d587d6faec3307a66e31137f0
+DIST cfengine-3.3.5.tar.gz 1254473 SHA256 f7d948d85c54ee7b49a03d9b1b8b8cc6d27cdb6a0a9af8f9fefa6485856af6e9 SHA512 ff1e62a2d564f4e1bff927dfd004a7805c48fcdbe45ef389c8641d145110f11c244caf1d82dcefa09565d76ce2dfdbfb450996835467fa45935aeb0a1683fed9 WHIRLPOOL 895443031b14c49bf2b0eed09c475bf4355ff1fdad4d50be7f391e88ac732cf3e100d6c1d1a7acc5aaa890fdd4b6a4f9d13874b653329b803bd68f3491da7444
 EBUILD cfengine-2.2.10-r4.ebuild 3365 SHA256 4cfd98a72d2a583e7d5a0e1178dd6805cf82130776ab253e3310ed845d51b705 SHA512 f75f244749f1a1a1ce0a3b4fa8255e0427b0809dfa6241d3dd10166d85db6062d233a28807c4ba45814f573d7fac32fd5a2399009e96b252136c4459e50e9243 WHIRLPOOL dae053efd423c20dba9c78e6d5d7eef4f8e32a1cedbef85c283244bdf7b4d8cd48d134386d9ec3613cc34f96bf45eea89719eec34219a591c90304c61eef3874
-EBUILD cfengine-3.1.4.ebuild 4531 SHA256 8fa834e85f0eec587a27941fed761d15cf416278004af1167ffc2c69500b830f SHA512 126a94deba6e04504bbd40311d17f0f90ff460b7cd737057509423a4b052a10f7ff0df87a44530dcca3c3c87aaed508066d881a24ad0ec34540b9c16b2144f11 WHIRLPOOL 6244cc223b70ea4fc99c5c3bac9018c7077831f66792def64283d927a05a81c17bc6bf9fc1ae5dcd1c8b31ff688824b3aec4583d89b470d5b3854e2ce7e210a3
 EBUILD cfengine-3.2.4.ebuild 4079 SHA256 c032a915a4f4f790d859194ec4ba54811d88eafe297d6bfb534ce701be687a09 SHA512 7c27889df738fabc02a4b965bbe81d83898b34cd1c053af3d03139f5e148781c7b1af4159a675f1c676e56622b42472caf4656a10c92972122a33a3d4e44ff92 WHIRLPOOL 5551679e36530e98c75f42bfffdca262b605609c7a39e7936b1ad06deef484fdcebca824db4e9f46949c93d6960f652c41632942b38e79a3afddc5545b11148f
-EBUILD cfengine-3.3.4.ebuild 3709 SHA256 b514ce0a928493835bc4e76b652423607f906cd21ca45a57e6021fd51b70d631 SHA512 5d60e919b3443f0fa09585becbb6a2692e35cc62a69d5c70d6dc04ffccf71dc9c5f9fb6ac45b094a57ea71eb37bc5f01053674ca218ed5ce7ac2bd730dfec8fe WHIRLPOOL a35b0732905d3914b99ff19a29291792bd14fca1633e09f8277caadc54c61ce93bd78e8b942199ae7ebe4081312e5a2a17c9f0b768f9221e6b8e0f628d5c2cb3
-MISC ChangeLog 25984 SHA256 31e5ef740c612b9da8d42112a2b848c6070773f80b427f2271c0b8e08d24ca12 SHA512 e20d73aa613dba4b184718e072fe60da6c6c4ccd4d512a32804163f9033186d66e1f62e7f65c0bd7829004fc5aa3654e410df9785a4842860fb5e357ed43bf18 WHIRLPOOL 0e6886628a567bbfe121d3ebb47da221c3b9a4af33fdd83723769be6755ac39b94e99137b45a194b26696717515befcf0ed02e4fcff4a434bcdedf768b17f67e
+EBUILD cfengine-3.3.5.ebuild 3709 SHA256 70362a37f54693d317f8a158259e3157b2b37341cfd0781de7306034988f5301 SHA512 e0ad2c868389c11d538a1797049a8a3e0d2e487a3c1000841e5c1e5b24f14ea6e31b95f3826d9bdde2fdf255232ea19500fecf67d9acf53acf4eb3074716ec3a WHIRLPOOL f7fa42e14a51dacfa4f0974d5e960b1f0feccc15f5c0e5d67128612b6302eea77eae3fbe738f180023c575fcdc84155a95910d8d4ba33b3c6ad350735411c3aa
+MISC ChangeLog 26182 SHA256 4e6c4b9dd2ee29be44d21478ae0b82800753cef85fecb79f1d011836ddcab825 SHA512 ef63b1a8ee39f822f775784749103f06cef2e732392a159960c689e376d30a3bb8405d9d5c9ccf829496c5757827822a3db0d322ed299df96792dfd2e20f9a2f WHIRLPOOL 8ab7cfdc22f4157ac4c11dc4597b822fe4098ae8fcaa02e35193407ddfe92edfd78882ed87db5c2cb21ba1fe02b468628b554033fb5cb8abe8bddb476557583c
 MISC metadata.xml 2179 SHA256 04ce07ed6c831b8a693b6e57d692937ffded6decf3eaa67f5bf3212f4aa734d1 SHA512 31c637da0c32e6d50aa6c0c00414ba36071518d3f8277aa0b76382882d48073006f4462023cc2c41e0816bd9ae856314e8892e4dd4aa2430a64730f003c44758 WHIRLPOOL 6103370aad7b7504a864853ac3eb55cf74e9b5faeeeee9713f22c924d1076c4b9cf77dff7b8397f5239a5f767cca8f89ef7a0d3737521cb6ad7bc368c5952f63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAWlr0ACgkQl5yvQNBFVTUh5ACfdWCTFc2MJ4lCWR1Jairb1HdA
-xcUAn1x6ODGdyVz1rY6JViMLbzIUMtu/
-=23z+
+iQEcBAEBCAAGBQJQN82iAAoJEMOx0zmdw4Z19voH/0VjazL/noQg8Expx+fQvNgN
+Darwrh90fcjWJdBHmv3nfi80OxsvJDA6sYPqo4+lj4jn3AAnAB4/81GxTIGX8RmB
+F5cYZGSjJ28yyK0TWUn6H6SHSmqNzDRo57wAJ3dwXNC926c1btTJwImi7jo8DuaN
+l7Arjyi7OnacVj1bgBAjx6sh/dW1E4hQ9XbgsrSOpthK5uxFeptTtHh6UglYnSd2
+5io51iPwTBoOtIQj2dBE35/G6Q4b5zwo9ligqHO3tJ3v9s4YnqTA7R7hwmVSDl/P
+BP5iD1OnM5QlABgZcMLj6yZls98R/dnJ8+URMfj+rS1jpXKu5a+Ekt1s2hZRJYY=
+=48T3
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
deleted file mode 100644
index 95f68d07aab4..000000000000
--- a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild,v 1.7 2012/06/04 19:25:34 idl0r Exp $
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.com/source_code/download?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~s390 sparc x86"
-IUSE="vim-syntax"
-
-DEPEND=">=sys-libs/db-4
-	>=dev-libs/openssl-0.9.7
-	app-portage/portage-utils"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-src_prepare() {
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666
-	# http://bugs.gentoo.org/339808
-	epatch "${FILESDIR}/admit-noclass-520696.patch" \
-		"${FILESDIR}/511666-segfault.patch" \
-		"${FILESDIR}/${P}-snprintf_buffer_overflow.patch"
-}
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr
-
-	# Fix Makefile to skip doc,inputs, & contrib install to wrong locations
-	sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile
-	sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile
-
-	# Fix man pages
-	sed -i -e 's/\/usr\/local/\/usr/' doc/*.8
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die
-	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die
-
-	make DESTDIR="${D}" install || die
-
-	# Remove static library and libtool file as they are not needed
-	rm "${D}"/usr/$(get_libdir)/*.la
-	rm "${D}"/usr/$(get_libdir)/*.a
-
-	dodoc AUTHORS ChangeLog README TODO INSTALL
-
-	# Manually install doc and inputs
-	doman doc/*.8
-	docinto examples
-	doinfo doc/*.info*
-	dodoc inputs/*.example
-
-	# Create cfengine working directory
-	mkdir -p "${D}"/var/cfengine
-	fperms 700 /var/cfengine
-	keepdir /var/cfengine/bin
-	keepdir /var/cfengine/inputs
-	dodir /var/cfengine/modules
-}
-
-pkg_postinst() {
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-
-	cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/
-
-	einfo
-	einfo "NOTE: The cfportage module has been deprecated in favor of the"
-	einfo "      upstream 'packages' action."
-	einfo
-	einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cfexecd -F"
-	einfo
-
-	elog "You MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cfkey
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.1.4.ebuild b/net-misc/cfengine/cfengine-3.1.4.ebuild
deleted file mode 100644
index 3c94bc992085..000000000000
--- a/net-misc/cfengine/cfengine-3.1.4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.4.ebuild,v 1.7 2012/05/05 21:36:03 ranger Exp $
-
-EAPI="3"
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://cfengine.com/source_code/download?file=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="amd64 arm ppc ~s390 sparc x86"
-
-# libvirt disabled for now because it blocks stabilization etc.
-IUSE="examples gd graphviz html ldap mysql postgres qdbm selinux tests tokyocabinet vim-syntax"
-
-# libvirt? ( app-emulation/libvirt )
-DEPEND=">=sys-libs/db-4
-	gd? ( media-libs/gd )
-	graphviz? ( media-gfx/graphviz )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	!tokyocabinet? ( qdbm? ( dev-db/qdbm ) )
-	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
-	>=dev-libs/openssl-0.9.7
-	dev-libs/libpcre"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local myconf
-
-	if use mysql || use postgres ; then
-		myconf="--with-sql"
-	else
-		myconf="--without-sql"
-	fi
-
-	# BDB by default, prefer tokyocabinet above qdbm...
-	if ! use qdbm && ! use tokyocabinet; then
-		myconf="${myconf} --with-berkeleydb=/usr"
-	elif use qdbm && use tokyocabinet; then
-		elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default"
-		myconf="${myconf} --with-tokyocabinet"
-	elif use qdbm && ! use tokyocabinet; then
-		myconf="${myconf} --with-qdbm"
-	elif ! use qdbm && use tokyocabinet; then
-		myconf="${myconf} --with-tokyocabinet"
-	fi
-
-	# Enforce /var/cfengine for historical compatibility
-	# $(use_with libvirt) \
-	econf \
-		--docdir=/usr/share/doc/"${PF}" \
-		--with-workdir=/var/cfengine \
-		--with-pcre \
-		${myconf} \
-		$(use_with gd) \
-		$(use_with graphviz) \
-		$(use_with ldap) \
-		$(use_enable selinux)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-
-	if use tests; then
-		# Fix Makefiles to install tests in correct directory
-		for i in file_masters file_operands units ; do
-			sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \
-				tests/${i}/Makefile || die
-		done
-	else
-		sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die
-	fi
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
-
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
-
-	if use examples; then
-		docinto examples
-		dodoc inputs/*.cf || die
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
-	done
-
-	if use html; then
-		docinto html
-		dohtml -r docs/ || die
-	fi
-}
-
-pkg_postinst() {
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.3.4.ebuild b/net-misc/cfengine/cfengine-3.3.5.ebuild
index 9b4cd2ea2657..39349af3ebcf 100644
--- a/net-misc/cfengine/cfengine-3.3.4.ebuild
+++ b/net-misc/cfengine/cfengine-3.3.5.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/net-misc/cfengine/cfengine-3.3.4.ebuild,v 1.1 2012/06/24 19:59:54 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.3.5.ebuild,v 1.1 2012/08/24 18:53:16 idl0r Exp $
 
 EAPI="4"