Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/jpeg: jpeg-6b-r9.ebuild ChangeLog jpeg-7-r1.ebuild jpeg-8c.ebuild
Date: Sat, 28 Jan 2012 00:01:30
Message-Id: 20120128000119.5824D2004B@flycatcher.gentoo.org
1 ssuominen 12/01/28 00:01:19
2
3 Modified: jpeg-6b-r9.ebuild ChangeLog jpeg-7-r1.ebuild
4 Removed: jpeg-8c.ebuild
5 Log:
6 old, and silence repoman while at it
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.4 media-libs/jpeg/jpeg-6b-r9.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild?r1=1.3&r2=1.4
16
17 Index: jpeg-6b-r9.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- jpeg-6b-r9.ebuild 18 Jan 2010 15:35:38 -0000 1.3
24 +++ jpeg-6b-r9.ebuild 28 Jan 2012 00:01:19 -0000 1.4
25 @@ -1,14 +1,13 @@
26 -# Copyright 1999-2010 Gentoo Foundation
27 +# Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild,v 1.3 2010/01/18 15:35:38 ssuominen Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r9.ebuild,v 1.4 2012/01/28 00:01:19 ssuominen Exp $
31
32 # this ebuild is only for the libjpeg.so.62 SONAME for ABI compat
33
34 -EAPI="2"
35 -
36 +EAPI=4
37 +PATCH_VER=2
38 inherit eutils libtool multilib toolchain-funcs
39
40 -PATCH_VER="2"
41 DESCRIPTION="library to load, handle and manipulate images in the JPEG format (transition package)"
42 HOMEPAGE="http://www.ijg.org/"
43 SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
44 @@ -19,9 +18,6 @@
45 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
46 IUSE=""
47
48 -RDEPEND="!~media-libs/jpeg-6b:0
49 - !media-libs/jpeg-compat"
50 -
51 src_prepare() {
52 EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
53 elibtoolize
54 @@ -36,10 +32,10 @@
55 }
56
57 src_compile() {
58 - emake libjpeg.la || die
59 + emake libjpeg.la
60 }
61
62 src_install() {
63 exeinto /usr/$(get_libdir)
64 - doexe .libs/libjpeg.so.62 || die
65 + doexe .libs/libjpeg.so.62
66 }
67
68
69
70 1.124 media-libs/jpeg/ChangeLog
71
72 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.124&view=markup
73 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?rev=1.124&content-type=text/plain
74 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/ChangeLog?r1=1.123&r2=1.124
75
76 Index: ChangeLog
77 ===================================================================
78 RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v
79 retrieving revision 1.123
80 retrieving revision 1.124
81 diff -u -r1.123 -r1.124
82 --- ChangeLog 27 Jan 2012 23:54:52 -0000 1.123
83 +++ ChangeLog 28 Jan 2012 00:01:19 -0000 1.124
84 @@ -1,12 +1,20 @@
85 # ChangeLog for media-libs/jpeg
86 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
87 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.123 2012/01/27 23:54:52 ssuominen Exp $
88 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.124 2012/01/28 00:01:19 ssuominen Exp $
89 +
90 + 27 Jan 2012; Samuli Suominen <ssuominen@g.o> -jpeg-8c.ebuild:
91 + old
92 +
93 + 27 Jan 2012; Samuli Suominen <ssuominen@g.o> jpeg-6b-r9.ebuild,
94 + jpeg-7-r1.ebuild:
95 + Remove deprecated blockers.
96
97 27 Jan 2012; Samuli Suominen <ssuominen@g.o> jpeg-8c-r1.ebuild:
98 amd64/ppc/ppc64/x86 stable wrt #401109
99
100 27 Jan 2012; Samuli Suominen <ssuominen@g.o> jpeg-8c-r1.ebuild:
101 - pkg_postinst message for users switching from libjpeg-turbo
102 + Post installation message warning users to rebuild reverse dependencies
103 + if switching from libjpeg-turbo.
104
105 31 Dec 2011; Fabian Groffen <grobian@g.o> jpeg-8c-r1.ebuild:
106 Marked ~m68k-mint, bug #394955
107
108
109
110 1.4 media-libs/jpeg/jpeg-7-r1.ebuild
111
112 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild?rev=1.4&view=markup
113 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild?rev=1.4&content-type=text/plain
114 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild?r1=1.3&r2=1.4
115
116 Index: jpeg-7-r1.ebuild
117 ===================================================================
118 RCS file: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild,v
119 retrieving revision 1.3
120 retrieving revision 1.4
121 diff -u -r1.3 -r1.4
122 --- jpeg-7-r1.ebuild 18 Jan 2010 15:35:38 -0000 1.3
123 +++ jpeg-7-r1.ebuild 28 Jan 2012 00:01:19 -0000 1.4
124 @@ -1,31 +1,23 @@
125 -# Copyright 1999-2010 Gentoo Foundation
126 +# Copyright 1999-2012 Gentoo Foundation
127 # Distributed under the terms of the GNU General Public License v2
128 -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild,v 1.3 2010/01/18 15:35:38 ssuominen Exp $
129 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-7-r1.ebuild,v 1.4 2012/01/28 00:01:19 ssuominen Exp $
130
131 # this ebuild is only for the libjpeg.so.7 SONAME for ABI compat
132
133 -EAPI="2"
134 -
135 +EAPI=4
136 +PATCH_VER=2
137 inherit eutils libtool multilib
138
139 DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
140 HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
141 SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
142 - mirror://gentoo/${PN}-6b-patches-2.tar.bz2"
143 + mirror://gentoo/${PN}-6b-patches-${PATCH_VER}.tar.bz2"
144
145 LICENSE="as-is"
146 SLOT="7"
147 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
148 IUSE=""
149
150 -DEPEND="!~media-libs/jpeg-7:0"
151 -
152 -pkg_setup() {
153 - if [[ -e ${ROOT}/usr/$(get_libdir)/libjpeg.so.7 ]]; then
154 - rm -f "${ROOT}"/usr/$(get_libdir)/libjpeg.so.7
155 - fi
156 -}
157 -
158 src_prepare() {
159 epatch "${WORKDIR}"/patch/60_all_jpeg-maxmem-sysconf.patch
160 elibtoolize
161 @@ -33,17 +25,16 @@
162
163 src_configure() {
164 econf \
165 - --disable-dependency-tracking \
166 --enable-shared \
167 --disable-static \
168 --enable-maxmem=64
169 }
170
171 src_compile() {
172 - emake libjpeg.la || die
173 + emake libjpeg.la
174 }
175
176 src_install() {
177 exeinto /usr/$(get_libdir)
178 - doexe .libs/libjpeg.so.7 || die
179 + doexe .libs/libjpeg.so.7
180 }