Always install cron file (bug #547846).

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 63 insertions, 19 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index c90e10ebf267..9fec2834e593 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/sysstat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.289 2015/04/14 04:49:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.290 2015/06/08 04:45:43 jer Exp $
+
+*sysstat-11.1.4-r1 (08 Jun 2015)
+*sysstat-11.0.4-r1 (08 Jun 2015)
+
+  08 Jun 2015; Jeroen Roovers <jer@gentoo.org> -sysstat-11.0.4.ebuild,
+  +sysstat-11.0.4-r1.ebuild, -sysstat-11.1.4.ebuild, +sysstat-11.1.4-r1.ebuild,
+  +files/sysstat-11.0.4-cron.patch:
+  Always install cron file (bug #547846).
 
 *sysstat-11.1.4 (14 Apr 2015)
 *sysstat-11.0.4 (14 Apr 2015)
diff --git a/app-admin/sysstat/files/sysstat-11.0.4-cron.patch b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
new file mode 100644
index 000000000000..9d047ac6e9fe
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-11.0.4-cron.patch
@@ -0,0 +1,38 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -368,25 +368,19 @@
+ 	$(CHOWN) $(CRON_OWNER) $(DESTDIR)$(SA_DIR)
+ ifdef SYSTEMD_UNIT_DIR
+ 	mkdir -p $(DESTDIR)$(SYSTEMD_UNIT_DIR)
+-else
+-	if [ -d /etc/cron.d ]; then \
+-		mkdir -p $(DESTDIR)/etc/cron.d; \
+-	elif [ -d /etc/cron.hourly -a -d /etc/cron.daily ]; then \
+-		mkdir -p $(DESTDIR)/etc/cron.hourly $(DESTDIR)/etc/cron.daily; \
+-	fi
+-	if [ -d $(INIT_DIR) ]; then \
+-		mkdir -p $(DESTDIR)$(INIT_DIR); \
+-	elif [ -d $(RC_DIR) ]; then \
++endif
++ifeq ($(INSTALL_CRON),y)
++	mkdir -p $(DESTDIR)/etc/cron.d; \
++	mkdir -p $(DESTDIR)$(INIT_DIR); \
++	if [ -d $(RC_DIR) ]; then \
+ 		mkdir -p $(DESTDIR)$(RC_DIR); \
+ 	fi
+ endif
+-	if [ -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" ]; then \
+-		if [ -d $(DESTDIR)/etc/cron.d ]; then \
+-			$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
+-		elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
+-			$(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
+-			$(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
+-		fi \
++	if [ -d $(DESTDIR)/etc/cron.d ]; then \
++		$(INSTALL_DATA) cron/sysstat.crond $(DESTDIR)/etc/cron.d/sysstat; \
++	elif [ -d $(DESTDIR)/etc/cron.hourly -a -d $(DESTDIR)/etc/cron.daily ]; then \
++		$(INSTALL_BIN) cron/sysstat.cron.hourly $(DESTDIR)/etc/cron.hourly/sysstat; \
++		$(INSTALL_BIN) cron/sysstat.cron.daily $(DESTDIR)/etc/cron.daily/sysstat; \
+ 	fi
+ ifeq ($(COPY_ONLY),n)
+ 	if [ \( -z "$(SYSTEMD_UNIT_DIR)" -o ! -d "$(DESTDIR)$(SYSTEMD_UNIT_DIR)" \) -a ! -d $(DESTDIR)/etc/cron.d ]; then \
diff --git a/app-admin/sysstat/sysstat-11.0.4.ebuild b/app-admin/sysstat/sysstat-11.0.4-r1.ebuild
index ba5d3a5b8a81..0d6bc9cac27f 100644
--- a/app-admin/sysstat/sysstat-11.0.4.ebuild
+++ b/app-admin/sysstat/sysstat-11.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.0.4.ebuild,v 1.1 2015/04/14 04:49:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.0.4-r1.ebuild,v 1.1 2015/06/08 04:45:43 jer Exp $
 
 EAPI=5
 inherit eutils multilib systemd toolchain-funcs
@@ -12,12 +12,11 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="cron debug +doc isag nls lm_sensors selinux"
+IUSE="debug +doc isag nls lm_sensors selinux"
 
 CDEPEND="
-	cron? ( sys-process/cronbase )
 	isag? (
-		dev-lang/tk
+		dev-lang/tk:*
 		dev-vcs/rcs
 		sci-visualization/gnuplot
 	)
@@ -45,7 +44,9 @@ src_prepare() {
 			fi
 		done
 	fi
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+	epatch \
+		"${FILESDIR}"/${PN}-10.0.4-flags.patch \
+		"${FILESDIR}"/${PN}-11.0.4-cron.patch
 }
 
 src_configure() {
@@ -56,12 +57,12 @@ src_configure() {
 		econf \
 			--enable-copy-only \
 			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
-			$(use_enable cron install-cron) \
 			$(use_enable debug debuginfo) \
 			$(use_enable doc documentation ) \
 			$(use_enable isag install-isag) \
 			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
+			$(use_enable nls) \
+			--enable-install-cron
 }
 
 src_compile() {
@@ -71,8 +72,6 @@ src_compile() {
 src_install() {
 	keepdir /var/log/sa
 
-	use cron && dodir /etc/cron.d
-
 	emake \
 		DESTDIR="${D}" \
 		DOC_DIR=/usr/share/doc/${PF} \
diff --git a/app-admin/sysstat/sysstat-11.1.4.ebuild b/app-admin/sysstat/sysstat-11.1.4-r1.ebuild
index 37ead06f5b71..b5200ff1ec46 100644
--- a/app-admin/sysstat/sysstat-11.1.4.ebuild
+++ b/app-admin/sysstat/sysstat-11.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.1.4.ebuild,v 1.1 2015/04/14 04:49:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.1.4-r1.ebuild,v 1.1 2015/06/08 04:45:43 jer Exp $
 
 EAPI=5
 inherit eutils multilib systemd toolchain-funcs
@@ -12,12 +12,11 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="cron debug +doc isag nls lm_sensors selinux"
+IUSE="debug +doc isag nls lm_sensors selinux"
 
 CDEPEND="
-	cron? ( sys-process/cronbase )
 	isag? (
-		dev-lang/tk
+		dev-lang/tk:*
 		dev-vcs/rcs
 		sci-visualization/gnuplot
 	)
@@ -45,7 +44,9 @@ src_prepare() {
 			fi
 		done
 	fi
-	epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+	epatch \
+		"${FILESDIR}"/${PN}-10.0.4-flags.patch \
+		"${FILESDIR}"/${PN}-11.0.4-cron.patch
 }
 
 src_configure() {
@@ -56,12 +57,12 @@ src_configure() {
 		econf \
 			--enable-copy-only \
 			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
-			$(use_enable cron install-cron) \
 			$(use_enable debug debuginfo) \
 			$(use_enable doc documentation ) \
 			$(use_enable isag install-isag) \
 			$(use_enable lm_sensors sensors) \
-			$(use_enable nls)
+			$(use_enable nls) \
+			--enable-install-cron
 }
 
 src_compile() {
@@ -71,8 +72,6 @@ src_compile() {
 src_install() {
 	keepdir /var/log/sa
 
-	use cron && dodir /etc/cron.d
-
 	emake \
 		DESTDIR="${D}" \
 		DOC_DIR=/usr/share/doc/${PF} \