diff --git a/README.html b/README.html index edc2c1a..9992210 100644 --- a/README.html +++ b/README.html @@ -471,22 +471,8 @@ href="./x11-misc/slock-spde/slock-spde-9999.ebuild">slock-spde-9999.ebuildspmenu
  • spmenuify diff --git a/README.md b/README.md index 391cb0d..8ae4156 100644 --- a/README.md +++ b/README.md @@ -161,14 +161,7 @@ The ebuilds are liensed under the GPLv2-only license due to Gentoo's licensing. * [spde](./x11-misc/spde) * [spde-9999.ebuild](./x11-misc/spde/spde-9999.ebuild) * [spmenu](./x11-misc/spmenu) - * [spmenu-2.1.1.ebuild](./x11-misc/spmenu/spmenu-2.1.1.ebuild) - * [spmenu-2.1.ebuild](./x11-misc/spmenu/spmenu-2.1.ebuild) - * [spmenu-2.2.ebuild](./x11-misc/spmenu/spmenu-2.2.ebuild) - * [spmenu-2.3.ebuild](./x11-misc/spmenu/spmenu-2.3.ebuild) - * [spmenu-3.0.2.ebuild](./x11-misc/spmenu/spmenu-3.0.2.ebuild) - * [spmenu-3.0.ebuild](./x11-misc/spmenu/spmenu-3.0.ebuild) * [spmenu-3.1.1.ebuild](./x11-misc/spmenu/spmenu-3.1.1.ebuild) - * [spmenu-3.1.ebuild](./x11-misc/spmenu/spmenu-3.1.ebuild) * [spmenu-9999.ebuild](./x11-misc/spmenu/spmenu-9999.ebuild) * [spmenuify](./x11-misc/spmenuify) * [spmenuify-0.2.ebuild](./x11-misc/spmenuify/spmenuify-0.2.ebuild) diff --git a/metadata/md5-cache/x11-misc/spmenu-3.1.1 b/metadata/md5-cache/x11-misc/spmenu-3.1.1 index bc5277e..822489e 100644 --- a/metadata/md5-cache/x11-misc/spmenu-3.1.1 +++ b/metadata/md5-cache/x11-misc/spmenu-3.1.1 @@ -13,4 +13,4 @@ REQUIRED_USE=!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 ) SLOT=0 SRC_URI=https://ls.speedie.site/releases/spmenu/3.1.1/spmenu-3.1.1.tar.gz _eclasses_=toolchain-funcs 8e3fb781f3258ae2757d1dfc2c7c170e multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils f3010c780f65d1bb5aea15a9af1adc9c python-utils-r1 7661dc585f75dd1f81eccefe37bef093 meson 08b7183c3f4811568ee93eb0f79a89fe -_md5_=8cd08562b58441e4e39f09b94d53e577 +_md5_=ce65b2e6d49f833c07fbfc091c753dfb diff --git a/metadata/md5-cache/x11-misc/spmenu-9999 b/metadata/md5-cache/x11-misc/spmenu-9999 index dfab7e1..3272a62 100644 --- a/metadata/md5-cache/x11-misc/spmenu-9999 +++ b/metadata/md5-cache/x11-misc/spmenu-9999 @@ -5,11 +5,11 @@ DESCRIPTION=Fancy dynamic menu for X11 and Wayland, compatible with dmenu EAPI=8 HOMEPAGE=https://spmenu.speedie.site INHERIT=toolchain-funcs meson git-r3 -IUSE=+X +wayland +imlib2 +ssl +regex +fribidi +config +xinerama +xrdb +IUSE=+X +wayland +imlib2 +ssl +regex +fribidi +config +xinerama +xrdb +doc +run +test +man LICENSE=MIT PROPERTIES=live RDEPEND=X? ( x11-libs/libX11 x11-libs/libXrender ) X? ( xrdb? ( x11-apps/xrdb ) ) X? ( xinerama? ( x11-libs/libXinerama ) ) wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) imlib2? ( media-libs/imlib2 dev-libs/openssl ) ssl? ( dev-libs/openssl ) fribidi? ( dev-libs/fribidi ) x11-libs/pango x11-libs/cairo REQUIRED_USE=!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 ) SLOT=0 _eclasses_=toolchain-funcs 8e3fb781f3258ae2757d1dfc2c7c170e multilib c19072c3cd7ac5cb21de013f7e9832e0 multiprocessing b4e253ab22cef7b1085e9b67c7a3b730 ninja-utils f3010c780f65d1bb5aea15a9af1adc9c python-utils-r1 7661dc585f75dd1f81eccefe37bef093 meson 08b7183c3f4811568ee93eb0f79a89fe git-r3 2358a7b20091609e24bd3a83b3ac5991 -_md5_=8cd08562b58441e4e39f09b94d53e577 +_md5_=cb0b0a1f71c32031490c8de9993ac45f diff --git a/x11-misc/spmenu/Manifest b/x11-misc/spmenu/Manifest index 73a01ab..8ccd539 100644 --- a/x11-misc/spmenu/Manifest +++ b/x11-misc/spmenu/Manifest @@ -1,8 +1 @@ -DIST spmenu-2.1.1.tar.gz 434435 BLAKE2B ba145e35e04e70198e4d7ba89946af8783051cf45dc970b2ffdddff9d18e4a6c8606315ef2365b3a8046684fbba96cf074e12243f235fe3a4973038b32bc39a6 SHA512 82ca89020d3dfb2aecf9cc723af0b3e56d9781a9a8c165375e5c5ba25ad8317d7e7944f0235769c84edc14d5b6471f80971d30b3b13f69519121b3653e792bb5 -DIST spmenu-2.1.tar.gz 432420 BLAKE2B 046e03e8a91f7813396b181a824dbf901da410ebf5ca9a588d900f07af09ea0ccabf5f08e18c19ef8bf84abcd7e0491b6641ef0b924de4653624f57e3767a21d SHA512 d44941f27f3c7f568b655d3eca8d514aa567420fc0d73178ac673e06ee8497092aaf0a4075b5ed02fe5905d65607280bf1405ec2a7dba6af6c0ed6571d2a4ca9 -DIST spmenu-2.2.tar.gz 153611 BLAKE2B e2394eed1dfd35f30e81a6cf8b502cab4fca019346a50059a3c65a41e8c50761c66bcda71f01e5d8f00d3f54239570e6393669d9ae2d123816c1060b3b5e1d7f SHA512 815ae3f2b651697dd496df3064bfd4be26a1d3b0a750d05fa30b939d4cac10d906e57ebad4cb140cd7ee2acd5f526fa67474fd93d7e48e2dafe90199fd1f07b8 -DIST spmenu-2.3.tar.gz 128080 BLAKE2B b0896c73bd990786ce1bfd6fc1b3b6b06a4ca75801f3a858153aa79d69ab510da1cb5628e152c702055caf445c6c197e0b9fd6c02afc252473f5f41f80251391 SHA512 0d09d3b54931a6807fa8da4ecb192a2881cedf72787fe433a574b62faede132aa3287e1334dc308cab3dfe53786143489f2999785cd3809d5c78ed0bebb06a29 -DIST spmenu-3.0.2.tar.gz 131224 BLAKE2B 8cb4aa57d05e502213113bf9169e2c252f94e81e8b4d76ecbc11c1107307f77d3d96c932e7c5afc88737f9a78e2372b4ef44a23cdee31d5d5f65ec7e9bc740ea SHA512 c1e1e36c217f1907aed20b933325f5218cc73e5eee61c0fbd8fa130c42dd111bac185b4400b6c733edabc9e6c288b5fa124e09d903704794a5e74975aa0d82b1 -DIST spmenu-3.0.tar.gz 132988 BLAKE2B 872096809e8a2804db2c6b3fa0464b05694bed13d9d00521cb567836a79e14005f39a9535006ad7047541c6d0c2d9a6a19923037b0ad9ec0abd97a901dc7b886 SHA512 8c848ce54107ac8666d1db3c4491fc9f14f480ab0941884d8340bc012c3dcd1d837b4e719fe7b6e36aa579edbd12fe8f963ae301bd261aabe476d6c348e5cc14 DIST spmenu-3.1.1.tar.gz 165864 BLAKE2B 61ba5736218c84f464219ac3d2ad723c67b3d0236b715830d6e575a6b378e1ccd6a35a9cb9f699d6a4a079e7ca36f89ae5c2a915e36c58d183668a37e950f709 SHA512 979c85f9074ced8462a0007e5f9908e98c6c55f860e8ec89b5e98f4436a4d591d1557c276cfa610e0eba274929dd9c001d6d78d1e9561cbe09e5df3e7a978ca5 -DIST spmenu-3.1.tar.gz 137255 BLAKE2B 211da63d3897e432963e809d21553e62b8ba43e532d94fda53c56ecd362be9bea91c0c139bfc8578bc63dba40c84e383ee63f9ad9f8528f91497bbd6a975af10 SHA512 94a4753b904221827edaacf9d5900516b91fb43e4104999f1e57ec76f70684881c4869aec9a90833bfef7b96e58583fd74ec01dde33ea09f1ccd5dd5b6818b93 diff --git a/x11-misc/spmenu/spmenu-2.1.1.ebuild b/x11-misc/spmenu/spmenu-2.1.1.ebuild deleted file mode 100644 index c5dc420..0000000 --- a/x11-misc/spmenu/spmenu-2.1.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit toolchain-funcs meson - -DESCRIPTION="Fancy dynamic menu for X11 and Wayland, compatible with dmenu" -HOMEPAGE="https://spmenu.speedie.site" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.speedie.site/speedie/${PN}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - SRC_URI="https://ls.speedie.site/releases/${PN}/${PV}/${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+X +wayland +imlib2 +ssl +fribidi +config +xinerama +xrdb" -REQUIRED_USE="!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 )" - -RDEPEND=" - X? ( x11-libs/libX11 x11-libs/libXrender ) - X? ( xrdb? ( x11-apps/xrdb ) ) - X? ( xinerama? ( x11-libs/libXinerama ) ) - wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) - imlib2? ( media-libs/imlib2 dev-libs/openssl ) - ssl? ( dev-libs/openssl ) - fribidi? ( dev-libs/fribidi ) - x11-libs/pango - x11-libs/cairo -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default -} - -src_configure() { - local emesonargs=( - $(meson_use wayland) - $(meson_use X x11) - $(meson_use xrdb xresources) - $(meson_use fribidi) - $(meson_use config libconfig) - ) - - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - - if use imlib2 && use ssl; then - emesonargs+=($(meson_use ssl openssl)) - emesonargs+=($(meson_use imlib2)) - fi - - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - meson_install -} diff --git a/x11-misc/spmenu/spmenu-2.1.ebuild b/x11-misc/spmenu/spmenu-2.1.ebuild deleted file mode 100644 index c5dc420..0000000 --- a/x11-misc/spmenu/spmenu-2.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit toolchain-funcs meson - -DESCRIPTION="Fancy dynamic menu for X11 and Wayland, compatible with dmenu" -HOMEPAGE="https://spmenu.speedie.site" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.speedie.site/speedie/${PN}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - SRC_URI="https://ls.speedie.site/releases/${PN}/${PV}/${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+X +wayland +imlib2 +ssl +fribidi +config +xinerama +xrdb" -REQUIRED_USE="!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 )" - -RDEPEND=" - X? ( x11-libs/libX11 x11-libs/libXrender ) - X? ( xrdb? ( x11-apps/xrdb ) ) - X? ( xinerama? ( x11-libs/libXinerama ) ) - wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) - imlib2? ( media-libs/imlib2 dev-libs/openssl ) - ssl? ( dev-libs/openssl ) - fribidi? ( dev-libs/fribidi ) - x11-libs/pango - x11-libs/cairo -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default -} - -src_configure() { - local emesonargs=( - $(meson_use wayland) - $(meson_use X x11) - $(meson_use xrdb xresources) - $(meson_use fribidi) - $(meson_use config libconfig) - ) - - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - - if use imlib2 && use ssl; then - emesonargs+=($(meson_use ssl openssl)) - emesonargs+=($(meson_use imlib2)) - fi - - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - meson_install -} diff --git a/x11-misc/spmenu/spmenu-2.2.ebuild b/x11-misc/spmenu/spmenu-2.2.ebuild deleted file mode 100644 index c5dc420..0000000 --- a/x11-misc/spmenu/spmenu-2.2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit toolchain-funcs meson - -DESCRIPTION="Fancy dynamic menu for X11 and Wayland, compatible with dmenu" -HOMEPAGE="https://spmenu.speedie.site" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.speedie.site/speedie/${PN}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - SRC_URI="https://ls.speedie.site/releases/${PN}/${PV}/${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+X +wayland +imlib2 +ssl +fribidi +config +xinerama +xrdb" -REQUIRED_USE="!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 )" - -RDEPEND=" - X? ( x11-libs/libX11 x11-libs/libXrender ) - X? ( xrdb? ( x11-apps/xrdb ) ) - X? ( xinerama? ( x11-libs/libXinerama ) ) - wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) - imlib2? ( media-libs/imlib2 dev-libs/openssl ) - ssl? ( dev-libs/openssl ) - fribidi? ( dev-libs/fribidi ) - x11-libs/pango - x11-libs/cairo -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default -} - -src_configure() { - local emesonargs=( - $(meson_use wayland) - $(meson_use X x11) - $(meson_use xrdb xresources) - $(meson_use fribidi) - $(meson_use config libconfig) - ) - - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - - if use imlib2 && use ssl; then - emesonargs+=($(meson_use ssl openssl)) - emesonargs+=($(meson_use imlib2)) - fi - - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - meson_install -} diff --git a/x11-misc/spmenu/spmenu-2.3.ebuild b/x11-misc/spmenu/spmenu-2.3.ebuild deleted file mode 100644 index c5dc420..0000000 --- a/x11-misc/spmenu/spmenu-2.3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit toolchain-funcs meson - -DESCRIPTION="Fancy dynamic menu for X11 and Wayland, compatible with dmenu" -HOMEPAGE="https://spmenu.speedie.site" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.speedie.site/speedie/${PN}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - SRC_URI="https://ls.speedie.site/releases/${PN}/${PV}/${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+X +wayland +imlib2 +ssl +fribidi +config +xinerama +xrdb" -REQUIRED_USE="!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 )" - -RDEPEND=" - X? ( x11-libs/libX11 x11-libs/libXrender ) - X? ( xrdb? ( x11-apps/xrdb ) ) - X? ( xinerama? ( x11-libs/libXinerama ) ) - wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) - imlib2? ( media-libs/imlib2 dev-libs/openssl ) - ssl? ( dev-libs/openssl ) - fribidi? ( dev-libs/fribidi ) - x11-libs/pango - x11-libs/cairo -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default -} - -src_configure() { - local emesonargs=( - $(meson_use wayland) - $(meson_use X x11) - $(meson_use xrdb xresources) - $(meson_use fribidi) - $(meson_use config libconfig) - ) - - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - - if use imlib2 && use ssl; then - emesonargs+=($(meson_use ssl openssl)) - emesonargs+=($(meson_use imlib2)) - fi - - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - meson_install -} diff --git a/x11-misc/spmenu/spmenu-3.0.2.ebuild b/x11-misc/spmenu/spmenu-3.0.2.ebuild deleted file mode 100644 index 49495f7..0000000 --- a/x11-misc/spmenu/spmenu-3.0.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit toolchain-funcs meson - -DESCRIPTION="Fancy dynamic menu for X11 and Wayland, compatible with dmenu" -HOMEPAGE="https://spmenu.speedie.site" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.speedie.site/speedie/${PN}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - SRC_URI="https://ls.speedie.site/releases/${PN}/${PV}/${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+X +wayland +imlib2 +ssl +regex +fribidi +config +xinerama +xrdb" -REQUIRED_USE="!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 )" - -RDEPEND=" - X? ( x11-libs/libX11 x11-libs/libXrender ) - X? ( xrdb? ( x11-apps/xrdb ) ) - X? ( xinerama? ( x11-libs/libXinerama ) ) - wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) - imlib2? ( media-libs/imlib2 dev-libs/openssl ) - ssl? ( dev-libs/openssl ) - fribidi? ( dev-libs/fribidi ) - x11-libs/pango - x11-libs/cairo -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default -} - -src_configure() { - local emesonargs=( - $(meson_use wayland) - $(meson_use X x11) - $(meson_use xrdb xresources) - $(meson_use fribidi) - $(meson_use config libconfig) - $(meson_use regex) - ) - - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - - if use imlib2 && use ssl; then - emesonargs+=($(meson_use ssl openssl)) - emesonargs+=($(meson_use imlib2)) - fi - - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - meson_install -} diff --git a/x11-misc/spmenu/spmenu-3.0.ebuild b/x11-misc/spmenu/spmenu-3.0.ebuild deleted file mode 100644 index 49495f7..0000000 --- a/x11-misc/spmenu/spmenu-3.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit toolchain-funcs meson - -DESCRIPTION="Fancy dynamic menu for X11 and Wayland, compatible with dmenu" -HOMEPAGE="https://spmenu.speedie.site" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.speedie.site/speedie/${PN}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - SRC_URI="https://ls.speedie.site/releases/${PN}/${PV}/${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+X +wayland +imlib2 +ssl +regex +fribidi +config +xinerama +xrdb" -REQUIRED_USE="!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 )" - -RDEPEND=" - X? ( x11-libs/libX11 x11-libs/libXrender ) - X? ( xrdb? ( x11-apps/xrdb ) ) - X? ( xinerama? ( x11-libs/libXinerama ) ) - wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) - imlib2? ( media-libs/imlib2 dev-libs/openssl ) - ssl? ( dev-libs/openssl ) - fribidi? ( dev-libs/fribidi ) - x11-libs/pango - x11-libs/cairo -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default -} - -src_configure() { - local emesonargs=( - $(meson_use wayland) - $(meson_use X x11) - $(meson_use xrdb xresources) - $(meson_use fribidi) - $(meson_use config libconfig) - $(meson_use regex) - ) - - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - - if use imlib2 && use ssl; then - emesonargs+=($(meson_use ssl openssl)) - emesonargs+=($(meson_use imlib2)) - fi - - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - meson_install -} diff --git a/x11-misc/spmenu/spmenu-3.1.1.ebuild b/x11-misc/spmenu/spmenu-3.1.1.ebuild index 49495f7..5fcdd74 100644 --- a/x11-misc/spmenu/spmenu-3.1.1.ebuild +++ b/x11-misc/spmenu/spmenu-3.1.1.ebuild @@ -18,7 +18,12 @@ fi LICENSE="MIT" SLOT="0" IUSE="+X +wayland +imlib2 +ssl +regex +fribidi +config +xinerama +xrdb" -REQUIRED_USE="!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 )" +REQUIRED_USE=" + !wayland? ( X ) + !X? ( wayland ) + imlib2? ( ssl ) + ssl? ( imlib2 ) +" RDEPEND=" X? ( x11-libs/libX11 x11-libs/libXrender ) @@ -43,21 +48,22 @@ src_configure() { local emesonargs=( $(meson_use wayland) $(meson_use X x11) + $(meson_use xinerama) $(meson_use xrdb xresources) $(meson_use fribidi) $(meson_use config libconfig) $(meson_use regex) ) - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - if use imlib2 && use ssl; then emesonargs+=($(meson_use ssl openssl)) emesonargs+=($(meson_use imlib2)) + else + emesonargs+=(-Dimlib2=false) + emesonargs+=(-Dopenssl=false) fi + meson_src_configure } diff --git a/x11-misc/spmenu/spmenu-3.1.ebuild b/x11-misc/spmenu/spmenu-3.1.ebuild deleted file mode 100644 index 49495f7..0000000 --- a/x11-misc/spmenu/spmenu-3.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit toolchain-funcs meson - -DESCRIPTION="Fancy dynamic menu for X11 and Wayland, compatible with dmenu" -HOMEPAGE="https://spmenu.speedie.site" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.speedie.site/speedie/${PN}" -else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" - SRC_URI="https://ls.speedie.site/releases/${PN}/${PV}/${P}.tar.gz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="+X +wayland +imlib2 +ssl +regex +fribidi +config +xinerama +xrdb" -REQUIRED_USE="!wayland? ( X ) !X? ( wayland ) imlib2? ( ssl ) ssl? ( imlib2 )" - -RDEPEND=" - X? ( x11-libs/libX11 x11-libs/libXrender ) - X? ( xrdb? ( x11-apps/xrdb ) ) - X? ( xinerama? ( x11-libs/libXinerama ) ) - wayland? ( dev-libs/wayland dev-util/wayland-scanner dev-libs/wayland-protocols ) - imlib2? ( media-libs/imlib2 dev-libs/openssl ) - ssl? ( dev-libs/openssl ) - fribidi? ( dev-libs/fribidi ) - x11-libs/pango - x11-libs/cairo -" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default -} - -src_configure() { - local emesonargs=( - $(meson_use wayland) - $(meson_use X x11) - $(meson_use xrdb xresources) - $(meson_use fribidi) - $(meson_use config libconfig) - $(meson_use regex) - ) - - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - - if use imlib2 && use ssl; then - emesonargs+=($(meson_use ssl openssl)) - emesonargs+=($(meson_use imlib2)) - fi - - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_install() { - meson_install -} diff --git a/x11-misc/spmenu/spmenu-9999.ebuild b/x11-misc/spmenu/spmenu-9999.ebuild index c3f3ac9..0231899 100644 --- a/x11-misc/spmenu/spmenu-9999.ebuild +++ b/x11-misc/spmenu/spmenu-9999.ebuild @@ -17,7 +17,7 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+X +wayland +imlib2 +ssl +regex +fribidi +config +xinerama +xrdb" +IUSE="+X +wayland +imlib2 +ssl +regex +fribidi +config +xinerama +xrdb +doc +run +test +man" REQUIRED_USE=" !wayland? ( X ) !X? ( wayland ) @@ -48,21 +48,26 @@ src_configure() { local emesonargs=( $(meson_use wayland) $(meson_use X x11) + $(meson_use xinerama) $(meson_use xrdb xresources) $(meson_use fribidi) $(meson_use config libconfig) $(meson_use regex) + $(meson_use doc docs) + $(meson_use man) + $(meson_use run) + $(meson_use test) ) - if use X && use xinerama; then - emesonargs+=($(meson_use xinerama)) - fi - if use imlib2 && use ssl; then emesonargs+=($(meson_use ssl openssl)) emesonargs+=($(meson_use imlib2)) + else + emesonargs+=(-Dimlib2=false) + emesonargs+=(-Dopenssl=false) fi + meson_src_configure }