5 files changed, 84 insertions, 9 deletions
diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index e2af5031dec8..10bc32ea9b7e 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.19 2004/05/04 12:34:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.20 2004/05/21 17:31:13 carlo Exp $
+
+*qscintilla-1.60 (21 May 2004)
+
+  21 May 2004; <carsten@gentoo.org> qscintilla-1.60.ebuild,
+  files/qscintilla-1.60-sandbox.patch:
+  Version bump
 
   04 May 2004; Bryan Østergaard <kloeri@gentoo.org> qscintilla-1.49-r1.ebuild,
   qscintilla-1.49.ebuild, qscintilla-1.52.ebuild, qscintilla-1.53.ebuild:
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index 6d11a1b736c7..ada8c1de3910 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,16 +1,19 @@
 MD5 446000ecb22093a7429322a6dc22b02e qscintilla-1.52.ebuild 1082
-MD5 fcd367e58b5b846f82767b30349629e4 qscintilla-1.49.ebuild 1026
+MD5 ee89c18b86c3694c997097e5cf13df57 qscintilla-1.54.ebuild 1093
+MD5 d3a1f98b685fe5c7746d5477b0378c7f qscintilla-1.60.ebuild 1294
 MD5 f4c412fc039f3354bb6fae95080d676e qscintilla-1.49-r1.ebuild 1080
+MD5 0fe75f79cce89e89a231589061df191c ChangeLog 2321
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 ee89c18b86c3694c997097e5cf13df57 qscintilla-1.54.ebuild 1093
 MD5 8bf9db89578d6cea58692de180e454c7 qscintilla-1.53.ebuild 1072
-MD5 0cafb5f7eb64a9dd7bf2446556022bca ChangeLog 2175
+MD5 fcd367e58b5b846f82767b30349629e4 qscintilla-1.49.ebuild 1026
+MD5 b94b18479812bfd1bbfc1d572fe73ca7 files/qscintilla-1.53-sandbox.patch 783
+MD5 00d628534c7077582526546d18c716e1 files/digest-qscintilla-1.49-r1 79
+MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
+MD5 55d83f96c8adfcf599166b6f21cae03e files/qscintilla-1.49-sandbox.patch 783
+MD5 dc22cd37e5a193d127ad169db2cf6753 files/qscintilla-1.60-sandbox.patch 710
 MD5 00d628534c7077582526546d18c716e1 files/digest-qscintilla-1.49 79
+MD5 fc9cabb48b0b994d26803b8a5cfd9e63 files/digest-qscintilla-1.52 79
 MD5 3f81c279f244c878a89da9ba84f3e486 files/digest-qscintilla-1.53 79
 MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
-MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
-MD5 b94b18479812bfd1bbfc1d572fe73ca7 files/qscintilla-1.53-sandbox.patch 783
-MD5 fc9cabb48b0b994d26803b8a5cfd9e63 files/digest-qscintilla-1.52 79
+MD5 a9d71d6103367fa01a62735815dbe6ca files/digest-qscintilla-1.60 75
 MD5 4c2437213d7057e8d7b89d2d2242d70a files/qscintilla-1.52-sandbox.patch 777
-MD5 00d628534c7077582526546d18c716e1 files/digest-qscintilla-1.49-r1 79
-MD5 55d83f96c8adfcf599166b6f21cae03e files/qscintilla-1.49-sandbox.patch 783
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.60 b/dev-python/qscintilla/files/digest-qscintilla-1.60
new file mode 100644
index 000000000000..b39ec98fc3e1
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.60
@@ -0,0 +1 @@
+MD5 cc682b0d47515db0d380a9df13274580 qscintilla-1.60-gpl-1.3.tar.gz 670106
diff --git a/dev-python/qscintilla/files/qscintilla-1.60-sandbox.patch b/dev-python/qscintilla/files/qscintilla-1.60-sandbox.patch
new file mode 100644
index 000000000000..b8197ffa7dfe
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-1.60-sandbox.patch
@@ -0,0 +1,23 @@
+--- Makefile.orig	2004-04-19 09:51:48.000000000 +0200
++++ Makefile	2004-04-19 09:53:58.000000000 +0200
+@@ -288,7 +288,7 @@
+ QMAKE_TARGET = qscintilla
+ DESTDIR  = $(QTDIR)/lib/
+ TARGET   = libqscintilla.so.4.0.0
+-TARGETA	= $(QTDIR)/lib/libqscintilla.a
++TARGETA	= libqscintilla.a
+ TARGETD	= libqscintilla.so.4.0.0
+ TARGET0	= libqscintilla.so
+ TARGET1	= libqscintilla.so.4
+@@ -325,11 +325,6 @@
+ 	-ln -s $(TARGET) $(TARGET0)
+ 	-ln -s $(TARGET) $(TARGET1)
+ 	-ln -s $(TARGET) $(TARGET2)
+-	-$(DEL_FILE) $(QTDIR)/lib/$(TARGET)
+-	-$(DEL_FILE) $(QTDIR)/lib/$(TARGET0)
+-	-$(DEL_FILE) $(QTDIR)/lib/$(TARGET1)
+-	-$(DEL_FILE) $(QTDIR)/lib/$(TARGET2)
+-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
+ 
+ 
+ 
diff --git a/dev-python/qscintilla/qscintilla-1.60.ebuild b/dev-python/qscintilla/qscintilla-1.60.ebuild
new file mode 100644
index 000000000000..0fde00c352a8
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-1.60.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.60.ebuild,v 1.1 2004/05/21 17:31:13 carlo Exp $
+
+inherit eutils
+
+MY_P=${P}-gpl-1.3
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class."
+SRC_URI="http://www.river-bank.demon.co.uk/download/QScintilla/${MY_P}.tar.gz"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+IUSE="doc"
+
+DEPEND="virtual/glibc
+	x11-libs/qt"
+
+src_compile() {
+	cd ${S}/qt
+	qmake -o Makefile qscintilla.pro
+	sed -i -e "s/CFLAGS   = -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
+	sed -i -e "s/CXXFLAGS = -pipe -w -O2/CXXFLAGS = ${CXXFLAGS} -w/" Makefile
+	epatch ${FILESDIR}/${P}-sandbox.patch
+	make all staticlib
+}
+
+src_install() {
+	dodoc ChangeLog LICENSE NEWS README
+	dodir ${QTDIR}/{include,translations,lib}
+	cd ${S}/qt
+	cp qextscintilla*.h ${D}/$QTDIR/include
+	cp qscintilla*.qm ${D}/$QTDIR/translations
+	cp libqscintilla.a* ${D}/$QTDIR/lib
+	cp -d libqscintilla.so.* ${D}/$QTDIR/lib
+	use doc && ( dohtml ${S}/doc/html/*
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins ${S}/doc/Scintilla/* )
+}