1 |
commit: 5482d1cfeed1f30fe2640d365142b2e19832bebe |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 29 20:36:39 2017 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 29 20:36:39 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5482d1cf |
7 |
|
8 |
dev-ada/xmlada: Fix reinstalling and eliminate duplicated files |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
dev-ada/xmlada/Manifest | 1 - |
13 |
dev-ada/xmlada/xmlada-2016.ebuild | 57 --------------------------------------- |
14 |
dev-ada/xmlada/xmlada-2017.ebuild | 33 +++++++++++++++++++---- |
15 |
3 files changed, 28 insertions(+), 63 deletions(-) |
16 |
|
17 |
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest |
18 |
index a8b0ab867af..f2cfd0ebb37 100644 |
19 |
--- a/dev-ada/xmlada/Manifest |
20 |
+++ b/dev-ada/xmlada/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST xmlada-gpl-2016-src.tar.gz 1440671 BLAKE2B 32998fbdb680f3a1ea7915f144c3039441d8608ded9fe2df99d9b5c9d13436a020c25a9773cced753ffa3ff89a918bbb1ef3ca310cbc58f583682deb7dcc9d09 SHA512 d1d7c3d91731394235aed4b80c91b1babe30d5f184282fae8087ee556318475e3923ed628b805693fc89a4d9bb219b0fb0937bc5024a742226da0245d36ed652 |
23 |
DIST xmlada-gpl-2017-src.tar.gz 1578393 BLAKE2B 7b4894040b6044e86c96cbd530ebda5c0cfc4ad0e2b472d46798a93f535aca0916b03385a3aef49bd4e59d508a9665c856360e9cab0a4f67b15091228b629d81 SHA512 371f6adc01550a4bb13204ec0404dc1165438db595f4346813e5a23a155de74c857c40c55adde173919c2fe35b3b91d78b235c9718ee86bc848e62ddfd7fa2b4 |
24 |
|
25 |
diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2016.ebuild |
26 |
deleted file mode 100644 |
27 |
index 585a5492bb7..00000000000 |
28 |
--- a/dev-ada/xmlada/xmlada-2016.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,57 +0,0 @@ |
31 |
-# Copyright 1999-2017 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI=6 |
35 |
- |
36 |
-inherit multiprocessing |
37 |
- |
38 |
-MYP=${PN}-gpl-${PV} |
39 |
- |
40 |
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams" |
41 |
-HOMEPAGE="http://libre.adacore.com/" |
42 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 -> |
43 |
- ${MYP}-src.tar.gz" |
44 |
- |
45 |
-LICENSE="GPL-3" |
46 |
-SLOT="0" |
47 |
-KEYWORDS="~amd64" |
48 |
-IUSE="+gnat_2016 gnat_2017 +shared static static-pic" |
49 |
-REQUIRED_USE="|| ( shared static static-pic ) |
50 |
- ^^ ( gnat_2016 gnat_2017 )" |
51 |
- |
52 |
-RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
53 |
- gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )" |
54 |
-DEPEND="${RDEPEND} |
55 |
- dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
56 |
- |
57 |
-S="${WORKDIR}"/${MYP}-src |
58 |
- |
59 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
60 |
- |
61 |
-src_configure () { |
62 |
- econf --prefix="${D}"/usr |
63 |
-} |
64 |
- |
65 |
-src_compile () { |
66 |
- for kind in shared static static-pic; do |
67 |
- if use ${kind}; then |
68 |
- emake PROCESSORS=$(makeopts_jobs) ${kind} |
69 |
- fi |
70 |
- done |
71 |
-} |
72 |
- |
73 |
-src_test() { |
74 |
- emake test |
75 |
- emake run_test | grep DIFF && die |
76 |
-} |
77 |
- |
78 |
-src_install () { |
79 |
- for kind in shared static static-pic; do |
80 |
- if use ${kind}; then |
81 |
- emake PROCESSORS=$(makeopts_jobs) DESTDIR="${D}" install-${kind} |
82 |
- fi |
83 |
- done |
84 |
- einstalldocs |
85 |
- dodoc features-* known-problems-* xmlada-roadmap.txt |
86 |
- rm "${D}"/usr/share/doc/${PN}/.buildinfo || die |
87 |
-} |
88 |
|
89 |
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild |
90 |
index b80b4c4237f..04b53bcdf50 100644 |
91 |
--- a/dev-ada/xmlada/xmlada-2017.ebuild |
92 |
+++ b/dev-ada/xmlada/xmlada-2017.ebuild |
93 |
@@ -33,16 +33,17 @@ src_configure () { |
94 |
} |
95 |
|
96 |
src_compile () { |
97 |
- if use shared; then |
98 |
- gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=relocatable \ |
99 |
+ build () { |
100 |
+ gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \ |
101 |
-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \ |
102 |
-cargs ${ADAFLAGS} || die "gprbuild failed" |
103 |
+ } |
104 |
+ if use shared; then |
105 |
+ build relocatable |
106 |
fi |
107 |
for kind in static static-pic; do |
108 |
if use ${kind}; then |
109 |
- gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=${kind} \ |
110 |
- -XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \ |
111 |
- -cargs ${ADAFLAGS} || die "gprbuild failed" |
112 |
+ build ${kind} |
113 |
fi |
114 |
done |
115 |
} |
116 |
@@ -53,11 +54,33 @@ src_test() { |
117 |
} |
118 |
|
119 |
src_install () { |
120 |
+ local includedir=/usr/include/${PN} |
121 |
+ |
122 |
+ fix_install () { |
123 |
+ mv "${D}"${includedir}/$1.$2/* "${D}"${includedir}/$1/ || die |
124 |
+ for file in "${D}"${includedir}/$1/*; do |
125 |
+ dosym ../$1/$(basename ${file}) \ |
126 |
+ ${includedir}/$1.$2/$(basename ${file}) |
127 |
+ done |
128 |
+ } |
129 |
+ |
130 |
for kind in shared static static-pic; do |
131 |
if use ${kind}; then |
132 |
emake PROCESSORS=$(makeopts_jobs) install-${kind} |
133 |
fi |
134 |
done |
135 |
+ rm "${D}"/usr/lib/libxmlada_* || die |
136 |
+ for dir in xmlada_{dom,input,sax,schema,unicode}; do |
137 |
+ dodir /usr/include/${PN}/${dir} |
138 |
+ if use shared; then |
139 |
+ fix_install ${dir} relocatable |
140 |
+ fi |
141 |
+ for kind in static static-pic; do |
142 |
+ if use ${kind}; then |
143 |
+ fix_install ${dir} ${kind} |
144 |
+ fi |
145 |
+ done |
146 |
+ done |
147 |
einstalldocs |
148 |
dodoc xmlada-roadmap.txt |
149 |
rm "${D}"/usr/share/doc/${PN}/.buildinfo || die |