public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
Date: Sun, 30 Dec 2012 14:17:29 +0000 (UTC)	[thread overview]
Message-ID: <20121230141729.BE5D32171D@flycatcher.gentoo.org> (raw)

mgorny      12/12/30 14:17:29

  Modified:             ChangeLog python-utils-r1.eclass
  Log:
  Fix installing scripts & modules for Prefix, bug #448786.

Revision  Changes    Path
1.581                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.581&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.581&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.580&r2=1.581

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- ChangeLog	29 Dec 2012 17:47:53 -0000	1.580
+++ ChangeLog	30 Dec 2012 14:17:29 -0000	1.581
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.580 2012/12/29 17:47:53 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.581 2012/12/30 14:17:29 mgorny Exp $
+
+  30 Dec 2012; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+  Fix installing scripts & modules for Prefix, bug #448786.
 
   29 Dec 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
   some adaption for new makefile handling, >=vdr-1.7.34



1.11                 eclass/python-utils-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.10&r2=1.11

Index: python-utils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- python-utils-r1.eclass	27 Dec 2012 22:56:53 -0000	1.10
+++ python-utils-r1.eclass	30 Dec 2012 14:17:29 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.10 2012/12/27 22:56:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.11 2012/12/30 14:17:29 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -490,10 +490,10 @@
 
 		debug-print "${FUNCNAME}: ${oldfn} -> ${newfn}"
 		newins "${f}" "${newfn}" || die
-		_python_rewrite_shebang "${D}/${d}/${newfn}"
+		_python_rewrite_shebang "${ED}/${d}/${newfn}"
 
 		# install the wrapper
-		_python_ln_rel "${ED}"/usr/bin/python-exec "${D}/${d}/${oldfn}" || die
+		_python_ln_rel "${ED}"/usr/bin/python-exec "${ED}/${d}/${oldfn}" || die
 	done
 }
 
@@ -501,7 +501,7 @@
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The current module root for python_domodule(). The path can be either
-# an absolute system path (it must start with a slash, and ${D} will be
+# an absolute system path (it must start with a slash, and ${ED} will be
 # prepended to it) or relative to the implementation's site-packages directory
 # (then it must start with a non-slash character).
 #
@@ -561,7 +561,7 @@
 		local PYTHON_SITEDIR=${PYTHON_SITEDIR}
 		[[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR
 
-		d=${PYTHON_SITEDIR}/${python_moduleroot}
+		d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot}
 	fi
 
 	local INSDESTTREE
@@ -569,7 +569,7 @@
 	insinto "${d}"
 	doins -r "${@}" || die
 
-	python_optimize "${D}/${d}"
+	python_optimize "${ED}/${d}"
 }
 
 _PYTHON_UTILS_R1=1





             reply	other threads:[~2012-12-30 14:17 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-12-30 14:17 Michal Gorny (mgorny) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-07-27 16:35 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass Michal Gorny (mgorny)
2015-07-27 16:34 Michal Gorny (mgorny)
2015-07-27 16:34 Michal Gorny (mgorny)
2015-07-27 16:32 Michal Gorny (mgorny)
2015-07-25 10:07 Michal Gorny (mgorny)
2015-02-21  8:07 Michal Gorny (mgorny)
2015-01-02  0:15 Michal Gorny (mgorny)
2015-01-02  0:14 Michal Gorny (mgorny)
2014-12-28 18:35 Michal Gorny (mgorny)
2014-12-28 11:24 Michal Gorny (mgorny)
2014-12-27 23:52 Michal Gorny (mgorny)
2014-12-27 23:22 Michal Gorny (mgorny)
2014-12-27 19:31 Michal Gorny (mgorny)
2014-12-27 18:26 Michal Gorny (mgorny)
2014-11-29 23:03 Michal Gorny (mgorny)
2014-11-23 16:05 Mike Gilbert (floppym)
2014-11-23 16:02 Mike Gilbert (floppym)
2014-10-18 22:36 Mike Gilbert (floppym)
2014-09-04 14:52 Michal Gorny (mgorny)
2014-07-06 11:45 Michal Gorny (mgorny)
2014-06-19 15:10 Michal Gorny (mgorny)
2014-05-16  7:54 Michal Gorny (mgorny)
2014-05-01 13:34 Justin Lecher (jlec)
2014-03-13  8:10 Michal Gorny (mgorny)
2014-03-12  9:29 Michal Gorny (mgorny)
2014-03-12  9:23 Michal Gorny (mgorny)
2014-03-12  9:06 Michal Gorny (mgorny)
2014-03-12  8:18 Patrick Lauer (patrick)
2014-02-22 17:01 Mike Gilbert (floppym)
2013-10-27  7:27 Michal Gorny (mgorny)
2013-10-09 19:08 Michal Gorny (mgorny)
2013-10-09 17:23 Michal Gorny (mgorny)
2013-09-17 19:40 Michal Gorny (mgorny)
2013-09-17 17:28 Michal Gorny (mgorny)
2013-09-17 13:25 Michal Gorny (mgorny)
2013-09-16 17:58 Michal Gorny (mgorny)
2013-09-08 14:56 Michal Gorny (mgorny)
2013-09-08 14:54 Michal Gorny (mgorny)
2013-09-05  9:59 Michal Gorny (mgorny)
2013-08-28 22:04 Michal Gorny (mgorny)
2013-07-11  7:20 Michal Gorny (mgorny)
2013-07-11  6:57 Michal Gorny (mgorny)
2013-06-07  1:11 Mike Gilbert (floppym)
2013-05-31 17:40 Michal Gorny (mgorny)
2013-04-14  0:10 Mike Gilbert (floppym)
2013-03-28 12:21 Michal Gorny (mgorny)
2013-03-07 20:58 Tim Harder (radhermit)
2013-02-04 13:53 Michal Gorny (mgorny)
2013-02-04 13:52 Michal Gorny (mgorny)
2013-01-29 21:12 Michal Gorny (mgorny)
2013-01-27 16:35 Michal Gorny (mgorny)
2013-01-05 10:01 Michal Gorny (mgorny)
2012-12-27 22:56 Michal Gorny (mgorny)
2012-12-20  6:05 Mike Gilbert (floppym)
2012-12-15 21:30 Michal Gorny (mgorny)
2012-11-26 10:16 Michal Gorny (mgorny)

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=20121230141729.BE5D32171D@flycatcher.gentoo.org \
    --to=mgorny@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