Remove old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 94BFDF4484AD142F)

6 files changed, 7 insertions, 297 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index f520715befa3..6d8e3fbeff4a 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.410 2013/12/17 15:02:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.411 2013/12/17 15:09:43 dilfridge Exp $
+
+  17 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/poppler-0.22.2-findgio.patch, -files/poppler-0.22.2-interp.patch,
+  -files/poppler-0.22.2-nojpeg.patch, -poppler-0.22.2-r2.ebuild,
+  -poppler-0.22.5.ebuild:
+  Remove old
 
   17 Dec 2013; Agostino Sarubbo <ago@gentoo.org> poppler-0.24.3.ebuild:
   Stable for sparc, wrt bug #489720
diff --git a/app-text/poppler/files/poppler-0.22.2-findgio.patch b/app-text/poppler/files/poppler-0.22.2-findgio.patch
deleted file mode 100644
index 4813d87752c7..000000000000
--- a/app-text/poppler/files/poppler-0.22.2-findgio.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 47e869e60fb147caca825380eeaa2a0851d502b9 Mon Sep 17 00:00:00 2001
-From: Michael Weiser <michael@weiser.dinsnail.net>
-Date: Mon, 18 Mar 2013 18:15:14 +0100
-Subject: [PATCH] cmake: search also for gio-2.0 as GLIB library
-
----
- cmake/modules/FindGLIB.cmake | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/cmake/modules/FindGLIB.cmake b/cmake/modules/FindGLIB.cmake
-index 15fb0c7..35a9f9e 100644
---- a/cmake/modules/FindGLIB.cmake
-+++ b/cmake/modules/FindGLIB.cmake
-@@ -6,6 +6,7 @@
- #  GLIB2_LIBRARIES - Link these to use GLib
- #
- # Copyright 2008-2010 Pino Toscano, <pino@kde.org>
-+# Copyright 2013 Michael Weiser, <michael@weiser.dinsnail.net>
- #
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-@@ -15,7 +16,7 @@ include(FindPackageHandleStandardArgs)
- if (NOT WIN32)
-   find_package(PkgConfig REQUIRED)
- 
--  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}")
-+  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}")
- 
-   find_package_handle_standard_args(GLib DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS)
- 
--- 
-1.8.1.5
-
diff --git a/app-text/poppler/files/poppler-0.22.2-interp.patch b/app-text/poppler/files/poppler-0.22.2-interp.patch
deleted file mode 100644
index 0bee885ed06d..000000000000
--- a/app-text/poppler/files/poppler-0.22.2-interp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 66e13949ce245e4e444028be627250dacd698b8f Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Sun, 17 Mar 2013 19:39:14 +1030
-Subject: [PATCH] cairo: Don't change image interpolation when printing
-
-Bug 62418
----
- poppler/CairoOutputDev.cc |    4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
-index dfa3e0e..127aa24 100644
---- a/poppler/CairoOutputDev.cc
-+++ b/poppler/CairoOutputDev.cc
-@@ -1790,6 +1790,10 @@ CairoOutputDev::getFilterForSurface(cairo_surface_t *image,
-   if (orig_width == 0 || orig_height == 0)
- 	  return CAIRO_FILTER_NEAREST;
- 
-+  /* When printing, don't change the interpolation. */
-+  if (printing)
-+    return CAIRO_FILTER_NEAREST;
-+
-   int scaled_width, scaled_height;
-   getScaledSize (orig_width, orig_height, &scaled_width, &scaled_height);
- 
--- 
-1.7.10.4
-
diff --git a/app-text/poppler/files/poppler-0.22.2-nojpeg.patch b/app-text/poppler/files/poppler-0.22.2-nojpeg.patch
deleted file mode 100644
index 2010d4fb8d6f..000000000000
--- a/app-text/poppler/files/poppler-0.22.2-nojpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5a51812b7c1457feb8acaa106f43d7d5252b3980 Mon Sep 17 00:00:00 2001
-From: Peter Breitenlohner <peb@mppmu.mpg.de>
-Date: Tue, 12 Mar 2013 20:25:50 +0100
-Subject: [PATCH] Fix compile when not using libjpeg
-
----
- poppler/Stream.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/poppler/Stream.h b/poppler/Stream.h
-index 7a5ff1c..76d6a1f 100644
---- a/poppler/Stream.h
-+++ b/poppler/Stream.h
-@@ -22,6 +22,7 @@
- // Copyright (C) 2011, 2012 William Bader <williambader@hotmail.com>
- // Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
- // Copyright (C) 2012 Fabio D'Urso <fabiodurso@hotmail.it>
-+// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
- //
- // To see a description of the changes please see the Changelog file that
- // came with your tarball or type make ChangeLog if you are building from git
-@@ -850,7 +851,7 @@ struct DCTHuffTable {
- class DCTStream: public FilterStream {
- public:
- 
--  DCTStream(Stream *strA, int colorXformA);
-+  DCTStream(Stream *strA, int colorXformA, Object *dict);
-   virtual ~DCTStream();
-   virtual StreamKind getKind() { return strDCT; }
-   virtual void reset();
--- 
-1.8.1.5
-
diff --git a/app-text/poppler/poppler-0.22.2-r2.ebuild b/app-text/poppler/poppler-0.22.2-r2.ebuild
deleted file mode 100644
index 6751a6c3f7b5..000000000000
--- a/app-text/poppler/poppler-0.22.2-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.2-r2.ebuild,v 1.15 2013/08/27 16:01:38 kensington Exp $
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-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/35"
-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:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	png? ( >=media-libs/libpng-1.4:0 )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui: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 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-PATCHES=(
-	"${FILESDIR}/${P}-nojpeg.patch"
-	"${FILESDIR}/${P}-interp.patch"
-	"${FILESDIR}/${P}-findgio.patch"
-)
-
-src_configure() {
-	# this is needed for multilib, see bug 459394
-	local ft_libdir ft_includedir
-	ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
-	ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
-	export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
-	einfo "Detected FreeType at ${FREETYPE_DIR}"
-
-	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/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.22.5.ebuild b/app-text/poppler/poppler-0.22.5.ebuild
deleted file mode 100644
index 850ae9d6c85f..000000000000
--- a/app-text/poppler/poppler-0.22.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.22.5.ebuild,v 1.10 2013/09/26 17:30:24 ago Exp $
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs
-
-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/37"
-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:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	png? ( media-libs/libpng:0= )
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui: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 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF TODO)
-
-src_configure() {
-	# this is needed for multilib, see bug 459394
-	local ft_libdir ft_includedir
-	ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
-	ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
-	export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
-	einfo "Detected FreeType at ${FREETYPE_DIR}"
-
-	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/*
-	fi
-}