From 3a6bd2277d50ef53eb50676b0749d3bce91277dd Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 17 Feb 2017 15:40:21 +0100 Subject: dev-vcs/mercurial-server: distutils-r1, EAPI=6 --- .../mercurial-server-1.2-r1.ebuild | 83 ++++++++++++++++++++++ .../mercurial-server/mercurial-server-1.2.ebuild | 82 --------------------- .../mercurial-server/mercurial-server-9999.ebuild | 43 +++++------ 3 files changed, 105 insertions(+), 103 deletions(-) create mode 100644 dev-vcs/mercurial-server/mercurial-server-1.2-r1.ebuild delete mode 100644 dev-vcs/mercurial-server/mercurial-server-1.2.ebuild (limited to 'dev-vcs/mercurial-server') diff --git a/dev-vcs/mercurial-server/mercurial-server-1.2-r1.ebuild b/dev-vcs/mercurial-server/mercurial-server-1.2-r1.ebuild new file mode 100644 index 000000000000..9212f8ffff89 --- /dev/null +++ b/dev-vcs/mercurial-server/mercurial-server-1.2-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +# force single impl to avoid python-exec wrapping +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 user + +if [[ "${PV}" = "9999" ]]; then + inherit mercurial + EHG_REPO_URI="http://hg.opensource.lshift.net/mercurial-server" + KEYWORDS="" +else + MY_P="${PN}_${PV}" + SRC_URI="http://dev.lshift.net/paul/mercurial-server/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${MY_P}.orig" +fi + +DESCRIPTION="Mercurial authentication and authorization tools" +HOMEPAGE="http://www.lshift.net/mercurial-server.html" + +LICENSE="GPL-2" +SLOT="0" +IUSE="doc" + +RDEPEND="dev-vcs/mercurial" +DEPEND="${RDEPEND} + doc? ( + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + )" + +pkg_setup() { + enewgroup hg + enewuser hg -1 /bin/bash "/var/lib/${PN}" hg + python-single-r1_pkg_setup +} + +python_prepare_all() { + # remove useless makefile + rm Makefile || die + + # fix installation paths + sed -i -e "s|'init'|'share/${PN}/init'|" setup.py \ + || die 'sed setup.py failed.' + + distutils-r1_python_prepare_all +} + +python_compile_all() { + # build documentation + if use doc; then + xsltproc --nonet -o manual.html \ + /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl \ + doc/manual.docbook || die "xsltproc failed" + fi +} + +python_install() { + distutils-r1_python_install --install-scripts="/usr/share/${PN}" +} + +python_install_all() { + distutils-r1_python_install_all + + # install configuration files + insinto "/etc/${PN}" + doins -r src/init/conf/. + keepdir /etc/mercurial-server/keys/{root,users} + + # install documentation + use doc && dodoc manual.html + + # install hg home directory + keepdir "/var/lib/${PN}" + fowners hg:hg "/var/lib/${PN}" + fperms 750 "/var/lib/${PN}" +} diff --git a/dev-vcs/mercurial-server/mercurial-server-1.2.ebuild b/dev-vcs/mercurial-server/mercurial-server-1.2.ebuild deleted file mode 100644 index 6f78f0191984..000000000000 --- a/dev-vcs/mercurial-server/mercurial-server-1.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" -PYTHON_DEPEND="2" - -inherit distutils eutils user - -if [[ "${PV}" = "9999" ]]; then - inherit mercurial - EHG_REPO_URI="http://hg.opensource.lshift.net/mercurial-server" - KEYWORDS="" -else - MY_P="${PN}_${PV}" - SRC_URI="http://dev.lshift.net/paul/mercurial-server/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_P}.orig" -fi - -DESCRIPTION="Mercurial authentication and authorization tools" -HOMEPAGE="http://www.lshift.net/mercurial-server.html" - -LICENSE="GPL-2" -SLOT="0" -IUSE="doc" - -RDEPEND="dev-vcs/mercurial" -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - )" - -pkg_setup() { - enewgroup hg - enewuser hg -1 /bin/bash "/var/lib/${PN}" hg -} - -src_prepare() { - # remove useless makefile - rm Makefile - - # fix installation paths - sed -i -e "s|'init'|'share/${PN}/init'|" setup.py \ - || die 'sed setup.py failed.' - - # fix documentation - if [[ "${PV}" = "1.1" ]]; then - epatch "${FILESDIR}/${P}_documentation.patch" - fi -} - -src_compile() { - distutils_src_compile - - # build documentation - if use doc; then - xsltproc --nonet -o manual.html \ - /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl \ - doc/manual.docbook || die "xsltproc failed" - fi -} - -src_install() { - distutils_src_install --install-scripts="/usr/share/${PN}" - - # install configuration files - insinto "/etc/${PN}" - doins -r src/init/conf/* - keepdir /etc/mercurial-server/keys/{root,users} - - # install documentation - if use doc; then - dohtml manual.html - fi - - # install hg home directory - keepdir "/var/lib/${PN}" - fowners hg:hg "/var/lib/${PN}" - fperms 750 "/var/lib/${PN}" -} diff --git a/dev-vcs/mercurial-server/mercurial-server-9999.ebuild b/dev-vcs/mercurial-server/mercurial-server-9999.ebuild index 0c131f4f95e1..c53d6b79af40 100644 --- a/dev-vcs/mercurial-server/mercurial-server-9999.ebuild +++ b/dev-vcs/mercurial-server/mercurial-server-9999.ebuild @@ -1,11 +1,14 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="3" -PYTHON_DEPEND="2" +EAPI=6 -inherit distutils eutils user +# force single impl to avoid python-exec wrapping +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 user if [[ "${PV}" = "9999" ]]; then inherit mercurial @@ -35,45 +38,43 @@ DEPEND="${RDEPEND} pkg_setup() { enewgroup hg enewuser hg -1 /bin/bash "/var/lib/${PN}" hg + python-single-r1_pkg_setup } -src_prepare() { +python_prepare_all() { # remove useless makefile - rm Makefile + rm Makefile || die # fix installation paths sed -i -e "s|'init'|'share/${PN}/init'|" setup.py \ || die 'sed setup.py failed.' - # fix documentation - if [[ "${PV}" = "1.1" ]]; then - epatch "${FILESDIR}/${P}_documentation.patch" - fi + distutils-r1_python_prepare_all } -src_compile() { - distutils_src_compile - +python_compile_all() { # build documentation if use doc; then xsltproc --nonet -o manual.html \ - /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl \ - doc/manual.docbook || die "xsltproc failed" + /usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl \ + doc/manual.docbook || die "xsltproc failed" fi } -src_install() { - distutils_src_install --install-scripts="/usr/share/${PN}" +python_install() { + distutils-r1_python_install --install-scripts="/usr/share/${PN}" +} + +python_install_all() { + distutils-r1_python_install_all # install configuration files insinto "/etc/${PN}" - doins -r src/init/conf/* + doins -r src/init/conf/. keepdir /etc/mercurial-server/keys/{root,users} # install documentation - if use doc; then - dohtml manual.html - fi + use doc && dodoc manual.html # install hg home directory keepdir "/var/lib/${PN}" -- cgit v1.2.3-65-gdbad