Fix relative paths in patch (bug #471852 by Milos Popovic).

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 18 insertions, 19 deletions

diff --git a/sci-libs/libecwj2/ChangeLog b/sci-libs/libecwj2/ChangeLog
index bf57790ec774..2963cb146841 100644
--- a/sci-libs/libecwj2/ChangeLog
+++ b/sci-libs/libecwj2/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/libecwj2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/ChangeLog,v 1.10 2012/08/03 19:42:46 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libecwj2/ChangeLog,v 1.11 2013/05/31 14:05:23 jer Exp $
+
+  31 May 2013; Jeroen Roovers <jer@gentoo.org> files/libecwj2-3.3-nolcms.patch:
+  Fix relative paths in patch (bug #471852 by Milos Popovic).
 
   03 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> libecwj2-3.3-r1.ebuild:
   Added static-libs, keyword amd64-linux x86-linux
diff --git a/sci-libs/libecwj2/Manifest b/sci-libs/libecwj2/Manifest
index 10a69bddfe65..c811984b7dc4 100644
--- a/sci-libs/libecwj2/Manifest
+++ b/sci-libs/libecwj2/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libecwj2-3.3-nolcms.patch 3078 SHA256 ecd95c7d91978778f91e49bf7f5416eb91af0a3eda8e900285ade524fd389921 SHA512 25d3b7de1903e34bab631ef9dd50b120ea1bc93a7edcb65a5c1bb8dd0d4ce95ede0ca35b07cccd95637841c5a8590de4640d7a29dc18295e876bdb9be43ecc97 WHIRLPOOL 21d9554a3bd302a0dd35916b7d8f682d7792f5056fd76867915f06868b6b9564bf9e9961725ee7907ba38301957fe26676f879ae9228ea02a7c74a1fde7316de
+AUX libecwj2-3.3-nolcms.patch 2738 SHA256 399bd397b22137714c2cae0938ef66c2f78d3e5a1ebcea51652133c3629e0c03 SHA512 62bc85b5667785e352bd2870d06eb28d8a67647adadb952f00934188824bf0b3d213a941b6b1e16d32835eaf194bf3e6e73675e599ef7697dfb68ea3806a9e25 WHIRLPOOL 7e09b32e4b77b472e7ea0336610fcd648b204596ff0a91c2f3714b41e0969cfe5dbe7e53435e8859c23bd4862a46734ad54ebf89401299dd9430449661241a6a
 DIST libecwj2-3.3-2006-09-06.zip 5461201 SHA256 60ae34e2ba34ca77525950822f53243f374940f1cd13d2460eabbbd759e11074 SHA512 531826bc87b89562e3e6f5e68602c3595662ebfce7a5a29d1e31f3f960b17846d0164cda6b4bbcd709614e49cb5a5b764f61f2b2ba76a220b701e93adab4faa0 WHIRLPOOL 8bf529a82f995163f84ce21652b3cf6ed893fe132e299f3abc37b52a9fbec4aa161c42d5a1531cb0508cad15146ada88e8791fa7c5c8b0fb17856c4954a3be75
 EBUILD libecwj2-3.3-r1.ebuild 1052 SHA256 1fc78f881d816bb6bf7c71247dad08785760ab31143370ae065b74173e206263 SHA512 751912c78f853e13378e49af1e575ddce7714c0cf40815fe6a80c0e258d1d1fcc51c666b4045173305e8bcedd5a881563f633c3ff90ccd62e1ce83882712bc96 WHIRLPOOL 3d27759f8c4c65a35dc2f02f9c6a6a256506883cc9bff2ecfa8d71d29531d58795dceab7151b4c8ca668415f4807de1e5af30d3385ae19fd3d424b7b46c9a3e0
-MISC ChangeLog 1906 SHA256 dc1bff2a3453678d89b0f1f0a9fb3c0196fa7262a3e95c36a3e9cbe0787b51f1 SHA512 d63a3595600eae235e163d4d8a235e38f5034231aaea3667c8c7a79777b8e078c2d9b3a7c1682591a9cb62392dea706d023caeb1862176871223c7c59d19cb93 WHIRLPOOL b2d641bf000c9976418a42e62886e0b3e81278280bdfff521c6409cc97b06f9badeea0ad1d8a6885c9d22b36a8a41749162aa8a7fe083075b4fdd095378d8b26
+MISC ChangeLog 2044 SHA256 06a09b2369c4fa8ecf195df06409dedfb789675345cd51baa422c27a772c63f8 SHA512 79cc36fa0e41b2359dbff2eb02e3e088841f98c055b2835cb467897b42520ff17ee25397c56fe90cbb87badb504faa3b0f040ead6aa2dc48660a3df8a1314b4f WHIRLPOOL ff8e36c6943d089758492a027ec3c7ac766b9ecc40bab8ea238ec9e6e239ea0688893b78f703931db35b478244307aa8c8c121847c752dec8d167ac43a839773
 MISC metadata.xml 168 SHA256 2fc15316b226307080574c36b3761f27a23a642e89c60f02feabdc64049a188d SHA512 eec7cb4444156fec7e8fa88c1ae6a02d0cf125174ae058f4286c77806eaa40ab8f7644b319bc01a3a8fdb717c9bd13c93111c4756e13cb3724a55783cf9b5eda WHIRLPOOL 3a4c3ce31b3f3a766d4791d8e41880c365501387bca1219bc1b411c27d002c68e31119b18ebbd646d0fb1bd7630176692ac9159350f8bbfe1998fd3a76f83ff1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAcKbwACgkQ1ycZbhPLE2CYyQCfdDl5HjdAFH1OGxVvaNJjfm66
-mMsAnj1BhwinhbeNDnu89D8665PAboRd
-=HCNV
+iEYEAREIAAYFAlGoriUACgkQVWmRsqeSphMv5gCff90yiXEmTWc5lcar37By++Cu
+TZMAn2uI0v2EFmp/tKoL/JxIOs0N1QiW
+=+N+c
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch b/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
index 3be4142de4f5..92c5abdc09fa 100644
--- a/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
+++ b/sci-libs/libecwj2/files/libecwj2-3.3-nolcms.patch
@@ -1,6 +1,5 @@
-diff -Naur ../libecwj2-3.3/Makefile.am ./Makefile.am
---- ../libecwj2-3.3/Makefile.am	2006-07-02 20:14:18.000000000 -0500
-+++ ./Makefile.am	2009-03-16 14:04:13.000000000 -0500
+--- a/Makefile.am	2006-07-02 20:14:18.000000000 -0500
++++ b/Makefile.am	2009-03-16 14:04:13.000000000 -0500
 @@ -1,3 +1,5 @@
 +AUTOMAKE_OPTIONS = foreign
 +
@@ -15,9 +14,8 @@ diff -Naur ../libecwj2-3.3/Makefile.am ./Makefile.am
 -	Source/C/NCSEcw/lcms/include/icc34.h \
  	Source/NCSBuildGnu/NCSGnuConfig.h 
  
-diff -Naur ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am ./Source/NCSBuildGnu/Makefile.am
---- ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am	2006-07-02 20:14:18.000000000 -0500
-+++ ./Source/NCSBuildGnu/Makefile.am	2009-03-16 14:00:50.000000000 -0500
+--- a/Source/NCSBuildGnu/Makefile.am	2006-07-02 20:14:18.000000000 -0500
++++ b/Source/NCSBuildGnu/Makefile.am	2009-03-16 14:00:50.000000000 -0500
 @@ -113,22 +113,6 @@
  	../C/NCSEcw/shared_src/qmf_util.c \
  	../C/NCSEcw/shared_src/quantize.c \
@@ -41,9 +39,8 @@ diff -Naur ../libecwj2-3.3/Source/NCSBuildGnu/Makefile.am ./Source/NCSBuildGnu/M
  	../C/NCSGDT2/NCSGDTEpsg.cpp \
  	../C/NCSGDT2/NCSGDTEPSGKey.cpp \
  	../C/NCSGDT2/NCSGDTLocation.cpp
-diff -Naur ../libecwj2-3.3/Source/include/NCSJPCDefs.h ./Source/include/NCSJPCDefs.h
---- ../libecwj2-3.3/Source/include/NCSJPCDefs.h	2006-07-02 20:15:24.000000000 -0500
-+++ ./Source/include/NCSJPCDefs.h	2009-03-16 14:00:27.000000000 -0500
+--- a/Source/include/NCSJPCDefs.h	2006-07-02 20:15:24.000000000 -0500
++++ b/Source/include/NCSJPCDefs.h	2009-03-16 14:00:27.000000000 -0500
 @@ -59,7 +59,7 @@
  // Use LCMS for ICC->RGB conversions, supports both
  // restricted and full ICC profiles.
@@ -53,9 +50,8 @@ diff -Naur ../libecwj2-3.3/Source/include/NCSJPCDefs.h ./Source/include/NCSJPCDe
  
  //
  // Use TinyXML for XML DOM Parsing
-diff -Naur ../libecwj2-3.3/configure.in ./configure.in
---- ../libecwj2-3.3/configure.in	2006-07-02 20:13:30.000000000 -0500
-+++ ./configure.in	2009-03-16 14:00:14.000000000 -0500
+--- a/configure.in	2006-07-02 20:13:30.000000000 -0500
++++ b/configure.in	2009-03-16 14:00:14.000000000 -0500
 @@ -32,17 +32,6 @@
  # Build some standard absolute include paths for the build