Corrected library paths used in qscintilla-2.2 patches (bug #223911).

Package-Manager: portage-2.1.5

4 files changed, 22 insertions, 6 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index bd4fc3771bfa..9771b0424442 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.11 2008/05/25 10:40:59 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.12 2008/07/08 12:41:57 griffon26 Exp $
+
+  08 Jul 2008; Maurice van der Pot <griffon26@gentoo.org>
+  files/qscintilla-2.2-qt.patch, files/qscintilla-2.2-qt4.patch:
+  Fixed library path in qscintilla-2.2 patches, because libraries are now built
+  in a different location. Fixes bug #223911 reported by Bryce Verdier
+  <btv@pdx.edu>.
 
   25 May 2008; Ben de Groot <yngwin@gentoo.org>
   +files/qscintilla-2.2-qt.patch, +files/qscintilla-2.2-qt4.patch:
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 1f912b53481d..648f607d3aff 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,9 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX qscintilla-1.5-sandbox.patch 1041 RMD160 baf1c1ce082fdcead195941e4b3d3b2cfa48ce72 SHA1 f8625430db1692006e927f84110779786c281c2b SHA256 e1086b472285474fa3591a3bd9eb6b064a448e48d105f84b2fdd2c6977bcec8b
 AUX qscintilla-1.7.1.patch 398 RMD160 ebbd518a1bf6068f143fa902390ab772feea9627 SHA1 1bfb73303bab3251cf7351b6d6302c212880d705 SHA256 2aee04714bd2366326c21f2a559a6db4421e2e3e548811c72ee4d37e22e8873d
 AUX qscintilla-2.1-qt.patch 351 RMD160 99756fe8a0105c649c7666609625f942e2ff502c SHA1 6ef678ef5c345746295be78db700e8175dc2f682 SHA256 b6c4cdfc9af82ab04e885b2e30204e291391fe9111ed34dbe12a9af36e41ede9
 AUX qscintilla-2.1-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40 SHA1 14092204c892dbb19c1749ae629bf06944dc4cbb SHA256 0ca4ad564038c6241b80e3a48d444fd5431b478e964ab41100221580c8674a22
-AUX qscintilla-2.2-qt.patch 351 RMD160 99756fe8a0105c649c7666609625f942e2ff502c SHA1 6ef678ef5c345746295be78db700e8175dc2f682 SHA256 b6c4cdfc9af82ab04e885b2e30204e291391fe9111ed34dbe12a9af36e41ede9
-AUX qscintilla-2.2-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40 SHA1 14092204c892dbb19c1749ae629bf06944dc4cbb SHA256 0ca4ad564038c6241b80e3a48d444fd5431b478e964ab41100221580c8674a22
+AUX qscintilla-2.2-qt.patch 347 RMD160 8585ed1b9e525b57663ed5f4e0b0c6500e9b9a7d SHA1 8b97babbbd05ad7d22b1a93c105ac83eaf57ea02 SHA256 9ef628c4546be47ba1eb32e13f2d56c40c0b8c26ea6990b979bc5c73540c9545
+AUX qscintilla-2.2-qt4.patch 439 RMD160 4c97b91aa538fa2db7da3e0b7f0f99766e8f98ed SHA1 84a6e4cab7aaed4d7ffa3286e7e31809ba0367f2 SHA256 9996813f9c512bc702c85dea920351770becfbdc9034f7b4babad41de8eea14d
 DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 SHA1 424415960e5cbcd58306e87d1d610bd8e72f3368 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c
 DIST QScintilla-1.73-gpl-2.1.tar.gz 1866929 RMD160 ef114b468b3cea5d36346c915bc407ce2ad3ec65 SHA1 ca9ac61cc3d537d7b53202ff5d8565365c3f8734 SHA256 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86
 DIST QScintilla-gpl-2.2.tar.gz 1873664 RMD160 8a1ad1dbad864d972259723cf308d2a779de346a SHA1 f570df8e7bcfc1281a477a21a12036023de6535a SHA256 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
@@ -12,5 +15,12 @@ EBUILD qscintilla-1.5.1.ebuild 2059 RMD160 8601c92d2f113c4add903ed5400c69c3fc6e1
 EBUILD qscintilla-1.7.1.ebuild 2301 RMD160 db738559013576467202a3c52383ba74a0c6524a SHA1 36fb7fedcf14676a6b009c80fc5667c387c11218 SHA256 e393b619c84b32c9bbf8f5eeb0fbbad0599fa34da14d045c3948d77ee7fbd6b1
 EBUILD qscintilla-2.1-r1.ebuild 3895 RMD160 a0612558e12afc97ba320add4bcdf73a4107032f SHA1 f1c887b5da51fb586d922f41e64f53c50df91476 SHA256 c79824dc4b98966998d77d5c7ad6c1600c27f6578e57271b009c6a18534c539e
 EBUILD qscintilla-2.2.ebuild 3852 RMD160 4bf262415d4705e18c6922ccac18e965992fff69 SHA1 eff2655dcb77ab0c4ca3581014df88bb90bfe2d1 SHA256 9b62695535244af133dffabcd46def8ad50172eb00baa4e6d1307d173ef999f1
-MISC ChangeLog 12191 RMD160 26e56eff554f8a324341e56053fdd2893e92c6f4 SHA1 f15fb1364c1ca8c4870d7cdfc63148e1e7a543e8 SHA256 4d8bd25d935f0035d65229ad8c14b36932749c3525a8c79c1a8019ddf269873c
+MISC ChangeLog 12486 RMD160 5ceca620d7a4ef0b803061a2d44fd09ff19c3ea2 SHA1 fe3be75a9277f977241a977bfb18724ca0e14577 SHA256 7ddaffc122b141bcd89922023a5845ee369497c893a71ba752b8687af1623dbb
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhzYJ0ACgkQMGnpIbeahxyagACffTFXaGi38V9ToI20bbAv2V31
+YH8AoJU62SiVIdSrFC4G0rU03ht2It8f
+=tUPV
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch b/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch
index 3579ea2400af..98b4fb5a237b 100644
--- a/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch
+++ b/x11-libs/qscintilla/files/qscintilla-2.2-qt.patch
@@ -11,4 +11,4 @@
  SOURCES += qscintillaplugin.cpp
  
 -LIBS += -lqscintilla2
-+LIBS += -L../Qt3/lib -lqscintilla2
++LIBS += -L../Qt3 -lqscintilla2
diff --git a/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch b/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch
index 646e38f45dbb..35062e4695ef 100644
--- a/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch
+++ b/x11-libs/qscintilla/files/qscintilla-2.2-qt4.patch
@@ -16,4 +16,4 @@
  INSTALLS += target
  
 -LIBS += -lqscintilla2
-+LIBS += -L../Qt4/lib -lqscintilla2
++LIBS += -L../Qt4 -lqscintilla2