version bump, with some patch changes

Package-Manager: portage-2.1.2_rc1-r1

5 files changed, 147 insertions, 5 deletions

diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index a1c994223d52..4d223df2bcf6 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.65 2006/05/20 20:01:33 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.66 2006/11/14 13:48:15 caleb Exp $
+
+*qscintilla-1.7 (14 Nov 2006)
+
+  14 Nov 2006; Caleb Tennis <caleb@gentoo.org> +files/qscintilla-1.7.patch,
+  +qscintilla-1.7.ebuild:
+  version bump, with some patch changes
 
   20 May 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   qscintilla-1.6.ebuild:
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index fa65fe1092ad..ca15c5706c68 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,11 +1,56 @@
-MD5 471bb1018c6932502c327680fcece99e ChangeLog 8239
-MD5 b3387e20eba70b27a4290523e89753e4 files/digest-qscintilla-1.5.1 77
-MD5 4f3a81db5affa3915e5d35de77364e97 files/digest-qscintilla-1.6 75
+AUX qscintilla-1.5-sandbox.patch 1041 RMD160 baf1c1ce082fdcead195941e4b3d3b2cfa48ce72 SHA1 f8625430db1692006e927f84110779786c281c2b SHA256 e1086b472285474fa3591a3bd9eb6b064a448e48d105f84b2fdd2c6977bcec8b
 MD5 bacbcf22f2420b5d982a6d04f171b44a files/qscintilla-1.5-sandbox.patch 1041
+RMD160 baf1c1ce082fdcead195941e4b3d3b2cfa48ce72 files/qscintilla-1.5-sandbox.patch 1041
+SHA256 e1086b472285474fa3591a3bd9eb6b064a448e48d105f84b2fdd2c6977bcec8b files/qscintilla-1.5-sandbox.patch 1041
+AUX qscintilla-1.6-sandbox.patch 1220 RMD160 2ccab18cb3c0d19970e8bc9b2d80c38ef331cccd SHA1 ec6a489edac1187093fd997f84ae800af504cc3a SHA256 5568bae2a9ae3a865b1b7bcbf973a24b6599a5c4f1a09cc03d8242fe120b26c5
 MD5 5ed55fc7967f5baa8facac5fdb95f767 files/qscintilla-1.6-sandbox.patch 1220
+RMD160 2ccab18cb3c0d19970e8bc9b2d80c38ef331cccd files/qscintilla-1.6-sandbox.patch 1220
+SHA256 5568bae2a9ae3a865b1b7bcbf973a24b6599a5c4f1a09cc03d8242fe120b26c5 files/qscintilla-1.6-sandbox.patch 1220
+AUX qscintilla-1.60-sandbox.patch 710 RMD160 bfd6522349207903b72248684e139b323c175d7a SHA1 c01bdf9baa950bdb51fd4afde9e785cbd4ad0a24 SHA256 c12f8007a3b2a84e7b078e514f2a0892075e91bf5a9926f8d00b6bad72e301ec
 MD5 dc22cd37e5a193d127ad169db2cf6753 files/qscintilla-1.60-sandbox.patch 710
+RMD160 bfd6522349207903b72248684e139b323c175d7a files/qscintilla-1.60-sandbox.patch 710
+SHA256 c12f8007a3b2a84e7b078e514f2a0892075e91bf5a9926f8d00b6bad72e301ec files/qscintilla-1.60-sandbox.patch 710
+AUX qscintilla-1.61-sandbox.patch 710 RMD160 e5837ebb036fc11d3255a4c11bc1fd553a7e6c4b SHA1 22c35d642ed2052c30b19d57ed11ecaae4a2d652 SHA256 d9bbb5eac50cc1860e48ac6349645dca434c62e564fee59e449a89fe757dbc4d
 MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
+RMD160 e5837ebb036fc11d3255a4c11bc1fd553a7e6c4b files/qscintilla-1.61-sandbox.patch 710
+SHA256 d9bbb5eac50cc1860e48ac6349645dca434c62e564fee59e449a89fe757dbc4d files/qscintilla-1.61-sandbox.patch 710
+AUX qscintilla-1.65-sandbox.patch 710 RMD160 6541661ddfbd80a597bbfb25732beb21788c1231 SHA1 4abfdda13bf33c6326c0452fb6a677ba5074a339 SHA256 b12078801afb29cbe8747424383da47e0fd43fc9346adedb728d3c73886bdcc1
 MD5 f5f01b5ca1b6758b69a04a4897c0a370 files/qscintilla-1.65-sandbox.patch 710
-MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+RMD160 6541661ddfbd80a597bbfb25732beb21788c1231 files/qscintilla-1.65-sandbox.patch 710
+SHA256 b12078801afb29cbe8747424383da47e0fd43fc9346adedb728d3c73886bdcc1 files/qscintilla-1.65-sandbox.patch 710
+AUX qscintilla-1.7.patch 394 RMD160 2675542f285293f6b6a517c63ae00a39ee4a18a4 SHA1 90c514613a2c6f26e3409ad5cd963511aca80cd6 SHA256 1cd2d3aa56526a74106740aca95cc193432b962f8d83b3e644815eb274d2ce81
+MD5 909cf00cf9bb28addabb2798e014d069 files/qscintilla-1.7.patch 394
+RMD160 2675542f285293f6b6a517c63ae00a39ee4a18a4 files/qscintilla-1.7.patch 394
+SHA256 1cd2d3aa56526a74106740aca95cc193432b962f8d83b3e644815eb274d2ce81 files/qscintilla-1.7.patch 394
+DIST QScintilla1-1.71-gpl-1.7.tar.gz 1060310 RMD160 a0715e7c7712ddd466fd0d810226d971aacf1e72 SHA1 6fa1e1b7a46783c90cfc63af6fc57bd049c4106e SHA256 3094fcff5ca5e9ea979e3d740213ac9d00a0a054d0604279c2061faf36b0558f
+DIST qscintilla-1.62-gpl-1.5.1.tar.gz 727606
+DIST qscintilla-1.65-gpl-1.6.tar.gz 821730
+EBUILD qscintilla-1.5.1.ebuild 2071 RMD160 e80526e39c7c437a7b5fb4d1ff25116984ad39fa SHA1 5439335209fa034b25e97e485f5d7517629c79f4 SHA256 6142153db233108b0b3e391daec437cdfbcb2de21c5bbf978929ff506d577ef2
 MD5 e70bf3827275bc2c00f845ef1a9667fc qscintilla-1.5.1.ebuild 2071
+RMD160 e80526e39c7c437a7b5fb4d1ff25116984ad39fa qscintilla-1.5.1.ebuild 2071
+SHA256 6142153db233108b0b3e391daec437cdfbcb2de21c5bbf978929ff506d577ef2 qscintilla-1.5.1.ebuild 2071
+EBUILD qscintilla-1.6.ebuild 2391 RMD160 be4153138e02035fbb6faac7d233f1e1d75a2c4e SHA1 6a8223d4f95bee56d2630ad226270093d91e6d1e SHA256 73da3f833c04b67885c42c10bcd445f9092f90117c0d23c922b155cd20ea4408
 MD5 563a5b4f93aa4031e47337485c785ef8 qscintilla-1.6.ebuild 2391
+RMD160 be4153138e02035fbb6faac7d233f1e1d75a2c4e qscintilla-1.6.ebuild 2391
+SHA256 73da3f833c04b67885c42c10bcd445f9092f90117c0d23c922b155cd20ea4408 qscintilla-1.6.ebuild 2391
+EBUILD qscintilla-1.7.ebuild 2321 RMD160 747c8f29c2385a5a3db910a2f3627ee410369317 SHA1 ff115a77337178ca7013498ed56fd6e4792e24d4 SHA256 8e8682ccec2dc35e8671210013487b315b263b1491eceebc018b98c0f8e94eed
+MD5 b0fe81a7e17464749fe2b4ca0d5fbb60 qscintilla-1.7.ebuild 2321
+RMD160 747c8f29c2385a5a3db910a2f3627ee410369317 qscintilla-1.7.ebuild 2321
+SHA256 8e8682ccec2dc35e8671210013487b315b263b1491eceebc018b98c0f8e94eed qscintilla-1.7.ebuild 2321
+MISC ChangeLog 8408 RMD160 d039f715705f494ae6b00f6ef815677b683fd3a3 SHA1 657da281c85994f93d62ae8ba2c947abeb25bc22 SHA256 e4c1edebd84f3a8e6373d9772bf7d9818596d64fdc3a91ba1f11542af3802872
+MD5 11fb1211a87a0f8c1f289bf0013729df ChangeLog 8408
+RMD160 d039f715705f494ae6b00f6ef815677b683fd3a3 ChangeLog 8408
+SHA256 e4c1edebd84f3a8e6373d9772bf7d9818596d64fdc3a91ba1f11542af3802872 ChangeLog 8408
+MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
+MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 metadata.xml 175
+SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d metadata.xml 175
+MD5 b3387e20eba70b27a4290523e89753e4 files/digest-qscintilla-1.5.1 77
+RMD160 7b3119e01f80c06fea844fd2e8edd1e4f34a6673 files/digest-qscintilla-1.5.1 77
+SHA256 49140dbd561558d2ec41eec885acf9b2e83cb2577ffddb9acd33b43bdf9eabfe files/digest-qscintilla-1.5.1 77
+MD5 4f3a81db5affa3915e5d35de77364e97 files/digest-qscintilla-1.6 75
+RMD160 fa43cd759305bc5386a4fb2723f5a15d298c473f files/digest-qscintilla-1.6 75
+SHA256 03a14aa371a4ab4a53421225b597d734f55fc8d0ec58a298972ce5caaf8fde41 files/digest-qscintilla-1.6 75
+MD5 8601c9ebd022feb5c4ab2a1ec8043bf7 files/digest-qscintilla-1.7 277
+RMD160 671d28af5aaf3d18fdc3bb36a354bad85f41fb0b files/digest-qscintilla-1.7 277
+SHA256 7db89e59150f7cc40579a43cf4298142a36b21ddf0422f5e97f70d86dca4a5e6 files/digest-qscintilla-1.7 277
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.7 b/dev-python/qscintilla/files/digest-qscintilla-1.7
new file mode 100644
index 000000000000..c8f1f3a2db47
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.7
@@ -0,0 +1,3 @@
+MD5 145321e9e3ae7d4edc7f2bf6954b6763 QScintilla1-1.71-gpl-1.7.tar.gz 1060310
+RMD160 a0715e7c7712ddd466fd0d810226d971aacf1e72 QScintilla1-1.71-gpl-1.7.tar.gz 1060310
+SHA256 3094fcff5ca5e9ea979e3d740213ac9d00a0a054d0604279c2061faf36b0558f QScintilla1-1.71-gpl-1.7.tar.gz 1060310
diff --git a/dev-python/qscintilla/files/qscintilla-1.7.patch b/dev-python/qscintilla/files/qscintilla-1.7.patch
new file mode 100644
index 000000000000..99eb91369f97
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-1.7.patch
@@ -0,0 +1,17 @@
+--- designer/designer.pro.orig	2006-11-14 08:35:36.000000000 -0500
++++ designer/designer.pro	2006-11-14 08:35:49.000000000 -0500
+@@ -3,10 +3,12 @@
+ 
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+-DESTDIR = $(QTDIR)/plugins/designer
++DESTDIR = .
+ 
+ CONFIG += qt warn_on release plugin
+ 
+ SOURCES += qscintillaplugin.cpp
+ 
+-LIBS += -lqscintilla
++LIBS += -L../qt -lqscintilla
++
++INCLUDEPATH += ../qt
diff --git a/dev-python/qscintilla/qscintilla-1.7.ebuild b/dev-python/qscintilla/qscintilla-1.7.ebuild
new file mode 100644
index 000000000000..4c27514a63cc
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-1.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.7.ebuild,v 1.1 2006/11/14 13:48:15 caleb Exp $
+
+inherit eutils toolchain-funcs
+
+QSCINTILLA_MAJOR_VER="1"
+SCINTILLA_VER="1.71"
+MY_P="${PN/qs/QS}1-${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.riverbankcomputing.com/Downloads/QScintilla1/${MY_P}.tar.gz"
+#SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="=x11-libs/qt-3*"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}/qt
+	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = lib:" qscintilla.pro
+	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}.patch
+
+	cd ${S}/designer
+	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> designer.pro
+	${QTDIR}/bin/qmake -o Makefile designer.pro
+}
+
+src_compile() {
+	cd ${S}/qt
+	make all staticlib CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINK="$(tc-getCXX)" || die "make failed"
+	cd ${S}/designer
+	dodir ${QTDIR}/plugins/designer
+	make
+}
+
+src_install() {
+	dodoc ChangeLog LICENSE NEWS README*
+	dodir ${ROOT}/usr/{include,$(get_libdir),share/qscintilla/translations}
+	cd ${S}/qt
+	cp qextscintilla*.h "${D}/usr/include"
+	cp qscintilla*.qm "${D}/usr/share/qscintilla/translations"
+	cp lib/libqscintilla.a* "${D}/usr/$(get_libdir)"
+	cp -d lib/libqscintilla.so.* "${D}/usr/$(get_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
+	insinto ${QTDIR}/plugins/designer
+	insopts  -m0755
+	doins ${S}/designer/libqscintillaplugin.so
+}