summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2013-02-17 03:40:47 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2013-02-17 03:40:47 +0000
commit15dcfc07f700b6e4c891ed3bc2c2dbe6bf0d3183 (patch)
treea3a79763ea1e7f11bfe06f68ff788156a544590c /x11-misc
parentversion bump (diff)
downloadhistorical-15dcfc07f700b6e4c891ed3bc2c2dbe6bf0d3183.tar.gz
historical-15dcfc07f700b6e4c891ed3bc2c2dbe6bf0d3183.tar.bz2
historical-15dcfc07f700b6e4c891ed3bc2c2dbe6bf0d3183.zip
Remove REQUIRED_USE to prevent conflict with package.use.force of USE flags new-login and gdm for arm, ppc64
Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64 Manifest-Sign-Key: 0x4868F14D
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/ChangeLog8
-rw-r--r--x11-misc/xscreensaver/Manifest14
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.20.ebuild6
3 files changed, 17 insertions, 11 deletions
diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 7274875b1705..5891fc74b7bb 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
# 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.325 2012/12/16 19:56:05 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.326 2013/02/17 03:40:42 ssuominen Exp $
+
+ 17 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> xscreensaver-5.20.ebuild:
+ Remove REQUIRED_USE to prevent conflict with package.use.force of USE flags
+ new-login and gdm for arm, ppc64
16 Dec 2012; Raúl Porcel <armin76@gentoo.org> xscreensaver-5.20.ebuild:
alpha/ia64/sh/sparc stable wrt #439146
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 3e18d2406c9a..4176479e9648 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -12,13 +12,17 @@ AUX xscreensaver-5.20-tests-miscfix.patch 784 SHA256 3cbc3af757f4ea362e7059ebf69
DIST xscreensaver-5.15.tar.gz 5977594 SHA256 4f6d1f1e4c15dbb74e2296f8fe57a73d47d602515178c248bbc838f779d5082d SHA512 2013cf627908a3fa59a3e7d3e6e03b495497113828bf6c89d477fd84dca6867ddeafd572a5f23f12bbfd98fb32acbfc2bcb5d24ef4975c3c263439dbe6fa66b2 WHIRLPOOL 186719cc301ede656fd002f4eadafcec2fe488f60bc1323ca512cb0f49398dfcb3e08da4fd0e6028287438a24b92746a1972759a18b9f9e57bc9d61b5a50c852
DIST xscreensaver-5.20.tar.gz 7380256 SHA256 a9cf9f745c6319db175d7e1e36545b01b9e099a89fd5c239689c982e0c10bcb1 SHA512 2867e081154e53c3d7e16bda1226c9682b296461f93b7565cbb0a267ac81489abefd947e0795f04e77632e108f428c7421e14fdd95894297a8a8da375914db74 WHIRLPOOL e3ffbb2dfbfabfa669276c9e624f9a88dfd4808533dcaa7b57b12cbe16e3da83c8d1ab38a19a370f2309a1ed7d266666ace5c65ed9357707fb9850d4f4ab290d
EBUILD xscreensaver-5.15.ebuild 3198 SHA256 890d133642f9d71ca9dfd2bf3203eaa813d3b9f90216d8e8858367cf165d8180 SHA512 3a5719e4475266ae6dc5d083a95ff52f24b51abfebcd00f207bd01482c41df15b494f54d97a4442f6919ff2e49cef9a5c31e741a5ff46a1d8db9e796ebbca8bf WHIRLPOOL 50039503a2f82e7b9a6a2b65bf7cfb64a2a6530543cd589b15ca253e53d421163bf8289cfaad7d44bdc91af1d372dbc8e1531c686dba12242cb23da1286c5fb4
-EBUILD xscreensaver-5.20.ebuild 3544 SHA256 139a57a3b06db95d253ec0b998992345a6885ac43b9d78ed14f6be8a03b66aa3 SHA512 f02d6ea7a60b4fbbb734f2d7f97562d2a0e10d6523cec6757d01e9143fb917c1b27bb6e1b60f8c9d81381bb72d35171b37c4eeeda5624f5ed3bac1285a6dd939 WHIRLPOOL 4188891149e3744ad8321dcc997e6594e3322bf3dc2c18dd69ea16401e15ca3774871079a46e2d035a867ffaf1ed270ea92eb40bdcae261c8d8e25c60c4d1aa2
-MISC ChangeLog 52259 SHA256 b17457215c05b12a2c44df8bd28d7dd61b8cde62a8210fab072c793ba198855e SHA512 3701fbd242b0faec5d6c47f7bc81fbd7f479188598d1d924321a0efe413375381d1eb1cd2bb52e0263ad4fb929e98dc39d989ce4c3be45f0c05d417e1c8a5462 WHIRLPOOL ee84051a3dcad84ac39117c31fdd8ee61911c55f489c3f383d2eb4ad7eb572d17ce40133b61ae74d09141adca7b3b03742ae4c9ab7e2344fb2cdb9ec9c686856
+EBUILD xscreensaver-5.20.ebuild 3512 SHA256 3e8d507246ff7f05d4f5e748ed886e64fa47c12f067ff95b34b6f4889f4ca752 SHA512 552362582414c3081389e4b31e707664f4ae722117390a8f761726bf0fb291316a669dadcdbcb3ca28dda6099ea285e335dc467a833bddf3d6ac4313470fb280 WHIRLPOOL 36fce3ec8a7340d0ba63bb6deebd7e7f3c8fc6fe5ed74285e4b39731c1fba93c8a6a402f3f4eb452caeb55bb112c887325c8568ba56bd335ed5707dfa36162b3
+MISC ChangeLog 52455 SHA256 a96420f6458e9eda350be2789d7635b57fb9937cb921190a55f044326058c5e8 SHA512 f3590bec2332dcbd01db7a1b17b28dd5b2d0b8ed7f54e5e2010e7cba2f697feeaf1055b929b79ee1459b1d737ea775eeb35045c4f11eba89dffc7d5e086224aa WHIRLPOOL 7562bbd3acaca16245ee9ae231f12a4877e725ed2d457cc9463ef9b408e260df4ddf5a504224efb2593fac88555719e9348f42ca9ec52f2abff339dfef9cb466
MISC metadata.xml 581 SHA256 e4880a7050f0232501dcdeac4feb3e4b0c79e013924632f0ed5609fe221e0a19 SHA512 46d230f1769dc7bcf962511fbc808e60e241966238a3cb15bfa6a86de092046f00ed0665fc81028c91b436464968688cddf178a75f4e98932c0f1a6398734ada WHIRLPOOL 0ce50d9f73b5d4fbe45eb07086f5aa4435c6583ae9112346037f1a11297c385cb8361325e2fe9be90378b8d99c443d1bba55f67fac3de28a08f067e2102db3cc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlDOJ1gACgkQuQc30/atMkBUBACgvhhy89aCR085v+aR6VhEP0pZ
-AC8AoIx6BEhBpqnLmgRKvUPk4Bs8Vje2
-=g4qq
+iQEcBAEBCAAGBQJRIFEqAAoJEEdUh39IaPFN8skH/1WR2KJwF8S4l5PHRLoA8Va6
+a1+rclcOfmBiu9VW9eIzUBZ851gPRp9wgiuW8BFn8KmgcCb/AEv1KSFL9bCZnhmT
+DNxopy7FKCi583M1JQ2ZpRZEt/gZcrT90uUjb8+AxdjDaSS/SBt/si6o9s4aWUn7
+FxNiQ3Z3MwUm3ZNDwxKnEFzSqTSuXjc2u//xnbcsqfE1xdtuNOLcc2FIUX6naDPQ
+16HzaBqt5j6Rb06HhZqrzlHhhf5hYBbNdIoX/VGbEpir8+YlhyOaa74qP4vqAvmi
+4lqSqc8vw/khcV6DMSfhdQ9as3hf5XcrNW1RTM6ftIjUzyO+hDBpB843Pvcjf34=
+=hSM6
-----END PGP SIGNATURE-----
diff --git a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
index 1bd396801de3..e8740c25b573 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.9 2012/12/16 19:56:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.20.ebuild,v 1.10 2013/02/17 03:40:42 ssuominen Exp $
EAPI=4
inherit autotools eutils flag-o-matic multilib pam
@@ -56,8 +56,6 @@ DEPEND="${COMMON_DEPEND}
x11-proto/xf86vidmodeproto
xinerama? ( x11-proto/xineramaproto )"
-REQUIRED_USE="gdm? ( new-login )"
-
src_prepare() {
if use new-login && ! use gdm; then #392967
sed -i \