From ed8427b948a2963752692f6aaa3706218df64d30 Mon Sep 17 00:00:00 2001 From: Manuel Rüger Date: Wed, 23 Jul 2014 01:32:12 +0000 Subject: Install missing config files. Apply fix for bug #432206. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key ) --- net-misc/arm/ChangeLog | 8 +++- net-misc/arm/arm-1.4.5.0_p20140714-r1.ebuild | 60 ++++++++++++++++++++++++++++ net-misc/arm/arm-1.4.5.0_p20140714.ebuild | 56 -------------------------- 3 files changed, 67 insertions(+), 57 deletions(-) create mode 100644 net-misc/arm/arm-1.4.5.0_p20140714-r1.ebuild delete mode 100644 net-misc/arm/arm-1.4.5.0_p20140714.ebuild (limited to 'net-misc/arm') diff --git a/net-misc/arm/ChangeLog b/net-misc/arm/ChangeLog index 88ede23a5135..030e490d2174 100644 --- a/net-misc/arm/ChangeLog +++ b/net-misc/arm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/arm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/arm/ChangeLog,v 1.26 2014/07/23 00:15:57 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/arm/ChangeLog,v 1.27 2014/07/23 01:32:12 mrueg Exp $ + +*arm-1.4.5.0_p20140714-r1 (23 Jul 2014) + + 23 Jul 2014; Manuel Rüger +arm-1.4.5.0_p20140714-r1.ebuild, + -arm-1.4.5.0_p20140714.ebuild: + Install missing config files. Apply fix for bug #432206. *arm-1.4.5.0_p20140714 (23 Jul 2014) diff --git a/net-misc/arm/arm-1.4.5.0_p20140714-r1.ebuild b/net-misc/arm/arm-1.4.5.0_p20140714-r1.ebuild new file mode 100644 index 000000000000..20ff1fd21d31 --- /dev/null +++ b/net-misc/arm/arm-1.4.5.0_p20140714-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/arm/arm-1.4.5.0_p20140714-r1.ebuild,v 1.1 2014/07/23 01:32:12 mrueg Exp $ + +EAPI=5 +PYTHON_COMPAT=(python2_7) +PYTHON_REQ_USE="ncurses" +inherit vcs-snapshot distutils-r1 + +DESCRIPTION="A ncurses-based status monitor for Tor relays" +HOMEPAGE="http://www.atagar.com/arm/" +COMMIT_ID="ac7923e31f52d3cf51b538ddf799162d67c04ecc" +SRC_URI="https://gitweb.torproject.org/arm.git/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] ) + dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=">=net-libs/stem-1.2.2_p20140718[${PYTHON_USEDEP}] + net-misc/tor" + +python_prepare_all() { + sed -i -e "s/.version import VERSION/ import __version__ as VERSION/"\ + -e "s/, 'arm.cli'//"\ + -e "s/arm.cli/arm/g"\ + -e "s/'arm.stem'//"\ + -e "/gui/d"\ + -e "s/\"arm\/settings.cfg\",//"\ + -e "/install-purelib/d"\ + -e "/eggPath/d" setup.py || die + sed -i -e "s/1.4.6_dev/${PV}/" arm/__init__.py || die + distutils-r1_python_prepare_all +} + +python_install() { + distutils-r1_python_install --docPath "${EPREFIX}"/usr/share/doc/${PF} + # Workaround until setup.py is fixed upstream + python_moduleinto arm + python_domodule arm/config + python_replicate_script "${ED}"/usr/bin/run_arm +} +python_install_all() { + distutils-r1_python_install_all --docPath "${EPREFIX}"/usr/share/doc/${PF} +} + +python_test() { + ${PYTHON} run_tests.py || die +} + +pkg_postinst() { + elog "Some graphing data issues have been noted in testing" + elog "when run as root. It is not recommended to run arm as" + elog "root until those issues have been isolated and fixed." + elog + elog "Trouble with graphs under app-misc/screen? Try:" + elog 'TERM="rxvt-unicode" arm' +} diff --git a/net-misc/arm/arm-1.4.5.0_p20140714.ebuild b/net-misc/arm/arm-1.4.5.0_p20140714.ebuild deleted file mode 100644 index 7cd6bfe9fedd..000000000000 --- a/net-misc/arm/arm-1.4.5.0_p20140714.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/arm/arm-1.4.5.0_p20140714.ebuild,v 1.1 2014/07/23 00:15:57 mrueg Exp $ - -EAPI=5 -PYTHON_COMPAT=(python2_7) -PYTHON_REQ_USE="ncurses" -inherit vcs-snapshot distutils-r1 - -DESCRIPTION="A ncurses-based status monitor for Tor relays" -HOMEPAGE="http://www.atagar.com/arm/" -COMMIT_ID="ac7923e31f52d3cf51b538ddf799162d67c04ecc" -SRC_URI="https://gitweb.torproject.org/arm.git/snapshot/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="test" - -DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] ) - dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND=">=net-libs/stem-1.2.2_p20140718[${PYTHON_USEDEP}] - net-misc/tor" - -python_prepare_all() { - sed -i -e "s/.version import VERSION/ import __version__ as VERSION/"\ - -e "s/, 'arm.cli'//"\ - -e "s/arm.cli/arm/g"\ - -e "s/arm.stem//"\ - -e "/gui/d"\ - -e "s/\"arm\/settings.cfg\",//"\ - -e "/install-purelib/d"\ - -e "/eggPath/d" setup.py || die - sed -i -e "s/1.4.6_dev/${PV}/" arm/__init__.py || die - distutils-r1_python_prepare_all -} - -python_install() { - distutils-r1_python_install --docPath "${EPREFIX}"/usr/share/doc/${PF} -} -python_install_all() { - distutils-r1_python_install_all --docPath "${EPREFIX}"/usr/share/doc/${PF} -} - -python_test() { - ${PYTHON} run_tests.py || die -} - -pkg_postinst() { - elog "Some graphing data issues have been noted in testing" - elog "when run as root. It is not recommended to run arm as" - elog "root until those issues have been isolated and fixed." - elog - elog "Trouble with graphs under app-misc/screen? Try:" - elog 'TERM="rxvt-unicode" arm' -} -- cgit v1.2.3-65-gdbad