Remove old

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

6 files changed, 23 insertions, 455 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/Manifest b/app-text/poppler/Manifest
index 6d4e0ab2569b..0aed9d042286 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,32 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX poppler-0.20.1-lcms-automagic.patch 4393 SHA256 2a75cd5955fe976d1b052839297561853e6c597256610cf1ebcf6aba28e1b81c SHA512 5c3af759aeaf1a3be534bc2f90dde3674e4967c7257cc2499505cef014d1c7570eaa53cc1ee9e4b079302085130dbb8215c1795cbd701a0c057273310a32bee5 WHIRLPOOL 2657072b71f916f94f8a1e1c2dd4348334aaa8df2369d5e6aa47d5c27493d32cdf6124d643c91681e65ac5d6d3ac0df01524b683e19bed6c96bc5d7097f13471
 AUX poppler-0.22.2-findgio.patch 1234 SHA256 acae65355d372e20c19125aca61baa4dbe85e3ea807a5d641f1933f84c20959e SHA512 43172a59171712e6e0d8202c3c9f2dcefd94be34f1596a38aeca103d1df5eaf0e5bcfc30b37061fe9642e1ad0f22481fa9da2e9a296a9047a31f6d7ef01893dd WHIRLPOOL 4b17fbe84a3cdde1f7c89ccf3312b5a7b40022fe27f8c6561b589935f55653e4969045721a044797cb07bedce06621bafef9db0357db2a03372de3aa994b66a7
 AUX poppler-0.22.2-interp.patch 871 SHA256 4eeb1d831049df1d2a1971d4beb7d7e1a4bf3a4dee61d5f7202dfb9c5e1fcfc9 SHA512 a25cd13f2369a90cc3284d4536c2f56badfd6e3fe31d4f54c5b94031b5096a9c2b7d0e50b096a82ba3df298cdb0b84eacb22353ad1f7f35e5d5eb6d5279e0ff8 WHIRLPOOL 3e4c1f2ca63964fadc2e0f43b2dbb6accad291c4ec15cd9c1e6ad1d7e581f2da719e4e6a0d4becb39d9a3f67ce849230a2d365d492361ea527a4a3fd3594d469
 AUX poppler-0.22.2-nojpeg.patch 1159 SHA256 be8eb19d4cda463e9aee48f3c8721e7e18fa5858b5223f83109f3d0ccc4239db SHA512 b41b878d4500b470f530e332cbce3ed9a517ce3fbcb79ca34e8b3f8fd70343012c542d8c4d03ed0a6892c67bb5075b8cfac420461e75dfd94e0a9c67b4d41c8d WHIRLPOOL e3e6e5c9d1fd91c42565147ee23aa6a3947d7157790daf38d1fe601e1378c5272620595a1e6ab80487ac2388116541e5b81a6cd5a1664aa727a19d2012acde33
-DIST poppler-0.20.5.tar.gz 2158387 SHA256 c6d7048a5f011dbde1f579d21bcfdd652b472d9d1c607dde9aa89eff960454b6 SHA512 2c9245d8a43c1daedcedc7916540cb5e9def8429382e9b3f3992d4a1fad081c035a9fc07d63998e210257d3dfd0b3b754e31be8f75fd2d94a8e50c7efbd1bb01 WHIRLPOOL cab7068d0b1b678797b9d63aa71e42bb3b70fd6d3f956a43b093734f445ce577a75638ebc4c2a2786ac592c2860f1090db22743cf01da8dab65ceb9a16ebc136
 DIST poppler-0.22.2.tar.gz 2215737 SHA256 108736ef84069317f6c5beacb5268f3b799ecf401e353e239611772eae8a662d SHA512 ce962f12a87f873a46cf8d02c0620694893a6e1857ac680174c4d9388d2255b5011e62e28b34a6e0abec9c8779530bf91ac123206a619a6eba59be92adb02d42 WHIRLPOOL 80b744f1cf4687a936a1eb9ce40567602935535e8fc1faca010171e433ea4948284b8eba3fca866b6b27034319efa46d54d1e2f71ba14c8e5554ee3b137d935d
-EBUILD poppler-0.20.5.ebuild 2730 SHA256 3d109d7c45b66e0e403193bb4dd9c5275a519798d56ff8294527e916af38ab85 SHA512 ba9122db7b2d38f53d8a675ab0575137a7706189d43fabbf31dfc19471a8100204937cd2f7a6c2dfee728b37f0dc45dd96386797b2158d30e134397beaaa6958 WHIRLPOOL 81e4d3d445ec37cb733a0ff8c3ed04b87eee9c578195abe07263748aac3488c7c1f157d934744eac8dfddc1da4a194e2158cf12ad88acb7b81dffd5d740bd3c7
-EBUILD poppler-0.22.2-r1.ebuild 3124 SHA256 521ac1964a56d88ac036219771f5837f1bcaa3b9a801a4b3746d622c7d5bcda8 SHA512 08f8ad18ec361a408ab25c4f6703a15b8ecf8e33625dde23e01ec82d55f4400e15f6a25192737abb98a2d8f7f7cc6d43fc36857353bdeafec771bcd38d011c27 WHIRLPOOL 3426b4e5f79431a9b42931244b6a0185b7490300cedac94c86a289e246f5760696063a42ee2f4d0dc5fe32a3b92d2fd75258d55655f32ebf6a49171502fdd3b1
 EBUILD poppler-0.22.2-r2.ebuild 3153 SHA256 abd4fef5587e3725a96ef47486c22163f1c0f79ac688ae347c3a6eee610d29ba SHA512 35ba625f1f30218e82186568011f7879936d81de4ec95e3a48ca54e2571ac4623c0410ecec2a28fd2342cb212deceffe30568dfea8194440d8a72f61bfc2a3fa WHIRLPOOL 3742fc609570c09dcd7b0f9b87aa7c6d88015b588b7c20783cdc93851383e4ef66ccad21f3c87a914f35d071585bdce125fb8b2ac17166dc6c9f251e435034fb
-EBUILD poppler-0.22.2.ebuild 3099 SHA256 50fe35462f67e55f408d2be291ec47cbaaaa3fad0cb1868e27a7ec6d07c6fbcd SHA512 66e324818f2a9365bdf93ed14a8a069f0a4b3cadd367af2c888b34fd42e432822cee87b1e7844a21b68e25b8acf6ca783c85c9179a92121d894f797c20df9c65 WHIRLPOOL 7fb3750dc0bc42e9802c543980a24a8848e7de262bc4f4e3750830f322bb1c6afa59a08eb9307f61c093f495f3d1a231da2c871d288db94359a42a536e44912c
-MISC ChangeLog 53477 SHA256 2168933ef30700293d383e6aafca01dbc102d89f1de126aaac02c39c11ce916f SHA512 1ac6d773aec6c5b8dc9786b2c95d5e9f359da9e7efe2326a9456d7a768d9b0f0fbdfb5d4ab58c0868b9b0c348cdd63681c48b29536d8a1c3264b7a6d6a456a38 WHIRLPOOL f006dd9ef6582b2c05522af816ec7d16d6016c994e2609d809b588a7e2e17293f5a4190bdac989f57dd06ee47fe5f680b02a44849d98bae2c179b1b421593b16
+MISC ChangeLog 53677 SHA256 8740329db8013d9d1d4ec3e0bc0a93daac1c68f21cb89c272a07eb38e7e62759 SHA512 b918178d71a2b9fa3dfbc2d92890095ef30c53535aeabf13be85ca05b2a9f2436648e17035b206a51409edf6bd3128d45739e9a1a2bd2dbf78ac0791d90b6792 WHIRLPOOL e258d53b8e7de6a148e47828d48bfc68b4b3cdd3e5591c945720dca36e6adde7da827aa005212d2bc0ef6526a8ee791bc93ddf99c5d910aa7b7a749fb1a245ce
 MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRWtqpAAoJELp701BxlEWfvwMQAInmHq4NnnvI/8dXPQVnAc+B
-xfobYpbBTpqj4LHC7ZpD3D8W8JZb8rzsUJFhYooYSmmB98/gG3Y8tzF15ibBUisa
-hHJhoCx/EqNK+r9rCJ+4B7et9FxYgttF8SbIlphZuTEFVw2rqz5FzhOU13B9q+1R
-vxAcBWdiUi2bzQWPmNhsWwKPeeqD36+fAs9x5BuaId8vcubjmMIUZTZduejV/4wf
-jzmlQRWDcyvpWbMjFhxkGKqRlMctZdHg3XKEcSFXFf1GBa7nYDyAcUpRMDBQ463c
-Ckf12EuajNM7Iim8pwT0sSwYGFZ1LWRxhhIbeMP9M8aJdJRzVkUHT2F9x7slhIQg
-XDwQgZ+hweCpF7rNYZ0I/XxvtiFaOHdHEr2JwVMOXznQkfr8F2aDbXQimx7zNA3n
-BnPpWBoXIgq3DWC9O4RJTK5PhPWADebeys3cvQgQc97Au9ULWXoj6yZfj7ENUPJ3
-zqZJHZMHXIHxElnwsPFYv4NqoPkydu91JL7YzHMFqgDCIHAJR8bIUnzlv2HAM/7r
-TkDV/VnHvo/iWRdJzsN+Gphazy7bgIANWdk1mMCNvymM7MGp7adhW/fgPg23gAG3
-0Lr+QIwqcNJMSUTi7jyzR5U2U0Z+Lz7cBt4Vkccp7wkuP02uO635m373r0zfzlRu
-Xs6m7f6vjIF16IWkgyEG
-=ovcJ
+iQJ8BAEBCABmBQJRZvBFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcZ1gQANC2hH0LcymiSuhfRCWsOQU7
+ePZ9zNnZvyFjmpc7USwOQbeVGNkXh1IL+jLsr5WWgVJUYPJ/vNNtolXWOqYZft/a
+aDRUdkBvnnKVyXNQZxT3WTi+MEKGkRoxiCSuvclQri3dAlvlTt6e/5vlMKiewvT1
+M7/lnVg7utVLpHRCYOoH+dqPSi7t91+lQZcYDhx3pgS4t+fL6mj2EpcJHlN7XpO/
+DBwtsUPFiH0nRsFjHofQQARzu/VEhDKz2MTacR75gKqVREdBYqI7r3+wtaHCDC/7
+S1rlKRJXK8BsROqSyijTDN+jxSJEcC0mN8M4O4aXhsxzEDnlAzP1GJPTPNiaNe00
+7Rl6Nw8xeVrqCb6cAlpcvvBXv400oh/TsvJr+9/y1rUAEBLd+VQ1RGylfMGf85OQ
+GycaVHR7XZQgrQY3pN2LZ7biznUAXeC5zQZFALj+g/Bbmse1c6BHrZAPbukq9Orr
+CNyplndEybclf8OXuxkTdNB7jmJN87fR0Z3ubdl2Sujz47MjFo23ntkKq3Y6QlDQ
+ZMEDu2Y2PswlnOpBnTrmIO/Of9ojTnV4flf0a9gMGAfGZOYLMLyaRd6HwhnPi92M
+J/xw3RmXSqHDeyPDb7eguQjlzriF2d9zj05PS0bBTtE0OWRPBpRz2Cu0YHBocM1l
+/BD4rdV3QhdZX0ImHxRL
+=qMNr
 -----END PGP SIGNATURE-----
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."
-}