gentoo resync : 20.03.2021

3 files changed, 44 insertions, 36 deletions

diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index b39a61f910cd..b5e2e164542c 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -2,6 +2,6 @@ AUX openbox-3.5.2-gnome-session.patch 574 BLAKE2B 64d1d141245172140c16e7d4bee919
 AUX openbox-3.6.1-py3-xdg.patch 4702 BLAKE2B 52e8f35626bf71a10327efe99d518994aece46561f4cb4d26d71412f8f5e1528efbd17c48b38a902053b6d3eefbaa9b79f79c06783d669b0c76cbdf256300463 SHA512 7079cf38a79e2fe7e35c07a5600de8a4678961239d3990596378239f064522204ca40522861f1d403d6e621bca92ca14b06873645ba60fda2c86a4132a9aa16a
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5 SHA512 5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce SHA512 dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e
-EBUILD openbox-3.6.1-r3.ebuild 2729 BLAKE2B 3aa288cf5e8f8a26d21e4ff8ab76280afdfb2e18f159edf80244d1c58527f5eb2475ea9e77eec6f0f9ec439d09c2bdf611917bc2eeaa013868bd05d7d75a15a7 SHA512 f5d19a8058390dd0b1dedbca10e794e0805a1112b893b63972fd5d9a1e477dd33825b6e982f7c0ddda0a02a7da20fec2158a3720b2846e7b7df8df062a5981c5
-EBUILD openbox-9999.ebuild 2736 BLAKE2B f9ced447b3c49bb9b396f2253df950922390b4e1ffae83b5d6cb1eea9b61be1f3e3d7e1746d96393af587a5204942f7de61ce57f71870dae5b85afa6f583d5d9 SHA512 8f1905f0e53584397e20183808681dd2cf0db99b823fb829cf697d2164127124549d35cfa13d7b532235f4840a453a51dcd8d527fb216d5fadbe0f4ed06777f2
+EBUILD openbox-3.6.1-r3.ebuild 2726 BLAKE2B ab6e257d7b26587ee55aae15916daa337202c759ff56de21adda9e05398ad454e3a14aeec02d5f78bcaaead9b5f325d84ecc801712eb863ca28fca85cf6e0d83 SHA512 48d17b4e9e73594c7e2b0b2f24303d5e908e7524bd9c4d33e75970d1f05a52192190ed7e035dd453045bed4aa2ccec10ddad2b700990d3ad68b637ff97aa455c
+EBUILD openbox-9999.ebuild 2733 BLAKE2B 27aa4985831c42d02302b822f5116dfa0c42f052420d858c7c9e469f2228b0f81bae74d3365fc8a1cb88d3cb7bfd39f6e7aa6c8e99046842ffb6f0952ce28e26 SHA512 595f05188de1d3239fcacd4eebcab66bd9fae7f6c322ba1f3ca7e5fca3867735fea6c7a9b6778344c3e52d1cc0845b46c0f936debb9cb3be1ec66eaa1f3e607a
 MISC metadata.xml 704 BLAKE2B 6a8354358ddaa1b4af8e662aa43800168e49aecc074ec4e9c353813e70650e5e44c6647a1848f465e74571367d873a5d32ead3a340e4da730432524adfc4eec5 SHA512 f232879857441d09e1a0b7251849ab466e0a1a5c75e035ab28aa5bc91a7d11e962cd618672aaa65746ec019fb5cd08a190a28e001a89b9e6a82f9afc11d5c207
diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 0737dc46d366..5a00c19811e0 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools python-single-r1
 
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/wiki/Main_Page"
 
 if [[ ${PV} == *9999* ]]; then
@@ -21,7 +21,7 @@ SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+IUSE="branding debug imlib nls session startup-notification svg xdg"
 REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
@@ -51,8 +51,7 @@ RDEPEND="
 		')
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 
@@ -62,6 +61,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
 )
 
+pkg_setup() {
+	use xdg && python-single-r1_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		git-r3_src_unpack
@@ -71,25 +74,26 @@ src_unpack() {
 }
 
 src_prepare() {
-	use xdg && python-single-r1_pkg_setup
 	default
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
 		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
+		m4/openbox.m4 || die
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable imlib imlib2) \
-		$(use_enable svg librsvg) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
+	local myeconfargs=(
+		--disable-static
 		--with-x
+		$(use_enable debug)
+		$(use_enable imlib imlib2)
+		$(use_enable nls)
+		$(use_enable session session-management)
+		$(use_enable startup-notification)
+		$(use_enable svg librsvg)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -106,7 +110,7 @@ src_install() {
 			"${D}"/etc/xdg/openbox/rc.xml \
 			|| die "failed to set Surreal Gentoo as the default theme"
 	fi
-	use static-libs || find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 	if use xdg ; then
 		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
 	else
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 916dd0c62298..f608dddb2d71 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools python-single-r1
 
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
+DESCRIPTION="Standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/wiki/Main_Page"
 
 if [[ ${PV} == *9999* ]]; then
@@ -21,7 +21,7 @@ SRC_URI+=" branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo
 
 LICENSE="GPL-2"
 SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg xdg"
+IUSE="branding debug imlib nls session startup-notification svg xdg"
 REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
@@ -51,8 +51,7 @@ RDEPEND="
 		')
 	)
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 "
 
@@ -62,6 +61,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
 )
 
+pkg_setup() {
+	use xdg && python-single-r1_pkg_setup
+}
+
 src_unpack() {
 	if [[ ${PV} == *9999* ]]; then
 		git-r3_src_unpack
@@ -71,25 +74,26 @@ src_unpack() {
 }
 
 src_prepare() {
-	use xdg && python-single-r1_pkg_setup
 	default
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
 		-e 's/-fno-strict-aliasing//' \
-		"${S}"/m4/openbox.m4 || die
+		m4/openbox.m4 || die
 	eautoreconf
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable imlib imlib2) \
-		$(use_enable svg librsvg) \
-		$(use_enable startup-notification) \
-		$(use_enable session session-management) \
+	local myeconfargs=(
+		--disable-static
 		--with-x
+		$(use_enable debug)
+		$(use_enable imlib imlib2)
+		$(use_enable nls)
+		$(use_enable session session-management)
+		$(use_enable startup-notification)
+		$(use_enable svg librsvg)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -106,7 +110,7 @@ src_install() {
 			"${D}"/etc/xdg/openbox/rc.xml \
 			|| die "failed to set Surreal Gentoo as the default theme"
 	fi
-	use static-libs || find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 	if use xdg ; then
 		python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
 	else