From: Justin Lecher <jlec@gentoo.org>
Date: Wed, 16 Nov 2011 10:07:39 +0000 (+0000)
Subject: Corrected Slotting of media-libs/tiff and media-libs/libpng
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3606acd3b397d4abf024b98127a3684e72a4ac24;p=gentoo.git

Corrected Slotting of media-libs/tiff and media-libs/libpng

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

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index 01fc3c08c999..4030ffa16552 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.304 2011/11/01 14:03:41 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.305 2011/11/16 10:07:39 jlec Exp $
+
+  16 Nov 2011; Justin Lecher <jlec@gentoo.org> poppler-0.16.7.ebuild,
+  poppler-0.18.1.ebuild:
+  Corrected Slotting of media-libs/tiff and media-libs/libpng
 
 *poppler-0.18.1 (01 Nov 2011)
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 4fb04325929b..ebf10c6e5b82 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX poppler-0.18.1-pkgconfig.patch 2280 RMD160 10f1fc34726588746e94263d2658ebc45ab2d4eb SHA1 6a90effa7fed3fac5fcfef28ba13b9dd89dd4948 SHA256 38fd730aacb3c4a949cab68b7cbc0dd12858c1a14b9437786630787cb4a7cff9
 DIST poppler-0.16.7.tar.gz 1952179 RMD160 279330e6feaf97a207f3396eab1af836d3d1f16c SHA1 26c735f863688f62b57d5159863fdad4272be89f SHA256 fab4e8af2d34d4142a718819fd747d40930b71ef520ee0e6bcc94e2c44f22bcd
 DIST poppler-0.18.1.tar.gz 1949210 RMD160 62c9461b3455937c6abd07690233dbc2ab29db0b SHA1 0224907e3ec52cdc25c95dcc45a09f020218077e SHA256 d024540a5ffe3862351a0aca4a5304c14fdf3b071d3ac384245023a215faa8a3
-EBUILD poppler-0.16.7.ebuild 2836 RMD160 f7e185992c490e98d2bfc3297e06dba3833cb01d SHA1 62c24047436959a56699dbc84f443e430a6409c7 SHA256 5288722d1d9505e9b8efac08a8451c1b2fa9d09e9b9abb4327b40c3d0af65f82
-EBUILD poppler-0.18.1.ebuild 2700 RMD160 da9734f597ad365c0f3c95d57ae808f935db35bf SHA1 3acea028e3de06f4293ec8d0729a734e8b4ec3cc SHA256 9d495102ee7dea630dd494c14844a2e0f1fce74c74403309063d591f5b391b26
-MISC ChangeLog 42901 RMD160 ec9c07d430b069bec15072d5cec1c192db3f59fd SHA1 a626d825406d6f7acb49589214340788baf8ae72 SHA256 d8664472d85f776535358203ad8871ee93eb06ccdb706857ca2e934982b7ada2
+EBUILD poppler-0.16.7.ebuild 2839 RMD160 b0a94ae8c49362c42ac847fd2d949e5661e903c5 SHA1 5a519ec7aad7b9afb5b0ebeb9c747b7427f91b85 SHA256 d76ecf63db98c67d8ce5846fc75fd12034c04a03223768e15a31b0861578e598
+EBUILD poppler-0.18.1.ebuild 2700 RMD160 ceb0560c3cc6d2e2beda324e4e29dd5d30626395 SHA1 6ed2b3888473edd8641d6e00f9d9db9133476a0d SHA256 795bdaa5d16e2bcb80cede79da0b32c333e3094b41fa20bb79ac1058f046b26f
+MISC ChangeLog 43055 RMD160 853a2a257ff5173935ac5c8e7119006dcabee412 SHA1 6edcb472a005606948e81c7ff3585c3af32b5ede SHA256 6bd0c0036ea5d687eb0a7c499c1376985b1e3205223b795841947791c5519152
 MISC metadata.xml 531 RMD160 bdae255e3871cac7966787a198b50d0f77180747 SHA1 8d191a0d9acc9c4494dd4b80ba72e420cf5489a4 SHA256 afef403de543eb24d44ec80c5353f932dffd16c5cd805f311a82089cdb4f4a99
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6v/EIACgkQFuHa/bHpVdvV1ACaAoKiPPbLe3w9PnPRhQxyzUbg
-rfwAoMlbCmR4tNRRjTAoCDm/mgB+kFiH
-=9k3Z
+iEYEAREKAAYFAk7Di3EACgkQgAnW8HDreRZvOgCgssxwc//v1Wvz2ujAs4fM8e+H
+IfwAn0eq4KxqnPqURswX3sGMTjmeu9FG
+=86rF
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/poppler-0.16.7.ebuild b/app-text/poppler/poppler-0.16.7.ebuild
index 580dbcc750fe..e0c0ac6750f4 100644
--- a/app-text/poppler/poppler-0.16.7.ebuild
+++ b/app-text/poppler/poppler-0.16.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.7.ebuild,v 1.8 2011/10/05 15:32:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.16.7.ebuild,v 1.9 2011/11/16 10:07:39 jlec Exp $
 
 EAPI="2"
 
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	lcms? ( =media-libs/lcms-1* )
-	png? ( >=media-libs/libpng-1.4 )
+	png? ( >=media-libs/libpng-1.4:0 )
 	qt4? (
 		x11-libs/qt-core:4
 		x11-libs/qt-gui:4
diff --git a/app-text/poppler/poppler-0.18.1.ebuild b/app-text/poppler/poppler-0.18.1.ebuild
index 7b87f6094fc6..b2e8e8a87085 100644
--- a/app-text/poppler/poppler-0.18.1.ebuild
+++ b/app-text/poppler/poppler-0.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.1.ebuild,v 1.1 2011/11/01 14:03:41 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.1.ebuild,v 1.2 2011/11/16 10:07:39 jlec Exp $
 
 EAPI="4"
 
@@ -31,12 +31,12 @@ COMMON_DEPEND="
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/openjpeg )
 	lcms? ( =media-libs/lcms-1* )
-	png? ( >=media-libs/libpng-1.4 )
+	png? ( >=media-libs/libpng-1.4:0 )
 	qt4? (
 		x11-libs/qt-core:4
 		x11-libs/qt-gui:4
 	)
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig