From b81db42bda43bc1b1ef6fb7494afa5b205d81e0d Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 13 Nov 2011 11:24:33 +0000 Subject: [PATCH] Corrected Slotting of media-libs/tiff and media-libs/libpng Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64 --- media-libs/openjpeg/ChangeLog | 5 ++++- media-libs/openjpeg/Manifest | 14 +++++--------- media-libs/openjpeg/openjpeg-1.4-r1.ebuild | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog index 601d7e6bd0a0..32ec1d118d26 100644 --- a/media-libs/openjpeg/ChangeLog +++ b/media-libs/openjpeg/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/openjpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.55 2011/10/23 19:28:42 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.56 2011/11/13 11:24:33 jlec Exp $ + + 13 Nov 2011; Justin Lecher openjpeg-1.4-r1.ebuild: + Corrected Slotting of media-libs/tiff and media-libs/libpng 23 Oct 2011; Tim Harder -files/openjpeg-1.1.1-Makefile.patch, -files/openjpeg-1.2-Makefile.patch, diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest index 28ff3a86f8af..4d27383efe62 100644 --- a/media-libs/openjpeg/Manifest +++ b/media-libs/openjpeg/Manifest @@ -6,17 +6,13 @@ AUX openjpeg-1.4-libpng15.patch 524 RMD160 1f7828677ce4dee97a42a5d412341624ceee3 AUX openjpeg-1.4-linking.patch 595 RMD160 6177609274bd222c2a73c4f56db0b234306c5b20 SHA1 41fbd01354e004f2333a8f4cc74ee5847e9340f8 SHA256 cc79c403d8c9530fe753c5f9cf58d4ab8f95935cf88e02edfe31c98f445b3d0a AUX openjpeg-1.4-pkgconfig.patch 1573 RMD160 9de432a117e36ca80c493a50708053010f39b374 SHA1 f755e6aa220c0f107c13a46398aafe60b7189b01 SHA256 f026fc520583943dc5b079d3838fe61d230862cd7e7622a0dd3720427b5de594 DIST openjpeg_v1_4_sources_r697.tgz 2365447 RMD160 c0d88c4a312651bac17d50bd6917e1b678fcf8f7 SHA1 9ef6a08ecf5944962b4e2cd7569ac01a8eaa66d0 SHA256 493e4db087bf5c5485618a1e1cfd827c4fb2ad421a4342903b166b76cf094b73 -EBUILD openjpeg-1.4-r1.ebuild 1406 RMD160 fc68e31b150d52f4fdffa08ae713903c458df0e3 SHA1 577452147d18db3ca9e0f8073e69f15ce4d71791 SHA256 dc217d67625179699b28c70cc593af121e211a925b2f3ecd3867b40c81e2874e -MISC ChangeLog 7978 RMD160 260a2f101ce53aa1601a950c70596975bbd51950 SHA1 71a6980d7fbc4a6da7cf21db3f087052ca393a2d SHA256 7894bb17edad449d48aeae5e4369a959b5de97157919323446133940207e3b83 +EBUILD openjpeg-1.4-r1.ebuild 1407 RMD160 b885c49ff7615f282fabc860aa55756b442e351e SHA1 c598b840b8e865db7074d1ea0ed8bfe00329d3b4 SHA256 e3432ae9d9487e2b5ac396aa4745dcb288a56a25f7acae3bfd572d42139c1c8d +MISC ChangeLog 8107 RMD160 928e5479102cce11a9de973a088a87318254a82d SHA1 23daa56835fe05bab2a098dc4b17eae0354002ab SHA256 9b0ba4981d8527b8c2c0be10931fd48707187ced389d747508f0b8a8380de681 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOpGrzAAoJEEqz6FtPBkyj+74H/AvEsqWeMdCQS8I9FsbdlbXf -EZjz3xrFo7CHN6m1pvMc/0wZN0Hj2U8GcbVyjc6bZkhe5s6fDGmldjKbScV/QlI0 -9DVc+cYOYWWxQUZvpZIfFTbMfG35i3GYUY5NdNdktJ4828eiR3NCuOzV8y2MGWxA -w0jogt2zuWrRI/a14yxLAlUISt01ahVeRUSfZXfmP4TmvNbrx4CgLgVmEwC361M0 -zlpT8/knzQyeevvqZIxizMg+Px+p408f3N/BvtUzRJMENH1xUPZn0dXR0OmyhFSb -Ib62tCFMbOpkuJM5pbsO8y/KxQXfMQVX3CRImRfabaTWwkm9M/VAdvCDGu6zcww= -=lJRj +iEYEAREKAAYFAk6/qP0ACgkQgAnW8HDreRZ5NwCfZZzJ8uZpCwHikEeKjMVXSVDc +oKkAn2QP7AQ0A7uPJZA4HL0QdQC/BjcG +=hYTC -----END PGP SIGNATURE----- diff --git a/media-libs/openjpeg/openjpeg-1.4-r1.ebuild b/media-libs/openjpeg/openjpeg-1.4-r1.ebuild index 26611510e1ef..6bdcfe57208e 100644 --- a/media-libs/openjpeg/openjpeg-1.4-r1.ebuild +++ b/media-libs/openjpeg/openjpeg-1.4-r1.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/media-libs/openjpeg/openjpeg-1.4-r1.ebuild,v 1.10 2011/10/23 15:15:18 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.4-r1.ebuild,v 1.11 2011/11/13 11:24:33 jlec Exp $ EAPI=4 @@ -18,9 +18,9 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbs IUSE="doc test" RDEPEND=" - media-libs/libpng - media-libs/tiff media-libs/lcms:2 + media-libs/libpng:0 + media-libs/tiff:0 sys-libs/zlib " DEPEND="${RDEPEND} -- 2.26.2