Version bump to 3.1.5. Remove old versions.

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

4 files changed, 22 insertions, 127 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index f16df6f0cc1e..e70041acdae3 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.135 2011/04/25 14:30:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.136 2011/05/03 23:16:33 idl0r Exp $
+
+*cfengine-3.1.5 (03 May 2011)
+
+  03 May 2011; Christian Ruppert <idl0r@gentoo.org> -cfengine-2.2.10.ebuild,
+  -cfengine-3.1.2.ebuild, +cfengine-3.1.5.ebuild:
+  Version bump to 3.1.5. Remove old versions.
 
   25 Apr 2011; Raúl Porcel <armin76@gentoo.org> cfengine-3.1.4.ebuild:
   sparc stable wrt #352280
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 7b33f5901fc4..e7aa6c794b68 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
@@ -11,18 +11,21 @@ AUX cfenvd.rc6 254 RMD160 cbbb932dfee81318437f27b0e644b3201d6e4664 SHA1 d27f693a
 AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df7747bded2a2d9c5bdcfb1bebc3e3c9ef463 SHA256 98735d665038e372be29ac8b173861491dde1d71fad7d0cefddab0fbf99a157c
 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.2.tar.gz 1588874 RMD160 5df871993ea77107bfc617ec8dc2e183d76ed7b5 SHA1 70b6fa569ba4fb0c314ab6256c11596d8c138321 SHA256 9af10093f2bdfb46401c2aae86e7aa3ed204bd4cb62ea4b57355371cea3ba29e
 DIST cfengine-3.1.4.tar.gz 1599876 RMD160 75be7bed44718dd4f45ddccd235a46563391eecf SHA1 8879f375e0c0208620660d0d49f52bb814934fd9 SHA256 b4f2e1f7c1d39d37a78c63cab33899b0e829648283be507d78ffa873ccbe3466
+DIST cfengine-3.1.5.tar.gz 1141253 RMD160 d2605a74ce30bbb06e9d92a57dd102524419d496 SHA1 e362742ed3d1d605be222cc901820ac0811ff177 SHA256 7c9742dfae84893bedb74b9c40f1604567c20cafbda188cf289442de350cd826
 EBUILD cfengine-2.2.10-r3.ebuild 3109 RMD160 c4dc9fe7d8026ad6ecf7fa01a4e8dc67a62ab277 SHA1 7921fd2d9434d6f9f331c1deeafd14a514353dfc SHA256 53b7fde170c753a64a5c605b23bbd6168fdc211833a2b4e5542b994831be0ce8
-EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.1.2.ebuild 4502 RMD160 4dc95169772f5fa3b5dc75c46a18385b2c5264d9 SHA1 0afd72eb80f5b8c2dd54ef3a3d8e962051c897f2 SHA256 24750766593d89c4df5af9136b6adba467dffd6363e2d9c62a226ca637c76fa2
 EBUILD cfengine-3.1.4.ebuild 4502 RMD160 7694f9f53de35c4a52fac8b7de808d2305d71a24 SHA1 e83e588f785d68cbe3f08854ce9a9d99e47c4924 SHA256 7e596e304020931f2744f56999ad2d6659f0b62b78f7c8e735dc17633e6e7e65
-MISC ChangeLog 22700 RMD160 b00e6af15d7cba86f324678fad40026b791b8e99 SHA1 e62a5c495f3e8d23348b63cf6c93ae1125044d80 SHA256 9749b49d65b5a328469962a55b9cdd5f13ec10c81de4e8953ae91058556c06b7
+EBUILD cfengine-3.1.5.ebuild 4025 RMD160 49466dda83a8962c84c17cc84f59a1d79312ff1f SHA1 c8f95de7e92ea903963a55e63f5b74bc65627943 SHA256 78a238b6bae8228307a8d7ce124bda7b4e5b543636901d71f932de6abdbdd8a8
+MISC ChangeLog 22903 RMD160 9c141c4e235216fdded0c0a65b412a2f0c94e810 SHA1 f365bc286fe19060397549520031253861883bf8 SHA256 a3805d470d0d751ef27da89a7d05127d0598f5eb4f3a3ee0c6616f96f762bb7c
 MISC metadata.xml 2591 RMD160 d5907725b22a9608780c95f44e9cdf28645b4e40 SHA1 a6780f88141ed5fe46d201fe32aacabbb7e05b91 SHA256 f871e8ac89cf6f0b46aabf0409aa387307288c72cd0ac4a6bf1231ed01e4ddf0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk21hX8ACgkQuQc30/atMkDnDACfScn4utXu5+j+OQIIEnpICjCN
-3UMAoKTr7tTm+aX97co+Wmq1mbQklBV3
-=1RAk
+iQEcBAEBCAAGBQJNwIzWAAoJEMOx0zmdw4Z1p4oH/jLIjpZ0oXvoU4R+sH7GBH9n
+ChmnqcP7cBfQ6y+jSB9Ug4C1EFphIvPMBCmyssxXuaBBhGOyn3dPbbZlGiKzyz7m
+KVUakkwwsCpLWQIDR1+m3KPMK1HHFc1lm6udag/HyUagG1EkV3zOO4/0P8+12BYg
+PCj9vk+pEvs7iulE5C4m1ASjof/I7KYvYeSRb1kwe8QbHjD4tdqTxvyyIhwGTu3Z
+rHfiY7qNWEhGIGClifTXyWEQcJunMcII7wB5DC+E4wioYLY4L6WtQN0gpogpns0q
+s4mX6i+Vspt97dwUdoa4gOGjsUrziuFHvfn1uCbtfcX+dPyj8uE/A6S2a6BAeGI=
+=YAll
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-2.2.10.ebuild b/net-misc/cfengine/cfengine-2.2.10.ebuild
deleted file mode 100644
index 34ea28553a8f..000000000000
--- a/net-misc/cfengine/cfengine-2.2.10.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.5 2010/01/19 18:32:06 nixnut Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://www.cfengine.org/tarballs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~s390 sparc x86"
-IUSE=""
-
-DEPEND=">=sys-libs/db-4
-	>=dev-libs/openssl-0.9.7
-	app-portage/portage-utils"
-
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr || die
-
-	# 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
-	newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd
-	newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd
-
-	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.2.ebuild b/net-misc/cfengine/cfengine-3.1.5.ebuild
index 58e76f905a06..126eb8144c85 100644
--- a/net-misc/cfengine/cfengine-3.1.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.1.5.ebuild
@@ -1,6 +1,6 @@
 # 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.1.2.ebuild,v 1.9 2011/02/13 13:06:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.5.ebuild,v 1.1 2011/05/03 23:16:33 idl0r Exp $
 
 EAPI="3"
 
@@ -15,16 +15,13 @@ SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="3"
-KEYWORDS="amd64 arm ~ppc ~s390 sparc x86"
+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"
+IUSE="examples html 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 )
@@ -66,9 +63,6 @@ src_configure() {
 		--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"
@@ -76,16 +70,6 @@ src_configure() {
 
 	# 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() {