Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, dev-libs/mxml/, media-sound/zynaddsubfx/, ...
Date: Mon, 22 Oct 2018 20:14:23
Message-Id: 1540239164.2ac93ff3e53e4ffae61c678c94dea053c09dbc4c.mgorny@gentoo
1 commit: 2ac93ff3e53e4ffae61c678c94dea053c09dbc4c
2 Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com>
3 AuthorDate: Sat Oct 20 20:54:10 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 22 20:12:44 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac93ff3
7
8 dev-libs/mini-xml: renamed to dev-libs/mxml for matching upstream
9
10 Bug: https://bugs.gentoo.org/668604
11 Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
12 Closes: https://github.com/gentoo/gentoo/pull/10141
13 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
14
15 dev-libs/{mini-xml => mxml}/Manifest | 0
16 dev-libs/{mini-xml => mxml}/files/respect-users-flags.patch | 0
17 dev-libs/{mini-xml => mxml}/metadata.xml | 0
18 dev-libs/{mini-xml/mini-xml-2.10.ebuild => mxml/mxml-2.10.ebuild} | 6 +-----
19 dev-libs/{mini-xml/mini-xml-2.11.ebuild => mxml/mxml-2.11.ebuild} | 4 +---
20 dev-libs/{mini-xml/mini-xml-2.12.ebuild => mxml/mxml-2.12.ebuild} | 7 +------
21 media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild | 2 +-
22 media-sound/yoshimi/yoshimi-1.4.1.ebuild | 2 +-
23 media-sound/yoshimi/yoshimi-1.5.1.1.ebuild | 2 +-
24 media-sound/yoshimi/yoshimi-1.5.8.2.ebuild | 2 +-
25 media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild | 2 +-
26 profiles/updates/4Q-2018 | 1 +
27 12 files changed, 9 insertions(+), 19 deletions(-)
28
29 diff --git a/dev-libs/mini-xml/Manifest b/dev-libs/mxml/Manifest
30 similarity index 100%
31 rename from dev-libs/mini-xml/Manifest
32 rename to dev-libs/mxml/Manifest
33
34 diff --git a/dev-libs/mini-xml/files/respect-users-flags.patch b/dev-libs/mxml/files/respect-users-flags.patch
35 similarity index 100%
36 rename from dev-libs/mini-xml/files/respect-users-flags.patch
37 rename to dev-libs/mxml/files/respect-users-flags.patch
38
39 diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mxml/metadata.xml
40 similarity index 100%
41 rename from dev-libs/mini-xml/metadata.xml
42 rename to dev-libs/mxml/metadata.xml
43
44 diff --git a/dev-libs/mini-xml/mini-xml-2.10.ebuild b/dev-libs/mxml/mxml-2.10.ebuild
45 similarity index 91%
46 rename from dev-libs/mini-xml/mini-xml-2.10.ebuild
47 rename to dev-libs/mxml/mxml-2.10.ebuild
48 index 1b30124a228..2406db40c70 100644
49 --- a/dev-libs/mini-xml/mini-xml-2.10.ebuild
50 +++ b/dev-libs/mxml/mxml-2.10.ebuild
51 @@ -5,11 +5,9 @@ EAPI=6
52
53 inherit autotools
54
55 -MY_P="${P/mini-xml/mxml}"
56 -
57 DESCRIPTION="Small XML parsing library to read XML and XML-like data files"
58 HOMEPAGE="http://www.minixml.org/"
59 -SRC_URI="http://www.msweet.org/files/project3/${MY_P}.tar.gz"
60 +SRC_URI="http://www.msweet.org/files/project3/${P}.tar.gz"
61
62 LICENSE="Mini-XML"
63 SLOT="0"
64 @@ -19,8 +17,6 @@ IUSE="threads static-libs"
65 DEPEND="virtual/pkgconfig"
66 RDEPEND=""
67
68 -S="${WORKDIR}/${MY_P}"
69 -
70 src_prepare() {
71 default
72 sed -e "s:755 -s:755:" \
73
74 diff --git a/dev-libs/mini-xml/mini-xml-2.11.ebuild b/dev-libs/mxml/mxml-2.11.ebuild
75 similarity index 94%
76 rename from dev-libs/mini-xml/mini-xml-2.11.ebuild
77 rename to dev-libs/mxml/mxml-2.11.ebuild
78 index 6a29195944d..6a58f55a52b 100644
79 --- a/dev-libs/mini-xml/mini-xml-2.11.ebuild
80 +++ b/dev-libs/mxml/mxml-2.11.ebuild
81 @@ -5,12 +5,10 @@ EAPI=6
82
83 inherit autotools
84
85 -MY_P="${P/mini-xml/mxml}"
86 -
87 DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
88 HOMEPAGE="https://github.com/michaelrsweet/mxml
89 https://www.msweet.org/mxml/"
90 -SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${MY_P}.tar.gz"
91 +SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${P}.tar.gz"
92
93 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
94 LICENSE="Mini-XML"
95
96 diff --git a/dev-libs/mini-xml/mini-xml-2.12.ebuild b/dev-libs/mxml/mxml-2.12.ebuild
97 similarity index 89%
98 rename from dev-libs/mini-xml/mini-xml-2.12.ebuild
99 rename to dev-libs/mxml/mxml-2.12.ebuild
100 index 955dcacc9ee..7a98fc55386 100644
101 --- a/dev-libs/mini-xml/mini-xml-2.12.ebuild
102 +++ b/dev-libs/mxml/mxml-2.12.ebuild
103 @@ -5,13 +5,10 @@ EAPI="7"
104
105 inherit autotools
106
107 -MY_PN="mxml"
108 -MY_P="${MY_PN}-${PV}"
109 -
110 DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
111 HOMEPAGE="https://github.com/michaelrsweet/mxml
112 https://www.msweet.org/mxml/"
113 -SRC_URI="https://github.com/michaelrsweet/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
114 +SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
115
116 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
117 LICENSE="Mini-XML"
118 @@ -20,8 +17,6 @@ IUSE="static-libs threads"
119
120 BDEPEND="virtual/pkgconfig"
121
122 -S="${WORKDIR}/${MY_P}"
123 -
124 src_prepare() {
125 default
126
127
128 diff --git a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
129 index 291b1f091c6..e38ffacba8d 100644
130 --- a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
131 +++ b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
132 @@ -25,7 +25,7 @@ RDEPEND="
133 dev-libs/libevent
134 dev-libs/libgcrypt:0
135 dev-libs/libunistring
136 - dev-libs/mini-xml[threads]
137 + dev-libs/mxml[threads]
138 media-libs/alsa-lib
139 net-dns/avahi[dbus]
140 virtual/ffmpeg
141
142 diff --git a/media-sound/yoshimi/yoshimi-1.4.1.ebuild b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
143 index 7c8f3e4ee73..d7d64c58b5a 100644
144 --- a/media-sound/yoshimi/yoshimi-1.4.1.ebuild
145 +++ b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
146 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
147 IUSE="+lv2"
148
149 RDEPEND="
150 - >=dev-libs/mini-xml-2.5
151 + >=dev-libs/mxml-2.5
152 >=media-libs/alsa-lib-1.0.17
153 media-libs/fontconfig
154 media-libs/libsndfile
155
156 diff --git a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
157 index b33e6064a78..b8e82d9c8ff 100644
158 --- a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
159 +++ b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
160 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
161 IUSE="+lv2"
162
163 RDEPEND="
164 - >=dev-libs/mini-xml-2.5
165 + >=dev-libs/mxml-2.5
166 >=media-libs/alsa-lib-1.0.17
167 media-libs/fontconfig
168 media-libs/libsndfile
169
170 diff --git a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
171 index a926a1d6d59..c5fd3cc38be 100644
172 --- a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
173 +++ b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
174 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
175 IUSE="+lv2"
176
177 RDEPEND="
178 - >=dev-libs/mini-xml-2.5
179 + >=dev-libs/mxml-2.5
180 >=media-libs/alsa-lib-1.0.17
181 media-libs/fontconfig
182 media-libs/libsndfile
183
184 diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
185 index 988efc1b994..b929690c9c5 100644
186 --- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
187 +++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
188 @@ -14,7 +14,7 @@ SLOT="0"
189 KEYWORDS="amd64 ~ppc x86"
190 IUSE="alsa +fltk jack lash"
191
192 -RDEPEND=">=dev-libs/mini-xml-2.2.1
193 +RDEPEND=">=dev-libs/mxml-2.2.1
194 sci-libs/fftw:3.0
195 media-libs/liblo
196 alsa? ( media-libs/alsa-lib )
197
198 diff --git a/profiles/updates/4Q-2018 b/profiles/updates/4Q-2018
199 index e579bb4e45f..663e1d6f096 100644
200 --- a/profiles/updates/4Q-2018
201 +++ b/profiles/updates/4Q-2018
202 @@ -1,2 +1,3 @@
203 slotmove dev-libs/girara 3 0
204 move dev-python/CommonMark dev-python/commonmark
205 +move dev-libs/mini-xml dev-libs/mxml