Revbump to stable, removing xpdf-headers useflag

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 26 insertions, 21 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 69a9f19dcdb3..7781053ad6cb 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # 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.330 2012/08/08 16:51:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.331 2012/08/08 17:21:46 dilfridge Exp $
+
+*poppler-0.18.4-r2 (08 Aug 2012)
+
+  08 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -poppler-0.18.4-r1.ebuild, +poppler-0.18.4-r2.ebuild:
+  Revbump to stable, removing xpdf-headers useflag
 
 *poppler-0.20.2-r2 (08 Aug 2012)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 9a823818d0a6..d9150dbfe8e5 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,24 +6,24 @@ AUX poppler-0.20.1-lcms-automagic.patch 4393 SHA256 2a75cd5955fe976d1b0528392975
 AUX poppler-0.20.2-xyscale.patch 1337 SHA256 c15c41d7467744ab5dcdd11982a02e26ddfeee427efd624466353acf61e151a6 SHA512 9509c40572634a42c63fe5b99ee45b65e4cacb9a3df48557a40aa24df102b4fbec3ae69a98113b3fb13d030532a8e9ea8596718ec156c839ff2ff58f3a947853 WHIRLPOOL be81620eb075c4f8448cd4d425a1a13f893947998b75211500cc594819e97e1c94412fd2fd3b8ff12d19a6e9323dfbe3ba3ee6e41da4b57c372f35d7ff6134b6
 DIST poppler-0.18.4.tar.gz 1992993 SHA256 33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e SHA512 dc7a8f059b6d0b1a73160a40226efc7b9d058806cc62c7b59e868453fef679dd92095629d26462f3697e96e6b16f95ce5425b7b96985f04b4d2db83e432e5216 WHIRLPOOL af4b8889aa0005dff5d4dae0414e2c1468e9a5bf58365425dae5cc96ae6afa8c2943cfc632a23781ac558df54e71f55d3195e8219f1410f026aebaf7cb62ba23
 DIST poppler-0.20.2.tar.gz 2146312 SHA256 2debc5034e0e85402957d84fb2674737658a3dbe8a3c631e1792e3f8c88ce369 SHA512 7a9a9e94298be025d8ee2dcba2be61c9d6bf167cee238a2599e211999ce0dcb59b5ef3418c5f3a6ddc8f1600e7ef2954c53f4a4149742a8a87879b1c58e77bed WHIRLPOOL 3c614eec3e054439a0733d00904fb27788c09ad41735397a5283ca74be0ec80b4f5ea77cf02a1a6706a2d0adf7cef2835eefe0e84f976aefcc8bbedd2e7e0430
-EBUILD poppler-0.18.4-r1.ebuild 2704 SHA256 57140d5c35dc153f10db2054a03d9260f28199eef4b6b967c51e8d2c5a1fd1a6 SHA512 96d0b1a1de6eb5664c16e8c409f6ed9af750a6c8b5e02248ba79bc591649cc5220fd3617c16bbe152e8050fbe441d157d9411cf32708de815aa7538cd6a1980a WHIRLPOOL 8db25773e0a98137c2d2a52d6702c226711552d5befe2d26f9a218d2dfd28f01f89b9a1e1cda917f55531f4df075127b44349cc966447349373cc76601c9727c
+EBUILD poppler-0.18.4-r2.ebuild 2664 SHA256 e7e5ad7a837e18641ff1e933a50410c86a13849d7af09f30e2ccbabb53de6461 SHA512 34777a82e166ecc29198f9618e1911f25a91adb2b842e042532484358f598f39561fdb741a256d6943703e953c58ac3bb16e6b0e193597a8c6d848b1ccddcdf8 WHIRLPOOL f89bd7c351d77a06dcc03f1c161c13eec5e69e77bbd226869834c3946ef469b2fd7d20235f80b9d137ff2bc1fb63989fbe8df94ecb7e8433886f3c14947c00c0
 EBUILD poppler-0.20.2-r2.ebuild 2792 SHA256 f5219bda26d504e4e8b0801742ed57f7081035585cebd42f4a08455969929816 SHA512 0249907613dcb9db9042b8410f0b2d15f459d9ac66ac15a71d780f86e348a8a5b0e2d534cd7cfce9b1ef53f3f410ec341d995fcd20fd969fb343a42c1da847e3 WHIRLPOOL e9c05e06964b32dd99f295e9ada6f4d5ef033743130b43baa260479c486343d3221d328210b65c15f14f2e25a232d098751d8892b9672da9537a4010fe23de24
-MISC ChangeLog 46902 SHA256 b75611e27ddc9bc45ebc47ead3df43ae856d8d9970fe954c3cdbe046c094d0f1 SHA512 64e2c5efb46a79d92b7729eb1313872e41e6fa976e323d72aae6a7243f6971d0c9658b064f99150c8ecec0d67a5cec32d25485c76deb39c20e840f1f4503e5d3 WHIRLPOOL eda754549a5d355f93f5901ddda3ca5e30e7a722bae148d75e722e28b27eb51866ec5bc87ba0b79e230335f107ee4699b4b2df07bf54e984b38caa535cd1e657
-MISC metadata.xml 514 SHA256 ed8a191164e828c0eb435d3a1f5379cf00fc7c6d1bcca2e0c2edfb65b078d38c SHA512 cbfea09b657be01585751f17bb41e7a829132d1948232b739c853f8d4e1691cda35cdb89f134a3a60adae4219cb3a0d64d74b41c2f783949e5e9f2e42891c526 WHIRLPOOL 76db9718fb7647d573bfdc6d3b9ab8ffc440cae7319fb9c2a5070aa40c1ece0db5e400330a406465b0feba9ca850d98f2797c45fda065b4851bced7cd617a54c
+MISC ChangeLog 47101 SHA256 d8280abe6433f623226d32d9d0ec2884d511e5a60e3d238d0b80c25ac18c0d50 SHA512 6b3d24f273a7f568893f0b6ada8b3ed2208d9ddc9d7db628ca31322045e65912c0af3fbc712be1ca21dc2b8ed8e797f0feb25c108d7e290831266ea97627d447 WHIRLPOOL e3e1577bf49ae8ceb9c0e967f261efc448111fa4335a262bafaec00e2bbd25d09fe02ab38d33115a63662d4e303c7c3ad24c75258bb8531aa689c289b962f60e
+MISC metadata.xml 436 SHA256 11c2593e7d35deb49a1e6d7a5d08ba970b82a4071b7c5fcdc88645fa33c362a1 SHA512 6a82698c8890cd386d3011c003088f3f97f2a83aff0fde6ed13e38a3ed7ea99a3716da8a5b3f91ddcde617f8445d5ed95460011ac86101174479f640d93a7216 WHIRLPOOL 056ed300269a0ad2d9669f454b12569af79294a252b49f946bbf3cecc323485c3341895fc43bca91aedadaa7109909ec01f4c63b0c209115d8459c6ad05d8a91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQIpm5AAoJENwGBM22xffesckQAIs2NdVvNHYETjPCLOadLTa2
-g2xiVXTa0V1kx8af952F+LjpEe66FyVtETVsUxPzGIqJY4NDNPybwjeyEYrliZg6
-HnSedk72+7UPDXeRbX5DXlVLuXDb7DzMaXdEjFZuvKkMS4gWBEZug9z+uXzXuzxb
-UjbE7Pjj1p+r7D9zc+QGzqUDJjO4an/07A+bdFyE+JEES/9LYzzx5grzMTgc/UrN
-YKxTWCapOHantQZQO/O0CcJeEA0gW3rp2ochRCH0oGOgvBOOhnhgkPkBFTWHGzVu
-LcWwvUmbd0hawNuFZrjmtN57lHNv5OuqmwiFq4tCoHPnJ3ioH5nTmgkCOUyl+tdo
-xi4HO7Pz0MWyCIdXT0UR0XtdvyYD/ghFvxwIWC6TKkCTRfhXZpK3gOYK0llp5vmw
-Ec9fX29dYMkdbNIJh0FKnKI8h0yPsqqDg18tS3u8323dFBOvodBgOVFcCHnDhnVW
-B1FHgLzmT9cl2iLSW3d3Sp1jryQWHJq2qMkjRCMDNuIypdgPm9c0im5sfG8Cn73A
-u9v77hHU1iLKZeRzcOxuCRH/WOXUf/13nBK4Th8xOCq5qfDfZqFDqERLyXQEGGS1
-BjQTeBm/P2PJ/l0+fMFGpsese9AXnCOujDIIYwvmyHVzD1HzhvjGL/eGYCx46ebL
-giGLRVCMxUm/ns8o371r
-=Hvs7
+iQIcBAEBCAAGBQJQIqC0AAoJENwGBM22xffegbgQAKMjmgEblgVZLQQhKfXsiMrb
+NQRP2v2C7CGiaX2ULTu2tKmd+8pURQs6AcjUhOt8BbjtQM3PpigwblL4FYGuuHim
+qpMaVebtHlPXLAfd+VZjiFDW2pe89m9b7+yN/+L2iswSa/dHi0YLE6UivEdPN+sJ
+Kr/pVYrf4iYDsZ+1FaeSLL8VP+fIznAXOI+cvrf+7zCip+A57TQP0DJMaLuEVkx0
+J7ZOpqQFEJDzs8hrjPhLDW5qfAVYNGImCuyXEhcDfU1rds8xiRBgcD+NtF0gaYQC
+DppAv5fyd7T2AwFlgZsn5M22bvu4xhi31nulS8gvMCpHcOWd81/0aiihl3879MWv
+NHT6VCP8sIoKSVhLHs7+6MGCSosW/86wnogfdGo3Ed/BQgVbT/TXjvBL1jKAiSUA
+ANe1Ky0FJXGb6nYQ211hxlXUeoQJg51yIh/kD69CJ6O5Bl/IOejJ/NIMhWf9xyfc
+MgofI64rt9RIp/5cTUX+Ohe2LYDygfAMjH6AqHb2A5BbcHSSHMo03EaFK7h/oZmF
+sveSn0DFalN+rcWG2wKelr4WUV4M9xGfPIFj5JPvYs2KJydubI6dS9fniHc1xfdS
+74juxDachJ3bLwPNqgAoz2Yqo8g+WM4bG8rJkcN4YHivA7H9ZNzf0yZYO5ozpN8I
+P4q9qkRIR5+Uoa5/VBQM
+=UEDN
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index da61c4afdc3c..9124e13b642e 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -10,6 +10,5 @@
 <use>
 	<flag name='introspection'>Enable GObject introspection.</flag>
 	<flag name='utils'>Install command-line PDF converters and various utilities.</flag>
-	<flag name='xpdf-headers'>Install (upstream-)unsupported xpdf headers</flag>
 </use>
 </pkgmetadata>
diff --git a/app-text/poppler/poppler-0.18.4-r1.ebuild b/app-text/poppler/poppler-0.18.4-r2.ebuild
index 5f86c83e3c73..8b60c054df43 100644
--- a/app-text/poppler/poppler-0.18.4-r1.ebuild
+++ b/app-text/poppler/poppler-0.18.4-r2.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.18.4-r1.ebuild,v 1.12 2012/06/17 14:32:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.4-r2.ebuild,v 1.1 2012/08/08 17:21:46 dilfridge Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ 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 +xpdf-headers"
+IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils"
 
 # No test data provided
 RESTRICT="test"
@@ -61,12 +61,12 @@ src_configure() {
 		-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 lcms)
 		$(cmake-utils_use_enable utils)
-		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
 		$(cmake-utils_use_with cairo)
 		$(cmake-utils_use_with introspection GObjectIntrospection)
 		$(cmake-utils_use_with jpeg)