diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-21 15:32:14 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-21 15:32:14 +0000 |
| commit | 4c0a82c395fe3d1f4371983aeb0a3295e0cfac32 (patch) | |
| tree | 4a86cca09fc8fd0112ff0798fb74a9d58d7fb7a3 /app-text/poppler | |
| parent | QA added missing die (diff) | |
| download | gentoo-2-4c0a82c395fe3d1f4371983aeb0a3295e0cfac32.tar.gz gentoo-2-4c0a82c395fe3d1f4371983aeb0a3295e0cfac32.tar.bz2 gentoo-2-4c0a82c395fe3d1f4371983aeb0a3295e0cfac32.zip | |
Fix preserve_old_lib wrt #323519. Remove USE="doc" (only for this release) wrt #323409.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-text/poppler')
| -rw-r--r-- | app-text/poppler/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/poppler/poppler-0.14.0-r1.ebuild | 23 |
2 files changed, 15 insertions, 13 deletions
diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog index 4f3db9d5c365..32f1d5db8c10 100644 --- a/app-text/poppler/ChangeLog +++ b/app-text/poppler/ChangeLog @@ -1,10 +1,11 @@ # 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.241 2010/06/21 09:57:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.242 2010/06/21 15:32:14 ssuominen Exp $ 21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> poppler-0.14.0-r1.ebuild: - Restrict media-libs/lcms depend to old version. + Fix preserve_old_lib wrt #323519. Remove USE="doc" (only for this release) + wrt #323409. Restrict media-libs/lcms depend to old version. 20 Jun 2010; Raúl Porcel <armin76@gentoo.org> poppler-0.12.4-r3.ebuild: alpha/arm/ia64/s390/sh/sparc stable wrt #323271 diff --git a/app-text/poppler/poppler-0.14.0-r1.ebuild b/app-text/poppler/poppler-0.14.0-r1.ebuild index deb67a4755b8..c89a2de374fd 100644 --- a/app-text/poppler/poppler-0.14.0-r1.ebuild +++ b/app-text/poppler/poppler-0.14.0-r1.ebuild @@ -1,6 +1,6 @@ # 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.14.0-r1.ebuild,v 1.3 2010/06/21 09:57:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.0-r1.ebuild,v 1.4 2010/06/21 15:32:14 ssuominen Exp $ EAPI="2" @@ -13,7 +13,8 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2" LICENSE="GPL-2" 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" SLOT="0" -IUSE="+abiword cairo cjk curl cxx debug doc exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers" +IUSE="+abiword cairo cjk curl cxx debug exceptions jpeg jpeg2k +lcms png qt4 +utils +xpdf-headers" +# doc, see src_install # No test data provided RESTRICT="test" @@ -81,19 +82,19 @@ 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 +# Restore with 0.14.1 per http://bugs.gentoo.org/323409 +# if use cairo && use doc; then +# insinto /usr/share/doc/${PF}/html +# doins -r "${S}"/glib/reference/html/* || die +# fi } pkg_preinst() { - preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.5 - preserve_old_lib /usr/$(get_libdir)/libpoppler.so.6 + preserve_old_lib /usr/$(get_libdir)/libpoppler-glib.so.4 + preserve_old_lib /usr/$(get_libdir)/libpoppler.so.5 } pkg_postinst() { - preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.5 - preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.6 + preserve_old_lib_notify /usr/$(get_libdir)/libpoppler-glib.so.4 + preserve_old_lib_notify /usr/$(get_libdir)/libpoppler.so.5 } |