gentoo resync : 23.09.2020

6 files changed, 68 insertions, 13 deletions

diff --git a/dev-util/cgdb/Manifest b/dev-util/cgdb/Manifest
index 439fe3b94f5b..2e0b4c02f0fd 100644
--- a/dev-util/cgdb/Manifest
+++ b/dev-util/cgdb/Manifest
@@ -1,9 +1,10 @@
+AUX cgdb-0.7.1-respect-AR.patch 807 BLAKE2B 6689327f2a41f52d772b1d1f2714bac4f4cd40e994b51c6b12a8c9c5d40ed6616cb03128753e60bb773a6c6b46d26fb6d9d80c67c0ac8432e5f17e34b70105d8 SHA512 db51c83bec17cf05e9b8dfc7d92b253999e545c2c1a002db2f63edc0a08d0c831fa6b4b5177e972844755f4df455ec268e5b3554115f5fdeafa071d1df0dd4bc
 AUX cgdb-test.patch 2132 BLAKE2B 7308e2817a0956382a2949baad003ff0adf10989825170fcc953979d9f39da245584de4245d4d86b81e9cb74cccf11628ce3448a736cc3e89ae6e9dfabc3112e SHA512 8c5dde409035134ee75115c99a9b257a6c711750fbf662478d33911a015cccf4bf1a1ee6ec9d72d7075b0ce6dfae98a30ec60f4d2447f958ba322ced71be203c
 DIST cgdb-0.6.8.tar.gz 435115 BLAKE2B 31efcd8740dc0a0354c8d655cd7b77b18b25842dc39d1de42a92917305879394b425d7a7b0e555b368fc6a67f535fe9244c3fedeec9105c3622ace313b24c8c8 SHA512 ef3d94820bb5a37a8d7fbac48c8d144e0ac73c4f5a9d25bea33f2c4390080bb2dbdc5e7e21a5ef8a4980515cc48d80f140f7cf1f90eebac3f8bf1cc6168585ea
 DIST cgdb-0.7.0.tar.gz 319980 BLAKE2B bfc62f9214f6726e5df081119e85ccdeaea9a2310a9bb7a1746525ab998ea94ec1181efd3a1986ec0d33103c2f2b888e4d93c4ddaa4a996db4e47b0173c3b67c SHA512 83aeb919e96cd0981d8fe5cdd257df3e8d8bfbceea720ea66c1773b28c9f0ecb0e303e0585206c55242bc4438d505e328d43b4991c6ddc4e4202e048558c30d9
 DIST cgdb-0.7.1.tar.gz 314768 BLAKE2B 767a57d071fa4e3c75d231a1ec879d871669fcda9c733d157d380fa525dd321f1deb68d7ef7f424b3f36a115043a0a0faae271f24746f934e288ba7d9a4e7fa1 SHA512 050c7bad963d51c1a2cb309530319ca77e9d236f419fb0abac4ab5030ff1068d799fa626959a8b3036321711de98bddf40d264bf9367ff5697075e30ca8168c6
-EBUILD cgdb-0.6.8.ebuild 893 BLAKE2B 6fb0c64d243360738b7aabcaf1b1427712f1028d4ebd6c50c64726a6071328c09a68791d9c4857bb22c1c174ff950d0f1b987e5180e51681dc5c50679ceed2da SHA512 3261342f77bfc9b3e9645de231a90d8dbc5844a95fd8aa6b49635d18682cce8ebf5fd5b46baba389f2595c1b187f98e240f829f2f0ce0f80760c1cf5be5e8ef0
-EBUILD cgdb-0.7.0-r2.ebuild 1438 BLAKE2B b646c5214ba5fe56ec5271908124e34d2a94c96823a7976be221fe9376753fdb4031caa492408157e7ae1991bb9ea34f61317ab6c14c385a43159cbca4e937f6 SHA512 5d077490c5249c8e83f8f1aab0f44d43473c2ac2e8fe971a7dff1dbb902b79c43ac360e2c248ba6c72802506d2811f9eeeb58c2ca8229683f3bd92e0c2b72b83
-EBUILD cgdb-0.7.1.ebuild 1429 BLAKE2B e8aea700c70a6511490f613a85c694a6d51c624458945761c905612afc62f4519f2388ffcb7f7452d717f9e8c67dadd2e8db99ce995b79864a4125525baff0d0 SHA512 362aee2e11eec03646c63592a4812beaccfcb0613bf60e0cd0dd6b8a43e480e6d5ecfc99592b9893bb2c44f478689feec6dca47f78880e288cc19b83e8826497
-EBUILD cgdb-9999.ebuild 1349 BLAKE2B a3924926eac8f279e57ce6a247e3966626e62a5fd8b6e6b30ac333f663ff1611d87b8e4b5a39c80324855d203b7fd129c9b66d73fbbf94effbd2932f585437f8 SHA512 47640224adfddb21d6e19bc9d1b3dadd30d93981bbd820a098f96f47801c0a0f668c392fdde0b70f839bb0173f0df58c6582ea4604bccd7cbc2ee8afa1f8bd93
+EBUILD cgdb-0.6.8.ebuild 1030 BLAKE2B b9b63fab052fc0548adc68b7416180f02d71c868764c0828efaa47e16a2da1a0d0ae1f0a589dc597ab2f56b83c22f6d48bcd87da6573875f7e9c2ecdfc18b1dc SHA512 00d475449fe55161876abae492c79c1458f7bf3aedcd01a6476f007280179b3d2ef840efda5d2f15b66740624a51c20e3511f566656906ea32445a76a00374c2
+EBUILD cgdb-0.7.0-r2.ebuild 1557 BLAKE2B 3b8f53e8c96f607d701bdaace3842e3d5fd63ac32384f1902a574af942f2fe2022cfdc9881ceeb952be8a3b3f624779489bbef38ca2b609fecb08ee33dedc9dd SHA512 a0605eb5eafd3e8f7d48670f5397781a6d9b9a193726fc417fe9499209949ebb08c2cea93e10ab5e65658a7dc08ea74d95efb97824912c5394cd94d9796f06c9
+EBUILD cgdb-0.7.1.ebuild 1546 BLAKE2B 5acf8793b8f5354f908cbc409b163e09c6ce26be1674588df71ea887b0fbc115ebd6a097e85a5e1acf215ea8b07e59f38e25c5df6a33166da9cf385aab5f9b56 SHA512 21765d784f1ed6310de035fd1cbb145877df982a0a1e29381ca3edbdabba551dbefc82757bba63940bde2a9f807bf9ed6685d6ae6fee9f32a7f83b4047659477
+EBUILD cgdb-9999.ebuild 1486 BLAKE2B 462a9e9fef68d24af10cf84bf7aff8585d87cd9d854aef53d0aa70dc5a7d166799006cd34a9d1f61b1ace6044576cc0230b3842aadea4037524b16524a693c20 SHA512 0813893bf020b8a77607712df53bdeb694f84b3b2254da0282131384dea8458f0c62f01355601d78ecb0ddc4a7c5e3fc22804f9fa1c3ff6397015d9dbe34400b
 MISC metadata.xml 491 BLAKE2B 6f0b7012dd97eba9ad20c893d489f2793c1381da6fb86e24c6259dc54244632c09be3b0f4ce2f8259e43d86d2d01546d0aaa565982bdc13b575742b1716d66f9 SHA512 fe06ce409d20619b30f9f4cdb28acc77edd1964d7177accbd3c9597d7930f1ec260847112a12e5184acb835e436c9d30a100c4613ed54b678c545dc8d3824a20
diff --git a/dev-util/cgdb/cgdb-0.6.8.ebuild b/dev-util/cgdb/cgdb-0.6.8.ebuild
index c38d3ca1e868..357b17b658a2 100644
--- a/dev-util/cgdb/cgdb-0.6.8.ebuild
+++ b/dev-util/cgdb/cgdb-0.6.8.ebuild
@@ -12,7 +12,8 @@ else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 fi
-inherit multilib-minimal
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
@@ -34,9 +35,15 @@ RDEPEND="
 
 DOCS=( AUTHORS ChangeLog INSTALL NEWS README.md TODO )
 
+PATCHES=(
+	# Bug: #724256
+	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
+)
+
 src_prepare() {
 	default
-	./autogen.sh || die
+	cp configure.{init,ac} || die "cp failed"
+	AT_M4DIR="config" eautoreconf
 }
 
 multilib_src_configure() {
diff --git a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
index b2a19f371e8f..8ff75bb5efdf 100644
--- a/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.0-r2.ebuild
@@ -10,9 +10,10 @@ if [[ ${PV} = *9999* ]]; then
 		git@github.com:cgdb/cgdb.git"
 else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
 fi
-inherit multilib-minimal
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
@@ -40,11 +41,14 @@ DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 PATCHES=(
 	# Bugs: #730138, #678006, #630512, #682386
 	"${FILESDIR}/${PN}-test.patch"
+	# Bug: #724256
+	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
 )
 
 src_prepare() {
 	default
-	./autogen.sh || die
+	cp configure.{init,ac} || die "cp failed"
+	AT_M4DIR="config" eautoreconf
 }
 
 multilib_src_test() {
diff --git a/dev-util/cgdb/cgdb-0.7.1.ebuild b/dev-util/cgdb/cgdb-0.7.1.ebuild
index 9b0c032ba93d..79f79a249163 100644
--- a/dev-util/cgdb/cgdb-0.7.1.ebuild
+++ b/dev-util/cgdb/cgdb-0.7.1.ebuild
@@ -12,7 +12,8 @@ else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
-inherit multilib-minimal
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
@@ -40,11 +41,14 @@ DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 PATCHES=(
 	# Bugs: #730138, #678006, #630512
 	"${FILESDIR}/${PN}-test.patch"
+	# Bug: #724256
+	"${FILESDIR}/${P}-respect-AR.patch"
 )
 
 src_prepare() {
 	default
-	./autogen.sh || die
+	cp configure.{init,ac} || die "cp failed"
+	AT_M4DIR="config" eautoreconf
 }
 
 multilib_src_test() {
diff --git a/dev-util/cgdb/cgdb-9999.ebuild b/dev-util/cgdb/cgdb-9999.ebuild
index 403e3567898b..191687d3b093 100644
--- a/dev-util/cgdb/cgdb-9999.ebuild
+++ b/dev-util/cgdb/cgdb-9999.ebuild
@@ -12,7 +12,8 @@ else
 	SRC_URI="https://github.com/cgdb/cgdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
-inherit multilib-minimal
+
+inherit autotools multilib-minimal
 
 DESCRIPTION="A curses front-end for GDB, the GNU debugger"
 HOMEPAGE="https://cgdb.github.io/"
@@ -37,9 +38,15 @@ RDEPEND="
 
 DOCS=( AUTHORS ChangeLog FAQ INSTALL NEWS README.md )
 
+PATCHES=(
+	# Bug: #724256
+	"${FILESDIR}/${PN}-0.7.1-respect-AR.patch"
+)
+
 src_prepare() {
 	default
-	./autogen.sh || die
+	cp configure.{init,ac} || die "cp failed"
+	AT_M4DIR="config" eautoreconf
 }
 
 multilib_src_test() {
diff --git a/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch b/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch
new file mode 100644
index 000000000000..e9837855ee3d
--- /dev/null
+++ b/dev-util/cgdb/files/cgdb-0.7.1-respect-AR.patch
@@ -0,0 +1,32 @@
+From: Jakov Smolic <jakov.smolic@sartura.hr>
+Date: Sun, 6 Sep 2020 11:33:02 +0200
+Subject: [PATCH] configure.init: respect AR
+Bug: https://bugs.gentoo.org/724256
+Patch taken from https://github.com/cgdb/cgdb/pull/142
+
+Signed-off-by: Jakov Smolic <jakov.smolic@sartura.hr>
+---
+ configure.init | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/configure.init b/configure.init
+index 920b2a3..d2f696d 100644
+--- a/configure.init
++++ b/configure.init
+@@ -13,6 +13,13 @@ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AM_PROG_LEX
+ AC_PROG_YACC
++m4_ifndef([AC_PROG_AR],[dnl
++  AN_MAKEVAR([AR], [AC_PROG_AR])
++  AN_PROGRAM([ar], [AC_PROG_AR])
++  AC_DEFUN([AC_PROG_AR],
++  [AC_CHECK_TOOL(AR, ar, :)])
++])
++AC_PROG_AR
+ 
+ dnl determine if we are running in linux, cygwin, solaris, or freebsd
+ AC_CANONICAL_HOST
+-- 
+2.26.2
+