[gentoo-commits] proj/kde-sunset:master commit in: Documentation/package.unmask/, app-text/poppler/

[Martin von Gagern]

commit:     7714cfe49fcf06b278616a2b0c86eff09573b700
Author:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
AuthorDate: Thu Jun 30 20:59:39 2011 +0000
Commit:     Martin von Gagern <Martin.vGagern <AT> gmx <DOT> net>
CommitDate: Thu Jun 30 20:59:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde-sunset.git;a=commit;h=7714cfe4

[app-text/poppler] Update from main portage tree

---
 Documentation/package.unmask/kde-3.5               |    3 +-
 app-text/poppler/ChangeLog                         |    8 ++-
 app-text/poppler/poppler-0.16.6.ebuild             |   98 --------------------
 ...poppler-0.16.5.ebuild => poppler-0.16.7.ebuild} |    2 +-
 4 files changed, 9 insertions(+), 102 deletions(-)

diff --git a/Documentation/package.unmask/kde-3.5 b/Documentation/package.unmask/kde-3.5
index 21bc02b..6c60753 100644
--- a/Documentation/package.unmask/kde-3.5
+++ b/Documentation/package.unmask/kde-3.5
@@ -66,8 +66,7 @@
 =app-text/kchmviewer-3.1_p2-r1
 =app-text/kding-0.4.3
 =app-text/poppler-0.14.5-r1
-=app-text/poppler-0.16.5
-=app-text/poppler-0.16.6
+=app-text/poppler-0.16.7
 =dev-db/hk_classes-0.8.3
 =dev-db/hk_classes-0.8.3-r1
 =dev-db/knoda-0.8.3

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 4e7e3df..7acab11 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.293 2011/05/31 02:09:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.294 2011/06/28 20:59:16 reavertm Exp $
+
+*poppler-0.16.7 (28 Jun 2011)
+
+  28 Jun 2011; Maciej Mrozowski <reavertm@g.o> -poppler-0.16.5.ebuild,
+  -poppler-0.16.6.ebuild, +poppler-0.16.7.ebuild:
+  Version bump, remove old
 
 *poppler-0.16.6 (31 May 2011)
 

diff --git a/app-text/poppler/poppler-0.16.6.ebuild b/app-text/poppler/poppler-0.16.6.ebuild
deleted file mode 100644
index e218d01..0000000
--- a/app-text/poppler/poppler-0.16.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.6.ebuild,v 1.1 2011/05/31 02:09:05 reavertm Exp $
-
-EAPI="2"
-
-inherit cmake-utils qt3
-
-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"
-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="cairo cjk curl cxx debug doc exceptions +introspection jpeg
-jpeg2k +lcms png qt3 qt4 +utils +xpdf-headers"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		>=x11-libs/gtk+-2.20.1:2[introspection?]
-		introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	lcms? ( =media-libs/lcms-1* )
-	png? ( >=media-libs/libpng-1.4 )
-	qt3? ( >=x11-libs/qt-meta-3.3:3 )
-	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_configure() {
-	mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		$(cmake-utils_use_with qt3)
-		-DENABLE_ABIWORD=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)
-		$(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 introspection GObjectIntrospection)
-		$(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 "linking to it. If you're not a portage-2.2_rc user, you're advised"
-	ewarn "to run revdep-rebuild"
-}

diff --git a/app-text/poppler/poppler-0.16.5.ebuild b/app-text/poppler/poppler-0.16.7.ebuild
similarity index 98%
rename from app-text/poppler/poppler-0.16.5.ebuild
rename to app-text/poppler/poppler-0.16.7.ebuild
index 681f968..713b16f 100644
--- a/app-text/poppler/poppler-0.16.5.ebuild
+++ b/app-text/poppler/poppler-0.16.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.5.ebuild,v 1.1 2011/05/01 00:21:42 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.7.ebuild,v 1.1 2011/06/28 20:59:16 reavertm Exp $
 
 EAPI="2"