gentoo resync : 29.06.2020

4 files changed, 43 insertions, 6 deletions

diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 0c0a26346d25..14fe60c4a20d 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,5 +1,6 @@
+AUX cdw-0.8.1-fix-ar-call.patch 680 BLAKE2B a258766221e3be5eee1d8b1ed9670b09d6119f868caee45c2af72e6c83d44c9073b679162fe275d98e4aa5f8a0e1d558cee83b7eb114d6a7584cff6c88a90a54 SHA512 412da6962e86f263214e883935778cab987a0895cd633dda250a80155f5304350dd4c0682d0b3f262c8801b6bfd858349b44af08288237b5c0d53ef0cd4c0dc6
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
-EBUILD cdw-0.8.1-r1.ebuild 665 BLAKE2B 8ec562f5e01700a9338989f9a25dabced25fc0a8c9450defde4e5ed133b51e222e993510675e00c8767880ead601e302a7d75e44b46d5a37699ece3feec0a4bb SHA512 3b51aed44a8bef5d1766bce8fa47dfbea67516a2e6c12dc4442c9208f6865ba332f5d2278a0a0160f3420b1f918bde725cbf2089a14ebfcee139d81bbd8d9486
+EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B be965818072076042539e98c73559d2f38034446019a24b1ca8e7a87727ceac103a7df491754165019979ffc47e970ecea816b71bb256c1e352c9b113f3e939f SHA512 7389a0b4a34041b1dfea66c984c94f4200f42b619cd356c849fc828813715e19f25caf1207b9fa1dead1b4dbf4f701511af0451e6968d641ce4b71c755fd3e3d
 EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 6be4e48db38ceb81cb4c819552def61d7f96a8b35faa01d02bce8fde9e3915e2fe39cb6010dfd114c24836db2b2b34beed798203d7541022d6acef57a8271208 SHA512 e2f975ae1e5cba6b086d52fa104aa67d0acab99cf6b4cbc04a36880b12cde300d788fb41a7e65e37e2594ad009211d1106c377ed1fb0890052c63c9ed874b0d5
-EBUILD cdw-9999.ebuild 791 BLAKE2B 5b380cbeed433459b15b244ed38a1c1a8b3f5bb9225125327f308a8337adc8f2d2df07e49774830baabf06311d30b4fe5231762ceb0fbd47ebf19666bce4d4da SHA512 c99bea0008b0920bc3bf23de6a35fb1e82509feb5cdb815c9b839628c7f699bd30599bb9daa382e00133173089b72f05a87e4d09190b3ef459b92302f8bab871
+EBUILD cdw-9999.ebuild 849 BLAKE2B 0323ea79202be7e1a0a90b614296e3542d5a9c906dafa65a52b346b62cd0760dedef8f35b09d4a458730b63417fcca8ad2bdd8720a35ec3efed4e9cd2ea6567d SHA512 d692d443175347a3719df1375897d4f94f99e6d3538521ea9465368646afa862c0531bce39f44d68a88fa761541a02326bbda0a9dd6b2eec0de2c5df22c8f5f7
 MISC metadata.xml 446 BLAKE2B 6313db12893912ba680ec7c27d939ba2fa7c81b6cb2d7132052b5a0eaf674ce7f71703a8ea8324c61fcad6101b6bbb1e07f9a857bdc1646d96c27e6110b6b495 SHA512 304f1a9a99962e295db23822a327cc5d1b8f2f049bcbbbe562a516a5bf5171b5d93a9886353d02dedc32d1d1220f519bff13c35a7c00d1463a6af4906ad63161
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index 2e0b7596745d..c524d89d06de 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
 HOMEPAGE="http://cdw.sourceforge.net"
@@ -22,8 +22,15 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" )
+
 DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
 }
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index 5013ebb9082d..f23f85b84c76 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,6 @@ HOMEPAGE="http://cdw.sourceforge.net"
 
 LICENSE="GPL-2+"
 SLOT="0"
-DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
 
 RDEPEND="
 	app-cdr/dvd+rw-tools
@@ -27,6 +26,10 @@ BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/${ECVS_MODULE}
 
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" )
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch b/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch
new file mode 100644
index 000000000000..a578696c1c82
--- /dev/null
+++ b/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 76627c7..527e2cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,7 +119,7 @@ AC_TYPE_UINT16_T
+ AC_TYPE_UINT32_T
+ AC_TYPE_UINT8_T
+ AC_CHECK_TYPES([ptrdiff_t])
+-
++AC_CHECK_TOOL(AR, ar, false)
+ 
+ 
+ 
+diff --git a/src/user_interface/Makefile.in b/src/user_interface/Makefile.in
+index 5d5f1fc..4d8214b 100644
+--- a/src/user_interface/Makefile.in
++++ b/src/user_interface/Makefile.in
+@@ -88,7 +88,7 @@ CONFIG_HEADER = $(top_builddir)/config_cdw.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)