diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2005-12-10 00:53:41 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2005-12-10 00:53:41 +0000 |
| commit | 241e0107e6b44f924edf747a14077f0d531ef7fa (patch) | |
| tree | b160539558b988d452e03f222a9d3822c4c61510 /dev-python | |
| parent | Removing dvdrip from package.mask (diff) | |
| download | gentoo-2-241e0107e6b44f924edf747a14077f0d531ef7fa.tar.gz gentoo-2-241e0107e6b44f924edf747a14077f0d531ef7fa.tar.bz2 gentoo-2-241e0107e6b44f924edf747a14077f0d531ef7fa.zip | |
minor fixes
(Portage version: 2.0.53)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/qscintilla/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/qscintilla/qscintilla-1.5.1.ebuild | 9 | ||||
| -rw-r--r-- | dev-python/qscintilla/qscintilla-1.6.ebuild | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog index ab330ac9ae74..ea03af15269a 100644 --- a/dev-python/qscintilla/ChangeLog +++ b/dev-python/qscintilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/qscintilla # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.52 2005/12/09 21:35:23 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.53 2005/12/10 00:53:41 carlo Exp $ + + 10 Dec 2005; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.5.1.ebuild, + qscintilla-1.6.ebuild: + minor fixes 09 Dec 2005; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.6.ebuild: fix whitespace diff --git a/dev-python/qscintilla/qscintilla-1.5.1.ebuild b/dev-python/qscintilla/qscintilla-1.5.1.ebuild index 955e5d1bc053..0318d84e9641 100644 --- a/dev-python/qscintilla/qscintilla-1.5.1.ebuild +++ b/dev-python/qscintilla/qscintilla-1.5.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.5.1.ebuild,v 1.5 2005/08/18 18:51:05 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.5.1.ebuild,v 1.6 2005/12/10 00:53:41 carlo Exp $ -inherit eutils +inherit eutils toolchain-funcs SCINTILLA_VER="1.62" MY_P="${PN}-${SCINTILLA_VER}-gpl-${PV}" @@ -25,7 +25,7 @@ DEPEND="virtual/libc sys-apps/sed =x11-libs/qt-3*" -LIBDIR="/usr/$(get_libdir)" +LIBDIR="${ROOT}/usr/$(get_libdir)" src_unpack() { unpack ${A} ; cd ${S}/qt @@ -38,7 +38,8 @@ src_unpack() { src_compile() { cd ${S}/qt - make destdir=${LIBDIR} all staticlib + # It uses g++'s syntax while linking (-Wl,) so it can't use tc-getLD. + make destdir=${LIBDIR} all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed" } src_install() { diff --git a/dev-python/qscintilla/qscintilla-1.6.ebuild b/dev-python/qscintilla/qscintilla-1.6.ebuild index 61353e2945f7..bb307bddc354 100644 --- a/dev-python/qscintilla/qscintilla-1.6.ebuild +++ b/dev-python/qscintilla/qscintilla-1.6.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.6.ebuild,v 1.2 2005/12/09 21:35:23 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.6.ebuild,v 1.3 2005/12/10 00:53:41 carlo Exp $ -inherit eutils +inherit eutils toolchain-funcs SCINTILLA_VER="1.65" MY_P="${PN}-${SCINTILLA_VER}-gpl-${PV}" @@ -42,7 +42,7 @@ src_unpack() { src_compile() { cd ${S}/qt - make destdir="${ROOT}/usr/$(get_libdir)" all staticlib + make destdir="${ROOT}/usr/$(get_libdir)" all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed" cd ${S}/designer dodir ${QTDIR}/plugins/designer make |