# ChangeLog for x11-misc/xscreensaver
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.295 2011/10/21 15:03:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.296 2011/10/21 15:17:00 ssuominen Exp $
+
+*xscreensaver-5.15 (21 Oct 2011)
+
+ 21 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+ +xscreensaver-5.15.ebuild, +files/xscreensaver-5.15-gentoo.patch:
+ Version bump.
21 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
-files/xscreensaver-5.10-gentoo.patch, -xscreensaver-5.12.ebuild,
AUX xscreensaver-5.05-interix.patch 1033 RMD160 8246ead601e80f89e535ffad6b6d3298c7f96eab SHA1 b3e5168c1cb204032c5af4a7631dc08222b0eee5 SHA256 3ddb5277929a9a3b65ba4a89cf59d3c2ffd3d51ce43f9ac83062afcd118d9f27
AUX xscreensaver-5.14-gentoo.patch 2940 RMD160 ab0e0d86e4391b0f109747be94c3ae01c9778f25 SHA1 e68f018f3d0069faab5efdc489e2048237e1cd9a SHA256 141823bada0173563cf3dfe87f797ddad85abadfd3dd29abfbe14c1c80aa55c3
+AUX xscreensaver-5.15-gentoo.patch 3002 RMD160 83d0aa8101828a0884a01553db9c4ef5c16ca5f1 SHA1 cac280d34ed8a66660ca2b30ce5b97aa801d314b SHA256 f81bde587499a82778fd396220eb4b4c8453213a7ba94dd4255624b9fd8d45a9
DIST xscreensaver-5.14.tar.gz 5925175 RMD160 f3f832cf34781c68a4716298e0e5f3ad4f095106 SHA1 bfa37a9e7b2e93f54922191bb93dbc70c2f73772 SHA256 3eea040f452e17572177840566eb880b259ee5a970444f3a4ae178db18ebf023
+DIST xscreensaver-5.15.tar.gz 5977594 RMD160 58c7d4fae709b6500001df53e8ce27c48ae8a5b9 SHA1 b5ce7caa19f4d57c3bac83377a36dddbe7095052 SHA256 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d
EBUILD xscreensaver-5.14.ebuild 2762 RMD160 29bbe8f90ff624e248e4846b1337dba880fb2d15 SHA1 34cf83353d4e8f85effaa245bb8defd65720dea6 SHA256 7b840430be1fb8f585b19681d5808f2a9cddffad22153348e557b566c974e34e
-MISC ChangeLog 47738 RMD160 23121a56cfcb9a1a959ed3db0ecc11a94a94709e SHA1 d504a7a32f71e2ed9243c0b7fb999b11110d4caa SHA256 b784566f1b683b6df46363a82af152ec338c0bfba51a1c6abf9aac1552389edd
+EBUILD xscreensaver-5.15.ebuild 2782 RMD160 ca44f9ee3700411c37009c9be34234285c6ddc3a SHA1 81a25c707defa6afe54723ab831f6f709af19257 SHA256 41c769124796f802afe8aac006b83781a41f225ea8225dc5e48b1d7e1804b4c4
+MISC ChangeLog 47911 RMD160 02c4494a5f76fe2c3a87e6d02d569a7f00c1c109 SHA1 bc4781ac7b1c9a7031d98eed3b952f40dce482e1 SHA256 5a70a820eb7f91dc74ce3f6977424a9aa330d9ea41020cbd561b2388670a6497
MISC metadata.xml 494 RMD160 ba20404c67b1049332bae94a7a3543d33fb0579f SHA1 431f3a7cacea2e341fed0ef301f70941c9e5adb4 SHA256 b49839244c1c8d9df0ede500471c7d7e9037a8d62150c97ced979e50e68f8a10
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJOoYmnAAoJEEdUh39IaPFNzLUH/iLh0ID468eBjkyE8NqTVt0a
-NeHC6jiVZATzgThoQNKpMW+z53kYlTPMZVmBC2hg9ANtLkWpdFrVw1qccY1hyDKi
-1oeVIYH0bxmbQvbmMHhJ1mWLn6fp2Puz3Om865Y5I6owdKP50/jBKw7p+AGvO42/
-1ZQ3bPW1gWgJa2aL9NYsWoC2gcFt7Oc4jAEpzuT3dOpcnQaaxA2jQ+mE/1FpIl+j
-42vJoNVxAuUFjDC3ybta7Y7DV1SdtKcuY9nl3TE9ccHPfGMHGZk0h5mn1iHFVAtp
-DZYVgWlyznfSkWIYz1SR+Gs7cuvcfRVGh5d3UJvCGwGDBJGbs6J5jyPHFho5sFE=
-=isI/
+iQEcBAEBAgAGBQJOoYzJAAoJEEdUh39IaPFNsQkH/3l86GAc58lHMiQepRB7McJS
+r1CTziU3USMOR/+xJLIHC4eEPdYan4mEwgvoeyEnM2qDJ+rJnL1VtGwxKK3nkf5y
+QR+6wtNdEV4R6FraIuK8Lha4GK4e5LB83qgcz/drKeMRGVqthToff+6hupLgVycw
+p/muoqcCMVJ8OG6f3NdE+oPxxYf7qw5+EBOIjCipMB7on2LtkmXCtuWVtcVENXkE
+KxqnCBEHK1thNi3Yej0Vow/siJIa2g2B4KvpwLBT2aP34clB+YXRgB/FcywX1q2U
+JRnC+ZBBqFHxSZn4nNOLVDSaGyLX4TRlVBwEaAC36e45r/wa5r+biC0DxEMfNKk=
+=NQsO
-----END PGP SIGNATURE-----
--- /dev/null
+--- driver/XScreenSaver.ad.in
++++ driver/XScreenSaver.ad.in
+@@ -31,21 +31,21 @@
+ *mode: random
+ *timeout: 0:10:00
+ *cycle: 0:10:00
+-*lockTimeout: 0:00:00
++*lockTimeout: 0:30:00
+ *passwdTimeout: 0:00:30
+-*dpmsEnabled: False
++*dpmsEnabled: True
+ *dpmsQuickoffEnabled: False
+ *dpmsStandby: 2:00:00
+ *dpmsSuspend: 2:00:00
+ *dpmsOff: 4:00:00
+-*grabDesktopImages: True
++*grabDesktopImages: False
+ *grabVideoFrames: False
+ *chooseRandomImages: @DEFAULT_IMAGES_P@
+ ! This can be a local directory name, or the URL of an RSS or Atom feed.
+ *imageDirectory: @DEFAULT_IMAGE_DIRECTORY@
+ *nice: 10
+ *memoryLimit: 0
+-*lock: False
++*lock: True
+ *verbose: False
+ *timestamp: True
+ *fade: True
+@@ -62,7 +62,7 @@
+ *textLiteral: XScreenSaver
+ *textFile: @DEFAULT_TEXT_FILE@
+ *textProgram: fortune
+-*textURL: http://twitter.com/statuses/public_timeline.atom
++*textURL: http://planet.gentoo.org/rss20.xml
+ !*textURL: http://www.livejournal.com/stats/latest-rss.bml
+
+ *overlayTextForeground: #FFFF00
+@@ -123,7 +123,8 @@
+
+ ! The format used for printing the date and time in the password dialog box
+ ! (see the strftime(3) manual page for details.)
+-*dateFormat: %d-%b-%y (%a); %I:%M %p
++*dateFormat: %x %X
++! *dateFormat: %d-%b-%y (%a); %I:%M %p
+ ! To show the time only:
+ ! *dateFormat: %I:%M %p
+ ! For 24 hour time:
+--- hacks/barcode.c
++++ hacks/barcode.c
+@@ -131,7 +131,6 @@
+ "children",
+ "chocolate",
+ "CLONE",
+- "cock",
+ "constriction",
+ "contrition",
+ "cop",
+@@ -265,7 +264,6 @@
+ "punishment",
+ "punk rock",
+ "punk",
+- "pussy",
+ "quagmire",
+ "quarantine",
+ "quartz",
+@@ -333,8 +331,6 @@
+ "vegetarian",
+ "venom",
+ "verifiability",
+- "viagra",
+- "vibrator",
+ "victim",
+ "vignette",
+ "villainy",
+--- hacks/glx/glsnake.c
++++ hacks/glx/glsnake.c
+@@ -565,17 +565,17 @@
+ ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+ ZERO, PIN, ZERO }
+ },
+- { "erect penis", /* thanks benno */
++ { "shuffle board", /* thanks benno */
+ { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
+ ZERO, ZERO }
+ },
+- { "flaccid penis",
++ { "flaccid anchor",
+ { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
+ ZERO, ZERO }
+ },
+- { "vagina",
++ { "engagement ring",
+ { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
+ LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
+ PIN, RIGHT, ZERO }
+@@ -995,7 +995,7 @@
+ { "Parrot",
+ { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
+ },
+- { "Penis",
++ { "Shuttle",
+ { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
+ },
+ { "PictureComingSoon",
--- /dev/null
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.15.ebuild,v 1.1 2011/10/21 15:17:00 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="jpeg new-login opengl pam suid xinerama"
+
+RDEPEND="x11-libs/libXmu
+ x11-libs/libXxf86vm
+ x11-libs/libXrandr
+ x11-libs/libXxf86misc
+ x11-libs/libXt
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-apps/xwininfo
+ x11-apps/appres
+ media-libs/netpbm
+ >=dev-libs/libxml2-2.5
+ >=x11-libs/gtk+-2:2
+ >=gnome-base/libglade-1.99
+ pam? ( virtual/pam )
+ jpeg? ( virtual/jpeg )
+ opengl? ( virtual/opengl )
+ xinerama? ( x11-libs/libXinerama )
+ new-login? ( || ( gnome-base/gdm kde-base/kdm ) )"
+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 )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-5.15-gentoo.patch \
+ "${FILESDIR}"/${PN}-5.05-interix.patch
+
+ eautoconf
+}
+
+src_configure() {
+ if use ppc || use ppc64; then
+ filter-flags -mabi=altivec
+ filter-flags -maltivec
+ 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
+}