commit: 74ffc3dee3556956428a8c43c7771ac641bd1771 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Mar 5 19:06:39 2016 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Mar 5 19:15:32 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ffc3de
sys-apps/gentoo-systemd-integration: Revamp the live ebuild Move to EAPI 6. Package-Manager: portage-2.2.27_p64 .../gentoo-systemd-integration-9999.ebuild | 39 +++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild index 8aba232..93648dd 100644 --- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild +++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild @@ -1,44 +1,45 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -#if LIVE -AUTOTOOLS_AUTORECONF=1 -EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"; -inherit git-2 -#endif +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"; + inherit autotools git-r3 +else + SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"; + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +fi -inherit autotools-utils systemd +inherit systemd DESCRIPTION="systemd integration files for Gentoo" -HOMEPAGE="https://bitbucket.org/mgorny/gentoo-systemd-integration"; -SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"; +HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"; LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="" RDEPEND=">=sys-apps/systemd-207 !sys-fs/eudev !sys-fs/udev" -#if LIVE -SRC_URI= -KEYWORDS= +if [[ ${PV} == 9999 ]]; then + DEPEND+=" sys-devel/systemd-m4" +fi -DEPEND="${DEPEND} - sys-devel/systemd-m4" -#endif +src_prepare() { + default + [[ ${PV} != 9999 ]] || eautoreconf +} src_configure() { local myeconfargs=( - "$(systemd_with_unitdir)" + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" # TODO: solve it better in the eclass --with-systemdsystemgeneratordir="$(systemd_get_utildir)"/system-generators ) - autotools-utils_src_configure + econf "${myeconfargs[@]}" }
