rm

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 6 insertions, 110 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 495438e34119..6a9c24b866a1 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.253 2010/08/21 01:58:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.254 2010/08/21 21:58:59 scarabeus Exp $
+
+  21 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/poppler-0.12.3-config.patch:
+  rm
 
   21 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> poppler-0.14.1.ebuild:
   ppc64 stable wrt #331969
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 214627b8b81b..fb58c315ec4f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,5 @@
 AUX poppler-0.12.3-cairo-downscale.patch 17313 RMD160 6c2068605e195c2ec27636634613482a181195a9 SHA1 1df4c48520c53ef289d92b2208a5b55140443204 SHA256 643ab8d6d747a9e1484d132be43ee674e5ccae38c79792a8be01ed2df82e8067
 AUX poppler-0.12.3-cmake-disable-tests.patch 2121 RMD160 3edded24926076c9c0ef42d0f1f295a8d46cafdb SHA1 fd22bdf1d887bcedd83673992fd182bfdb3bfcb0 SHA256 182489ee0d76a38c6d2570721a6777d78077ace4249bbeac7dad8d29b075c01b
-AUX poppler-0.12.3-config.patch 3468 RMD160 de39ce760cca5b811e1c21efc893731fbcfbc22b SHA1 e7dd1b86d2d5312c5610b02101d5551bece21b10 SHA256 909a1626b8800b3e796c24e3c2a5b6140cd626a28b6c627bd212d6a4a9a12aef
 AUX poppler-0.12.3-darwin-gtk-link.patch 455 RMD160 9f08076c4821a29ef8b96bc0eb32b0b1d93b0285 SHA1 297d84fff5ee4f9fd05ceaf34228df5e21baff90 SHA256 1d58beb5d476857e60cdf16bc4c458b8c48e59f2b9a26715f485003da18f9814
 AUX poppler-0.12.3-fix-headers-installation.patch 1110 RMD160 8e327ab79c6cc3dc149b83be8c96ceb0ecfd494d SHA1 fa9b58cc1ca6f81f5dd30a41f89b8b5c136d9fe4 SHA256 ef05df49853ecde1fa5711f799f75d2811d56481f199995d88efb198f9f5b12e
 AUX poppler-0.12.3-gdk.patch 633 RMD160 85f009940f64f1e4d8d3b1dff2a8ec1e09b95420 SHA1 90c650df067e5dd2558dee1c098c5655b0f5974b SHA256 c6054c500b6049ec8be492bae5d364c6fdfed23a8ffe704ad80f2677ed13ccac
@@ -15,5 +14,5 @@ DIST poppler-0.14.2.tar.gz 1791177 RMD160 bdbb901f85edd33ecd3ca1805a0f46c806bdb8
 EBUILD poppler-0.12.4-r3.ebuild 3600 RMD160 922b9c48702a16bcdad05e472caf88a644a5a27f SHA1 a8f96ec417938b8323f45844217fcbace1e6c1d0 SHA256 9eabf2f7ed80436f29b0d4af4c4d108b4b2e475900eaeecddb08acfd186d21d4
 EBUILD poppler-0.14.1.ebuild 2733 RMD160 fe8652ddfe6dabb6f146cd6af3bc601292e15516 SHA1 b359064b0fde39b2e19c92fccf02b2923ff13fb2 SHA256 9959e3d2ff34f05da0f501f534941c7cea58af237b1f4b011799207f7f2a2db9
 EBUILD poppler-0.14.2.ebuild 2666 RMD160 4ae148bc2c71a0c81e1b6e5e88c2281c99dd4b78 SHA1 39b60a876d0d0b8e99e51dd68d728a017f99bc45 SHA256 2a810b16216a5beee84fbb33caf6ee2bb2c716c390721b81594015fc91d2e6da
-MISC ChangeLog 36139 RMD160 4427ab3082f991af62059ea39ec61f3f2bd3ef14 SHA1 2a88ebdecc19ea8ccd6b6cbc70d4957b00dc7c2f SHA256 cbc4cc72fa0011e34590cb6cc5175a2f83d97956bd7894cea1d197336970c932
+MISC ChangeLog 36238 RMD160 99d18daddcde81217816ba92708d3914473057dd SHA1 625da46efbb9226929ed81fdbdbe8ee247fc640c SHA256 90155c55bdd37a26c9b78cfe1f2aedfe5e4d2ef6460365fd74ce87ac606797f9
 MISC metadata.xml 564 RMD160 078af3bfc173aeaf994a9886723d7ca9a73f9b3f SHA1 2288b78748160193bc62d30bb458a26afd031f04 SHA256 3be05c7573d0473701d0589caac0ed0c7bf4f738bf33d6e9bda47166d6ad7ace
diff --git a/app-text/poppler/files/poppler-0.12.3-config.patch b/app-text/poppler/files/poppler-0.12.3-config.patch
deleted file mode 100644
index 1fc4f8a0f889..000000000000
--- a/app-text/poppler/files/poppler-0.12.3-config.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -urN poppler-0.12.3.sav/CMakeLists.txt poppler-0.12.3/CMakeLists.txt
---- poppler-0.12.3.sav/CMakeLists.txt	2009-12-24 11:50:12.000000000 +0100
-+++ poppler-0.12.3/CMakeLists.txt	2010-02-10 20:29:54.000000000 +0100
-@@ -33,7 +33,7 @@
- set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
- 
- # Enable these unconditionally.
--set(MULTITHREAD ON)
-+set(MULTITHREADED ON)
- set(OPI_SUPPORT ON)
- set(TEXTOUT_WORD_LIST ON)
- 
-diff -urN poppler-0.12.3.sav/poppler/poppler-config.h poppler-0.12.3/poppler/poppler-config.h
---- poppler-0.12.3.sav/poppler/poppler-config.h	2009-12-24 11:51:39.000000000 +0100
-+++ poppler-0.12.3/poppler/poppler-config.h	1970-01-01 01:00:00.000000000 +0100
-@@ -1,91 +0,0 @@
--/* poppler/poppler-config.h.  Generated from poppler-config.h.in by configure.  */
--//================================================= -*- mode: c++ -*- ====
--//
--// poppler-config.h
--//
--// Copyright 1996-2004 Glyph & Cog, LLC
--//
--//========================================================================
--
--#ifndef POPPLER_CONFIG_H
--#define POPPLER_CONFIG_H
--
--// We duplicate some of the config.h #define's here since they are
--// used in some of the header files we install.  The #ifndef/#endif
--// around #undef look odd, but it's to silence warnings about
--// redefining those symbols.
--
--/* Enable multithreading support. */
--#ifndef MULTITHREADED
--#define MULTITHREADED 1
--#endif
--
--/* Enable exceptions. */
--#ifndef USE_EXCEPTIONS
--/* #undef USE_EXCEPTIONS */
--#endif
--
--/* Use fixedpoint. */
--#ifndef USE_FIXEDPOINT
--/* #undef USE_FIXEDPOINT */
--#endif
--
--/* Include support for OPI comments. */
--#ifndef OPI_SUPPORT
--#define OPI_SUPPORT 1
--#endif
--
--/* Enable word list support. */
--#ifndef TEXTOUT_WORD_LIST
--#define TEXTOUT_WORD_LIST 1
--#endif
--
--// Also, there's a couple of preprocessor symbols in the header files
--// that are used but never defined: DISABLE_OUTLINE, DEBUG_MEM and
--
--//------------------------------------------------------------------------
--// version
--//------------------------------------------------------------------------
--
--// copyright notice
--#define popplerCopyright "Copyright 2005-2009 The Poppler Developers - http://poppler.freedesktop.org"
--#define xpdfCopyright "Copyright 1996-2004 Glyph & Cog, LLC"
--
--//------------------------------------------------------------------------
--// popen
--//------------------------------------------------------------------------
--
--#if defined(_MSC_VER) || defined(__BORLANDC__)
--#define popen _popen
--#define pclose _pclose
--#endif
--
--#if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS)
--#define POPEN_READ_MODE "rb"
--#else
--#define POPEN_READ_MODE "r"
--#endif
--
--//------------------------------------------------------------------------
--// Win32 stuff
--//------------------------------------------------------------------------
--
--#if defined(_WIN32) && !defined(_MSC_VER)
--#include <windef.h>
--#else
--#define CDECL
--#endif
--
--//------------------------------------------------------------------------
--// Compiler
--//------------------------------------------------------------------------
--
--#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--#define GCC_PRINTF_FORMAT(fmt_index, va_index) \
--	__attribute__((__format__(__printf__, fmt_index, va_index)))
--#else
--#define GCC_PRINTF_FORMAT(fmt_index, va_index)
--#endif
--
--
--#endif /* POPPLER_CONFIG_H */