diff options
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/Manifest | 11 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch | 106 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.33.ebuild | 142 |
4 files changed, 262 insertions, 5 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 614be982e528..9ff524918ab7 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.396 2015/03/05 08:44:37 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.397 2015/07/04 05:10:07 jer Exp $ + +*xscreensaver-5.33 (04 Jul 2015) + + 04 Jul 2015; Jeroen Roovers <jer@gentoo.org> +xscreensaver-5.33.ebuild, + +files/xscreensaver-5.33-gentoo.patch: + Version bump. 05 Mar 2015; Jeroen Roovers <jer@gentoo.org> -xscreensaver-5.30.ebuild, -files/xscreensaver-5.29-pragma.patch: diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 51a742ebc5ea..aac12b6109c2 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -8,14 +8,17 @@ AUX xscreensaver-5.20-tests-miscfix.patch 784 SHA256 3cbc3af757f4ea362e7059ebf69 AUX xscreensaver-5.21-gentoo.patch 3109 SHA256 05edd9c8a57c441afd317fd4c40dbfc763c11831c1696505c67d1efab737afeb SHA512 13a1beae2812dc30855c3fb0a5fbce126969c7caa44d19dcff3a4ccf18a2f282faebc2c73f4ec9c4bac07b30097b942ee4cb8beadb3a315a4fef5b167ffb11da WHIRLPOOL 03a0fdf456fdd9599d94652ff61a8e0170d36429de4d0f2f03509910748b09627d22c9b62c467bb18eb583c315597db05736d48397c9f98a09354f3031e1cc05 AUX xscreensaver-5.28-comment-style.patch 698 SHA256 d219ece42590e79f0f958312ec83fd4afbb3fdaf0a2e87a7fee85185d89a57f7 SHA512 e6c6a3200ffbec930df9cf4974f109cddae2faf43e95797336c3ad17d4867629c5b15c05dbdd547d22083da096ef55efd15c3d22c26feed92ad3b886651d740c WHIRLPOOL bdb8a8626cd7f48760be61d509b092d1f01f9e892144eb6c4569b060bb506b64080f2a77f9ad7317729e0a3022124ad61e129c3839a1b3fb1a3ebf1cad37948c AUX xscreensaver-5.31-pragma.patch 442 SHA256 ee39c6a23c7452aafac4b001c157ae915c316028f6db2e739ee9ef78c5b4f157 SHA512 9aecda422bc0f22bab5eb0de22f1c861b9ed1a2ff4fff2327bec134fafc5e3116156d80a70e81b67e9ce7ce05eb6f842614b2e939cb91a618dd0b10e1d443557 WHIRLPOOL af5f5364cd24b501cbbf24a1add0941af518392f670c0ca5e0d014edd71ced036fcd804a33ddd55c3f0f787bdae12fde840c3b979eb66e78908e7139ba1749d9 +AUX xscreensaver-5.33-gentoo.patch 3006 SHA256 7c2d79bb4b43d1c70ef7fc0d84ec8cbd3578a097687286861e121ec864f7b9dc SHA512 9394909e79e746e3ef90c027f8f39caa79e19293284639def6470942986d5a44417c0212e510ac720df7358306ccbbfb23bdc40c661b3e6d9a6ab002335fcda0 WHIRLPOOL 1bc2261c0e79cbf6e90faab27b782163ac6224c9f7f7abddc99cd14ab6b2b7c35543d82ee27cb6cd27a6cc7f2978537368da35be0ccc94ad337d8b636bb8fd7d DIST xscreensaver-5.32.tar.gz 10571502 SHA256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd SHA512 0d7f3d283998cdb2aec10c8f5e94c9cc6e28a72785c36759cee988f3592a5f8aae20ba593c8363eab8fe61f7caf325376a887cac42ecf300c60894bf20d2f75b WHIRLPOOL 1a99e36ac89cf7f3121d499da6bf06e02808465b7b500e0fc371a97df0d8e1b729bc20c57cd7fe560e151e1051e46dafc0b034cf72c343a185b1fddcf8fdb749 +DIST xscreensaver-5.33.tar.gz 20668552 SHA256 329085e08ed9e1807cb17cae7fb48321311151ac2b196b9092d0a3a93457c46b SHA512 f9bd9b0727a0db8b797c23a4257cf92a8b76f7a70b4f8c51891e30c0ad610241bc123c2d58e3933897edc0ab0091c78cc6d61eeee84d81f8391d6dbccd1317cf WHIRLPOOL b0e0e24d2d051f9118a478bf8a6a32f5958336518cacfd9ade693af104c4d3a2422bc783da050aad5352fcd69bf8cead06698fc9501c5b3503e29eef94b0b8d2 EBUILD xscreensaver-5.32.ebuild 3582 SHA256 7669b2829fc6f26f90fa9d5c1567bf356f731019935776ad11141a2b27f4c98c SHA512 3cc6eb6699098e06e183a4be79676aca34bdfbe63f361d133a64677fbf81637dab35911c41510482a5475c8ea44616f83fa4d84960ff2bc755d4630942ea8249 WHIRLPOOL acd67526647ad56df7769ce8ee58e904ec3151e91627376a0b432eb66cb92f6a27899b16c9230a29cea4c55c6c5b17e3575119def6374a9a06b4abd224ee86f2 -MISC ChangeLog 61232 SHA256 1e9fee312c037b9171d0136173a9d7d76827f0217ac61129e5ae0cd943a166b9 SHA512 485dea7b041dcbd007b3607a60b23b1ed2dc8c6e4641217ec39963889797b7e86b846860d542aa626a1bd37599d521fe9f3fdf0c8bbf81e20f07dc01f42adcf9 WHIRLPOOL 17a1aed29f1d7eaa7bda2b57bb05f4ac246cf6eec356776eaa6a229bdc9df5c999c0df237a26d68975bb9ba174f2da1304f81d67734d5ea68e45c1b9c66e8ecd +EBUILD xscreensaver-5.33.ebuild 3589 SHA256 3ae7523688831915f0c0c0a77d8c72fb174975741d0e9f824ed66880c4020984 SHA512 d41fad33a14b0f2a978babbe0e7dad733aea1215d7ba48d1021f4edb66e2bee9b2578dca84ca0f1536d49c3c4414d153550e16aeac738f51c469d8967fc8f94b WHIRLPOOL b0bc52d26523812f8b734cf6760c06e063b207fea88a053535af06714727d134382c5cb588d9a7bd91953dc1b9f122d4d55db789d758aebe328b545346ebe8aa +MISC ChangeLog 61398 SHA256 98f5c3532001e885dbef26c53e018b24ee429c6f1426fa837a59e94c99b8a9d7 SHA512 66e703a05d0babe5cfffb52f29d1cf62950dbaf27e711f90c25eb68a7369e8d6a33166baedaf6b1b7459f02001cfd5771555a0c80596e2813fe2b148c19c8aed WHIRLPOOL 61b2eb0fe284bf124287c84fda2810130b2bd81e89884dab9bc9fc670de7ee38936bde1eb619fb6af4c9ac02a13b2f56c169708c6afafceb1e7130e8d0a4176e MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlT4F3YACgkQVWmRsqeSphNT8gCfeWZpi06h+EegEDvZCAsETvol -moQAn35qGZxVJbebrgWytPU5jNwBGA7r -=3mvH +iEYEAREIAAYFAlWXarEACgkQVWmRsqeSphN23QCeMSEbRdfJm67yq10fmK9Z1KqL +hL4AnjmOdGdORPrz2a3wE1RL/DaYaV+q +=p4nL -----END PGP SIGNATURE----- diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch b/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch new file mode 100644 index 000000000000..e199c6def68e --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.33-gentoo.patch @@ -0,0 +1,106 @@ +--- a/driver/XScreenSaver.ad.in ++++ b/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 +@@ -63,7 +63,7 @@ + *textLiteral: XScreenSaver + *textFile: @DEFAULT_TEXT_FILE@ + *textProgram: fortune +-*textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss ++*textURL: https://planet.gentoo.org/rss20.xml + + *overlayTextForeground: #FFFF00 + *overlayTextBackground: #000000 +@@ -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: %d-%b-%y (%a); %I:%M %p ++*dateFormat: %x %X + ! To show the time only: + ! *dateFormat: %I:%M %p + ! For 24 hour time: +--- a/hacks/barcode.c ++++ a/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", +--- a/hacks/glx/glsnake.c ++++ a/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", diff --git a/x11-misc/xscreensaver/xscreensaver-5.33.ebuild b/x11-misc/xscreensaver/xscreensaver-5.33.ebuild new file mode 100644 index 000000000000..150dc29c951b --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-5.33.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.33.ebuild,v 1.1 2015/07/04 05:10:07 jer Exp $ + +EAPI=5 +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 ~arm64 ~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 selinux suid xinerama" + +COMMON_DEPEND=" + >=gnome-base/libglade-2 + dev-libs/libxml2 + 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:0 ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) + ) + opengl? ( + virtual/glu + 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 + ) + selinux? ( sec-policy/selinux-xscreensaver ) +" +DEPEND=" + ${COMMON_DEPEND} + dev-util/intltool + sys-devel/bc + sys-devel/gettext + virtual/pkgconfig + x11-proto/recordproto + x11-proto/scrnsaverproto + x11-proto/xextproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + xinerama? ( x11-proto/xineramaproto ) +" + +src_prepare() { + sed -i configure.in -e '/^ALL_LINGUAS=/d' || die + strip-linguas -i po/ + export ALL_LINGUAS="${LINGUAS}" + + 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.33-gentoo.patch \ + "${FILESDIR}"/${PN}-5.05-interix.patch \ + "${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \ + "${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \ + "${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \ + "${FILESDIR}"/${PN}-5.28-comment-style.patch \ + "${FILESDIR}"/${PN}-5.31-pragma.patch + + epatch_user + + eautoconf + eautoheader +} + +src_configure() { + if use ppc || use ppc64; then + filter-flags -maltivec -mabi=altivec + append-flags -U__VEC__ + fi + + unset BC_ENV_ARGS #24568 + export RPM_PACKAGE_VERSION=no #368025 + + econf \ + $(use_with jpeg) \ + $(use_with new-login login-manager) \ + $(use_with opengl gl) \ + $(use_with pam) \ + $(use_with suid setuid-hacks) \ + $(use_with xinerama xinerama-ext) \ + --enable-locking \ + --with-configdir="${EPREFIX}"/usr/share/${PN}/config \ + --with-dpms-ext \ + --with-gtk \ + --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \ + --with-pixbuf \ + --with-proc-interrupts \ + --with-randr-ext \ + --with-text-file="${EPREFIX}"/etc/gentoo-release \ + --with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \ + --with-xdbe-ext \ + --with-xf86gamma-ext \ + --with-xf86vmode-ext \ + --with-xinput-ext \ + --with-xshm-ext \ + --without-gle \ + --without-kerberos \ + --x-includes="${EPREFIX}"/usr/include \ + --x-libraries="${EPREFIX}"/usr/$(get_libdir) +} + +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 +} |