Fixed patch, bug #160931 (thanks to Brian Merrill).

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index 38a912deb41403bfd6873e4a66a34aa72db1922b..815071a073b3eb19741ba322e85ae5d5bff8a049 100644 (file)
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.68 2007/01/06 21:31:37 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.69 2007/01/09 19:52:35 dev-zero Exp $
+
+  09 Jan 2007; Tiziano Müller <dev-zero@gentoo.org>
+  files/qscintilla-1.7.1.patch:
+  Fixed patch, bug #160931 (thanks to Brian Merrill).
 
   06 Jan 2007; Tiziano Müller <dev-zero@gentoo.org>
   qscintilla-1.7.1.ebuild:

diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index 3069bd82dd69e3eac803fb16e05064f19526f8a8..3db75b1f739d58be6039c83643706eebac80f5f8 100644 (file)
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -2,10 +2,10 @@ AUX qscintilla-1.5-sandbox.patch 1041 RMD160 baf1c1ce082fdcead195941e4b3d3b2cfa4
 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.7.1.patch 394 RMD160 2675542f285293f6b6a517c63ae00a39ee4a18a4 SHA1 90c514613a2c6f26e3409ad5cd963511aca80cd6 SHA256 1cd2d3aa56526a74106740aca95cc193432b962f8d83b3e644815eb274d2ce81
-MD5 909cf00cf9bb28addabb2798e014d069 files/qscintilla-1.7.1.patch 394
-RMD160 2675542f285293f6b6a517c63ae00a39ee4a18a4 files/qscintilla-1.7.1.patch 394
-SHA256 1cd2d3aa56526a74106740aca95cc193432b962f8d83b3e644815eb274d2ce81 files/qscintilla-1.7.1.patch 394
+AUX qscintilla-1.7.1.patch 398 RMD160 ebbd518a1bf6068f143fa902390ab772feea9627 SHA1 1bfb73303bab3251cf7351b6d6302c212880d705 SHA256 2aee04714bd2366326c21f2a559a6db4421e2e3e548811c72ee4d37e22e8873d
+MD5 0efd9405b361a911e69727f0ff22274f files/qscintilla-1.7.1.patch 398
+RMD160 ebbd518a1bf6068f143fa902390ab772feea9627 files/qscintilla-1.7.1.patch 398
+SHA256 2aee04714bd2366326c21f2a559a6db4421e2e3e548811c72ee4d37e22e8873d files/qscintilla-1.7.1.patch 398
 DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 SHA1 424415960e5cbcd58306e87d1d610bd8e72f3368 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c
 DIST qscintilla-1.62-gpl-1.5.1.tar.gz 727606
 EBUILD qscintilla-1.5.1.ebuild 2071 RMD160 e80526e39c7c437a7b5fb4d1ff25116984ad39fa SHA1 5439335209fa034b25e97e485f5d7517629c79f4 SHA256 6142153db233108b0b3e391daec437cdfbcb2de21c5bbf978929ff506d577ef2
@@ -16,10 +16,10 @@ EBUILD qscintilla-1.7.1.ebuild 2300 RMD160 718bf5a7f51f220c6ceffd594137bdc1c8859
 MD5 a8334ff2ac76b42e20cfddd797ee188b qscintilla-1.7.1.ebuild 2300
 RMD160 718bf5a7f51f220c6ceffd594137bdc1c8859608 qscintilla-1.7.1.ebuild 2300
 SHA256 55f64c626a3c156a2037333bbf5203b03f12ae16dcc55808dbf5cfc03c0827c8 qscintilla-1.7.1.ebuild 2300
-MISC ChangeLog 8970 RMD160 f10fad8d1c6e734f4a3b53f1ddb97f15f95277b7 SHA1 2adcbdb94cc32e4c7bb7b7f1cdab045f04ba23de SHA256 029cae80494bd4133df92eca832d89bae4a1a8c2f938d1720f9b8fb749802cea
-MD5 853964788c660d23a23a933c7afafc82 ChangeLog 8970
-RMD160 f10fad8d1c6e734f4a3b53f1ddb97f15f95277b7 ChangeLog 8970
-SHA256 029cae80494bd4133df92eca832d89bae4a1a8c2f938d1720f9b8fb749802cea ChangeLog 8970
+MISC ChangeLog 9110 RMD160 6b21e236fa7d3bae2837d976142ce867af677658 SHA1 254b979e2dd6bdee7c87acec79941838d7c9f81a SHA256 cdd866cb3c3f1908cc46bbc9e532c3623aa5ec23e357c8d905bdf876c7d6272a
+MD5 0301e43e20a400515acb2e154a7f45b5 ChangeLog 9110
+RMD160 6b21e236fa7d3bae2837d976142ce867af677658 ChangeLog 9110
+SHA256 cdd866cb3c3f1908cc46bbc9e532c3623aa5ec23e357c8d905bdf876c7d6272a ChangeLog 9110
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 metadata.xml 175

diff --git a/dev-python/qscintilla/files/qscintilla-1.7.1.patch b/dev-python/qscintilla/files/qscintilla-1.7.1.patch
index 99eb91369f9768eb3d7fa4bb53451e2d411dba99..5d63990c14843a6ecaa6c38006cfa4ef942f9d38 100644 (file)
--- a/dev-python/qscintilla/files/qscintilla-1.7.1.patch
+++ b/dev-python/qscintilla/files/qscintilla-1.7.1.patch
@@ -12,6 +12,6 @@
  SOURCES += qscintillaplugin.cpp
  
 -LIBS += -lqscintilla
-+LIBS += -L../qt -lqscintilla
++LIBS += -L../qt/lib -lqscintilla
 +
 +INCLUDEPATH += ../qt