diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-17 21:58:31 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-17 21:58:31 +0000 |
| commit | 63f70b2e76f40806830cc68bf7788c03036b02af (patch) | |
| tree | d13d19d6483152eac09e8c0d9c9757f4826836cf /media-libs/jpeg | |
| parent | Factor out the function used to validate the makefile for the extraction method. (diff) | |
| download | historical-63f70b2e76f40806830cc68bf7788c03036b02af.tar.gz historical-63f70b2e76f40806830cc68bf7788c03036b02af.tar.bz2 historical-63f70b2e76f40806830cc68bf7788c03036b02af.zip | |
Missing blockers for libjpeg.so.7.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'media-libs/jpeg')
| -rw-r--r-- | media-libs/jpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/jpeg/Manifest | 6 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-7-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-7.ebuild | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog index 3a5a5f98be9e..9b50ae2dfb0f 100644 --- a/media-libs/jpeg/ChangeLog +++ b/media-libs/jpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/jpeg # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.92 2010/01/17 21:40:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.93 2010/01/17 21:58:31 ssuominen Exp $ + + 17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> jpeg-7.ebuild, + jpeg-7-r1.ebuild: + Missing blockers for libjpeg.so.7. 17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> jpeg-7.ebuild: Drop old preserve_old_lib logic, it's moved to jpeg-8 ebuild. diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest index 64cf9e0afcfc..0a93a4e5b25c 100644 --- a/media-libs/jpeg/Manifest +++ b/media-libs/jpeg/Manifest @@ -6,8 +6,8 @@ DIST jpegsrc.v7.tar.gz 960379 RMD160 6049c5fee2682c0757d4b51740abd981d1b24487 SH DIST jpegsrc.v8.tar.gz 961697 RMD160 f6a11317fd48e388ab034fcd5d66e00e77e8470b SHA1 1324834b52428d57479faa062f8b2d98d755d85e SHA256 17baa5b7acb3f0f8d15d73dd2416cb9398a55b3334a5a9359d278d8de6a50bac DIST libjpeg7_7-1.diff.gz 11554 RMD160 193bcb5fdc7360707cbb450c16888499085dd2c6 SHA1 b346d8f7803d08feccade84a0012a48ee2b5f62e SHA256 e465ab295502c6db995780d3b2e38570794d0d31034f0065352bcbda63c3a094 EBUILD jpeg-6b-r9.ebuild 1227 RMD160 b65cd2dda31f476ee3f0bf97e35dd7d0c2e8a5a2 SHA1 d083b518965ed64987d286fa201a0f3bb988b233 SHA256 97838d23d4e37504ad2dac9561f7ba5cd12dbdd8d69779b38b34472de0da4c1c -EBUILD jpeg-7-r1.ebuild 1046 RMD160 44644bc532926d4a4b555555469bb0d972540c2c SHA1 a2e212daf9762fabe745c6de240e081ac68ed8f4 SHA256 b19a29da151452d25bde3ca1816ea86bfc90b4c65e1174958c8b1278e4844adf -EBUILD jpeg-7.ebuild 1463 RMD160 562b5070dedcf083982d05f7dcf04b155afd29f0 SHA1 cda42ee668c1d2e93299f09e1df5b693aaeeffd6 SHA256 6bedbb29f9c947fce84bebe1e0365ff6b024c77432578bc5b90b92cfc63d1e47 +EBUILD jpeg-7-r1.ebuild 1079 RMD160 dde192b4f470d18d5209cbfaf6ac8c3f0ce64cd9 SHA1 d58724dd4731b367bd39448495307a432eaa1523 SHA256 801a05845e2be2a7dbf573f030b51f9f469de94211b8725df0eb79f3a9f5d877 +EBUILD jpeg-7.ebuild 1492 RMD160 70cd0195792d723e0d49b2cdc80edf2ba8a68b9a SHA1 7ba737f8f53882ab4ad965d4b51917a314f6f244 SHA256 a5343d25a8238bb820285a3c972153478a6a3c5671134e0871ac8b80f8c685a9 EBUILD jpeg-8.ebuild 1615 RMD160 71f23ab4a56eb3c4c0540a60da39de1cd6a8a33c SHA1 44b1daa7f68e3dcd7d5bffe44571763c08e4352d SHA256 8c859c05070c20a62f269a42ef491762367093bd9bb5cd2e7337f0a2490678c0 -MISC ChangeLog 11486 RMD160 388ae16f294b04abcbd9d61aa573a772918816bc SHA1 9faea1ff11f45526fff17d33e4a0c20ea3f0aeca SHA256 6c42102a90556c4bf5615b9604271fc45931a46a59d46598b098405975737120 +MISC ChangeLog 11613 RMD160 4175dba99f173d124090baafe7e0295e2b11c051 SHA1 758c6224ed4f9eb2e457b0640cf7ca23889c1e16 SHA256 67e11c8862cf5ed4629cd14c42797bbd43fe900d95cc45a0ef53a6320df75c3a MISC metadata.xml 224 RMD160 3a7dcbadaed2b7ed12e11152fe1fe2de0193fc29 SHA1 fa5078079869e963f3f51f80124cecf8ea6c1b67 SHA256 806818bba7ae36d62f16c1fe548a1eb2a360caf2d984aa8f47bba7b91ff73434 diff --git a/media-libs/jpeg/jpeg-7-r1.ebuild b/media-libs/jpeg/jpeg-7-r1.ebuild index 97e1675310c7..1397d1c7632a 100644 --- a/media-libs/jpeg/jpeg-7-r1.ebuild +++ b/media-libs/jpeg/jpeg-7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild,v 1.1 2010/01/17 19:14:18 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild,v 1.2 2010/01/17 21:58:31 ssuominen Exp $ # this ebuild is only for the libjpeg.so.7 SONAME for ABI compat @@ -18,6 +18,8 @@ SLOT="7" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" IUSE="" +DEPEND="!=media-libs/jpeg-7*:0" + src_prepare() { epatch "${WORKDIR}"/patch/60_all_jpeg-maxmem-sysconf.patch elibtoolize diff --git a/media-libs/jpeg/jpeg-7.ebuild b/media-libs/jpeg/jpeg-7.ebuild index f01c77632b4e..06d2bfea61d1 100644 --- a/media-libs/jpeg/jpeg-7.ebuild +++ b/media-libs/jpeg/jpeg-7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v 1.19 2010/01/17 21:40:30 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v 1.20 2010/01/17 21:58:31 ssuominen Exp $ EAPI="2" @@ -20,6 +20,8 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" +DEPEND="!media-libs/jpeg:7" + src_unpack() { unpack ${A} cd "${S}" |