version bump

5 files changed, 85 insertions, 5 deletions

diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index d5999f418d24..2627962fa24c 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.28 2004/08/20 22:34:59 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.29 2004/09/16 18:01:16 carlo Exp $
+
+*qscintilla-1.61 (16 Sep 2004)
+
+  16 Sep 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/qscintilla-1.61-sandbox.patch, +qscintilla-1.61.ebuild:
+  version bump
 
   21 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> qscintilla-1.60.ebuild:
   Marked stable on amd64.
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index 3f4131f61972..b54b057fd73e 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,8 +1,11 @@
-MD5 1645911fb8aff0e83148e687069a162d ChangeLog 3292
-MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 d762a0c028ea97224fa19ac7bd5432cf qscintilla-1.61.ebuild 1291
 MD5 e5f604948ad4b76dc10734fdfd4ee3f6 qscintilla-1.54.ebuild 1050
 MD5 3e180831f480d43868975437cd53808b qscintilla-1.60.ebuild 1245
-MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
+MD5 ff0e2abe5d72d51ed3b628bc234855a3 ChangeLog 3450
+MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
 MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
-MD5 a9d71d6103367fa01a62735815dbe6ca files/digest-qscintilla-1.60 75
 MD5 dc22cd37e5a193d127ad169db2cf6753 files/qscintilla-1.60-sandbox.patch 710
+MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
+MD5 a9d71d6103367fa01a62735815dbe6ca files/digest-qscintilla-1.60 75
+MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.61 75
+MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.61 b/dev-python/qscintilla/files/digest-qscintilla-1.61
new file mode 100644
index 000000000000..2a84b5081a17
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.61
@@ -0,0 +1 @@
+MD5 b12350ab2609b3a5e230330a0d9718aa qscintilla-1.61-gpl-1.4.tar.gz 700442
diff --git a/dev-python/qscintilla/files/qscintilla-1.61-sandbox.patch b/dev-python/qscintilla/files/qscintilla-1.61-sandbox.patch
new file mode 100644
index 000000000000..3356fccfacc0
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-1.61-sandbox.patch
@@ -0,0 +1,23 @@
+--- Makefile.orig	2004-09-16 19:22:04.000000000 +0200
++++ Makefile	2004-09-16 19:23:22.000000000 +0200
+@@ -305,7 +305,7 @@
+ QMAKE_TARGET = qscintilla
+ DESTDIR  = $(QTDIR)/lib/
+ TARGET   = libqscintilla.so.5.0.0
+-TARGETA	= $(QTDIR)/lib/libqscintilla.a
++TARGETA	= libqscintilla.a
+ TARGETD	= libqscintilla.so.5.0.0
+ TARGET0	= libqscintilla.so
+ TARGET1	= libqscintilla.so.5
+@@ -342,11 +342,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.61.ebuild b/dev-python/qscintilla/qscintilla-1.61.ebuild
new file mode 100644
index 000000000000..79d53cbbe7e4
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-1.61.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.61.ebuild,v 1.1 2004/09/16 18:01:16 carlo Exp $
+
+inherit eutils
+
+MY_P=${P}-gpl-1.4
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class."
+SRC_URI="mirror://gentoo/${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/libc
+	sys-apps/sed
+	x11-libs/qt"
+
+src_unpack() {
+	unpack ${A}
+	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
+}
+
+src_compile() {
+	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/* )
+}