summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs/qscintilla')
-rw-r--r--x11-libs/qscintilla/ChangeLog6
-rw-r--r--x11-libs/qscintilla/Manifest6
-rw-r--r--x11-libs/qscintilla/qscintilla-2.3.2.ebuild81
-rw-r--r--x11-libs/qscintilla/qscintilla-2.4.ebuild26
4 files changed, 34 insertions, 85 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 9d6cae4d9c37..5673877c5fb3 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qscintilla
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.37 2010/01/02 18:59:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.38 2010/01/02 21:17:54 yngwin Exp $
+
+ 02 Jan 2010; Ben de Groot <yngwin@gentoo.org> qscintilla-2.3.2.ebuild,
+ qscintilla-2.4.ebuild:
+ Drop qt3 support
02 Jan 2010; Ben de Groot <yngwin@gentoo.org> -qscintilla-1.5.1.ebuild,
qscintilla-2.3.2.ebuild, qscintilla-2.4.ebuild:
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index baeb3d1a926c..dbb5e6076ae7 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -7,7 +7,7 @@ DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e
DIST QScintilla-gpl-2.3.2.tar.gz 2146902 RMD160 de7828d4b965156771034eb622ee9614b2aea9be SHA1 d34ae9907e6221d221c5b5c1324e9b263553d2cb SHA256 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
DIST QScintilla-gpl-2.4.tar.gz 2304554 RMD160 19e5d5c331705c217c5192b1fcac5d298942db69 SHA1 17962bb64d2641f9e181b39fdca39228170488a3 SHA256 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
EBUILD qscintilla-1.7.1.ebuild 2300 RMD160 96542d9c579ef2e81ea8ef1f893c0445a83fb136 SHA1 f0aa09572e6933dffd436c30547b4e4e68030154 SHA256 5d5a6b12c2dba8d784ddba803ada081312ccb144202fc6d18d80ca67a6213a23
-EBUILD qscintilla-2.3.2.ebuild 3801 RMD160 fdbc9a0f1f800b2ee164c5a73c014d987bc007d6 SHA1 c79698d86d7304f193bd4a6e12662291598d8169 SHA256 81a3144c93534acbfab55064b6447da121609fbb8daee06948a041a2591e87fd
-EBUILD qscintilla-2.4.ebuild 2407 RMD160 6999797c225f8683c9eb5c3a8ea5e3047bbe795c SHA1 77692e5f30d11f6ed5e66a8db96af95078cd312b SHA256 cf24eca0878b177ff6d35ca0f04e9485f6136d5bce92a5919d722e82122738ef
-MISC ChangeLog 15671 RMD160 8f7ddc6bbecd27ebd3191cd44db51e84317c4615 SHA1 d88f809024608603b5e29069dc0400806dbe59a3 SHA256 962fdc76fcb21ba787f9faf1ed81693a86c346fb2310a2f6f3e37f4786832b63
+EBUILD qscintilla-2.3.2.ebuild 2827 RMD160 d0bac04c11422c5fc87023a9f6f5afbf00718be5 SHA1 b97dafd48d5580df9ce169b95ccacb90ec32b399 SHA256 5567ed08dbfcef493cd82d6a5d59b8df2603164ec02480e51dc6a96ca99975cb
+EBUILD qscintilla-2.4.ebuild 2095 RMD160 e92d2a015f4935bf2ada02c991b4361f32113d8d SHA1 4395918ba0571aaa0b4f460049115904a441f0f1 SHA256 4d9483d856cf195a2592a76b91320bb30a5bd9bdea041cc80ac675f1eb8ef7bf
+MISC ChangeLog 15789 RMD160 4a725b52adb31b22b25326bcd249d2dd2fe3e148 SHA1 c64a138463e12c8eb25581f75d6d98f885e5588f SHA256 cd9c08ac6a5a8ef6c9e4668d1bebd049c4c8a96c54132595c129f3cfa7a2d80e
MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
index ce0048e7cf41..f985bdff50c4 100644
--- a/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.10 2010/01/02 18:59:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.2.ebuild,v 1.11 2010/01/02 21:17:54 yngwin Exp $
EAPI=2
inherit eutils toolchain-funcs multilib
@@ -15,24 +15,16 @@ SRC_URI="http://www.riverbankcomputing.com/static/Downloads/QScintilla2/${MY_P}.
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+qt4 +python doc examples debug"
+IUSE="+python doc examples debug"
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
- !qt4? ( x11-libs/qt:3 )"
+RDEPEND="x11-libs/qt-gui:4"
DEPEND="${RDEPEND}"
-# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
-# need dev-python/PyQt, bug 199543
PDEPEND="python? ( dev-python/qscintilla-python )"
src_configure() {
local myqmake myqtdir
- if use qt4; then
- myqmake=/usr/bin/qmake
- myqtdir=Qt4
- else
- myqmake="${QTDIR}/bin/qmake"
- myqtdir=Qt3
- fi
+ myqmake=/usr/bin/qmake
+ myqtdir=Qt4
cd "${S}/${myqtdir}"
sed -i \
@@ -49,15 +41,11 @@ src_configure() {
${myqmake} -o Makefile qscintilla.pro
cd "${S}/designer-${myqtdir}"
- if use qt4; then
- epatch "${FILESDIR}/${PN}-2.2-qt4.patch"
- else
- epatch "${FILESDIR}/${PN}-2.2-qt.patch"
+ epatch "${FILESDIR}/${PN}-2.2-qt4.patch"
sed -i \
-e "s:DESTDIR = \$(QTDIR)/plugins/designer:DESTDIR = .:" \
designer.pro || die "sed in designer.pro failed"
- fi
cat <<- EOF >> designer.pro
QMAKE_CFLAGS_RELEASE=${CFLAGS} -w
@@ -69,70 +57,39 @@ src_configure() {
}
src_compile() {
- if use qt4; then
- cd "${S}"/Qt4
- else
- cd "${S}"/Qt3
- fi
+ cd "${S}"/Qt4
make all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed"
- if use qt4; then
- cd "${S}"/designer-Qt4
- make DESTDIR="${D}"/usr/lib/qt4/plugins/designer || die "make failed"
- dodir /usr/lib/qt4/plugins/designer
- else
- cd "${S}"/designer-Qt3
- make DESTDIR="${D}"/${QTDIR}/plugins/designer || die "make failed"
- dodir ${QTDIR}/plugins/designer
- fi
+ cd "${S}"/designer-Qt4
+ make DESTDIR="${D}"/usr/lib/qt4/plugins/designer || die "make failed"
+ dodir /usr/lib/qt4/plugins/designer
make
}
src_install() {
dodoc ChangeLog NEWS README*
dodir /usr/{include,$(get_libdir),share/qscintilla/translations}
- if use qt4; then
- cd "${S}"/Qt4
- else
- cd "${S}"/Qt3
- fi
+ cd "${S}"/Qt4
cp -r Qsci "${D}/usr/include"
#cp qextscintilla*.h "${D}/usr/include"
cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
cp libqscintilla2.a* "${D}/usr/$(get_libdir)"
cp -d libqscintilla2.so.* "${D}/usr/$(get_libdir)"
- if use qt4; then
- dodir /usr/share/qt4/translations/
- for I in $(ls -1 qscintilla*.qm) ; do
- dosym "/usr/share/qscintilla/translations/${I}" "/usr/share/qt4/translations/${I}"
- done
- else
- dodir ${QTDIR}/translations/
- for I in $(ls -1 qscintilla*.qm) ; do
- dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
- done
- fi
+ dodir /usr/share/qt4/translations/
+ for I in $(ls -1 qscintilla*.qm) ; do
+ dosym "/usr/share/qscintilla/translations/${I}" "/usr/share/qt4/translations/${I}"
+ done
if use doc ; then
dohtml "${S}"/doc/html/*
insinto /usr/share/doc/${PF}/Scintilla
doins "${S}"/doc/Scintilla/*
fi
- if use qt4; then
- insinto /usr/$(get_libdir)/qt4/plugins/designer
- insopts -m0755
- doins "${S}"/designer-Qt4/libqscintillaplugin.so
- else
- insinto ${QTDIR}/plugins/designer
- insopts -m0755
- doins "${S}"/designer-Qt3/libqscintillaplugin.so
- fi
+ insinto /usr/$(get_libdir)/qt4/plugins/designer
+ insopts -m0755
+ doins "${S}"/designer-Qt4/libqscintillaplugin.so
}
pkg_postinst() {
- if use qt4; then
- ewarn "Please remerge dev-python/PyQt4 if you have problems with eric4"
- else
- ewarn "Please remerge dev-python/PyQt if you have problems with eric3"
- fi
+ ewarn "Please remerge dev-python/PyQt4 if you have problems with eric4"
ewarn "or other qscintilla related packages before submitting bug reports."
}
diff --git a/x11-libs/qscintilla/qscintilla-2.4.ebuild b/x11-libs/qscintilla/qscintilla-2.4.ebuild
index beab7dab9f61..9fec53820b3f 100644
--- a/x11-libs/qscintilla/qscintilla-2.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.4.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild,v 1.7 2010/01/02 18:59:18 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild,v 1.8 2010/01/02 21:17:54 yngwin Exp $
EAPI="2"
-inherit eutils multilib qt3 qt4
+inherit eutils multilib qt4
MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
@@ -15,13 +15,10 @@ SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc python +qt4"
+IUSE="doc python"
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
- !qt4? ( x11-libs/qt:3 )"
+RDEPEND="x11-libs/qt-gui:4"
DEPEND="${RDEPEND}"
-# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
-# need dev-python/PyQt, bug 199543
PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
S="${WORKDIR}"/${MY_P}
@@ -29,13 +26,8 @@ S="${WORKDIR}"/${MY_P}
PATCHES=( "${FILESDIR}/${PN}-2.4-designer.patch" )
src_configure() {
- if use qt4; then
- myqtver=4
- myqtdir=/usr/share/qt4
- else
- myqtver=3
- myqtdir=${QTDIR}
- fi
+ myqtver=4
+ myqtdir=/usr/share/qt4
cd "${S}"/Qt${myqtver}
eqmake${myqtver} qscintilla.pro
@@ -83,10 +75,6 @@ src_install() {
}
pkg_postinst() {
- if use qt4; then
- ewarn "Please remerge dev-python/PyQt4 if you have problems with eric or other"
- else
- ewarn "Please remerge dev-python/PyQt if you have problems with"
- fi
+ ewarn "Please remerge dev-python/PyQt4 if you have problems with eric or other"
ewarn "qscintilla related packages before submitting bug reports."
}