add nls-issue compile patch, #112496; thanks for the pointers, Spanky!

Package-Manager: portage-2.1_pre9-r4

4 files changed, 85 insertions, 14 deletions

diff --git a/media-libs/libextractor/ChangeLog b/media-libs/libextractor/ChangeLog
index 7052a81cfd98..f90ff52256e9 100644
--- a/media-libs/libextractor/ChangeLog
+++ b/media-libs/libextractor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libextractor
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.27 2006/04/25 05:10:17 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/ChangeLog,v 1.28 2006/04/27 06:28:45 squinky86 Exp $
+
+  27 Apr 2006; Jon Hood <squinky86@gentoo.org>
+  +files/libextractor-includeorder.patch, libextractor-0.5.12.ebuild:
+  Fix nls compile breakage, #112496.
 
 *libextractor-0.5.12 (25 Apr 2006)
 
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index c0f5684dcd34..13a30c965f49 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,18 +1,28 @@
-MD5 988875c0c1a947b6a9c643c5a232195d ChangeLog 6119
-RMD160 9cc52b4ae3c6288a2afb83caa2c229b6b938673f ChangeLog 6119
-SHA256 763ed9c75f89eff74fcfb7f02af077279e85ae579303d2777978ab7a836db450 ChangeLog 6119
-MD5 b74f900da231e7c6c8ae518ca0d2ccd6 files/digest-libextractor-0.5.12 262
-RMD160 8a22a020ea51abe9791836e9d3f591cb6aa0798b files/digest-libextractor-0.5.12 262
-SHA256 e50f29ea2427aadc8394984700dee7cb8980adc192e2024080c6d34fd5053aca files/digest-libextractor-0.5.12 262
-MD5 04946a27fbbe28393456a9c13d351f98 files/digest-libextractor-0.5.9 259
-RMD160 eb17228432a85698e1f526b0427d49802da4e33b files/digest-libextractor-0.5.9 259
-SHA256 faad31458d3f8289d353bdbe6b85ef6bd032e6987740d06e666288f3d013f089 files/digest-libextractor-0.5.9 259
-MD5 fc2242732e369060b6f85f3acf0bab18 libextractor-0.5.12.ebuild 1018
-RMD160 dd5136426d5f528479350938f361fb99e20ce724 libextractor-0.5.12.ebuild 1018
-SHA256 819a5e6750028131d31733b74f2087a7c2055045dcbd6297dcf0c044b2e9966a libextractor-0.5.12.ebuild 1018
+AUX libextractor-includeorder.patch 1438 RMD160 0c11bd4a4f00f2bd76d477491e2bcef7abeaac21 SHA1 0a5eaf4cd4284d1ab0a723d51ece8035fc510266 SHA256 101c93ba9d7a76f597b88fc737e8aa3e5afe724c79e5b595987beeb6c539c00e size 1438
+MD5 aafd7db58f61c497e45ac2fb7422eaf5 files/libextractor-includeorder.patch 1438
+RMD160 0c11bd4a4f00f2bd76d477491e2bcef7abeaac21 files/libextractor-includeorder.patch 1438
+SHA256 101c93ba9d7a76f597b88fc737e8aa3e5afe724c79e5b595987beeb6c539c00e files/libextractor-includeorder.patch 1438
+DIST libextractor-0.5.12.tar.gz 7750212 RMD160 e47260222069c78d8f842e689ea4e3ddac038136 SHA256 adc4cce999918cb20565888d656482aa7a9e0198642ceaad3ec1318addf14424 size 7750212
+DIST libextractor-0.5.9.tar.gz 6138887 RMD160 d96aaa1e42b589d37318b8f746f4d6a7b2f59ca1 SHA256 99a837dbe267d1d18267f9cdb5ee3b1583447c935765b32bb939a1c23edd2ea0 size 6138887
+EBUILD libextractor-0.5.12.ebuild 1103 RMD160 49a6eb753a4641cf3d429562a3b79b43c8d3ea14 SHA1 7be0d0bd1f0d94ea60a449e41fb195a1e532053e SHA256 62c0d4d6003c57826b74c01b63436da9b5b2c558827f5102c31ba208801267a1 size 1103
+MD5 53e99c9a9ff3ff856778e726c9cd3a67 libextractor-0.5.12.ebuild 1103
+RMD160 49a6eb753a4641cf3d429562a3b79b43c8d3ea14 libextractor-0.5.12.ebuild 1103
+SHA256 62c0d4d6003c57826b74c01b63436da9b5b2c558827f5102c31ba208801267a1 libextractor-0.5.12.ebuild 1103
+EBUILD libextractor-0.5.9.ebuild 1011 RMD160 079c4c98ce4b07531f97500a6d4bdd91fdc0b7aa SHA1 ba20e6b65dd4704a268f8760fd5b625f8bc81ced SHA256 299d422994fd10ab3ec34dfdb6d9a2a19da1f0fe738ac49e875eb379ef1ac136 size 1011
 MD5 067eff0026d6d578e0d3228007e315b1 libextractor-0.5.9.ebuild 1011
 RMD160 079c4c98ce4b07531f97500a6d4bdd91fdc0b7aa libextractor-0.5.9.ebuild 1011
 SHA256 299d422994fd10ab3ec34dfdb6d9a2a19da1f0fe738ac49e875eb379ef1ac136 libextractor-0.5.9.ebuild 1011
+MISC ChangeLog 6274 RMD160 a7e17ef2d72dc289ac4000798ca763bcd3644142 SHA1 4cc6f79446c6a9421cf9d38051b842fc888dcd20 SHA256 3a7416575f1a0f35e011f76083943a638ba06cf80bae1190a96d87c8d1f0c3a5 size 6274
+MD5 9c4cb20447ab061aa0488f827f9599df ChangeLog 6274
+RMD160 a7e17ef2d72dc289ac4000798ca763bcd3644142 ChangeLog 6274
+SHA256 3a7416575f1a0f35e011f76083943a638ba06cf80bae1190a96d87c8d1f0c3a5 ChangeLog 6274
+MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f size 160
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
+MD5 b74f900da231e7c6c8ae518ca0d2ccd6 files/digest-libextractor-0.5.12 262
+RMD160 8a22a020ea51abe9791836e9d3f591cb6aa0798b files/digest-libextractor-0.5.12 262
+SHA256 e50f29ea2427aadc8394984700dee7cb8980adc192e2024080c6d34fd5053aca files/digest-libextractor-0.5.12 262
+MD5 04946a27fbbe28393456a9c13d351f98 files/digest-libextractor-0.5.9 259
+RMD160 eb17228432a85698e1f526b0427d49802da4e33b files/digest-libextractor-0.5.9 259
+SHA256 faad31458d3f8289d353bdbe6b85ef6bd032e6987740d06e666288f3d013f089 files/digest-libextractor-0.5.9 259
diff --git a/media-libs/libextractor/files/libextractor-includeorder.patch b/media-libs/libextractor/files/libextractor-includeorder.patch
new file mode 100644
index 000000000000..d2adff938bda
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-includeorder.patch
@@ -0,0 +1,51 @@
+diff -Naur libextractor-0.5.12/src/plugins/exiv2/exiv2extractor.cc libextractor-0.5.12.working/src/plugins/exiv2/exiv2extractor.cc
+--- libextractor-0.5.12/src/plugins/exiv2/exiv2extractor.cc	2006-03-10 18:12:32.000000000 -0600
++++ libextractor-0.5.12.working/src/plugins/exiv2/exiv2extractor.cc	2006-04-27 01:11:51.000000000 -0500
+@@ -23,19 +23,18 @@
+   @date    30-Jun-05, ahu: created
+ */
+ 
+-#include "platform.h"
+-#include "extractor.h"
+-
+-#include "exif.hpp"
+-#include "image.hpp"
+-#include "futils.hpp"
+-
+ #include <iostream>
+ #include <iomanip>
+ #include <cassert>
+ #include <cstring>
+ #include <math.h>
+ 
++#include "platform.h"
++#include "extractor.h"
++
++#include "exif.hpp"
++#include "image.hpp"
++#include "futils.hpp"
+ 
+ #define WORKAROUND_905 1
+ #if WORKAROUND_905
+diff -Naur libextractor-0.5.12/src/plugins/wordleaker/wordextractor.cc libextractor-0.5.12.working/src/plugins/wordleaker/wordextractor.cc
+--- libextractor-0.5.12/src/plugins/wordleaker/wordextractor.cc	2006-04-05 02:50:51.000000000 -0500
++++ libextractor-0.5.12.working/src/plugins/wordleaker/wordextractor.cc	2006-04-27 01:13:01.000000000 -0500
+@@ -22,15 +22,14 @@
+      the README file in this directory.
+  */
+ 
+-#include "platform.h"
+-#include "extractor.h"
+-#include "../convert.h"
+ #include <math.h>
+ #include <time.h>
+ 
+ #include "wordleaker.h"
+ #include "pole.h"
+-
++#include "platform.h"
++#include "extractor.h"
++#include "../convert.h"
+ 
+ extern "C" {
+ 
diff --git a/media-libs/libextractor/libextractor-0.5.12.ebuild b/media-libs/libextractor/libextractor-0.5.12.ebuild
index 435258ab5804..4f3e616367fe 100644
--- a/media-libs/libextractor/libextractor-0.5.12.ebuild
+++ b/media-libs/libextractor/libextractor-0.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.12.ebuild,v 1.1 2006/04/25 05:10:17 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libextractor/libextractor-0.5.12.ebuild,v 1.2 2006/04/27 06:28:45 squinky86 Exp $
 
 inherit libtool eutils
 
@@ -21,6 +21,12 @@ DEPEND="virtual/libc
 	zlib? ( sys-libs/zlib )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-includeorder.patch
+}
+
 src_compile() {
 	elibtoolize
 	econf --enable-glib --enable-exiv2 \