Remove old cruft

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

7 files changed, 7 insertions, 566 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/Manifest b/x11-libs/qscintilla/Manifest
index 421686ac90ac..3990624037f8 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -5,19 +5,9 @@ AUX qscintilla-2.1-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40
 AUX qscintilla-2.2-qt.patch 347 RMD160 8585ed1b9e525b57663ed5f4e0b0c6500e9b9a7d SHA1 8b97babbbd05ad7d22b1a93c105ac83eaf57ea02 SHA256 9ef628c4546be47ba1eb32e13f2d56c40c0b8c26ea6990b979bc5c73540c9545
 AUX qscintilla-2.2-qt4.patch 439 RMD160 4c97b91aa538fa2db7da3e0b7f0f99766e8f98ed SHA1 84a6e4cab7aaed4d7ffa3286e7e31809ba0367f2 SHA256 9996813f9c512bc702c85dea920351770becfbdc9034f7b4babad41de8eea14d
 AUX qscintilla-2.4-designer.patch 1042 RMD160 cfb80962caed15e4bb6c290edcc35d1acfc861a0 SHA1 d5586a13545be09e2d2126b6fcbef2f172470429 SHA256 af6c15f8cdc64041ddd692480d6bcc7d6c59aa7c1c5b963707b4d31e60288d78
-DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 SHA1 424415960e5cbcd58306e87d1d610bd8e72f3368 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c
-DIST QScintilla-1.73-gpl-2.1.tar.gz 1866929 RMD160 ef114b468b3cea5d36346c915bc407ce2ad3ec65 SHA1 ca9ac61cc3d537d7b53202ff5d8565365c3f8734 SHA256 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86
-DIST QScintilla-gpl-2.2.tar.gz 1873664 RMD160 8a1ad1dbad864d972259723cf308d2a779de346a SHA1 f570df8e7bcfc1281a477a21a12036023de6535a SHA256 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
 DIST QScintilla-gpl-2.3.2.tar.gz 2146902 RMD160 de7828d4b965156771034eb622ee9614b2aea9be SHA1 d34ae9907e6221d221c5b5c1324e9b263553d2cb SHA256 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
-DIST QScintilla-gpl-2.3.tar.gz 2126817 RMD160 9ecbc4d4ef9eddc1901152d4d0dcc08e7d704c01 SHA1 90c8c4b74e92b43fd8de350fe12f20c7f589e645 SHA256 43e051cb07b36b9cd455c781a421a8ed221a48d63455b6d00ea63be397be70c9
 DIST QScintilla-gpl-2.4.tar.gz 2304554 RMD160 19e5d5c331705c217c5192b1fcac5d298942db69 SHA1 17962bb64d2641f9e181b39fdca39228170488a3 SHA256 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
-DIST qscintilla-1.62-gpl-1.5.1.tar.gz 727606 RMD160 fe7fa31ec1ecbc7f4bbf887817830630dfbd5d88 SHA1 240bafd43f3f1f7c73f76daf98b23da3f071bc43 SHA256 5dfc860a8d91c15775ae03f40a57f0c26f51f90b8266236e457cb8cbb3f6e30e
-EBUILD qscintilla-1.5.1.ebuild 2059 RMD160 aba058df06336df7de6795a682a623bca8dfb8fb SHA1 42a32ef4eaac7264e3a9045e2eaa5ea5a77a78df SHA256 0a7fc83a53e1c43206367891168eb2eeb0d23437d6ec988b4e1ea618cbaaad9e
-EBUILD qscintilla-1.7.1.ebuild 2299 RMD160 99f53c4c41fc670e789f7ee55e5695adef29f3d3 SHA1 4a0b0e0aa66604d91d642082addc195684f51c9a SHA256 e3f092f98b44fde1a9de44a7ab2d6fa715206cd82e2967f46c311ed46ac37d59
-EBUILD qscintilla-2.1-r1.ebuild 3866 RMD160 0d0064d1158b5f4fc44ace428867e1c960c0b12c SHA1 5c5d8366c7b5ea647811dc1f88bc3c64207e9d8f SHA256 24771ad5f2bf0050df5fa51399d27a340dbfd14ebbb9d2cc7d429475289bb4c5
-EBUILD qscintilla-2.2.ebuild 3826 RMD160 436e47817789f4533377a692c2855854bdf6d182 SHA1 bc2e171c5c2b66ce8a45f5b4bf0da1a383b0220f SHA256 9d68d7f881766617c9ad71ee9be83dd75b0130654d641b4fb01ca73eaa59ffb4
 EBUILD qscintilla-2.3.2.ebuild 3805 RMD160 d6d41d1213cc5ba0873a0c63fb40ba272a990637 SHA1 b92f0e444fca0696d9b4d9067b785a8ece6b2fb1 SHA256 57d00e7cd62d83a35c62aca509fb396f80dd0ab97ddf17e33da4dcf4535dc1f9
-EBUILD qscintilla-2.3.ebuild 3856 RMD160 6962209abdc8644d9ccea6d11e2176c38c25822c SHA1 5ca7c6e1069cee8d6e9bcdac556c71485d880ba0 SHA256 daadb8eed16941e26137614d61c0407f3967a938500c0a624a5f2f0f5b11d40a
 EBUILD qscintilla-2.4.ebuild 2414 RMD160 96af66677f51dee27f0ab965264327cbe19b7c5d SHA1 b909d75a5c93388b1e1b7d05efbb8de07875c291 SHA256 10bd9cbb7b670da9f2f3f84634fe3ce4f59981be25d0b232d3eb44bbe00e3ce4
-MISC ChangeLog 14851 RMD160 12fd9158eca67d1cc09807ffecd31016224cf4bb SHA1 cf05dc550d240b557d6e1b93cdca81e6ce013e19 SHA256 9a068083aac73319205f592cb180870562737f22307171aced52f7fe5ec36a3a
+MISC ChangeLog 15049 RMD160 87e947ff823f63da8226ade81c9d10df7a8a4a06 SHA1 de84f4159fb87379f0f1f433e78da9b9500c1fab SHA256 9efb738a466fa8f130d117d49751c9263d3bbaca1ad80dc47f0ab2a881ee18ed
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
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."
-}