1 |
jlec 10/04/23 10:44:12 |
2 |
|
3 |
Modified: expect-5.43.0-r1.ebuild ChangeLog |
4 |
expect-5.44.1.15.ebuild |
5 |
Log: |
6 |
Reintroduced USE=X again on request of aballier |
7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 dev-tcltk/expect/expect-5.43.0-r1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: expect-5.43.0-r1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- expect-5.43.0-r1.ebuild 17 Apr 2010 13:40:36 -0000 1.2 |
23 |
+++ expect-5.43.0-r1.ebuild 23 Apr 2010 10:44:12 -0000 1.3 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2010 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v 1.2 2010/04/17 13:40:36 jlec Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v 1.3 2010/04/23 10:44:12 jlec Exp $ |
29 |
|
30 |
EAPI="3" |
31 |
|
32 |
@@ -14,11 +14,12 @@ |
33 |
LICENSE="BSD" |
34 |
SLOT="0" |
35 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" |
36 |
-IUSE="doc" |
37 |
+IUSE="doc X" |
38 |
|
39 |
# We need dejagnu for src_test, but dejagnu needs expect |
40 |
# to compile/run, so we cant add dejagnu to DEPEND :/ |
41 |
-DEPEND=">=dev-lang/tk-8.2" |
42 |
+DEPEND=">=dev-lang/tcl-8.2 |
43 |
+ X? ( >=dev-lang/tk-8.2 )" |
44 |
RDEPEND="${DEPEND}" |
45 |
|
46 |
NON_MICRO_V=${PN}-$(get_version_component_range 1-2) |
47 |
@@ -61,13 +62,20 @@ |
48 |
src_configure() { |
49 |
local myconf |
50 |
local tcl_version |
51 |
- tcl_version="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)" |
52 |
+ tcl_version="$(best_version dev-lang/tcl | cut -d- -f3 | cut -d. -f1,2)" |
53 |
TCL_HDIR="${EPREFIX}/usr/$(get_libdir)/tcl${tcl_version}/include" |
54 |
- |
55 |
#configure needs to find the file tclConfig.sh is |
56 |
myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${TCL_HDIR}" |
57 |
|
58 |
- myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir)" |
59 |
+ if use X ; then |
60 |
+ #--with-x is enabled by default |
61 |
+ #configure needs to find the file tkConfig.sh and tk.h |
62 |
+ #tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude |
63 |
+ myconf="$myconf --with-tk=/usr/$(get_libdir)" |
64 |
+ else |
65 |
+ #configure knows that tk depends on X so just disable X |
66 |
+ myconf="$myconf --without-x" |
67 |
+ fi |
68 |
|
69 |
econf $myconf --enable-shared |
70 |
} |
71 |
|
72 |
|
73 |
|
74 |
1.71 dev-tcltk/expect/ChangeLog |
75 |
|
76 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?rev=1.71&view=markup |
77 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?rev=1.71&content-type=text/plain |
78 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?r1=1.70&r2=1.71 |
79 |
|
80 |
Index: ChangeLog |
81 |
=================================================================== |
82 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v |
83 |
retrieving revision 1.70 |
84 |
retrieving revision 1.71 |
85 |
diff -u -r1.70 -r1.71 |
86 |
--- ChangeLog 17 Apr 2010 13:40:36 -0000 1.70 |
87 |
+++ ChangeLog 23 Apr 2010 10:44:12 -0000 1.71 |
88 |
@@ -1,6 +1,10 @@ |
89 |
# ChangeLog for dev-tcltk/expect |
90 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
91 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.70 2010/04/17 13:40:36 jlec Exp $ |
92 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.71 2010/04/23 10:44:12 jlec Exp $ |
93 |
+ |
94 |
+ 23 Apr 2010; Justin Lecher <jlec@g.o> expect-5.43.0-r1.ebuild, |
95 |
+ expect-5.44.1.15.ebuild: |
96 |
+ Reintroduced USE=X again on request of aballier |
97 |
|
98 |
17 Apr 2010; Justin Lecher <jlec@g.o> expect-5.43.0-r1.ebuild, |
99 |
expect-5.44.1.15.ebuild: |
100 |
|
101 |
|
102 |
|
103 |
1.4 dev-tcltk/expect/expect-5.44.1.15.ebuild |
104 |
|
105 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?rev=1.4&view=markup |
106 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?rev=1.4&content-type=text/plain |
107 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?r1=1.3&r2=1.4 |
108 |
|
109 |
Index: expect-5.44.1.15.ebuild |
110 |
=================================================================== |
111 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v |
112 |
retrieving revision 1.3 |
113 |
retrieving revision 1.4 |
114 |
diff -u -r1.3 -r1.4 |
115 |
--- expect-5.44.1.15.ebuild 17 Apr 2010 13:40:36 -0000 1.3 |
116 |
+++ expect-5.44.1.15.ebuild 23 Apr 2010 10:44:12 -0000 1.4 |
117 |
@@ -1,6 +1,6 @@ |
118 |
# Copyright 1999-2010 Gentoo Foundation |
119 |
# Distributed under the terms of the GNU General Public License v2 |
120 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.3 2010/04/17 13:40:36 jlec Exp $ |
121 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.4 2010/04/23 10:44:12 jlec Exp $ |
122 |
|
123 |
EAPI="3" |
124 |
|
125 |
@@ -14,11 +14,12 @@ |
126 |
LICENSE="BSD" |
127 |
SLOT="0" |
128 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" |
129 |
-IUSE="doc" |
130 |
+IUSE="debug doc threads X" |
131 |
|
132 |
# We need dejagnu for src_test, but dejagnu needs expect |
133 |
# to compile/run, so we cant add dejagnu to DEPEND :/ |
134 |
-DEPEND=">=dev-lang/tk-8.2" |
135 |
+DEPEND=">=dev-lang/tcl-8.2[threads?] |
136 |
+ X? ( >=dev-lang/tk-8.2[threads?] )" |
137 |
RDEPEND="${DEPEND}" |
138 |
|
139 |
src_prepare() { |
140 |
@@ -49,14 +50,25 @@ |
141 |
# version number. |
142 |
tclv=$(grep TCL_VER ${EPREFIX}/usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/') |
143 |
#tkv isn't really needed, included for symmetry and the future |
144 |
- #tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/') |
145 |
- |
146 |
- #configure needs to find the files tclConfig.sh and tclInt.h |
147 |
+ #tkv=$(grep TK_VER ${EPREFIX}/usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/') |
148 |
myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/tcl${tclv}/include/generic" |
149 |
|
150 |
- myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include" |
151 |
- |
152 |
- econf $myconf --enable-shared || die "econf failed" |
153 |
+# if use X ; then |
154 |
+ #--with-x is enabled by default |
155 |
+ #configure needs to find the file tkConfig.sh and tk.h |
156 |
+ #tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude |
157 |
+ myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include" |
158 |
+# else |
159 |
+# #configure knows that tk depends on X so just disable X |
160 |
+# myconf="$myconf --without-x" |
161 |
+# fi |
162 |
+ |
163 |
+ econf \ |
164 |
+ $myconf \ |
165 |
+ --enable-shared \ |
166 |
+ $(use_enable threads) \ |
167 |
+ $(use_enable amd64 64bit) \ |
168 |
+ $(use_enable debug symbols) |
169 |
} |
170 |
|
171 |
src_test() { |
172 |
@@ -76,11 +88,11 @@ |
173 |
if use doc ; then |
174 |
docinto examples |
175 |
local scripts=$(make -qp | \ |
176 |
- sed -e 's/^SCRIPTS = //' -et -ed | head -n1) |
177 |
- exeinto /usr/share/doc/${PF}/examples |
178 |
- doexe ${scripts} |
179 |
+ sed -e 's/^SCRIPTS = //' -et -ed | head -n1) |
180 |
+ insinto /usr/share/doc/${PF}/examples |
181 |
+ doins ${scripts} || die |
182 |
local scripts_manpages=$(make -qp | \ |
183 |
- sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1) |
184 |
+ sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1) |
185 |
for m in ${scripts_manpages}; do |
186 |
dodoc example/${m}.man |
187 |
done |