Version bump.

(Portage version: 2.1.2.5)

4 files changed, 28 insertions, 43 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 0c6222cdc42f..3ed237048995 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.170 2007/04/06 21:33:20 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.171 2007/05/01 14:10:59 drac Exp $
+
+*xscreensaver-5.02 (01 May 2007)
+
+  01 May 2007; Samuli Suominen <drac@gentoo.org> +xscreensaver-5.02.ebuild:
+  Version bump.
 
   06 Apr 2007; Peter Weller <welp@gentoo.org> xscreensaver-5.01-r2.ebuild:
   Stable on amd64 wrt bug 167688
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r3 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r3
deleted file mode 100644
index 8093df95cb91..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-5.01-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 fe10f420e7fe5d648adcc77f3856ced6 xscreensaver-5.01-branding-1.1.patch.bz2 13258
-RMD160 67d2e2aa4bb11bc744543ab77974457e596ed86b xscreensaver-5.01-branding-1.1.patch.bz2 13258
-SHA256 be990533d5548813602f8f1a1732a379a1d9cf6c66fb738f0822926b3efb2dec xscreensaver-5.01-branding-1.1.patch.bz2 13258
-MD5 b60abc52b39591750f48f9c9f20c4167 xscreensaver-5.01.tar.gz 5270954
-RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b xscreensaver-5.01.tar.gz 5270954
-SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf xscreensaver-5.01.tar.gz 5270954
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-5.02 b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02
new file mode 100644
index 000000000000..fdfae96d63a8
--- /dev/null
+++ b/x11-misc/xscreensaver/files/digest-xscreensaver-5.02
@@ -0,0 +1,3 @@
+MD5 83937791b30f55f52011d4fee0f5dff3 xscreensaver-5.02.tar.gz 5371759
+RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 xscreensaver-5.02.tar.gz 5371759
+SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d xscreensaver-5.02.tar.gz 5371759
diff --git a/x11-misc/xscreensaver/xscreensaver-5.01-r3.ebuild b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
index 0fb180868749..61f3cd7db96d 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.01-r3.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.02.ebuild
@@ -1,21 +1,17 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.01-r3.ebuild,v 1.2 2007/03/22 17:12:20 drac Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.4"
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.02.ebuild,v 1.1 2007/05/01 14:10:59 drac Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
 DESCRIPTION="A modular screen saver and locker for the X Window System"
-SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz
-	branding? ( http://dev.gentoo.org/~drac/distfiles/${P}-branding-1.1.patch.bz2 )"
-HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
+HOMEPAGE="http://www.jwz.org/xscreensaver"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="branding gnome jpeg insecure-savers new-login offensive opengl pam xinerama"
+IUSE="gnome jpeg insecure-savers new-login offensive opengl pam xinerama"
 
 RDEPEND="x11-libs/libXxf86misc
 	x11-apps/xwininfo
@@ -47,17 +43,14 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# Use Gentoo branding in Lock Screen
-	use branding && epatch "${WORKDIR}"/${P}-branding-1.1.patch
-
 	# Bug fixes:
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-5.01-gentoo.patch"
 
 	# disable not-safe-for-work xscreensavers
-	use offensive || epatch "${FILESDIR}/${P}-nsfw.patch"
+	use offensive || epatch "${FILESDIR}/${PN}-5.01-nsfw.patch"
 
 	# Fix bug #154444 - hypertorus hack:
-	epatch "${FILESDIR}/${P}-hypertorus.xml.patch"
+	epatch "${FILESDIR}/${PN}-5.01-hypertorus.xml.patch"
 
 	eautoreconf
 
@@ -78,7 +71,6 @@ src_compile() {
 		--with-configdir=/usr/share/xscreensaver/config \
 		--x-libraries=/usr/$(get_libdir) \
 		--x-includes=/usr/include \
-		--with-mit-ext \
 		--with-dpms-ext \
 		--with-xf86vmode-ext \
 		--with-xf86gamma-ext \
@@ -88,7 +80,6 @@ src_compile() {
 		--with-xdbe-ext \
 		--enable-locking \
 		--with-gtk \
-		--with-xml \
 		--without-kerberos \
 		$(use_with insecure-savers setuid-hacks) \
 		$(use_with new-login login-manager) \
@@ -104,13 +95,12 @@ src_compile() {
 src_install() {
 	[[ -n "${KDEDIR}" ]] && dodir "${KDEDIR}/bin"
 
-	make install_prefix="${D}" install || die "make install failed"
+	emake install_prefix="${D}" install || die "emake install failed."
 
-	dodoc README
+	dodoc README*
 
 	# install correctly in gnome, including info about configuration preferences
-	if use gnome ; then
-
+	if use gnome; then
 		dodir /usr/share/gnome/capplets
 		insinto /usr/share/gnome/capplets
 		doins driver/screensaver-properties.desktop
@@ -120,7 +110,6 @@ src_install() {
 		dodir /usr/share/control-center-2.0/capplets
 		insinto /usr/share/control-center-2.0/capplets
 		newins "${FILESDIR}/desktop_entries/screensaver-properties.desktop"
-
 	fi
 
 	# Remove "extra" capplet
@@ -143,19 +132,19 @@ src_install() {
 	# Fix bug #152250:
 	dodir "/usr/share/X11/app-defaults"
 	mv "${D}/usr/lib/X11/app-defaults/XScreenSaver" \
-		"${D}/usr/share/X11/app-defaults/XScreenSaver" || die "mv failed"
+		"${D}/usr/share/X11/app-defaults/XScreenSaver"
 }
 
 pkg_postinst() {
 	if ! use new-login; then
-		einfo
-		einfo "You have chosen to not use the new-login USE flag."
-		einfo "This is a new USE flag which enables individuals to"
-		einfo "create new logins when the screensaver is active,"
-		einfo "allowing others to use their account, even though the"
-		einfo "screen is locked to another account. If you want this"
-		einfo "feature, please recompile with USE=\"new-login\"."
-		einfo
+		elog
+		elog "You have chosen to not use the new-login USE flag."
+		elog "This is a new USE flag which enables individuals to"
+		elog "create new logins when the screensaver is active,"
+		elog "allowing others to use their account, even though the"
+		elog "screen is locked to another account. If you want this"
+		elog "feature, please recompile with USE=\"new-login\"."
+		elog
 	fi
 
 	if use insecure-savers;then
@@ -167,10 +156,4 @@ pkg_postinst() {
 		ewarn "root privileges. You have been warned."
 		ewarn
 	fi
-
-	ewarn
-	ewarn "In XScreenSaver 5.00 API was changed. All third party screen savers"
-	ewarn "need to be ported to the new API. Until then they will not work."
-	ewarn
-	epause
 }