From: Carsten Lohrke <carlo@gentoo.org>
Date: Sun, 19 Dec 2004 21:21:22 +0000 (+0000)
Subject: debug support, minor fixes
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e0072e833cdbd8e9428d86f8c642443d0af0eac;p=gentoo.git

debug support, minor fixes
---

diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index 1ccb14518b26..eea10234c0d4 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/PyQt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.48 2004/12/16 05:23:24 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.49 2004/12/19 21:21:22 carlo Exp $
+
+  19 Dec 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.13.ebuild:
+  debug support, minor fixes
 
   16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> PyQt-3.13.ebuild:
   Stable on amd64.
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index 4436f61366d7..fab74f8880ee 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,12 +1,12 @@
-MD5 04dd793a3e6bbfbaf0e4fc2630b6a421 ChangeLog 5869
-MD5 662927c3b912dc404e91bc13bf2c7ff7 PyQt-3.11.ebuild 1467
 MD5 7c8fb2a2b6609252545dcd723d207e89 PyQt-3.12.ebuild 1169
-MD5 4b51a48f503de0853b3a443499d2a263 PyQt-3.13.ebuild 1186
+MD5 662927c3b912dc404e91bc13bf2c7ff7 PyQt-3.11.ebuild 1467
 MD5 6ead8b4d714da5007cb7901b52d5d01d PyQt-3.8.1.ebuild 1647
+MD5 3affccb524378e0b1aabe27a9bbcb543 ChangeLog 5963
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
+MD5 0c0a905554069f00574727d70195d734 PyQt-3.13.ebuild 1510
 MD5 e548a5df6315f902d96d5b2d5afc2901 files/digest-PyQt-3.11 69
 MD5 1ce3d5a83afb717de48efb8050e66a1a files/digest-PyQt-3.12 69
 MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13 69
 MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
+MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
 MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
diff --git a/dev-python/PyQt/PyQt-3.13.ebuild b/dev-python/PyQt/PyQt-3.13.ebuild
index c17157307513..ba1c80e1fd98 100644
--- a/dev-python/PyQt/PyQt-3.13.ebuild
+++ b/dev-python/PyQt/PyQt-3.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.13.ebuild,v 1.6 2004/12/16 05:23:24 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.13.ebuild,v 1.7 2004/12/19 21:21:22 carlo Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc sparc -alpha amd64 ~ppc64"
-IUSE="doc"
+IUSE="debug doc"
 
 RDEPEND="virtual/libc
 	x11-libs/qt
@@ -26,20 +26,31 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool"
 
 
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s/  check_license()/# check_license()/" ${S}/configure.py
+}
+
 src_compile() {
 	distutils_python_version
 	addpredict ${QTDIR}/etc/settings
-	sed -i -e "s/  check_license()/# check_license()/" configure.py
-	python configure.py \
-		-d /usr/lib/python${PYVER}/site-packages \
-		-b /usr/bin \
-		-v /usr/share/sip \
-		-c
-	emake || die
+
+	local myconf="-d /usr/lib/python${PYVER}/site-packages -b /usr/bin -v /usr/share/sip"
+	use debug && myconf="${myconf} -u"
+	has distcc ${FEATURES} || myconf="${myconf} -c"
+
+	if [ "$(echo $(free -m | grep Mem) | cut -d' ' -f2)" -lt "257" ] ; then
+		echo ""
+		einfo "Low on memory?! Use distcc or get a coffee. :)"
+		echo ""
+	fi
+
+	python configure.py ${myconf}
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall DESTDIR=${D} || die
+	make DESTDIR=${D} install || die "install failed"
 	dodoc ChangeLog LICENSE NEWS README README.Linux THANKS
 	if use doc ; then
 		dohtml doc/PyQt.html