Tidy!

(Portage version: 2.0.51-r15)

8 files changed, 20 insertions, 308 deletions

diff --git a/sys-apps/vixie-cron/ChangeLog b/sys-apps/vixie-cron/ChangeLog
index 7b4b1a49c4cf..c6b00ae4acdf 100644
--- a/sys-apps/vixie-cron/ChangeLog
+++ b/sys-apps/vixie-cron/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/vixie-cron
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.53 2005/02/04 22:41:53 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/ChangeLog,v 1.54 2005/02/05 20:51:21 ka0ttic Exp $
+
+  05 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -vixie-cron-3.0.1-r1.ebuild, -vixie-cron-3.0.1-r3.ebuild,
+  -vixie-cron-4.1-r3.ebuild:
+  Tidy!
 
   04 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
   vixie-cron-4.1-r4.ebuild:
diff --git a/sys-apps/vixie-cron/Manifest b/sys-apps/vixie-cron/Manifest
index 4dfe420b4a5f..259cd57f32ec 100644
--- a/sys-apps/vixie-cron/Manifest
+++ b/sys-apps/vixie-cron/Manifest
@@ -1,28 +1,22 @@
-MD5 5d4da5ea5491e0e50cbb70bb1b44874c ChangeLog 11935
-MD5 0fcc78652b11c683f3fe76d614934379 metadata.xml 288
-MD5 96f9e03ead97dce72db64ee9a6730ae2 vixie-cron-3.0.1-r1.ebuild 1670
-MD5 5f6e2e2e1586bca899cf1ea2080de64a vixie-cron-3.0.1-r3.ebuild 1915
 MD5 1985d806ba1556d197f4054765b6006e vixie-cron-3.0.1-r4.ebuild 2019
-MD5 10e6e5c36bab78f2ad1c22adb26c4931 vixie-cron-3.0.1-r5.ebuild 2202
 MD5 81048a4b18fee963919e309e1b5b0967 vixie-cron-4.1-r5.ebuild 2632
-MD5 4b48f0ba12308f1afe776e97cf757957 vixie-cron-4.1-r3.ebuild 2830
 MD5 79a935a3e530efe990cab92963df8191 vixie-cron-4.1-r4.ebuild 3290
-MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
-MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
+MD5 10e6e5c36bab78f2ad1c22adb26c4931 vixie-cron-3.0.1-r5.ebuild 2202
+MD5 5e324549878506d0474022d323a3dd04 ChangeLog 12082
+MD5 0fcc78652b11c683f3fe76d614934379 metadata.xml 288
+MD5 8692002451e69ee31d667eb2d0dc904d files/vixie-cron-4.1-cron.deny 220
 MD5 90b7dda2ca0ecdd2f4dcd9764eaa2358 files/crontab-3.0.1-r4 617
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r1 144
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r3 144
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r4 144
-MD5 9d66b761d15afae9471d33509b712fe9 files/vixie-cron-3.0.1-close_stdin.diff 810
-MD5 cec7bf697ed66fa43aedb973b2ad5362 files/vixie-cron-3.0.1-pam.patch 1854
-MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
-MD5 2790891d7be3833a500e5af547546b0d files/vixie-cron.rc6 526
+MD5 f9c762005dc744193babe199ba3fb297 files/crontab 604
 MD5 de84c3326555349db053b4aa13c0805f files/crontab.5.diff 772
-MD5 041d9eec86f3869f6613b876ada841a1 files/digest-vixie-cron-3.0.1-r5 144
-MD5 b806ca293a6934a3965a063ec2fe0381 files/digest-vixie-cron-4.1-r5 143
-MD5 8692002451e69ee31d667eb2d0dc904d files/vixie-cron-4.1-cron.deny 220
+MD5 5eab102dfecfc35810ab8cf50f95d0d3 files/cron.pam.d 123
 MD5 620b10c2982aed3071acd92d52e76d8e files/vixie-cron-4.1-pam.patch 1714
-MD5 08c5d571b72d52a2762b2c40639d6946 files/vixie-cron-4.1-commandline.patch 387
 MD5 4c35adb745265e3008fe1999d6a18952 files/vixie-cron-4.1-selinux.diff 3557
-MD5 cdf831673f04d48d38020428f6c72937 files/digest-vixie-cron-4.1-r3 143
+MD5 2790891d7be3833a500e5af547546b0d files/vixie-cron.rc6 526
+MD5 9d66b761d15afae9471d33509b712fe9 files/vixie-cron-3.0.1-close_stdin.diff 810
+MD5 08c5d571b72d52a2762b2c40639d6946 files/vixie-cron-4.1-commandline.patch 387
+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 b806ca293a6934a3965a063ec2fe0381 files/digest-vixie-cron-4.1-r4 143
+MD5 b806ca293a6934a3965a063ec2fe0381 files/digest-vixie-cron-4.1-r5 143
+MD5 1915f29deae7e87c569877f1dbbbec67 files/vixie-cron-3.0.1-selinux.diff.bz2 1853
diff --git a/sys-apps/vixie-cron/files/digest-vixie-cron-3.0.1-r1 b/sys-apps/vixie-cron/files/digest-vixie-cron-3.0.1-r1
deleted file mode 100644
index a6ccf1b47338..000000000000
--- a/sys-apps/vixie-cron/files/digest-vixie-cron-3.0.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 369390355808fcf947cd2f9847f88859 vixie-cron-3.0.1.tar.bz2 50376
-MD5 b9e1488f6bad0b8b5bfc94561f79c8a6 vixie-cron-3.0.1-gentoo.patch.bz2 8901
diff --git a/sys-apps/vixie-cron/files/digest-vixie-cron-3.0.1-r3 b/sys-apps/vixie-cron/files/digest-vixie-cron-3.0.1-r3
deleted file mode 100644
index a6ccf1b47338..000000000000
--- a/sys-apps/vixie-cron/files/digest-vixie-cron-3.0.1-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 369390355808fcf947cd2f9847f88859 vixie-cron-3.0.1.tar.bz2 50376
-MD5 b9e1488f6bad0b8b5bfc94561f79c8a6 vixie-cron-3.0.1-gentoo.patch.bz2 8901
diff --git a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r3 b/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r3
deleted file mode 100644
index 880d1f06a0af..000000000000
--- a/sys-apps/vixie-cron/files/digest-vixie-cron-4.1-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 09dc04f9879684d27c64c910174a9536 vixie-cron-4.1.tar.bz2 54246
-MD5 c08e12c3ba0ab1363a777072e7f23b55 vixie-cron-4.1-gentoo-r2.patch.bz2 3861
diff --git a/sys-apps/vixie-cron/vixie-cron-3.0.1-r1.ebuild b/sys-apps/vixie-cron/vixie-cron-3.0.1-r1.ebuild
deleted file mode 100644
index 19941ab3c53a..000000000000
--- a/sys-apps/vixie-cron/vixie-cron-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/vixie-cron-3.0.1-r1.ebuild,v 1.10 2005/01/10 06:49:11 ciaranm Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="The Vixie cron daemon"
-HOMEPAGE="http://www.vix.com/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo.patch.bz2"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa ia64"
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4.0.5"
-
-RDEPEND="!virtual/cron
-	 sys-apps/cronbase
-	 virtual/mta"
-
-PROVIDE="virtual/cron"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/${P}-gentoo.patch
-
-	sed -i "s:-O2:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	#this does not work if the directory exists already
-	diropts -m0750 -o root -g cron
-	keepdir /var/spool/cron/crontabs/
-
-	doman crontab.1 crontab.5 cron.8
-
-	dodoc CHANGES CONVERSION FEATURES MAIL MANIFEST 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
-	doins ${FILESDIR}/crontab
-
-	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
-}
-
-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
-
-	echo
-	einfo "You may wish to read the Gentoo Linux Cron Guide, which can be"
-	einfo "found online at:"
-	einfo "    http://www.gentoo.org/doc/en/cron-guide.xml"
-	echo
-}
diff --git a/sys-apps/vixie-cron/vixie-cron-3.0.1-r3.ebuild b/sys-apps/vixie-cron/vixie-cron-3.0.1-r3.ebuild
deleted file mode 100644
index e79a3b717108..000000000000
--- a/sys-apps/vixie-cron/vixie-cron-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vixie-cron/vixie-cron-3.0.1-r3.ebuild,v 1.12 2005/01/10 06:49:11 ciaranm Exp $
-
-inherit eutils
-
-IUSE="selinux"
-
-SELINUX_PATCH="${P}-selinux.diff.bz2"
-
-DESCRIPTION="The Vixie cron daemon"
-HOMEPAGE="http://www.vix.com/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-gentoo.patch.bz2"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~amd64 ppc sparc alpha mips ~hppa ia64"
-
-DEPEND=">=sys-apps/portage-2.0.47-r10
-	>=sys-apps/sed-4.0.5
-	selinux? ( sys-libs/libselinux )"
-
-RDEPEND="!virtual/cron
-	 sys-apps/cronbase
-	 virtual/mta
-	 selinux? ( sys-libs/libselinux )"
-
-PROVIDE="virtual/cron"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	epatch ${WORKDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-close_stdin.diff
-
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-
-	sed -i "s:-O2:${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 MANIFEST 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
-	doins ${FILESDIR}/crontab
-
-	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
-}
-
-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
-
-	echo
-	einfo "You may wish to read the Gentoo Linux Cron Guide, which can be"
-	einfo "found online at:"
-	einfo "    http://www.gentoo.org/doc/en/cron-guide.xml"
-	echo
-}
diff --git a/sys-apps/vixie-cron/vixie-cron-4.1-r3.ebuild b/sys-apps/vixie-cron/vixie-cron-4.1-r3.ebuild
deleted file mode 100644
index a4f41e4286ac..000000000000
--- a/sys-apps/vixie-cron/vixie-cron-4.1-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 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-r3.ebuild,v 1.7 2005/01/10 06:49:11 ciaranm Exp $
-
-inherit eutils flag-o-matic toolchain-funcs
-
-# 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="r2"
-
-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 -e "s:gcc \(-Wall.*\):$(tc-getCC) \1 ${CFLAGS}:" \
-		-e "s:^\(LDFLAGS[ \t]\+=\).*:\1 ${LDFLAGS}:" Makefile \
-		|| die "sed Makefile failed"
-
-	emake || die "emake failed"
-}
-
-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
-
-	echo
-	einfo "You may wish to read the Gentoo Linux Cron Guide, which can be"
-	einfo "found online at:"
-	einfo "    http://www.gentoo.org/doc/en/cron-guide.xml"
-	echo
-}