Don't set dependency of init script for logger to "need" but "use" instead (bug #473492). Removed old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 25 insertions, 114 deletions

diff --git a/sys-process/at/ChangeLog b/sys-process/at/ChangeLog
index 073c5717b129..b67ac75126f7 100644
--- a/sys-process/at/ChangeLog
+++ b/sys-process/at/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/at
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.68 2014/11/02 10:19:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/ChangeLog,v 1.69 2014/12/16 13:00:19 polynomial-c Exp $
+
+*at-3.1.16-r1 (16 Dec 2014)
+
+  16 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -at-3.1.13-r2.ebuild,
+  -at-3.1.15.ebuild, +at-3.1.16-r1.ebuild, -files/at-3.1.13-Makefile.patch,
+  +files/atd.rc8:
+  Don't set dependency of init script for logger to "need" but "use" instead
+  (bug #473492). Removed old.
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> at-3.1.14.ebuild,
   at-3.1.15.ebuild, at-3.1.16.ebuild:
diff --git a/sys-process/at/at-3.1.13-r2.ebuild b/sys-process/at/at-3.1.13-r2.ebuild
deleted file mode 100644
index 0a59d619562b..000000000000
--- a/sys-process/at/at-3.1.13-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.13-r2.ebuild,v 1.11 2013/09/14 10:56:55 ago Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic pam user systemd
-
-DESCRIPTION="Queues jobs for later execution"
-HOMEPAGE="http://packages.qa.debian.org/a/at.html"
-SRC_URI="mirror://debian/pool/main/a/at/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam selinux"
-
-DEPEND="virtual/mta
-	>=sys-devel/autoconf-2.64
-	sys-devel/bison
-	>=sys-devel/flex-2.5.4a
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-at )"
-RDEPEND="virtual/mta
-	virtual/logger
-	selinux? ( sec-policy/selinux-at )"
-
-pkg_setup() {
-	enewgroup at 25
-	enewuser at 25 -1 /var/spool/at/atjobs at
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.8-more-deny.patch
-	epatch "${FILESDIR}"/${PN}-3.1.13-Makefile.patch
-	# fix parallel make issues, bug #244884
-	epatch "${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
-	epatch "${FILESDIR}"/${P}-configure.in-fix-PAM-automagick-dep.patch
-	# Fix parallel make issue (bug #408375)
-	epatch "${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch
-	epatch "${FILESDIR}"/${PN}-3.1.13-getloadavg.patch
-
-	eautoconf
-}
-
-src_configure() {
-	use pam || my_conf="--without-pam"
-	econf \
-		--sysconfdir=/etc/at \
-		--with-jobdir=/var/spool/at/atjobs \
-		--with-atspool=/var/spool/at/atspool \
-		--with-etcdir=/etc/at \
-		--with-daemon_username=at \
-		--with-daemon_groupname=at \
-		${my_conf}
-}
-
-src_install() {
-	emake install IROOT="${D}" || die
-
-	newinitd "${FILESDIR}"/atd.rc7 atd
-	newconfd "${FILESDIR}"/atd.confd atd
-	newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
-
-	# Preserve existing .SEQ files (bug #386625)
-	local seq_file="${ROOT}/var/spool/at/atjobs/.SEQ"
-	if [ -f "${seq_file}" ] ; then
-		einfo "Preserving existing .SEQ file (bug #386625)."
-		cp -p "${seq_file}" "${D}"/var/spool/at/atjobs/ || die
-	fi
-
-	systemd_dounit "${FILESDIR}/atd.service"
-}
-
-pkg_postinst() {
-	einfo "Forcing correct permissions on /var/spool/at"
-	chown at:at "${ROOT}/var/spool/at/atjobs"
-	chmod 1770  "${ROOT}/var/spool/at/atjobs"
-	chown at:at "${ROOT}/var/spool/at/atjobs/.SEQ"
-	chmod 0600  "${ROOT}/var/spool/at/atjobs/.SEQ"
-	chown at:at "${ROOT}/var/spool/at/atspool"
-	chmod 1770  "${ROOT}/var/spool/at/atspool"
-}
diff --git a/sys-process/at/at-3.1.15.ebuild b/sys-process/at/at-3.1.16-r1.ebuild
index eecb71cd0ec9..c5bfa43bc135 100644
--- a/sys-process/at/at-3.1.15.ebuild
+++ b/sys-process/at/at-3.1.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.15.ebuild,v 1.2 2014/11/02 10:19:19 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/at-3.1.16-r1.ebuild,v 1.1 2014/12/16 13:00:19 polynomial-c Exp $
 
 EAPI=5
 
@@ -57,7 +57,7 @@ src_configure() {
 src_install() {
 	emake install IROOT="${D}"
 
-	newinitd "${FILESDIR}"/atd.rc7 atd
+	newinitd "${FILESDIR}"/atd.rc8 atd
 	newconfd "${FILESDIR}"/atd.confd atd
 	newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
 
diff --git a/sys-process/at/files/at-3.1.13-Makefile.patch b/sys-process/at/files/at-3.1.13-Makefile.patch
deleted file mode 100644
index 43c6d073d08e..000000000000
--- a/sys-process/at/files/at-3.1.13-Makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# - install into Gentoo/FHS doc dir
-# - respect Gentoo LDFLAGS
-
---- at-3.1.13/Makefile.in
-+++ at-3.1.13/Makefile.in
-@@ -12,8 +12,11 @@
- man1dir		= $(mandir)/man1
- man5dir		= $(mandir)/man5
- man8dir		= $(mandir)/man8
--docdir		= $(prefix)/doc
--atdocdir	= $(docdir)/at
-+ifndef PF
-+PF = at-$(VERSION)
-+endif
-+docdir		= $(prefix)/share/doc
-+atdocdir	= $(docdir)/$(PF)
- etcdir		= @ETCDIR@
- 
- DAEMON_USERNAME	= @DAEMON_USERNAME@
-@@ -35,7 +38,7 @@
- 		-DDAEMON_USERNAME=\"$(DAEMON_USERNAME)\" \
- 		-DDAEMON_GROUPNAME=\"$(DAEMON_GROUPNAME)\" \
- 		-DLFILE=\"$(LFILE)\" -Wall
--LIBS		= @LIBS@
-+LIBS		= @LIBS@ @LDFLAGS@
- LIBOBJS		= @LIBOBJS@
- INSTALL		= @INSTALL@
- PAMLIB          = @PAMLIB@
diff --git a/sys-process/at/files/atd.rc8 b/sys-process/at/files/atd.rc8
new file mode 100755
index 000000000000..56056f7340f2
--- /dev/null
+++ b/sys-process/at/files/atd.rc8
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/at/files/atd.rc8,v 1.1 2014/12/16 13:00:19 polynomial-c Exp $
+
+pidfile="/var/run/atd.pid"
+command="/usr/sbin/atd"
+command_args="${ATD_OPTS}"
+start_stop_daemon_args="--pidfile ${pidfile}"
+
+depend() {
+	need clock
+	use logger
+}