gentoo resync : 17.02.2021

3 files changed, 6 insertions, 35 deletions

diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index fd3d6c750a66..d192bec64b46 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,8 +1,6 @@
 AUX udunits-2.1.15-autotools.patch 1850 BLAKE2B dc1e48bff93de3764f488bd276b46fe7061399468c621ffb249d50218bceefb52d6e3d59284544173d9b4e340fa2d0d13c2fb04a850ad2bb8faf8f51df622f99 SHA512 bd4371d0ac9c54d2d4e8a3a0e908b38350bcb729c364de6da93da2fa580abd0f7e48cb3b902a67a9ab84fcff043dad554529cbfb5b26f48eb1f8ba87c43236db
 DIST udunits-2.1.24.tar.gz 1059344 BLAKE2B a28f13e886d4db875078ffee7577f4e17712987b0d87df586e037c1f9a0986ad206ea8bf648920269890d458a6b65250c896f4ea9ec2e8e7bfbe6e1692967530 SHA512 71af2aa62300dd6a2c58318d75cb9182433a208e28446725334a3a80195ebdae77aebe66e6c4e12b53b675501cf3295de2960d1e8beb1496a547d4eed0cde98e
-DIST udunits-2.2.20.tar.gz 1002380 BLAKE2B 63bc2756b32aa620f390fa2b033192e8a519b4834d83ca93315ef94ec926814e01906476d7aa1dc8553505ca1a787e71ed358bccefd3c55f6141aa27247682a7 SHA512 5d5803d9c2cbfdba7c760739f522680e3e69921256119af83e139a36fbcb4d7c84e044661f2987e3422f1eea548abaf4f585946643e8db36cd1d7065b86f8737
 DIST udunits-2.2.28.tar.gz 1224503 BLAKE2B 64d64c609cfbada505c5e163a1e757cd25c09dd75865f255ec8f3bfc26dfafa0f2b9b9997602cb91f80ae81e1fa74bfc0f2d9f3d2d29f880c64e8785e5cbb1a8 SHA512 86146d489e1d472723e059fb15a5dd697a67568ffb5cdba17d191eb304c018bffffea708a73cce50a6c87ad33b387e5ee6653377ae0ebe9986117dfd41e9a5a1
 EBUILD udunits-2.1.24-r1.ebuild 982 BLAKE2B 5a66df0b348ed6fa1710ea9e0bcdbf86c417823069bc43c69c5770fdc9ec1eb2bac633e6b745f8a8e191ef5e1ed6acf9ca533ce8fc66610a693a50803b8255a7 SHA512 f010b9473546525158f03e4c01be1cee97cb975efd61e6c062e6bc637ded915ebe02e99c1c1d647b84102b52ee9e27188b976d74e64ad22a444a18c428335d79
-EBUILD udunits-2.2.20.ebuild 763 BLAKE2B 9d4e7a2b95eff615a11f95dcf4bf7634a7246b77c6ba210aab444d1ddee3e53369d4cdfb3af30383d2e7369362567aa1fddf6b4bf1502e77ec71290b0334f803 SHA512 0c5936d30b028be8f4f7e19b6c06000447e90df7f0e3e72c48c61e2c80bb5c49b74e2c8e4a85738ed4c6f3798d86a30ffe3aaf4b02fef9b2f0bd271d6eec800d
-EBUILD udunits-2.2.28.ebuild 610 BLAKE2B 67524600752caf186cfffb5189ef2c13002bba75ccad23f11fadef9a0ecf348a69b410dc6902d4296039ca29fb8491a76725656746dd8b1bc6d481666826bc0e SHA512 b01453a31fdd2cfe4dbfb9d4bb9354e5237ee1e64d314cf0a4270b326eee4a4d8373d0241f62835da669b0ef29e20dbabb27b47000bfb82c42e8cacf41e51b1f
+EBUILD udunits-2.2.28.ebuild 762 BLAKE2B 2a61a82a852129dd67f777c4472737011081cc647313b9113155ea0adc888b348e4b53393e44499e4c19aeeb9fadd5f6675f9828a6575209156d3b2f93e742c3 SHA512 8ecab523a21dcc8dec7da6fa7d872b7d3d07d1bbfb24ef60cdb53759ca0f38dbdc9a760254af7421716a1d31a10316793ffa87b8460cd401676c9eecc0a7601e
 MISC metadata.xml 535 BLAKE2B b8b216bb211bfbd90c60f71248d5a390eb6d21bcceb13d077e128a764484b2c30a0aa7378323539acea5ff9b4c756fc51942e5988698d2de095169c7763e4316 SHA512 dcbd5fd4a61a2780193ff4875f973ec1237be15f98bc047c2f1603b1d780183b1869086ed8ab91f5832722c04f0e1d26d17cf3e60883d77e79b65f68dbc47ae9
diff --git a/sci-libs/udunits/udunits-2.2.20.ebuild b/sci-libs/udunits/udunits-2.2.20.ebuild
deleted file mode 100644
index dc56fc673720..000000000000
--- a/sci-libs/udunits/udunits-2.2.20.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fortran-2
-
-DESCRIPTION="Library for manipulating units of physical quantities"
-HOMEPAGE="https://www.unidata.ucar.edu/software/udunits/"
-SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="UCAR-BSD"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	doinfo udunits2.info prog/udunits2prog.info
-	dodoc CHANGE_LOG ANNOUNCEMENT
-	dodoc udunits2.pdf prog/udunits2prog.pdf
-	docinto html
-	dodoc udunits2.html prog/udunits2prog.html
-}
diff --git a/sci-libs/udunits/udunits-2.2.28.ebuild b/sci-libs/udunits/udunits-2.2.28.ebuild
index 43ae140b3454..9db08c0372bf 100644
--- a/sci-libs/udunits/udunits-2.2.28.ebuild
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -23,6 +23,11 @@ src_configure() {
 src_install() {
 	default
 
+	local i
+	for i in udunits2 udunits2-{accepted,base,common,derived,prefixes}; do
+		dosym ../../udunits/"${i}".xml usr/share/doc/${PF}/"${i}".xml
+	done
+
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }