Remove old

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

5 files changed, 6 insertions, 435 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 37d856d54497..f2a42f9e9ef2 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,11 @@
 # 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.381 2013/04/02 13:21:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.382 2013/04/11 17:16:48 dilfridge Exp $
+
+  11 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/poppler-0.20.1-lcms-automagic.patch, -poppler-0.20.5.ebuild,
+  -poppler-0.22.2.ebuild, -poppler-0.22.2-r1.ebuild:
+  Remove old
 
   02 Apr 2013; Agostino Sarubbo <ago@gentoo.org> poppler-0.22.2-r2.ebuild:
   Stable for s390, wrt bug #459866
diff --git a/app-text/poppler/files/poppler-0.20.1-lcms-automagic.patch b/app-text/poppler/files/poppler-0.20.1-lcms-automagic.patch
deleted file mode 100644
index 641a4ab68b17..000000000000
--- a/app-text/poppler/files/poppler-0.20.1-lcms-automagic.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 8f6d84fd882907ff433c8eacebbe1d5a559d4e3b Mon Sep 17 00:00:00 2001
-From: Maciej Mrozowski <reavertm@gmail.com>
-Date: Fri, 18 May 2012 01:47:55 +0200
-Subject: [PATCH] [Buildsystem] CMake: Provide ENABLE_CMS=[auto/lcms1/lcms2] option to distinguish between available liblcms implementations when both are present during configure phase. 'auto' (default) prefers lcms2. Autotools: add --enable-cms=[auto/lcms1/lcms2].
-
----
- CMakeLists.txt |   20 +++++++++++++-------
- configure.ac   |   31 +++++++++++++++----------------
- 2 files changed, 28 insertions(+), 23 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9f4830b..8b07470 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,7 +28,7 @@ option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
- option(ENABLE_UTILS "Compile poppler command line utils." ON)
- option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
- option(ENABLE_LIBOPENJPEG "Use libopenjpeg for JPX streams." ON)
--option(ENABLE_LCMS "Use liblcms for color management." ON)
-+set(ENABLE_CMS "auto" CACHE STRING "Use color management system. Possible values: auto, lcms1, lcms2. 'auto' prefers lcms2 over lcms1 if both are available. Unset to disable color management system.")
- option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF)
- option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
- option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF)
-@@ -136,16 +136,22 @@ if(ENABLE_LIBOPENJPEG)
-   set(ENABLE_LIBOPENJPEG ${LIBOPENJPEG_FOUND})
-   set(HAVE_OPENJPEG_H ON)
- endif(ENABLE_LIBOPENJPEG)
--if(ENABLE_LCMS)
-+if(ENABLE_CMS STREQUAL "auto")
-   find_package(LCMS2)
--  if(LCMS2_FOUND)
--    set(USE_CMS ${LCMS2_FOUND})
--  else(LCMS2_FOUND)
-+  set(USE_CMS ${LCMS2_FOUND})
-+  if(NOT LCMS2_FOUND)
-     find_package(LCMS)
-     set(USE_CMS ${LCMS_FOUND})
-     set(USE_LCMS1 ${LCMS_FOUND})
--  endif(LCMS2_FOUND)
--endif(ENABLE_LCMS)
-+  endif(NOT LCMS2_FOUND)
-+elseif(ENABLE_CMS STREQUAL "lcms1")
-+  find_package(LCMS)
-+  set(USE_CMS ${LCMS_FOUND})
-+  set(USE_LCMS1 ${LCMS_FOUND})
-+elseif(ENABLE_CMS STREQUAL "lcms2")
-+  find_package(LCMS2)
-+  set(USE_CMS ${LCMS2_FOUND})
-+endif()
- if(ENABLE_LIBCURL)
-   find_package(CURL)
-   include_directories(${CURL_INCLUDE_DIR})
-diff --git a/configure.ac b/configure.ac
-index f9919d9..a4b4f18 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -660,7 +660,7 @@ AC_ARG_ENABLE(utils,
- AM_CONDITIONAL(BUILD_UTILS, test x$enable_utils = xyes)
- 
- AC_ARG_ENABLE(compile-warnings,
--              AC_HELP_STRING([--enable-compile-warnings=@<:@no/yes/kde@:>@]
-+              AC_HELP_STRING([--enable-compile-warnings=@<:@no/yes/kde@:>@],
-                              [Turn on compiler warnings.]),,
-               [enable_compile_warnings="yes"])
- 
-@@ -669,31 +669,30 @@ dnl   Color Management
- dnl
- 
- AC_ARG_ENABLE(cms,
--	      AC_HELP_STRING([--disable-cms],
--	                     [Don't use color management system.]),
--              enable_cms=$enableval,
--              enable_cms="try")
--if test x$enable_cms = xyes; then
-+              AC_HELP_STRING([--enable-cms=@<:@auto/lcms1/lcms2/none@:>@],
-+                             [Use color management system. 'auto' prefers lcms2 over lcms1 if both are available [[default=auto]]]),
-+              [enable_cms=$enableval],
-+              [enable_cms="auto"])
-+if test x$enable_cms = xauto; then
-   PKG_CHECK_MODULES(LCMS, lcms2, [lcms2=yes], [lcms2=no])
-   if test x$lcms2 = xno; then
--      PKG_CHECK_MODULES(LCMS, lcms)
--  fi
--elif test x$enable_cms = xtry; then
--  PKG_CHECK_MODULES(LCMS, lcms2,[lcms2=yes],[lcms2=no])
--  if test x$lcms2 = xyes; then
--    enable_cms=yes
--  else
--      PKG_CHECK_MODULES(LCMS, lcms,[enable_cms=yes],[enable_cms=no])
-+      PKG_CHECK_MODULES(LCMS, lcms, [lcms1=yes], [lcms1=no])
-   fi
-+elif test x$enable_cms = xlcms1; then
-+  PKG_CHECK_MODULES(LCMS, lcms, [lcms1=yes], [lcms1=no])
-+elif test x$enable_cms = xlcms2; then
-+  PKG_CHECK_MODULES(LCMS, lcms2, [lcms2=yes], [lcms2=no])
- fi
- 
--if test "x$enable_cms" = "xyes"; then
-+if test x$lcms1 = xyes || test x$lcms2 = xyes; then
-+  enable_cms=yes
-   AC_DEFINE(USE_CMS, 1, [Defines if use cms])
--  if test "x$lcms2" != "xyes"; then
-+  if test x$lcms1 = xyes; then
-     lcms1=yes;
-     AC_DEFINE(USE_LCMS1, 1, [Defines if use lcms1])
-   fi
- fi
-+
- AM_CONDITIONAL(USE_CMS, test x$enable_cms = xyes)
- AM_CONDITIONAL(USE_LCMS1, test x$lcms1 = xyes)
- 
--- 
-1.7.3.4
-
diff --git a/app-text/poppler/poppler-0.20.5.ebuild b/app-text/poppler/poppler-0.20.5.ebuild
deleted file mode 100644
index a8f1db36d23a..000000000000
--- a/app-text/poppler/poppler-0.20.5.ebuild
+++ /dev/null
@@ -1,101 +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.20.5.ebuild,v 1.13 2013/03/02 19:44:22 hwoarang 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? (
-		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 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.20.1-lcms-automagic.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.22.2-r1.ebuild b/app-text/poppler/poppler-0.22.2-r1.ebuild
deleted file mode 100644
index d875774e407f..000000000000
--- a/app-text/poppler/poppler-0.22.2-r1.ebuild
+++ /dev/null
@@ -1,110 +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-r1.ebuild,v 1.6 2013/03/21 16:00:22 jer 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 )
-	jpeg2k? ( media-libs/openjpeg )
-	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"
-)
-
-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
-}
-
-pkg_postinst() {
-	ewarn "After upgrading app-text/poppler you may need to reinstall packages"
-	ewarn "linking to it. For EAPI=5 subslot-capable packages this may be done"
-	ewarn "automatically. Anyway, 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.22.2.ebuild b/app-text/poppler/poppler-0.22.2.ebuild
deleted file mode 100644
index b594b681ecea..000000000000
--- a/app-text/poppler/poppler-0.22.2.ebuild
+++ /dev/null
@@ -1,109 +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.ebuild,v 1.5 2013/03/16 17:13:11 dilfridge 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 )
-	jpeg2k? ( media-libs/openjpeg )
-	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"
-)
-
-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
-}
-
-pkg_postinst() {
-	ewarn "After upgrading app-text/poppler you may need to reinstall packages"
-	ewarn "linking to it. For EAPI=5 subslot-capable packages this may be done"
-	ewarn "automatically. Anyway, if you're not a portage-2.2_rc user, you're advised"
-	ewarn "to run revdep-rebuild."
-}