From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2D6D13835A for ; Sun, 14 Mar 2021 23:02:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B63CE083D; Sun, 14 Mar 2021 23:02:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0491AE083D for ; Sun, 14 Mar 2021 23:02:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA079340D9F for ; Sun, 14 Mar 2021 23:02:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5AC2A5A7 for ; Sun, 14 Mar 2021 23:02:06 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1615762913.c041c9a6d1228503e15329e7eaffb24dc49c9b5b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/openbox/openbox-3.6.1-r3.ebuild x11-wm/openbox/openbox-9999.ebuild X-VCS-Directories: x11-wm/openbox/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c041c9a6d1228503e15329e7eaffb24dc49c9b5b X-VCS-Branch: master Date: Sun, 14 Mar 2021 23:02:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91c4408e-04be-4096-82e2-d63a55254c9f X-Archives-Hash: b107c13d0d136509e59da8c214ae041f commit: c041c9a6d1228503e15329e7eaffb24dc49c9b5b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 13 23:57:00 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 14 23:01:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c041c9a6 x11-wm/openbox: Fix IUSE=-xdg w/o python, drop 'static-libs', py39 Closes: https://bugs.gentoo.org/772878 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-wm/openbox/openbox-3.6.1-r3.ebuild | 38 +++++++++++++++++++--------------- x11-wm/openbox/openbox-9999.ebuild | 38 +++++++++++++++++++--------------- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild b/x11-wm/openbox/openbox-3.6.1-r3.ebuild index 0737dc46d36..5a00c19811e 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 916dd0c6229..f608dddb2d7 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