From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-python+bounces-232-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 343601381F3
for <garchives@archives.gentoo.org>; Mon, 26 Nov 2012 21:24:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 171C521C031;
Mon, 26 Nov 2012 21:23:56 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 95AFD21C031
for <gentoo-python@lists.gentoo.org>; Mon, 26 Nov 2012 21:23:55 +0000 (UTC)
Received: from pomiocik.lan (87-205-66-159.adsl.inetia.pl [87.205.66.159])
(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
(No client certificate requested)
(Authenticated sender: mgorny)
by smtp.gentoo.org (Postfix) with ESMTPSA id BB4B133D9D2;
Mon, 26 Nov 2012 21:23:53 +0000 (UTC)
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
To: gentoo-python@lists.gentoo.org
Cc: python@gentoo.org,
=?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Subject: [gentoo-python] [PATCH 04/10] Commonize out $(python_get_libdir) in src_install().
Date: Mon, 26 Nov 2012 22:20:31 +0100
Message-Id: <1353964837-24198-5-git-send-email-mgorny@gentoo.org>
X-Mailer: git-send-email 1.8.0
In-Reply-To: <1353964837-24198-1-git-send-email-mgorny@gentoo.org>
References: <1353964837-24198-1-git-send-email-mgorny@gentoo.org>
Precedence: bulk
List-Post: <mailto:gentoo-python@lists.gentoo.org>
List-Help: <mailto:gentoo-python+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-python+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-python+subscribe@lists.gentoo.org>
List-Id: Discussions centering around the Python ecosystem in Gentoo Linux <gentoo-python.gentoo.org>
X-BeenThere: gentoo-python@gentoo.org
X-BeenThere: gentoo-python@lists.gentoo.org
X-Archives-Salt: b34eb040-bc31-4514-8914-221bb466265b
X-Archives-Hash: 0258bec2d85d4c74eeb296dd8f67309f
---
gx86/dev-lang/python/python-2.7.3-r3.ebuild | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/gx86/dev-lang/python/python-2.7.3-r3.ebuild b/gx86/dev-lang/python/python-2.7.3-r3.ebuild
index 7efab59..1ba8eee 100644
--- a/gx86/dev-lang/python/python-2.7.3-r3.ebuild
+++ b/gx86/dev-lang/python/python-2.7.3-r3.ebuild
@@ -248,9 +248,11 @@ src_test() {
src_install() {
[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
+ local libdir=${ED}$(python_get_libdir)
+
emake DESTDIR="${D}" altinstall maninstall || die "emake altinstall maninstall failed"
- sed -e "s/\(LDFLAGS=\).*/\1/" -i "${ED}$(python_get_libdir)/config/Makefile" || die "sed failed"
+ sed -e "s/\(LDFLAGS=\).*/\1/" -i "${libdir}/config/Makefile" || die "sed failed"
mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
@@ -261,16 +263,16 @@ src_install() {
rm -f "${ED}usr/bin/smtpd.py"
if use build; then
- rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
+ rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{bsddb,dbhash.py,idlelib,lib-tk,sqlite3,test}
else
- use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/"{bsddb/test,test}
- use berkdb || rm -fr "${ED}$(python_get_libdir)/"{bsddb,dbhash.py,test/test_bsddb*}
- use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
- use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,lib-tk}
+ use elibc_uclibc && rm -fr "${libdir}/"{bsddb/test,test}
+ use berkdb || rm -fr "${libdir}/"{bsddb,dbhash.py,test/test_bsddb*}
+ use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
+ use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${libdir}/"{idlelib,lib-tk}
fi
- use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
- use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe
+ use threads || rm -fr "${libdir}/multiprocessing"
+ use wininst || rm -f "${libdir})/distutils/command/"wininst-*.exe
dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
--
1.8.0