summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolić <jsmolic@gentoo.org>2021-09-05 07:14:32 +0200
committerJakov Smolić <jsmolic@gentoo.org>2021-09-05 07:14:32 +0200
commit39272b109329f6eb7dc4b1bd217cfcccdcda8b96 (patch)
treed19ef3f25336a4073ae5489116c9df2a7b42c530 /x11-misc
parentdev-python/dkimpy: delete DISTUTILS_USE_SETUPTOOLS (diff)
downloadgentoo-39272b109329f6eb7dc4b1bd217cfcccdcda8b96.tar.gz
gentoo-39272b109329f6eb7dc4b1bd217cfcccdcda8b96.tar.bz2
gentoo-39272b109329f6eb7dc4b1bd217cfcccdcda8b96.zip
x11-misc/xscreensaver: Remove old 5.45
Bug: https://bugs.gentoo.org/810679 Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/Manifest1
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch10
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch47
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch146
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch40
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch32
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch49
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild169
8 files changed, 0 insertions, 494 deletions
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 237089b7aff2..b90a0a6ec0d8 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,2 +1 @@
-DIST xscreensaver-5.45.tar.gz 27729147 BLAKE2B 132301dd6645a21e04cd6f8b2f85e4b2454f5281e8cca3c5a89d50e16fee7f7e79d0b323e639bf7a18ddbcae0b4c8e7e5c9a84409bfe9f57253062cdaab30880 SHA512 1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
deleted file mode 100644
index cf95cf105b01..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-blurb-hndl-test-passwd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/driver/test-passwd.c
-+++ b/driver/test-passwd.c
-@@ -69,6 +69,7 @@
- char *timestring (time_t when) { return ""; }
-
- const char *blurb(void) { return progname; }
-+Bool in_signal_handler_p = 0;
- Atom XA_SCREENSAVER, XA_DEMO, XA_PREFS;
-
- void
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
deleted file mode 100644
index 279a19cf6386..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.44-gentoo.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/driver/XScreenSaver.ad.in
-+++ b/driver/XScreenSaver.ad.in
-@@ -31,21 +31,21 @@
- *mode: random
- *timeout: 0:10:00
- *cycle: 0:10:00
--*lockTimeout: 0:00:00
-+*lockTimeout: 0:30:00
- *passwdTimeout: 0:00:30
--*dpmsEnabled: False
-+*dpmsEnabled: True
- *dpmsQuickoffEnabled: False
- *dpmsStandby: 2:00:00
- *dpmsSuspend: 2:00:00
- *dpmsOff: 4:00:00
--*grabDesktopImages: True
-+*grabDesktopImages: False
- *grabVideoFrames: False
- *chooseRandomImages: @DEFAULT_IMAGES_P@
- ! This can be a local directory name, or the URL of an RSS or Atom feed.
- *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
- *nice: 10
- *memoryLimit: 0
--*lock: False
-+*lock: True
- *verbose: False
- *timestamp: True
- *fade: True
-@@ -63,7 +63,7 @@
- *textLiteral: XScreenSaver
- *textFile: @DEFAULT_TEXT_FILE@
- *textProgram: fortune
--*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss
-+*textURL: https://planet.gentoo.org/rss20.xml
-
- ! When a saver writes an error message to stdout/stderr, it can be printed
- ! on the screen.
-@@ -124,7 +124,8 @@
-
- ! The format used for printing the date and time in the password dialog box
- ! (see the strftime(3) manual page for details.)
--*dateFormat: %d-%b-%y (%a); %I:%M %p
-+!*dateFormat: %d-%b-%y (%a); %I:%M %p
-+*dateFormat: %x %X
- ! For day month date:
- ! *dateFormat: %a %b %d, %I:%M %p
- ! To show the time only:
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
deleted file mode 100644
index cee3a30897f6..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-configure.ac-sandbox.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 6e4e7c657f6628109c9809561f2c5d7bf51c8c8e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 16 Mar 2021 00:55:54 +0100
-Subject: [PATCH] configure.ac: Stop asking rpm and dpkg things, we're on
- Gentoo
-
----
- configure.ac | 115 ---------------------------------------------------
- 1 file changed, 115 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 603b993..6ef2631 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3917,25 +3917,6 @@ for d in /usr/share/fonts/X11 \
- done
- AC_MSG_RESULT($have_bitmap_fonts)
-
--# In case we didn't guess the font directory properly, check RPMs and DEBs too.
--if test $have_bitmap_fonts != yes ; then
-- for r in 100dpi 75dpi ; do
-- for f in xfonts-$r \
-- xorg-x11-fonts-$r \
-- xorg-x11-fonts-ISO8859-1-$r \
-- ; do
-- if test $have_bitmap_fonts != yes ; then
-- AC_MSG_CHECKING(for $f)
-- if ( rpm -q "$f" 2>&- >&- ) ||
-- ( dpkg -s "$f" 2>&- | grep -q '^Status:.*installed' ) ; then
-- have_bitmap_fonts=yes
-- fi
-- AC_MSG_RESULT($have_bitmap_fonts)
-- fi
-- done
-- done
--fi
--
-
- ###############################################################################
- #
-@@ -4876,102 +4857,6 @@ for bad_choice in xscreensaver xscreensaver-demo xscreensaver-command ; do
- fi
- done
-
--
--# Now let's warn if there's a previous RPM version already installed.
--# But don't bother with this test if we are currently *building* an RPM.
--
--if test -z "$RPM_PACKAGE_VERSION" ; then
--
-- rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
--
-- # M4 sucks!!
-- changequote(X,Y)
-- rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
-- sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
-- head -1`
-- changequote([,])
--
-- if test \! -z "$rpmv" ; then
--
-- # M4 sucks!!
-- changequote(A,B)
-- rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
-- rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
-- rpmcdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
-- rpmadir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
-- changequote([,])
--
-- err=" (DIFFERS)"
-- if test -z "$rpmbdir" ; then rpmbdir='???'
-- elif test "$rpmbdir" != "${bindir}/" ; then rpmbdir="$rpmbdir$err";fi
--
-- if test -z "$rpmhdir" ; then rpmhdir='???'
-- elif test "$rpmhdir" != "${HACKDIR}/" ; then rpmhdir="$rpmhdir$err";fi
--
-- if test -z "$rpmcdir" ; then rpmcdir='???'
-- elif test "$rpmcdir" != "${HACK_CONF_DIR}/"; then rpmcdir="$rpmcdir$err";fi
--
-- if test -z "$rpmadir" ; then rpmadir='???'
-- elif test "$rpmadir" != "${APPDEFAULTS}/" ; then rpmadir="$rpmadir$err";fi
--
-- warning=no
-- warnL "There is already an installed RPM of xscreensaver"
-- warn2 "version \"$rpmv\" on this system."
-- echo ""
-- warn2 "It is currently installed in these directories:"
-- echo ""
-- warn2 "User programs: $rpmbdir$berr"
-- warn2 "Screen savers: $rpmhdir$herr"
-- warn2 "Configuration: $rpmcdir$cerr"
-- warn2 "App Defaults: $rpmadir$aerr"
-- fi
--fi
--
--# Also warn if there's a Debian package installed.
--#
--debnames="xscreensaver xscreensaver-data xscreensaver-data-extra"
--debv=''
--for dpkg in $debnames ; do
-- if test -z "$debv"; then
-- debv=`dpkg -s $dpkg 2>/dev/null | sed -n 's/^Version: \(.*\)$/\1/p'`
-- fi
--done
--
--if test \! -z "$debv" ; then
--
-- # M4 sucks!!
-- changequote(A,B)
-- debbdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/bin/\)xscreensaver$@\1@p'`
-- debhdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
-- debcdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
-- debadir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@p'`
-- changequote([,])
--
-- err=" (DIFFERS)"
-- if test -z "$debbdir" ; then debbdir='???'
-- elif test "$debbdir" != "${bindir}/" ; then debbdir="$debbdir$err"; fi
--
-- if test -z "$debhdir" ; then debhdir='???'
-- elif test "$debhdir" != "${HACKDIR}/" ; then debhdir="$debhdir$err"; fi
--
-- if test -z "$debcdir" ; then debcdir='???'
-- elif test "$debcdir" != "${HACK_CONF_DIR}/" ; then debcdir="$debcdir$err"; fi
--
-- if test -z "$debadir" ; then debadir='???'
-- elif test "$debadir" != "${APPDEFAULTS}/" ; then debadir="$debadir$err"; fi
--
-- warning=no
-- warnL "There is already an installed dpkg of xscreensaver"
-- warn2 "version \"$debv\" on this system."
-- echo ""
-- warn2 "It is currently installed in these directories:"
-- echo ""
-- warn2 "User programs: $debbdir$berr"
-- warn2 "Screen savers: $debhdir$herr"
-- warn2 "Configuration: $debcdir$cerr"
-- warn2 "App Defaults: $debadir$aerr"
--fi
--
- echo ""
- echo "$warnsep"
- echo ""
---
-2.30.2
-
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
deleted file mode 100644
index 3d002b40877a..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-cve-2021-34557.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From c1e43f7fa01b7536bc90ad5a9b61c568f4db4dd1 Mon Sep 17 00:00:00 2001
-From: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
-Date: Tue, 18 May 2021 15:41:55 +0200
-Subject: [PATCH] Fix updating outputs info
-
-When an output is disconnected, update_screen_layout() will try to unset
-a property on window assigned to that output. It does that by iterating
-si->screens up to 'count', while 'good_count' signifies how many outputs
-are currently connected (good_count <= count). si->screens has few more
-entries allocated (at start 10), but if there are more disconnected
-outputs, the iteration will go beyond si->screens array.
-The only out of bound access there is reading window ID to delete
-property from, which in most cases will be a bogus number -> crashing
-xscreensaver with BadWindow error.
-
-Fix this by allocating array up to full 'count' entries, even if much
-fewer outputs are connected at the moment.
----
- driver/screens.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/driver/screens.c b/driver/screens.c
-index 5aeb55d..16d6ec3 100644
---- a/driver/screens.c
-+++ b/driver/screens.c
-@@ -1020,9 +1020,9 @@ update_screen_layout (saver_info *si)
- calloc (sizeof(*si->screens), si->ssi_count);
- }
-
-- if (si->ssi_count <= good_count)
-+ if (si->ssi_count <= count)
- {
-- si->ssi_count = good_count + 10;
-+ si->ssi_count = count;
- si->screens = (saver_screen_info *)
- realloc (si->screens, sizeof(*si->screens) * si->ssi_count);
- memset (si->screens + si->nscreens, 0,
---
-2.31.1
-
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch
deleted file mode 100644
index f9841a49b74a..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-interix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/driver/prefs.c b/driver/prefs.c
-index ab97ffa..cc04cc9 100644
---- a/driver/prefs.c
-+++ b/driver/prefs.c
-@@ -969,7 +969,10 @@ write_init_file (Display *dpy,
- sure that the bits actually land on the disk right away. */
- /* Update 2020: Apparently here in the future, this sometimes takes
- 3+ seconds, so let's not. */
-+/* Interix has no sync() or alike. */
-+#ifndef __INTERIX
- /* sync(); */
-+#endif
-
- status = 0; /* wrote and renamed successfully! */
- }
-diff --git a/driver/setuid.c b/driver/setuid.c
-index 3ac78e4..a2b9e15 100644
---- a/driver/setuid.c
-+++ b/driver/setuid.c
-@@ -136,9 +136,12 @@ set_ids_by_number (uid_t uid, gid_t gid, char **message_ret)
- if (uid == (uid_t) -1) uid = (uid_t) -2;
-
- errno = 0;
-+
-+#ifndef __INTERIX
- if (setgroups_needed_p (gid) &&
- setgroups (1, &gid) < 0)
- sgs_errno = errno ? errno : -1;
-+#endif
-
- errno = 0;
- if (setgid (gid) != 0)
diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch b/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch
deleted file mode 100644
index 9a2ac62036a9..000000000000
--- a/x11-misc/xscreensaver/files/xscreensaver-5.45-remove-libXxf86misc-dep.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-libXxf86misc is the client-side code of an X extension that has not been
-supported by the Xserver in more than 10 years. Since xscreensaver's dependency
-on it is automagic, we have to patch configure.in to safely remove it.
-
-https://bugs.gentoo.org/720158
-
-diff -ruN xscreensaver.orig/configure.ac xscreensaver/configure.ac
---- xscreensaver.orig/configure.ac 2020-05-02 18:09:23.169324761 -0700
-+++ xscreensaver/configure.ac 2020-05-02 18:09:52.578233240 -0700
-@@ -104,12 +104,6 @@
- (It's available if the file /usr/include/X11/extensions/XInput.h
- exists.)])
-
--AH_TEMPLATE([HAVE_XF86MISCSETGRABKEYSSTATE],
-- [Define this if you have the XF86MiscSetGrabKeysState function
-- (which allows the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key
-- sequences to be temporarily disabled. Sadly, it doesn't affect
-- Ctrl-Alt-BS or Ctrl-Alt-F1.)])
--
- AH_TEMPLATE([HAVE_RANDR],
- [Define this if you have the Resize and Rotate extension.
- This is standard on sufficiently-recent XFree86 systems, and
-@@ -1888,25 +1882,6 @@
- fi
-
-
--###############################################################################
--#
--# Check for XF86MiscSetGrabKeysState (but only bother if we are already
--# using other XF86 stuff.)
--#
--###############################################################################
--
--have_xf86miscsetgrabkeysstate=no
--if test "$have_xf86gamma" = yes -o "$have_xf86vmode" = yes; then
-- AC_CHECK_X_LIB(Xxf86misc, XF86MiscSetGrabKeysState,
-- [have_xf86miscsetgrabkeysstate=yes],
-- [true], -lXext -lX11)
-- if test "$have_xf86miscsetgrabkeysstate" = yes ; then
-- SAVER_LIBS="$SAVER_LIBS -lXxf86misc"
-- AC_DEFINE(HAVE_XF86MISCSETGRABKEYSSTATE)
-- fi
--fi
--
--
- ###############################################################################
- #
- # Check for HP XHPDisableReset and XHPEnableReset.
-
diff --git a/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild b/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
deleted file mode 100644
index 2b7ec1057034..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-5.45-r4.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib optfeature pam strip-linguas
-
-DESCRIPTION="modular screen saver and locker for the X Window System"
-HOMEPAGE="https://www.jwz.org/xscreensaver/"
-SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="caps +gdk-pixbuf gdm +gtk jpeg +locking new-login offensive opengl pam +perl selinux suid systemd xinerama"
-REQUIRED_USE="
- gdk-pixbuf? ( gtk )
-"
-
-COMMON_DEPEND="
- >=gnome-base/libglade-2
- dev-libs/libxml2
- media-libs/netpbm
- virtual/libcrypt:=
- x11-apps/appres
- x11-apps/xwininfo
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXmu
- x11-libs/libXrandr
- x11-libs/libXt
- x11-libs/libXxf86vm
- caps? ( sys-libs/libcap )
- gdk-pixbuf? (
- x11-libs/gdk-pixbuf-xlib
- >=x11-libs/gdk-pixbuf-2.42.0:2
- )
- gtk? ( x11-libs/gtk+:2 )
- jpeg? ( virtual/jpeg:0 )
- new-login? (
- gdm? ( gnome-base/gdm )
- !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- pam? ( sys-libs/pam )
- systemd? ( >=sys-apps/systemd-221 )
- xinerama? ( x11-libs/libXinerama )
-"
-# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
-RDEPEND="
- ${COMMON_DEPEND}
- perl? (
- dev-lang/perl
- dev-perl/libwww-perl
- virtual/perl-Digest-MD5
- )
- selinux? ( sec-policy/selinux-xscreensaver )
-"
-DEPEND="
- ${COMMON_DEPEND}
- dev-util/intltool
- sys-devel/bc
- sys-devel/gettext
- virtual/pkgconfig
- x11-base/xorg-proto
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-5.45-remove-libXxf86misc-dep.patch
- "${FILESDIR}"/${PN}-5.45-interix.patch
- "${FILESDIR}"/${PN}-5.31-pragma.patch
- "${FILESDIR}"/${PN}-5.44-blurb-hndl-test-passwd.patch
- "${FILESDIR}"/${PN}-5.44-gentoo.patch
- "${FILESDIR}"/${PN}-5.45-gcc.patch
- "${FILESDIR}"/${PN}-5.45-configure.ac-sandbox.patch
- "${FILESDIR}"/${P}-cve-2021-34557.patch # bug 794475
-)
-
-src_prepare() {
- sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
- strip-linguas -i po/
- export ALL_LINGUAS="${LINGUAS}"
-
- if use new-login && ! use gdm; then #392967
- sed -i \
- -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
- configure{,.ac} || die
- fi
-
- default
-
- if ! use offensive; then
- sed -i \
- -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
- hacks/barcode.c || die
- sed -i \
- -e 's|erect penis|shuffle board|g' \
- -e 's|flaccid penis|flaccid anchor|g' \
- -e 's|vagina|engagement ring|g' \
- -e 's|Penis|Shuttle|g' \
- hacks/glx/glsnake.c || break
- fi
-
- eapply_user
-
- eautoconf
- eautoheader
-}
-
-src_configure() {
- if use ppc || use ppc64; then
- filter-flags -maltivec -mabi=altivec
- append-flags -U__VEC__
- fi
-
- unset BC_ENV_ARGS #24568
- 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 systemd) \
- $(use_with xinerama xinerama-ext) \
- --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
- --with-configdir="${EPREFIX}"/usr/share/${PN}/config \
- --with-dpms-ext \
- --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
- --with-proc-interrupts \
- --with-randr-ext \
- --with-text-file="${EPREFIX}"/etc/gentoo-release \
- --with-xdbe-ext \
- --with-xf86gamma-ext \
- --with-xf86vmode-ext \
- --with-xinput-ext \
- --with-xshm-ext \
- --without-gle \
- --without-kerberos \
- --without-motif \
- --x-includes="${EPREFIX}"/usr/include \
- --x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
- emake install_prefix="${D}" install
-
- dodoc README{,.hacking}
-
- if use pam; then
- fperms 755 /usr/bin/${PN}
- pamd_mimic_system ${PN} auth
- fi
-
- rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
-}
-
-pkg_postinst() {
- optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
- optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
-}