[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-06-07 Thread Arthur Zamarin 
commit: 0cf9a7fa66b356a0b88b1300dca1db6324731ead
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  7 16:19:30 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  7 16:19:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf9a7fa

x11-wm/openbox: Stabilize 3.6.1-r9 ppc64, #933501

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r9.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
index daf0a15ecbfc..fd6294555071 100644
--- a/x11-wm/openbox/openbox-3.6.1-r9.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-06-07 Thread Arthur Zamarin 
commit: 41ea76e7a7aef453be44f4a0ae40763e544c6d98
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  7 07:13:39 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  7 07:13:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ea76e7

x11-wm/openbox: Stabilize 3.6.1-r9 sparc, #933501

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r9.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
index 6a2a2fb25256..daf0a15ecbfc 100644
--- a/x11-wm/openbox/openbox-3.6.1-r9.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
~sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-06-05 Thread Arthur Zamarin 
commit: 90e97745b05986ad28db240d707d3ca64bd784ad
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun  5 19:59:11 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun  5 19:59:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90e97745

x11-wm/openbox: Stabilize 3.6.1-r9 arm64, #933501

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r9.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
index b62efb85f576..6a2a2fb25256 100644
--- a/x11-wm/openbox/openbox-3.6.1-r9.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
~sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-06-05 Thread Arthur Zamarin 
commit: 3633d40658f5883b2827ef137d0b3ab92e00d9d3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun  5 19:59:10 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun  5 19:59:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3633d406

x11-wm/openbox: Stabilize 3.6.1-r9 arm, #933501

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r9.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
index bb743cb8a432..aa9bb9989e7a 100644
--- a/x11-wm/openbox/openbox-3.6.1-r9.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-06-05 Thread Arthur Zamarin 
commit: 013a72935742edd64f41048736d9bde5fe1462cf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun  5 19:59:10 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun  5 19:59:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013a7293

x11-wm/openbox: Stabilize 3.6.1-r9 x86, #933501

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r9.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
index aa9bb9989e7a..b62efb85f576 100644
--- a/x11-wm/openbox/openbox-3.6.1-r9.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-06-05 Thread Arthur Zamarin 
commit: dc2ea342ace17c78765f92024ff2010e463addab
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun  5 19:59:09 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun  5 19:59:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc2ea342

x11-wm/openbox: Stabilize 3.6.1-r9 ppc, #933501

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r9.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
index bd702a6cf3e7..bb743cb8a432 100644
--- a/x11-wm/openbox/openbox-3.6.1-r9.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-06-05 Thread Arthur Zamarin 
commit: ef42c0c7aa62ba2bc6b66620653d6bace677c0d7
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun  5 19:59:08 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun  5 19:59:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef42c0c7

x11-wm/openbox: Stabilize 3.6.1-r9 amd64, #933501

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r9.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
index aba60e39ae11..bd702a6cf3e7 100644
--- a/x11-wm/openbox/openbox-3.6.1-r9.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-05-28 Thread Jimi Huotari 
commit: f12458b52bd40e0fc9ab81381154f0e7e3c011e5
Author: Jimi Huotari  gentoo  org>
AuthorDate: Tue May 28 15:58:12 2024 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Tue May 28 16:00:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12458b5

x11-wm/openbox: drop 3.6.1-r5

Signed-off-by: Jimi Huotari  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 123 -
 1 file changed, 123 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
deleted file mode 100644
index 2805aebf7192..
--- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11})
-inherit autotools python-single-r1
-
-DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/wiki/Main_Page;
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
-else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
-fi
-
-SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification svg xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-RDEPEND="
-   dev-libs/glib:2
-   >=dev-libs/libxml2-2.0
-   >=media-libs/fontconfig-2
-   x11-libs/cairo
-   x11-libs/libXau
-   x11-libs/libXcursor
-   x11-libs/libXext
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXt
-   >=x11-libs/pango-1.8[X]
-   imlib? ( media-libs/imlib2 )
-   startup-notification? ( >=x11-libs/startup-notification-0.8 )
-   svg? ( gnome-base/librsvg:2 )
-   xdg? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pyxdg[${PYTHON_USEDEP}]
-   ')
-   )
-"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
-   # see https://github.com/danakj/openbox/pull/35
-   "${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
-   # https://bugs.gentoo.org/827227
-   "${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch"
-   # https://bugs.gentoo.org/901777
-   "${FILESDIR}/${PN}-3.6.1-glib-2.76.patch"
-)
-
-pkg_setup() {
-   use xdg && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-   if [[ ${PV} == ** ]]; then
-   git-r3_src_unpack
-   fi
-
-   default
-}
-
-src_prepare() {
-   default
-   sed -i \
-   -e "s:-O0 -ggdb ::" \
-   -e 's/-fno-strict-aliasing//' \
-   m4/openbox.m4 || die
-   eautoreconf
-}
-
-src_configure() {
-   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() {
-   dodir /etc/X11/Sessions
-   echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-   fperms a+x /etc/X11/Sessions/${PN}
-   emake DESTDIR="${D}" install
-   if use branding; then
-   insinto /usr/share/themes
-   doins -r "${WORKDIR}"/Surreal_Gentoo
-   # make it the default theme
-   sed -i \
-   -e "//{n; 
s@.*@Surreal_Gentoo@}" \
-   "${D}"/etc/xdg/openbox/rc.xml \
-   || die "failed to set Surreal Gentoo as the default 
theme"
-   fi
-   find "${ED}" -name '*.la' -delete || die
-   if use xdg ; then
-   python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
-   else
-   rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2024-05-28 Thread Jimi Huotari 
commit: 0b6a441d0c3393c867b17a9e6f35be1369484219
Author: Jimi Huotari  gentoo  org>
AuthorDate: Tue May 28 15:55:54 2024 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Tue May 28 16:00:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6a441d

x11-wm/openbox: add python 3.12 compatibility

Closes: https://bugs.gentoo.org/929897
Signed-off-by: Jimi Huotari  gentoo.org>

 x11-wm/openbox/{openbox-.ebuild => openbox-3.6.1-r9.ebuild} | 4 ++--
 x11-wm/openbox/openbox-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
similarity index 97%
copy from x11-wm/openbox/openbox-.ebuild
copy to x11-wm/openbox/openbox-3.6.1-r9.ebuild
index ee0aaca94942..aba60e39ae11 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11})
+PYTHON_COMPAT=( python3_{9..12})
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index ee0aaca94942..aba60e39ae11 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11})
+PYTHON_COMPAT=( python3_{9..12})
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-12-23 Thread Arthur Zamarin 
commit: b5f472239e36f287cdefadfd5abe7c4ecbd62bd1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 23 20:00:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 23 20:00:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5f47223

x11-wm/openbox: Stabilize 3.6.1-r8 sparc, #920172

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r8.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
index e8f5f6619eec..96e08a0e031c 100644
--- a/x11-wm/openbox/openbox-3.6.1-r8.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-12-18 Thread Arthur Zamarin 
commit: 8bf7da1ca837d7b6d509b3dca08dcc426ac32d4d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Dec 18 09:00:54 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Dec 18 09:00:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf7da1c

x11-wm/openbox: Stabilize 3.6.1-r8 ppc, #920172

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r8.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
index cfac58f43e5b..e8f5f6619eec 100644
--- a/x11-wm/openbox/openbox-3.6.1-r8.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-12-16 Thread Arthur Zamarin 
commit: 9b391a54a3c97a2f4f4bca3df053c680b5168648
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 06:19:42 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 06:19:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b391a54

x11-wm/openbox: Stabilize 3.6.1-r8 amd64, #920172

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r8.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
index 9187895aab9a..cfac58f43e5b 100644
--- a/x11-wm/openbox/openbox-3.6.1-r8.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-12-16 Thread Arthur Zamarin 
commit: 85e5514df52a5d278e04b9364c8a61f6a7d85403
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 06:19:41 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 06:19:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85e5514d

x11-wm/openbox: Stabilize 3.6.1-r8 x86, #920172

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r8.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
index fd229c1dc91e..9187895aab9a 100644
--- a/x11-wm/openbox/openbox-3.6.1-r8.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-12-16 Thread Sam James 
commit: d9c76f569fed44c8cb503fbb407e404eb15e2345
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 00:22:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 00:22:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c76f56

x11-wm/openbox: Stabilize 3.6.1-r8 ppc64, #920172

Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r8.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
index 01818019a14a..fd229c1dc91e 100644
--- a/x11-wm/openbox/openbox-3.6.1-r8.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-12-16 Thread Sam James 
commit: f1089e3b2f0196956a520283f0cfe735e1584b91
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 00:00:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 00:00:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1089e3b

x11-wm/openbox: Stabilize 3.6.1-r8 arm64, #920172

Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r8.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
index ee0aaca94942..4f0d53bbc50f 100644
--- a/x11-wm/openbox/openbox-3.6.1-r8.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-12-16 Thread Sam James 
commit: 67f2133c2a3fa88a0abc63b80d6399af455c50e1
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 17 00:00:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 17 00:00:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67f2133c

x11-wm/openbox: Stabilize 3.6.1-r8 arm, #920172

Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r8.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
index 4f0d53bbc50f..01818019a14a 100644
--- a/x11-wm/openbox/openbox-3.6.1-r8.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-08-09 Thread Sam James 
commit: 4a1f9fe744c3d262b03f5024c5020876088ed099
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 10 04:07:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 10 04:07:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1f9fe7

x11-wm/openbox: fix session name again

Closes: https://bugs.gentoo.org/911974
Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/{openbox-3.6.1-r7.ebuild => openbox-3.6.1-r8.ebuild} | 2 +-
 x11-wm/openbox/openbox-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r7.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
similarity index 99%
rename from x11-wm/openbox/openbox-3.6.1-r7.ebuild
rename to x11-wm/openbox/openbox-3.6.1-r8.ebuild
index 3a35c296e216..ee0aaca94942 100644
--- a/x11-wm/openbox/openbox-3.6.1-r7.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r8.ebuild
@@ -104,7 +104,7 @@ src_install() {
exeinto /etc/X11/Sessions
newexe - ${PN} <<-EOF
#!/bin/sh
-   ${PN}
+   openbox-session
EOF
 
emake DESTDIR="${D}" install

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 3a35c296e216..ee0aaca94942 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -104,7 +104,7 @@ src_install() {
exeinto /etc/X11/Sessions
newexe - ${PN} <<-EOF
#!/bin/sh
-   ${PN}
+   openbox-session
EOF
 
emake DESTDIR="${D}" install

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-08-05 Thread Sam James 
commit: dea896f4f045ee93faf42e8ba3b27929dd35ed33
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug  5 23:12:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug  5 23:12:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea896f4

x11-wm/openbox: fix mess

Sorry, I've no idea what I did here. Keep r7 with the fixes for the xsession
file but drop it to ~arch. Drop the now-useless -r6.

Fixes: 1c952dae5ccf5c5a2805a3e622ca822c24cd2902
Fixes: 7f9198feb0dc9af82c863c7839d339c6a54bd76c
Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r6.ebuild | 126 -
 x11-wm/openbox/openbox-3.6.1-r7.ebuild |   2 +-
 2 files changed, 1 insertion(+), 127 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r6.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r6.ebuild
deleted file mode 100644
index 3a35c296e216..
--- a/x11-wm/openbox/openbox-3.6.1-r6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11})
-inherit autotools python-single-r1
-
-DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/wiki/Main_Page;
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
-else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
-fi
-
-SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification svg xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-RDEPEND="
-   dev-libs/glib:2
-   >=dev-libs/libxml2-2.0
-   >=media-libs/fontconfig-2
-   x11-libs/cairo
-   x11-libs/libXau
-   x11-libs/libXcursor
-   x11-libs/libXext
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXt
-   >=x11-libs/pango-1.8[X]
-   imlib? ( media-libs/imlib2 )
-   startup-notification? ( >=x11-libs/startup-notification-0.8 )
-   svg? ( gnome-base/librsvg:2 )
-   xdg? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pyxdg[${PYTHON_USEDEP}]
-   ')
-   )
-"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
-   # see https://github.com/danakj/openbox/pull/35
-   "${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
-   # https://bugs.gentoo.org/827227
-   "${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch"
-   # https://bugs.gentoo.org/901777
-   "${FILESDIR}/${PN}-3.6.1-glib-2.76.patch"
-)
-
-pkg_setup() {
-   use xdg && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-   if [[ ${PV} == ** ]]; then
-   git-r3_src_unpack
-   fi
-
-   default
-}
-
-src_prepare() {
-   default
-   sed -i \
-   -e "s:-O0 -ggdb ::" \
-   -e 's/-fno-strict-aliasing//' \
-   m4/openbox.m4 || die
-   eautoreconf
-}
-
-src_configure() {
-   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() {
-   exeinto /etc/X11/Sessions
-   newexe - ${PN} <<-EOF
-   #!/bin/sh
-   ${PN}
-   EOF
-
-   emake DESTDIR="${D}" install
-   if use branding; then
-   insinto /usr/share/themes
-   doins -r "${WORKDIR}"/Surreal_Gentoo
-   # make it the default theme
-   sed -i \
-   -e "//{n; 
s@.*@Surreal_Gentoo@}" \
-   "${D}"/etc/xdg/openbox/rc.xml \
-   || die "failed to set Surreal Gentoo as the default 
theme"
-   fi
-   find "${ED}" -name '*.la' -delete || die
-   if use xdg ; then
-   python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
-   else
-   rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
-   fi
-}

diff --git a/x11-wm/openbox/openbox-3.6.1-r7.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r7.ebuild
index 0233009d6d34..3a35c296e216 100644
--- a/x11-wm/openbox/openbox-3.6.1-r7.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-08-05 Thread Sam James 
commit: 1c952dae5ccf5c5a2805a3e622ca822c24cd2902
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug  5 22:31:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug  5 22:31:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c952dae

x11-wm/openbox: drop back to ~arch

Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r6.ebuild  | 2 +-
 x11-wm/openbox/{openbox-3.6.1-r6.ebuild => openbox-3.6.1-r7.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r6.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r6.ebuild
index 0233009d6d34..3a35c296e216 100644
--- a/x11-wm/openbox/openbox-3.6.1-r6.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

diff --git a/x11-wm/openbox/openbox-3.6.1-r6.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r7.ebuild
similarity index 100%
copy from x11-wm/openbox/openbox-3.6.1-r6.ebuild
copy to x11-wm/openbox/openbox-3.6.1-r7.ebuild

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-08-05 Thread Sam James 
commit: 7f9198feb0dc9af82c863c7839d339c6a54bd76c
Author: Sam James  gentoo  org>
AuthorDate: Sat Aug  5 22:28:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Aug  5 22:28:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9198fe

x11-wm/openbox: fix shebang in /etc/X11/Sessions file

A file in /etc/X11/Sessions with just the path that's *not* executable is fine,
but if it's executable, it's reasonably treated as a script. Oops.

Closes: https://bugs.gentoo.org/911787
Signed-off-by: Sam James  gentoo.org>

 .../{openbox-.ebuild => openbox-3.6.1-r6.ebuild}| 13 +
 x11-wm/openbox/openbox-.ebuild  | 11 ---
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r6.ebuild
similarity index 91%
copy from x11-wm/openbox/openbox-.ebuild
copy to x11-wm/openbox/openbox-3.6.1-r6.ebuild
index d753cdef761b..0233009d6d34 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -61,6 +61,8 @@ PATCHES=(
"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
# https://bugs.gentoo.org/827227
"${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch"
+   # https://bugs.gentoo.org/901777
+   "${FILESDIR}/${PN}-3.6.1-glib-2.76.patch"
 )
 
 pkg_setup() {
@@ -99,9 +101,12 @@ src_configure() {
 }
 
 src_install() {
-   dodir /etc/X11/Sessions
-   echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-   fperms a+x /etc/X11/Sessions/${PN}
+   exeinto /etc/X11/Sessions
+   newexe - ${PN} <<-EOF
+   #!/bin/sh
+   ${PN}
+   EOF
+
emake DESTDIR="${D}" install
if use branding; then
insinto /usr/share/themes

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index d753cdef761b..3a35c296e216 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -61,6 +61,8 @@ PATCHES=(
"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
# https://bugs.gentoo.org/827227
"${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch"
+   # https://bugs.gentoo.org/901777
+   "${FILESDIR}/${PN}-3.6.1-glib-2.76.patch"
 )
 
 pkg_setup() {
@@ -99,9 +101,12 @@ src_configure() {
 }
 
 src_install() {
-   dodir /etc/X11/Sessions
-   echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-   fperms a+x /etc/X11/Sessions/${PN}
+   exeinto /etc/X11/Sessions
+   newexe - ${PN} <<-EOF
+   #!/bin/sh
+   ${PN}
+   EOF
+
emake DESTDIR="${D}" install
if use branding; then
insinto /usr/share/themes

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-06-18 Thread Andreas Sturmlechner 
commit: b8da851bc904611b438501918b2d65107df923df
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 18 09:21:56 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 18 14:53:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8da851b

x11-wm/openbox: drop 3.6.1-r3, 3.6.1-r4

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 119 
 x11-wm/openbox/openbox-3.6.1-r4.ebuild | 121 -
 2 files changed, 240 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
deleted file mode 100644
index 2989a86a97e2..
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11})
-inherit autotools python-single-r1
-
-DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/wiki/Main_Page;
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
-fi
-
-SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification svg xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
-   sys-devel/gettext
-   virtual/pkgconfig
-"
-RDEPEND="
-   dev-libs/glib:2
-   >=dev-libs/libxml2-2.0
-   >=media-libs/fontconfig-2
-   x11-libs/cairo
-   x11-libs/libXau
-   x11-libs/libXcursor
-   x11-libs/libXext
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXt
-   >=x11-libs/pango-1.8[X]
-   imlib? ( media-libs/imlib2 )
-   startup-notification? ( >=x11-libs/startup-notification-0.8 )
-   svg? ( gnome-base/librsvg:2 )
-   xdg? (
-   ${PYTHON_DEPS}
-   $(python_gen_cond_dep '
-   dev-python/pyxdg[${PYTHON_USEDEP}]
-   ')
-   )
-"
-DEPEND="${RDEPEND}
-   x11-base/xorg-proto
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
-   # see https://github.com/danakj/openbox/pull/35
-   "${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
-)
-
-pkg_setup() {
-   use xdg && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-   if [[ ${PV} == ** ]]; then
-   git-r3_src_unpack
-   fi
-
-   default
-}
-
-src_prepare() {
-   default
-   sed -i \
-   -e "s:-O0 -ggdb ::" \
-   -e 's/-fno-strict-aliasing//' \
-   m4/openbox.m4 || die
-   eautoreconf
-}
-
-src_configure() {
-   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() {
-   dodir /etc/X11/Sessions
-   echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-   fperms a+x /etc/X11/Sessions/${PN}
-   emake DESTDIR="${D}" install
-   if use branding; then
-   insinto /usr/share/themes
-   doins -r "${WORKDIR}"/Surreal_Gentoo
-   # make it the default theme
-   sed -i \
-   -e "//{n; 
s@.*@Surreal_Gentoo@}" \
-   "${D}"/etc/xdg/openbox/rc.xml \
-   || die "failed to set Surreal Gentoo as the default 
theme"
-   fi
-   find "${ED}" -name '*.la' -delete || die
-   if use xdg ; then
-   python_fix_shebang "${ED}"/usr/libexec/openbox-xdg-autostart
-   else
-   rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
-   fi
-}

diff --git a/x11-wm/openbox/openbox-3.6.1-r4.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r4.ebuild
deleted file mode 100644
index d753cdef761b..
--- a/x11-wm/openbox/openbox-3.6.1-r4.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11})
-inherit autotools python-single-r1
-
-DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/wiki/Main_Page;
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
-else
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-05-05 Thread Arthur Zamarin 
commit: 9b97d60abba806dabd98bbde111687b5f75c6f9a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  5 09:57:12 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  5 09:57:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b97d60a

x11-wm/openbox: Stabilize 3.6.1-r5 ppc, #905675

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
index fb27edbfdcfa..2805aebf7192 100644
--- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-05-05 Thread Arthur Zamarin 
commit: b5195bfd01ab47b6c69ba444b9c03828cb3d1ff0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  5 09:45:26 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  5 09:45:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5195bfd

x11-wm/openbox: Stabilize 3.6.1-r5 sparc, #905675

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
index 6e9a195840a0..fb27edbfdcfa 100644
--- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-05-05 Thread Arthur Zamarin 
commit: 5e085610a0c78528bd16a99e788141629a6a9df8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  5 09:24:19 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  5 09:24:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e085610

x11-wm/openbox: Stabilize 3.6.1-r5 arm64, #905675

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
index 005f70d52ddb..6e9a195840a0 100644
--- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-05-04 Thread Sam James 
commit: 85cd16835bd6f971bdada35d9dc0f2cbeb6115ff
Author: Sam James  gentoo  org>
AuthorDate: Thu May  4 12:45:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  4 12:45:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cd1683

x11-wm/openbox: Stabilize 3.6.1-r5 amd64, #905675

Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
index c064c2e0a6c4..005f70d52ddb 100644
--- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-05-04 Thread Sam James 
commit: 5f8835ddbdf4dcad0b876588f4985e8f7ba2784c
Author: Sam James  gentoo  org>
AuthorDate: Thu May  4 12:45:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  4 12:45:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f8835dd

x11-wm/openbox: Stabilize 3.6.1-r5 x86, #905675

Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
index 2e77116f0155..c064c2e0a6c4 100644
--- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-05-04 Thread Arthur Zamarin 
commit: 6b8f0d850397fa5a2ae69c489936239b9a113b95
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May  4 12:23:21 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May  4 12:23:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8f0d85

x11-wm/openbox: Stabilize 3.6.1-r5 ppc64, #905675

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
index 04043d98cff4..2e77116f0155 100644
--- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv 
~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-05-04 Thread Sam James 
commit: 767ec293d62e4b244727237f2b3767f4a9429951
Author: Sam James  gentoo  org>
AuthorDate: Thu May  4 12:11:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  4 12:11:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767ec293

x11-wm/openbox: Stabilize 3.6.1-r5 arm, #905675

Signed-off-by: Sam James  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
index ebd2a5d8b75d..04043d98cff4 100644
--- a/x11-wm/openbox/openbox-3.6.1-r5.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/files/, x11-wm/openbox/

2023-03-19 Thread Jimi Huotari 
commit: 95d5a573165b47f9523ba43d9abc3cae5e116c48
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sun Mar 19 10:24:19 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sun Mar 19 10:24:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d5a573

x11-wm/openbox: patch issue with >=glib-2.76.0

Bug: https://bugs.gentoo.org/901777
Signed-off-by: Jimi Huotari  gentoo.org>

 x11-wm/openbox/files/openbox-3.6.1-glib-2.76.patch |  54 +
 x11-wm/openbox/openbox-3.6.1-r5.ebuild | 123 +
 2 files changed, 177 insertions(+)

diff --git a/x11-wm/openbox/files/openbox-3.6.1-glib-2.76.patch 
b/x11-wm/openbox/files/openbox-3.6.1-glib-2.76.patch
new file mode 100644
index ..65d0dba17300
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.6.1-glib-2.76.patch
@@ -0,0 +1,54 @@
+Gentoo Bug: https://bugs.gentoo.org/901777
+Upstream Bug: https://bugzilla.icculus.org/show_bug.cgi?id=6669
+Upstream Commit: 
https://github.com/Mikachu/openbox/commit/9ed6fdd71890c5cc43747f105382d5677e5d37e7
+
+From 9ed6fdd71890c5cc43747f105382d5677e5d37e7 Mon Sep 17 00:00:00 2001
+From: pldubouilh 
+Date: Fri, 17 Mar 2023 18:23:47 +0100
+Subject: [PATCH] Fix list traversal issue in client_calc_layer
+
+The calls to client_calc_layer_internal can modify stacking_list, which
+can cause us to follow dangling ->next pointers (either by the pointer
+itself already being freed, or it pointing to a freed area). Avoid this
+by copying the list first, the goal is to visit every client in the list
+once so this should be fine.
+---
+ openbox/client.c | 9 +++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/openbox/client.c b/openbox/client.c
+index 7168b2407..b8264587c 100644
+--- a/openbox/client.c
 b/openbox/client.c
+@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self)
+ void client_calc_layer(ObClient *self)
+ {
+ GList *it;
++/* the client_calc_layer_internal calls below modify stacking_list,
++   so we have to make a copy to iterate over */
++GList *list = g_list_copy(stacking_list);
+ 
+ /* skip over stuff above fullscreen layer */
+-for (it = stacking_list; it; it = g_list_next(it))
++for (it = list; it; it = g_list_next(it))
+ if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+ 
+ /* find the windows in the fullscreen layer, and mark them not-visited */
+@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self)
+ client_calc_layer_internal(self);
+ 
+ /* skip over stuff above fullscreen layer */
+-for (it = stacking_list; it; it = g_list_next(it))
++for (it = list; it; it = g_list_next(it))
+ if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break;
+ 
+ /* now recalc any windows in the fullscreen layer which have not
+@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self)
+  !WINDOW_AS_CLIENT(it->data)->visited)
+ client_calc_layer_internal(it->data);
+ }
++
++g_list_free(it);
+ }
+ 
+ gboolean client_should_show(ObClient *self)

diff --git a/x11-wm/openbox/openbox-3.6.1-r5.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
new file mode 100644
index ..ebd2a5d8b75d
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.6.1-r5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11})
+inherit autotools python-single-r1
+
+DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"
+HOMEPAGE="http://openbox.org/wiki/Main_Page;
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
+else
+   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
+fi
+
+SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="3"
+IUSE="branding debug imlib nls session startup-notification svg xdg"
+REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+RDEPEND="
+   dev-libs/glib:2
+   >=dev-libs/libxml2-2.0
+   >=media-libs/fontconfig-2
+   x11-libs/cairo
+   x11-libs/libXau
+   x11-libs/libXcursor
+   x11-libs/libXext
+   x11-libs/libXft
+   x11-libs/libXinerama
+   x11-libs/libXrandr
+   x11-libs/libXt
+   >=x11-libs/pango-1.8[X]
+   imlib? ( media-libs/imlib2 )
+   startup-notification? ( >=x11-libs/startup-notification-0.8 )
+   svg? ( gnome-base/librsvg:2 )
+   xdg? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep '
+   dev-python/pyxdg[${PYTHON_USEDEP}]
+   ')
+   )
+"
+DEPEND="${RDEPEND}
+   x11-base/xorg-proto
+"
+
+PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-03-09 Thread Jimi Huotari 
commit: 134130a591d7b46d64ce89566b4981c9f0cf3fee
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Mar  9 13:53:01 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Thu Mar  9 16:29:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134130a5

x11-wm/openbox: use EAPI 8 and python3_11

Closes: https://bugs.gentoo.org/897356
Signed-off-by: Jimi Huotari  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 4 ++--
 x11-wm/openbox/openbox-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 8289583c8fce..2989a86a97e2 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11})
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index e08b9bf823bc..261d9e75d33f 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11})
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/files/, x11-wm/openbox/

2023-03-09 Thread Jimi Huotari 
commit: c7ad157920317e70d19389d9f3601d3cc7f599be
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Mar  9 14:22:09 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Thu Mar  9 16:29:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7ad1579

x11-wm/openbox: patch getgrent to getgroups

Upstream: https://bugzilla.icculus.org/show_bug.cgi?id=5978
Closes: https://bugs.gentoo.org/827227
Signed-off-by: Jimi Huotari  gentoo.org>

 .../openbox-3.6.1-getgrent-to-getgroups.patch  | 67 ++
 ...openbox-.ebuild => openbox-3.6.1-r4.ebuild} |  4 +-
 x11-wm/openbox/openbox-.ebuild |  4 +-
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/x11-wm/openbox/files/openbox-3.6.1-getgrent-to-getgroups.patch 
b/x11-wm/openbox/files/openbox-3.6.1-getgrent-to-getgroups.patch
new file mode 100644
index ..4634b5a03028
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.6.1-getgrent-to-getgroups.patch
@@ -0,0 +1,67 @@
+Gentoo: https://bugs.gentoo.org/827227
+Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=808138
+Upstream: https://bugzilla.icculus.org/show_bug.cgi?id=5978
+
+>From e0cb404f53c9b21a521ea2f14c8cd66fdfb68ea7 Mon Sep 17 00:00:00 2001
+From: Simon 
+Date: Tue, 15 Dec 2015 15:46:18 +0100
+Subject: [PATCH] Replace getgrent with getgroups. Fixes #5978.
+
+---
+ obt/paths.c | 34 +-
+ 1 file changed, 21 insertions(+), 13 deletions(-)
+
+diff --git a/obt/paths.c b/obt/paths.c
+index 25cb6b0..d526936 100644
+--- a/obt/paths.c
 b/obt/paths.c
+@@ -108,25 +108,33 @@ static void find_uid_gid(uid_t *u, gid_t **g, guint *n)
+ const gchar *name;
+ struct group *gr;
+ 
++gid_t gmain;
++unsigned int maininc;
++int i;
++
+ *u = getuid();
+ pw = getpwuid(*u);
+ name = pw->pw_name;
+ 
+-*g = g_new(gid_t, *n=1);
+-(*g)[0] = getgid();
+-
+-while ((gr = getgrent())) {
+-if (gr->gr_gid != (*g)[0]) { /* skip the main group */
+-gchar **c;
+-for (c = gr->gr_mem; *c; ++c)
+-if (strcmp(*c, name) == 0) {
+-*g = g_renew(gid_t, *g, ++(*n)); /* save the group */
+-(*g)[*n-1] = gr->gr_gid;
+-break;
+-}
++gmain = getgid();
++
++*n = getgroups(0, *g);
++*g = g_new(gid_t, *n);
++*n = getgroups(*n, *g);
++
++/* Check if the effective group ID of the calling process is already
++   included in the returned list. Add it otherwise. */
++maininc = 0;
++for (i = 0; i < *n; i++) {
++if ( (*g)[i] == gmain ) {
++maininc = 1;
++break;
+ }
+ }
+-endgrent();
++if (!maininc) {
++*g = g_renew(gid_t, *g, ++(*n));
++(*g)[*n-1] = gmain;
++}
+ 
+ qsort(*g, *n, sizeof(gid_t), gid_cmp);
+ }
+-- 
+2.1.4
+

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r4.ebuild
similarity index 95%
copy from x11-wm/openbox/openbox-.ebuild
copy to x11-wm/openbox/openbox-3.6.1-r4.ebuild
index 261d9e75d33f..e569dd1af6b1 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -59,6 +59,8 @@ PATCHES=(
"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
# see https://github.com/danakj/openbox/pull/35
"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
+   # https://bugs.gentoo.org/827227
+   "${FILESDIR}/${PN}-3.6.1-getgrent-to-getgroups.patch"
 )
 
 pkg_setup() {

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 261d9e75d33f..e569dd1af6b1 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~sparc ~x86 ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -59,6 +59,8 @@ PATCHES=(
"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
# see https://github.com/danakj/openbox/pull/35
"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
+   # https://bugs.gentoo.org/827227
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2023-03-09 Thread Jimi Huotari 
commit: ea6f79c68a7ead28797e0d3da275c1e3addcd9d5
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Mar  9 16:16:14 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Thu Mar  9 16:29:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea6f79c6

x11-wm/openbox: switch to GitHub live repo with https

This also switches to the repository maintained by Mikachu, which has
seen some work since 2015, while the previous one is behind the
current release.

Signed-off-by: Jimi Huotari  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r4.ebuild | 2 +-
 x11-wm/openbox/openbox-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r4.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r4.ebuild
index e569dd1af6b1..d753cdef761b 100644
--- a/x11-wm/openbox/openbox-3.6.1-r4.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://openbox.org/wiki/Main_Page;
 
 if [[ ${PV} == ** ]]; then
inherit git-r3
-   EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+   EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index e569dd1af6b1..d753cdef761b 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://openbox.org/wiki/Main_Page;
 
 if [[ ${PV} == ** ]]; then
inherit git-r3
-   EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
+   EGIT_REPO_URI="https://github.com/Mikachu/openbox.git;
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~riscv ~sparc ~x86 ~x86-linux"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2022-05-25 Thread WANG Xuerui 
commit: be96e13786fcd9851bdf330b534325f9ff3a248d
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed May 25 11:18:08 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed May 25 11:18:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be96e137

x11-wm/openbox: keyword 3.6.1-r3 for ~loong

See: https://github.com/xen0n/loongson-overlay/pull/25
Tested-by: HougeLangley  gmail.com>
Signed-off-by: WANG Xuerui  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index c5df08cd6a6e..aa4008344737 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 
sparc x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2022-05-25 Thread WANG Xuerui 
commit: 34b3054cbd128f0055c85d240324943d15217060
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed May 25 11:18:07 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed May 25 11:18:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b3054c

x11-wm/openbox: forward ~loong

See: https://github.com/xen0n/loongson-overlay/pull/25
Tested-by: HougeLangley  gmail.com>
Signed-off-by: WANG Xuerui  gentoo.org>

 x11-wm/openbox/openbox-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 0b8c51f00bd1..2cbac0641c41 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 
~sparc ~x86 ~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2022-02-01 Thread Craig Andrews 
commit: a832b9fb0ec505d4096e3ebe0dc0c02cc0df16e9
Author: Craig Andrews  gentoo  org>
AuthorDate: Wed Feb  2 02:36:12 2022 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Wed Feb  2 02:36:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a832b9fb

x11-wm/openbox: Python 3.10 compatibility

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Craig Andrews  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 4 ++--
 x11-wm/openbox/openbox-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 2288b82914b0..c5df08cd6a6e 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 996da0e28250..0b8c51f00bd1 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2021-07-17 Thread David Seifert 
commit: 456db16a1fca1fba9806cdceac71c9e19a21b56b
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jul 17 18:17:25 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul 17 18:17:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=456db16a

x11-wm/openbox: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP

Signed-off-by: David Seifert  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 4 ++--
 x11-wm/openbox/openbox-.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 2e055c88caa..2288b82914b 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"
@@ -47,7 +47,7 @@ RDEPEND="
xdg? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
-   dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+   dev-python/pyxdg[${PYTHON_USEDEP}]
')
)
 "

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index f608dddb2d7..996da0e2825 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit autotools python-single-r1
 
 DESCRIPTION="Standards compliant, fast, light-weight, extensible window 
manager"
@@ -47,7 +47,7 @@ RDEPEND="
xdg? (
${PYTHON_DEPS}
$(python_gen_cond_dep '
-   dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+   dev-python/pyxdg[${PYTHON_USEDEP}]
')
)
 "

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2021-05-27 Thread Yixun Lan 
commit: dc952881adeca5f8707d6f4d5ce52da3ddbf2022
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu May 27 13:46:39 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu May 27 14:33:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc952881

x11-wm/openbox: add riscv keyword

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 5a00c19811e..2e055c88caa 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2021-03-14 Thread Andreas Sturmlechner 
commit: c041c9a6d1228503e15329e7eaffb24dc49c9b5b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 13 23:57:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 14 23:01:53 2021 +
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-.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} == ** ]]; 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} == ** ]]; 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-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 916dd0c6229..f608dddb2d7 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.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} == ** ]]; 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=(

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-08-13 Thread Andreas Sturmlechner 
commit: 786b20fa6aff12f05fd338faf227442ecc7dad8e
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Aug 13 02:28:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 13 15:45:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=786b20fa

x11-wm/openbox: add missing BDEPEND

Reported-by: Mart Raudsepp  gentoo.org>
Closes: https://bugs.gentoo.org/733964
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17107
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 12 
 x11-wm/openbox/openbox-.ebuild | 12 
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index a5c37f022d9..55a0b32061e 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -24,7 +24,12 @@ SLOT="3"
 IUSE="branding debug imlib nls session startup-notification static-libs svg 
xdg"
 REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/glib:2
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+RDEPEND="
+   dev-libs/glib:2
>=dev-libs/libxml2-2.0
>=media-libs/fontconfig-2
x11-libs/cairo
@@ -46,9 +51,8 @@ RDEPEND="dev-libs/glib:2
')
)
 "
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
+DEPEND="
+   ${RDEPEND}
x11-base/xorg-proto
 "
 

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 736a89bce39..ad62edb8fa6 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -24,7 +24,12 @@ SLOT="3"
 IUSE="branding debug imlib nls session startup-notification static-libs svg 
xdg"
 REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-libs/glib:2
+BDEPEND="
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+RDEPEND="
+   dev-libs/glib:2
>=dev-libs/libxml2-2.0
>=media-libs/fontconfig-2
x11-libs/cairo
@@ -46,9 +51,8 @@ RDEPEND="dev-libs/glib:2
')
)
 "
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
+DEPEND="
+   ${RDEPEND}
x11-base/xorg-proto
 "

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-08-13 Thread Andreas Sturmlechner 
commit: 44a794de2c0725cc362097c2ea6209fa075b2c9d
Author: Jimi Huotari  gentoo  org>
AuthorDate: Thu Aug 13 02:32:52 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 13 15:45:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44a794de

x11-wm/openbox: remove version 3.6.1 (r0)

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Jimi Huotari  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/openbox/openbox-3.6.1.ebuild | 96 -
 1 file changed, 96 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
deleted file mode 100644
index 810985f6f7c..000
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools ltprune python-r1 eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/;
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-   SRC_URI="branding? (
-   https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-   branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 
~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg 
xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-   >=dev-libs/libxml2-2.0
-   >=media-libs/fontconfig-2
-   x11-libs/cairo
-   x11-libs/libXau
-   x11-libs/libXcursor
-   x11-libs/libXext
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXt
-   >=x11-libs/pango-1.8[X]
-   imlib? ( media-libs/imlib2 )
-   startup-notification? ( >=x11-libs/startup-notification-0.8 )
-   svg? ( gnome-base/librsvg:2 )
-   xdg? (
-   ${PYTHON_DEPS}
-   dev-python/pyxdg[${PYTHON_USEDEP}]
-   )
-   "
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   x11-base/xorg-proto"
-
-src_prepare() {
-   use xdg && python_setup
-   epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
-   sed -i \
-   -e "s:-O0 -ggdb ::" \
-   -e 's/-fno-strict-aliasing//' \
-   "${S}"/m4/openbox.m4 || die
-   epatch_user
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-   $(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) \
-   --with-x
-}
-
-src_install() {
-   dodir /etc/X11/Sessions
-   echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-   fperms a+x /etc/X11/Sessions/${PN}
-   emake DESTDIR="${D}" install
-   if use branding; then
-   insinto /usr/share/themes
-   doins -r "${WORKDIR}"/Surreal_Gentoo
-   # make it the default theme
-   sed -i \
-   -e "//{n; 
s@.*@Surreal_Gentoo@}" \
-   "${D}"/etc/xdg/openbox/rc.xml \
-   || die "failed to set Surreal Gentoo as the default 
theme"
-   fi
-   use static-libs || prune_libtool_files --all
-   if use xdg ; then
-   python_replicate_script 
"${ED}"/usr/libexec/openbox-xdg-autostart
-   else
-   rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-05-18 Thread Sergei Trofimovich 
commit: 9fe8b7f162f00f510231345f49ff20a3bc882045
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon May 18 15:34:24 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon May 18 16:46:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe8b7f1

x11-wm/openbox: stable 3.6.1-r3 for hppa, bug #722488

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 68f72a7a3c5..a5c37f022d9 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 sparc x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-05-13 Thread Agostino Sarubbo 
commit: 146c2390871c47e279a1db80a57e97bf5b58aec8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 10:08:11 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 10:08:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146c2390

x11-wm/openbox: x86 stable wrt bug #722488

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index e8df3a3d471..68f72a7a3c5 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc ~x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-05-13 Thread Agostino Sarubbo 
commit: f0d249e8322404d87e80be92a505f2ddab4e100f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 10:06:51 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 10:06:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d249e8

x11-wm/openbox: sparc stable wrt bug #722488

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 1fbf783062a..e8df3a3d471 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc ~x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc ~x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-05-13 Thread Agostino Sarubbo 
commit: c913e10303701a5913691cbd3949015605715c99
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 10:05:27 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 10:05:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c913e103

x11-wm/openbox: ppc64 stable wrt bug #722488

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 66764d702ee..1fbf783062a 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~sparc ~x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~sparc ~x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-05-13 Thread Agostino Sarubbo 
commit: d3f4b82384c94883057e4f3251c730f27b4c0bc4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 10:04:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 10:04:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f4b823

x11-wm/openbox: arm stable wrt bug #722488

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 132dc8c1875..0e34213f308 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-05-13 Thread Agostino Sarubbo 
commit: c03e0b919ba6772a6e61aa755e4ace4f5a936990
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 10:04:52 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 10:04:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03e0b91

x11-wm/openbox: ppc stable wrt bug #722488

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 0e34213f308..66764d702ee 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ~ppc64 ~sparc ~x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-05-12 Thread Mart Raudsepp 
commit: cc41908a3286bee78fb2e08eeb7e633d453a930d
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Tue May 12 18:29:13 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue May 12 21:47:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc41908a

x11-wm/openbox: arm64 stable (bug #722488)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index d3d8992b6d6..132dc8c1875 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-05-12 Thread Agostino Sarubbo 
commit: 62319a10c03b38a803fa37571f77f83f44e2b96f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 12 13:05:01 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 12 13:05:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62319a10

x11-wm/openbox: amd64 stable wrt bug #722488

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 736a89bce39..d3d8992b6d6 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
 fi
 
 SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-03-28 Thread Andreas Sturmlechner 
commit: 21bdc12c53c76a92910a85d86f6706ac4f1eb99d
Author: Jimi Huotari  gentoo  org>
AuthorDate: Tue Mar 24 13:09:02 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 28 13:08:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21bdc12c

x11-wm/openbox: use 'python-single-r1_pkg_setup' and sync 

Also includes minor cosmetic changes, an update for the homepage,
removal of unused eclass inherits, and a fix for installing the
'Surreal Gentoo' theme for .

Closes: https://bugs.gentoo.org/705420
Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Jimi Huotari  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/15106
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r3.ebuild | 28 ++---
 x11-wm/openbox/openbox-.ebuild | 46 +++---
 2 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r3.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
index ac111903327..736a89bce39 100644
--- a/x11-wm/openbox/openbox-3.6.1-r3.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -4,21 +4,21 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit multilib autotools python-single-r1 eutils
+inherit autotools python-single-r1
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/;
+HOMEPAGE="http://openbox.org/wiki/Main_Page;
+
 if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-   SRC_URI="branding? (
-   https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
 else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-   branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
+   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
 fi
 
+SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+
 LICENSE="GPL-2"
 SLOT="3"
 IUSE="branding debug imlib nls session startup-notification static-libs svg 
xdg"
@@ -45,11 +45,12 @@ RDEPEND="dev-libs/glib:2
dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
')
)
-   "
+"
 DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig
-   x11-base/xorg-proto"
+   x11-base/xorg-proto
+"
 
 PATCHES=(
"${FILESDIR}/${PN}-3.5.2-gnome-session.patch"
@@ -57,7 +58,16 @@ PATCHES=(
"${FILESDIR}/${PN}-3.6.1-py3-xdg.patch"
 )
 
+src_unpack() {
+   if [[ ${PV} == ** ]]; then
+   git-r3_src_unpack
+   fi
+
+   default
+}
+
 src_prepare() {
+   use xdg && python-single-r1_pkg_setup
default
sed -i \
-e "s:-O0 -ggdb ::" \

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 75bd3b71f0f..736a89bce39 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools ltprune python-r1 eutils
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools python-single-r1
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/;
+HOMEPAGE="http://openbox.org/wiki/Main_Page;
+
 if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-   SRC_URI="branding? (
-   https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
 else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-   branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
 fi
 
+SRC_URI+=" branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
+
 LICENSE="GPL-2"
 SLOT="3"
 IUSE="branding debug imlib nls session startup-notification static-libs svg 
xdg"
@@ -41,17 +41,33 @@ RDEPEND="dev-libs/glib:2
svg? ( gnome-base/librsvg:2 )
xdg? (
${PYTHON_DEPS}
-   dev-python/pyxdg[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+   ')
)
-   "
+"
 DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig
-   x11-base/xorg-proto"
+   x11-base/xorg-proto
+"
 
-PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-03-28 Thread Andreas Sturmlechner 
commit: 6fe2504a67062ebfcc86c9a5501ccb679771cede
Author: Jimi Huotari  gentoo  org>
AuthorDate: Wed Mar 25 11:53:27 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 28 13:08:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe2504a

x11-wm/openbox: remove version 3.6.1-r1

Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Jimi Huotari  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r1.ebuild | 95 --
 1 file changed, 95 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r1.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
deleted file mode 100644
index 7866f2eda02..000
--- a/x11-wm/openbox/openbox-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools ltprune python-r1 eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/;
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-   SRC_URI="branding? (
-   https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-   branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg 
xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-   >=dev-libs/libxml2-2.0
-   >=media-libs/fontconfig-2
-   x11-libs/cairo
-   x11-libs/libXau
-   x11-libs/libXcursor
-   x11-libs/libXext
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXt
-   >=x11-libs/pango-1.8[X]
-   imlib? ( media-libs/imlib2 )
-   startup-notification? ( >=x11-libs/startup-notification-0.8 )
-   svg? ( gnome-base/librsvg:2 )
-   xdg? (
-   ${PYTHON_DEPS}
-   dev-python/pyxdg[${PYTHON_USEDEP}]
-   )
-   "
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
-
-src_prepare() {
-   default
-   sed -i \
-   -e "s:-O0 -ggdb ::" \
-   -e 's/-fno-strict-aliasing//' \
-   "${S}"/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) \
-   --with-x
-}
-
-src_install() {
-   dodir /etc/X11/Sessions
-   echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-   fperms a+x /etc/X11/Sessions/${PN}
-   emake DESTDIR="${D}" install
-   if use branding; then
-   insinto /usr/share/themes
-   doins -r "${WORKDIR}"/Surreal_Gentoo
-   # make it the default theme
-   sed -i \
-   -e "//{n; 
s@.*@Surreal_Gentoo@}" \
-   "${D}"/etc/xdg/openbox/rc.xml \
-   || die "failed to set Surreal Gentoo as the default 
theme"
-   fi
-   use static-libs || prune_libtool_files --all
-   if use xdg ; then
-   python_replicate_script 
"${ED}"/usr/libexec/openbox-xdg-autostart
-   else
-   rm "${ED}"/usr/libexec/openbox-xdg-autostart || die
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-03-22 Thread Hanno Böck 
commit: d6a767fb5931af5753af4cd7b3607a09f56bafb2
Author: Hanno Böck  gentoo  org>
AuthorDate: Sun Mar 22 18:21:00 2020 +
Commit: Hanno Böck  gentoo  org>
CommitDate: Sun Mar 22 18:21:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a767fb

x11-wm/openbox: Assign to lxqt project

Signed-off-by: Hanno Böck  gentoo.org>
Package-Manager: Portage-2.3.94, Repoman-2.3.21

 x11-wm/openbox/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 8919f0518e2..716db565e9a 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -2,8 +2,8 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   l...@gentoo.org
-   Gentoo LXDE Project
+   l...@gentoo.org
+   LXQt


Enables support for session managers

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-02-15 Thread David Seifert 
commit: 8f96355e98b9d684ddd5cd55b0add9f90914e7ef
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb 15 10:03:26 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb 15 10:03:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f96355e

x11-wm/openbox: [QA] inherit ltprune.eclass directly

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Closes: https://github.com/gentoo/gentoo/pull/14653
Signed-off-by: David Seifert  gentoo.org>

 x11-wm/openbox/openbox-3.6.1-r1.ebuild | 4 ++--
 x11-wm/openbox/openbox-3.6.1.ebuild| 2 +-
 x11-wm/openbox/openbox-.ebuild | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r1.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
index accf171ec29..30f1883b2a3 100644
--- a/x11-wm/openbox/openbox-3.6.1-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools python-r1 eutils
+inherit multilib autotools ltprune python-r1 eutils
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
 HOMEPAGE="http://openbox.org/;

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
index b8128144937..810985f6f7c 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -4,7 +4,7 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools python-r1 eutils
+inherit multilib autotools ltprune python-r1 eutils
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
 HOMEPAGE="http://openbox.org/;

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 27180a3f68e..658500bbf76 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools python-r1 eutils
+inherit multilib autotools ltprune python-r1 eutils
 
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
 HOMEPAGE="http://openbox.org/;

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2020-02-09 Thread Michał Górny 
commit: 8518b0bb4d4e7f8f75649d86034405b61f028f2d
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 20:31:21 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:37:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8518b0bb

x11-wm/openbox: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny  gentoo.org>

 x11-wm/openbox/{openbox-3.6.1-r2.ebuild => openbox-3.6.1-r3.ebuild} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r2.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
similarity index 97%
rename from x11-wm/openbox/openbox-3.6.1-r2.ebuild
rename to x11-wm/openbox/openbox-3.6.1-r3.ebuild
index 80c67975b17..87f93920849 100644
--- a/x11-wm/openbox/openbox-3.6.1-r2.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -41,7 +41,9 @@ RDEPEND="dev-libs/glib:2
svg? ( gnome-base/librsvg:2 )
xdg? (
${PYTHON_DEPS}
-   dev-python/pyxdg[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+   ')
)
"
 DEPEND="${RDEPEND}

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/, x11-wm/openbox/files/

2020-01-13 Thread Hanno Böck 
commit: 31bad4f781f788ccf848500f8c17905ad32a2de9
Author: Hanno Böck  gentoo  org>
AuthorDate: Mon Jan 13 16:22:27 2020 +
Commit: Hanno Böck  gentoo  org>
CommitDate: Mon Jan 13 16:22:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31bad4f7

x11-wm/openbox: Python 3 support.

Use EAPI 7.
Remove Python 2, change to python single package.

Closes: https://bugs.gentoo.org/696042
Signed-off-by: Hanno Böck  gentoo.org>
Package-Manager: Portage-2.3.84, Repoman-2.3.20

 x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch | 126 +++
 x11-wm/openbox/openbox-3.6.1-r2.ebuild   | 100 ++
 2 files changed, 226 insertions(+)

diff --git a/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch 
b/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch
new file mode 100644
index 000..d28b536d64a
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.6.1-py3-xdg.patch
@@ -0,0 +1,126 @@
+diff --git a/data/autostart/openbox-xdg-autostart 
b/data/autostart/openbox-xdg-autostart
+index 04a17a199..f2c75bbdd 100755
+--- a/data/autostart/openbox-xdg-autostart
 b/data/autostart/openbox-xdg-autostart
+@@ -19,6 +19,8 @@
+ #   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #   GNU General Public License for more details.
+ 
++from __future__ import print_function
++
+ ME="openbox-xdg-autostart"
+ VERSION="1.1"
+ 
+@@ -28,9 +30,9 @@ try:
+ from xdg.DesktopEntry import DesktopEntry
+ from xdg.Exceptions import ParsingError
+ except ImportError:
+-print
+-print >>sys.stderr, "ERROR:", ME, "requires PyXDG to be installed"
+-print
++print()
++print("ERROR:", ME, "requires PyXDG to be installed", file=sys.stderr)
++print()
+ sys.exit(1)
+ 
+ def main(argv=sys.argv):
+@@ -51,7 +53,7 @@ def main(argv=sys.argv):
+ try:
+ autofile = AutostartFile(path)
+ except ParsingError:
+-print "Invalid .desktop file: " + path
++print("Invalid .desktop file: " + path)
+ else:
+ if not autofile in files:
+ files.append(autofile)
+@@ -99,9 +101,9 @@ class AutostartFile:
+ 
+ def _alert(self, str, info=False):
+ if info:
+-print "\t ", str
++print("\t ", str)
+ else:
+-print "\t*", str
++print("\t*", str)
+ 
+ def _showInEnvironment(self, envs, verbose=False):
+ default = not self.de.getOnlyShowIn()
+@@ -146,14 +148,14 @@ class AutostartFile:
+ 
+ def display(self, envs):
+ if self._shouldRun(envs):
+-print "[*] " + self.de.getName()
++print("[*] " + self.de.getName())
+ else:
+-print "[ ] " + self.de.getName()
++print("[ ] " + self.de.getName())
+ self._alert("File: " + self.path, info=True)
+ if self.de.getExec():
+ self._alert("Executes: " + self.de.getExec(), info=True)
+ self._shouldRun(envs, True)
+-print
++print()
+ 
+ def run(self, envs):
+ here = os.getcwd()
+@@ -165,34 +167,34 @@ class AutostartFile:
+ os.chdir(here)
+ 
+ def show_help():
+-print "Usage:", ME, "[OPTION]... [ENVIRONMENT]..."
+-print
+-print "This tool will run xdg autostart .desktop files"
+-print
+-print "OPTIONS"
+-print "  --listShow a list of the files which would be run"
+-print "Files which would be run are marked with an 
asterix"
+-print "symbol [*].  For files which would not be run,"
+-print "information is given for why they are excluded"
+-print "  --helpShow this help and exit"
+-print "  --version Show version and copyright information"
+-print
+-print "ENVIRONMENT specifies a list of environments for which to run 
autostart"
+-print "applications.  If none are specified, only applications which do 
not "
+-print "limit themselves to certain environments will be run."
+-print
+-print "ENVIRONMENT can be one or more of:"
+-print "  GNOME Gnome Desktop"
+-print "  KDE   KDE Desktop"
+-print "  ROX   ROX Desktop"
+-print "  XFCE  XFCE Desktop"
+-print "  Old   Legacy systems"
+-print
++print("Usage:", ME, "[OPTION]... [ENVIRONMENT]...")
++print()
++print("This tool will run xdg autostart .desktop files")
++print()
++print("OPTIONS")
++print("  --listShow a list of the files which would be run")
++print("Files which would be run are marked with an 
asterix")
++print("symbol [*].  For files which would not be run,")
++print("information is given for why they are excluded")
++print("  --helpShow this help and exit")
++print("  --version Show version and copyright information")
++print()
++

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2019-11-29 Thread Michał Górny 
commit: 1e81cf3f559913cacb995aaa5818e3c5ba354799
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Nov 28 17:33:33 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Nov 29 08:14:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e81cf3f

x11-wm/openbox: python_export_best → python_setup

Signed-off-by: Michał Górny  gentoo.org>

 x11-wm/openbox/openbox-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
index 4fee4c0952c..35d268b94df 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto"
 
 src_prepare() {
-   use xdg && python_export_best
+   use xdg && python_setup
epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
sed -i \
-e "s:-O0 -ggdb ::" \

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2018-05-30 Thread Johannes Huber 
commit: 484c6990897956bc8d9b1d0e67b39c572d6dd21b
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu May 31 05:37:51 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu May 31 05:38:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=484c6990

x11-wm/openbox: Drop banned function call

Closes: https://bugs.gentoo.org/656938
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/openbox/openbox-3.6.1-r1.ebuild | 1 -
 x11-wm/openbox/openbox-.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1-r1.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
index 0c6773cef0a..8ad170d1e46 100644
--- a/x11-wm/openbox/openbox-3.6.1-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
@@ -52,7 +52,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
 
 src_prepare() {
-   use xdg && python_export_best
default
sed -i \
-e "s:-O0 -ggdb ::" \

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index f38bbd65197..fd29dcff8e5 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -52,7 +52,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
 
 src_prepare() {
-   use xdg && python_export_best
default
sed -i \
-e "s:-O0 -ggdb ::" \

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2018-05-30 Thread Johannes Huber 
commit: d50394f9a5aa47c6f56040935441338213b53200
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 30 19:52:39 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May 30 21:13:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50394f9

x11-wm/openbox: Remove 3.6

Uses deprecated EAPI 5 and overshadowed by 3.6.1.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/openbox/Manifest   |   1 -
 x11-wm/openbox/openbox-3.6.ebuild | 102 --
 2 files changed, 103 deletions(-)

diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 06f4bd24df5..fc3ee96 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,3 +1,2 @@
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 
1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5
 SHA512 
5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
-DIST openbox-3.6.tar.gz 963207 BLAKE2B 
cbc29011fea9157af62c87a68e1cf4c31b474a5520c995bca360f2db83fe0957716bbf5af916bf7d5d0f677192d07d4cb07ad35f7b79ede548342f2805add533
 SHA512 
7f158a5236dcba5ec3c0e4fb5d1a5cabbd956d4125f19dfdb0594f5ded52545078d85ab645589ec3400a5306f63b43db5ee1ae26e3683141ee47f1b406d9788b
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B 
e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce
 SHA512 
dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e

diff --git a/x11-wm/openbox/openbox-3.6.ebuild 
b/x11-wm/openbox/openbox-3.6.ebuild
deleted file mode 100644
index 8412487ff4f..000
--- a/x11-wm/openbox/openbox-3.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools python-r1 eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/;
-if [[ ${PV} == ** ]]; then
-   inherit git-2
-   EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-   SRC_URI="branding? (
-   https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS=""
-
-else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-   branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg 
xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-   >=dev-libs/libxml2-2.0
-   >=media-libs/fontconfig-2
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXt
-   >=x11-libs/pango-1.8[X]
-   imlib? ( media-libs/imlib2 )
-   startup-notification? ( >=x11-libs/startup-notification-0.8 )
-   svg? ( gnome-base/librsvg:2 )
-   xdg? (
-   ${PYTHON_DEPS}
-   dev-python/pyxdg[${PYTHON_USEDEP}]
-   )
-   "
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   x11-base/xorg-proto"
-
-src_unpack() {
-   if [[ ${PV} == ** ]]; then
-   git-2_src_unpack
-   else
-   unpack ${A}
-   fi
-}
-
-src_prepare() {
-   use xdg && python_export_best
-   epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
-   sed -i \
-   -e "s:-O0 -ggdb ::" \
-   -e 's/-fno-strict-aliasing//' \
-   "${S}"/m4/openbox.m4 || die
-   epatch_user
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-   $(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) \
-   --with-x
-}
-
-src_install() {
-   dodir /etc/X11/Sessions
-   echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-   fperms a+x /etc/X11/Sessions/${PN}
-   emake DESTDIR="${D}" install
-   if use branding; then
-   insinto /usr/share/themes
-   doins -r "${WORKDIR}"/Surreal_Gentoo
-   # make it the default theme
-   sed -i \
-   -e "//{n; 
s@.*@Surreal_Gentoo@}" \
-   "${D}"/etc/xdg/openbox/rc.xml \
-   || die "failed to set Surreal Gentoo as the default 
theme"
-   fi
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2018-05-30 Thread Johannes Huber 
commit: ee72b353c542dcbc423e27f54ef0f38aa19a804d
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 30 20:11:08 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May 30 21:13:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee72b353

x11-wm/openbox: Add missing deps

Closes: https://bugs.gentoo.org/588930
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/openbox/openbox-3.6.1.ebuild | 4 
 x11-wm/openbox/openbox-.ebuild  | 4 
 2 files changed, 8 insertions(+)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
index d06a776bab0..1786f2c2ccf 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -29,6 +29,10 @@ REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="dev-libs/glib:2
>=dev-libs/libxml2-2.0
>=media-libs/fontconfig-2
+   x11-libs/cairo
+   x11-libs/libXau
+   x11-libs/libXcursor
+   x11-libs/libXext
x11-libs/libXft
x11-libs/libXinerama
x11-libs/libXrandr

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index a2cb088ec10..651ddc4d1e4 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -29,6 +29,10 @@ REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="dev-libs/glib:2
>=dev-libs/libxml2-2.0
>=media-libs/fontconfig-2
+   x11-libs/cairo
+   x11-libs/libXau
+   x11-libs/libXcursor
+   x11-libs/libXext
x11-libs/libXft
x11-libs/libXinerama
x11-libs/libXrandr

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2018-05-30 Thread Johannes Huber 
commit: 8883893ecd11b82dc40aaa3a62dba56b272271d7
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 30 20:53:03 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May 30 21:13:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8883893e

x11-wm/openbox: Migrate to git-r3 eclass

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/openbox/openbox-3.6.1.ebuild | 12 +---
 x11-wm/openbox/openbox-.ebuild  | 11 ++-
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
index 1786f2c2ccf..fb04b059624 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -9,12 +9,10 @@ inherit multilib autotools python-r1 eutils
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
 HOMEPAGE="http://openbox.org/;
 if [[ ${PV} == ** ]]; then
-   inherit git-2
+   inherit git-r3
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
SRC_URI="branding? (
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="alpha arm hppa ppc ppc64 sparc x86"
-
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -51,14 +49,6 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
x11-base/xorg-proto"
 
-src_unpack() {
-   if [[ ${PV} == ** ]]; then
-   git-2_src_unpack
-   else
-   unpack ${A}
-   fi
-}
-
 src_prepare() {
use xdg && python_export_best
epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 651ddc4d1e4..1a98e9183a6 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -9,7 +9,7 @@ inherit multilib autotools python-r1 eutils
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
 HOMEPAGE="http://openbox.org/;
 if [[ ${PV} == ** ]]; then
-   inherit git-2
+   inherit git-r3
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
SRC_URI="branding? (
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -51,19 +51,12 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
x11-base/xorg-proto"
 
-src_unpack() {
-   if [[ ${PV} == ** ]]; then
-   git-2_src_unpack
-   else
-   unpack ${A}
-   fi
-}
-
 src_prepare() {
use xdg && python_export_best
epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
sed -i \
-e "s:-O0 -ggdb ::" \
+   -e 's/-fno-strict-aliasing//' \
"${S}"/m4/openbox.m4 || die
epatch_user
eautoreconf

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2018-05-30 Thread Johannes Huber 
commit: b56f7a605f3e530755f37b7e9f0837e672bc0cd7
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 30 19:51:31 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May 30 21:13:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56f7a60

x11-wm/openbox: Remove 3.5.2-r1

Uses deprecated EAPI 5 and overshadowed by 3.6.1.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/openbox/Manifest|   1 -
 x11-wm/openbox/openbox-3.5.2-r1.ebuild | 102 -
 2 files changed, 103 deletions(-)

diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 9ea22643b12..06f4bd24df5 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,4 +1,3 @@
-DIST openbox-3.5.2.tar.gz 972751 BLAKE2B 
67fa52c595ac107906b879bc98cbf057ef38432686d4fe138b3b13c39e640719a2afd1686847d8ba50548eb8fbd6ea9b92cbbc35ce692d61135c8d35f8f6a907
 SHA512 
89c58364bc482f2b098341e28b2bbab69a791430ff8924dc0dd6fe56aabadde916d42a4e7dfb47cab21afebd747698e106a19e852444d2ede05e72ef423df09d
 DIST openbox-3.6.1.tar.gz 962665 BLAKE2B 
1c0288137d7b02d443c384f970cd9a3f4d5d5585989917ac6ae8cf492e045dc086650c245907e168bc7b6d0ce701339854a5d94ad510823141cc78e28c1e13c5
 SHA512 
5e6f4a214005bea8b26bc8959fe5bb67356a387ddd317e014f43cb5b5bf263ec617a5973e2982eb76a08dc7d3ca5ec9e72e64c9b5efd751001a8999b420b1ad0
 DIST openbox-3.6.tar.gz 963207 BLAKE2B 
cbc29011fea9157af62c87a68e1cf4c31b474a5520c995bca360f2db83fe0957716bbf5af916bf7d5d0f677192d07d4cb07ad35f7b79ede548342f2805add533
 SHA512 
7f158a5236dcba5ec3c0e4fb5d1a5cabbd956d4125f19dfdb0594f5ded52545078d85ab645589ec3400a5306f63b43db5ee1ae26e3683141ee47f1b406d9788b
 DIST surreal-gentoo.tar.gz 13410 BLAKE2B 
e7d902278004785c68a2e5aa02aa326cee1ef04fe964fce283afde00cb668b06d5d8461207ef9571aa402b960ec16bdff6bf11cf38ca9a76335ced173592ffce
 SHA512 
dd43cb78e5e33345767edad22d0470765ac9eeae02bbad0acd8098bc096c15a166bf651493d12a5953bc043c9be92e9b160607eafb4723a6bcfc5d1d6fae235e

diff --git a/x11-wm/openbox/openbox-3.5.2-r1.ebuild 
b/x11-wm/openbox/openbox-3.5.2-r1.ebuild
deleted file mode 100644
index 433a8a57712..000
--- a/x11-wm/openbox/openbox-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit multilib autotools python-r1 eutils
-
-DESCRIPTION="A standards compliant, fast, light-weight, extensible window 
manager"
-HOMEPAGE="http://openbox.org/;
-if [[ ${PV} == ** ]]; then
-   inherit git-2
-   EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
-   SRC_URI="branding? (
-   https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS=""
-
-else
-   SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
-   branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 
~x86-fbsd ~arm-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="branding debug imlib nls session startup-notification static-libs svg 
xdg"
-REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-libs/glib:2
-   >=dev-libs/libxml2-2.0
-   >=media-libs/fontconfig-2
-   x11-libs/libXft
-   x11-libs/libXinerama
-   x11-libs/libXrandr
-   x11-libs/libXt
-   >=x11-libs/pango-1.8[X]
-   imlib? ( media-libs/imlib2 )
-   startup-notification? ( >=x11-libs/startup-notification-0.8 )
-   svg? ( gnome-base/librsvg:2 )
-   xdg? (
-   ${PYTHON_DEPS}
-   dev-python/pyxdg[${PYTHON_USEDEP}]
-   )
-   "
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   virtual/pkgconfig
-   x11-base/xorg-proto"
-
-src_unpack() {
-   if [[ ${PV} == ** ]]; then
-   git-2_src_unpack
-   else
-   unpack ${A}
-   fi
-}
-
-src_prepare() {
-   use xdg && python_export_best
-   epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
-   sed -i \
-   -e "s:-O0 -ggdb ::" \
-   -e 's/-fno-strict-aliasing//' \
-   "${S}"/m4/openbox.m4 || die
-   epatch_user
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --docdir="${EPREFIX}/usr/share/doc/${PF}" \
-   $(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) \
-   --with-x
-}
-
-src_install() {
-   dodir /etc/X11/Sessions
-   echo "/usr/bin/openbox-session" > "${ED}/etc/X11/Sessions/${PN}"
-   fperms a+x /etc/X11/Sessions/${PN}
-   emake DESTDIR="${D}" install
-   if use branding; then
-   insinto /usr/share/themes
-

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2018-05-30 Thread Johannes Huber 
commit: 4d59f9f210fb49183354b0c1453c0a9c2d38d32e
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May 30 21:07:13 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May 30 21:13:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d59f9f2

x11-wm/openbox: EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../openbox/{openbox-.ebuild => openbox-3.6.1-r1.ebuild}  | 11 +--
 x11-wm/openbox/openbox-.ebuild|  9 -
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
similarity index 93%
copy from x11-wm/openbox/openbox-.ebuild
copy to x11-wm/openbox/openbox-3.6.1-r1.ebuild
index 1a98e9183a6..0c6773cef0a 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit multilib autotools python-r1 eutils
@@ -13,12 +13,10 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
SRC_URI="branding? (
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS=""
-
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~arm-linux ~x86-linux"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
@@ -51,14 +49,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
+
 src_prepare() {
use xdg && python_export_best
-   epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+   default
sed -i \
-e "s:-O0 -ggdb ::" \
-e 's/-fno-strict-aliasing//' \
"${S}"/m4/openbox.m4 || die
-   epatch_user
eautoreconf
 }
 

diff --git a/x11-wm/openbox/openbox-.ebuild 
b/x11-wm/openbox/openbox-.ebuild
index 1a98e9183a6..f38bbd65197 100644
--- a/x11-wm/openbox/openbox-.ebuild
+++ b/x11-wm/openbox/openbox-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit multilib autotools python-r1 eutils
@@ -13,8 +13,6 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
SRC_URI="branding? (
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS=""
-
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -51,14 +49,15 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
+
 src_prepare() {
use xdg && python_export_best
-   epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+   default
sed -i \
-e "s:-O0 -ggdb ::" \
-e 's/-fno-strict-aliasing//' \
"${S}"/m4/openbox.m4 || die
-   epatch_user
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2017-11-26 Thread David Seifert 
commit: 93b6da7bf0df39211651e4814406b2a21cf9c3f2
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 26 13:17:36 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 26 23:32:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93b6da7b

x11-wm/openbox: [QA] Consistent whitespace in metadata.xml

 x11-wm/openbox/metadata.xml | 42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 03e0a0449e0..4c8dd2cb3bd 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -1,25 +1,25 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-   hwoar...@gentoo.org
-   Markos Chandras
-  
-  
-l...@gentoo.org
-Gentoo LXDE Project
-  
-  
-Enables support for session managers
-Install the python xdg files for xdg autostart
-  
-  
-
-  dan...@orodu.net
-  Dana Jansens
-
-http://openbox.org/wiki/Openbox:News
-http://openbox.org/wiki/Help:Contents
-http://openbox.org/wiki/Openbox:Contribute
-  
+   
+   hwoar...@gentoo.org
+   Markos Chandras
+   
+   
+   l...@gentoo.org
+   Gentoo LXDE Project
+   
+   
+   Enables support for session managers
+   Install the python xdg files for xdg 
autostart
+   
+   
+   
+   dan...@orodu.net
+   Dana Jansens
+   
+   http://openbox.org/wiki/Openbox:News
+   http://openbox.org/wiki/Help:Contents
+   http://openbox.org/wiki/Openbox:Contribute
+

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2016-10-01 Thread Jeroen Roovers 
commit: 7fcf60386b1f2d448b412ac6c0f4f2d7d1703a85
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sat Oct  1 11:49:50 2016 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sat Oct  1 11:49:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fcf6038

x11-wm/openbox: Stable for HPPA PPC64 (bug #561046).

Package-Manager: portage-2.3.1
RepoMan-Options: --ignore-arches

 x11-wm/openbox/openbox-3.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
index 83f9d33..5e32bba 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -14,12 +14,12 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
SRC_URI="branding? (
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="alpha arm ppc x86"
+   KEYWORDS="alpha arm hppa ppc ppc64 x86"
 
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 ~sparc x86 
~x86-fbsd ~arm-linux ~x86-linux"
+   KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 ~sparc x86 
~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2016-05-23 Thread Tobias Klausmann 
commit: 789f357b408eb6c928c5dc6a99157bc7330d8f38
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon May 23 14:37:52 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon May 23 14:37:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789f357b

x11-wm/openbox-3.6.1-r0: add alpha keyword

Gentoo-Bug: 561046

Package-Manager: portage-2.3.0_rc1

 x11-wm/openbox/openbox-3.6.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
index 8eb7996..682e286 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,12 +14,12 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
SRC_URI="branding? (
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="arm"
+   KEYWORDS="alpha arm"
 
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
+   KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2016-04-19 Thread Markus Meier 
commit: 4d6f8a62f24bdc9fc6385ca86e9a4e6821486011
Author: Markus Meier  gentoo  org>
AuthorDate: Tue Apr 19 15:56:45 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Tue Apr 19 15:56:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6f8a62

x11-wm/openbox: arm stable, bug #561046

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 x11-wm/openbox/openbox-3.6.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
index f5ed474..8eb7996 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -14,12 +14,12 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
SRC_URI="branding? (
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS=""
+   KEYWORDS="arm"
 
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

2016-04-09 Thread Agostino Sarubbo 
commit: f24c125139d84fe8df61f54b937da0edbb487e3c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr  9 13:43:29 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr  9 13:43:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24c1251

x11-wm/openbox: amd64 stable wrt bug #561046

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-wm/openbox/openbox-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild 
b/x11-wm/openbox/openbox-3.6.1.ebuild
index 7edc700..f5ed474 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == ** ]]; then
 else
SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"