USE="branding" for Gentoo style Lock Screen, patch from Niklas "Jarda" Närhinen.

Package-Manager: portage-2.1.2.2

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 410d9bd9601293917d4a2a06db8935e9e487b4e1..6ddf5dede160d7709f8bfeb4d3862b770b067bc5 100644 (file)
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.167 2007/03/02 13:24:23 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.168 2007/03/18 21:27:53 drac Exp $
+
+*xscreensaver-5.01-r3 (18 Mar 2007)
+
+  18 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  +xscreensaver-5.01-r3.ebuild:
+  USE="branding" for Gentoo style Lock Screen. Patch from Niklas Närhinen.
 
   02 Mar 2007; Samuli Suominen <drac@gentoo.org>
   xscreensaver-5.01-r2.ebuild:

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 35667ad5adb6c1814ce2d2bc4e7299f8027de4df..fec978fe421c06a9225d2f7c514e9b0f9ef431a5 100644 (file)
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -39,6 +39,7 @@ MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.01-nsfw.patch 6673
 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.01-nsfw.patch 6673
 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d files/xscreensaver-5.01-nsfw.patch 6673
 DIST xscreensaver-4.24.tar.gz 4936993 RMD160 a7cb8262991d6783bd0da843bc6dbdce6976e287 SHA1 9573a5c561422fed2845d37f3ad43fa3e2b62247 SHA256 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474
+DIST xscreensaver-5.01-branding.patch.bz2 13437 RMD160 2f99561c239bca4d20e7b4c92c79f2c4d06efcb7 SHA1 692602a496fb28c63dce0a2a2a2f37025487c3c3 SHA256 bbb3ac0656791362fc1ec5d073f624348ab172162017c1ecdc90b1dd9c4f7108
 DIST xscreensaver-5.01.tar.gz 5270954 RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b SHA1 c371241c54f4c4cc2dd670852e39f212da3ca991 SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf
 EBUILD xscreensaver-4.24.ebuild 5233 RMD160 0cbb58d41ae8364e8ce8b40366a03098fc399735 SHA1 b4c5954cb4d8340dfb0d12e68f199092a636a3c7 SHA256 de2bb90e7122b9ba6d97d058b8788834e16af8d62b6d0f0592e571c14905162c
 MD5 c3b384b963b8a1d708942269f1913e24 xscreensaver-4.24.ebuild 5233
@@ -48,10 +49,14 @@ EBUILD xscreensaver-5.01-r2.ebuild 4859 RMD160 7004a79dfac6b19c1815ad141da218025
 MD5 cade5b39a52bf009f10223f76878dc3f xscreensaver-5.01-r2.ebuild 4859
 RMD160 7004a79dfac6b19c1815ad141da218025b669f91 xscreensaver-5.01-r2.ebuild 4859
 SHA256 639a776f0de9f7c6f35ffef2b9a2f7a00ad1681ab900c478c0d6ad03139ebf78 xscreensaver-5.01-r2.ebuild 4859
-MISC ChangeLog 28432 RMD160 4d919cf5400b3c314eda25c4aeba3d9296483f69 SHA1 7663f961dfb4ddf27e531d1025cfb9b22f34fdc1 SHA256 a35159377117062f0abf2ed38a7f81c9dd5b8996fa143b4b9f26003e057e3bb2
-MD5 a24f9953233214c642c12b5c72779000 ChangeLog 28432
-RMD160 4d919cf5400b3c314eda25c4aeba3d9296483f69 ChangeLog 28432
-SHA256 a35159377117062f0abf2ed38a7f81c9dd5b8996fa143b4b9f26003e057e3bb2 ChangeLog 28432
+EBUILD xscreensaver-5.01-r3.ebuild 5048 RMD160 4a3f212fc9ba4c91651c96e63325bb4cfbdbd586 SHA1 7b2bb993a7e0e615967e145ee1ff4c1152afff2f SHA256 dc092d3f0583b585223ae74d40007783d249e99bb807209af94bf3ac78fc47e6
+MD5 8a7fa7ad403048b2e872a42b55b4ccad xscreensaver-5.01-r3.ebuild 5048
+RMD160 4a3f212fc9ba4c91651c96e63325bb4cfbdbd586 xscreensaver-5.01-r3.ebuild 5048
+SHA256 dc092d3f0583b585223ae74d40007783d249e99bb807209af94bf3ac78fc47e6 xscreensaver-5.01-r3.ebuild 5048
+MISC ChangeLog 28627 RMD160 4319a29feb3315d2c0b1a02eeb42adb3cd9fdab1 SHA1 8117e8c2960d0b4ce690d1f68716d83341c2d826 SHA256 720441cc1c3cd451a30636218e2bf6da1df7219b59ff8cdebc6dc9b69fc81361
+MD5 10ead8e9df286e883228a31827537da5 ChangeLog 28627
+RMD160 4319a29feb3315d2c0b1a02eeb42adb3cd9fdab1 ChangeLog 28627
+SHA256 720441cc1c3cd451a30636218e2bf6da1df7219b59ff8cdebc6dc9b69fc81361 ChangeLog 28627
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -62,3 +67,6 @@ SHA256 9988ae848a4dcb14ec369659a6ca2c7c682a9b35f7ee79edff88f8abff434b5d files/di
 MD5 89fc92ae4e5d4497f70455ee093619f0 files/digest-xscreensaver-5.01-r2 256
 RMD160 53c251e5b5844a380105b5fdb5a61bab05723fa2 files/digest-xscreensaver-5.01-r2 256
 SHA256 373fdb9ab0176f3509fbeeffdb25e3b2266e496475024636029574913943f921 files/digest-xscreensaver-5.01-r2 256
+MD5 fe538212310aa511d7051c3ab3f4d11c files/digest-xscreensaver-5.01-r3 542
+RMD160 a6403f651d689dbbbaaad16f84852a040a9522d1 files/digest-xscreensaver-5.01-r3 542
+SHA256 89d6cd2d7a7caccd8f29d18ede1f8c3c91f5582b1680065a6e7fd80a9be3c1c2 files/digest-xscreensaver-5.01-r3 542

diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r3 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r3
new file mode 100644 (file)
index 0000000..aee97c0
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r3
@@ -0,0 +1,6 @@
+MD5 6bd39f06f69239e2793d9d6390c29f15 xscreensaver-5.01-branding.patch.bz2 13437
+RMD160 2f99561c239bca4d20e7b4c92c79f2c4d06efcb7 xscreensaver-5.01-branding.patch.bz2 13437
+SHA256 bbb3ac0656791362fc1ec5d073f624348ab172162017c1ecdc90b1dd9c4f7108 xscreensaver-5.01-branding.patch.bz2 13437
+MD5 b60abc52b39591750f48f9c9f20c4167 xscreensaver-5.01.tar.gz 5270954
+RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b xscreensaver-5.01.tar.gz 5270954
+SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf xscreensaver-5.01.tar.gz 5270954

diff --git a/x11-misc/xscreensaver/xscreensaver-5.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.01-r3.ebuild
new file mode 100644 (file)
index 0000000..427ca77
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.01-r3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.01-r3.ebuild,v 1.1 2007/03/18 21:27:53 drac Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.4"
+
+inherit eutils flag-o-matic pam fixheadtails autotools
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz
+       branding? ( http://dev.gentoo.org/~drac/distfiles/${P}-branding.patch.bz2 )"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="branding gnome jpeg insecure-savers new-login offensive opengl pam xinerama"
+
+RDEPEND="x11-libs/libXxf86misc
+       x11-apps/xwininfo
+       x11-apps/appres
+       media-libs/netpbm
+       >=sys-libs/zlib-1.1.4
+       >=dev-libs/libxml2-2.5
+       >=x11-libs/gtk+-2
+       >=gnome-base/libglade-1.99
+       >=dev-libs/glib-2
+       pam? ( virtual/pam )
+       jpeg? ( media-libs/jpeg )
+       opengl? ( virtual/opengl
+               >=media-libs/gle-3.0.1 )
+       xinerama? ( x11-libs/libXinerama )
+       new-login? ( gnome-base/gdm )"
+DEPEND="${RDEPEND}
+       x11-proto/xf86vidmodeproto
+       x11-proto/xextproto
+       x11-proto/scrnsaverproto
+       x11-proto/recordproto
+       x11-proto/xf86miscproto
+       sys-devel/bc
+       dev-util/pkgconfig
+       sys-devel/gettext
+       xinerama? ( x11-proto/xineramaproto )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Use Gentoo branding in Lock Screen
+       use branding && epatch "${WORKDIR}"/${P}-branding.patch
+
+       # Bug fixes:
+       epatch "${FILESDIR}/${P}-gentoo.patch"
+
+       # disable not-safe-for-work xscreensavers
+       use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
+
+       # Fix bug #154444 - hypertorus hack:
+       epatch "${FILESDIR}/${P}-hypertorus.xml.patch"
+
+       eautoreconf
+
+       # change old head/tail to POSIX ones
+       ht_fix_all
+
+}
+
+src_compile() {
+       # simple workaround for the flurry screensaver
+       filter-flags -mabi=altivec
+       filter-flags -maltivec
+       append-flags -U__VEC__
+
+       unset BC_ENV_ARGS
+       econf \
+               --with-hackdir=/usr/lib/misc/xscreensaver \
+               --with-configdir=/usr/share/xscreensaver/config \
+               --x-libraries=/usr/$(get_libdir) \
+               --x-includes=/usr/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 \
+               --with-gtk \
+               --with-xml \
+               --without-kerberos \
+               $(use_with insecure-savers setuid-hacks) \
+               $(use_with new-login login-manager) \
+               $(use_with xinerama xinerama-ext) \
+               $(use_with pam) \
+               $(use_with opengl gl) $(use_with opengl gle) \
+               $(use_with jpeg)
+
+       # bug 155049
+       emake -j1 || die "emake failed."
+}
+
+src_install() {
+       [[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
+
+       make install_prefix="${D}" install || die "make install failed"
+
+       dodoc README
+
+       # install correctly in gnome, including info about configuration preferences
+       if use gnome ; then
+
+               dodir /usr/share/gnome/capplets
+               insinto /usr/share/gnome/capplets
+               doins driver/screensaver-properties.desktop
+
+               newicon "${S}/utils/images/logo-50.xpm" xscreensaver.xpm
+
+               dodir /usr/share/control-center-2.0/capplets
+               insinto /usr/share/control-center-2.0/capplets
+               newins "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
+
+       fi
+
+       # Remove "extra" capplet
+       rm -f "${D}/usr/share/applications/gnome-screensaver-properties.desktop"
+
+       # Allways install Settings .desktop for enviroments following
+       # freedesktop.org standard, e.g. xfce-base/xfdesktop and rox-base/xdg-menu
+       domenu "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
+
+       use pam && fperms 755 /usr/bin/xscreensaver
+       pamd_mimic_system xscreensaver auth
+
+       # Fix bug #135549:
+       rm -f "${D}/usr/share/xscreensaver/config/electricsheep.xml"
+       rm -f "${D}/usr/share/xscreensaver/config/fireflies.xml"
+       dodir /usr/share/man/man6x
+       mv "${D}/usr/share/man/man6/worm.6" \
+               "${D}/usr/share/man/man6x/worm.6x"
+
+       # Fix bug #152250:
+       dodir "/usr/share/X11/app-defaults"
+       mv "${D}/usr/lib/X11/app-defaults/XScreenSaver" \
+               "${D}/usr/share/X11/app-defaults/XScreenSaver" || die "mv failed"
+}
+
+pkg_postinst() {
+       if ! use new-login; then
+               einfo
+               einfo "You have chosen to not use the new-login USE flag."
+               einfo "This is a new USE flag which enables individuals to"
+               einfo "create new logins when the screensaver is active,"
+               einfo "allowing others to use their account, even though the"
+               einfo "screen is locked to another account. If you want this"
+               einfo "feature, please recompile with USE=\"new-login\"."
+               einfo
+       fi
+
+       if use insecure-savers;then
+               ewarn
+               ewarn "You have chosen USE=insecure-savers. While upstream"
+               ewarn "has made every effort to make sure these savers do not"
+               ewarn "abuse their setuid root status, the possibilty exists that"
+               ewarn "someone will exploit xscreensaver and will be able to gain"
+               ewarn "root privileges. You have been warned."
+               ewarn
+       fi
+
+       ewarn
+       ewarn "In XScreenSaver 5.00 API was changed. All third party screen savers"
+       ewarn "need to be ported to the new API. Until then they will not work."
+       ewarn
+       epause
+}