From 5c03efbacf5aa0cb5a08b35e21675044b600dfec Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tiziano=20M=C3=BCller?= Date: Sat, 6 Jan 2007 21:31:37 +0000 Subject: [PATCH] Added qt3 to inherit, fixed bug #140345. Some cleanups. Package-Manager: portage-2.1.2_rc4-r1 --- dev-python/qscintilla/ChangeLog | 8 +++- dev-python/qscintilla/Manifest | 16 ++++---- dev-python/qscintilla/qscintilla-1.7.1.ebuild | 38 +++++++++---------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog index fcaf1f286aef..38a912deb414 100644 --- a/dev-python/qscintilla/ChangeLog +++ b/dev-python/qscintilla/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/qscintilla -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.67 2006/12/26 22:38:00 dev-zero Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.68 2007/01/06 21:31:37 dev-zero Exp $ + + 06 Jan 2007; Tiziano Müller + qscintilla-1.7.1.ebuild: + Added qt3 to inherit, fixed bug #140345. Some cleanups. *qscintilla-1.7.1 (26 Dec 2006) diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest index ce232decb0b2..3069bd82dd69 100644 --- a/dev-python/qscintilla/Manifest +++ b/dev-python/qscintilla/Manifest @@ -12,14 +12,14 @@ EBUILD qscintilla-1.5.1.ebuild 2071 RMD160 e80526e39c7c437a7b5fb4d1ff25116984ad3 MD5 e70bf3827275bc2c00f845ef1a9667fc qscintilla-1.5.1.ebuild 2071 RMD160 e80526e39c7c437a7b5fb4d1ff25116984ad39fa qscintilla-1.5.1.ebuild 2071 SHA256 6142153db233108b0b3e391daec437cdfbcb2de21c5bbf978929ff506d577ef2 qscintilla-1.5.1.ebuild 2071 -EBUILD qscintilla-1.7.1.ebuild 2325 RMD160 206a0965d15ce56931e31c99ff8bdb6bb24e002f SHA1 5ac6e98b070970b0e1f26fa82f19cae3cfd7c540 SHA256 2e5177ae4a2d978235f81e4333f71921a5f0f47213c24eef15454d07c5db0195 -MD5 acfd749160508aadd862fc9c0469844c qscintilla-1.7.1.ebuild 2325 -RMD160 206a0965d15ce56931e31c99ff8bdb6bb24e002f qscintilla-1.7.1.ebuild 2325 -SHA256 2e5177ae4a2d978235f81e4333f71921a5f0f47213c24eef15454d07c5db0195 qscintilla-1.7.1.ebuild 2325 -MISC ChangeLog 8831 RMD160 581d7cf82034bdac5138696b8e3c4104c137089a SHA1 230cc8bd316d5e2f7a78d9b7db3bf66bc0047c38 SHA256 6603dff9be73c453d6f191fa549dc0308169d50376addd4c0f7d1bdb32904b8b -MD5 87021bcb3111c6656f60c62524bf3d05 ChangeLog 8831 -RMD160 581d7cf82034bdac5138696b8e3c4104c137089a ChangeLog 8831 -SHA256 6603dff9be73c453d6f191fa549dc0308169d50376addd4c0f7d1bdb32904b8b ChangeLog 8831 +EBUILD qscintilla-1.7.1.ebuild 2300 RMD160 718bf5a7f51f220c6ceffd594137bdc1c8859608 SHA1 cd4305f5a7009220700e523cafd8e2eee496da2e SHA256 55f64c626a3c156a2037333bbf5203b03f12ae16dcc55808dbf5cfc03c0827c8 +MD5 a8334ff2ac76b42e20cfddd797ee188b qscintilla-1.7.1.ebuild 2300 +RMD160 718bf5a7f51f220c6ceffd594137bdc1c8859608 qscintilla-1.7.1.ebuild 2300 +SHA256 55f64c626a3c156a2037333bbf5203b03f12ae16dcc55808dbf5cfc03c0827c8 qscintilla-1.7.1.ebuild 2300 +MISC ChangeLog 8970 RMD160 f10fad8d1c6e734f4a3b53f1ddb97f15f95277b7 SHA1 2adcbdb94cc32e4c7bb7b7f1cdab045f04ba23de SHA256 029cae80494bd4133df92eca832d89bae4a1a8c2f938d1720f9b8fb749802cea +MD5 853964788c660d23a23a933c7afafc82 ChangeLog 8970 +RMD160 f10fad8d1c6e734f4a3b53f1ddb97f15f95277b7 ChangeLog 8970 +SHA256 029cae80494bd4133df92eca832d89bae4a1a8c2f938d1720f9b8fb749802cea ChangeLog 8970 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 metadata.xml 175 diff --git a/dev-python/qscintilla/qscintilla-1.7.1.ebuild b/dev-python/qscintilla/qscintilla-1.7.1.ebuild index 38668678344c..c4fc3c3fea81 100644 --- a/dev-python/qscintilla/qscintilla-1.7.1.ebuild +++ b/dev-python/qscintilla/qscintilla-1.7.1.ebuild @@ -1,55 +1,53 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.1.ebuild,v 1.1 2006/12/26 22:38:00 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.1.ebuild,v 1.2 2007/01/06 21:31:37 dev-zero Exp $ -inherit eutils toolchain-funcs +inherit eutils toolchain-funcs qt3 -QSCINTILLA_MAJOR_VER="1" SCINTILLA_VER="1.71" MY_P="${PN/qs/QS}-${SCINTILLA_VER}-gpl-${PV}" MY_P=${MY_P/_pre/snapshot-} -S=${WORKDIR}/${MY_P} DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class." HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/" -#SRC_URI="http://www.river-bank.demon.co.uk/download/snapshots/QScintilla/${MY_P}.tar.gz" SRC_URI="http://www.riverbankcomputing.com/Downloads/QScintilla1/${MY_P}.tar.gz" -#SRC_URI="mirror://gentoo/${MY_P}.tar.gz" - SLOT="0" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="doc" -DEPEND="=x11-libs/qt-3*" +DEPEND="$(qt_min_version 3.3)" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} - cd ${S}/qt + cd "${S}/qt" sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" qscintilla.pro echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro - ${QTDIR}/bin/qmake -o Makefile qscintilla.pro + ${QTDIR}/bin/qmake -o Makefile qscintilla.pro || die "qmake qscintilla failed" - cd ${S} - epatch ${FILESDIR}/${P}.patch + cd "${S}" + epatch "${FILESDIR}/${P}.patch" - cd ${S}/designer + cd "${S}/designer" echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> designer.pro - ${QTDIR}/bin/qmake -o Makefile designer.pro + ${QTDIR}/bin/qmake -o Makefile designer.pro || die "qmake designer failed" } src_compile() { - cd ${S}/qt - make all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed" - cd ${S}/designer + cd "${S}/qt" + emake all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "emake failed" + cd "${S}/designer" dodir ${QTDIR}/plugins/designer - make + emake || die "emake designer failed" } src_install() { - dodoc ChangeLog LICENSE NEWS README* + dodoc ChangeLog NEWS README* dodir ${ROOT}/usr/{include,$(get_libdir),share/qscintilla/translations} cd ${S}/qt cp qextscintilla*.h "${D}/usr/include" -- 2.26.2