unmask x86 for 2.1.5

4 files changed, 1 insertions, 66 deletions

diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 635dd1e60ec2..0af9625d7e5f 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -5,7 +5,6 @@ MD5 91b94c15077795a19c52bdb37e5cb381 cfengine-2.1.1.ebuild 1548
 MD5 c43d635d5a652147971486b2b09e8345 metadata.xml 873
 MD5 1ee8d8f329b8027fb01046f15ec596cd cfengine-2.1.3.ebuild 1533
 MD5 322c7b9cb18356878558a83fc9e413c9 cfengine-2.1.5.ebuild 1543
-MD5 322c7b9cb18356878558a83fc9e413c9 cfengine-2.1.4.ebuild 1543
 MD5 904e36aa6f926900e054c9d02daf8324 files/digest-cfengine-2.1.5 67
 MD5 6453e4309a80963dde2df05003dfaf8a files/digest-cfengine-1.6.3 66
 MD5 d306cf207af6fe2703ab614c50719cbf files/digest-cfengine-2.1.0_p1 69
diff --git a/net-misc/cfengine/cfengine-2.1.4.ebuild b/net-misc/cfengine/cfengine-2.1.4.ebuild
deleted file mode 100644
index c7d0473847bd..000000000000
--- a/net-misc/cfengine/cfengine-2.1.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $
-
-DESCRIPTION="An agent/software robot and a high level policy language for building expert systems to administrate and configure large computer networks"
-HOMEPAGE="http://www.iu.hio.no/cfengine/"
-SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3.2
-	>=dev-libs/openssl-0.9.6k"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--with-workdir=/var/cfengine \
-		--with-berkeleydb=/usr || die
-
-	# Fix Makefile to skip doc & inputs install to wrong locations
-	sed -i -e 's/\(SUBDIRS.*\) inputs doc/\1/' Makefile
-
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING README TODO
-
-	# Manually install doc and inputs
-	doinfo doc/*.info*
-	dohtml doc/*.html
-	dodoc inputs/*.example
-
-	# Create cfengine working directory
-	mkdir -p ${D}/var/cfengine
-	fperms 700 /var/cfengine
-	keepdir /var/cfengine/bin
-	keepdir /var/cfengine/inputs
-}
-
-pkg_postinst() {
-	if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]
-		then
-		einfo "Generating keys for localhost."
-		/usr/sbin/cfkey
-	fi
-
-
-	# 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 /usr/sbin/cf{agent,servd,execd} /var/cfengine/bin/
-}
diff --git a/net-misc/cfengine/cfengine-2.1.5.ebuild b/net-misc/cfengine/cfengine-2.1.5.ebuild
index c7d0473847bd..e727ee4862ed 100644
--- a/net-misc/cfengine/cfengine-2.1.5.ebuild
+++ b/net-misc/cfengine/cfengine-2.1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.iu.hio.no/pub/cfengine/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 
 DEPEND="virtual/glibc
 	>=sys-libs/db-3.2
diff --git a/net-misc/cfengine/files/digest-cfengine-2.1.4 b/net-misc/cfengine/files/digest-cfengine-2.1.4
deleted file mode 100644
index 209423a55946..000000000000
--- a/net-misc/cfengine/files/digest-cfengine-2.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a1f66aaaab31835e5ee0ac9d2a7d792 cfengine-2.1.4.tar.gz 1845681