Version bump and cleanup

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

4 files changed, 25 insertions, 143 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 3a7c3bdfd4e5..3aa03d5dc56d 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.144 2012/05/05 21:36:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.145 2012/05/07 14:57:08 idl0r Exp $
+
+*cfengine-3.3.1 (07 May 2012)
+
+  07 May 2012; Christian Ruppert <idl0r@gentoo.org> -cfengine-3.2.3.ebuild,
+  -cfengine-3.3.0.ebuild, +cfengine-3.3.1.ebuild:
+  Version bump and cleanup
 
   05 May 2012; Brent Baude <ranger@gentoo.org> cfengine-3.1.4.ebuild:
   Marking cfengine-3.1.4 ppc for bug 352280
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 221ca10de380..39242378fa1a 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 511666-segfault.patch 731 RMD160 5a1965029fcc27f95ef89aaf74ea7b5e93ff30eb SHA1 1c93030161d91bab21e46df355bbb7da77772f27 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d
 AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6abdb SHA1 39e8a42c9ecca02d51d340fd6dabe91626c494c8 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2
 AUX cf-execd.rc6 318 RMD160 462f1700ca412a2ffbdc7e9f96e9d7354906a770 SHA1 0c161245a34a7562cbe37e878545ad90d551f508 SHA256 1862d1d86752b96cf92810f324f5746f0d73730cfce75e9598bea5e0b391a2e9
@@ -9,14 +12,23 @@ AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df77
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
 DIST cfengine-3.1.4.tar.gz 1599876 RMD160 75be7bed44718dd4f45ddccd235a46563391eecf SHA1 8879f375e0c0208620660d0d49f52bb814934fd9 SHA256 b4f2e1f7c1d39d37a78c63cab33899b0e829648283be507d78ffa873ccbe3466
-DIST cfengine-3.2.3.tar.gz 1128462 RMD160 251b06c323fdbc13668e980855a799b026ab91fe SHA1 e05b1c3ff54cc7d344ddeba34ca858f7ea85e1d4 SHA256 20748f2d10ec4e3623138c2ae1cf7d78d147b8c5c15be42965c3155d0762792d
 DIST cfengine-3.2.4.tar.gz 1134299 RMD160 fb7e590e5926f980a5b6891767676c93f8dcc26c SHA1 b127dc5f5ce0e7cb1db1ac0a47c986e0d0802f3c SHA256 261cd300c0a8e22dfdb215da81633d80f3c4579e659f186f0da3d09fd2e4f272
-DIST cfengine-3.3.0.tar.gz 1236769 RMD160 1cd486bcaf373a10270b88346f3f8f5d394e1bb5 SHA1 15ac009acaebf8fb402c23f3632470555bc48ecb SHA256 170a65cce35b9b333594543b9b3480e5d9c19c28e275431e6e58a3be9372c0a7
+DIST cfengine-3.3.1.tar.gz 1243798 RMD160 39cae5d9226fb8a4faba9b047577e0899e4b7187 SHA1 254b1a5db2d4b01daf49455c9c9a5dac5b3f2fdb SHA256 fc611609c958e514fe71811032fcf26e4cb9b0dd028588af7f4c1c237bcf45ae
 EBUILD cfengine-2.2.10-r3.ebuild 3136 RMD160 5a5c5da9d39b2a132724677e5b9635184a7244e6 SHA1 e6d6b692df225df50270a4e0df3dabc5d47c3eec SHA256 4bc18b1fc87207e318dca2a0ee29484405bfa080e234eba370148a61af053823
 EBUILD cfengine-2.2.10-r4.ebuild 3322 RMD160 6f78b025bfc9d61774335e9e2a6ae2f368c128ba SHA1 bfd65c0d4807585215a55c94f4c2d042aa2afb8a SHA256 46c348de33648a2e3922c1a3e25a69607c695ab057fdbf737d129d181d2b990c
 EBUILD cfengine-3.1.4.ebuild 4531 RMD160 4e3b31179fe527cecb9f024b0b5810697c8a5b7f SHA1 18d997be19f627d565b0b7e9baedfa23e9107bb2 SHA256 8fa834e85f0eec587a27941fed761d15cf416278004af1167ffc2c69500b830f
-EBUILD cfengine-3.2.3.ebuild 4074 RMD160 c6208f098c288e665d587279c31bfb95a78e72d0 SHA1 e0987313d47fd3d714a1f55bcd106ba5737d7f1d SHA256 eb0f66c7c57622e936e587115085e546381d17e990609e969a1832b9ccbd3269
 EBUILD cfengine-3.2.4.ebuild 4074 RMD160 2592a9162ad46a65230f91b2aa9baf67def94efc SHA1 766efc4984cfe2b72d0df81a7c54adcb30d06c00 SHA256 048e99b78937923c42fe6fc39052c4ae8673f78de3bef5af82ef3333e94527f4
-EBUILD cfengine-3.3.0.ebuild 3710 RMD160 aeb20dc73d05f2f3a1df158361ae440fd03d8ab1 SHA1 e80ff9f23e8e78c2bcec18c555abed9eef8c1e8b SHA256 476ade8aff60b309b83126b166078d9df3ec4a919c97a1c36f889fabae711e5b
-MISC ChangeLog 24148 RMD160 2547297aa2cd2e49151921fe9ce6cdd63df46327 SHA1 88df9618172930caa3d54a42e4b7d47b4b460db5 SHA256 cd506962884a26986797aac4f74f5adbb666d63fc7d3f6e8e4b802cea70d480e
+EBUILD cfengine-3.3.1.ebuild 3709 RMD160 864da171f83f1347a2a028ba6dd0b0eeea581380 SHA1 09bbe61e33b36013d39dd72dccbb1dbf69c167c0 SHA256 4b824906e16d72653d664e768c6b7fba4bee514fed403bff16d8144813ea9d3d
+MISC ChangeLog 24332 RMD160 ea54b3ae23dedc9fc8cc7a94d9e4cd6a47c1def8 SHA1 aa4ba082f178e94bc4eb461bb059f1f43abd9cf4 SHA256 693f1e489c2d535bff66babf12a33cc87041eeead5a80d81e8b4f6d864e55f37
 MISC metadata.xml 2179 RMD160 4ade441caa182e885e0cc2b090f1d05840a00a44 SHA1 f98bcdc0d50755c6a06aa22d13648a3a4a81656c SHA256 04ce07ed6c831b8a693b6e57d692937ffded6decf3eaa67f5bf3212f4aa734d1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCAAGBQJPp+LNAAoJEMOx0zmdw4Z1Z3sH/2W1rKVyQNQFoWeLDXic85+T
+R89V/DLpj/eea/0JQI51vZtwktf74LQ4Et+MUeHKRKEvPeGrrCCpdW1WBCd2J8hx
+Ltru4muDEId3xMuUKZJqiN8FeojI6TNAwIuzL1dzLS+j1X35CiZKmqg+d0mJ9Y9I
+Vyzp69uVrzgBVdhIzVSUFrX1BANUfRHn8goVrleVE3vl8wsiDPsLeOp5rMSXq75r
+06qIFTNrN36uj7txSeA6V4mN39240pAUUFsZ1fLqsMcAlO7IPPYA0sl/iToYoDr3
+bOUR7ql9ekJOYNZTJx8b17qA6unVgCPS57Vm6XVsb/8vqG8+USJQ0c4b37c3k4A=
+=Yzku
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.2.3.ebuild b/net-misc/cfengine/cfengine-3.2.3.ebuild
deleted file mode 100644
index 8a91afbe2ffc..000000000000
--- a/net-misc/cfengine/cfengine-3.2.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.2.3.ebuild,v 1.1 2011/11/01 22:27:01 idl0r 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 html mysql postgres qdbm selinux tests tokyocabinet vim-syntax"
-
-# libvirt? ( app-emulation/libvirt )
-DEPEND=">=sys-libs/db-4
-	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
-
-	# BDB by default, prefer tokyocabinet above qdbm...
-	# sqlite3 has been added but stated as experimental/broken...
-	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 postgres postgresql) \
-		$(use_with mysql) \
-		$(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
-}
-
-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 README INSTALL
-
-	if ! use examples; then
-		rm -rf "${D}"/usr/share/doc/${PF}/example*
-	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.0.ebuild b/net-misc/cfengine/cfengine-3.3.1.ebuild
index 55e57ddf8c9d..3becc6361de1 100644
--- a/net-misc/cfengine/cfengine-3.3.0.ebuild
+++ b/net-misc/cfengine/cfengine-3.3.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/net-misc/cfengine/cfengine-3.3.0.ebuild,v 1.2 2012/04/17 15:55:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.3.1.ebuild,v 1.1 2012/05/07 14:57:08 idl0r Exp $
 
 EAPI="4"