6 files changed, 22 insertions, 16 deletions
diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index 03ff1dc1a69d..081d8ad2f92b 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.37 2005/02/20 16:09:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.38 2005/02/21 19:44:47 carlo Exp $
+
+*qscintilla-1.4-r1 (21 Feb 2005)
+
+  21 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +qscintilla-1.4-r1.ebuild,
+  -qscintilla-1.4.ebuild, +qscintilla-1.5-r1.ebuild, -qscintilla-1.5.ebuild:
+  fixed stupid ebuild error, #82808
 
   20 Feb 2005; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.4.ebuild,
   qscintilla-1.5.ebuild:
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index c2968aa1fe08..51612bede22a 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,12 +1,10 @@
-MD5 103546daef21cbcf152bca6612287bf6 qscintilla-1.5.ebuild 1889
+MD5 d7c6a16291462e797bb2d64a4ae6532d qscintilla-1.4-r1.ebuild 1882
 MD5 f21b2e952d7a80a2bf61029240b5b66b qscintilla-1.61.ebuild 1316
 MD5 2bf5a82c276abb993cdbbb913f179941 qscintilla-1.54.ebuild 1046
-MD5 d97259f2e54b57543166598cd865b5c3 qscintilla-1.4.ebuild 1889
 MD5 4294b60e1800b02f408bd5bb859bffd8 qscintilla-1.60.ebuild 1242
-MD5 a4474d7fb0fcde0384df93d8f54165cc ChangeLog 4418
+MD5 a1ef8732ce8dc2b36f515bf209eaa403 ChangeLog 4642
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.4 75
-MD5 7421557a35d6c2f2d95d70e20358346b files/digest-qscintilla-1.5 75
+MD5 47834e7142876d1098fac62864ebb734 qscintilla-1.5-r1.ebuild 1882
 MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
 MD5 f5f52f3b6f62b4b9c0ca4adb2af8d99a files/qscintilla-1.4-sandbox.patch 1041
 MD5 dc22cd37e5a193d127ad169db2cf6753 files/qscintilla-1.60-sandbox.patch 710
@@ -15,3 +13,5 @@ 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
+MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.4-r1 75
+MD5 7421557a35d6c2f2d95d70e20358346b files/digest-qscintilla-1.5-r1 75
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.4 b/dev-python/qscintilla/files/digest-qscintilla-1.4-r1
index 2a84b5081a17..2a84b5081a17 100644
--- a/dev-python/qscintilla/files/digest-qscintilla-1.4
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.4-r1
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.5 b/dev-python/qscintilla/files/digest-qscintilla-1.5-r1
index a0f4f576507c..a0f4f576507c 100644
--- a/dev-python/qscintilla/files/digest-qscintilla-1.5
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.5-r1
diff --git a/dev-python/qscintilla/qscintilla-1.4.ebuild b/dev-python/qscintilla/qscintilla-1.4-r1.ebuild
index ec56e9e7b0a6..536bb6d24bcc 100644
--- a/dev-python/qscintilla/qscintilla-1.4.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/02/20 16:09:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.4-r1.ebuild,v 1.1 2005/02/21 19:44:47 carlo Exp $
 
 inherit eutils
 
@@ -12,8 +12,8 @@ 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"
+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"
@@ -47,8 +47,8 @@ src_install() {
 	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}"
+	cp libqscintilla.a* "${D}${LIBDIR}"
+	cp -d libqscintilla.so.* "${D}${LIBDIR}"
 	dodir ${QTDIR}/translations/
 	for I in $(ls -1 qscintilla*.qm) ; do
 		dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"
diff --git a/dev-python/qscintilla/qscintilla-1.5.ebuild b/dev-python/qscintilla/qscintilla-1.5-r1.ebuild
index e23a52f9ee25..221c199364fd 100644
--- a/dev-python/qscintilla/qscintilla-1.5.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/02/20 16:09:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.5-r1.ebuild,v 1.1 2005/02/21 19:44:47 carlo Exp $
 
 inherit eutils
 
@@ -12,8 +12,8 @@ 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"
+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"
@@ -47,8 +47,8 @@ src_install() {
 	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}"
+	cp libqscintilla.a* "${D}${LIBDIR}"
+	cp -d libqscintilla.so.* "${D}${LIBDIR}"
 	dodir ${QTDIR}/translations/
 	for I in $(ls -1 qscintilla*.qm) ; do
 		dosym "/usr/share/qscintilla/translations/${I}" "${QTDIR}/translations/${I}"