1 |
jlec 12/01/02 22:13:19 |
2 |
|
3 |
Modified: metadata.xml ChangeLog tdom-0.8.3.ebuild |
4 |
Log: |
5 |
Moved to EAPI=4, handle static-libs correctly |
6 |
|
7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 dev-tcltk/tdom/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/metadata.xml?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/metadata.xml?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/metadata.xml?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/metadata.xml,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- metadata.xml 4 Dec 2008 20:14:05 -0000 1.2 |
23 |
+++ metadata.xml 2 Jan 2012 22:13:19 -0000 1.3 |
24 |
@@ -1,8 +1,8 @@ |
25 |
<?xml version="1.0" encoding="UTF-8"?> |
26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
27 |
<pkgmetadata> |
28 |
-<herd>tcltk</herd> |
29 |
-<longdescription> |
30 |
+ <herd>tcltk</herd> |
31 |
+ <longdescription> |
32 |
tDOM combines high performance XML data processing with easy and |
33 |
powerful Tcl scripting functionality. tDOM should be one of the fastest |
34 |
ways to manipulate XML with a scripting language and uses very few |
35 |
|
36 |
|
37 |
|
38 |
1.12 dev-tcltk/tdom/ChangeLog |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/ChangeLog?rev=1.12&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/ChangeLog?rev=1.12&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/ChangeLog?r1=1.11&r2=1.12 |
43 |
|
44 |
Index: ChangeLog |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v |
47 |
retrieving revision 1.11 |
48 |
retrieving revision 1.12 |
49 |
diff -u -r1.11 -r1.12 |
50 |
--- ChangeLog 24 Jan 2011 13:12:11 -0000 1.11 |
51 |
+++ ChangeLog 2 Jan 2012 22:13:19 -0000 1.12 |
52 |
@@ -1,6 +1,9 @@ |
53 |
# ChangeLog for dev-tcltk/tdom |
54 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.11 2011/01/24 13:12:11 fauli Exp $ |
56 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.12 2012/01/02 22:13:19 jlec Exp $ |
58 |
+ |
59 |
+ 02 Jan 2012; Justin Lecher <jlec@g.o> tdom-0.8.3.ebuild, metadata.xml: |
60 |
+ Moved to EAPI=4, handle static-libs correctly |
61 |
|
62 |
24 Jan 2011; Christian Faulhammer <fauli@g.o> tdom-0.8.2.ebuild: |
63 |
stable x86, bug 351766 |
64 |
|
65 |
|
66 |
|
67 |
1.2 dev-tcltk/tdom/tdom-0.8.3.ebuild |
68 |
|
69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3.ebuild?rev=1.2&view=markup |
70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3.ebuild?rev=1.2&content-type=text/plain |
71 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3.ebuild?r1=1.1&r2=1.2 |
72 |
|
73 |
Index: tdom-0.8.3.ebuild |
74 |
=================================================================== |
75 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3.ebuild,v |
76 |
retrieving revision 1.1 |
77 |
retrieving revision 1.2 |
78 |
diff -u -r1.1 -r1.2 |
79 |
--- tdom-0.8.3.ebuild 21 Jan 2011 08:00:52 -0000 1.1 |
80 |
+++ tdom-0.8.3.ebuild 2 Jan 2012 22:13:19 -0000 1.2 |
81 |
@@ -1,21 +1,22 @@ |
82 |
-# Copyright 1999-2011 Gentoo Foundation |
83 |
+# Copyright 1999-2012 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3.ebuild,v 1.1 2011/01/21 08:00:52 jlec Exp $ |
86 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3.ebuild,v 1.2 2012/01/02 22:13:19 jlec Exp $ |
87 |
|
88 |
-EAPI="3" |
89 |
+EAPI=4 |
90 |
|
91 |
-inherit autotools eutils |
92 |
+inherit autotools eutils multilib |
93 |
|
94 |
MY_P="tDOM-${PV}" |
95 |
|
96 |
DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl" |
97 |
-HOMEPAGE="http://tdom.github.com" |
98 |
-SRC_URI="http://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz" |
99 |
+HOMEPAGE="http://tdom.github.com/" |
100 |
+#SRC_URI="http://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz" |
101 |
+SRC_URI="mirror://github/tDOM/${PN}/${MY_P}.tgz" |
102 |
|
103 |
LICENSE="MPL-1.1" |
104 |
SLOT="0" |
105 |
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
106 |
-IUSE="threads" |
107 |
+IUSE="static-libs threads" |
108 |
|
109 |
DEPEND=" |
110 |
dev-lang/tcl |
111 |
@@ -24,42 +25,37 @@ |
112 |
|
113 |
S="${WORKDIR}/${MY_P}" |
114 |
|
115 |
+PATCHES=( |
116 |
+ "${FILESDIR}/"${PN}-0.8.2.patch |
117 |
+ "${FILESDIR}/"${PN}-0.8.2-soname.patch |
118 |
+ "${FILESDIR}/"${P}-expat.patch |
119 |
+ "${FILESDIR}/"${PN}-0.8.2-tnc.patch |
120 |
+ ) |
121 |
+ |
122 |
src_prepare() { |
123 |
- epatch \ |
124 |
- "${FILESDIR}/"${PN}-0.8.2.patch \ |
125 |
- "${FILESDIR}/"${PN}-0.8.2-soname.patch \ |
126 |
- "${FILESDIR}/"${P}-expat.patch \ |
127 |
- "${FILESDIR}/"${PN}-0.8.2-tnc.patch |
128 |
+ epatch "${PATCHES[@]}" |
129 |
eautoreconf |
130 |
} |
131 |
|
132 |
src_configure() { |
133 |
- local myconf="" |
134 |
- |
135 |
- myconf="${myconf} |
136 |
+ local myeconfargs=( |
137 |
$(use_enable threads) |
138 |
--enable-shared |
139 |
--disable-tdomalloc |
140 |
- --with-expat" |
141 |
- |
142 |
- cd "${S}"/unix |
143 |
- ECONF_SOURCE=".." econf ${myconf} |
144 |
+ --with-expat |
145 |
+ ) |
146 |
|
147 |
- # compile tdomhtml |
148 |
- cd "${S}"/extensions/tdomhtml |
149 |
- econf |
150 |
- |
151 |
- # compile tnc |
152 |
- cd "${S}"/extensions/tnc |
153 |
- econf ${myconf} |
154 |
+ cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs} |
155 |
+ cd "${S}"/extensions/tdomhtml && econf ${myeconfargs} |
156 |
+ cd "${S}"/extensions/tnc && econf ${myeconfargs} |
157 |
} |
158 |
|
159 |
src_compile() { |
160 |
local dir |
161 |
|
162 |
- for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do |
163 |
+ for dir in "${S}"/unix "${S}"/extensions/tnc; do |
164 |
pushd ${dir} > /dev/null |
165 |
- emake || die |
166 |
+ emake |
167 |
popd > /dev/null |
168 |
done |
169 |
} |
170 |
@@ -67,11 +63,16 @@ |
171 |
src_install() { |
172 |
local dir |
173 |
|
174 |
- dodoc CHANGES ChangeLog README* || die |
175 |
+ dodoc CHANGES ChangeLog README* |
176 |
|
177 |
for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do |
178 |
pushd ${dir} > /dev/null |
179 |
- emake DESTDIR="${D}" install || die |
180 |
+ emake DESTDIR="${D}" install |
181 |
popd > /dev/null |
182 |
done |
183 |
+ |
184 |
+ if ! use static-libs; then |
185 |
+ einfo "Removing static libs ..." |
186 |
+ rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die |
187 |
+ fi |
188 |
} |