commit:     79cce30abd02567f8465f879a91b273544126c84
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 13:43:06 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 13:52:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79cce30a

app-eselect/eselect-wine: optionally rdepend on xdg-utils

Being optional makes some sense for headless system, albeit most
desktop ones will typically want xdg-open from this around.

Closes: https://bugs.gentoo.org/884077
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 ...lect-wine-2.0.1-r1.ebuild => eselect-wine-2.0.1-r2.ebuild} | 11 ++++++++---
 app-eselect/eselect-wine/metadata.xml                         |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild 
b/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
similarity index 92%
rename from app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild
rename to app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
index 9970fb76df07..6c0f23f8bccb 100644
--- a/app-eselect/eselect-wine/eselect-wine-2.0.1-r1.ebuild
+++ b/app-eselect/eselect-wine/eselect-wine-2.0.1-r2.ebuild
@@ -10,8 +10,12 @@ 
SRC_URI="https://gitweb.gentoo.org/proj/eselect-wine.git/snapshot/${P}.tar.bz2";
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
+IUSE="+xdg"
 
-RDEPEND="app-admin/eselect"
+# xdg-utils needed for bug #884077
+RDEPEND="
+       app-admin/eselect
+       xdg? ( x11-misc/xdg-utils )"
 
 pkg_pretend() {
        # /usr/bin/wine and /usr/include/wine are removed by pkg_preinst's 
unset,
@@ -35,8 +39,9 @@ src_install() {
 
        newenvd - 95${PN} <<-EOF
                PATH="${EPREFIX}/etc/eselect/wine/bin"
-               MANPATH="${EPREFIX}/etc/eselect/wine/share/man"
-               XDG_DATA_DIRS="${EPREFIX}/etc/eselect/wine/share"
+               MANPATH="${EPREFIX}/etc/eselect/wine/share/man"\
+               $(usev xdg "
+               XDG_DATA_DIRS=\"${EPREFIX}/etc/eselect/wine/share\"")
        EOF
 
        # links for building, e.g. wineasio (bug #657748)

diff --git a/app-eselect/eselect-wine/metadata.xml 
b/app-eselect/eselect-wine/metadata.xml
index 5db33c7f62f9..c4441da93cdc 100644
--- a/app-eselect/eselect-wine/metadata.xml
+++ b/app-eselect/eselect-wine/metadata.xml
@@ -6,6 +6,9 @@
                <name>Wine</name>
        </maintainer>
        <stabilize-allarches/>
+       <use>
+               <flag name="xdg">Make use of XDG_DATA_DIRS to provide desktop 
entries</flag>
+       </use>
        <upstream>
                <remote-id type="gentoo">proj/eselect-wine</remote-id>
        </upstream>

Reply via email to