diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-28 06:57:35 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-06-28 06:57:35 +0000 |
commit | 3a6ba0afe944681f9781b8851753ccdecb5fc731 (patch) | |
tree | 3860f1578e9fc5d897168f317a796ade88be1267 /x11-misc/xscreensaver | |
parent | Bump (diff) | |
download | gentoo-2-3a6ba0afe944681f9781b8851753ccdecb5fc731.tar.gz gentoo-2-3a6ba0afe944681f9781b8851753ccdecb5fc731.tar.bz2 gentoo-2-3a6ba0afe944681f9781b8851753ccdecb5fc731.zip |
Version bump.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xscreensaver')
-rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 8 | ||||
-rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.17-lament-newxpm.patch | 15 | ||||
-rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.17.ebuild | 123 |
3 files changed, 145 insertions, 1 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 0708caefa328..f8cd2182d2cb 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.310 2012/05/28 16:17:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.311 2012/06/28 06:57:35 ssuominen Exp $ + +*xscreensaver-5.17 (28 Jun 2012) + + 28 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> + +xscreensaver-5.17.ebuild, +files/xscreensaver-5.17-lament-newxpm.patch: + Version bump. 28 May 2012; Raúl Porcel <armin76@gentoo.org> xscreensaver-5.15-r1.ebuild: Readd ~alpha/~ia64/~sparc wrt #412847 diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.17-lament-newxpm.patch b/x11-misc/xscreensaver/files/xscreensaver-5.17-lament-newxpm.patch new file mode 100644 index 000000000000..dc66f2d06580 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.17-lament-newxpm.patch @@ -0,0 +1,15 @@ +http://pkgs.fedoraproject.org/gitweb/?p=xscreensaver.git;a=blob_plain;f=xscreensaver-5.17-lament-newxpm.patch;hb=HEAD + +--- hacks/glx/Makefile.in ++++ hacks/glx/Makefile.in +@@ -1832,7 +1832,9 @@ + lament.o: ../../config.h + lament.o: $(HACK_SRC)/fps.h + lament.o: $(srcdir)/gltrackball.h +-lament.o: $(HACK_SRC)/images/lament.xpm ++#lament.o: $(HACK_SRC)/images/lament.xpm ++#lament.o: $(HACK_SRC)/images/lament128.xpm ++lament.o: $(HACK_SRC)/images/lament512.xpm + lament.o: $(srcdir)/jwzgles.h + lament.o: $(srcdir)/normals.h + lament.o: $(srcdir)/rotator.h diff --git a/x11-misc/xscreensaver/xscreensaver-5.17.ebuild b/x11-misc/xscreensaver/xscreensaver-5.17.ebuild new file mode 100644 index 000000000000..3aeba82f3073 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-5.17.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.17.ebuild,v 1.1 2012/06/28 06:57:35 ssuominen Exp $ + +EAPI=4 +inherit autotools eutils flag-o-matic multilib pam + +DESCRIPTION="A modular screen saver and locker for the X Window System" +HOMEPAGE="http://www.jwz.org/xscreensaver/" +SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="gdm jpeg new-login opengl pam +perl suid xinerama" + +COMMON_DEPEND="dev-libs/libxml2 + >=gnome-base/libglade-2 + media-libs/netpbm + x11-apps/appres + x11-apps/xwininfo + x11-libs/gtk+:2 + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXrandr + x11-libs/libXt + x11-libs/libXxf86misc + x11-libs/libXxf86vm + jpeg? ( virtual/jpeg ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) + ) + opengl? ( virtual/opengl ) + pam? ( virtual/pam ) + 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 + )" +DEPEND="${COMMON_DEPEND} + dev-util/intltool + virtual/pkgconfig + sys-devel/bc + sys-devel/gettext + x11-proto/recordproto + x11-proto/scrnsaverproto + x11-proto/xextproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + xinerama? ( x11-proto/xineramaproto )" + +REQUIRED_USE="gdm? ( new-login )" + +MAKEOPTS="${MAKEOPTS} -j1" + +src_prepare() { + if use new-login && ! use gdm; then #392967 + sed -i \ + -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ + configure{,.in} || die + fi + + epatch \ + "${FILESDIR}"/${PN}-5.15-gentoo.patch \ + "${FILESDIR}"/${PN}-5.05-interix.patch \ + "${FILESDIR}"/${PN}-5.17-lament-newxpm.patch + + eautoconf +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset LINGUAS #113681 + unset BC_ENV_ARGS #24568 + export RPM_PACKAGE_VERSION=no #368025 + + econf \ + --x-includes="${EPREFIX}"/usr/include \ + --x-libraries="${EPREFIX}"/usr/$(get_libdir) \ + --enable-locking \ + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ + --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ + --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ + --with-dpms-ext \ + $(use_with xinerama xinerama-ext) \ + --with-xinput-ext \ + --with-xf86vmode-ext \ + --with-xf86gamma-ext \ + --with-randr-ext \ + --with-proc-interrupts \ + $(use_with pam) \ + --without-kerberos \ + $(use_with new-login login-manager) \ + --with-gtk \ + $(use_with opengl gl) \ + --without-gle \ + --with-pixbuf \ + $(use_with jpeg) \ + --with-xshm-ext \ + --with-xdbe-ext \ + --with-text-file="${EPREFIX}"/etc/gentoo-release \ + $(use_with suid setuid-hacks) +} + +src_install() { + emake install_prefix="${D}" install + dodoc README{,.hacking} + + use pam && fperms 755 /usr/bin/${PN} + pamd_mimic_system ${PN} auth + + rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml +} |