12 files changed, 9 insertions, 19 deletions
diff --git a/dev-libs/mini-xml/Manifest b/dev-libs/mxml/Manifest
index 416b138c3931..416b138c3931 100644
--- a/dev-libs/mini-xml/Manifest
+++ b/dev-libs/mxml/Manifest
diff --git a/dev-libs/mini-xml/files/respect-users-flags.patch b/dev-libs/mxml/files/respect-users-flags.patch
index 90e49cf2198e..90e49cf2198e 100644
--- a/dev-libs/mini-xml/files/respect-users-flags.patch
+++ b/dev-libs/mxml/files/respect-users-flags.patch
diff --git a/dev-libs/mini-xml/metadata.xml b/dev-libs/mxml/metadata.xml
index a4af87ab4c46..a4af87ab4c46 100644
--- a/dev-libs/mini-xml/metadata.xml
+++ b/dev-libs/mxml/metadata.xml
diff --git a/dev-libs/mini-xml/mini-xml-2.10.ebuild b/dev-libs/mxml/mxml-2.10.ebuild
index 1b30124a228f..2406db40c704 100644
--- a/dev-libs/mini-xml/mini-xml-2.10.ebuild
+++ b/dev-libs/mxml/mxml-2.10.ebuild
@@ -5,11 +5,9 @@ EAPI=6
 
 inherit autotools
 
-MY_P="${P/mini-xml/mxml}"
-
 DESCRIPTION="Small XML parsing library to read XML and XML-like data files"
 HOMEPAGE="http://www.minixml.org/"
-SRC_URI="http://www.msweet.org/files/project3/${MY_P}.tar.gz"
+SRC_URI="http://www.msweet.org/files/project3/${P}.tar.gz"
 
 LICENSE="Mini-XML"
 SLOT="0"
@@ -19,8 +17,6 @@ IUSE="threads static-libs"
 DEPEND="virtual/pkgconfig"
 RDEPEND=""
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
 	sed -e "s:755 -s:755:" \
diff --git a/dev-libs/mini-xml/mini-xml-2.11.ebuild b/dev-libs/mxml/mxml-2.11.ebuild
index 6a29195944da..6a58f55a52bd 100644
--- a/dev-libs/mini-xml/mini-xml-2.11.ebuild
+++ b/dev-libs/mxml/mxml-2.11.ebuild
@@ -5,12 +5,10 @@ EAPI=6
 
 inherit autotools
 
-MY_P="${P/mini-xml/mxml}"
-
 DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
 HOMEPAGE="https://github.com/michaelrsweet/mxml
 	https://www.msweet.org/mxml/"
-SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/michaelrsweet/mxml/releases/download/v${PV}/${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="Mini-XML"
diff --git a/dev-libs/mini-xml/mini-xml-2.12.ebuild b/dev-libs/mxml/mxml-2.12.ebuild
index 955dcacc9eee..7a98fc553860 100644
--- a/dev-libs/mini-xml/mini-xml-2.12.ebuild
+++ b/dev-libs/mxml/mxml-2.12.ebuild
@@ -5,13 +5,10 @@ EAPI="7"
 
 inherit autotools
 
-MY_PN="mxml"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="A small XML parsing library that you can use to read XML data files or strings"
 HOMEPAGE="https://github.com/michaelrsweet/mxml
 	https://www.msweet.org/mxml/"
-SRC_URI="https://github.com/michaelrsweet/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+SRC_URI="https://github.com/michaelrsweet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 LICENSE="Mini-XML"
@@ -20,8 +17,6 @@ IUSE="static-libs threads"
 
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	default
 
diff --git a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
index 291b1f091c68..e38ffacba8d5 100644
--- a/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
+++ b/media-sound/forked-daapd/forked-daapd-23.2-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-libs/libevent
 	dev-libs/libgcrypt:0
 	dev-libs/libunistring
-	dev-libs/mini-xml[threads]
+	dev-libs/mxml[threads]
 	media-libs/alsa-lib
 	net-dns/avahi[dbus]
 	virtual/ffmpeg
diff --git a/media-sound/yoshimi/yoshimi-1.4.1.ebuild b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
index 7c8f3e4ee739..d7d64c58b5a2 100644
--- a/media-sound/yoshimi/yoshimi-1.4.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+lv2"
 
 RDEPEND="
-	>=dev-libs/mini-xml-2.5
+	>=dev-libs/mxml-2.5
 	>=media-libs/alsa-lib-1.0.17
 	media-libs/fontconfig
 	media-libs/libsndfile
diff --git a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
index b33e6064a78d..b8e82d9c8ffe 100644
--- a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+lv2"
 
 RDEPEND="
-	>=dev-libs/mini-xml-2.5
+	>=dev-libs/mxml-2.5
 	>=media-libs/alsa-lib-1.0.17
 	media-libs/fontconfig
 	media-libs/libsndfile
diff --git a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
index a926a1d6d595..c5fd3cc38be7 100644
--- a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+lv2"
 
 RDEPEND="
-	>=dev-libs/mini-xml-2.5
+	>=dev-libs/mxml-2.5
 	>=media-libs/alsa-lib-1.0.17
 	media-libs/fontconfig
 	media-libs/libsndfile
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
index 988efc1b9940..b929690c9c52 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa +fltk jack lash"
 
-RDEPEND=">=dev-libs/mini-xml-2.2.1
+RDEPEND=">=dev-libs/mxml-2.2.1
 	sci-libs/fftw:3.0
 	media-libs/liblo
 	alsa? ( media-libs/alsa-lib )
diff --git a/profiles/updates/4Q-2018 b/profiles/updates/4Q-2018
index e579bb4e45f4..663e1d6f0967 100644
--- a/profiles/updates/4Q-2018
+++ b/profiles/updates/4Q-2018
@@ -1,2 +1,3 @@
 slotmove dev-libs/girara 3 0
 move dev-python/CommonMark dev-python/commonmark
+move dev-libs/mini-xml dev-libs/mxml