[gentoo-commits] gentoo-x86 commit in x11-misc/xscreensaver: ChangeLog xscreensaver-5.04.ebuild xscreensaver-5.02-r2.ebuild

[Samuli Suominen (drac)]

drac        07/12/30 19:39:32

  Modified:             ChangeLog
  Added:                xscreensaver-5.04.ebuild
  Removed:              xscreensaver-5.02-r2.ebuild
  Log:
  Version bump. Use global use flag for setuid screensavers. Use up to date .desktop file from tarball patched to f.d.o desktop entry standard. Pass --with-x-app-defaults to econf instead of moving files around in D. Remove old version.
  (Portage version: 2.1.4_rc11)

Revision  Changes    Path
1.205                x11-misc/xscreensaver/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.205&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.205&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?r1=1.204&r2=1.205

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- ChangeLog	20 Nov 2007 05:25:55 -0000	1.204
+++ ChangeLog	30 Dec 2007 19:39:31 -0000	1.205
@@ -1,6 +1,19 @@
 # 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.204 2007/11/20 05:25:55 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.205 2007/12/30 19:39:31 drac Exp $
+
+*xscreensaver-5.04 (30 Dec 2007)
+
+  30 Dec 2007; Samuli Suominen <drac@g.o>
+  -files/xscreensaver-5.02-gdmflexiserver.patch,
+  -files/xscreensaver-5.02-nsfw.patch, -files/xscreensaver-5.02-pam.patch,
+  +files/xscreensaver-5.04-desktop-entry.patch,
+  +files/xscreensaver-5.04-nsfw.patch, -xscreensaver-5.02-r2.ebuild,
+  +xscreensaver-5.04.ebuild:
+  Version bump. Use global use flag for setuid screensavers. Use up to date
+  .desktop file from tarball patched to f.d.o desktop entry standard. Pass
+  --with-x-app-defaults to econf instead of moving files around in D. Remove
+  old version.
 
   20 Nov 2007; Joshua Kinard <kumba@g.o> xscreensaver-5.03.ebuild:
   Stable on mips, per #195253.



1.1                  x11-misc/xscreensaver/xscreensaver-5.04.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.04.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.04.ebuild?rev=1.1&content-type=text/plain

Index: xscreensaver-5.04.ebuild
===================================================================
# 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.04.ebuild,v 1.1 2007/12/30 19:39:31 drac Exp $

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"
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="jpeg new-login offensive opengl pam suid 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 )
	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
	dev-util/intltool
	xinerama? ( x11-proto/xineramaproto )"

src_unpack() {
	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}"/${PN}-5.02-gentoo.patch

	# Update spec. using desktop-file-validate.
	epatch "${FILESDIR}"/${P}-desktop-entry.patch

	# disable offensive screensavers.
	use offensive || epatch "${FILESDIR}"/${P}-nsfw.patch

	eautoreconf

	# change head and tail calls 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-x-app-defaults=/usr/share/X11/app-defaults \
		--with-hackdir=/usr/lib/misc/xscreensaver \
		--with-configdir=/usr/share/xscreensaver/config \
		--x-libraries=/usr/$(get_libdir) \
		--x-includes=/usr/include \
		--with-dpms-ext \
		--with-xf86vmode-ext \
		--with-xf86gamma-ext \
		--with-proc-interrupts \
		--with-xpm \
		--with-xshm-ext \
		--with-xdbe-ext \
		--enable-locking \
		--with-gtk \
		--without-kerberos \
		--without-gle \
		$(use_with suid setuid-hacks) \
		$(use_with new-login login-manager) \
		$(use_with xinerama xinerama-ext) \
		$(use_with pam) \
		$(use_with opengl gl) \
		$(use_with jpeg)

	# Fix bug 155049.
	emake -j1 || die "emake failed."
}

src_install() {
	emake install_prefix="${D}" install || die "emake install failed."

	dodoc README*

	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
}

pkg_postinst() {
	if ! use new-login; then
		elog
		elog "You have chosen to not use the new-login USE flag."
		elog "This is a new USE flag which enables individuals to"
		elog "create new logins when the screensaver is active,"
		elog "allowing others to use their account, even though the"
		elog "screen is locked to another account. If you want this"
		elog "feature, please recompile with USE=\"new-login\"."
		elog
	fi
}



-- 
gentoo-commits@g.o mailing list