correcting versioning and bump

(Portage version: 2.0.51-r15)

11 files changed, 212 insertions, 15 deletions

diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index a9be4ff4ad01..7109f7447946 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,13 @@
 # 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.35 2004/12/31 00:17:43 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.36 2005/02/20 15:58:42 carlo Exp $
+
+*qscintilla-1.5 (20 Feb 2005)
+
+  20 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/qscintilla-1.4-sandbox.patch, +files/qscintilla-1.5-sandbox.patch,
+  +qscintilla-1.4.ebuild, +qscintilla-1.5.ebuild:
+  correcting versioning and bump
 
   31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index 6ac8984d8ab5..b73fd5b032d7 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,11 +1,17 @@
-MD5 3e180831f480d43868975437cd53808b qscintilla-1.60.ebuild 1245
-MD5 e5f604948ad4b76dc10734fdfd4ee3f6 qscintilla-1.54.ebuild 1050
-MD5 274710a5576a41d939a68735ba794fd7 ChangeLog 4045
+MD5 47001b3e08074e3e22c96681c65d45bd qscintilla-1.5.ebuild 1778
+MD5 d5ed1b606c73b2fe3ee7b55962fdf6d5 qscintilla-1.61.ebuild 1319
+MD5 53ef4379ca5dd60cf3cb8c9cd0664e11 qscintilla-1.54.ebuild 1050
+MD5 31f5d42f398388eb5b9efb5d2e78154e qscintilla-1.4.ebuild 1778
+MD5 981a0f6d736f10f019694ad757b20b42 qscintilla-1.60.ebuild 1245
+MD5 b2861fed11dddfe7fd0d6aea6c255b7a ChangeLog 4285
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 8efa0cf95703470588e71b2db11939d3 qscintilla-1.61.ebuild 1319
-MD5 a9d71d6103367fa01a62735815dbe6ca files/digest-qscintilla-1.60 75
-MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
+MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.4 75
+MD5 7421557a35d6c2f2d95d70e20358346b files/digest-qscintilla-1.5 75
 MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
-MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
+MD5 f5f52f3b6f62b4b9c0ca4adb2af8d99a files/qscintilla-1.4-sandbox.patch 1041
 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 bacbcf22f2420b5d982a6d04f171b44a files/qscintilla-1.5-sandbox.patch 1041
+MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.4 b/dev-python/qscintilla/files/digest-qscintilla-1.4
new file mode 100644
index 000000000000..2a84b5081a17
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.4
@@ -0,0 +1 @@
+MD5 b12350ab2609b3a5e230330a0d9718aa qscintilla-1.61-gpl-1.4.tar.gz 700442
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.5 b/dev-python/qscintilla/files/digest-qscintilla-1.5
new file mode 100644
index 000000000000..a0f4f576507c
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.5
@@ -0,0 +1 @@
+MD5 9aa4cb6b0bff1a320162d7a1f99f9d61 qscintilla-1.62-gpl-1.5.tar.gz 727129
diff --git a/dev-python/qscintilla/files/qscintilla-1.4-sandbox.patch b/dev-python/qscintilla/files/qscintilla-1.4-sandbox.patch
new file mode 100644
index 000000000000..caa6116cda6e
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-1.4-sandbox.patch
@@ -0,0 +1,30 @@
+--- Makefile.orig	2005-01-14 21:27:47.000000000 +0100
++++ Makefile	2005-01-14 21:29:57.000000000 +0100
+@@ -305,7 +305,7 @@
+ QMAKE_TARGET = qscintilla
+ DESTDIR  = ${destdir}/
+ TARGET   = libqscintilla.so.5.0.0
+-TARGETA	= ${destdir}/libqscintilla.a
++TARGETA	= libqscintilla.a
+ TARGETD	= libqscintilla.so.5.0.0
+ TARGET0	= libqscintilla.so
+ TARGET1	= libqscintilla.so.5
+@@ -336,17 +336,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/dev-python/qscintilla/files/qscintilla-1.5-sandbox.patch b/dev-python/qscintilla/files/qscintilla-1.5-sandbox.patch
new file mode 100644
index 000000000000..65bf1ad56905
--- /dev/null
+++ b/dev-python/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/dev-python/qscintilla/qscintilla-1.4.ebuild b/dev-python/qscintilla/qscintilla-1.4.ebuild
new file mode 100644
index 000000000000..bbfef0332a16
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-1.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.4.ebuild,v 1.1 2005/02/20 15:58:42 carlo Exp $
+
+inherit eutils
+
+SCINTILLA_VER="1.61"
+MY_P="${PN}-${SCINTILLA_VER}-gpl-${PV}"
+MY_P=${MY_P/_pre/snapshot-}
+S=${WORKDIR}/${MY_P}
+
+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/snapshots/QScintilla/${MY_P}.tar.gz"
+#SRC_URI="http://www.river-bank.demon.co.uk/download/QScintilla/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+IUSE="doc"
+
+DEPEND="virtual/libc
+	sys-apps/sed
+	x11-libs/qt"
+
+LIBDIR="/usr/$(get_libdir)"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}/qt
+	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro
+	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
+
+	qmake -o Makefile qscintilla.pro
+	epatch ${FILESDIR}/${P}-sandbox.patch
+}
+
+src_compile() {
+	cd ${S}/qt
+	make destdir=${LIBDIR} all staticlib
+}
+
+src_install() {
+	dodoc ChangeLog LICENSE NEWS README README.MacOS
+	dodir /usr/include ${LIBDIR} /usr/share/qscintilla/translations
+	cd ${S}/qt
+	cp qextscintilla*.h "${D}/usr/include"
+	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
+	cp libqscintilla.a* "${D}/usr/${LIBDIR}"
+	cp -d libqscintilla.so.* "${D}/usr/${LIBDIR}"
+	dodir ${QTDIR}/translations/
+	for I in $(ls -1 qscintilla*.qm) ; do
+		dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
+	done
+	if use doc ; then
+		dohtml ${S}/doc/html/*
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins ${S}/doc/Scintilla/*
+	fi
+}
diff --git a/dev-python/qscintilla/qscintilla-1.5.ebuild b/dev-python/qscintilla/qscintilla-1.5.ebuild
new file mode 100644
index 000000000000..e89468434e20
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-1.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.5.ebuild,v 1.1 2005/02/20 15:58:42 carlo Exp $
+
+inherit eutils
+
+SCINTILLA_VER="1.62"
+MY_P="${PN}-${SCINTILLA_VER}-gpl-${PV}"
+MY_P=${MY_P/_pre/snapshot-}
+S=${WORKDIR}/${MY_P}
+
+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/snapshots/QScintilla/${MY_P}.tar.gz"
+#SRC_URI="http://www.river-bank.demon.co.uk/download/QScintilla/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+IUSE="doc"
+
+DEPEND="virtual/libc
+	sys-apps/sed
+	x11-libs/qt"
+
+LIBDIR="/usr/$(get_libdir)"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}/qt
+	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro
+	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
+
+	qmake -o Makefile qscintilla.pro
+	epatch ${FILESDIR}/${P}-sandbox.patch
+}
+
+src_compile() {
+	cd ${S}/qt
+	make destdir=${LIBDIR} all staticlib
+}
+
+src_install() {
+	dodoc ChangeLog LICENSE NEWS README README.MacOS
+	dodir /usr/include ${LIBDIR} /usr/share/qscintilla/translations
+	cd ${S}/qt
+	cp qextscintilla*.h "${D}/usr/include"
+	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
+	cp libqscintilla.a* "${D}/usr/${LIBDIR}"
+	cp -d libqscintilla.so.* "${D}/usr/${LIBDIR}"
+	dodir ${QTDIR}/translations/
+	for I in $(ls -1 qscintilla*.qm) ; do
+		dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
+	done
+	if use doc ; then
+		dohtml ${S}/doc/html/*
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins ${S}/doc/Scintilla/*
+	fi
+}
diff --git a/dev-python/qscintilla/qscintilla-1.54.ebuild b/dev-python/qscintilla/qscintilla-1.54.ebuild
index 1aeaf8d15f38..c0a05e81f650 100644
--- a/dev-python/qscintilla/qscintilla-1.54.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.54.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.10 2004/07/02 04:30:30 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.54.ebuild,v 1.11 2005/02/20 15:58:42 carlo Exp $
 
 
 inherit eutils
diff --git a/dev-python/qscintilla/qscintilla-1.60.ebuild b/dev-python/qscintilla/qscintilla-1.60.ebuild
index 2eb093efb662..0de31d2b8e4f 100644
--- a/dev-python/qscintilla/qscintilla-1.60.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.60.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.9 2004/08/20 22:34:59 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.60.ebuild,v 1.10 2005/02/20 15:58:42 carlo Exp $
 
 inherit eutils
 
diff --git a/dev-python/qscintilla/qscintilla-1.61.ebuild b/dev-python/qscintilla/qscintilla-1.61.ebuild
index 19b5d0c6b278..7061044597af 100644
--- a/dev-python/qscintilla/qscintilla-1.61.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.61.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.6 2004/12/16 05:24:27 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.61.ebuild,v 1.7 2005/02/20 15:58:42 carlo Exp $
 
 inherit eutils