gentoo auto-resync : 10:04:2023 - 11:36:36

4 files changed, 2 insertions, 170 deletions

diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 1d6910ee6cb7..155fba096530 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1,7 +1,4 @@
-AUX gputils-1.5.0-respect-flags.patch 4608 BLAKE2B 064b50907a9e403e5dedf1bdba947f235d2b66b62104494de2b1b3badcb02bd15f5df3c66dddec6580cacee46ed52bd12292bef8e98fa1da4f27cab25314a271 SHA512 ee63f6ec3a4f44bd10edc35cdb0c2c9f63d63cacd21a3dc5eb531776d0688f2865d1466fe143950fc8f3a878a7e7eb8f40eec343bfd6f77b7baa0eed90a8c7da
 AUX gputils-1.5.2-fix-invalid-operator.patch 908 BLAKE2B 56572734e417ce425542952b0a67aa13dbe0280e026d31b4a6775c7cb9eb8c8dcbb9b07e48719b45b5fa73baa6fba77b0c1b8384e5905a39d2d6c0320e22bdf0 SHA512 81152bb1138902907d496ebe303d06d3534382d0bc277a65fb38f53417cab04fe4f37caa373f281e16a8f8a7d4c522274ce3013e68dedcbe0880e0f09b8ff2de
-DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
 DIST gputils-1.5.2.tar.bz2 7231711 BLAKE2B c52bd75ee408b2ff98f63679b18834e8e41b5aea4f2b4b659860acb8fa4dd3f922aa6307f99ae0fc024a4fc6f56d3be262cd873cf112ebac444d41eeca635d3b SHA512 43ed508d164152bf36e4f27b09656e6e3d58fc174806ad57d6415e6e2726a56381b1323be3acfc635f2a05babade695e9777b0db8b5f4b90da00b9d29e75eddc
-EBUILD gputils-1.5.0.ebuild 809 BLAKE2B 55f69b85e0ad845bd1f2ab6bf16d9267e09a66bc7b258b137a541aa0f2096445a528275eb2e2f8eef5a73813f84756ec295209f5baaccd04b313acbd7860d787 SHA512 cc30ee6fe9c71e6a8e2a42f5faf91e385c6713e6833abc25115ab347bff09f64a2729516aa1a56f59d1a265bbfa89c27b7e75c5b88189d01b829f0fe3735ac90
-EBUILD gputils-1.5.2.ebuild 992 BLAKE2B c06150fceaf6b6ccc9f7087f0d8b314e5e74032d12d163f65ab45b47b00a7536a5ff6196fa2b9c436520701ea371407dbbad300613359731bcd1964489b5b567 SHA512 cf747f7892a4357805d9dcd04d16800b7c8a73ad935fb9fdf0d6b4c0765f34991c012958fe4962a10d47a4080a8f32169dbe1f20acf765247f51634830fec2d9
+EBUILD gputils-1.5.2.ebuild 988 BLAKE2B 32cbcfeef61c216bab525a137ab2300f9c683a0397856ca069f82841b34212cf066cd7f995f16de2ccdc20c6fe4bbac43896ec06a96d012a2d9de9d9f2c42191 SHA512 f4f3d04f48e22490a07a065e12b3c94104c2a8edf718992ab6cdfa88f681c0045a0e7c6aab3d3faaae1df5519dec6c57b3ae64f4b19d84435f7937751486b766
 MISC metadata.xml 329 BLAKE2B 34b2d2759758806cc11494ac1ff80f04d307c4f825a7d4fac2c49cdc313f6cef2a73975c110a2ec2b5950d289812f14b3e7af29fb210c6362896054669813f95 SHA512 aa1a82ff6a8fc75841cce40006d7cb8a0a7e6b65b4135b31b69781820b437ac033f2fd32aa056557cf19bf107892fda0dc4e39f2bcaa95a96673c194f4dac776
diff --git a/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch b/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
deleted file mode 100644
index 01d13dedab0f..000000000000
--- a/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-https://sourceforge.net/p/gputils/code/1288
-https://bugs.gentoo.org/722648
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,29 +160,41 @@
- AC_CHECK_FUNCS(strndup, , [IBERTYOBJS="$IBERTYOBJS strndup.o"])
- AC_CHECK_FUNCS(strverscmp, , [IBERTYOBJS="$IBERTYOBJS strverscmp.o"])
- 
--AM_CFLAGS=
-+VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'`
-+VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'`
-+VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'`
-+
-+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number])
-+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number])
-+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number])
-+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string])
-+
-+AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)"
-+AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog`
-+
-+AM_CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)"
- AM_LDFLAGS=
- 
- # Options for the system on which the package will run.
- case "${host}" in
-   *cygwin* )
-     if test "x$GCC" = "xyes"; then
--      AM_CFLAGS="-Wall -pedantic"
-+      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic"
-       AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
-     fi
-     ;;
-   *darwin* )
-     if test "x$CC" = "xclang"; then
--      AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
-+      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
-     fi
-     ;;
-   *linux* )
-     if test "x$CC" = "xclang"; then
--      AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
-+      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
-       AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
-     else
-       if test "x$GCC" = "xyes"; then
--        AM_CFLAGS="-Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security"
-+        AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security"
-         AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
-       fi
-     fi
-@@ -192,33 +204,20 @@
-   *-pc-os2_emx | *-pc-os2-emx )
-     EXEEXT=".exe"
-     if test "x$GCC" = "xyes"; then
--      AM_CFLAGS="-Zcrtdll"
-+      AM_CFLAGS="$AM_CFLAGS -Zcrtdll"
-     fi
-     ;;
-   *sun* )
-     # sunos cc needs the -xCC flag for // comments
-     if test "x$GCC" != "xyes"; then
--      AM_CFLAGS="-xCC" 
-+      AM_CFLAGS="$AM_CFLAGS -xCC" 
-     fi
-     ;;
- esac
--
--VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'`
--VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'`
--VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'`
--
--AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number])
--AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number])
--AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number])
--AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string])
--
--AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)"
--AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog`
--CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)"
- 
- # Host filesystem options.
- case "${host}" in
--  *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp*)
-+  *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp* )
-     AC_DEFINE(HAVE_DOS_BASED_FILE_SYSTEM, 1, 
-       [Define if your host uses a DOS based file system.])
-     ;;
-@@ -231,15 +230,13 @@
- fi
- 
- if test x$enable_gdb_debuginfo = xyes; then
--  CFLAGS="$CFLAGS -ggdb"
-+  AM_CFLAGS="$AM_CFLAGS -ggdb"
- fi
- 
- if test x$enable_gputils_path = xyes; then
-   AC_DEFINE(USE_DEFAULT_PATHS, 1,
-     [Define if you want to add default search paths.])
- fi
--
--LDFLAGS=
- 
- # Substitute configuration variables.
- AC_SUBST(ENABLE_HTML_DOC)
-@@ -248,8 +245,6 @@
- AC_SUBST(AM_PACKAGE_SVN_VERSION)
- AC_SUBST(AM_CFLAGS)
- AC_SUBST(AM_LDFLAGS)
--AC_SUBST(CFLAGS)
--AC_SUBST(LDFLAGS)
- AC_SUBST(GPUTILS_HEADER_PATH)
- AC_SUBST(GPUTILS_LKR_PATH)
- AC_SUBST(GPUTILS_LIB_PATH)
-@@ -301,6 +296,7 @@
-   Source directory:     $srcdir
-   Installation prefix:  $prefix
-   C compiler:           $CC $AM_CFLAGS $CFLAGS
-+  C linker:             $CC $AM_LDFLAGS
-   Location of MPLAB-X:  $DEFAULT_MPLABX_PATH
- 
- ])
diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild
deleted file mode 100644
index 508c9285573c..000000000000
--- a/dev-embedded/gputils/gputils-1.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
-HOMEPAGE="https://gputils.sourceforge.io"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-flags.patch
-)
-
-src_prepare() {
-	default
-
-	# Only needed for the flags patch, if a new release ever comes...
-	eautoreconf
-}
-
-src_configure() {
-	# bug #369291, bug #818802
-	tc-ld-disable-gold
-
-	# Their configure script tries to do funky things with default
-	# compiler selection.  Force our own defaults instead.
-	tc-export CC
-
-	econf
-}
-
-src_install() {
-	default
-
-	dodoc doc/gputils.pdf
-}
diff --git a/dev-embedded/gputils/gputils-1.5.2.ebuild b/dev-embedded/gputils/gputils-1.5.2.ebuild
index 11fb1036b9e4..92ff42022c4a 100644
--- a/dev-embedded/gputils/gputils-1.5.2.ebuild
+++ b/dev-embedded/gputils/gputils-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc"
 
 PATCHES=(