Marked r4 stable on x86; tidy up r1 and r2.

7 files changed, 9 insertions, 221 deletions

diff --git a/sys-apps/vixie-cron/ChangeLog b/sys-apps/vixie-cron/ChangeLog
index 516a8bf49b36..50bb3e291b45 100644
--- a/sys-apps/vixie-cron/ChangeLog
+++ b/sys-apps/vixie-cron/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/vixie-cron
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.37 2004/11/18 17:00:27 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.38 2004/11/24 12:50:26 ka0ttic Exp $
+
+  24 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> -vixie-cron-4.1-r1.ebuild,
+  -vixie-cron-4.1-r2.ebuild, vixie-cron-4.1-r4.ebuild:
+  Marked r4 stable on x86; tidy up r1 and r2.
 
   18 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> vixie-cron-4.1-r4.ebuild:
   Add warning in pkg_postinst if /etc/pam.d/cron is SUID and give user
diff --git a/sys-apps/vixie-cron/Manifest b/sys-apps/vixie-cron/Manifest
index 3d5bcbd46abb..447e4daa2866 100644
--- a/sys-apps/vixie-cron/Manifest
+++ b/sys-apps/vixie-cron/Manifest
@@ -1,16 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 570905ddd12bf81d50d21a591343775c vixie-cron-4.1-r3.ebuild 2661
 MD5 3ff8b5eb733d9a828e916a46eabfa6ca vixie-cron-3.0.1-r4.ebuild 1852
 MD5 141bf296f623dc44f4bfa4d856dc21fa vixie-cron-3.0.1-r1.ebuild 1502
-MD5 36b96df568b03fc07852be8e5afd893f vixie-cron-4.1-r2.ebuild 2605
 MD5 dd33c1120b51b3d049054c798c20d5fa vixie-cron-3.0.1-r3.ebuild 1748
-MD5 160084254a595314c79e01468069ed52 vixie-cron-4.1-r4.ebuild 3082
+MD5 2595286af38dd1d37c9b3f733adfffc3 vixie-cron-4.1-r4.ebuild 3081
 MD5 ab3b7df1ed3ce81f23a9050de83ca101 vixie-cron-3.0.1-r5.ebuild 2035
-MD5 10a4e440db2065a01e99586d198acdd4 ChangeLog 9543
+MD5 97caa62a5727fb5a145c09670be88db5 ChangeLog 9721
 MD5 0fcc78652b11c683f3fe76d614934379 metadata.xml 288
-MD5 dfd6ea62f7a18c13729d8c240f7692af vixie-cron-4.1-r1.ebuild 2062
 MD5 8692002451e69ee31d667eb2d0dc904d files/vixie-cron-4.1-cron.deny 220
 MD5 90b7dda2ca0ecdd2f4dcd9764eaa2358 files/crontab-3.0.1-r4 617
 MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
@@ -26,15 +21,6 @@ MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r3 144
 MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r4 144
 MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r5 144
 MD5 cec7bf697ed66fa43aedb973b2ad5362 files/vixie-cron-3.0.1-pam.patch 1854
-MD5 de8a7ebb15e58d9c6496378ff64c5137 files/digest-vixie-cron-4.1-r1 143
-MD5 de8a7ebb15e58d9c6496378ff64c5137 files/digest-vixie-cron-4.1-r2 143
 MD5 cdf831673f04d48d38020428f6c72937 files/digest-vixie-cron-4.1-r3 143
 MD5 cdf831673f04d48d38020428f6c72937 files/digest-vixie-cron-4.1-r4 143
 MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBnNU1EZCkKN40op4RAk5GAJ9hvPj7i5G22Jrva9IHSNzB4krr9gCgxZEi
-Bqda5KOQIYxr7ekG6J4vSK8=
-=GiCi
------END PGP SIGNATURE-----
diff --git a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r1 b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r1
deleted file mode 100644
index 44721524e50e..000000000000
--- a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 09dc04f9879684d27c64c910174a9536 vixie-cron-4.1.tar.bz2 54246
-MD5 6629da19f6ddd41288d41894a0f663ed vixie-cron-4.1-gentoo-r1.patch.bz2 3782
diff --git a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r2 b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r2
deleted file mode 100644
index 44721524e50e..000000000000
--- a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 09dc04f9879684d27c64c910174a9536 vixie-cron-4.1.tar.bz2 54246
-MD5 6629da19f6ddd41288d41894a0f663ed vixie-cron-4.1-gentoo-r1.patch.bz2 3782
diff --git a/sys-apps/vixie-cron/vixie-cron-4.1-r1.ebuild b/sys-apps/vixie-cron/vixie-cron-4.1-r1.ebuild
deleted file mode 100644
index 0fbbee9940c1..000000000000
--- a/sys-apps/vixie-cron/vixie-cron-4.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/vixie-cron-4.1-r1.ebuild,v 1.2 2004/09/25 15:10:00 ciaranm Exp $
-
-inherit eutils
-
-IUSE="selinux pam"
-
-SELINUX_PATCH="${P}-selinux.diff"
-
-DESCRIPTION="The Vixie cron daemon"
-HOMEPAGE="http://www.vix.com/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${PR}.patch.bz2"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4.0.5
-	selinux? ( sys-libs/libselinux )
-	pam? ( sys-libs/pam )"
-
-RDEPEND="!virtual/cron
-	>=sys-apps/cronbase-0.2.1-r3
-	 virtual/mta
-	 selinux? ( sys-libs/libselinux )
-	 pam? ( sys-libs/pam )"
-
-PROVIDE="virtual/cron"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	epatch ${WORKDIR}/${P}-gentoo-${PR}.patch
-	epatch ${FILESDIR}/crontab.5.diff
-
-	use pam && epatch ${FILESDIR}/${P}-pam.patch
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-
-	sed -i "s:gcc \(-Wall.*\):${CC:-gcc} \1 ${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	# this does not work if the directory exists already
-	diropts -m0750 -o root -g cron
-	dodir /var/spool/cron/crontabs
-	keepdir /var/spool/cron/crontabs/
-
-	doman crontab.1 crontab.5 cron.8
-
-	dodoc CHANGES CONVERSION FEATURES MAIL README THANKS
-
-	diropts -m0755 ; dodir /etc/cron.d
-	keepdir /etc/cron.d/
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/vixie-cron.rc6 vixie-cron
-
-	insinto /etc
-	insopts -o root -g root -m 0644
-	newins  ${FILESDIR}/crontab-3.0.1-r4 crontab
-	newins ${FILESDIR}/${P}-cron.deny cron.deny
-
-	dodoc ${FILESDIR}/crontab
-
-	insinto /usr/sbin
-	insopts -o root -g root -m 0750 ; doins cron
-
-	insinto /usr/bin
-	insopts -o root -g cron -m 4750 ; doins crontab
-
-	if use pam
-	then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/cron.pam.d cron
-	fi
-}
-
-pkg_postinst() {
-
-	if [ -f ${ROOT}/etc/init.d/vcron ]
-	then
-		ewarn "Please run:"
-		ewarn "rc-update del vcron"
-		ewarn "rc-update add vixie-cron default"
-	fi
-}
diff --git a/sys-apps/vixie-cron/vixie-cron-4.1-r2.ebuild b/sys-apps/vixie-cron/vixie-cron-4.1-r2.ebuild
deleted file mode 100644
index d6434e3ddd73..000000000000
--- a/sys-apps/vixie-cron/vixie-cron-4.1-r2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/vixie-cron-4.1-r2.ebuild,v 1.2 2004/10/31 19:59:25 ciaranm Exp $
-
-inherit eutils flag-o-matic
-
-# no useful homepage, bug #65898
-HOMEPAGE="ftp://ftp.isc.org/isc/cron/"
-DESCRIPTION="Paul Vixie's cron daemon, a fully featured crond implementation"
-
-SELINUX_PATCH="${P}-selinux.diff"
-GENTOO_PATCH_REV="r1"
-
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~ppc sparc ~alpha mips ~hppa ~ia64 ~amd64 ~ppc64"
-IUSE="selinux pam"
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4.0.5
-	selinux? ( sys-libs/libselinux )
-	pam? ( sys-libs/pam )"
-
-RDEPEND="!virtual/cron
-	>=sys-apps/cronbase-0.2.1-r3
-	 virtual/mta
-	 selinux? ( sys-libs/libselinux )
-	 pam? ( sys-libs/pam )"
-
-PROVIDE="virtual/cron"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	epatch ${WORKDIR}/${P}-gentoo-${GENTOO_PATCH_REV}.patch
-	epatch ${FILESDIR}/crontab.5.diff
-	epatch ${FILESDIR}/${P}-commandline.patch
-
-	use pam && epatch ${FILESDIR}/${P}-pam.patch
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-}
-
-src_compile() {
-	# we need to tinker with ldflags since we're installing as setuid. see
-	# "[gentoo-core] Heads up changes in suid handing with portage >=51_pre21"
-	# for details. Note that we do the sed fixes here rather than in unpack so
-	# that our changes to LDFLAGS are picked up.
-
-	append-ldflags -Wl,-z,now
-	sed -i "s:gcc \(-Wall.*\):${CC:-gcc} \1 ${CFLAGS}:" Makefile
-	sed -i "s:^\(LDFLAGS[ \t]\+=\).*:\1 ${LDFLAGS}:" Makefile
-
-	emake || die
-}
-
-src_install() {
-	# this does not work if the directory exists already
-	diropts -m0750 -o root -g cron
-	dodir /var/spool/cron/crontabs
-	keepdir /var/spool/cron/crontabs/
-
-	doman crontab.1 crontab.5 cron.8
-
-	dodoc CHANGES CONVERSION FEATURES MAIL README THANKS
-
-	diropts -m0755 ; dodir /etc/cron.d
-	keepdir /etc/cron.d/
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/vixie-cron.rc6 vixie-cron
-
-	insinto /etc
-	insopts -o root -g root -m 0644
-	newins  ${FILESDIR}/crontab-3.0.1-r4 crontab
-	newins ${FILESDIR}/${P}-cron.deny cron.deny
-
-	dodoc ${FILESDIR}/crontab
-
-	insinto /usr/sbin
-	insopts -o root -g root -m 0750 ; doins cron
-
-	insinto /usr/bin
-	insopts -o root -g cron -m 4750 ; doins crontab
-
-	if use pam ; then
-		insinto /etc/pam.d
-		newins ${FILESDIR}/cron.pam.d cron
-	fi
-}
-
-pkg_postinst() {
-	if [ -f ${ROOT}/etc/init.d/vcron ]
-	then
-		ewarn "Please run:"
-		ewarn "rc-update del vcron"
-		ewarn "rc-update add vixie-cron default"
-	fi
-}
diff --git a/sys-apps/vixie-cron/vixie-cron-4.1-r4.ebuild b/sys-apps/vixie-cron/vixie-cron-4.1-r4.ebuild
index ce4b3538a98e..d6e90a320444 100644
--- a/sys-apps/vixie-cron/vixie-cron-4.1-r4.ebuild
+++ b/sys-apps/vixie-cron/vixie-cron-4.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/vixie-cron-4.1-r4.ebuild,v 1.2 2004/11/18 17:00:27 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/vixie-cron-4.1-r4.ebuild,v 1.3 2004/11/24 12:50:26 ka0ttic Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ia64 ~amd64 ~ppc64"
 IUSE="selinux pam"
 
 DEPEND=">=sys-apps/portage-2.0.47-r10