| 1 |
aballier 13/07/31 16:10:51 |
| 2 |
|
| 3 |
Modified: ChangeLog jpeg-8d-r1.ebuild |
| 4 |
Log: |
| 5 |
add the blocker on emul-linux so that it is stacked for baselibs -r4 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.139 media-libs/jpeg/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.139&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.139&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?r1=1.138&r2=1.139 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v |
| 19 |
retrieving revision 1.138 |
| 20 |
retrieving revision 1.139 |
| 21 |
diff -u -r1.138 -r1.139 |
| 22 |
--- ChangeLog 31 Jul 2013 10:04:15 -0000 1.138 |
| 23 |
+++ ChangeLog 31 Jul 2013 16:10:51 -0000 1.139 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for media-libs/jpeg |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.138 2013/07/31 10:04:15 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.139 2013/07/31 16:10:51 aballier Exp $ |
| 29 |
+ |
| 30 |
+ 31 Jul 2013; Alexis Ballier <aballier@g.o> jpeg-8d-r1.ebuild: |
| 31 |
+ add the blocker on emul-linux so that it is stacked for baselibs -r4 |
| 32 |
|
| 33 |
*jpeg-8d-r1 (31 Jul 2013) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 media-libs/jpeg/jpeg-8d-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: jpeg-8d-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- jpeg-8d-r1.ebuild 31 Jul 2013 10:04:15 -0000 1.1 |
| 51 |
+++ jpeg-8d-r1.ebuild 31 Jul 2013 16:10:51 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2013 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild,v 1.1 2013/07/31 10:04:15 ssuominen Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8d-r1.ebuild,v 1.2 2013/07/31 16:10:51 aballier Exp $ |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
inherit eutils libtool toolchain-funcs multilib-minimal |
| 60 |
@@ -17,6 +17,8 @@ |
| 61 |
SLOT="0" |
| 62 |
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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 63 |
IUSE="static-libs" |
| 64 |
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3 |
| 65 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch |
Archives