move dev-python/qscintilla to x11-libs/qscintilla and split python bindings to a separate package qscintilla-python to break circular dependency, bug 199543. install designerplugin into the correct directory, bug 196701 thanks to Franz Feller.

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

7 files changed, 89 insertions, 0 deletions

diff --git a/x11-libs/qscintilla/files/digest-qscintilla-1.5.1 b/x11-libs/qscintilla/files/digest-qscintilla-1.5.1
new file mode 100644
index 000000000000..ab453d224bb1
--- /dev/null
+++ b/x11-libs/qscintilla/files/digest-qscintilla-1.5.1
@@ -0,0 +1,3 @@
+MD5 9e4da4adbf9aac8a802cd73695b9786f qscintilla-1.62-gpl-1.5.1.tar.gz 727606
+RMD160 fe7fa31ec1ecbc7f4bbf887817830630dfbd5d88 qscintilla-1.62-gpl-1.5.1.tar.gz 727606
+SHA256 5dfc860a8d91c15775ae03f40a57f0c26f51f90b8266236e457cb8cbb3f6e30e qscintilla-1.62-gpl-1.5.1.tar.gz 727606
diff --git a/x11-libs/qscintilla/files/digest-qscintilla-1.7.1 b/x11-libs/qscintilla/files/digest-qscintilla-1.7.1
new file mode 100644
index 000000000000..a062abe9a8dd
--- /dev/null
+++ b/x11-libs/qscintilla/files/digest-qscintilla-1.7.1
@@ -0,0 +1,3 @@
+MD5 dfa047b45d4f09ae8d4a8a431ba88a5a QScintilla-1.71-gpl-1.7.1.tar.gz 1060119
+RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 QScintilla-1.71-gpl-1.7.1.tar.gz 1060119
+SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c QScintilla-1.71-gpl-1.7.1.tar.gz 1060119
diff --git a/x11-libs/qscintilla/files/digest-qscintilla-2.1-r1 b/x11-libs/qscintilla/files/digest-qscintilla-2.1-r1
new file mode 100644
index 000000000000..8a883cf2944f
--- /dev/null
+++ b/x11-libs/qscintilla/files/digest-qscintilla-2.1-r1
@@ -0,0 +1,3 @@
+MD5 13049717628391ca4db43f7ede0eeeb4 QScintilla-1.73-gpl-2.1.tar.gz 1866929
+RMD160 ef114b468b3cea5d36346c915bc407ce2ad3ec65 QScintilla-1.73-gpl-2.1.tar.gz 1866929
+SHA256 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86 QScintilla-1.73-gpl-2.1.tar.gz 1866929
diff --git a/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch b/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch
new file mode 100644
index 000000000000..65bf1ad56905
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-1.5-sandbox.patch
@@ -0,0 +1,30 @@
+--- Makefile.orig	2005-01-23 03:57:03.000000000 +0100
++++ Makefile	2005-01-23 03:57:35.000000000 +0100
+@@ -314,7 +314,7 @@
+ QMAKE_TARGET = qscintilla
+ DESTDIR  = ${destdir}/
+ TARGET   = libqscintilla.so.5.2.0
+-TARGETA	= ${destdir}/libqscintilla.a
++TARGETA	= libqscintilla.a
+ TARGETD	= libqscintilla.so.5.2.0
+ TARGET0	= libqscintilla.so
+ TARGET1	= libqscintilla.so.5
+@@ -345,17 +345,12 @@
+ all: Makefile  ${destdir}/$(TARGET)
+ 
+ ${destdir}/$(TARGET):  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP)  
+-	test -d ${destdir}/ || mkdir -p ${destdir}/
++#	test -d ${destdir}/ || mkdir -p ${destdir}/
+ 	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
+ 	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)
+ 	-ln -s $(TARGET) $(TARGET0)
+ 	-ln -s $(TARGET) $(TARGET1)
+ 	-ln -s $(TARGET) $(TARGET2)
+-	-$(DEL_FILE) ${destdir}/$(TARGET)
+-	-$(DEL_FILE) ${destdir}/$(TARGET0)
+-	-$(DEL_FILE) ${destdir}/$(TARGET1)
+-	-$(DEL_FILE) ${destdir}/$(TARGET2)
+-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) ${destdir}/
+ 
+ 
+ 
diff --git a/x11-libs/qscintilla/files/qscintilla-1.7.1.patch b/x11-libs/qscintilla/files/qscintilla-1.7.1.patch
new file mode 100644
index 000000000000..5d63990c1484
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-1.7.1.patch
@@ -0,0 +1,17 @@
+--- designer/designer.pro.orig	2006-11-14 08:35:36.000000000 -0500
++++ designer/designer.pro	2006-11-14 08:35:49.000000000 -0500
+@@ -3,10 +3,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+-DESTDIR = $(QTDIR)/plugins/designer
++DESTDIR = .
+ 
+ CONFIG += qt warn_on release plugin
+ 
+ SOURCES += qscintillaplugin.cpp
+ 
+-LIBS += -lqscintilla
++LIBS += -L../qt/lib -lqscintilla
++
++INCLUDEPATH += ../qt
diff --git a/x11-libs/qscintilla/files/qscintilla-2.1-qt.patch b/x11-libs/qscintilla/files/qscintilla-2.1-qt.patch
new file mode 100644
index 000000000000..3579ea2400af
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-2.1-qt.patch
@@ -0,0 +1,14 @@
+--- designer.pro.orig	2006-09-16 09:07:21.000000000 -0700
++++ designer.pro	2007-06-24 18:57:47.000000000 -0700
+@@ -5,8 +5,10 @@
+ TARGET = qscintillaplugin
+ DESTDIR = $(QTDIR)/plugins/designer
+ 
++INCLUDEPATH = ../Qt3
++
+ CONFIG += qt warn_on release plugin
+ 
+ SOURCES += qscintillaplugin.cpp
+ 
+-LIBS += -lqscintilla2
++LIBS += -L../Qt3/lib -lqscintilla2
diff --git a/x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch b/x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch
new file mode 100644
index 000000000000..646e38f45dbb
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-2.1-qt4.patch
@@ -0,0 +1,19 @@
+--- designer.pro.ori	2006-12-13 09:31:54.000000000 +0700
++++ designer.pro	2006-12-13 09:40:49.000000000 +0700
+@@ -4,12 +4,14 @@
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+ 
++INCLUDEPATH = ../Qt4
++
+ CONFIG += designer release plugin
+ 
+ HEADERS = qscintillaplugin.h
+ SOURCES = qscintillaplugin.cpp
+ 
+-target.path = $$[QT_INSTALL_PLUGINS]/designer
++target.path = .
+ INSTALLS += target
+ 
+-LIBS += -lqscintilla2
++LIBS += -L../Qt4/lib -lqscintilla2