gentoo resync : 17.07.2021

3 files changed, 32 insertions, 40 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 37738edd4741..7323206413f8 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest
index b4cfe5510c35..8e5cb1ea146c 100644
--- a/app-pda/barry/Manifest
+++ b/app-pda/barry/Manifest
@@ -1,4 +1,4 @@
 AUX barry-0.18.4-shared_ptr.patch 746 BLAKE2B c45dbda427c25807e1cdb9d3d54a5695a92623230eaaabe41cff71236715c816f1d2de6e8c29f71d993288803010803fe046a3a96e39d9f0b6da3a7f452d793c SHA512 b376e3553aa22d3aa8a04cee766d34aae3d03ad3677174d5f02118653fbfe8391175238727cf0c21c0caf33a850cc10fa0fcf077266815e891bf5efbb3d0d745
 DIST barry-0.18.3.tar.bz2 3457451 BLAKE2B ba7f49e95ac85d764c1275f6dc06f4a7be080d8d725466e1bb8d23977437879f2f7bf7581d9f5bc1262a07f8d1478992ce3c62c9893504f1094dcfb16d944ebd SHA512 4944d22bd5f5a76201ca10ccaf9d12ecf21b298e5b9c8d3d503441e0ad0386a94699c48ae683004992508bb385e75ec137859509663148f2f148933fa508e7fd
-EBUILD barry-0.18.3.ebuild 2355 BLAKE2B 16a1e08d03387953612a25a052f7934d53839c393f7d4a49140a53955e937a9619cfd621e2a31288ed293fe406d432b40a3060fcabac7c697f145c10e09f031a SHA512 eb882b64c12354f2f0fb0d825f12c3bb7512b8047f63c2ca3ee9891f6985aac9bfcb1b189ccddb86e924895ea383124dc6e4279cddd4cd5272c4cd7f573e23b6
+EBUILD barry-0.18.3.ebuild 2080 BLAKE2B 60ea66f66b1cbf4fa19c89412dba9c3c7d648830d8d1dc27101e91e93dcd1afecef3db903f0e24ef3c718f3338b660d2c9f151eb48f2f07478a5cc32a2dd58bf SHA512 fdcf8657f7a3ef53d3739d8e7aee01e591190627754a92ec13687e7f40d23eda0efe23c0b0974ce67b0a9873f4bb111864af06f33838e5c44910ebbd2089745d
 MISC metadata.xml 524 BLAKE2B 4820baca6dc90863e98ad0bf91761455caf5dd4e009a1de4ef75b07b5283a34d3db055e2bc4a79e7daf9573e4ace6858e014c02d9d12cc691c7a837b06b2ddae SHA512 7d7ba574edf9acceeb1e33ee029741b399b4530bb7cc48cfefcbd7f3f543b3096eba596813c31c364051e8d17f27a7df7292e3551bcd48c4aabc66482b66e545
diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild
index 0709efae039f..2162d8fc9d85 100644
--- a/app-pda/barry/barry-0.18.3.ebuild
+++ b/app-pda/barry/barry-0.18.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit bash-completion-r1 desktop epatch flag-o-matic gnome2-utils udev
+inherit bash-completion-r1 desktop udev xdg
 
 DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices"
 HOMEPAGE="http://www.netdirect.ca/software/packages/barry/"
@@ -12,53 +12,58 @@ SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2"
 LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="boost doc gui nls static-libs"
+IUSE="boost doc gui nls"
 
-RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6
+RDEPEND="
+	>=dev-cpp/libxmlpp-2.6:2.6
 	dev-libs/glib:2
 	>=dev-libs/libtar-1.2.11-r2
 	>=media-libs/libsdl-1.2
 	>=sys-fs/fuse-2.5:=
 	sys-libs/zlib
 	virtual/libusb:1
-	boost? ( >=dev-libs/boost-1.33 )
+	boost? ( dev-libs/boost:= )
 	gui? (
 		dev-cpp/glibmm:2
 		dev-cpp/gtkmm:2.4
 		dev-cpp/libglademm:2.4
-		)"
-DEPEND="${RDEPEND}
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( >=app-doc/doxygen-1.5.6 )
 	nls? ( >=sys-devel/gettext-0.18.1.1 )"
 
-DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO )
+PATCHES=( "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch
-
-	append-cxxflags -std=c++11
+	default
 
-	sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die
-	sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die
+	sed -e 's:plugdev:usb:g' -i udev/99-blackberry-perms.rules || die
+	sed -e '/Icon/s:=.*:=barry:' -i menu/*.desktop || die
 }
 
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable static-libs static) \
 		$(use_enable boost) \
 		$(use_enable gui) \
 		--disable-desktop \
-		--disable-rpath
+		--disable-rpath \
+		--disable-static
 }
 
 src_compile() {
 	default
 
 	if use doc; then
-		cd "${S}"
 		doxygen || die
+		# clean out cruft
+		find doc/www/doxygen/html/ \( \
+			-iname '*.map*' -o \
+			-iname '*.md5' -o \
+			-iname '*.php' -o \
+			-iname '*.sh' \) -delete || die
 	fi
 }
 
@@ -66,39 +71,26 @@ src_install() {
 	default
 
 	# docs
-	rm -rf "${S}"/doc/www/*.{php,sh}
-	find "${S}"/doc/www/doxygen/html -name "*.map" -size 0 -exec rm -f {} +
-	use doc && dohtml "${S}"/doc/www/doxygen/html/*
-	rm -rf "${S}"/doc/www
-	dodoc -r "${S}"/doc/*
+	dodoc KnownBugs
+	use doc && dodoc -r doc/www/doxygen/html
+	rm -rf doc/www || die
+	dodoc -r doc/.
 
 	# Skipping different (old Fedora) rules 69-blackberry.rules in purpose
-	udev_dorules "${S}"/udev/10-blackberry.rules "${S}"/udev/99-blackberry-perms.rules
+	udev_dorules udev/10-blackberry.rules udev/99-blackberry-perms.rules
 
 	# blacklist for BERRY_CHARGE kernel module
 	insinto /lib/modprobe.d
-	doins "${S}"/modprobe/blacklist-berry_charge.conf
+	doins modprobe/blacklist-berry_charge.conf
 
 	# pppd options files
 	docinto ppp
-	dodoc "${S}"/ppp/*
+	dodoc -r ppp/.
 
-	dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader
+	dobashcomp bash/btool bash/bjavaloader
 
-	newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg
-	use gui && domenu "${S}"/menu/barrybackup.desktop
+	newicon -s scalable logo/${PN}_logo_icon.svg ${PN}.svg
+	use gui && domenu menu/barrybackup.desktop
 
 	find "${ED}" -name '*.la' -delete || die
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}