From 197b9a17f858361a6ab373aa06c9ca628f43b380 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Apr 2015 13:25:34 +0100 Subject: since in Argent we're gonna leave the user choose their init system, gcc-config systemd support should be optional --- sys-devel/gcc-config/gcc-config-1.7.3.ebuild | 14 ++++++++++---- sys-devel/gcc-config/gcc-config-1.8.ebuild | 12 +++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/sys-devel/gcc-config/gcc-config-1.7.3.ebuild b/sys-devel/gcc-config/gcc-config-1.7.3.ebuild index f7c64752..714ffc44 100644 --- a/sys-devel/gcc-config/gcc-config-1.7.3.ebuild +++ b/sys-devel/gcc-config/gcc-config-1.7.3.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ + +EAPI=5 inherit eutils unpacker toolchain-funcs multilib @@ -12,14 +13,19 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="" +IUSE="openrc +systemd" +DEPEND=" + openrc? ( >=sys-apps/openrc-0.12.4 ) + systemd? ( >=sys-apps/gentoo-functions-0.7 )" -src_unpack() { +src_prepare() { unpacker_src_unpack cd "${S}" || die epatch "${FILESDIR}/${PN}-kogaion-base-gcc-support.patch" # systemd-only systems (Kogaion/Sabayon) support - epatch "${FILESDIR}/${PN}-systemd.patch" + if use systemd; then + epatch "${FILESDIR}/${PN}-systemd.patch" + fi } src_compile() { diff --git a/sys-devel/gcc-config/gcc-config-1.8.ebuild b/sys-devel/gcc-config/gcc-config-1.8.ebuild index 94dc67d2..94b1e254 100644 --- a/sys-devel/gcc-config/gcc-config-1.8.ebuild +++ b/sys-devel/gcc-config/gcc-config-1.8.ebuild @@ -1,6 +1,7 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ + +EAPI=5 inherit eutils unpacker toolchain-funcs multilib @@ -12,14 +13,19 @@ SRC_URI="mirror://gentoo/${P}.tar.xz LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="" +IUSE="openrc +systemd" +DEPEND=" + openrc? ( >=sys-apps/openrc-0.12.4 ) + systemd? ( >=sys-apps/gentoo-functions-0.7 )" src_unpack() { unpacker_src_unpack cd "${S}" || die epatch "${FILESDIR}/${PN}-kogaion-base-gcc-support-2.patch" # systemd-only systems (Kogaion/Sabayon) support - epatch "${FILESDIR}/${PN}-systemd.patch" + if use systemd; then + epatch "${FILESDIR}/${PN}-systemd.patch" + fi } src_compile() { -- cgit v1.2.3