version bump

3 files changed, 153 insertions, 3 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 5c739f7f98e3..0a635f749109 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.14 2002/12/13 11:00:55 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.15 2003/02/04 00:24:45 seemant Exp $
+
+*xscreensaver-4.07 (03 Feb 2003)
+
+  03 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xscreensaver-4.07.ebuild
+  files/digest-xscreensaver-4.07 :
+
+  Version bump.
+
+*xscreensaver-4.06-r2 (26 Oct 2002)
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
@@ -15,8 +24,6 @@
   26 Oct 2002; Maik Schreiber <blizzy@gentoo.org> xscreensaver-4.06-r2.ebuild:
   Remove /usr/share/control-center/capplets/screensaver-properties.desktop.
 
-*xscreensaver-4.06-r2 (26 Oct 2002)
-
   26 Oct 2002; Martin Schlemmer <azarah@gentoo.org> xscreensaver-4.06-r2.ebuild:
   Redo the whole thing not to depend on gtk+-2.0 by default, and enable
   --with-gnome theoretically for gnome-1.4.
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.07 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.07
new file mode 100644
index 000000000000..fcf1ad1c9910
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-4.07
@@ -0,0 +1 @@
+MD5 851058340a91cc3a7dbe180b3a8d7726 xscreensaver-4.07.tar.gz 3242535
diff --git a/x11-misc/xscreensaver/xscreensaver-4.07.ebuild b/x11-misc/xscreensaver/xscreensaver-4.07.ebuild
new file mode 100644
index 000000000000..16738b259492
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-4.07.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.07.ebuild,v 1.1 2003/02/04 00:24:45 seemant Exp $
+
+IUSE="pam kerberos gtk motif gnome opengl jpeg xml"
+
+DESCRIPTION="a modular screensaver for X11"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+
+LICENSE="BSD"
+KEYWORDS="~x86 ~ppc ~sparc"
+SLOT="0"
+
+# Enable gtk+ by default if 'motif' not in USE, or if
+# both 'motif' and 'gtk' is in USE.  ONLY enable motif
+# if 'motif', but not 'gtk' is in USE.
+DEPEND="sys-devel/bc
+	dev-util/pkgconfig
+	gtk? ( x11-libs/gtk+
+	       gnome-base/libglade
+	       dev-libs/libxml2 )
+	gnome? ( gnome-base/libglade
+	         dev-libs/libxml2
+	         gnome-base/control-center )
+	motif? ( virtual/motif )
+	!motif? ( x11-libs/gtk+
+	          gnome-base/libglade
+	          dev-libs/libxml2 )
+	pam? ( sys-libs/pam )
+	jpeg? ( media-libs/jpeg )
+	opengl? ( virtual/opengl
+	          >=media-libs/gle-3.0.1 )
+	xml? ( dev-libs/libxml2 )"
+
+RDEPEND="${DEPEND}
+	media-libs/netpbm"
+
+src_unpack() {
+	unpack ${A}
+	
+	cd ${S}
+	cp Makefile.in Makefile.in.orig
+	sed "s:hacks/glx po:hacks/glx:" \
+		Makefile.in.orig > Makefile.in
+}
+
+src_compile() {
+	local myconf=""
+	
+	# gtk is the more stable one, so enable it by default.
+	if use motif && ! use gtk
+	then
+		myconf="${myconf} --with-motif --without-gtk"
+	else
+		myconf="${myconf} --without-motif --with-gtk --with-xml"
+	fi
+
+	use pam \
+		&& myconf="${myconf} --with-pam" \
+		|| myconf="${myconf} --without-pam"
+
+	use kerberos \
+		&& myconf="${myconf} --with-kerberos" \
+		|| myconf="${myconf} --without-kerberos"
+
+	use opengl \
+		&& myconf="${myconf} --with-gl --with-gle" \
+		|| myconf="${myconf} --without-gl --without-gle"
+
+	use jpeg \
+		&& myconf="${myconf} --with-jpeg" \
+		|| myconf="${myconf} --without-jpeg"
+
+	use xml2 \
+		&& myconf="${myconf} --with-xml"
+# Do not specifically disable xml, as gtk use it
+#		|| myconf="${myconf} --without-xml"
+	
+	use nls \
+		&& myconf="${myconf} --enable-nls" \
+		|| myconf="${myconf} --disable-nls"
+
+	# Check if x11-libs/gtk+-2.0 is installed
+	pkg-config gtk+-2.0 &> /dev/null
+	local gtk2_installed="$?"
+
+	# Enable pixbuf support if x11-libs/gtk+-2.0 is not installed, but
+	# media-libs/gdk-pixbuf is installed,
+	# OR enable it if x11-libs/gtk+-2.0 is installed
+	( ( [ "${gtk2_installed}" -ne 0 ] && [ -x /usr/bin/gdk-pixbuf-config ] ) \
+	 || [ "${gtk2_installed}" -eq 0 ] ) \
+		&& myconf="${myconf} --with-pixbuf"
+	
+	# Enable gnome support (control-center capplet) if 'gnome' in USE,
+	# but gtk+-2.0 is not installed.
+	( [ "${gtk2_installed}" -ne 0 ] && use gnome ) \
+		&& myconf="${myconf} --with-gnome"
+
+	export C_INCLUDE_PATH="/usr/include/libxml2/"
+	econf \
+		--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
+	
+	# install correctly in gnome2 
+	use gnome && ( \
+		dodir /usr/share/gnome/capplets
+		insinto /usr/share/gnome/capplets
+		doins driver/screensaver-properties.desktop
+	)
+
+	# Remove "extra" capplet
+	rm -f ${D}/usr/share/control-center/capplets/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
+	)
+}