Version bump

(Portage version: 2.2_rc62/cvs/Linux x86_64)

3 files changed, 190 insertions, 1 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 003d468395c0..a79877cd8872 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # 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.222 2010/02/16 15:15:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.223 2010/02/18 01:41:25 yngwin Exp $
+
+*poppler-0.12.4 (18 Feb 2010)
+
+  18 Feb 2010; Ben de Groot <yngwin@gentoo.org> +poppler-0.12.4.ebuild,
+  +files/poppler-0.12.4-config.patch:
+  Version bump
 
   16 Feb 2010; Ben de Groot <yngwin@gentoo.org> +poppler-0.12.3-r5.ebuild,
   +files/poppler-0.12.3-cairo-downscale.patch:
diff --git a/app-text/poppler/files/poppler-0.12.4-config.patch b/app-text/poppler/files/poppler-0.12.4-config.patch
new file mode 100644
index 000000000000..0449e3f4ca44
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.12.4-config.patch
@@ -0,0 +1,95 @@
+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 */
diff --git a/app-text/poppler/poppler-0.12.4.ebuild b/app-text/poppler/poppler-0.12.4.ebuild
new file mode 100644
index 000000000000..7e95602f7d8a
--- /dev/null
+++ b/app-text/poppler/poppler-0.12.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.12.4.ebuild,v 1.1 2010/02/18 01:41:25 yngwin Exp $
+
+EAPI="2"
+
+inherit cmake-utils
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers"
+
+COMMON_DEPEND=">=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	abiword? ( dev-libs/libxml2:2 )
+	cairo? ( dev-libs/glib:2
+			 >=x11-libs/cairo-1.8.4
+			 >=x11-libs/gtk+-2.14.0:2 )
+	jpeg? ( >=media-libs/jpeg-7:0 )
+	jpeg2k? ( media-libs/openjpeg )
+	png? ( media-libs/libpng )
+	qt4? ( x11-libs/qt-core:4
+		   x11-libs/qt-gui:4 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/poppler
+	!dev-libs/poppler-glib
+	!dev-libs/poppler-qt3
+	!dev-libs/poppler-qt4
+	!app-text/poppler-utils
+	cjk? ( >=app-text/poppler-data-0.2.1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README README-XPDF TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.12.3-cmake-disable-tests.patch
+	epatch "${FILESDIR}"/${PN}-0.12.3-fix-headers-installation.patch
+	epatch "${FILESDIR}"/${PN}-0.12.3-gdk.patch
+	epatch "${FILESDIR}"/${PN}-0.12.3-darwin-gtk-link.patch
+	epatch "${FILESDIR}"/${P}-config.patch  #304407
+	epatch "${FILESDIR}"/${PN}-0.12.3-cairo-downscale.patch  #303817
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DWITH_Qt3=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		$(cmake-utils_use_enable abiword)
+		$(cmake-utils_use_enable lcms)
+		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with cairo GTK)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use exceptions USE_EXCEPTIONS)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use cairo && use doc; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
+	fi
+}
+
+pkg_postinst() {
+	ewarn 'After upgrading app-text/poppler you may need to reinstall packages'
+	ewarn 'depending on it. If you have gentoolkit installed, you can find those'
+	ewarn 'with `equery d poppler`.'
+}