Revision bump wrt #309739 to get poppler linked against lcms.

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

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 1d82f4674d277d1e9129587b58c5c39c2c713673..9565dfb7b7c93414e3dff8e16f7ddf7739fb6330 100644 (file)
--- 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.226 2010/03/11 22:07:20 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.227 2010/03/16 12:18:00 ssuominen Exp $
+
+*poppler-0.12.4-r1 (16 Mar 2010)
+
+  16 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +poppler-0.12.4-r1.ebuild:
+  Revision bump wrt #309739 to get poppler linked against lcms.
 
   11 Mar 2010; Ben de Groot <yngwin@gentoo.org> poppler-0.12.3-r3.ebuild,
   poppler-0.12.3-r5.ebuild, poppler-0.12.4.ebuild:

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index cc15e45f2fd532efba732e3089d50b84154b9196..29c1d90e85ffe6b809be75b9833679b95f970fd7 100644 (file)
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -10,6 +10,7 @@ DIST poppler-0.12.3.tar.gz 1616883 RMD160 a8fd07ec4dc918cc17390a5236aff9a43e1f72
 DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b SHA1 306507e0fbf47736b456218618f043a216c263ef SHA256 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a
 EBUILD poppler-0.12.3-r3.ebuild 2747 RMD160 3b9629709338dc993c64423268f90af4d530421a SHA1 272b0a771c3a713d1ec925d3d715f17445e1ec53 SHA256 e4e21785e8ddb4b693ad12a0a59a1aad1fa1d4f61267b5b884cb7dca8f873ab1
 EBUILD poppler-0.12.3-r5.ebuild 2815 RMD160 0dc2b96b76c0c8d7b185fa59ada614254649a552 SHA1 e4ee76a084f328419f97db733d0f58cf5b99c9e8 SHA256 045fdbbe3bbf799203a33a4ae9aefad5c5732a3adaae4e6394462514476b7578
+EBUILD poppler-0.12.4-r1.ebuild 2912 RMD160 181537af81cebee7634688da9c3a55ba5ac15760 SHA1 edbfddd79ef95f2db0b704db74c6c1ef146ac94d SHA256 a0f1e31f074dbf426c180926c8a20fd4d046af1f9f885aa28811d43b5234ea75
 EBUILD poppler-0.12.4.ebuild 2906 RMD160 f9cac45cdce3a8aa65c7134bdcb6f12ec0555bc7 SHA1 529f124b595837d8204a5ec4afa5c8acfae328ea SHA256 40ce999a0bade7662d0829a54a141a4471eeb8f06f2dfca76f3ffdf1384808cc
-MISC ChangeLog 32243 RMD160 570e8c519a99dc67e908e20ad16a406a19cf3919 SHA1 905f485845adfe645fdcf162da938398c68e2cc7 SHA256 06560a434e43d14e61ac1a4c94c4d42b1f22e05918a2377a58c37060fa966183
+MISC ChangeLog 32428 RMD160 0460c66f9dcf1a07766bd42a97a3efd3a37e117a SHA1 b2e75c292c163d09238f77c95bedc21e7c854f61 SHA256 309b641288e5d072648ae5002e230efec018ec108a47839f7ff5318e93df33f2
 MISC metadata.xml 565 RMD160 6a9e714721911707b23fb27535d64ab92c90a5f8 SHA1 ca7711ec7b7d2953310ae3b00ff2f447371c103f SHA256 ec946c05ddfa21325d7cb705cee3342f4a95a1d08b02f324e4bac36bfc479e0b

diff --git a/app-text/poppler/poppler-0.12.4-r1.ebuild b/app-text/poppler/poppler-0.12.4-r1.ebuild
new file mode 100644 (file)
index 0000000..1348a6d
--- /dev/null
+++ b/app-text/poppler/poppler-0.12.4-r1.ebuild
@@ -0,0 +1,90 @@
+# 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-r1.ebuild,v 1.1 2010/03/16 12:18:00 ssuominen 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 )
+       lcms? ( media-libs/lcms )
+       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
+       epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
+}
+
+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`.'
+}