old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 5 insertions, 86 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 4917bf826e25..9ecab9b16b07 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.96 2013/12/23 15:31:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.97 2013/12/24 19:21:54 pesa Exp $
+
+  24 Dec 2013; Davide Pesavento <pesa@gentoo.org>
+  -files/qscintilla-2.6.2-designer.patch, -qscintilla-2.6.2.ebuild:
+  old
 
   23 Dec 2013; Agostino Sarubbo <ago@gentoo.org> qscintilla-2.7.2.ebuild:
   Stable for sparc, wrt bug #483112
diff --git a/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch
deleted file mode 100644
index 978d068937da..000000000000
--- a/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -urN QScintilla-gpl-2.6.2.orig/designer-Qt4/designer.pro QScintilla-gpl-2.6.2/designer-Qt4/designer.pro
---- QScintilla-gpl-2.6.2.orig/designer-Qt4/designer.pro	2012-06-27 15:22:31.980241792 +0200
-+++ QScintilla-gpl-2.6.2/designer-Qt4/designer.pro	2012-06-27 15:23:39.802393898 +0200
-@@ -12,4 +12,5 @@
- target.path = $$[QT_INSTALL_PLUGINS]/designer
- INSTALLS += target
- 
--LIBS += -lqscintilla2
-+INCLUDEPATH = ../Qt4Qt5
-+LIBS += -L../Qt4Qt5 -lqscintilla2
diff --git a/x11-libs/qscintilla/qscintilla-2.6.2.ebuild b/x11-libs/qscintilla/qscintilla-2.6.2.ebuild
deleted file mode 100644
index b2caec866301..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.6.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.6.2.ebuild,v 1.9 2013/07/23 14:22:33 kensington Exp $
-
-EAPI=4
-
-inherit qt4-r2
-
-MY_P=QScintilla-gpl-${PV}
-
-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.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="doc python"
-
-DEPEND="
-	dev-qt/qtcore:4
-	|| ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.6.2-designer.patch"
-)
-
-src_configure() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Configuration of qscintilla"
-	eqmake4 qscintilla.pro
-	popd > /dev/null
-
-	pushd designer-Qt4 > /dev/null
-	einfo "Configuration of designer plugin"
-	eqmake4 designer.pro
-	popd > /dev/null
-}
-
-src_compile() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Building of qscintilla"
-	emake
-	popd > /dev/null
-
-	pushd designer-Qt4 > /dev/null
-	einfo "Building of designer plugin"
-	emake
-	popd > /dev/null
-}
-
-src_install() {
-	pushd Qt4Qt5 > /dev/null
-	einfo "Installation of qscintilla"
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	pushd designer-Qt4 > /dev/null
-	einfo "Installation of designer plugin"
-	emake INSTALL_ROOT="${D}" install
-	popd > /dev/null
-
-	dodoc NEWS
-
-	if use doc; then
-		dohtml doc/html-Qt4Qt5/*
-		insinto /usr/share/doc/${PF}
-		doins -r doc/Scintilla
-	fi
-}