Fix rc.d directory hack (bug #551732).

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

5 files changed, 19 insertions, 177 deletions

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index 6c701c4a2548..f5829a8947a0 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.291 2015/06/14 09:07:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.292 2015/07/09 06:38:39 jer Exp $
+
+*sysstat-11.1.5-r1 (09 Jul 2015)
+*sysstat-11.0.5-r1 (09 Jul 2015)
+
+  09 Jul 2015; Jeroen Roovers <jer@gentoo.org> -sysstat-11.0.4-r1.ebuild,
+  -sysstat-11.0.5.ebuild, +sysstat-11.0.5-r1.ebuild, -sysstat-11.1.4-r1.ebuild,
+  -sysstat-11.1.5.ebuild, +sysstat-11.1.5-r1.ebuild:
+  Fix rc.d directory hack (bug #551732).
 
 *sysstat-11.1.5 (14 Jun 2015)
 *sysstat-11.0.5 (14 Jun 2015)
diff --git a/app-admin/sysstat/sysstat-11.0.4-r1.ebuild b/app-admin/sysstat/sysstat-11.0.5-r1.ebuild
index 0d6bc9cac27f..9af471f00c81 100644
--- a/app-admin/sysstat/sysstat-11.0.4-r1.ebuild
+++ b/app-admin/sysstat/sysstat-11.0.5-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-r1.ebuild,v 1.1 2015/06/08 04:45:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.0.5-r1.ebuild,v 1.1 2015/07/09 06:38:39 jer Exp $
 
 EAPI=5
 inherit eutils multilib systemd toolchain-funcs
@@ -32,6 +32,8 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-sysstat )
 "
 
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -53,7 +55,7 @@ src_configure() {
 	tc-export AR
 	sa_lib_dir=/usr/$(get_libdir)/sa \
 		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			--enable-copy-only \
 			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
@@ -79,6 +81,7 @@ src_install() {
 
 	dodoc contrib/sargraph/sargraph
 
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	systemd_dounit ${PN}.service
 
diff --git a/app-admin/sysstat/sysstat-11.0.5.ebuild b/app-admin/sysstat/sysstat-11.0.5.ebuild
deleted file mode 100644
index feb399b4d57b..000000000000
--- a/app-admin/sysstat/sysstat-11.0.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.5.ebuild,v 1.1 2015/06/14 09:07:15 jer Exp $
-
-EAPI=5
-inherit eutils multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-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="debug +doc isag nls lm_sensors selinux"
-
-CDEPEND="
-	isag? (
-		dev-lang/tk:*
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch \
-		"${FILESDIR}"/${PN}-10.0.4-flags.patch \
-		"${FILESDIR}"/${PN}-11.0.4-cron.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			--enable-copy-only \
-			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-install-cron
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-11.1.4-r1.ebuild b/app-admin/sysstat/sysstat-11.1.5-r1.ebuild
index b5200ff1ec46..ad180dae461c 100644
--- a/app-admin/sysstat/sysstat-11.1.4-r1.ebuild
+++ b/app-admin/sysstat/sysstat-11.1.5-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-r1.ebuild,v 1.1 2015/06/08 04:45:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-11.1.5-r1.ebuild,v 1.1 2015/07/09 06:38:39 jer Exp $
 
 EAPI=5
 inherit eutils multilib systemd toolchain-funcs
@@ -32,6 +32,8 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-sysstat )
 "
 
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
 src_prepare() {
 	if use nls; then
 		strip-linguas -i nls/
@@ -53,7 +55,7 @@ src_configure() {
 	tc-export AR
 	sa_lib_dir=/usr/$(get_libdir)/sa \
 		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
 		econf \
 			--enable-copy-only \
 			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
@@ -79,6 +81,7 @@ src_install() {
 
 	dodoc contrib/sargraph/sargraph
 
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
 	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
 	systemd_dounit ${PN}.service
 
diff --git a/app-admin/sysstat/sysstat-11.1.5.ebuild b/app-admin/sysstat/sysstat-11.1.5.ebuild
deleted file mode 100644
index 37c7a568c064..000000000000
--- a/app-admin/sysstat/sysstat-11.1.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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.5.ebuild,v 1.1 2015/06/14 09:07:15 jer Exp $
-
-EAPI=5
-inherit eutils multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug +doc isag nls lm_sensors selinux"
-
-CDEPEND="
-	isag? (
-		dev-lang/tk:*
-		dev-vcs/rcs
-		sci-visualization/gnuplot
-	)
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-	epatch \
-		"${FILESDIR}"/${PN}-10.0.4-flags.patch \
-		"${FILESDIR}"/${PN}-11.0.4-cron.patch
-}
-
-src_configure() {
-	tc-export AR
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=Gentoo-does-not-use-rc.d \
-		econf \
-			--enable-copy-only \
-			--with-systemdsystemunitdir=$(systemd_get_unitdir) \
-			$(use_enable debug debuginfo) \
-			$(use_enable doc documentation ) \
-			$(use_enable isag install-isag) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-install-cron
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		install
-
-	dodoc contrib/sargraph/sargraph
-
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
-}