diff options
author | 2014-05-28 03:53:10 +0000 | |
---|---|---|
committer | 2014-05-28 03:53:10 +0000 | |
commit | 3d157b9f5f531399bdf94cc9a9d6a30120c0f6c3 (patch) | |
tree | f8dc0af4f11d63ef86f6418e0cdfecf63765588a /x11-misc | |
parent | New package: www-apache/mpm_itk, for itk support in apache-2.4. Fixes bug #41... (diff) | |
download | historical-3d157b9f5f531399bdf94cc9a9d6a30120c0f6c3.tar.gz historical-3d157b9f5f531399bdf94cc9a9d6a30120c0f6c3.tar.bz2 historical-3d157b9f5f531399bdf94cc9a9d6a30120c0f6c3.zip |
Version bump.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
Diffstat (limited to 'x11-misc')
-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.27-comment-style.patch | 36 | ||||
-rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.27.ebuild | 132 |
4 files changed, 182 insertions, 5 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 763b44fe8328..e65bf32bbedf 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/xscreensaver # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.352 2014/03/19 16:18:16 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.353 2014/05/28 03:53:09 jer Exp $ + +*xscreensaver-5.27 (28 May 2014) + + 28 May 2014; Jeroen Roovers <jer@gentoo.org> +xscreensaver-5.27.ebuild, + +files/xscreensaver-5.27-comment-style.patch: + Version bump. 19 Mar 2014; Jeroen Roovers <jer@gentoo.org> -xscreensaver-5.22.ebuild, -files/xscreensaver-5.20-conf264.patch: diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 7d5ec8820242..154f1eb1f5e5 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -6,14 +6,17 @@ AUX xscreensaver-5.20-blurb-hndl-test-passwd.patch 359 SHA256 24d7f49d51e6a6150d AUX xscreensaver-5.20-test-passwd-segv-tty.patch 412 SHA256 6abe35c0a28f7cb7aa9eca8f16d96130690b6fe20fdcf2dbf55ecd4da40ea8cb SHA512 5744b2669f3409cc690e7b3a7f365418e72cac0f7ba7496efbc41c3284ef9095531e1394a35740f8cdaff336d5fa0511690ab392352fc13acf9c0a259b4b843c WHIRLPOOL cea55d03b72c7dc35b901850cc490ad80073d2859ed3d1097c32c7a6a455fbcbaf1db032f9ffab55484c6780d49d48986d4a76e0e3a18abbf6ec855e595bc666 AUX xscreensaver-5.20-tests-miscfix.patch 784 SHA256 3cbc3af757f4ea362e7059ebf696aec155681684ecb1498cb0bf09892e905ec3 SHA512 ad1bea7367d548b5b8600bcfc5399c575d467135a327d303ca88b7cdd8572767001c690a9644b0df099086f80b2c946a9b3d742c9f1030f1d710c500c08057a2 WHIRLPOOL df8684942655e66c49ab127580aa2324b785c80afb7c76625f7101621daeca593dba0624bb487af57f204395ab72e4dfde165f643ebf09d5c70d4998d404a42a AUX xscreensaver-5.21-gentoo.patch 3109 SHA256 05edd9c8a57c441afd317fd4c40dbfc763c11831c1696505c67d1efab737afeb SHA512 13a1beae2812dc30855c3fb0a5fbce126969c7caa44d19dcff3a4ccf18a2f282faebc2c73f4ec9c4bac07b30097b942ee4cb8beadb3a315a4fef5b167ffb11da WHIRLPOOL 03a0fdf456fdd9599d94652ff61a8e0170d36429de4d0f2f03509910748b09627d22c9b62c467bb18eb583c315597db05736d48397c9f98a09354f3031e1cc05 +AUX xscreensaver-5.27-comment-style.patch 1054 SHA256 e090114eb551ca5019f82985f36437e596c27f432e7f9df3cbd97fc1bffec673 SHA512 4ad88ab72f27ded79e7052856ce732715ce0dd7af26856467f0af32ed0917b7f37c063e225437daa4841741d7af2339c33efbf1b6f6f7783c534e34945bc60c8 WHIRLPOOL 8adf54e21c1ed76ee6c8d5ea3f4504219a65bddeb61a1c8c50520732a26ed3a2f057fd6540df00a2999b6cb081160a4b25b9ccad8d4fbb80b6f0123aa42f354e DIST xscreensaver-5.26.tar.gz 8760550 SHA256 2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55 SHA512 2b14c7b64c13860b7cb7ca93ae5c28c787d3aa017f1d7185d93c3db0a52fea4f97fd2a79bfc0c5f657541417130587865e5f4447bd54983a59bf3db7e50a2936 WHIRLPOOL 576c21e35679356b21689dfdbcdda8538de24112767e83c0fbf85a6bca251f478acd15493a7548d6d712ba797421b16cd32759dce4a56dc9cc935f9b367f14f7 +DIST xscreensaver-5.27.tar.gz 8786914 SHA256 54bbb1f2e57271b388fe585d56ef85c974c0bef8d133012ed63cd1da1b450d12 SHA512 72f25ac30b13a7c416744f1b99366c0408e8b32a3e790f17b129cc4e9092c77b31f07080c096876ddaca98e12dcaa07388f69e9645ed5757d8c19ab589ffd68d WHIRLPOOL 4f7f0bdbd45c4a2a8cdf3bfd763693a1eb61ff9efc054a5591c60d0f4cfc7c25caa879029096e3269cbc62b008badd6bffa4f6565004b8c8a96c818be5073bd5 EBUILD xscreensaver-5.26.ebuild 3441 SHA256 a0745469d64b423b034476aa11c06c6de2c5681572ca1fc0c55a77dbf6ca10d1 SHA512 2f8a0e753dab303f8aca2376da7e004339c55e2084767090d0317fd1bb42ecf4958321925751a1b2282575bf6f3b7d826a99afb5d0ded5ee35829a5d5d254714 WHIRLPOOL fd7ecc3854e4e0684ed70927a512bef4fdf942174e55c5d2b7dbcb6e7db2ae96f4b6f3efbca536063b3f90a1f7278ffd242e93a0a632b17c13f9de50f4f5c79c -MISC ChangeLog 55836 SHA256 375b3eae6933c63cfcc2125fac5953a32705f6aed4609e4d6e02ddfed69b9c06 SHA512 f8c7d841b324bb10b9c7a71a3a49c911e74df4f8e763e5348f243872dff774bf118afef1c252f70198b085ca69d98819b0803219034c08c78361fa6b0f96b77c WHIRLPOOL ef9da43bbf3ecfdadabe86f75903ed482f1593dcff647b662b034a9c7ed85b7d92789871432a8059e3429948318d12ccd81bae026b8e901472414f374ddc3436 +EBUILD xscreensaver-5.27.ebuild 3578 SHA256 28db65f5f80e1e076bcb9e5f17f7ee63b0e939c363b1b8027e171ab46eb4a6e3 SHA512 508933453725d4977368831fcb53610e0b6929f0eb7882798b462bc8d53b94aa3d7b020f9a34a37c8cae8625baa217c0a187b5211002a3bfc723d6dd8d19061e WHIRLPOOL bc58c176a7929239534a4da2ea1de8d85b84dca490d3cc45eaa2331fb890201078c931d546e3fac1f69bdca9543383eac284390fe52ff367b51fa528b1b62f0e +MISC ChangeLog 56009 SHA256 a3930ac3a8487196d2b1f913dc665754ffbf6e87367041857795ea6073f1d8be SHA512 b6348afb4cce5d04afd04ec19b4b81ef938c3b21d79100b8cfd581a0f86eaa69d19cf1c9ea63f92327174eba30add1a53c269f72d4aa4bc931d27051d52c3c15 WHIRLPOOL 654efbd9f972771f22be72e60df665ad2738493b1f5af6dbb9e6b2a419cbae447364593aaeeb2b90594e4a1df7013b9111fb071f57680f4602e168ae713a9f4b MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iEYEAREIAAYFAlMpw0oACgkQVWmRsqeSphOO/wCfT7keJBF81gJgIbIB+bl4XU5r -IrMAn0qyxLDXAtN79uhAqXTybhmlJZH+ -=SUzK +iEYEAREIAAYFAlOFXaYACgkQVWmRsqeSphNhEwCfdkuX9y+he8NKrG26PTM6vHal +50EAn11hneyS8JFFOMTibDRmv7wZ3I3u +=GXOt -----END PGP SIGNATURE----- diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.27-comment-style.patch b/x11-misc/xscreensaver/files/xscreensaver-5.27-comment-style.patch new file mode 100644 index 000000000000..229ac715be81 --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-5.27-comment-style.patch @@ -0,0 +1,36 @@ +--- a/hacks/delaunay.c ++++ b/hacks/delaunay.c +@@ -87,9 +87,9 @@ + dy = yp - *yc; + drsqr = dx*dx + dy*dy; + +- // Original +- //return((drsqr <= *rsqr) ? TRUE : FALSE); +- // Proposed by Chuck Morris ++ /* Original ++ return((drsqr <= *rsqr) ? TRUE : FALSE); ++ Proposed by Chuck Morris */ + return((drsqr - *rsqr) <= EPSILON ? TRUE : FALSE); + } + +--- a/hacks/tessellimage.c ++++ b/hacks/tessellimage.c +@@ -507,15 +507,15 @@ + out[i].p = (n > 0 + ? (XPoint *) calloc (out[i].npoints + 1, sizeof (*out[i].p)) + : 0); +-//printf("%d: ", i); ++/*printf("%d: ", i);*/ + for (j = 0; j < out[i].npoints; j++) + { + ITRIANGLE *tt = &v[t->tri[j]]; + out[i].p[j].x = (p[tt->p1].x + p[tt->p2].x + p[tt->p3].x) / 3; + out[i].p[j].y = (p[tt->p1].y + p[tt->p2].y + p[tt->p3].y) / 3; +-//printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y); ++/*printf(" [%d: %d %d]", j, out[i].p[j].x, out[i].p[j].y);*/ + } +-//printf("\n"); ++/*printf("\n");*/ + } + + free (vert_to_tri); diff --git a/x11-misc/xscreensaver/xscreensaver-5.27.ebuild b/x11-misc/xscreensaver/xscreensaver-5.27.ebuild new file mode 100644 index 000000000000..2b8692736fd9 --- /dev/null +++ b/x11-misc/xscreensaver/xscreensaver-5.27.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.27.ebuild,v 1.1 2014/05/28 03:53:09 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 ~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="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:0 ) + new-login? ( + gdm? ( gnome-base/gdm ) + !gdm? ( || ( x11-misc/lightdm kde-base/kdm ) ) + ) + opengl? ( virtual/opengl ) + pam? ( virtual/pam ) + selinux? ( sec-policy/selinux-xscreensaver ) + 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 )" + +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 + + cp driver/screensaver-properties.desktop{.in,} || die + + epatch \ + "${FILESDIR}"/${PN}-5.21-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.27-comment-style.patch + + 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 + + append-libs -lpthread + + 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 +} |