diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-11-19 14:24:23 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-11-19 14:24:23 +0000 |
| commit | 979190cab80656a6e6719a86c6ab161d2a47dfd9 (patch) | |
| tree | 7edb4d7669e6e54a72a1cfe64949cfdf9dec5cb0 /app-portage | |
| parent | arm stable, bug #345767 (diff) | |
| download | gentoo-2-979190cab80656a6e6719a86c6ab161d2a47dfd9.tar.gz gentoo-2-979190cab80656a6e6719a86c6ab161d2a47dfd9.tar.bz2 gentoo-2-979190cab80656a6e6719a86c6ab161d2a47dfd9.zip | |
Revision bump to fix eshowkw bug 346035
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/gentoolkit/ChangeLog | 9 | ||||
| -rw-r--r-- | app-portage/gentoolkit/files/0.3.0_rc11-eshowkw_indir.patch | 16 | ||||
| -rw-r--r-- | app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild (renamed from app-portage/gentoolkit/gentoolkit-0.3.0_rc11.ebuild) | 11 |
3 files changed, 31 insertions, 5 deletions
diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index f02fc97ef928..a1d76803962a 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-portage/gentoolkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.196 2010/11/18 21:57:20 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.197 2010/11/19 14:24:23 scarabeus Exp $ + +*gentoolkit-0.3.0_rc11-r1 (19 Nov 2010) + + 19 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org> + +files/0.3.0_rc11-eshowkw_indir.patch, -gentoolkit-0.3.0_rc11.ebuild, + +gentoolkit-0.3.0_rc11-r1.ebuild: + Revision bump to fix eshowkw bug 346035 *gentoolkit-0.3.0_rc11 (18 Nov 2010) diff --git a/app-portage/gentoolkit/files/0.3.0_rc11-eshowkw_indir.patch b/app-portage/gentoolkit/files/0.3.0_rc11-eshowkw_indir.patch new file mode 100644 index 000000000000..5ad7a58af497 --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0_rc11-eshowkw_indir.patch @@ -0,0 +1,16 @@ +Index: gentoolkit/pym/gentoolkit/eshowkw/__init__.py +=================================================================== +--- gentoolkit/pym/gentoolkit/eshowkw/__init__.py (revision 856) ++++ gentoolkit/pym/gentoolkit/eshowkw/__init__.py (revision 857) +@@ -118,9 +118,9 @@ + if len(ebuilds) <= 0: + msg_err = 'No ebuilds at "%s"' % currdir + raise SystemExit(msg_err) +- package= '/'.join(os.path.basename(os.path.abspath('../')), os.path.basename(currdir)) ++ package= '%s/%s' % (os.path.basename(os.path.abspath('../')), os.path.basename(currdir)) + ourtree = os.path.abspath('../../') +- overlays = ' '.join(ports['PORTDIR_OVERLAY'], ourtree) ++ overlays = '%s %s' % (ports['PORTDIR_OVERLAY'], ourtree) + mysettings = portc(env={'PORTDIR_OVERLAY': overlays}) + dbapi = portdbapi(mysettings=mysettings) + # specify that we want just our nice tree we are in cwd diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild index d1f80b57e370..0dc63da8819a 100644 --- a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild @@ -1,11 +1,12 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11.ebuild,v 1.1 2010/11/18 21:57:20 fuzzyray Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild,v 1.1 2010/11/19 14:24:23 scarabeus Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" DISTUTILS_DISABLE_VERSIONING_OF_PYTHON_SCRIPTS="1" RESTRICT_PYTHON_ABIS="2.[45]" +PYTHON_USE_WITH="xml" inherit distutils python eutils @@ -22,9 +23,7 @@ IUSE="" # KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -DEPEND="sys-apps/portage - >=dev-lang/python-2.6[xml] - !!>=dev-lang/python-2.6[-xml]" +DEPEND="sys-apps/portage" RDEPEND="${DEPEND} !<=app-portage/gentoolkit-dev-0.2.7 dev-python/argparse @@ -38,6 +37,10 @@ distutils_src_compile_pre_hook() { || die "setup.py set_version failed" } +src_prepare() { + epatch "${FILESDIR}/${PV}-eshowkw_indir.patch" +} + src_install() { python_convert_shebangs -r "" build-*/scripts-* distutils_src_install |