commit: 366b4d33cc2c5d7733a5b03993d87b12e3bbd891 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Sat Mar 18 16:38:33 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sat Mar 18 16:38:33 2017 +0000 URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=366b4d33
app-portage/gentoostats: Bump to EAPI=6 and distutils-r1 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> app-portage/gentoostats/gentoostats-9999.ebuild | 38 +++++++++++-------------- app-portage/gentoostats/metadata.xml | 4 ++- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/app-portage/gentoostats/gentoostats-9999.ebuild b/app-portage/gentoostats/gentoostats-9999.ebuild index 29b517d..6e55fe8 100644 --- a/app-portage/gentoostats/gentoostats-9999.ebuild +++ b/app-portage/gentoostats/gentoostats-9999.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=3 +EAPI=6 -inherit distutils python git-2 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 git-r3 DESCRIPTION="Package statistics client" HOMEPAGE="http://soc.dev.gentoo.org/gentoostats"; SRC_URI="" - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/gentoostats.git" LICENSE="GPL-3" @@ -18,29 +19,24 @@ IUSE="" DEPEND="" RDEPEND="${DEPEND} - sys-apps/portage - >=app-portage/gentoolkit-0.3.0.2 - virtual/python-argparse - dev-python/simplejson" + sys-apps/portage[${PYTHON_USEDEP}] + >=app-portage/gentoolkit-0.3.0.2[${PYTHON_USEDEP}] + dev-python/simplejson[${PYTHON_USEDEP}] + virtual/python-argparse[${PYTHON_USEDEP}]" -src_compile() { - pushd "client" - distutils_src_compile -} +S="${WORKDIR}"/${P}/client src_install() { - pushd "client" - distutils_src_install + distutils-r1_src_install - dodir /etc/gentoostats || die insinto /etc/gentoostats - doins payload.cfg || die + doins payload.cfg # TODO(antarus): Vikram mentioned something along the lines of # userpriv not letting you have files owned by portage so we end up # setting perms in postinst instead. - fowners root:portage /etc/gentoostats/payload.cfg || die - fperms 0640 /etc/gentoostats/payload.cfg || die + fowners root:portage /etc/gentoostats/payload.cfg + fperms 0640 /etc/gentoostats/payload.cfg } generate_uuid() { @@ -57,8 +53,6 @@ generate_uuid() { } pkg_postinst() { - distutils_pkg_postinst - AUTHFILE="${ROOT}/etc/gentoostats/auth.cfg" if ! [[ -f "${AUTHFILE}" ]]; then elog "Generating uuid and password in ${AUTHFILE}" @@ -69,6 +63,6 @@ pkg_postinst() { echo -n "PASSWD : " >> "${AUTHFILE}" < /dev/urandom tr -dc a-zA-Z0-9 | head -c16 >> "${AUTHFILE}" fi - chown root:portage "${AUTHFILE}" - chmod 0640 "${AUTHFILE}" + chown root:portage "${AUTHFILE}" || die + chmod 0640 "${AUTHFILE}" || die } diff --git a/app-portage/gentoostats/metadata.xml b/app-portage/gentoostats/metadata.xml index b969149..9c7e122 100644 --- a/app-portage/gentoostats/metadata.xml +++ b/app-portage/gentoostats/metadata.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<maintainer type="project"><email>maintainer-wan...@gentoo.org</email></maintainer> + <maintainer type="project"> + <email>maintainer-wan...@gentoo.org</email> + </maintainer> </pkgmetadata>
