Removing ICC stuff altogether, with Mr_Bones_'s blessing

Package-Manager: portage-2.0.51.16

3 files changed, 4 insertions, 19 deletions

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index c802a3144848..91701adb7618 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -2,8 +2,8 @@ MD5 181e133ec0f402e4d9a51428c171dddd ChangeLog 13704
 MD5 753615dcedf3c8ce9e4ea6a7ff7c1d45 metadata.xml 337
 MD5 f934f262880ab5604c675d1b031dd437 xscreensaver-4.14-r2.ebuild 4661
 MD5 0e62ff1b856345ffcc2de00ca43af8eb xscreensaver-4.15.ebuild 4507
-MD5 b5dbb71293610e4582c26fd7e03bee29 xscreensaver-4.16.ebuild 4825
-MD5 e975ccc3c9cd6e8f0e3e7f87ee443f98 xscreensaver-4.20.ebuild 5023
+MD5 3b9ea45e073259449f2b6001cadf3997 xscreensaver-4.16.ebuild 4628
+MD5 8e7950b21a2decc2b60e5ce319fa418a xscreensaver-4.20.ebuild 4831
 MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
 MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
 MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
diff --git a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild b/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
index 8fd0f2943688..45747409b27c 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.18 2005/02/24 21:46:19 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.19 2005/02/25 22:49:40 rizzo Exp $
 
 inherit eutils flag-o-matic
 
 IUSE="pam kerberos krb4 gtk gtk2 gnome opengl jpeg xinerama offensive kde nls"
-#icc
 
 DESCRIPTION="a modular screensaver for X11"
 SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
@@ -84,8 +83,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-4.10-norpm.patch
 	# set default fortune to /usr/bin/fortune even if one can't be found
 	epatch ${FILESDIR}/${PN}-4.14-fortune.patch
-	# disabled because it is out of date - liquidx (15/06/2004)
-	# use icc && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-icc.patch
 	# disable not-safe-for-work xscreensavers
 	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
 }
@@ -130,11 +127,6 @@ src_compile() {
 		fi
 	fi
 
-	#if use icc ; then
-		#export CC=icc
-		#autoconf
-	#fi
-
 	econf \
 		--enable-hackdir=/usr/lib/xscreensaver \
 		--x-libraries=/usr/X11R6/lib \
diff --git a/x11-misc/xscreensaver/xscreensaver-4.20.ebuild b/x11-misc/xscreensaver/xscreensaver-4.20.ebuild
index 804cc78d9a49..7afc510ec3a9 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.20.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.20.ebuild,v 1.3 2005/02/24 21:46:19 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.20.ebuild,v 1.4 2005/02/25 22:49:40 rizzo Exp $
 
 inherit eutils flag-o-matic
 
@@ -84,8 +84,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-4.20-norpm.patch
 	# set default fortune to /usr/bin/fortune even if one can't be found
 	epatch ${FILESDIR}/${PN}-4.14-fortune.patch
-	# disabled because it is out of date - liquidx (15/06/2004)
-	# use icc && EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-4.14-icc.patch
 	# disable not-safe-for-work xscreensavers
 	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
 }
@@ -128,11 +126,6 @@ src_compile() {
 		|| myconf="${myconf} --disable-nls"
 
 
-	#if use icc ; then
-		#export CC=icc
-		#autoconf
-	#fi
-
 	econf \
 		--enable-hackdir=/usr/lib/xscreensaver \
 		--x-libraries=/usr/X11R6/lib \