commit: 61d8b112447dc2151828847714d0f30032095cfe Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Jun 24 10:14:17 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Jun 24 10:19:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d8b112
x11-misc/xscreensaver: Add IUSE="gdk-pixbuf gtk locking" Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> x11-misc/xscreensaver/metadata.xml | 30 ++++++++++++----------- x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild | 16 +++++++----- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml index cc68eed3604..fb3aa2fc1da 100644 --- a/x11-misc/xscreensaver/metadata.xml +++ b/x11-misc/xscreensaver/metadata.xml @@ -1,18 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Desktop Miscellaneous Project</name> - </maintainer> - <upstream> - <maintainer> - <email>[email protected]</email> - <name>Jamie Zawinski</name> - </maintainer> - </upstream> - <use> - <flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag> - <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag> - </use> +<maintainer type="project"> +<email>[email protected]</email> +<name>Gentoo Desktop Miscellaneous Project</name> +</maintainer> +<upstream> +<maintainer> +<email>[email protected]</email> +<name>Jamie Zawinski</name> +</maintainer> +</upstream> +<use> +<flag name="gdk-pixbuf">Include support for the <pkg>x11-libs/gdk-pixbuf</pkg> library in some demos, which will make it possible for them to read GIF, JPEG, and PNG files as well</flag> +<flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag> +<flag name="locking">Compile in support for locking the display</flag> +<flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>)</flag> +</use> </pkgmetadata> diff --git a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild index 60a494c3363..49a04e5dd61 100644 --- a/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-5.44-r2.ebuild @@ -13,7 +13,10 @@ SRC_URI=" LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama" +IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid xinerama" +REQUIRED_USE=" + gdk-pixbuf? ( gtk ) +" COMMON_DEPEND=" >=gnome-base/libglade-2 @@ -21,8 +24,6 @@ COMMON_DEPEND=" media-libs/netpbm x11-apps/appres x11-apps/xwininfo - x11-libs/gdk-pixbuf:2[X] - x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXft @@ -32,6 +33,8 @@ COMMON_DEPEND=" x11-libs/libXt x11-libs/libXxf86vm caps? ( sys-libs/libcap ) + gdk-pixbuf? ( x11-libs/gdk-pixbuf:2[X] ) + gtk? ( x11-libs/gtk+:2 ) jpeg? ( virtual/jpeg:0 ) new-login? ( gdm? ( gnome-base/gdm ) @@ -111,19 +114,19 @@ src_configure() { export RPM_PACKAGE_VERSION=no #368025 econf \ + $(use_enable locking) \ $(use_with caps setcap-hacks) \ + $(use_with gdk-pixbuf pixbuf) \ + $(use_with gtk) \ $(use_with jpeg) \ $(use_with new-login login-manager) \ $(use_with opengl gl) \ $(use_with pam) \ $(use_with suid setuid-hacks) \ $(use_with xinerama xinerama-ext) \ - --enable-locking \ --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ --with-dpms-ext \ - --with-gtk \ --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ - --with-pixbuf \ --with-proc-interrupts \ --with-randr-ext \ --with-text-file="${EPREFIX}"/etc/gentoo-release \ @@ -135,6 +138,7 @@ src_configure() { --with-xshm-ext \ --without-gle \ --without-kerberos \ + --without-motif \ --x-includes="${EPREFIX}"/usr/include \ --x-libraries="${EPREFIX}"/usr/$(get_libdir) }
