1 |
flameeyes 10/11/29 13:43:03 |
2 |
|
3 |
Modified: ChangeLog opensc-0.11.13.ebuild |
4 |
Added: opensc-0.11.13-r1.ebuild |
5 |
Log: |
6 |
Fix build with recent pcsc-lite (backport from upstream); closes bug #341371; add dependency over libtool (needed for ltdl), and over readline (it was automagic before). In r1 instead add USE flag for readline, OpenSSL and zlib, and rebuild autotools with modern versions to fix bug #317295. |
7 |
|
8 |
(Portage version: 2.2.0_alpha6/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.102 dev-libs/opensc/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/ChangeLog?rev=1.102&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/ChangeLog?rev=1.102&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/ChangeLog?r1=1.101&r2=1.102 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v |
20 |
retrieving revision 1.101 |
21 |
retrieving revision 1.102 |
22 |
diff -u -r1.101 -r1.102 |
23 |
--- ChangeLog 17 Oct 2010 18:02:28 -0000 1.101 |
24 |
+++ ChangeLog 29 Nov 2010 13:43:03 -0000 1.102 |
25 |
@@ -1,6 +1,15 @@ |
26 |
# ChangeLog for dev-libs/opensc |
27 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.101 2010/10/17 18:02:28 arfrever Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.102 2010/11/29 13:43:03 flameeyes Exp $ |
30 |
+ |
31 |
+*opensc-0.11.13-r1 (29 Nov 2010) |
32 |
+ |
33 |
+ 29 Nov 2010; Diego E. Pettenò <flameeyes@g.o> opensc-0.11.13.ebuild, |
34 |
+ +opensc-0.11.13-r1.ebuild, +files/opensc-0.11.13+pcsc-lite-1.6.2.patch: |
35 |
+ Fix build with recent pcsc-lite (backport from upstream); closes bug #341371; |
36 |
+ add dependency over libtool (needed for ltdl), and over readline (it was |
37 |
+ automagic before). In r1 instead add USE flag for readline, OpenSSL and zlib, |
38 |
+ and rebuild autotools with modern versions to fix bug #317295. |
39 |
|
40 |
17 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
41 |
opensc-0.11.13.ebuild: |
42 |
|
43 |
|
44 |
|
45 |
1.8 dev-libs/opensc/opensc-0.11.13.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/opensc-0.11.13.ebuild?rev=1.8&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/opensc-0.11.13.ebuild?rev=1.8&content-type=text/plain |
49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/opensc-0.11.13.ebuild?r1=1.7&r2=1.8 |
50 |
|
51 |
Index: opensc-0.11.13.ebuild |
52 |
=================================================================== |
53 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.13.ebuild,v |
54 |
retrieving revision 1.7 |
55 |
retrieving revision 1.8 |
56 |
diff -u -r1.7 -r1.8 |
57 |
--- opensc-0.11.13.ebuild 17 Oct 2010 18:02:28 -0000 1.7 |
58 |
+++ opensc-0.11.13.ebuild 29 Nov 2010 13:43:03 -0000 1.8 |
59 |
@@ -1,9 +1,11 @@ |
60 |
# Copyright 1999-2010 Gentoo Foundation |
61 |
# Distributed under the terms of the GNU General Public License v2 |
62 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.13.ebuild,v 1.7 2010/10/17 18:02:28 arfrever Exp $ |
63 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.13.ebuild,v 1.8 2010/11/29 13:43:03 flameeyes Exp $ |
64 |
|
65 |
EAPI="2" |
66 |
|
67 |
+inherit eutils |
68 |
+ |
69 |
DESCRIPTION="SmartCard library and applications" |
70 |
HOMEPAGE="http://www.opensc-project.org/opensc/" |
71 |
|
72 |
@@ -14,8 +16,11 @@ |
73 |
SLOT="0" |
74 |
IUSE="doc openct pcsc-lite" |
75 |
|
76 |
+# libtool is required at runtime for libltdl |
77 |
RDEPEND="dev-libs/openssl |
78 |
sys-libs/zlib |
79 |
+ sys-devel/libtool |
80 |
+ sys-libs/readline |
81 |
openct? ( >=dev-libs/openct-0.5.0 ) |
82 |
pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )" |
83 |
DEPEND="${RDEPEND} |
84 |
@@ -28,6 +33,10 @@ |
85 |
fi |
86 |
} |
87 |
|
88 |
+src_prepare() { |
89 |
+ epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.2.patch |
90 |
+} |
91 |
+ |
92 |
src_configure() { |
93 |
econf \ |
94 |
--docdir="/usr/share/doc/${PF}" \ |
95 |
|
96 |
|
97 |
|
98 |
1.1 dev-libs/opensc/opensc-0.11.13-r1.ebuild |
99 |
|
100 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/opensc-0.11.13-r1.ebuild?rev=1.1&view=markup |
101 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/opensc/opensc-0.11.13-r1.ebuild?rev=1.1&content-type=text/plain |
102 |
|
103 |
Index: opensc-0.11.13-r1.ebuild |
104 |
=================================================================== |
105 |
# Copyright 1999-2010 Gentoo Foundation |
106 |
# Distributed under the terms of the GNU General Public License v2 |
107 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.13-r1.ebuild,v 1.1 2010/11/29 13:43:03 flameeyes Exp $ |
108 |
|
109 |
EAPI="2" |
110 |
|
111 |
inherit eutils autotools |
112 |
|
113 |
DESCRIPTION="SmartCard library and applications" |
114 |
HOMEPAGE="http://www.opensc-project.org/opensc/" |
115 |
|
116 |
SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz" |
117 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
118 |
|
119 |
LICENSE="LGPL-2.1" |
120 |
SLOT="0" |
121 |
IUSE="doc openct pcsc-lite readline ssl zlib" |
122 |
|
123 |
# libtool is required at runtime for libltdl |
124 |
RDEPEND=" |
125 |
sys-devel/libtool |
126 |
zlib? ( sys-libs/zlib ) |
127 |
readline? ( sys-libs/readline ) |
128 |
ssl? ( dev-libs/openssl ) |
129 |
openct? ( >=dev-libs/openct-0.5.0 ) |
130 |
pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )" |
131 |
DEPEND="${RDEPEND} |
132 |
dev-util/pkgconfig" |
133 |
|
134 |
pkg_setup() { |
135 |
if use openct; then |
136 |
elog "Support for openct is deprecated." |
137 |
elog "It is recommended to use pcsc-lite." |
138 |
fi |
139 |
} |
140 |
|
141 |
src_prepare() { |
142 |
epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.2.patch |
143 |
|
144 |
eautoreconf |
145 |
} |
146 |
|
147 |
src_configure() { |
148 |
econf \ |
149 |
--docdir="/usr/share/doc/${PF}" \ |
150 |
--htmldir="/usr/share/doc/${PF}/html" \ |
151 |
$(use_enable doc) \ |
152 |
$(use_enable openct) \ |
153 |
$(use_enable pcsc-lite pcsc) \ |
154 |
$(use_enable readline) \ |
155 |
$(use_enable ssl openssl) \ |
156 |
$(use_enable zlib) \ |
157 |
--with-pinentry="/usr/bin/pinentry" |
158 |
} |
159 |
|
160 |
src_install() { |
161 |
emake DESTDIR="${D}" install || die "emake install failed" |
162 |
} |