gentoo resync : 03.03.2021

4 files changed, 2 insertions, 106 deletions

diff --git a/sci-libs/udunits/Manifest b/sci-libs/udunits/Manifest
index d192bec64b46..3968cb16531e 100644
--- a/sci-libs/udunits/Manifest
+++ b/sci-libs/udunits/Manifest
@@ -1,6 +1,3 @@
-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.28.tar.gz 1224503 BLAKE2B 64d64c609cfbada505c5e163a1e757cd25c09dd75865f255ec8f3bfc26dfafa0f2b9b9997602cb91f80ae81e1fa74bfc0f2d9f3d2d29f880c64e8785e5cbb1a8 SHA512 86146d489e1d472723e059fb15a5dd697a67568ffb5cdba17d191eb304c018bffffea708a73cce50a6c87ad33b387e5ee6653377ae0ebe9986117dfd41e9a5a1
-EBUILD udunits-2.1.24-r1.ebuild 982 BLAKE2B 5a66df0b348ed6fa1710ea9e0bcdbf86c417823069bc43c69c5770fdc9ec1eb2bac633e6b745f8a8e191ef5e1ed6acf9ca533ce8fc66610a693a50803b8255a7 SHA512 f010b9473546525158f03e4c01be1cee97cb975efd61e6c062e6bc637ded915ebe02e99c1c1d647b84102b52ee9e27188b976d74e64ad22a444a18c428335d79
-EBUILD udunits-2.2.28.ebuild 762 BLAKE2B 2a61a82a852129dd67f777c4472737011081cc647313b9113155ea0adc888b348e4b53393e44499e4c19aeeb9fadd5f6675f9828a6575209156d3b2f93e742c3 SHA512 8ecab523a21dcc8dec7da6fa7d872b7d3d07d1bbfb24ef60cdb53759ca0f38dbdc9a760254af7421716a1d31a10316793ffa87b8460cd401676c9eecc0a7601e
+EBUILD udunits-2.2.28.ebuild 759 BLAKE2B 6da67644d82b2474f848903cd8413ed2ca982786b412ec065a6c12864ac67302aa2292b5b433fb0a4f2eb3b7895152e6160af661e364ff966698919fe3e3997a SHA512 40b0e8b832c09c9c60525cc18cd912b919fe4aa9a45545df00694105ef8133b1a85ffb8bfb24c2f11cb4d1894ec66f028b5926aa6942ae386ba1c20b6361188f
 MISC metadata.xml 535 BLAKE2B b8b216bb211bfbd90c60f71248d5a390eb6d21bcceb13d077e128a764484b2c30a0aa7378323539acea5ff9b4c756fc51942e5988698d2de095169c7763e4316 SHA512 dcbd5fd4a61a2780193ff4875f973ec1237be15f98bc047c2f1603b1d780183b1869086ed8ab91f5832722c04f0e1d26d17cf3e60883d77e79b65f68dbc47ae9
diff --git a/sci-libs/udunits/files/udunits-2.1.15-autotools.patch b/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
deleted file mode 100644
index 31c67656a815..000000000000
--- a/sci-libs/udunits/files/udunits-2.1.15-autotools.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 728e587..3c84c1b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,11 +6,11 @@
- #
- ## Process this file with automake to produce Makefile.in
- if COND_EXPAT
--    SUBDIRS		= expat lib prog
-+    SUBDIRS		= lib prog
- else
-     SUBDIRS		= lib prog
- endif
--DIST_SUBDIRS		= expat lib prog test
-+DIST_SUBDIRS		= lib prog test
- info_TEXINFOS		= udunits2.texi
- udunits2_TEXINFOS	= success.texi failure.texi make.texi
- EXTRA_DIST = \
-diff --git a/configure.ac b/configure.ac
-index 097f6eb..091e673 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,7 +13,7 @@ AC_INIT(UDUNITS, 2.1.15, support-udunits@unidata.ucar.edu)
- AC_CONFIG_SRCDIR([lib/converter.c])
- AC_CONFIG_AUX_DIR([.])
- AM_INIT_AUTOMAKE([foreign subdir-objects])
--AC_CONFIG_HEADERS([config.h expat/expat_config.h])
-+AC_CONFIG_HEADERS([config.h])
- 
- CFLAGS_COVERAGE=''
- LIBS_COVERAGE=''
-@@ -37,7 +37,7 @@ AC_ARG_ENABLE([debug],
-     CFLAGS="-g${CFLAGS:+ $CFLAGS}"
-     debug=true ;;
-   no)
--    CFLAGS="-O${CFLAGS:+ $CFLAGS}"
-+    CFLAGS="${CFLAGS:+ $CFLAGS}"
-     debug=false ;;
-   *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
- esac],
-@@ -110,20 +110,12 @@ AM_CONDITIONAL([HAVE_CUNIT], [test "$LD_CUNIT"])
- AC_C_CONST
- AC_TYPE_SIZE_T
- 
--# Needed for the Expat subpackage:
--AC_C_BIGENDIAN([byteorder=4321], [byteorder=1234])
--AC_DEFINE_UNQUOTED([BYTEORDER], [$byteorder],
--    [Define to 4321 for big-endian and 1234 for little-endian])
--AC_DEFINE([XML_CONTEXT_BYTES], 1024,
--    [How much context to retain around the current parse point.])
--
- # Checks for library functions.
- AC_CHECK_FUNCS([floor memmove memset modf pow strcasecmp strdup strpbrk])
- 
- AC_PROG_LIBTOOL
- 
- AC_CONFIG_FILES([Makefile
--		 expat/Makefile
-                  lib/Makefile
-                  lib/xmlFailures/Makefile
-                  lib/xmlSuccesses/Makefile
diff --git a/sci-libs/udunits/udunits-2.1.24-r1.ebuild b/sci-libs/udunits/udunits-2.1.24-r1.ebuild
deleted file mode 100644
index 4ab59d99c971..000000000000
--- a/sci-libs/udunits/udunits-2.1.24-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils 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-Unidata"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# respect user's flags, compile with system libexpat
-	epatch "${FILESDIR}"/${PN}-2.1.15-autotools.patch
-	rm -rf expat || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(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 9db08c0372bf..d52e8de33216 100644
--- a/sci-libs/udunits/udunits-2.2.28.ebuild
+++ b/sci-libs/udunits/udunits-2.2.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.unidata.ucar.edu/pub/udunits/${P}.tar.gz"
 
 LICENSE="UCAR-BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/expat"
 DEPEND="${RDEPEND}"