gentoo resync : 23.09.2020

3 files changed, 151 insertions, 0 deletions

diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index e805867a8094..47e75566dd81 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -1,5 +1,7 @@
+AUX 299.patch 3435 BLAKE2B 04b4c27800ee95e185aff83e1fd2453c30559fce7034a42821482cac9b4d409d3945813fef736e7adb744b9d865e31afab60c6ac457af968d7dbc319872ad5ea SHA512 b425c524b28a3e245a4de6090b052a2b1e08a06b5b8227450f91a127d4ea67cc8b1f3a74ac802f1525126d236fa1ad2de0a171ef0fa241ad27b1164606ec0501
 DIST grive-0.5.1.tar.gz 169929 BLAKE2B a8f8fc9f3bcf019b7b713178f6a39ca6c62f6531054329d4ff8ac6fbfdfa5579f9e51aa8f9c493b90005194c3ab77934575e541c0986404a32e807c5c87c4cfd SHA512 609837fc93ad78d143dcb4d1f558743d413c887fec2e9aaac81edd58549b812db859aab5ce7f664f06564779cff4bae32d43529e47fcc36640f1a9b52c5b5888
 DIST grive-0.5.1_pre20171005.tar.gz 164450 BLAKE2B e8fde261ec419c1284575032ce326de4953ecf7b4824a70aec07b41f6013b4d26532ba0eae3897c910bd5bb51949dcc13fcb699013557f24c38c75fb251e868c SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c
+EBUILD grive-0.5.1-r1.ebuild 787 BLAKE2B 7737e8622f3779d8a121b18bd09fd3717b019576fa1ada046dc104e3f23445b297d749bf6a3557b58a212839c6611c916e872455890be7aae01be1cf1ffdf574 SHA512 41bfbcd2dc7038d879db312b4701b4bd37cbbb8fa065a720dd5de71903aac8745c9ff679e96df1accd9e316badb1e02fd4562ff734fe52e79c53f2133f054dfd
 EBUILD grive-0.5.1.ebuild 756 BLAKE2B e2d3f071ea93435ba19516baa1a138d6312f794133a8ce4edb811dd601daf7e129e73c13345c843d9a5c0af9346351d5c70df775a16d572f42c02913b8f82a77 SHA512 9e9c1fd7d8c34de9615f6a93af74caad6dbb5fe632ad4417aa7571a683099a3c3b8cb40dd984d6e57e2ca29473780e9bd0c3080c6c9cf6a569af68c1e179de08
 EBUILD grive-0.5.1_pre20171005.ebuild 810 BLAKE2B 75622d38abc90cb36ac0625bc113a4ae3e1841768d0392e24d45ffacd06c593ad96d4b366fad8f22d725eafa2bbb7324c9851f507c7af30660ec06202c1694f9 SHA512 d29f8d4cb9b1775b600469592378b0785de1dcc8a6afba3e142d95e47a8b3064576d1c2cd070f13b7fd9d14e0c668d2ebd67b9c153df91ba23036ba25379cd66
 MISC metadata.xml 329 BLAKE2B 29317b0c9304da834a9876bf09262b2e6d8664978ec04973bfcb6b196efa71d3405f758176662a2af32b780f5819cf4980a4ed21f079609ed8b50109a176a438 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997
diff --git a/net-misc/grive/files/299.patch b/net-misc/grive/files/299.patch
new file mode 100644
index 000000000000..a5e030f2534a
--- /dev/null
+++ b/net-misc/grive/files/299.patch
@@ -0,0 +1,113 @@
+From b4d6ac055f8f16ac735a70036243bc4ea2334039 Mon Sep 17 00:00:00 2001
+From: Giuseppe Corbelli <corbelligiuseppe@mesdan.it>
+Date: Tue, 14 Jan 2020 11:50:20 +0100
+Subject: [PATCH] [SymbolInfo.cc] Support compilation with binutils >= 2.33.1
+ on Debian.
+
+bfd_get_section_vma macro was removed.
+bfd_section_size changed signature.
+
+See inline comment for details.
+---
+ libgrive/src/bfd/SymbolInfo.cc | 35 ++++++++++++++++++++--------------
+ 1 file changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/libgrive/src/bfd/SymbolInfo.cc b/libgrive/src/bfd/SymbolInfo.cc
+index 5876cc0..cdb5d7c 100644
+--- a/libgrive/src/bfd/SymbolInfo.cc
++++ b/libgrive/src/bfd/SymbolInfo.cc
+@@ -49,9 +49,9 @@ SymbolInfo::SymbolInfo( )
+ 	m_impl->m_bfd		= 0 ;
+ 	m_impl->m_symbols	= 0 ;
+ 	m_impl->m_symbol_count	= 0 ;
+-	
++
+ 	bfd_init( ) ;
+-	
++
+ 	// opening itself
+ 	bfd *b = bfd_openr( "/proc/self/exe", 0 ) ;
+ 	if ( b == NULL )
+@@ -60,13 +60,13 @@ SymbolInfo::SymbolInfo( )
+ 		          << bfd_errmsg( bfd_get_error() ) << std::endl ;
+ 		return ;
+ 	}
+-	
++
+ 	if ( bfd_check_format( b, bfd_archive ) )
+ 	{
+ 		bfd_close( b ) ;
+ 		return ;
+ 	}
+-	
++
+ 	char **matching ;
+ 	if ( !bfd_check_format_matches( b, bfd_object, &matching ) )
+ 	{
+@@ -78,7 +78,7 @@ SymbolInfo::SymbolInfo( )
+ 			std::cerr << bfd_get_filename( b ) << ": Matching formats: " ;
+ 			for ( char **p = matching ; *p != 0 ; p++ )
+ 				std::cerr << " " << *p ;
+-			
++
+ 			std::cerr << std::endl ;
+ 			std::free( matching ) ;
+ 		}
+@@ -107,7 +107,7 @@ struct SymbolInfo::BacktraceInfo
+ 	const char			*m_func_name ;
+ 	unsigned int		m_lineno ;
+ 	unsigned int		m_is_found ;
+-	
++
+ 	static void Callback( bfd *abfd, asection *section, void* addr ) ;
+ } ;
+ 
+@@ -117,17 +117,24 @@ void SymbolInfo::BacktraceInfo::Callback( bfd *abfd, asection *section,
+ 	BacktraceInfo *info = (BacktraceInfo *)data ;
+ 	if ((section->flags & SEC_ALLOC) == 0)
+ 		return ;
+-	
+-	bfd_vma vma = bfd_get_section_vma(abfd, section);
+-	
++
++	// bfd_get_section_vma works up to 7b1cfbcf1a27951fb1b3a212995075dd6fdf985b,
++	// removed in 7c13bc8c91abf291f0206b6608b31955c5ea70d8 (binutils 2.33.1 or so)
++	// so it's substituted by its implementation to avoid checking for binutils
++	// version (which at least on Debian SID it's not that easy because the
++	// version.h is not included with the official package)
++	bfd_vma vma = section->vma;
++
+ 	unsigned long address = (unsigned long)(info->m_addr);
+ 	if ( address < vma )
+ 		return;
+-	
+-	bfd_size_type size = bfd_section_size(abfd, section);
++
++	// bfd_section_size changed between the two objects described above,
++	// same rationale applies
++	bfd_size_type size = section->size;
+ 	if ( address > (vma + size))
+ 		return ;
+-	
++
+ 	const SymbolInfo *pthis	= info->m_pthis ;
+ 	info->m_is_found	=  bfd_find_nearest_line( abfd, section,
+ 	                                              pthis->m_impl->m_symbols,
+@@ -149,7 +156,7 @@ void SymbolInfo::PrintTrace( void *addr, std::ostream& os, std::size_t idx )
+ 	{
+ 		this, addr, 0, 0, 0, false
+ 	} ;
+-	
++
+ 	Dl_info sym ;
+ 	bfd_map_over_sections( m_impl->m_bfd,
+ 							&SymbolInfo::BacktraceInfo::Callback,
+@@ -165,7 +172,7 @@ if ( btinfo.m_is_found )
+ 			filename.erase( pos, std::strlen( SRC_DIR ) ) ;
+ #endif
+ 		os << "#"  << idx << " " << addr << " "
+-			<< filename << ":" << btinfo.m_lineno 
++			<< filename << ":" << btinfo.m_lineno
+ 			<< " "
+ 			<< (btinfo.m_func_name != 0 ? Demangle(btinfo.m_func_name) : "" )
+ 			<< std::endl ;
diff --git a/net-misc/grive/grive-0.5.1-r1.ebuild b/net-misc/grive/grive-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..323a194002ef
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	dev-libs/yajl
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/299.patch" )