1 |
jlec 11/11/20 11:08:17 |
2 |
|
3 |
Modified: ChangeLog tkimg-1.4-r3.ebuild |
4 |
Added: tkimg-1.4-r4.ebuild |
5 |
Log: |
6 |
Use bundled tiff so that we can have tiff-4 from tree installed, #391071 |
7 |
|
8 |
(Portage version: 2.2.0_alpha75_p11/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.40 dev-tcltk/tkimg/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/ChangeLog?rev=1.40&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/ChangeLog?rev=1.40&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/ChangeLog?r1=1.39&r2=1.40 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v |
20 |
retrieving revision 1.39 |
21 |
retrieving revision 1.40 |
22 |
diff -u -r1.39 -r1.40 |
23 |
--- ChangeLog 16 Nov 2011 10:35:11 -0000 1.39 |
24 |
+++ ChangeLog 20 Nov 2011 11:08:17 -0000 1.40 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for dev-tcltk/tkimg |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.39 2011/11/16 10:35:11 jlec Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.40 2011/11/20 11:08:17 jlec Exp $ |
30 |
+ |
31 |
+*tkimg-1.4-r4 (20 Nov 2011) |
32 |
+ |
33 |
+ 20 Nov 2011; Justin Lecher <jlec@g.o> tkimg-1.4-r3.ebuild, |
34 |
+ +tkimg-1.4-r4.ebuild: |
35 |
+ Use bundled tiff so that we can have tiff-4 from tree installed, #391071 |
36 |
|
37 |
16 Nov 2011; Justin Lecher <jlec@g.o> tkimg-1.4-r3.ebuild, |
38 |
-tkimg-1.4.20100510-r1.ebuild, -tkimg-1.5_pre324.ebuild, |
39 |
|
40 |
|
41 |
|
42 |
1.6 dev-tcltk/tkimg/tkimg-1.4-r3.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild?rev=1.6&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild?rev=1.6&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild?r1=1.5&r2=1.6 |
47 |
|
48 |
Index: tkimg-1.4-r3.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild,v |
51 |
retrieving revision 1.5 |
52 |
retrieving revision 1.6 |
53 |
diff -u -r1.5 -r1.6 |
54 |
--- tkimg-1.4-r3.ebuild 16 Nov 2011 10:35:11 -0000 1.5 |
55 |
+++ tkimg-1.4-r3.ebuild 20 Nov 2011 11:08:17 -0000 1.6 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2011 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild,v 1.5 2011/11/16 10:35:11 jlec Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r3.ebuild,v 1.6 2011/11/20 11:08:17 jlec Exp $ |
61 |
|
62 |
EAPI=3 |
63 |
|
64 |
@@ -24,10 +24,10 @@ |
65 |
RDEPEND=" |
66 |
dev-lang/tk |
67 |
>=dev-tcltk/tcllib-1.11 |
68 |
- virtual/jpeg |
69 |
=media-libs/tiff-3*:0 |
70 |
media-libs/libpng:0 |
71 |
- sys-libs/zlib" |
72 |
+ sys-libs/zlib |
73 |
+ virtual/jpeg" |
74 |
DEPEND="${RDEPEND} |
75 |
test? ( |
76 |
x11-apps/xhost |
77 |
|
78 |
|
79 |
|
80 |
1.1 dev-tcltk/tkimg/tkimg-1.4-r4.ebuild |
81 |
|
82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild?rev=1.1&view=markup |
83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild?rev=1.1&content-type=text/plain |
84 |
|
85 |
Index: tkimg-1.4-r4.ebuild |
86 |
=================================================================== |
87 |
# Copyright 1999-2011 Gentoo Foundation |
88 |
# Distributed under the terms of the GNU General Public License v2 |
89 |
# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4-r4.ebuild,v 1.1 2011/11/20 11:08:17 jlec Exp $ |
90 |
|
91 |
EAPI=3 |
92 |
|
93 |
VIRTUALX_USE=test |
94 |
|
95 |
inherit eutils prefix virtualx |
96 |
|
97 |
MYP="${PN}${PV}" |
98 |
|
99 |
DESCRIPTION="Adds a lot of image formats to Tcl/Tk" |
100 |
HOMEPAGE="http://tkimg.sourceforge.net/" |
101 |
SRC_URI=" |
102 |
http://dev.gentoo.org/~jlec/distfiles/${P}-gentoo+bundled-tiff.patch.xz |
103 |
mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2" |
104 |
|
105 |
IUSE="doc test" |
106 |
SLOT="0" |
107 |
LICENSE="BSD" |
108 |
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" |
109 |
|
110 |
RDEPEND=" |
111 |
dev-lang/tk |
112 |
>=dev-tcltk/tcllib-1.11 |
113 |
media-libs/tiff:0 |
114 |
media-libs/libpng:0 |
115 |
sys-libs/zlib |
116 |
virtual/jpeg" |
117 |
DEPEND="${RDEPEND} |
118 |
test? ( |
119 |
x11-apps/xhost |
120 |
media-fonts/font-misc-misc |
121 |
media-fonts/font-cursor-misc )" |
122 |
|
123 |
# Fails with jpeg-turbo silently, #386253 |
124 |
RESTRICT="test" |
125 |
|
126 |
S="${WORKDIR}/${MYP}" |
127 |
|
128 |
src_prepare() { |
129 |
epatch "${WORKDIR}"/${P}-gentoo+bundled-tiff.patch |
130 |
find compat/{libjpeg,libpng,zlib} -delete |
131 |
sed \ |
132 |
-e 's:-O2 -fomit-frame-pointer::g' \ |
133 |
-e 's: -pipe::g' \ |
134 |
-i */configure || die |
135 |
eprefixify */*.h |
136 |
} |
137 |
|
138 |
src_test() { |
139 |
Xemake test || die "Xmake failed" |
140 |
} |
141 |
|
142 |
src_install() { |
143 |
local l bl |
144 |
|
145 |
emake \ |
146 |
DESTDIR="${D}" \ |
147 |
INSTALL_ROOT="${D}" \ |
148 |
install || die "emake install failed" |
149 |
|
150 |
# Make library links |
151 |
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do |
152 |
bl=$(basename $l) |
153 |
dosym Img1.4/${bl} /usr/$(get_libdir)/${bl} |
154 |
done |
155 |
|
156 |
dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die |
157 |
|
158 |
if use doc; then |
159 |
insinto /usr/share/doc/${PF} |
160 |
doins demo.tcl || die |
161 |
insinto /usr/share/doc/${PF}/html |
162 |
doins -r doc/* || die |
163 |
fi |
164 |
} |