6 files changed, 6 insertions, 555 deletions
diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index b642e611957f..49746b1baf86 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.32 2009/10/18 14:48:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.33 2009/11/04 14:01:59 yngwin Exp $
+
+  04 Nov 2009; Ben de Groot <yngwin@gentoo.org> -qscintilla-1.5.1.ebuild,
+  -qscintilla-1.7.1.ebuild, -qscintilla-2.1-r1.ebuild,
+  -qscintilla-2.2.ebuild, -qscintilla-2.3.ebuild:
+  Remove old cruft
 
   18 Oct 2009; Raúl Porcel <armin76@gentoo.org> qscintilla-2.4.ebuild:
   alpha/ia64/sparc stable wrt #284707
diff --git a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
deleted file mode 100644
index 69b44cfc02b4..000000000000
--- a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-1.5.1.ebuild,v 1.2 2009/05/05 08:08:39 ssuominen Exp $
-
-inherit eutils toolchain-funcs
-
-SCINTILLA_VER="1.62"
-MY_P="${PN}-${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.river-bank.demon.co.uk/download/QScintilla/${MY_P}.tar.gz"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="=x11-libs/qt-3*"
-DEPEND="${RDEPEND}
-	sys-apps/sed"
-
-LIBDIR="/usr/$(get_libdir)"
-
-src_unpack() {
-	unpack ${A} ; cd "${S}"/qt
-	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" 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
-	epatch "${FILESDIR}"/${PN}-1.5-sandbox.patch
-}
-
-src_compile() {
-	cd "${S}"/qt
-	# 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() {
-	dodoc ChangeLog NEWS README
-	dodir /usr/include ${LIBDIR} /usr/share/qscintilla/translations
-	cd "${S}"/qt
-	cp qextscintilla*.h "${D}/usr/include"
-	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
-	cp libqscintilla.a* "${D}${LIBDIR}"
-	cp -d libqscintilla.so.* "${D}${LIBDIR}"
-	dodir ${QTDIR}/translations/
-	for I in $(ls -1 qscintilla*.qm) ; do
-		dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
-	done
-	if use doc ; then
-		dohtml "${S}"/doc/html/*
-		insinto /usr/share/doc/${PF}/Scintilla
-		doins "${S}"/doc/Scintilla/*
-	fi
-}
diff --git a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
deleted file mode 100644
index 64080e97b5e0..000000000000
--- a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-1.7.1.ebuild,v 1.2 2008/07/28 21:36:25 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt3
-
-SCINTILLA_VER="1.71"
-MY_P="${PN/qs/QS}-${SCINTILLA_VER}-gpl-${PV}"
-MY_P=${MY_P/_pre/snapshot-}
-
-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.riverbankcomputing.com/Downloads/QScintilla1/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-DEPEND="x11-libs/qt:3"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	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 || die "qmake qscintilla failed"
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.patch"
-
-	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 || die "qmake designer failed"
-}
-
-src_compile() {
-	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
-	emake || die "emake designer failed"
-}
-
-src_install() {
-	dodoc ChangeLog NEWS README*
-	dodir /usr/{include,$(get_libdir),share/qscintilla/translations}
-	cd "${S}"/qt
-	cp qextscintilla*.h "${D}/usr/include"
-	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
-	cp lib/libqscintilla.a* "${D}/usr/$(get_libdir)"
-	cp -R lib/libqscintilla.so.* "${D}/usr/$(get_libdir)"
-	dodir ${QTDIR}/translations/
-	for I in $(ls -1 qscintilla*.qm) ; do
-		dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
-	done
-	if use doc ; then
-		dohtml "${S}"/doc/html/*
-		insinto /usr/share/doc/${PF}/Scintilla
-		doins "${S}"/doc/Scintilla/*
-	fi
-	insinto ${QTDIR}/plugins/designer
-	insopts  -m0755
-	doins "${S}"/designer/libqscintillaplugin.so
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild
deleted file mode 100644
index 7e7325c70455..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.1-r1.ebuild,v 1.9 2009/10/06 17:58:11 ayoy Exp $
-
-EAPI=1
-inherit eutils toolchain-funcs multilib
-
-SCINTILLA_VER="1.73"
-MY_P="${PN/qs/QS}-${SCINTILLA_VER}-gpl-${PV}"
-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.riverbankcomputing.com/Downloads/QScintilla2/${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 ~x86-fbsd"
-IUSE="qt4 +python doc examples debug"
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	!qt4? ( x11-libs/qt:3 )"
-# 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_unpack() {
-	unpack ${A}
-
-	local myqmake myqtdir
-	if use qt4; then
-		myqmake=/usr/bin/qmake
-		myqtdir=Qt4
-	else
-		myqmake="${QTDIR}/bin/qmake"
-		myqtdir=Qt3
-	fi
-
-	cd "${S}/${myqtdir}"
-	sed -i \
-		-e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" \
-		-e "s:DESTDIR = \$\$\[QT_INSTALL_LIBS\]:DESTDIR = lib:"\
-		qscintilla.pro || die "sed in qscintilla.pro failed"
-
-	cat <<- EOF >> qscintilla.pro
-	QMAKE_CFLAGS_RELEASE=${CFLAGS} -w
-	QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w
-	QMAKE_LFLAGS_RELEASE=${LDFLAGS}
-	EOF
-
-	${myqmake} -o Makefile qscintilla.pro
-	cd "${S}/designer-${myqtdir}"
-
-	if use qt4; then
-		epatch "${FILESDIR}/${P}-qt4.patch"
-	else
-		epatch "${FILESDIR}/${P}-qt.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
-	QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w
-	QMAKE_LFLAGS_RELEASE=${LDFLAGS}
-	EOF
-
-	${myqmake} -o Makefile designer.pro
-}
-
-src_compile() {
-	if use qt4; then
-		cd "${S}"/Qt4
-	else
-		cd "${S}"/Qt3
-	fi
-	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
-	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
-	cp -r Qsci "${D}/usr/include"
-	#cp qextscintilla*.h "${D}/usr/include"
-	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
-	cp lib/libqscintilla2.a* "${D}/usr/$(get_libdir)"
-	cp -d lib/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
-	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
-}
-
-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 "or other qscintilla related packages before submitting bug reports."
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.2.ebuild b/x11-libs/qscintilla/qscintilla-2.2.ebuild
deleted file mode 100644
index 7b6b4dc42a3a..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.2.ebuild,v 1.3 2009/10/06 17:58:11 ayoy Exp $
-
-EAPI=1
-inherit eutils toolchain-funcs multilib
-
-MY_P="${PN/qs/QS}-gpl-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/QScintilla2/${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 ~x86-fbsd"
-IUSE="qt4 +python doc examples debug"
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	!qt4? ( x11-libs/qt:3 )"
-# 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_unpack() {
-	unpack ${A}
-
-	local myqmake myqtdir
-	if use qt4; then
-		myqmake=/usr/bin/qmake
-		myqtdir=Qt4
-	else
-		myqmake="${QTDIR}/bin/qmake"
-		myqtdir=Qt3
-	fi
-
-	cd "${S}/${myqtdir}"
-	sed -i \
-		-e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" \
-		-e "s:DESTDIR = \$\$\[QT_INSTALL_LIBS\]:DESTDIR = lib:"\
-		qscintilla.pro || die "sed in qscintilla.pro failed"
-
-	cat <<- EOF >> qscintilla.pro
-	QMAKE_CFLAGS_RELEASE=${CFLAGS} -w
-	QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w
-	QMAKE_LFLAGS_RELEASE=${LDFLAGS}
-	EOF
-
-	${myqmake} -o Makefile qscintilla.pro
-	cd "${S}/designer-${myqtdir}"
-
-	if use qt4; then
-		epatch "${FILESDIR}/${P}-qt4.patch"
-	else
-		epatch "${FILESDIR}/${P}-qt.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
-	QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w
-	QMAKE_LFLAGS_RELEASE=${LDFLAGS}
-	EOF
-
-	${myqmake} -o Makefile designer.pro
-}
-
-src_compile() {
-	if use qt4; then
-		cd "${S}"/Qt4
-	else
-		cd "${S}"/Qt3
-	fi
-	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
-	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
-	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
-	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
-}
-
-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 "or other qscintilla related packages before submitting bug reports."
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.3.ebuild b/x11-libs/qscintilla/qscintilla-2.3.ebuild
deleted file mode 100644
index d68b9f01ac3d..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.3.ebuild,v 1.3 2009/10/06 17:58:11 ayoy Exp $
-
-EAPI=1
-inherit eutils toolchain-funcs multilib
-
-MY_P="${PN/qs/QS}-gpl-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-SRC_URI="http://www.riverbankcomputing.com/static/Downloads/QScintilla2/${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 ~x86-fbsd"
-IUSE="qt4 +python doc examples debug"
-
-RDEPEND="qt4? ( x11-libs/qt-gui:4 )
-	!qt4? ( x11-libs/qt:3 )"
-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_unpack() {
-	unpack ${A}
-
-	local myqmake myqtdir
-	if use qt4; then
-		myqmake=/usr/bin/qmake
-		myqtdir=Qt4
-	else
-		myqmake="${QTDIR}/bin/qmake"
-		myqtdir=Qt3
-	fi
-
-	cd "${S}/${myqtdir}"
-	sed -i \
-		-e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" \
-		-e "s:DESTDIR = \$\$\[QT_INSTALL_LIBS\]:DESTDIR = lib:"\
-		qscintilla.pro || die "sed in qscintilla.pro failed"
-
-	cat <<- EOF >> qscintilla.pro
-	QMAKE_CFLAGS_RELEASE=${CFLAGS} -w
-	QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w
-	QMAKE_LFLAGS_RELEASE=${LDFLAGS}
-	EOF
-
-	${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"
-
-		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
-	QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w
-	QMAKE_LFLAGS_RELEASE=${LDFLAGS}
-	EOF
-
-	${myqmake} -o Makefile designer.pro
-}
-
-src_compile() {
-	if use qt4; then
-		cd "${S}"/Qt4
-	else
-		cd "${S}"/Qt3
-	fi
-	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
-	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
-	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
-	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
-}
-
-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 "or other qscintilla related packages before submitting bug reports."
-}