diff options
| author |   Alastair Tse <liquidx@gentoo.org> | 2003-06-17 10:29:21 +0000 |
|---|---|---|
| committer | Alastair Tse <liquidx@gentoo.org> | 2003-06-17 10:29:21 +0000 |
| commit | eee27c3b0129222b945a15ab1095aa6c51725309 (patch) | |
| tree | 0b835fc1eb2c99a76d4bb318e6c025099753b3aa /x11-misc/xscreensaver | |
| parent | Initial commit (diff) | |
| download | gentoo-2-eee27c3b0129222b945a15ab1095aa6c51725309.tar.gz gentoo-2-eee27c3b0129222b945a15ab1095aa6c51725309.tar.bz2 gentoo-2-eee27c3b0129222b945a15ab1095aa6c51725309.zip | |
made kerberos support depend on krb4 also
Diffstat (limited to 'x11-misc/xscreensaver')
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/Manifest | 4 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-4.10.ebuild | 20 |
3 files changed, 23 insertions, 7 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 90cbc64d19d5..997ef227da8d 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.30 2003/06/16 22:38:50 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.31 2003/06/17 10:29:12 liquidx Exp $ + + 17 Jun 2003; Alastair Tse <liquidx@gentoo.org> xscreensaver-4.10.ebuild: + kerberos support requires krb4. so we disable kerberos if krb4 isn't present + (with a warning) (#22937). 16 Jun 2003; Alastair Tse <liquidx@gentoo.org> xscreensaver-4.10.ebuild, files/xscreensaver-4.10-klein.c: diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 4659db67fcca..eb644412d72b 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,6 +1,6 @@ -MD5 1799f4a91e3be467324d1bfa0373a116 ChangeLog 7156 +MD5 28974a89f71cc17f6f8ff917dd0a117d ChangeLog 7340 MD5 b4a12bd1c38b96bdc61418f625ef0238 xscreensaver-4.05-r3.ebuild 2471 -MD5 68706bfedcbb02341d60dd71a415ee88 xscreensaver-4.10.ebuild 4109 +MD5 c56baf0ff8581254064d9d006ebb69b7 xscreensaver-4.10.ebuild 4498 MD5 ab5c2c76af72bf7bc833b2ad04a4875a files/digest-xscreensaver-4.05-r3 70 MD5 51f90e218232e1e767a3962668c7ec9f files/xscreensaver-4.10-klein.c 10125 MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.09-norpm.patch 1266 diff --git a/x11-misc/xscreensaver/xscreensaver-4.10.ebuild b/x11-misc/xscreensaver/xscreensaver-4.10.ebuild index 48f52196ffb0..b1d1f79240ed 100644 --- a/x11-misc/xscreensaver/xscreensaver-4.10.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-4.10.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.10.ebuild,v 1.7 2003/06/16 22:38:50 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.10.ebuild,v 1.8 2003/06/17 10:29:12 liquidx Exp $ -IUSE="pam kerberos gtk gtk2 gnome opengl jpeg xinerama" +IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama" DESCRIPTION="a modular screensaver for X11" SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" @@ -38,7 +38,7 @@ RDEPEND="virtual/x11 !gtk? ( virtual/motif >=media-libs/gdk-pixbuf-0.18 ) pam? ( sys-libs/pam ) - kerberos? ( >=app-crypt/mit-krb5-1.2.5 ) + kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) ) jpeg? ( media-libs/jpeg ) opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )" @@ -49,6 +49,18 @@ DEPEND="${RDEPEND} gtk2? ( dev-util/pkgconfig ) nls? ( sys-devel/gettext )" +pkg_setup() { + if [ -n "`use kerberos`" -a -z "`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 + sleep 2 + fi +} + src_unpack() { unpack ${A} @@ -76,7 +88,7 @@ src_compile() { && myconf="${myconf} --with-pam" \ || myconf="${myconf} --without-pam" - use kerberos \ + use kerberos && use krb4 \ && myconf="${myconf} --with-kerberos" \ || myconf="${myconf} --without-kerberos" |