1 |
jer 11/05/02 06:03:40 |
2 |
|
3 |
Modified: ChangeLog gsasl-1.6.0-r1.ebuild gsasl-1.6.0.ebuild |
4 |
Log: |
5 |
Fix USE=static in other ebuilds too. |
6 |
|
7 |
(Portage version: 2.2.0_alpha30/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.40 net-misc/gsasl/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/ChangeLog?rev=1.40&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/ChangeLog?rev=1.40&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/ChangeLog?r1=1.39&r2=1.40 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v |
19 |
retrieving revision 1.39 |
20 |
retrieving revision 1.40 |
21 |
diff -u -r1.39 -r1.40 |
22 |
--- ChangeLog 2 May 2011 05:46:06 -0000 1.39 |
23 |
+++ ChangeLog 2 May 2011 06:03:40 -0000 1.40 |
24 |
@@ -1,6 +1,10 @@ |
25 |
# ChangeLog for net-misc/gsasl |
26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.39 2011/05/02 05:46:06 jer Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/ChangeLog,v 1.40 2011/05/02 06:03:40 jer Exp $ |
29 |
+ |
30 |
+ 02 May 2011; Jeroen Roovers <jer@g.o> gsasl-1.6.0.ebuild, |
31 |
+ gsasl-1.6.0-r1.ebuild: |
32 |
+ Fix USE=static in other ebuilds too. |
33 |
|
34 |
*gsasl-1.6.1 (02 May 2011) |
35 |
|
36 |
|
37 |
|
38 |
|
39 |
1.2 net-misc/gsasl/gsasl-1.6.0-r1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/gsasl-1.6.0-r1.ebuild?rev=1.2&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/gsasl-1.6.0-r1.ebuild?rev=1.2&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/gsasl-1.6.0-r1.ebuild?r1=1.1&r2=1.2 |
44 |
|
45 |
Index: gsasl-1.6.0-r1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.0-r1.ebuild,v |
48 |
retrieving revision 1.1 |
49 |
retrieving revision 1.2 |
50 |
diff -u -r1.1 -r1.2 |
51 |
--- gsasl-1.6.0-r1.ebuild 25 Apr 2011 15:13:59 -0000 1.1 |
52 |
+++ gsasl-1.6.0-r1.ebuild 2 May 2011 06:03:40 -0000 1.2 |
53 |
@@ -1,16 +1,18 @@ |
54 |
# Copyright 1999-2011 Gentoo Foundation |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.0-r1.ebuild,v 1.1 2011/04/25 15:13:59 eras Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.0-r1.ebuild,v 1.2 2011/05/02 06:03:40 jer Exp $ |
58 |
|
59 |
EAPI="2" |
60 |
|
61 |
+inherit autotools-utils |
62 |
+ |
63 |
DESCRIPTION="The GNU SASL client, server, and library" |
64 |
HOMEPAGE="http://www.gnu.org/software/gsasl/" |
65 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" |
66 |
LICENSE="GPL-3" |
67 |
SLOT="0" |
68 |
KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
69 |
-IUSE="doc gcrypt idn kerberos nls ntlm static" |
70 |
+IUSE="doc gcrypt idn kerberos nls ntlm static-libs" |
71 |
|
72 |
DEPEND=" |
73 |
gcrypt? ( dev-libs/libgcrypt ) |
74 |
@@ -37,11 +39,12 @@ |
75 |
$(use_with idn stringprep) \ |
76 |
$(use_enable ntlm) \ |
77 |
$(use_with ntlm libntlm) \ |
78 |
- $(use_enable static) |
79 |
+ $(use_enable static-libs static) |
80 |
} |
81 |
|
82 |
src_install() { |
83 |
emake DESTDIR="${D}" install || die "emake install failed" |
84 |
+ use static-libs || remove_libtool_files |
85 |
dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS |
86 |
doman doc/gsasl.1 doc/man/*.3 |
87 |
|
88 |
|
89 |
|
90 |
|
91 |
1.3 net-misc/gsasl/gsasl-1.6.0.ebuild |
92 |
|
93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/gsasl-1.6.0.ebuild?rev=1.3&view=markup |
94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/gsasl-1.6.0.ebuild?rev=1.3&content-type=text/plain |
95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/gsasl/gsasl-1.6.0.ebuild?r1=1.2&r2=1.3 |
96 |
|
97 |
Index: gsasl-1.6.0.ebuild |
98 |
=================================================================== |
99 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.0.ebuild,v |
100 |
retrieving revision 1.2 |
101 |
retrieving revision 1.3 |
102 |
diff -u -r1.2 -r1.3 |
103 |
--- gsasl-1.6.0.ebuild 15 Mar 2011 19:25:00 -0000 1.2 |
104 |
+++ gsasl-1.6.0.ebuild 2 May 2011 06:03:40 -0000 1.3 |
105 |
@@ -1,6 +1,10 @@ |
106 |
# Copyright 1999-2011 Gentoo Foundation |
107 |
# Distributed under the terms of the GNU General Public License v2 |
108 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.0.ebuild,v 1.2 2011/03/15 19:25:00 jer Exp $ |
109 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsasl/gsasl-1.6.0.ebuild,v 1.3 2011/05/02 06:03:40 jer Exp $ |
110 |
+ |
111 |
+EAPI="2" |
112 |
+ |
113 |
+inherit autotools-utils |
114 |
|
115 |
DESCRIPTION="The GNU SASL client, server, and library" |
116 |
HOMEPAGE="http://www.gnu.org/software/gsasl/" |
117 |
@@ -8,7 +12,7 @@ |
118 |
LICENSE="GPL-3" |
119 |
SLOT="0" |
120 |
KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
121 |
-IUSE="doc gcrypt idn kerberos nls static" |
122 |
+IUSE="doc gcrypt idn kerberos nls static-libs" |
123 |
|
124 |
# TODO: check http://www.gnu.org/software/gsasl/#dependencies for more |
125 |
# optional external libraries. |
126 |
@@ -20,7 +24,7 @@ |
127 |
" |
128 |
RDEPEND="${DEPEND}" |
129 |
|
130 |
-src_compile() { |
131 |
+src_configure() { |
132 |
econf \ |
133 |
--enable-client \ |
134 |
--enable-server \ |
135 |
@@ -29,13 +33,12 @@ |
136 |
$(use_with gcrypt libgcrypt) \ |
137 |
$(use_enable nls) \ |
138 |
$(use_with idn stringprep) \ |
139 |
- $(use_enable static) \ |
140 |
- || die "econf failed" |
141 |
- emake || die "emake failed" |
142 |
+ $(use_enable static-libs static) |
143 |
} |
144 |
|
145 |
src_install() { |
146 |
make DESTDIR="${D}" install || die "einstall failed" |
147 |
+ use static-libs || remove_libtool_files |
148 |
dodoc AUTHORS ChangeLog NEWS README THANKS |
149 |
doman doc/gsasl.1 |