dev-libs/mini-xml: renamed to dev-libs/mxml for matching upstream

Bug: https://bugs.gentoo.org/668604
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/10141
Signed-off-by: Michał Górny <mgorny@gentoo.org>

6 files changed, 3 insertions, 14 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