diff options
| -rw-r--r-- | x11-misc/xscreensaver/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/Manifest | 20 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/files/xscreensaver-5.17-lament-newxpm.patch | 15 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.15-r1.ebuild | 122 | ||||
| -rw-r--r-- | x11-misc/xscreensaver/xscreensaver-5.17.ebuild | 123 |
5 files changed, 14 insertions, 273 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 1ca45a7fa6d6..8412148a7da8 100644 --- a/x11-misc/xscreensaver/ChangeLog +++ b/x11-misc/xscreensaver/ChangeLog @@ -1,6 +1,11 @@ # 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.312 2012/07/16 11:27:57 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.313 2012/07/16 11:32:27 ssuominen Exp $ + + 16 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> + -xscreensaver-5.15-r1.ebuild, -xscreensaver-5.17.ebuild, + -files/xscreensaver-5.17-lament-newxpm.patch: + old *xscreensaver-5.18 (16 Jul 2012) diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 3021af627f6f..5ec6b960a46f 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -3,25 +3,21 @@ Hash: SHA1 AUX xscreensaver-5.05-interix.patch 1033 SHA256 3ddb5277929a9a3b65ba4a89cf59d3c2ffd3d51ce43f9ac83062afcd118d9f27 SHA512 61201dba2e4a1332db179f619452dedd67a6576f6002184d35109d25079c7a9b8a71267a0713c1c2d32a59c08867d2642edd9a1c22a39dd324b0be3fa3d13dd0 WHIRLPOOL e613cf264a4941d96bb7904fc42b44593cc28f9110c89e24d172965ad5d715c1a313aeae8c92188cf585d3490e224ebb7bbf1d3458b97e1f1ce30425136e3efe AUX xscreensaver-5.15-gentoo.patch 3002 SHA256 f81bde587499a82778fd396220eb4b4c8453213a7ba94dd4255624b9fd8d45a9 SHA512 52106a0503325a5f669cfcd5316e789815f084587127d7f5574aa1dbd350f8f5cbc62690d55bec365104039d1229aeef1a816700cbe43ecdafb8f562d836978b WHIRLPOOL 1f06576380fd44295416fe9e591c2f586767c6a5abaa9e1ed965f7af21edecad650764b443d91c903192bb64272a999ffaaa4055874f3a60dfede2dcd935f5f9 -AUX xscreensaver-5.17-lament-newxpm.patch 548 SHA256 73ae7fe0e982e7b82894eb957299e88f9c59268b7f3149f98225212f3322b015 SHA512 87e31ac6b47bc580fea088787353101e9b771acb49585ad1973cad803b8f1e15ecbc8f17c15c8f628051506dc320a7b19a3999235b1af380091adf462b210008 WHIRLPOOL fc047df64feb8b1f033fc420bfa949a5afe020c07e7c17861a72459bffee5d96e67505fece022e9ab155cfd59d61ad30e3571d67ea77b7f7f100380b0b18809d AUX xscreensaver-5.18-sonar-compile.patch 692 SHA256 556450f92281e0a6fdb0ba0dd54b71dea87d14cf2187894a41741b9f17e9ee65 SHA512 27e71139e55f9ab867c02d25312a426bcdfb05aed77255b7ece6475a243a28f7b741446cc24b4e5c549d6c7aac67a80632242492289db9543da72c6e7f19bfb4 WHIRLPOOL 316f004e782532afdfb6bd9bebc88bb89d8e7fe50a09f749a1476bb9a2825c4c8683533493c54dcccebb525d7dc7181d6c018cb50745963bdb767ccee3986cef DIST xscreensaver-5.15.tar.gz 5977594 SHA256 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d SHA512 2013cf627908a3fa59a3e7d3e6e03b495497113828bf6c89d477fd84dca6867ddeafd572a5f23f12bbfd98fb32acbfc2bcb5d24ef4975c3c263439dbe6fa66b2 WHIRLPOOL 186719cc301ede656fd002f4eadafcec2fe488f60bc1323ca512cb0f49398dfcb3e08da4fd0e6028287438a24b92746a1972759a18b9f9e57bc9d61b5a50c852 -DIST xscreensaver-5.17.tar.gz 7238015 SHA256 c34b92f71b8c597ee55b087a3d2528baa0e56123fa3d784cf97b99eb3b7f6d7b SHA512 11387138312c72c52c6c65a1403015661b7921d8a0ec5641065ea1a40e29770009bf01ad178434af2b66156d7ac57541f3f52ebf2195f83b07b8415559ef082d WHIRLPOOL 380e376ca81eff18ddb46789e0bc47398745ec83e0865f8119ada2dac97ebe9d41d7359a9c167d22d15d5cf2dfd54ea0399f524a7bbf3de0b7d47a8687be03fb DIST xscreensaver-5.18.tar.gz 7363800 SHA256 3d70edb8f46511f5427f21b4ba4d8323f336888f60268d16731f5231c6883db9 SHA512 8efd4bc07eb05bb84ce669c2c3d9fd7d33c91920522916a09800d19e55bee8053a631565c996bf35355b275a02ace66b9d26c1d2140001a329b3bcd32b07bc1e WHIRLPOOL 680cb3b8d919c456100c9110aac1212f0f0188ed70b15385c3eb9979da9574d2b812c157e43d0c588b4883f208bd9b6a47304e06888fd02a3474ec24ce371838 -EBUILD xscreensaver-5.15-r1.ebuild 3203 SHA256 5e7cfc86b63153209c6569a1ea68f649180ba8bffa8d2d275d618184e37d4472 SHA512 96fa3f1a7115d33605da4a268b1aecb8d6068a420543ab24c1d3978262208240f42e8a3b624272fb491504b139d8aa9414c8387945fccf2ddd59ac1530da4282 WHIRLPOOL 27d677c70ddf6e2e771723ebac07968caddf522de86e28923a1fbf2eb70a823f0c5a9f6579704c9f4fc6f24df59910a9304a7d18fa108ed5c42e367d2f87c542 EBUILD xscreensaver-5.15.ebuild 3145 SHA256 ab6ed9398d88bf779cd71720b9aafe1c37df95a1a748d8647d8a1f4ae790a13e SHA512 2bf927bb2f089ccc07e4a37bacd054b2e07bb91558b3e074c288ccc9b2bdcc9cefdfdac9d54caa92af78f9b38fbfe18cb6b34f86e1f577dc0279fe035ebd94e3 WHIRLPOOL 00cfd2282b56f9a480ef76c6b1274c159b3835769fe970e9de792adcb0cc6831215c011e91c42f6b519afc55ea9c5d326b127b9daf12cac5063221aa2dea8f17 -EBUILD xscreensaver-5.17.ebuild 3251 SHA256 899a5b12255584dd6cd3b7725325d6a878f82054ff7ffd18ee07bb5f1c9863f2 SHA512 d190d7f13f2b5b4a88c6ec006e05fe55e733296ed8196164fc2b120a7a0900e9d2684caeb7e0bca9ace3b501b0bc4f30780a23ac685a8108e78803d5c29ad3b1 WHIRLPOOL 9a8add4c3ac2397f6273b8873eebdc76ffeec4a9274ba0d97d6c857939f6e48e73c518f071afa6eed95014040a616203269e27240abc8441d1fb15dd17dd2ab2 EBUILD xscreensaver-5.18.ebuild 3251 SHA256 8b91fa0a6467b640fb0ae3f9d3373ba3fa5b2efe7e71048d9120791d23def4ee SHA512 04dbcf09909d7391f09e977ce738ba4adcb95cacf31005d93a3bcc868bb5c3e388d5d97e455d3f31816b028a07db11058edddd9b69d928264aa37bb0cebc9736 WHIRLPOOL d701c4074a063ef7fb490f8b5c1f66d5a0b3763845d47babb8b4aa29aa911cbe5de1666f2a42400c9d9e3ce1dfe0af46cf4ee15fdeb53458b335fe7e725ebd85 -MISC ChangeLog 50281 SHA256 127e30dd26de11d7917a6e5fe5fe73d78ec3f9f1a0da250752fa43a0658002b6 SHA512 1becb8092f012bb127a27dafebfdb9221e11af2cfc96452e196b65f298e6871b6a5a05565f9a38530d15b41eb528cf6e19c1c20039879077ac3f44fb65987511 WHIRLPOOL 08dcaf2b7d44f23d6dfce0b02c1c33b458b31831a6755f74f738c776ae2124e68d87b1bba00f1861fa72adae0014928388fe79a97f7868120e7c3b59c2826ff5 +MISC ChangeLog 50449 SHA256 0e0089241edb9eddce552847cfddaf92d3ce36319672fac5381ae66b2cda82d3 SHA512 9c3ae722cae20e88a2ac4f4482c3d5f4eaa4cf209735be9fb8e7de56e57f2935e8e0f05215757aeb2436d10c282dcfc3a65a8665de63abc89daa77e74f44a322 WHIRLPOOL db1df7b16e8ebdfc6dad368be46eb1a4f2dde012c9c9fafb4ba6f2b5ad770c1296a90c677851915ffa2e98f453c0202fa905a8993012c635ba34bcbb431143d7 MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJQA/lFAAoJEEdUh39IaPFNV2AH/iBhixW3pHOOoYmHmH5Wov6a -059r2BsiPlTMVovSydSaWtvRnq8yYFIottLxy2fLHxMUE7iKtbULQjgZRQ5ExMpp -txJTlG0Ibxk8ATdKfjY5lk8i/hIAFm3sDXV8mIdUVRbagzvyZqxKlT0r8Xcr+Du6 -m039bUUh9lytqMalgPSe1oVvTqR8gEEBN+S283pr7+qralUL8c/vbUXgaQ4Xif1B -pmD0GNzdCKoUd63kyII6gK9Bvb7Z/nD/oEZG4WC03qZpxSolIjZqfXW86jiL6V3V -oOAHJ72gekmmXtgf3hRsDSjqaXGRnHqVg3ZDZcBrrZFYIKeeK9Rs2qYMBEV6LNs= -=5LJb +iQEcBAEBAgAGBQJQA/pJAAoJEEdUh39IaPFNelkIAJEfpmcKX/WGelJtxyln5z8L +CtHXczAaE51b1/5zJvqbJsEOFrzWaVwfGRTXCP0DDHn5J5GGEEAENC71ThDpg99+ +fUcps1H5iLZu+K0jBXCCg/AyobafB0wiwjzI4/IEoo2i5DTqFH3wNY0hlSSR4KCa +R7+e4c8lUR0L1DgVo8StMbtwdGv602sQiCByv980xC0KX32S4jcU+w9xop2zPGix +5X3QguNucPJi+B8TYUou6lQZp2w4DlAPQ58f8fnCOFt80X7RhKdDDmJD43ZMayhm +FVT2zUUJs9Y3hmp+NHwsojjMezr2VErhzrDziVr9rK++95GIA9YrhW3RVaD7FNk= +=Ei1Z -----END PGP SIGNATURE----- diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.17-lament-newxpm.patch b/x11-misc/xscreensaver/files/xscreensaver-5.17-lament-newxpm.patch deleted file mode 100644 index dc66f2d06580..000000000000 --- a/x11-misc/xscreensaver/files/xscreensaver-5.17-lament-newxpm.patch +++ /dev/null @@ -1,15 +0,0 @@ -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.15-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.15-r1.ebuild deleted file mode 100644 index 900dac68218f..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.15-r1.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# 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.15-r1.ebuild,v 1.3 2012/05/28 16:17:37 armin76 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 - - 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 -} diff --git a/x11-misc/xscreensaver/xscreensaver-5.17.ebuild b/x11-misc/xscreensaver/xscreensaver-5.17.ebuild deleted file mode 100644 index 3aeba82f3073..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-5.17.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# 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 -} |