diff options
| -rw-r--r-- | app-text/poppler/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/poppler/metadata.xml | 1 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.20.0.ebuild | 21 |
3 files changed, 10 insertions, 18 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index 92cfb1a63059..c17749375880 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/poppler # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.319 2012/05/18 14:46:32 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.320 2012/05/21 21:12:14 reavertm Exp $ + + 21 May 2012; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml, + poppler-0.20.0.ebuild: + Remove lcms1 USE flag. 18 May 2012; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml: Give lcms1 USE flag less encouraging description. diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml index 3134584bbe98..f938028802cf 100644 --- a/app-text/poppler/metadata.xml +++ b/app-text/poppler/metadata.xml @@ -10,7 +10,6 @@ <use> <flag name='exceptions'>Enable exceptions throwing.</flag> <flag name='introspection'>Enable GObject introspection.</flag> - <flag name='lcms1'>Prefer liblcms1 (deprecated) implementation over liblcms2.</flag> <flag name='utils'>Install command-line PDF converters and various utilities.</flag> <flag name='xpdf-headers'></flag> </use> diff --git a/app-text/poppler/poppler-0.20.0.ebuild b/app-text/poppler/poppler-0.20.0.ebuild index eead20c4e8c4..4bdb885eb697 100644 --- a/app-text/poppler/poppler-0.20.0.ebuild +++ b/app-text/poppler/poppler-0.20.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.20.0.ebuild,v 1.1 2012/05/17 23:39:44 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.20.0.ebuild,v 1.2 2012/05/21 21:12:14 reavertm Exp $ EAPI="4" @@ -13,11 +13,7 @@ SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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" SLOT="0" -IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k lcms1 +lcms png qt4 tiff +utils +xpdf-headers" - -REQUIRED_USE=" - lcms1? ( lcms ) -" +IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers" # No test data provided RESTRICT="test" @@ -34,10 +30,7 @@ COMMON_DEPEND=" curl? ( net-misc/curl ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/openjpeg ) - lcms? ( - lcms1? ( =media-libs/lcms-1* ) - !lcms1? ( media-libs/lcms:2 ) - ) + lcms? ( media-libs/lcms:2 ) png? ( >=media-libs/libpng-1.4:0 ) qt4? ( x11-libs/qt-core:4 @@ -68,11 +61,13 @@ src_configure() { -DBUILD_GTK_TESTS=OFF -DBUILD_QT4_TESTS=OFF -DBUILD_CPP_TESTS=OFF + -DENABLE_LCMS=OFF -DENABLE_SPLASH=ON -DENABLE_ZLIB=ON $(cmake-utils_use_enable curl LIBCURL) $(cmake-utils_use_enable cxx CPP) $(cmake-utils_use_enable jpeg2k LIBOPENJPEG) + $(cmake-utils_use_enable lcms LCMS2) $(cmake-utils_use_enable utils) $(cmake-utils_use_enable xpdf-headers XPDF_HEADERS) $(cmake-utils_use_with cairo) @@ -82,12 +77,6 @@ src_configure() { $(cmake-utils_use_with qt4) $(cmake-utils_use_with tiff) ) - if use lcms; then - mycmakeargs+=( - $(cmake-utils_use_enable lcms1 LCMS) - $(cmake-utils_use_enable !lcms1 LCMS2) - ) - fi cmake-utils_src_configure } |