summaryrefslogtreecommitdiff
path: root/x11-wm/fluxbox
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/fluxbox')
-rw-r--r--x11-wm/fluxbox/Manifest8
-rw-r--r--x11-wm/fluxbox/files/osx-has-otool.patch4
-rw-r--r--x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild114
-rw-r--r--x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild54
-rw-r--r--x11-wm/fluxbox/fluxbox-9999.ebuild113
-rw-r--r--x11-wm/fluxbox/metadata.xml4
6 files changed, 30 insertions, 267 deletions
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 3f2389d33c63..c8473234d82c 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -2,12 +2,10 @@ AUX fix-hidden-toolbar.patch 5403 BLAKE2B af751babd70eae79729b942c7bb0e49e95c0b9
AUX fluxbox.desktop 187 BLAKE2B 3486c46b9c1c2bb1526818a991202eb327b31b2ca71690d639c78d57494715d1b66a60d8903c3ecafcf84b3c1fdf44396aee5d1d534a60bf99a31e2a6f14f0e8 SHA512 217baf54698bb553dabfdc5565827eb10e897728a2ff2595f0eb03aaf049784a094c48b7e698b34ce374dd9f81036bebc77cf7136ec7aa9651eeaf8a0b751dd0
AUX fluxbox.xsession 2004 BLAKE2B 3c242e42ff2c0a633e061def8cd339a1cc980aee20e92ea3aa2d5298bffe3b76c02987b02bf20b5faa9604841fc2b8d947c3dd7123ac5a3793c7d85a51b5cc2c SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72
AUX gentoo_style_location-1.1.x.patch 735 BLAKE2B bd441ccd5c2819770543effd6fcbc1b33adf52352cfd0a4802140b32083302e665cfa9fed9c1417698f706fa36d8ae0d9b7e2fa19a983aa8f61292dbca27b9d0 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220
-AUX osx-has-otool.patch 472 BLAKE2B 6341fa70a3e58bfeb63d2a829a86dd8a134fbcb1f4c0c3137619ea22de3df567f03c4ea2c6999c17442adbc636dea1a92dfd6a7e01e9725b13329143c3f9c249 SHA512 50758ff5729bfdd74011106f95eb9cf72c4e1ba3ec5fc462017172b7b4f8f9e7763416e8c9243fdb59f699175c5ca18711e05e4be1a95ad973e76daa3814d17a
+AUX osx-has-otool.patch 476 BLAKE2B 0c1bae602dc169aa4cb3b7bbe9712935ac117962e644ebdae428740dd72caf5a34690267446ed9f5e3829a9b87a15916dd44e8c63e898e685b16091f1008a9a0 SHA512 a955035154a7607e7f4c9f64fa85bbc43c79cc6cd9654b854b40d1948b5cc3a8f8f8cb50c9906eb7691f755d14e7a588fa2237b44e12c5073b40d2dd470acf1e
AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e1124b0c6d0cf4fcec84a612cc525e038625d87cf8d13b9d6a8212c7916a789ab45872e17c978f7bcc54142 SHA512 116876f0edb60b993738b367f5c6a25a401cfd26a9062416e6d4e58dd92e814f79c43357352a1fddf9e52b6274914efa4b41479643557a38295b0d9e5c2c9dee
AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622
AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094
DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01
-EBUILD fluxbox-1.3.7-r3.ebuild 3139 BLAKE2B 42b73e75a4b21e4c3411d6ed93f72811f70596927a4b86c16871a0565e57e2567a4b1a7143e0403f753e992cc31b8d0fa216ba166c02672107ed3d493d201823 SHA512 08da466e88dfdcd6e004d6a9fa920647719449f4f16151bb28ecac167a8a4a790b61c0af4c62418cc181c7e092af184986c05a2f81ea613cfe61f6210b908be8
-EBUILD fluxbox-1.3.7-r4.ebuild 3176 BLAKE2B f32bccc0a559807535e1f961de63b3de5e614b6e059e968ff4bdd8776108f1263d7418501336cabe00b6048bb8c261339036b70e7071ff7783cda60419c26a86 SHA512 b7d234563f2ff220eedca38dccf10dea62e4ff390423e60c9fc298a1af0c0c76f4f5095e1183f1a69f7f3e6472ca88e8f97d7583d02e4db56da55de2b94eb67f
-EBUILD fluxbox-9999.ebuild 2989 BLAKE2B fd1ca1cb0e2bd290436a65da63b431204996ae1f046b3a8876d42fee5177fef3c81dd9443a1d9855a1006964d2289f863b866df597f1c633a735050ccd62a0b7 SHA512 4c77a116e4e5be9ac525b1047bd39f45763b6300d97c4efb34b8bbedbd3de9ba56cc4c7935b681b89cb3a38a7116f4513dd3641d30caf44ef07572aae4fa328c
-MISC metadata.xml 1000 BLAKE2B 37bb680df975da4d9074c20418218ba2da7ace4d50d89ab9b802a3b71ac1270a48c1ae33f25c1c3ec07719d6b021d4538a44a535f945c8b73de5a22d9b4eabd8 SHA512 7c3c819b2e19ea143255b2305722bb09f70cfc304f8becad482ffacbf751a934de96a3e3635cc95acd6e2529ef810a08eb7011632baf064fdc6ce27c307341d6
+EBUILD fluxbox-1.3.7-r4.ebuild 3011 BLAKE2B 700ef6d8d8dccb4a83037a40db40ee0783799e2b81eb4859c0a0debf27838cf215bdb408feb76d21b233649ccd5b1cb2331c3e4a625407e18c87b08676e62952 SHA512 3915646f058a7153ffa257ee79181bc69097e8c56565e3d72c3c41c7c848a8580a06618ea1b2552f7e6b392d34fff549da9d9830ac86322a5b6bb74874fc4a88
+MISC metadata.xml 892 BLAKE2B 83aa00ca67e0a6239d9086b9550969068155e9dee4a6dcca0340e553bd43097e9700bd68637bb0a94d0051b8b19a2a5abc2147ac16e0ae7b28836d7a9b79ae4d SHA512 fd8410c6214cf63d781b148ee2add0c46cfbd050cc22412afef43f3b2cfb6eca9a97f66518f138db0d5f695dcca522fccf44c422e481589718ab14394b8d741a
diff --git a/x11-wm/fluxbox/files/osx-has-otool.patch b/x11-wm/fluxbox/files/osx-has-otool.patch
index 7671dd83647c..d500af681f81 100644
--- a/x11-wm/fluxbox/files/osx-has-otool.patch
+++ b/x11-wm/fluxbox/files/osx-has-otool.patch
@@ -1,5 +1,5 @@
---- util/fbsetbg
-+++ util/fbsetbg
+--- a/util/fbsetbg
++++ b/util/fbsetbg
@@ -356,7 +356,8 @@
if [ ! "$wpsetter" = Esetroot ]; then
WPSETTER=$wpsetter
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
deleted file mode 100644
index 165e79552f94..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs prefix xdg
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
-
-REQUIRED_USE="systray? ( toolbar )"
-
-DESCRIPTION="X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- !!<=x11-misc/fbdesk-1.2.1
- !!<=x11-misc/fluxconf-0.9.9
- !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
- bidi? ( >=dev-libs/fribidi-0.19.2 )
- imlib? ( >=media-libs/imlib2-1.2.0[X] )
- truetype? ( media-libs/freetype )
- vim-syntax? ( app-vim/fluxbox-syntax )
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- || ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
- ${RDEPEND}
- bidi? ( virtual/pkgconfig )
- nls? ( sys-devel/gettext )
- x11-base/xorg-proto
-"
-
-src_prepare() {
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
-
- eprefixify util/fluxbox-generate_menu.in
-
- epatch "${FILESDIR}"/osx-has-otool.patch
-
- # Fix bug #551522; 1.3.8 will render this obsolete
- epatch "${FILESDIR}"/fix-hidden-toolbar.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-}
-
-src_configure() {
- use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
- econf $(use_enable bidi fribidi ) \
- $(use_enable imlib imlib2) \
- $(use_enable nls) \
- $(use_enable slit ) \
- $(use_enable systray ) \
- $(use_enable toolbar ) \
- $(use_enable truetype xft) \
- $(use_enable xinerama) \
- --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
- --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
- default
-
- ebegin "Creating a menu file (may take a while)"
- mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- # Call fluxbox-generate_menu through bash since it lacks +x
- # chmod 744 may be an equal fix
- MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
- CHECKINIT="no. go away." HOME="${T}/home" \
- bash "${S}/util/fluxbox-generate_menu" -is -ds \
- || die "menu generation failed"
- eend $?
-}
-
-src_install() {
- emake DESTDIR="${D}" STRIP="" install
- dodoc README* AUTHORS TODO* ChangeLog NEWS
-
- # Install the generated menu
- insinto /usr/share/fluxbox
- doins data/menu
-
- insinto /usr/share/xsessions
- doins "${FILESDIR}"/${PN}.desktop
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
- # Styles menu framework
- insinto /usr/share/fluxbox/menu.d/styles
- doins "${FILESDIR}"/styles-menu-fluxbox
- doins "${FILESDIR}"/styles-menu-commonbox
- doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
index ec5b26ddccd2..c36ed4f3624f 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r4.ebuild
@@ -1,26 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs prefix xdg xdg-utils
+EAPI=7
-IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
-
-REQUIRED_USE="systray? ( toolbar )"
+inherit flag-o-matic toolchain-funcs prefix xdg
DESCRIPTION="X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+
LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
-RDEPEND="
- !!<=x11-misc/fbdesk-1.2.1
- !!<=x11-misc/fluxconf-0.9.9
- !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
- bidi? ( >=dev-libs/fribidi-0.19.2 )
+RDEPEND="bidi? ( >=dev-libs/fribidi-0.19.2 )
imlib? ( >=media-libs/imlib2-1.2.0[X] )
truetype? ( media-libs/freetype )
vim-syntax? ( app-vim/fluxbox-syntax )
@@ -30,27 +26,27 @@ RDEPEND="
x11-libs/libXrandr
x11-libs/libXrender
xinerama? ( x11-libs/libXinerama )
- || ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
- ${RDEPEND}
- bidi? ( virtual/pkgconfig )
- nls? ( sys-devel/gettext )
- x11-base/xorg-proto
-"
+ || ( x11-misc/gxmessage x11-apps/xmessage )"
+
+BDEPEND="bidi? ( virtual/pkgconfig )
+ nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
src_prepare() {
+ default
# We need to be able to include directories rather than just plain
# files in menu [include] items. This patch will allow us to do clever
# things with style ebuilds.
- epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
+ eapply "${FILESDIR}"/gentoo_style_location-1.1.x.patch
eprefixify util/fluxbox-generate_menu.in
- epatch "${FILESDIR}"/osx-has-otool.patch
+ eapply "${FILESDIR}"/osx-has-otool.patch
# Fix bug #551522; 1.3.8 will render this obsolete
- epatch "${FILESDIR}"/fix-hidden-toolbar.patch
+ eapply "${FILESDIR}"/fix-hidden-toolbar.patch
# Add in the Gentoo -r number to fluxbox -version output.
if [[ "${PR}" == "r0" ]] ; then
@@ -65,9 +61,11 @@ src_prepare() {
src_configure() {
xdg_environment_reset
+
use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
- econf $(use_enable bidi fribidi ) \
+ econf \
+ $(use_enable bidi fribidi ) \
$(use_enable imlib imlib2) \
$(use_enable nls) \
$(use_enable slit ) \
@@ -82,7 +80,6 @@ src_configure() {
src_compile() {
default
- ebegin "Creating a menu file (may take a while)"
mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
# Call fluxbox-generate_menu through bash since it lacks +x
# chmod 744 may be an equal fix
@@ -90,7 +87,6 @@ src_compile() {
CHECKINIT="no. go away." HOME="${T}/home" \
bash "${S}/util/fluxbox-generate_menu" -is -ds \
|| die "menu generation failed"
- eend $?
}
src_install() {
diff --git a/x11-wm/fluxbox/fluxbox-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
deleted file mode 100644
index 70aa43032016..000000000000
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs git-2 prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
-
-REQUIRED_USE="systray? ( toolbar )"
-
-DESCRIPTION="X11 window manager featuring tabs and an iconbar"
-
-EGIT_REPO_URI="git://git.fluxbox.org/fluxbox.git"
-SRC_URI=""
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS=""
-
-RDEPEND="
- !!<=x11-misc/fbdesk-1.2.1
- !!<=x11-misc/fluxconf-0.9.9
- !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
- bidi? ( >=dev-libs/fribidi-0.19.2 )
- imlib? ( >=media-libs/imlib2-1.2.0[X] )
- truetype? ( media-libs/freetype )
- vim-syntax? ( app-vim/fluxbox-syntax )
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- || ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
- ${RDEPEND}
- bidi? ( virtual/pkgconfig )
- nls? ( sys-devel/gettext )
- x11-base/xorg-proto
-"
-
-src_prepare() {
- ./autogen.sh
-
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
- eprefixify util/fluxbox-generate_menu.in
-
- epatch "${FILESDIR}"/osx-has-otool.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-}
-
-src_configure() {
- use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
- econf $(use_enable bidi fribidi ) \
- $(use_enable imlib imlib2) \
- $(use_enable nls) \
- $(use_enable slit ) \
- $(use_enable systray) \
- $(use_enable toolbar ) \
- $(use_enable truetype xft) \
- $(use_enable xinerama) \
- --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
- --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
- default
-
- ebegin "Creating a menu file (may take a while)"
- mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- # Call fluxbox-generate_menu through bash since it lacks +x
- # chmod 744 may be an equal fix
- MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
- CHECKINIT="no. go away." HOME="${T}/home" \
- bash "${S}/util/fluxbox-generate_menu" -is -ds \
- || die "menu generation failed"
- eend $?
-}
-
-src_install() {
- emake DESTDIR="${D}" STRIP="" install
- dodoc README* AUTHORS TODO* ChangeLog NEWS
-
- # Install the generated menu
- insinto /usr/share/fluxbox
- doins data/menu
-
- insinto /usr/share/xsessions
- doins "${FILESDIR}"/${PN}.desktop
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
- # Styles menu framework
- insinto /usr/share/fluxbox/menu.d/styles
- doins "${FILESDIR}"/styles-menu-fluxbox
- doins "${FILESDIR}"/styles-menu-commonbox
- doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index 0cbfa3e809bc..9666567c86b7 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -13,10 +13,6 @@
countless additional features.
</longdescription>
<use>
- <flag name="bidi">
- Enable bidirectional language support with
- <pkg>dev-libs/fribidi</pkg>
- </flag>
<flag name="slit">Enables the Fluxbox slit (or dock)</flag>
<flag name="systray">Enables the system tray in the Fluxbox toolbar</flag>
<flag name="toolbar">Enables the Fluxbox toolbar</flag>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-30 13:03:20 +0000