Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde-sunset

5 files changed, 41 insertions, 121 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index bad27a6b..d07f471a 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,39 @@
 # 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.258 2010/09/23 11:20:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.267 2010/10/25 23:13:11 halcy0n Exp $
+
+  25 Oct 2010; Mark Loeser <halcy0n@gentoo.org> poppler-0.14.4.ebuild:
+  Stable on ppc64; bug #338878
+
+  18 Oct 2010; Tobias Klausmann <klausman@gentoo.org> poppler-0.14.4.ebuild:
+  Stable on alpha, bug #338878
+
+  17 Oct 2010; Raúl Porcel <armin76@gentoo.org> poppler-0.14.4.ebuild:
+  ia64/s390/sh/sparc stable wrt #338878
+
+  16 Oct 2010; Jeroen Roovers <jer@gentoo.org> poppler-0.14.4.ebuild:
+  Stable for HPPA (bug #338878).
+
+  16 Oct 2010; Markus Meier <maekke@gentoo.org> poppler-0.14.4.ebuild:
+  arm stable, bug #338878
+
+  15 Oct 2010; Brent Baude <ranger@gentoo.org> poppler-0.14.4.ebuild:
+  Marking poppler-0.14.4 ppc for bug 338878
+
+  14 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  poppler-0.14.4.ebuild:
+  x86 stable wrt security bug #338878
+
+  14 Oct 2010; Markos Chandras <hwoarang@gentoo.org> poppler-0.14.4.ebuild:
+  Stable on amd64 wrt bug #338878
+
+*poppler-0.14.4 (06 Oct 2010)
+
+  06 Oct 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -poppler-0.12.4-r3.ebuild, poppler-0.14.1.ebuild, -poppler-0.14.3.ebuild,
+  +poppler-0.14.4.ebuild:
+  Version bump 0.14.4, remove old. Remove obsolete blocks on poppler-qt3
+  everywhere.
 
   23 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> poppler-0.14.3.ebuild:
   Remove dev-libs/poppler-qt3 from blockers wrt #338346 by Michał Górny.
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index b85f82ab..a964aaf8 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,11 +8,9 @@ AUX poppler-0.12.4-config.patch 3028 RMD160 5e0d0e51621eeb272d019990c526cbcef21c
 AUX poppler-0.12.4-nanosleep-rt.patch 1308 RMD160 473ccf2a4fc83762f8b17ab20da89af1a9a80566 SHA1 b1103fc1d310bdbbb3cfd1b9bc29d1bfdef9076b SHA256 57d366e46cad51ead796abf2beae33103187c811c1ae9af4a2750aa29c999ae7
 AUX poppler-0.12.4-strings_h.patch 927 RMD160 f1bbe64a295a78ba3596b1ad834cd14859c647a0 SHA1 f203cdcbc50f6e491a8db6c3f0591b3409d0393b SHA256 11a28f1aa00b2de51b49918be1b20e09e33de76b20515a1a8a9e13210bcee639
 AUX poppler-0.12.4-xopen_source.patch 1878 RMD160 13541fb85dec76297d1d35c9591c1f7b6b720a62 SHA1 b98a3a25f867000aa937e1b9e1e39cec7a7b829d SHA256 2c6877e6bf886d7fbda08cdf2f7a0716c876bb6f5406b8919986306b5e589758
-DIST poppler-0.12.4.tar.gz 1674400 RMD160 9c212ebb8fc3d4cbc532f1c826428cc4d195cb5b SHA1 306507e0fbf47736b456218618f043a216c263ef SHA256 2afa2a54bd4ccb09e92f82b64bcafa95d39a404a3b3db9d6a5fcad0e0229857a
 DIST poppler-0.14.1.tar.gz 1782771 RMD160 7b8d084b05ccc374e9add9771b781a88948907a7 SHA1 28229f897451feba5682d74defe7d67361eeee11 SHA256 efe59b33585791ef6714fa33a6d62b8746d6352c4f57a093f03364b0979bfa3e
-DIST poppler-0.14.3.tar.gz 1791880 RMD160 7e8bd03986fe6206934b4eb13ac8f58d201a350b SHA1 b5e0db722625d92a025e62c3e2fe7a4fc6318b32 SHA256 ca807bab3e88eebc25b56f02d7d04a482ba9d220fbaf172d3e48845939fae8c3
-EBUILD poppler-0.12.4-r3.ebuild 3651 RMD160 fe637947927cefd77b8f8965b513b92502372c9c SHA1 da235b4bfcf1302994a962f419175e80399a508f SHA256 a7ca394d2477d06e845f68972505dcc299ecb195457b8e5adfe97b59b55ec0b2
-EBUILD poppler-0.14.1.ebuild 2776 RMD160 59604e97ca47c6c59456113e4d275cef1b140b34 SHA1 f3340e66eabb97720a31bd9bc0de82659cf684df SHA256 e8ea7d4e01bd28e3678774b79a5992aaed3a8b3198bb6e30d24090490c19ae92
-EBUILD poppler-0.14.3.ebuild 2695 RMD160 02eb28617ff13f6f400a7afa228cd642dd152a08 SHA1 84256e414ebb256cac40fb60cf8d298292074357 SHA256 6dd72d1043da49f30e43a3f893a58ec1746efcaa752704210e663b9490f187c6
-MISC ChangeLog 36771 RMD160 c71ca77ed4b6ed80af21afac17f2aa2c5bbdf9cb SHA1 a1e50c981e5165993dfd008580e6d8d1c84cb703 SHA256 7592cf0e6d48a0126b390bbd66bd6bfee8899af2df98bb354f6f9f01b34c0779
+DIST poppler-0.14.4.tar.gz 1794096 RMD160 505ac4c3759a7d4b14c1d077f9249f317dc2d2af SHA1 c51931d7229126c16da54b72bfe63a190c2b5160 SHA256 97c394144802e733eaec2682e06bddc4939c71ede58df045127aa94bd244c713
+EBUILD poppler-0.14.1.ebuild 2754 RMD160 28d021d0df9291429df1d62577b24232f4d204cf SHA1 1d5ea7717219ed47093203b6bb56c0f5e3b2dd15 SHA256 60b1853b6fd69a5526fe612f5c4d7812e955b82165d6d279a1bccc4d6309ac13
+EBUILD poppler-0.14.4.ebuild 2682 RMD160 3b6da6a3df389c5d0e2ad29791ede1b7ae9ef153 SHA1 89834c86040da0b89537eb56c81e76ab4cac825c SHA256 ea99f07a737f41cf2ab941c298d9d2cd67ab99d7b7e12a520d2076fd72d5bdc0
+MISC ChangeLog 37916 RMD160 85b8176ca6242171eb022ffc5963408e73626d36 SHA1 de91ed09b83f64445ed814b20dac33cf91fbb5dd SHA256 168607ecf6d36160919b89db7ca12fcf8d5a0a71dab001fbbe495c81f2b40417
 MISC metadata.xml 564 RMD160 078af3bfc173aeaf994a9886723d7ca9a73f9b3f SHA1 2288b78748160193bc62d30bb458a26afd031f04 SHA256 3be05c7573d0473701d0589caac0ed0c7bf4f738bf33d6e9bda47166d6ad7ace
diff --git a/app-text/poppler/poppler-0.12.4-r3.ebuild b/app-text/poppler/poppler-0.12.4-r3.ebuild
deleted file mode 100644
index 56a0d501..00000000
--- a/app-text/poppler/poppler-0.12.4-r3.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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-r3.ebuild,v 1.14 2010/07/26 02:06:25 jer 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="+abiword cairo cjk debug doc exceptions jpeg jpeg2k +lcms png qt3 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-1* )
-	png? ( media-libs/libpng )
-	qt3? ( >=x11-libs/qt-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_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.3-preserve-cflags.patch  #309297
-	epatch "${FILESDIR}"/${PN}-0.12.4-nanosleep-rt.patch
-	epatch "${FILESDIR}"/${PN}-0.12.4-strings_h.patch #314925
-	epatch "${FILESDIR}"/${PN}-0.12.4-xopen_source.patch #314925
-	# The whole _XOPEN_SOURCE thing breaks OSX Tiger and Solaris, this
-	# is introduced by #309297, and made worse by #314925.  Since
-	# vanilla sources don't have this enabled, the whole _XOPEN_SOURCE
-	# isn't set by default, and hence correct from upstream's point of
-	# view.  FreeBSD folks should file a proper bug for #314925 if they
-	# really need it to compile vanilla sources.
-	[[ ${CHOST} == *-darwin8 || ${CHOST} == *-solaris* ]] && \
-		sed -i -e '/add_definitions/d' cmake/modules/PopplerMacros.cmake
-}
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		$(cmake-utils_use_with qt3)
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		$(cmake-utils_use_enable abiword)
-		$(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 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`.'
-}
diff --git a/app-text/poppler/poppler-0.14.1.ebuild b/app-text/poppler/poppler-0.14.1.ebuild
index fcbaf822..4fb4f350 100644
--- a/app-text/poppler/poppler-0.14.1.ebuild
+++ b/app-text/poppler/poppler-0.14.1.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.1.ebuild,v 1.8 2010/09/18 14:26:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.1.ebuild,v 1.9 2010/10/06 21:39:32 reavertm Exp $
 
 EAPI="2"
 
@@ -45,7 +45,6 @@ DEPEND="${COMMON_DEPEND}
 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 )
diff --git a/app-text/poppler/poppler-0.14.3.ebuild b/app-text/poppler/poppler-0.14.4.ebuild
index 3d73c0e1..ca62c3da 100644
--- a/app-text/poppler/poppler-0.14.3.ebuild
+++ b/app-text/poppler/poppler-0.14.4.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.3.ebuild,v 1.2 2010/09/23 11:20:25 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.14.4.ebuild,v 1.9 2010/10/25 23:13:11 halcy0n Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@ 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"
+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 qt3 qt4 +utils +xpdf-headers"