| 1 |
aballier 13/07/31 16:07:28 |
| 2 |
|
| 3 |
Modified: ChangeLog libjpeg-turbo-1.3.0-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.63 media-libs/libjpeg-turbo/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.63&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?rev=1.63&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog?r1=1.62&r2=1.63 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v |
| 19 |
retrieving revision 1.62 |
| 20 |
retrieving revision 1.63 |
| 21 |
diff -u -r1.62 -r1.63 |
| 22 |
--- ChangeLog 31 Jul 2013 10:07:13 -0000 1.62 |
| 23 |
+++ ChangeLog 31 Jul 2013 16:07:28 -0000 1.63 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for media-libs/libjpeg-turbo |
| 26 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.62 2013/07/31 10:07:13 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/ChangeLog,v 1.63 2013/07/31 16:07:28 aballier Exp $ |
| 29 |
+ |
| 30 |
+ 31 Jul 2013; Alexis Ballier <aballier@g.o> |
| 31 |
+ libjpeg-turbo-1.3.0-r1.ebuild: |
| 32 |
+ add the blocker on emul-linux so that it is stacked for baselibs -r4 |
| 33 |
|
| 34 |
31 Jul 2013; Samuli Suominen <ssuominen@g.o> |
| 35 |
libjpeg-turbo-1.3.0-r1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: libjpeg-turbo-1.3.0-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 10:07:13 -0000 1.2 |
| 52 |
+++ libjpeg-turbo-1.3.0-r1.ebuild 31 Jul 2013 16:07:28 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2013 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.2 2013/07/31 10:07:13 ssuominen Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r1.ebuild,v 1.3 2013/07/31 16:07:28 aballier Exp $ |
| 58 |
|
| 59 |
EAPI=5 |
| 60 |
|
| 61 |
@@ -28,7 +28,9 @@ |
| 62 |
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" |
| 63 |
COMMON_DEPEND="!media-libs/jpeg:0" |
| 64 |
RDEPEND="${COMMON_DEPEND} |
| 65 |
- java? ( >=virtual/jre-1.5 )" |
| 66 |
+ java? ( >=virtual/jre-1.5 ) |
| 67 |
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3 |
| 68 |
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" |
| 69 |
DEPEND="${COMMON_DEPEND} |
| 70 |
amd64? ( ${ASM_DEPEND} ) |
| 71 |
x86? ( ${ASM_DEPEND} ) |
Archives