[gentoo-commits] gentoo-x86 commit in media-libs/jpeg: ChangeLog jpeg-7.ebuild jpeg-7-r1.ebuild

[gentoo-commits] gentoo-x86 commit in media-libs/jpeg: ChangeLog jpeg-7.ebuild jpeg-7-r1.ebuild

[Samuli Suominen (ssuominen)]

ssuominen    10/01/17 21:58:31

  Modified:             ChangeLog jpeg-7.ebuild jpeg-7-r1.ebuild
  Log:
  Missing blockers for libjpeg.so.7.
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.93                 media-libs/jpeg/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/ChangeLog?r1=1.92&r2=1.93

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog	17 Jan 2010 21:40:30 -0000	1.92
+++ ChangeLog	17 Jan 2010 21:58:31 -0000	1.93
@@ -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.



1.20                 media-libs/jpeg/jpeg-7.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild?r1=1.19&r2=1.20

Index: jpeg-7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jpeg-7.ebuild	17 Jan 2010 21:40:30 -0000	1.19
+++ jpeg-7.ebuild	17 Jan 2010 21:58:31 -0000	1.20
@@ -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 @@
 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}"



1.2                  media-libs/jpeg/jpeg-7-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild?r1=1.1&r2=1.2

Index: jpeg-7-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jpeg-7-r1.ebuild	17 Jan 2010 19:14:18 -0000	1.1
+++ jpeg-7-r1.ebuild	17 Jan 2010 21:58:31 -0000	1.2
@@ -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 @@
 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