From: "Fabian Groffen (grobian)" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-portage/gentoolkit-dev: gentoolkit-dev-9999.ebuild gentoolkit-dev-0.3.0.ebuild ChangeLog
Date: Wed, 29 Jul 2015 17:52:38 +0000 (UTC) [thread overview]
Message-ID: <20150729175238.8CCB6110@oystercatcher.gentoo.org> (raw)
grobian 15/07/29 17:52:38
Modified: gentoolkit-dev-9999.ebuild
gentoolkit-dev-0.3.0.ebuild ChangeLog
Log:
Fix for Prefix: shebangs and portage.db key
(Portage version: 2.2.20-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path
1.18 app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild?r1=1.17&r2=1.18
Index: gentoolkit-dev-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gentoolkit-dev-9999.ebuild 22 May 2015 16:39:00 -0000 1.17
+++ gentoolkit-dev-9999.ebuild 29 Jul 2015 17:52:38 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.17 2015/05/22 16:39:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.18 2015/07/29 17:52:38 grobian Exp $
EAPI="5"
@@ -37,6 +37,28 @@
RDEPEND="${PYTHON_DEPS}
${CDEPEND}"
+src_prepare() {
+ if [[ -n ${EPREFIX} ]] ; then
+ # fix shebangs of scripts
+ local d p
+ ebegin "Fixing shebangs"
+ for d in src/* ; do
+ p=${d#*/}
+ sed -i \
+ -e "1s:\(\(/usr\)\?/bin/\):${EPREFIX}\1:" \
+ ${d}/${p}* \
+ || die "failed to fix ${d}/${p}"
+ done
+ eend $?
+
+ # fix repo location
+ sed -i \
+ -e "s:portage\.db\['/'\]:portage.db['${EPREFIX}/']:g" \
+ src/ekeyword/ekeyword.py \
+ || die "failed to set EPREFIX in ekeyword"
+ fi
+}
+
src_test() {
# echangelog test is not able to run as root
# the EUID check may not work for everybody
1.2 app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild?r1=1.1&r2=1.2
Index: gentoolkit-dev-0.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gentoolkit-dev-0.3.0.ebuild 22 May 2015 16:39:00 -0000 1.1
+++ gentoolkit-dev-0.3.0.ebuild 29 Jul 2015 17:52:38 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild,v 1.1 2015/05/22 16:39:00 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild,v 1.2 2015/07/29 17:52:38 grobian Exp $
EAPI="5"
@@ -37,6 +37,28 @@
RDEPEND="${PYTHON_DEPS}
${CDEPEND}"
+src_prepare() {
+ if [[ -n ${EPREFIX} ]] ; then
+ # fix shebangs of scripts
+ local d p
+ ebegin "Fixing shebangs"
+ for d in src/* ; do
+ p=${d#*/}
+ sed -i \
+ -e "1s:\(\(/usr\)\?/bin/\):${EPREFIX}\1:" \
+ ${d}/${p}* \
+ || die "failed to fix ${d}/${p}"
+ done
+ eend $?
+
+ # fix repo location
+ sed -i \
+ -e "s:portage\.db\['/'\]:portage.db['${EPREFIX}/']:g" \
+ src/ekeyword/ekeyword.py \
+ || die "failed to set EPREFIX in ekeyword"
+ fi
+}
+
src_test() {
# echangelog test is not able to run as root
# the EUID check may not work for everybody
1.144 app-portage/gentoolkit-dev/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog?r1=1.143&r2=1.144
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- ChangeLog 22 Jul 2015 01:42:18 -0000 1.143
+++ ChangeLog 29 Jul 2015 17:52:38 -0000 1.144
@@ -1,6 +1,10 @@
# ChangeLog for app-portage/gentoolkit-dev
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.143 2015/07/22 01:42:18 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.144 2015/07/29 17:52:38 grobian Exp $
+
+ 29 Jul 2015; Fabian Groffen <grobian@gentoo.org> gentoolkit-dev-0.3.0.ebuild,
+ gentoolkit-dev-9999.ebuild:
+ Fix for Prefix: shebangs and portage.db key
22 Jul 2015; Manuel Rüger <mrueg@gentoo.org>
-files/gentoolkit-dev-0.2.8-tests.patch, -gentoolkit-dev-0.2.6.14.ebuild,
reply other threads:[~2015-07-29 17:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150729175238.8CCB6110@oystercatcher.gentoo.org \
--to=grobian@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox