xpdf-headers useflag for poppler is going away

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 33 insertions, 9 deletions

diff --git a/gnustep-libs/popplerkit/ChangeLog b/gnustep-libs/popplerkit/ChangeLog
index e6591e8a5adb..b602c498f495 100644
--- a/gnustep-libs/popplerkit/ChangeLog
+++ b/gnustep-libs/popplerkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnustep-libs/popplerkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/ChangeLog,v 1.25 2012/05/02 21:22:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/ChangeLog,v 1.26 2012/08/08 16:50:30 dilfridge Exp $
+
+  08 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  popplerkit-0.4.1.ebuild:
+  xpdf-headers useflag for poppler is going away
 
   02 May 2012; Jeff Horelick <jdhore@gentoo.org> popplerkit-0.4.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/gnustep-libs/popplerkit/Manifest b/gnustep-libs/popplerkit/Manifest
index 882fec7fe4d0..29f079d165fd 100644
--- a/gnustep-libs/popplerkit/Manifest
+++ b/gnustep-libs/popplerkit/Manifest
@@ -1,6 +1,26 @@
-AUX popplerkit-0.2-poppler6_support.patch 6044 RMD160 0130b7dd0f6eb486ee097df1704784b5ccc36c90 SHA1 658578ed2245c5b347da5d9302ebedcc6edfc757 SHA256 b41398eb79b16fe32fedc9d5ab3265b31f4cc156a33268b03b77241c0e9cf10e
-AUX popplerkit-0.4.0-config-as-needed.patch 1636 RMD160 a9b2c2a0222e549f7aa154624657d26efa4fdd68 SHA1 e34fd8c090acea85309691ef56a91b8bd7179005 SHA256 143dfd50d019e8b648db18492bab440bb089b8730cab7bb4d4093488a4ccf160
-DIST etoile-0.4.1.tar.bz2 8281449 RMD160 f7965102a42e8616007baf89f4d11019aa12ef99 SHA1 b87af57c4a39aa939bee9ae883092bc86d942014 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
-EBUILD popplerkit-0.4.1.ebuild 1021 RMD160 6aab714e939006ba20583107295a91bade360455 SHA1 a3f643d2e5fb316d836d7781a5d9664ddc2e0a42 SHA256 d00acc8b924b9adc6de337e9189518510d8a5bead738cb13b86bd134e8aa08ff
-MISC ChangeLog 3457 RMD160 a18685a54dcad19f0533757dbb4ea4ae317c3ee3 SHA1 f6a7ecdb74e7d9d529932e8c1e2c0a93b64a6bd5 SHA256 2fb10ecba521f4e0e4ec3cc8f994fab3f29d3664753abc739ca34826a0108b74
-MISC metadata.xml 249 RMD160 ba5b4e225358e1ecbc6edcd8b8a5c314d7897b18 SHA1 4c78f83a26931b22608dbddf72ed75de1e2b5589 SHA256 78beb5173d3c75a10c26540981e01218b86d92441d0a09c84b0af106d2e8b24a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX popplerkit-0.2-poppler6_support.patch 6044 SHA256 b41398eb79b16fe32fedc9d5ab3265b31f4cc156a33268b03b77241c0e9cf10e SHA512 d74cffe023f95b2950ad8f87910c27fc84218c6202847fa5342900e7cad320cc9d12831f9ed4e49b0232b279fede35ade7e35726d9509851580986c8215128e9 WHIRLPOOL c038f8eb7c1299ba4fbf5e353449bfdc14d448edba395abb26deafd9e6f14ecb4245f9a7b84300763fc7c1ec787643ee6724c5c11037eab6a26600b35f831cbc
+AUX popplerkit-0.4.0-config-as-needed.patch 1636 SHA256 143dfd50d019e8b648db18492bab440bb089b8730cab7bb4d4093488a4ccf160 SHA512 158a36694282a09d6c3f876a6372257f5ee5ce771485992d12606dff3063262cc1c64f2ecdc160710cff141f850ee976f06e800c21a14db726612dae552f4d18 WHIRLPOOL 240402ed5066b9318b5b5bed87a75d8f6da1a0e9e461736a9ddb72b3cacc38d60136548577a5b913512d1ce4c6ab0d2c729e78104f5eaddc4b90dc27203691e3
+DIST etoile-0.4.1.tar.bz2 8281449 SHA256 2c9f189a0eae9dbc85589660a55faac498d05a056bf8148fa91f25455728cf25
+EBUILD popplerkit-0.4.1.ebuild 1059 SHA256 ca4d434fe140b1c70ea9513c25a25553867ca364f550779bcacb616597764f98 SHA512 b6461ab66d64b02730c1d1af0ce0f0015547d1c551ed4ed962ce8244acaf658efb06200ac5736aa70e3521dde3648a4ed9cbd737452d408f6fa6ae247247eadd WHIRLPOOL 391027acb7f9f1a76b78d33e951d9ee107510d824ccd5994e0a23b41dd56f194b13a1d9e059e19312469f34a8cd8da9db20dfeaf855b1ef87763b1ccb37ca679
+MISC ChangeLog 3594 SHA256 17ce81fa5a15c84a0cb8f9a92486d063f9c083bec1b018f4f775605575d9ce31 SHA512 6a859478f33c21a60fdda8194dec53292e67a0b193b71d4b82a501d4ac9cfe29c28bb5628ac8f0faa4eeca7bc92521cbb8cf4072a04114e106b911d88ed0dc44 WHIRLPOOL a7319bfc5db926dd53fe0638f19ebeed6315a04d1ef774d7eccaf77784cb802f634c6dbd463b70d1126504ea428e087e7579b4e01eb9451f50aad950660366a0
+MISC metadata.xml 249 SHA256 78beb5173d3c75a10c26540981e01218b86d92441d0a09c84b0af106d2e8b24a SHA512 24ed46f3b53daef2004458d5071073d8a29f9f1c139a4f16b21bf8e9057ab7552b9937f6daaca902c54c2a223fb30488e697e3267d9c78683d67d963f7fa749f WHIRLPOOL 52266d11385a493e5b5fee60302a0109becb196b598248a1ba2527098f8ffbf98b0bba7022e7dfd8bf7d5890e0e36f3e750528183c9742a4ef8320679b1af9c3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQIplfAAoJENwGBM22xffeO1cQAILcj47Mfi7re48FKPrc7Smg
+IujnKeZOc9jEhrfKkwnjPkIDGaE0zyfZbrojqki6MFF3mjEWf4IdOyjcb7UmmAma
+E988+vb1m3LYJSLn1FNC3LEVagyyqiuVLZuErGTMsd4LIY7lZweZO8vCRbN2CSZz
+vt79pJhcuRpY8WLQwrrRP1KTdpVmjPtlvKXMx2h+Ep7PYxpsz97IjQv+uusP2EJW
+EQmpTeBM08TP7OcXEV50DfzWUYhfONkspWh7eA4wH2uuVqLQYesUmomCOWDv9Z1m
+cNI5Hsko3AF+apgD+jnG2lLZOff/3P6/szBDmdgGG+gNGsn+ehmUt5fG3v/IJdGM
+yaI9PZf0nErsSO+kC9KoynIVVN8miRug7VMx980huJdGG7F+gPwqT9rcKeclaeQq
+ATAu0V2OwyvQv53ade2ocHLym2PhtU//t01UUTpliKZBFuupzxMjsH+f7hPI4E6i
+K7xl9tllFvRw8blmP1R7jXzHkVcA9V/Tx5okvEMS/waAjcYVUoRT6hlNsftMk9mS
+gYlqM2r3r/5pQ9MDWZxfAPKsURdsKUTA+2iS3VRPLN/gup9lohkROJVglvcpCEVc
+siwDmZfZWEJzP82hDMVK4SJgL6Hh/a3fK03cMjS+f0miC/PHnEAX8C3w05hV/HDN
+0Pe56WQfsLRjHAzM/eDr
+=E2nf
+-----END PGP SIGNATURE-----
diff --git a/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild b/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild
index de72721a9880..e1a1a20e8ba1 100644
--- a/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild
+++ b/gnustep-libs/popplerkit/popplerkit-0.4.1.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/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild,v 1.7 2012/05/02 21:22:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/popplerkit/popplerkit-0.4.1.ebuild,v 1.8 2012/08/08 16:50:30 dilfridge Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE=""
 
 # Check me. Is xpdf-headers required?
-RDEPEND=">=app-text/poppler-0.12.3-r3[xpdf-headers]
+RDEPEND="|| ( <app-text/poppler-0.20.2-r2[xpdf-headers] >=app-text/poppler-0.20.2-r2 )
 	>=media-libs/freetype-2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"