Version bump, remove old.

(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)

4 files changed, 9 insertions, 150 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 52adef64e5ee..396d05eafba1 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,13 @@
 # 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.333 2012/09/17 14:24:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.334 2012/10/11 18:38:29 reavertm Exp $
+
+*poppler-0.20.5 (11 Oct 2012)
+
+  11 Oct 2012; Maciej Mrozowski <reavertm@gentoo.org> +poppler-0.20.5.ebuild,
+  -files/poppler-0.20.2-xyscale.patch, -poppler-0.20.2-r2.ebuild,
+  -poppler-0.20.3.ebuild:
+  Version bump, remove old.
 
 *poppler-0.20.4 (17 Sep 2012)
 
diff --git a/app-text/poppler/files/poppler-0.20.2-xyscale.patch b/app-text/poppler/files/poppler-0.20.2-xyscale.patch
deleted file mode 100644
index 6602dc909c2f..000000000000
--- a/app-text/poppler/files/poppler-0.20.2-xyscale.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 36481939e3064de920e49d9d1742a85473a50963 Mon Sep 17 00:00:00 2001
-From: Thomas Freitag <Thomas.Freitag@alfa.de>
-Date: Sun, 22 Jul 2012 16:40:46 +0000
-Subject: Make sure xScale and yScale are always initialized
-
-Bug #52215
----
-diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
-index a01a4b3..e15c2e9 100644
---- a/poppler/PSOutputDev.cc
-+++ b/poppler/PSOutputDev.cc
-@@ -3521,6 +3521,7 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
-     saveState(NULL);
-   }
- 
-+  xScale = yScale = 1;
-   switch (mode) {
- 
-   case psModePSOrigPageSizes:
-@@ -3631,8 +3632,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
-       } else {
- 	yScale = xScale;
-       }
--    } else {
--      xScale = yScale = 1;
-     }
-     // deal with odd bounding boxes or clipping
-     if (clipLLX0 < clipURX0 && clipLLY0 < clipURY0) {
-@@ -3694,7 +3693,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
-     if (tx != 0 || ty != 0) {
-       writePSFmt("{0:.6g} {1:.6g} translate\n", tx, ty);
-     }
--    xScale = yScale = 1;
-     break;
- 
-   case psModeForm:
-@@ -3702,7 +3700,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
-     writePS("begin xpdf begin\n");
-     writePS("pdfStartPage\n");
-     tx = ty = 0;
--    xScale = yScale = 1;
-     rotate = 0;
-     break;
-   }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/app-text/poppler/poppler-0.20.2-r2.ebuild b/app-text/poppler/poppler-0.20.2-r2.ebuild
deleted file mode 100644
index 87a5334e0ad8..000000000000
--- a/app-text/poppler/poppler-0.20.2-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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.2-r2.ebuild,v 1.1 2012/08/08 16:51:59 dilfridge Exp $
-
-EAPI=4
-
-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"
-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 +lcms png qt4 tiff +utils"
-
-# 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
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	lcms? ( media-libs/lcms:2 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	qt4? (
-		x11-libs/qt-core:4
-		x11-libs/qt-gui:4
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/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.4.4 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.20.1-lcms-automagic.patch"
-	"${FILESDIR}/${PN}-0.20.2-xyscale.patch"
-)
-
-DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT4_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_XPDF_HEADERS=ON
-		$(cmake-utils_use_enable curl LIBCURL)
-		$(cmake-utils_use_enable cxx CPP)
-		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
-		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_with cairo)
-		$(cmake-utils_use_with introspection GObjectIntrospection)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with qt4)
-		$(cmake-utils_use_with tiff)
-	)
-	if use lcms; then
-		mycmakeargs+=(-DENABLE_CMS=lcms2)
-	else
-		mycmakeargs+=(-DENABLE_CMS=)
-	fi
-
-	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.20.3.ebuild b/app-text/poppler/poppler-0.20.5.ebuild
index 32bc48cc116a..7d7bc57caf04 100644
--- a/app-text/poppler/poppler-0.20.3.ebuild
+++ b/app-text/poppler/poppler-0.20.5.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.3.ebuild,v 1.1 2012/08/12 23:28:56 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.20.5.ebuild,v 1.1 2012/10/11 18:38:29 reavertm Exp $
 
 EAPI=4