Version bump

4 files changed, 74 insertions, 2 deletions

diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index 7bb976dda062..051b27267123 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,10 +1,10 @@
-MD5 44eb04063dc86d3e12063e5ca794108a ChangeLog 1270
+MD5 8f8f830b0edc7af058dfe864b78b669c ChangeLog 1439
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
 MD5 20076e3556e661912484f549e3c054f6 qscintilla-1.49-r1.ebuild 1070
 MD5 75cc44358f98eec2a5b507ac3189645a qscintilla-1.49.ebuild 1020
 MD5 73b65768b609c20c67aa04bd71401def qscintilla-1.52.ebuild 1072
 MD5 fb5082e03cd638ebc16cc09efbc1be9b qscintilla-1.53.ebuild 1063
-MD5 73cdb1d6b44c1852d74193822a3fabb7 qscintilla-1.54.ebuild 965
+MD5 87fb1afa1339203728afc11720ad6182 qscintilla-1.54.ebuild 1076
 MD5 00d628534c7077582526546d18c716e1 files/digest-qscintilla-1.49 79
 MD5 00d628534c7077582526546d18c716e1 files/digest-qscintilla-1.49-r1 79
 MD5 fc9cabb48b0b994d26803b8a5cfd9e63 files/digest-qscintilla-1.52 79
@@ -13,3 +13,4 @@ MD5 55d83f96c8adfcf599166b6f21cae03e files/qscintilla-1.49-sandbox.patch 783
 MD5 4c2437213d7057e8d7b89d2d2242d70a files/qscintilla-1.52-sandbox.patch 777
 MD5 b94b18479812bfd1bbfc1d572fe73ca7 files/qscintilla-1.53-sandbox.patch 783
 MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
+MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.54 b/dev-python/qscintilla/files/digest-qscintilla-1.54
new file mode 100644
index 000000000000..5f8e980d1841
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.54
@@ -0,0 +1 @@
+MD5 a69bf732c40df24c1e57d152cbf25729 qscintilla-1.54-x11-gpl-1.2.tar.gz 568362
diff --git a/dev-python/qscintilla/files/qscintilla-1.54-sandbox.patch b/dev-python/qscintilla/files/qscintilla-1.54-sandbox.patch
new file mode 100644
index 000000000000..c65b6db79b80
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-1.54-sandbox.patch
@@ -0,0 +1,24 @@
+--- Makefile.orig	2003-09-28 16:17:59.000000000 -0700
++++ Makefile	2003-09-28 16:18:48.000000000 -0700
+@@ -258,7 +258,7 @@
+ QMAKE_TARGET = qscintilla
+ DESTDIR  = $(QTDIR)/lib/
+ TARGET   = libqscintilla.so.3.0.0
+-TARGETA	= $(QTDIR)/lib/libqscintilla.a
++TARGETA	= libqscintilla.a
+ TARGETD	= libqscintilla.so.3.0.0
+ TARGET0	= libqscintilla.so
+ TARGET1	= libqscintilla.so.3
+@@ -295,11 +295,7 @@
+ 	-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/
++	-$(COPY) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(D)/$(QTDIR)/lib/
+ 
+ 
+ 
diff --git a/dev-python/qscintilla/qscintilla-1.54.ebuild b/dev-python/qscintilla/qscintilla-1.54.ebuild
new file mode 100644
index 000000000000..b1438d4b4090
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-1.54.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.54.ebuild,v 1.1 2003/10/14 18:06:06 pythonhead Exp $
+
+
+inherit eutils
+
+S="${WORKDIR}/${P}-x11-gpl-1.2"
+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/QScintilla/${P}-x11-gpl-1.2.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
+DEPEND="virtual/glibc
+	x11-libs/qt"
+
+src_unpack() {
+
+	unpack ${P}-x11-gpl-1.2.tar.gz
+	cd ${S}/qt
+	qmake -o Makefile qscintilla.pro
+	epatch ${FILESDIR}/${P}-sandbox.patch
+	mkdir -p ${D}/${QTDIR}/lib
+
+}
+
+src_compile() {
+
+	cd ${S}/qt
+	make all staticlib
+
+}
+
+src_install() {
+
+	cd ${S}/qt
+	mkdir -p ${D}/${QTDIR}/{include,translations,lib}
+	cp qextscintilla*.h ${D}/$QTDIR/include
+	cp qscintilla*.qm ${D}/$QTDIR/translations
+	cp libqscintilla.so.* ${D}/$QTDIR/lib
+	cp libqscintilla.a* ${D}/$QTDIR/lib
+
+}
+