commit: dea896f4f045ee93faf42e8ba3b27929dd35ed33
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 23:12:10 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 23:12:10 2023 +0000
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 <sam <AT> 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..000000000000
--- 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} == *9999* ]]; 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} == *9999* ]]; 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 "/<theme>/{n;
s@<name>.*</name>@<name>Surreal_Gentoo</name>@}" \
- "${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} == *9999* ]]; 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 )"
