summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Smith <smithj@gentoo.org>2005-06-23 22:48:39 +0000
committerJonathan Smith <smithj@gentoo.org>2005-06-23 22:48:39 +0000
commitdd98740bfe251ab05b092fa45447d1f12904bf02 (patch)
tree492c6b8ae816440d390753e5267aeb86622ec457 /x11-misc
parentFix misc overflows, and support for more operators, etc... (diff)
downloadhistorical-dd98740bfe251ab05b092fa45447d1f12904bf02.tar.gz
historical-dd98740bfe251ab05b092fa45447d1f12904bf02.tar.bz2
historical-dd98740bfe251ab05b092fa45447d1f12904bf02.zip
ebuild cleanup, version bump for #96894, fixed setuid/pam crap in 4.22 for #94570; #93577 and #94739 should also be fixed by the version bump
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/ChangeLog10
-rw-r--r--x11-misc/xscreensaver/Manifest18
-rw-r--r--x11-misc/xscreensaver/files/digest-xscreensaver-4.14-r21
-rw-r--r--x11-misc/xscreensaver/files/digest-xscreensaver-4.151
-rw-r--r--x11-misc/xscreensaver/files/digest-xscreensaver-4.161
-rw-r--r--x11-misc/xscreensaver/files/digest-xscreensaver-4.221
-rw-r--r--x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild163
-rw-r--r--x11-misc/xscreensaver/xscreensaver-4.15.ebuild168
-rw-r--r--x11-misc/xscreensaver/xscreensaver-4.22.ebuild (renamed from x11-misc/xscreensaver/xscreensaver-4.16.ebuild)131
9 files changed, 80 insertions, 414 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 457cc65791b3..fe464b9bc38c 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for x11-misc/xscreensaver
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.88 2005/06/23 21:47:27 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.89 2005/06/23 22:48:39 smithj Exp $
+
+*xscreensaver-4.22 (23 Jun 2005)
+
+ 23 Jun 2005; Jonathan Smith <smithj@gentoo.org>
+ -xscreensaver-4.14-r2.ebuild, -xscreensaver-4.15.ebuild,
+ -xscreensaver-4.16.ebuild, +xscreensaver-4.22.ebuild:
+ ebuild cleanup, version bump for #96894, fixed setuid/pam crap in 4.22 for
+ #94570; #93577 and #94739 should also be fixed by the version bump
23 Jun 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml:
removed liquidx as maintainer of this package; desktop-misc herd will handle
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 03713063e1a4..5ad29c4e4480 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,17 +1,12 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 3bc98182048db92f93dee783f4fd3a63 ChangeLog 15241
-MD5 f934f262880ab5604c675d1b031dd437 xscreensaver-4.14-r2.ebuild 4661
-MD5 0e62ff1b856345ffcc2de00ca43af8eb xscreensaver-4.15.ebuild 4507
-MD5 c5e8426900683256df19b91f5d23a6a6 xscreensaver-4.16.ebuild 4641
-MD5 9b75f02ad6d2e359cab3b1d17412dacd xscreensaver-4.20-r1.ebuild 4462
MD5 1394e4bb4a7ef2463ed16a3d6e1e6195 xscreensaver-4.20.ebuild 4836
MD5 f9e4d478fa668b28e05c77b33ff4d3ad xscreensaver-4.21.ebuild 4637
MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
-MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
-MD5 0722c17c948e57fa839a1c5acbdc5f22 files/digest-xscreensaver-4.16 70
+MD5 c0f94e55889ac9d62ea23e5690bd49db xscreensaver-4.22.ebuild 4873
+MD5 9b75f02ad6d2e359cab3b1d17412dacd xscreensaver-4.20-r1.ebuild 4462
+MD5 8f8a0169ebf8e31ec8e931e3fddacf87 ChangeLog 15587
MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20-r1 70
MD5 c4ec3ad074fd83aff37b4b4ddc9b7f61 files/digest-xscreensaver-4.21 70
@@ -23,11 +18,12 @@ MD5 cd227d954dff63ea80266d1db213b15f files/xscreensaver-4.16-nsfw.patch 1586
MD5 deb323da3671e7d537a7d3973e7304ba files/xscreensaver-4.20-norpm.patch 1287
MD5 a719b7c6d25874293342a3f22d69d8e4 files/xscreensaver-4.21-norpm.patch 1290
MD5 d51a7f89b409fa5d58c228856b927993 files/xscreensaver-4.21-settings.patch 1162
+MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22 70
MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFCuy4Pl5AvwDPiUowRAkJYAJ9kPxRT5HuyGb/Azx5qJgYyjCSm9QCbB/RX
-AFGfa7YIFsi1ZOu2dPL3Zm4=
-=shWH
+iD8DBQFCuzxil5AvwDPiUowRAsnNAJ0SqUx4+koaprDn9dnOsk6Iy/maQACePdsR
+EHP+8jXmZhIhTcihvKQcMVE=
+=dmh1
-----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.14-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.14-r2
deleted file mode 100644
index 496ba8a7d261..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.14-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84ef242bab91fc64a4370cbb90df06ed xscreensaver-4.14.tar.gz 3988251
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.15 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.15
deleted file mode 100644
index 3b509a925983..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cfd498b21c0fea828be5f39fc8af53c xscreensaver-4.15.tar.gz 4045811
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.16 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.16
deleted file mode 100644
index 77863ce27061..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e715ca402fc1218a078d65b7e7922082 xscreensaver-4.16.tar.gz 4211337
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22
new file mode 100644
index 000000000000..6f0f6e359c66
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22
@@ -0,0 +1 @@
+MD5 9f37c428f034e581026e243445378195 xscreensaver-4.22.tar.gz 4620066
diff --git a/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild
deleted file mode 100644
index ff1ca62cbfe9..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild,v 1.9 2005/02/24 20:45:34 rizzo Exp $
-
-inherit eutils
-
-IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama icc kde nls"
-
-DESCRIPTION="a modular screensaver for X11"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64 hppa"
-SLOT="0"
-
-# NOTE: the motif interface is not supported/developed anymore
-# by xscreensaver devs. so we should deprecate it soon
-# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2
-# automatically over gtk1. we need to patch the autoconf stuff
-# to correctly allow users to choose gtk1/gtk2. right now it
-# only selects the deps.
-# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't
-# really matter if it isn't there. Maybe we should have a 'games'
-# USE flag
-
-RDEPEND="virtual/x11
- media-libs/netpbm
- >=sys-libs/zlib-1.1.4
- gtk? ( >=dev-libs/libxml2-2.5 )
- gtk? ( gtk2? ( >=x11-libs/gtk+-2
- >=gnome-base/libglade-1.99
- >=dev-libs/glib-2 ) )
- gtk? ( gtk2? ( gnome? ( >=gnome-extra/yelp-2 ) ) )
- gtk? ( !gtk2? ( =x11-libs/gtk+-1.2*
- =gnome-base/libglade-0.17* ) )
- gtk? ( !gtk2? ( gnome? ( =gnome-base/control-center-1.4*
- >=media-libs/gdk-pixbuf-0.18
- >=gnome-base/gnome-libs-1.4 ) ) )
- !gtk? ( x11-libs/openmotif )
- pam? ( sys-libs/pam )
- kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
- jpeg? ( media-libs/jpeg )
- opengl? ( virtual/opengl
- >=media-libs/gle-3.0.1 )"
-
-DEPEND="${RDEPEND}
- sys-devel/bc
- dev-lang/perl
- gtk2? ( dev-util/pkgconfig )
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- if use kerberos && ! use krb4; then
- ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
- ewarn "disabled unless kerberos 4 support has been compiled with your"
- ewarn "kerberos libraries. To do that, you should abort now and do:"
- ewarn ""
- ewarn " USE=\"krb4\" emerge mit-krb5"
- ewarn
- epause
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- # disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
- EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.10-norpm.patch
- # set default fortune to /usr/bin/fortune even if one can't be found
- EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-fortune.patch
- use icc && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-icc.patch
- # remove possible symlink attack (#41253)
- EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-analogtv_tmp.patch
-
-}
-
-src_compile() {
- local myconf=""
-
- myconf="--with-fortune=/usr/bin/fortune"
-
- use gtk \
- && myconf="${myconf} --without-motif --with-gtk --with-xml" \
- || myconf="${myconf} --with-motif --without-gtk --without-gdk-pixbuf"
-
- use xinerama \
- && myconf="${myconf} --with-xinerama-ext" \
- || myconf="${myconf} --without-xinerama-ext"
-
- use pam \
- && myconf="${myconf} --with-pam" \
- || myconf="${myconf} --without-pam"
-
- use kerberos && use krb4 \
- && myconf="${myconf} --with-kerberos" \
- || myconf="${myconf} --without-kerberos"
-
- use opengl \
- && myconf="${myconf} --with-gl --with-gle" \
- || myconf="${myconf} --without-gl --without-gle"
-
- use jpeg \
- && myconf="${myconf} --with-jpeg" \
- || myconf="${myconf} --without-jpeg"
-
- use nls \
- && myconf="${myconf} --enable-nls" \
- || myconf="${myconf} --disable-nls"
-
-
- if ! use gtk2 && use gtk; then
- if use gnome; then
- myconf="${myconf} --with-gnome --with-pixbuf"
- fi
- fi
-
- use icc && export CC=icc
- use icc && autoconf
-
- econf \
- --enable-hackdir=/usr/lib/xscreensaver \
- --x-libraries=/usr/X11R6/lib \
- --x-includes=/usr/X11R6/include \
- --with-mit-ext \
- --with-dpms-ext \
- --with-xf86vmode-ext \
- --with-xf86gamma-ext \
- --with-proc-interrupts \
- --with-xpm \
- --with-xshm-ext \
- --with-xdbe-ext \
- --enable-locking \
- ${myconf} || die
-
- emake || die
-}
-
-src_install() {
- [ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
- make install_prefix="${D}" install || die
-
- # install correctly in gnome2
- if use gnome; then
- dodir /usr/share/gnome/capplets
- insinto /usr/share/gnome/capplets
- doins driver/screensaver-properties.desktop
- insinto /usr/share/pixmaps
- newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
- fi
-
- # install symlink to satisfy kde
- use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
-
- # Remove "extra" capplet
- rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
-
- if use pam; then
- insinto /etc/pam.d
- doins ${FILESDIR}/pam.d/xscreensaver
- fi
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.15.ebuild b/x11-misc/xscreensaver/xscreensaver-4.15.ebuild
deleted file mode 100644
index f82b1ea22636..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.15.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.15.ebuild,v 1.14 2005/02/24 20:45:34 rizzo Exp $
-
-inherit eutils
-
-IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama icc kde nls"
-
-DESCRIPTION="a modular screensaver for X11"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha amd64 ~ia64 hppa"
-SLOT="0"
-
-# NOTE: the motif interface is not supported/developed anymore
-# by xscreensaver devs. so we should deprecate it soon
-# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2
-# automatically over gtk1. we need to patch the autoconf stuff
-# to correctly allow users to choose gtk1/gtk2. right now it
-# only selects the deps.
-# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't
-# really matter if it isn't there. Maybe we should have a 'games'
-# USE flag
-
-RDEPEND="virtual/x11
- media-libs/netpbm
- >=sys-libs/zlib-1.1.4
- gtk? (
- >=dev-libs/libxml2-2.5
- gtk2? (
- >=x11-libs/gtk+-2
- >=gnome-base/libglade-1.99
- >=dev-libs/glib-2
- gnome? ( >=gnome-extra/yelp-2 )
- )
- !gtk2? (
- =x11-libs/gtk+-1.2*
- =gnome-base/libglade-0.17*
- gnome? (
- =gnome-base/control-center-1.4*
- >=media-libs/gdk-pixbuf-0.18
- >=gnome-base/gnome-libs-1.4
- )
- )
- )
- !gtk? ( x11-libs/openmotif )
- pam? ( sys-libs/pam )
- kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
- jpeg? ( media-libs/jpeg )
- opengl? ( virtual/opengl
- >=media-libs/gle-3.0.1 )"
-
-DEPEND="${RDEPEND}
- sys-devel/bc
- dev-lang/perl
- gtk2? ( dev-util/pkgconfig )
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- if use kerberos && ! use krb4; then
- ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
- ewarn "disabled unless kerberos 4 support has been compiled with your"
- ewarn "kerberos libraries. To do that, you should abort now and do:"
- ewarn ""
- ewarn " USE=\"krb4\" emerge mit-krb5"
- ewarn
- epause
- fi
-}
-
-src_unpack() {
- unpack ${A}
-
- # disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
- EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.10-norpm.patch
- # set default fortune to /usr/bin/fortune even if one can't be found
- EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-fortune.patch
- use icc && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-icc.patch
-}
-
-src_compile() {
- local myconf=""
-
- myconf="--with-fortune=/usr/bin/fortune"
-
- use gtk \
- && myconf="${myconf} --without-motif --with-gtk --with-xml" \
- || myconf="${myconf} --with-motif --without-gtk --without-gdk-pixbuf"
-
- use xinerama \
- && myconf="${myconf} --with-xinerama-ext" \
- || myconf="${myconf} --without-xinerama-ext"
-
- use pam \
- && myconf="${myconf} --with-pam" \
- || myconf="${myconf} --without-pam"
-
- use kerberos && use krb4 \
- && myconf="${myconf} --with-kerberos" \
- || myconf="${myconf} --without-kerberos"
-
- use opengl \
- && myconf="${myconf} --with-gl --with-gle" \
- || myconf="${myconf} --without-gl --without-gle"
-
- use jpeg \
- && myconf="${myconf} --with-jpeg" \
- || myconf="${myconf} --without-jpeg"
-
- use nls \
- && myconf="${myconf} --enable-nls" \
- || myconf="${myconf} --disable-nls"
-
-
- if ! use gtk2 && use gtk; then
- if use gnome; then
- myconf="${myconf} --with-gnome --with-pixbuf"
- fi
- fi
-
- use icc && export CC=icc
- use icc && autoconf
-
- econf \
- --enable-hackdir=/usr/lib/xscreensaver \
- --x-libraries=/usr/X11R6/lib \
- --x-includes=/usr/X11R6/include \
- --with-mit-ext \
- --with-dpms-ext \
- --with-xf86vmode-ext \
- --with-xf86gamma-ext \
- --with-proc-interrupts \
- --with-xpm \
- --with-xshm-ext \
- --with-xdbe-ext \
- --enable-locking \
- ${myconf} || die
-
- emake || die
-}
-
-src_install() {
- [ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
- make install_prefix="${D}" install || die
-
- # install correctly in gnome2
- if use gnome; then
- dodir /usr/share/gnome/capplets
- insinto /usr/share/gnome/capplets
- doins driver/screensaver-properties.desktop
- insinto /usr/share/pixmaps
- newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
- fi
-
- # install symlink to satisfy kde
- use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
-
- # Remove "extra" capplet
- rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
-
- if use pam; then
- insinto /etc/pam.d
- doins ${FILESDIR}/pam.d/xscreensaver
- fi
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22.ebuild
index d2aeb868eaad..6f0fdcba519e 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.22.ebuild
@@ -1,25 +1,19 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.22 2005/04/01 19:14:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22.ebuild,v 1.1 2005/06/23 22:48:39 smithj Exp $
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic pam
-IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama offensive kde nls"
+IUSE="pam kerberos krb4 gtk gnome opengl jpeg xinerama offensive motif"
DESCRIPTION="a modular screensaver for X11"
SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
HOMEPAGE="http://www.jwz.org/xscreensaver/"
LICENSE="BSD"
-KEYWORDS="x86 ppc sparc alpha amd64 ia64 hppa ppc64 ~mips ~arm"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
SLOT="0"
-# NOTE: the motif interface is not supported/developed anymore
-# by xscreensaver devs. so we should deprecate it soon
-# FIXME: xscreensaver does it's own detection of gtk2 and uses gtk2
-# automatically over gtk1. we need to patch the autoconf stuff
-# to correctly allow users to choose gtk1/gtk2. right now it
-# only selects the deps.
# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't
# really matter if it isn't there. Maybe we should have a 'games'
# USE flag
@@ -29,33 +23,23 @@ RDEPEND="virtual/x11
>=sys-libs/zlib-1.1.4
gtk? (
>=dev-libs/libxml2-2.5
- gtk2? (
- >=x11-libs/gtk+-2
- >=gnome-base/libglade-1.99
- >=dev-libs/glib-2
- gnome? ( >=gnome-extra/yelp-2 )
- )
- !gtk2? (
- =x11-libs/gtk+-1.2*
- =gnome-base/libglade-0.17*
- >=media-libs/gdk-pixbuf-0.18
- gnome? (
- =gnome-base/control-center-1.4*
- >=gnome-base/gnome-libs-1.4
- )
- )
+ >=x11-libs/gtk+-2
+ >=gnome-base/libglade-1.99
+ >=dev-libs/glib-2
+ gnome? ( >=gnome-extra/yelp-2 )
)
- !gtk? ( x11-libs/openmotif )
- pam? ( sys-libs/pam )
+ motif? ( x11-libs/openmotif )
+ pam? ( virtual/pam )
kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
jpeg? ( media-libs/jpeg )
opengl? ( virtual/opengl
>=media-libs/gle-3.0.1 )"
+ #gnome? ( >=gnome-extra/yelp-2 gnome-base/gdm )
DEPEND="${RDEPEND}
sys-devel/bc
dev-lang/perl
- gtk2? ( dev-util/pkgconfig )
+ gtk? ( dev-util/pkgconfig )
nls? ( sys-devel/gettext )"
# simple workaround for the flurry screensaver
@@ -64,6 +48,24 @@ filter-flags -maltivec
append-flags -U__VEC__
pkg_setup() {
+ if ! use gtk ; then
+ if use motif ; then
+ ewarn 'From the configure script:'
+ ewarn ' Though the Motif front-end to xscreensaver is still'
+ ewarn ' maintained, it is no longer being updated with new'
+ ewarn ' features: all new development on the xscreensaver-demo'
+ ewarn ' program is happening in the GTK version, and not in the'
+ ewarn ' Motif version.'
+ ewarn 'It is recommended that you use the "gtk" USE flag.'
+ else
+ ewarn "You have enabled neither gtk nor motif USE flags. xscreensaver-demo"
+ ewarn "requires either GTK+ 2 or Motif (GTK+ 2 is recommended, as the Motif"
+ ewarn "version is no longer being maintained), so xscreensaver-demo will not"
+ ewarn "be built. This is most likely NOT what you want."
+ fi
+ ewarn
+ epause
+ fi
if use kerberos && ! use krb4 ; then
ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
ewarn "disabled unless kerberos 4 support has been compiled with your"
@@ -77,12 +79,11 @@ pkg_setup() {
src_unpack() {
unpack ${A}
-
cd ${S}
+
# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
- epatch ${FILESDIR}/${PN}-4.10-norpm.patch
- # set default fortune to /usr/bin/fortune even if one can't be found
- epatch ${FILESDIR}/${PN}-4.14-fortune.patch
+ epatch ${FILESDIR}/${PN}-4.21-norpm.patch
+
# disable not-safe-for-work xscreensavers
use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
}
@@ -90,45 +91,25 @@ src_unpack() {
src_compile() {
local myconf=""
- myconf="--with-fortune=/usr/bin/fortune"
-
- use gtk \
- && myconf="${myconf} --without-motif --with-gtk --with-xml" \
- || myconf="${myconf} --with-motif --without-gtk --without-gdk-pixbuf"
-
- use xinerama \
- && myconf="${myconf} --with-xinerama-ext" \
- || myconf="${myconf} --without-xinerama-ext"
+ if use gtk ; then
+ myconf="${myconf} --without-motif --with-gtk --with-xml"
+ elif use motif; then
+ myconf="${myconf} --with-motif --without-gtk --without-pixbuf"
+ else
+ myconf="${myconf} --without-motif --without-gtk --without-pixbuf"
+ fi
- use pam \
- && myconf="${myconf} --with-pam" \
- || myconf="${myconf} --without-pam"
+ use gnome || has_version gnome-base/gdm \
+ && myconf="${myconf} --with-login-manager" \
+ || myconf="${myconf} --without-login-manager"
use kerberos && use krb4 \
&& myconf="${myconf} --with-kerberos" \
|| myconf="${myconf} --without-kerberos"
- use opengl \
- && myconf="${myconf} --with-gl --with-gle" \
- || myconf="${myconf} --without-gl --without-gle"
-
- use jpeg \
- && myconf="${myconf} --with-jpeg" \
- || myconf="${myconf} --without-jpeg"
-
- use nls \
- && myconf="${myconf} --enable-nls" \
- || myconf="${myconf} --disable-nls"
-
-
- if ! use gtk2 && use gtk ; then
- if use gnome ; then
- myconf="${myconf} --with-gnome --with-pixbuf"
- fi
- fi
-
econf \
- --enable-hackdir=/usr/lib/xscreensaver \
+ --with-hackdir=/usr/lib/xscreensaver \
+ --with-configdir=/usr/share/xscreensaver/config \
--x-libraries=/usr/X11R6/lib \
--x-includes=/usr/X11R6/include \
--with-mit-ext \
@@ -140,6 +121,11 @@ src_compile() {
--with-xshm-ext \
--with-xdbe-ext \
--enable-locking \
+ $(use_with xinerama xinerama-ext) \
+ $(use_with pam) \
+ $(use_with opengl gl) $(use_with opengl gle) \
+ $(use_with jpeg) \
+ $(use_enable nls) \
${myconf} || die
emake || die
@@ -150,6 +136,8 @@ src_install() {
make install_prefix="${D}" install || die
+ dodoc README
+
# install correctly in gnome2
if use gnome ; then
dodir /usr/share/gnome/capplets
@@ -158,18 +146,25 @@ src_install() {
fi
# install symlink to satisfy kde
- use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
+ use kde && dosym /usr/share/xscreensaver/config /usr/lib/xscreensaver/config
# Remove "extra" capplet
- rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
+ rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
if use gnome ; then
insinto /usr/share/pixmaps
newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
fi
+ # Fixes setuid and opengl mess
if use pam ; then
- insinto /etc/pam.d
- doins ${FILESDIR}/pam.d/xscreensaver
+ fperms 711 /usr/bin/xscreensaver
+ pamd_mimic_system xscreensaver auth
+ else
+ ewarn "You have USE=\"-pam\". In order to be able to lock the screen,"
+ ewarn " /usr/bin/xscreensaver is installed as setuid root which causes"
+ ewarn "conflicts accessing device nodes of some accelerated graphics"
+ ewarn "drivers."
+ epause
fi
}