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 | 6a7fa958117e3b9d3fd5dc3da595585bee850fd7 (patch) | |
| tree | b7ce3edcb44c3cbd8b391da4e5a79688ae28ff38 /media-libs | |
| parent | Factor out the function used to validate the makefile for the extraction method. (diff) | |
| download | gentoo-2-6a7fa958117e3b9d3fd5dc3da595585bee850fd7.tar.gz gentoo-2-6a7fa958117e3b9d3fd5dc3da595585bee850fd7.tar.bz2 gentoo-2-6a7fa958117e3b9d3fd5dc3da595585bee850fd7.zip | |
Missing blockers for libjpeg.so.7.
(Portage version: 2.2_rc61/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/jpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-7-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/jpeg/jpeg-7.ebuild | 4 |
3 files changed, 11 insertions, 3 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/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}" |