gentoo resync : 13.11.2021

3 files changed, 145 insertions, 7 deletions

diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index baf5169b77e1..79b6993afa5c 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1,3 +1,4 @@
+AUX gputils-1.5.0-respect-flags.patch 4608 BLAKE2B 064b50907a9e403e5dedf1bdba947f235d2b66b62104494de2b1b3badcb02bd15f5df3c66dddec6580cacee46ed52bd12292bef8e98fa1da4f27cab25314a271 SHA512 ee63f6ec3a4f44bd10edc35cdb0c2c9f63d63cacd21a3dc5eb531776d0688f2865d1466fe143950fc8f3a878a7e7eb8f40eec343bfd6f77b7baa0eed90a8c7da
 DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
-EBUILD gputils-1.5.0.ebuild 627 BLAKE2B 4eff6895ea80d6797e8bf6488b3f2428f521218fa29dd6085c4c9bf2f095815fa8d9485e3cfc50b89e2350e1abadec0b2c80ae0ee2bd93059b2e7c6e2df22545 SHA512 cdf4695daf85d2b6f4c9c2286ac37a45025394a2c40e525a42678bdf2f360afba2e5ba8139a81792cb3ea86eeb5a33246b13926b917cc07d9e137e6b4b5701cb
+EBUILD gputils-1.5.0.ebuild 809 BLAKE2B 55f69b85e0ad845bd1f2ab6bf16d9267e09a66bc7b258b137a541aa0f2096445a528275eb2e2f8eef5a73813f84756ec295209f5baaccd04b313acbd7860d787 SHA512 cc30ee6fe9c71e6a8e2a42f5faf91e385c6713e6833abc25115ab347bff09f64a2729516aa1a56f59d1a265bbfa89c27b7e75c5b88189d01b829f0fe3735ac90
 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
new file mode 100644
index 000000000000..01d13dedab0f
--- /dev/null
+++ b/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
@@ -0,0 +1,123 @@
+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
index bd1e4fc9e3aa..508c9285573c 100644
--- a/dev-embedded/gputils/gputils-1.5.0.ebuild
+++ b/dev-embedded/gputils/gputils-1.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
 HOMEPAGE="https://gputils.sourceforge.io"
@@ -12,17 +12,31 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-respect-flags.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for the flags patch, if a new release ever comes...
+	eautoreconf
+}
 
 src_configure() {
-	tc-ld-disable-gold #369291
+	# 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
-	default
+
+	econf
 }
 
 src_install() {
 	default
+
 	dodoc doc/gputils.pdf
 }