add pixmap for gnome

12 files changed, 13 insertions, 343 deletions

diff --git a/app-misc/xscreensaver/ChangeLog b/app-misc/xscreensaver/ChangeLog
index 50a2b9b30964..d8366a4b708e 100644
--- a/app-misc/xscreensaver/ChangeLog
+++ b/app-misc/xscreensaver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/xscreensaver
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/ChangeLog,v 1.14 2002/06/24 02:00:58 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/ChangeLog,v 1.15 2002/06/28 23:41:51 azarah Exp $
+
+xscreensaver-4.05-r2 (29 Jun 2002)
+
+  29 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
+  Add /usr/share/pixmaps/xscreensaver.xpm if gnome in USE ... fixes no icon in
+  control-center for gnome2.
 
 xscreensaver-4.05 (22 Jun 2002)
   22 Jun 2002; Spider <spider@gentoo.org> xscreensaver-4.05-r1.ebuild :
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r3 b/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r3
deleted file mode 100644
index a352279d3ce7..000000000000
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.02-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea0deb9c38cae11b89ea3dd5c0a04540 xscreensaver-4.02.tar.gz 2201442
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2-r1 b/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2-r1
deleted file mode 100644
index a4e51d2403b3..000000000000
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79f99780be37eec5d7ffb8671afe7406 xscreensaver-4.04.2.tar.gz 2901618
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2-r2 b/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2-r2
deleted file mode 100644
index a4e51d2403b3..000000000000
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.04.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79f99780be37eec5d7ffb8671afe7406 xscreensaver-4.04.2.tar.gz 2901618
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.05-r1 b/app-misc/xscreensaver/files/digest-xscreensaver-4.05-r1
deleted file mode 100644
index abb2ba26d7b8..000000000000
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.05-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 39b05d4da14158638e501e3bc31c0943 xscreensaver-4.05.tar.gz 2914308
diff --git a/app-misc/xscreensaver/files/digest-xscreensaver-4.05 b/app-misc/xscreensaver/files/digest-xscreensaver-4.05-r2
index abb2ba26d7b8..abb2ba26d7b8 100644
--- a/app-misc/xscreensaver/files/digest-xscreensaver-4.05
+++ b/app-misc/xscreensaver/files/digest-xscreensaver-4.05-r2
diff --git a/app-misc/xscreensaver/files/xscreensaver-4.04.2-gentoo.diff b/app-misc/xscreensaver/files/xscreensaver-4.04.2-gentoo.diff
deleted file mode 100644
index 4c7cb005c058..000000000000
--- a/app-misc/xscreensaver/files/xscreensaver-4.04.2-gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- es.po.orig	Wed Jun  5 17:22:36 2002
-+++ es.po	Wed Jun  5 17:23:25 2002
-@@ -6686,10 +6686,6 @@
- #~ msgid "If the solver can "
- #~ msgstr "Si el resolutor puede "
- 
--#: driver/screensaver-properties.desktop.in:3
--msgid "Screensaver"
--msgstr "Propiedades Salvapantallas"
--
- #: driver/screensaver-properties.desktop.in:4
- msgid "Configure the settings of the screensaver."
- msgstr "Configurar el salvapantalla"
diff --git a/app-misc/xscreensaver/xscreensaver-4.02-r3.ebuild b/app-misc/xscreensaver/xscreensaver-4.02-r3.ebuild
deleted file mode 100644
index 14f99fde2e8a..000000000000
--- a/app-misc/xscreensaver/xscreensaver-4.02-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.02-r3.ebuild,v 1.1 2002/06/02 09:05:26 azarah Exp $
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="a modular screensaver for X11"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-RDEPEND="virtual/x11
-	jpeg? ( media-libs/jpeg )
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )
-	gnome? ( >=gnome-base/control-center-1.4.0.1-r1 )
-	pam? ( >=sys-libs/pam-0.75 )
-	dev-libs/libxml2"
-
-DEPEND="${RDEPEND}
-	sys-devel/bc"
-
-src_compile() {
-
-	local myconf=""
-	use jpeg && myconf="${myconf} --with-jpeg"
-	use jpeg || myconf="${myconf} --without-jpeg"
-	use gnome && myconf="${myconf} --with-gnome --with-pixbuf"
-	use gnome || myconf="${myconf} --without-gnome"
-	use gtk && 	myconf="${myconf} --with-gtk"
-	use gtk || myconf="${myconf} --without-gtk"
-	use motif && myconf="${myconf} --with-motif"
-	use motif || myconf="${myconf} --without-motif"
-	use pam && myconf="${myconf} --with-pam"
-	use pam || myconf="${myconf} --without-pam"
-	use opengl && myconf="${myconf} --with-gl --with-gle"
-	use opengl || myconf="${myconf} --without-gl --without-gle"
-	
-	export C_INCLUDE_PATH="/usr/include/libxml2/libxml/"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host=${CHOST} \
-		--enable-hackdir=/usr/lib/xscreensaver \
-		--with-mit-ext \
-		--with-dpms-ext \
-		--with-xinerama-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		${myconf} || die
-		
-	emake || die
-	unset C_INCLUDE_PATH
-}
-
-src_install() {
-
-	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
-	make install_prefix=${D} install || die
-
-	# Fix double Control Center entry
-	rm -f "${D}/usr/share/control-center/capplets/screensaver.desktop"
-
-	if [ "`use pam`" ]
-	then
-		insinto /etc/pam.d
-		doins "${FILESDIR}/pam.d/xscreensaver"
-	fi
-	
-	[ -n "`use kde`" ] || ( [ -n "${KDEDIR}" ] && rm -rf ${D}/${KDEDIR} )
-}
-
diff --git a/app-misc/xscreensaver/xscreensaver-4.04.2-r1.ebuild b/app-misc/xscreensaver/xscreensaver-4.04.2-r1.ebuild
deleted file mode 100644
index 2b5daadbcaa9..000000000000
--- a/app-misc/xscreensaver/xscreensaver-4.04.2-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.04.2-r1.ebuild,v 1.1 2002/06/06 22:19:53 seemant Exp $
-
-S="${WORKDIR}/${P/.2/}"
-DESCRIPTION="a modular screensaver for X11"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-DEPEND="virtual/x11 sys-devel/bc
-	gtk? ( x11-libs/gtk+ )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )
-	gnome? ( media-libs/gdk-pixbuf
-		>=gnome-base/control-center-1.4.0.1-r1 )
-	pam? ( >=sys-libs/pam-0.75 )
-	dev-libs/libxml2"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		cd po
-		patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-	) || ( \
-		cp Makefile.in Makefile.in.orig
-		sed "s:hacks/glx po:hacks/glx:" \
-			Makefile.in.orig > Makefile.in
-	)
-}
-
-src_compile() {
-	local myconf=""
-	use gnome && myconf="${myconf} --with-gnome" || myconf="${myconf} --without-gnome"
-	use gtk && 	myconf="${myconf} --with-gtk" || myconf="${myconf} --without-gtk"
-	use motif && myconf="${myconf} --with-motif" || myconf="${myconf} --without-motif"
-	use pam && myconf="${myconf} --with-pam" || myconf="${myconf} --without-pam"
-	use opengl myconf="${myconf} --with-gl --with-gle" || myconf="${myconf} --without-gl --without-gle"
-	export C_INCLUDE_PATH="/usr/include/libxml2/libxml/"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host="${CHOST}" \
-		--enable-hackdir=/usr/lib/xscreensaver \
-		--with-mit-ext \
-		--with-dpms-ext \
-		--with-xinerama-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		${myconf} || die
-		
-	emake || die
-}
-
-src_install() {
-
-	[ -n "$KDEDIR" ] && dodir "$KDEDIR/bin"
-	
-	make install_prefix="${D}" install || die
-
-	if [ "`use pam`" ]
-	then
-		insinto /etc/pam.d
-		doins "${FILESDIR}/pam.d/xscreensaver"
-	fi
-}
diff --git a/app-misc/xscreensaver/xscreensaver-4.04.2-r2.ebuild b/app-misc/xscreensaver/xscreensaver-4.04.2-r2.ebuild
deleted file mode 100644
index af25b33bc37d..000000000000
--- a/app-misc/xscreensaver/xscreensaver-4.04.2-r2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.04.2-r2.ebuild,v 1.1 2002/06/10 06:19:48 seemant Exp $
-
-S="${WORKDIR}/${P/.2/}"
-DESCRIPTION="a modular screensaver for X11"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-DEPEND="virtual/x11 sys-devel/bc
-	gtk? ( x11-libs/gtk+ )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )
-	gnome? ( media-libs/gdk-pixbuf
-		>=gnome-base/control-center-1.4.0.1-r1 )
-	pam? ( >=sys-libs/pam-0.75 )
-	dev-libs/libxml2"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		cd po
-		patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-	) || ( \
-		cp Makefile.in Makefile.in.orig
-		sed "s:hacks/glx po:hacks/glx:" \
-			Makefile.in.orig > Makefile.in
-	)
-}
-
-src_compile() {
-	local myconf=""
-	use gnome \
-		&& myconf="${myconf} --with-gnome" \
-		|| myconf="${myconf} --without-gnome"
-
-	use gtk \
-		&& myconf="${myconf} --with-gtk" \
-		|| myconf="${myconf} --without-gtk"
-
-	use motif \
-		&& myconf="${myconf} --with-motif" \
-		|| myconf="${myconf} --without-motif"
-
-	use pam \
-		&& myconf="${myconf} --with-pam" \
-		|| myconf="${myconf} --without-pam"
-
-	use opengl \
-		&& myconf="${myconf} --with-gl --with-gle" \
-		|| myconf="${myconf} --without-gl --without-gle"
-
-	export C_INCLUDE_PATH="/usr/include/libxml2/libxml/"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host="${CHOST}" \
-		--enable-hackdir=/usr/lib/xscreensaver \
-		--with-mit-ext \
-		--with-dpms-ext \
-		--with-xinerama-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		${myconf} || die
-		
-	emake || die
-}
-
-src_install() {
-
-	[ -n "$KDEDIR" ] && dodir "$KDEDIR/bin"
-	
-	make install_prefix="${D}" install || die
-
-	use pam && ( \
-		insinto /etc/pam.d
-		doins "${FILESDIR}/pam.d/xscreensaver"
-	)
-}
diff --git a/app-misc/xscreensaver/xscreensaver-4.05-r1.ebuild b/app-misc/xscreensaver/xscreensaver-4.05-r2.ebuild
index 25372563ce04..42fcedfac765 100644
--- a/app-misc/xscreensaver/xscreensaver-4.05-r1.ebuild
+++ b/app-misc/xscreensaver/xscreensaver-4.05-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Martin Schlemmer <azarah@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.05-r1.ebuild,v 1.1 2002/06/24 02:03:26 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.05-r2.ebuild,v 1.1 2002/06/28 23:41:51 azarah Exp $
 
 S="${WORKDIR}/${P/.2/}"
 DESCRIPTION="a modular screensaver for X11"
@@ -86,6 +86,11 @@ src_install() {
 		doins "driver/screensaver-properties.desktop"
 	)
 
+	use gnome && ( \
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	)
+
 	use pam && ( \
 		insinto /etc/pam.d
 		doins "${FILESDIR}/pam.d/xscreensaver"
diff --git a/app-misc/xscreensaver/xscreensaver-4.05.ebuild b/app-misc/xscreensaver/xscreensaver-4.05.ebuild
deleted file mode 100644
index 27a8f3ea1d3b..000000000000
--- a/app-misc/xscreensaver/xscreensaver-4.05.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Martin Schlemmer <azarah@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/app-misc/xscreensaver/xscreensaver-4.05.ebuild,v 1.1 2002/06/11 11:11:33 seemant Exp $
-
-S="${WORKDIR}/${P/.2/}"
-DESCRIPTION="a modular screensaver for X11"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
-
-DEPEND="virtual/x11 sys-devel/bc
-	gtk? ( x11-libs/gtk+ )
-	motif? ( >=x11-libs/openmotif-2.1.30 )
-	opengl? ( virtual/opengl >=media-libs/gle-3.0.1 )
-	gnome? ( media-libs/gdk-pixbuf
-		>=gnome-base/control-center-1.4.0.1-r1 )
-	pam? ( >=sys-libs/pam-0.75 )
-	dev-libs/libxml2"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		cd po
-		patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-	) || ( \
-		cp Makefile.in Makefile.in.orig
-		sed "s:hacks/glx po:hacks/glx:" \
-			Makefile.in.orig > Makefile.in
-	)
-}
-
-src_compile() {
-	local myconf=""
-	use gnome \
-		&& myconf="${myconf} --with-gnome" \
-		|| myconf="${myconf} --without-gnome"
-
-	use gtk \
-		&& myconf="${myconf} --with-gtk" \
-		|| myconf="${myconf} --without-gtk"
-
-	use motif \
-		&& myconf="${myconf} --with-motif" \
-		|| myconf="${myconf} --without-motif"
-
-	use pam \
-		&& myconf="${myconf} --with-pam" \
-		|| myconf="${myconf} --without-pam"
-
-	use opengl \
-		&& myconf="${myconf} --with-gl --with-gle" \
-		|| myconf="${myconf} --without-gl --without-gle"
-
-	export C_INCLUDE_PATH="/usr/include/libxml2/libxml/"
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--host="${CHOST}" \
-		--enable-hackdir=/usr/lib/xscreensaver \
-		--with-mit-ext \
-		--with-dpms-ext \
-		--with-xinerama-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		${myconf} || die
-		
-	emake || die
-}
-
-src_install() {
-
-	[ -n "$KDEDIR" ] && dodir "$KDEDIR/bin"
-	
-	make install_prefix="${D}" install || die
-
-	use pam && ( \
-		insinto /etc/pam.d
-		doins "${FILESDIR}/pam.d/xscreensaver"
-	)
-}