gentoo resync : 28.07.2021

3 files changed, 24 insertions, 50 deletions

diff --git a/net-misc/mico/Manifest b/net-misc/mico/Manifest
index 2345e96f654c..a3b54e0b9862 100644
--- a/net-misc/mico/Manifest
+++ b/net-misc/mico/Manifest
@@ -1,6 +1,6 @@
 DIST mico-2.3.13-gentoo-r13.patch 133254 BLAKE2B 71e22f8bd7491b6aa594a32d7d2a5677b3fc1376bb8ff11eae20e6749ec9c582b99704030c2178f81f1b1fd4ac8f4c2b14e3c80cdf9769ed49004c5a4bab761d SHA512 4e4c60c8e3f6e303b136d17cc83cd5bb92a2b23c0a843721ba74e62d6c69224719bf254a5d8c028df0166c36a07ef349e98f4244b4d208e689c3b6c382c1b906
 DIST mico-2.3.13-gentoo-r14.patch 136291 BLAKE2B 3416fe0fc2e0b9243d22c9cf6a0dffbf14c99846d1b064b3df6496c2d1b9021de0268d0543f566d13425d4fef29626829359deb133ce678d299627f93b0461de SHA512 3ec284442ac00bf429f633dddcaae46a83b720045bc93a177a609255957956aaccb188b0e858ac88b3d8b0c9be081501dcffabd86965b1a4b30a07d45aab0850
 DIST mico-2.3.13.tar.gz 3269814 BLAKE2B cddf6a3d3192625af492b1fa3cf91d4d19d3c8b410de9889cc2e68b6a0db28aef228c1c4e11dc04d4de629d58181dc9e9fd93ddd74537e3362ad5bcd4881750b SHA512 b4c09b5a41e480b8211529776b83e84669e1e91ccba7a0d2d940834f217bc7f3d9ef74101dadc43778c6813b733ccfdae2b00eab2f0993b58193bb9f270e3895
-EBUILD mico-2.3.13-r13.ebuild 4333 BLAKE2B 4648fb2603c2daa27f1cb9104e4212a67e571955334a57b22ace3ce81f9323a6d10867f2cf3b9f12b217911ca6c4bb5c9a8c429c2271e790d76057cb78645f58 SHA512 322bf79329d6dc18423dc9107112079a250ea46081749765820383b0af6f76833ee6641babb5f9e719bcffd810ed4cd91bf2456d8aaa819dccb905c34121253f
-EBUILD mico-2.3.13-r14.ebuild 4333 BLAKE2B 4648fb2603c2daa27f1cb9104e4212a67e571955334a57b22ace3ce81f9323a6d10867f2cf3b9f12b217911ca6c4bb5c9a8c429c2271e790d76057cb78645f58 SHA512 322bf79329d6dc18423dc9107112079a250ea46081749765820383b0af6f76833ee6641babb5f9e719bcffd810ed4cd91bf2456d8aaa819dccb905c34121253f
+EBUILD mico-2.3.13-r13.ebuild 3963 BLAKE2B b456926c8cabfe9304fb4766ef82f6a7fc9b17b1c225547456cc3899b962f41e1d0160301c7d2826e10a64bb564bc6494dbacb6e5cfa5f1082647f8ee3d9191e SHA512 391abc480d3b61d71893e7139891f0e261a8fdca517ae7f831367c085b67ad2f0a0747f57ac26b632b5e8d5f3c1f96a3ddde31e87687022a3408631fbb47d7c7
+EBUILD mico-2.3.13-r14.ebuild 3963 BLAKE2B b456926c8cabfe9304fb4766ef82f6a7fc9b17b1c225547456cc3899b962f41e1d0160301c7d2826e10a64bb564bc6494dbacb6e5cfa5f1082647f8ee3d9191e SHA512 391abc480d3b61d71893e7139891f0e261a8fdca517ae7f831367c085b67ad2f0a0747f57ac26b632b5e8d5f3c1f96a3ddde31e87687022a3408631fbb47d7c7
 MISC metadata.xml 545 BLAKE2B 657497ee8210b82d4fec11da182a4db656c0710a4ccec2574e9f40e0acf7184a91e29c3f6e23477cb01092b2a2cf6cd14357d7a16fe7e176fbbeeabc85e2e6e9 SHA512 f8402d2a5dbed0892d5a05a657f03fd12742ea43cd5708ba64cec6033a03c765ae3cdaa8054c45dfc32b6dd3e8495378c49b1cf498703fc9042424399969f492
diff --git a/net-misc/mico/mico-2.3.13-r13.ebuild b/net-misc/mico/mico-2.3.13-r13.ebuild
index 52c03727f64a..324ead110f2b 100644
--- a/net-misc/mico/mico-2.3.13-r13.ebuild
+++ b/net-misc/mico/mico-2.3.13-r13.ebuild
@@ -5,24 +5,17 @@ EAPI="7"
 
 inherit flag-o-matic toolchain-funcs autotools
 
-if [[ ${PV} == 9999 ]]; then
-	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
-	inherit darcs
-	SRC_URI=""
-	PATCHES="${WORKDIR}/${P}-gentoo.patch"
-else
-	SRC_URI="
-		http://www.mico.org/${P}.tar.gz
-		https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
-	"
-	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
-	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-fi
-
 DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
 HOMEPAGE="http://www.mico.org/"
+SRC_URI="
+	http://www.mico.org/${P}.tar.gz
+	https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
+"
+S="${WORKDIR}"/${PN}
+
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
@@ -42,15 +35,9 @@ BDEPEND="
 	>=sys-devel/bison-1.22
 "
 
-if [[ ${PV} == 9999 ]]; then
-	src_unpack() {
-		wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die
-		darcs_src_unpack
-		default
-	}
-else
-	S=${WORKDIR}/${PN}
-fi
+PATCHES=(
+	"${DISTDIR}"/${P}-gentoo-${PR}.patch
+)
 
 src_prepare() {
 	default
@@ -132,7 +119,7 @@ src_install() {
 	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
 
 	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
-	[[ ${PV} == 9999 ]] || dodoc FAQ
+	dodoc FAQ
 }
 
 pkg_postinst() {
diff --git a/net-misc/mico/mico-2.3.13-r14.ebuild b/net-misc/mico/mico-2.3.13-r14.ebuild
index 52c03727f64a..324ead110f2b 100644
--- a/net-misc/mico/mico-2.3.13-r14.ebuild
+++ b/net-misc/mico/mico-2.3.13-r14.ebuild
@@ -5,24 +5,17 @@ EAPI="7"
 
 inherit flag-o-matic toolchain-funcs autotools
 
-if [[ ${PV} == 9999 ]]; then
-	EDARCS_REPOSITORY="http://www.mico.org/mico-darcs-repository"
-	inherit darcs
-	SRC_URI=""
-	PATCHES="${WORKDIR}/${P}-gentoo.patch"
-else
-	SRC_URI="
-		http://www.mico.org/${P}.tar.gz
-		https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
-	"
-	PATCHES="${DISTDIR}/${P}-gentoo-${PR}.patch"
-	KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
-fi
-
 DESCRIPTION="A freely available and fully compliant implementation of the CORBA standard"
 HOMEPAGE="http://www.mico.org/"
+SRC_URI="
+	http://www.mico.org/${P}.tar.gz
+	https://github.com/ssi-schaefer/mico/compare/${PV}-raw...${PV}-gentoo-${PR}.patch -> ${P}-gentoo-${PR}.patch
+"
+S="${WORKDIR}"/${PN}
+
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-winnt"
 IUSE="gtk postgres ssl tcl threads X"
 RESTRICT="test" #298101
 
@@ -42,15 +35,9 @@ BDEPEND="
 	>=sys-devel/bison-1.22
 "
 
-if [[ ${PV} == 9999 ]]; then
-	src_unpack() {
-		wget -O ${P}-gentoo.patch "https://github.com/ssi-schaefer/mico/compare/gentoo.patch" || die
-		darcs_src_unpack
-		default
-	}
-else
-	S=${WORKDIR}/${PN}
-fi
+PATCHES=(
+	"${DISTDIR}"/${P}-gentoo-${PR}.patch
+)
 
 src_prepare() {
 	default
@@ -132,7 +119,7 @@ src_install() {
 	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
 
 	dodoc BUGS CHANGES* CONVERT README* ROADMAP TODO VERSION WTODO
-	[[ ${PV} == 9999 ]] || dodoc FAQ
+	dodoc FAQ
 }
 
 pkg_postinst() {