Version bump.

Package-Manager: portage-2.1.2.5

5 files changed, 40 insertions, 55 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/Manifest b/x11-misc/xscreensaver/Manifest
index 9405e9a920e2..7e5937b26189 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -39,8 +39,8 @@ MD5 ea86cf0c30999d0d79519d2b3573b2ff files/xscreensaver-5.01-nsfw.patch 6673
 RMD160 511aa5ce86beca16896e6657fe07f3d54519c9ad files/xscreensaver-5.01-nsfw.patch 6673
 SHA256 74d5ed26063ba56af8a912ddd19bed2ebf65d45f39a4a7b9b742d6e6b775f91d files/xscreensaver-5.01-nsfw.patch 6673
 DIST xscreensaver-4.24.tar.gz 4936993 RMD160 a7cb8262991d6783bd0da843bc6dbdce6976e287 SHA1 9573a5c561422fed2845d37f3ad43fa3e2b62247 SHA256 73140a9f209921543a6562442b5d68801883b3fff3b6be751bec934f4b456474
-DIST xscreensaver-5.01-branding-1.1.patch.bz2 13258 RMD160 67d2e2aa4bb11bc744543ab77974457e596ed86b SHA1 433bf67a6dc842d4694aa451b799f944c6871ff0 SHA256 be990533d5548813602f8f1a1732a379a1d9cf6c66fb738f0822926b3efb2dec
 DIST xscreensaver-5.01.tar.gz 5270954 RMD160 f301d9091f9f6e6cc05360c0d453dc4f6b2b489b SHA1 c371241c54f4c4cc2dd670852e39f212da3ca991 SHA256 3e34657a9180c3355a2bc81cec993bf8417daf6f8968d93bcb26751db9c9b0cf
+DIST xscreensaver-5.02.tar.gz 5371759 RMD160 b70fcfb0d4958134823a9fd7a288297c53fef270 SHA1 3e02f516efc25755f1a89f5af3983423f639f82b SHA256 0cb7e7653196701c31c2ee66f276f467bd8a9889a71c378aedc3b1fa2b8e879d
 EBUILD xscreensaver-4.24.ebuild 5233 RMD160 0cbb58d41ae8364e8ce8b40366a03098fc399735 SHA1 b4c5954cb4d8340dfb0d12e68f199092a636a3c7 SHA256 de2bb90e7122b9ba6d97d058b8788834e16af8d62b6d0f0592e571c14905162c
 MD5 c3b384b963b8a1d708942269f1913e24 xscreensaver-4.24.ebuild 5233
 RMD160 0cbb58d41ae8364e8ce8b40366a03098fc399735 xscreensaver-4.24.ebuild 5233
@@ -49,14 +49,14 @@ EBUILD xscreensaver-5.01-r2.ebuild 4858 RMD160 e6aa618f8b918c205588eccdc0c25377a
 MD5 807261a708a578c61acf12298ae77363 xscreensaver-5.01-r2.ebuild 4858
 RMD160 e6aa618f8b918c205588eccdc0c25377a83b71cd xscreensaver-5.01-r2.ebuild 4858
 SHA256 631c12133622aae5056bff900a5b958fd5eceb04cc99d8984365ed9782d900bf xscreensaver-5.01-r2.ebuild 4858
-EBUILD xscreensaver-5.01-r3.ebuild 5056 RMD160 cbfecb126d7a50b67933028861ab0b1b543407b3 SHA1 1b50d797c154febb06fa31cd81d33fe9670cb71d SHA256 0160f9b4522162dae11a63840b95c3f292e9056d0910f63a1b7d3ec0cda2026e
-MD5 27c09bf58560ebb94a462a662aeac6dd xscreensaver-5.01-r3.ebuild 5056
-RMD160 cbfecb126d7a50b67933028861ab0b1b543407b3 xscreensaver-5.01-r3.ebuild 5056
-SHA256 0160f9b4522162dae11a63840b95c3f292e9056d0910f63a1b7d3ec0cda2026e xscreensaver-5.01-r3.ebuild 5056
-MISC ChangeLog 28842 RMD160 74c3c2128c476b66398bd9748fe647578200174d SHA1 706b181436a6a69889211ca2df26ef9d9a0ae493 SHA256 b1f498c914884fcb7a35efd999a84dffbac7106d9a71a03d2e54e347898140f9
-MD5 6bc2f4f16921b60c07c294d63480c951 ChangeLog 28842
-RMD160 74c3c2128c476b66398bd9748fe647578200174d ChangeLog 28842
-SHA256 b1f498c914884fcb7a35efd999a84dffbac7106d9a71a03d2e54e347898140f9 ChangeLog 28842
+EBUILD xscreensaver-5.02.ebuild 4602 RMD160 18edeeb8f385013847cb4fb6f08da212d8b9200d SHA1 1f15a2e8f46a9e3474c07393c4e7346eb89fa645 SHA256 a0f6d705ab8f241bfaf9e4d8696c00497dc40cd9bf7a3a4e1b4c69b83e53f6da
+MD5 af399deec529cbd569cd61c6863c4887 xscreensaver-5.02.ebuild 4602
+RMD160 18edeeb8f385013847cb4fb6f08da212d8b9200d xscreensaver-5.02.ebuild 4602
+SHA256 a0f6d705ab8f241bfaf9e4d8696c00497dc40cd9bf7a3a4e1b4c69b83e53f6da xscreensaver-5.02.ebuild 4602
+MISC ChangeLog 28969 RMD160 58147ede40acbe974e0cc3f52f083ace195779ae SHA1 ca10d498cdee6b5183abc72f9f26d067cfb10060 SHA256 56e63dbab85c3ba7d1d3e5e749fd9577cf3dfa85611691b071bfb1a4e28c665a
+MD5 ad06d28e0e5381c1ce5a9f5a26bd9b9a ChangeLog 28969
+RMD160 58147ede40acbe974e0cc3f52f083ace195779ae ChangeLog 28969
+SHA256 56e63dbab85c3ba7d1d3e5e749fd9577cf3dfa85611691b071bfb1a4e28c665a ChangeLog 28969
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 metadata.xml 166
@@ -67,6 +67,6 @@ SHA256 9988ae848a4dcb14ec369659a6ca2c7c682a9b35f7ee79edff88f8abff434b5d files/di
 MD5 89fc92ae4e5d4497f70455ee093619f0 files/digest-xscreensaver-5.01-r2 256
 RMD160 53c251e5b5844a380105b5fdb5a61bab05723fa2 files/digest-xscreensaver-5.01-r2 256
 SHA256 373fdb9ab0176f3509fbeeffdb25e3b2266e496475024636029574913943f921 files/digest-xscreensaver-5.01-r2 256
-MD5 0db9d7c7764cb29d5feb1c4ff7734941 files/digest-xscreensaver-5.01-r3 554
-RMD160 d961de655c6312f92b01626ed7693e2af4ddea50 files/digest-xscreensaver-5.01-r3 554
-SHA256 59db1510485ae31668087c911603541633a0ce1d4cd5961463919416f7663e70 files/digest-xscreensaver-5.01-r3 554
+MD5 36502656b074298bd4f82303278ce293 files/digest-xscreensaver-5.02 256
+RMD160 91196636c0d193376f6ce7a21720ae4385d60e64 files/digest-xscreensaver-5.02 256
+SHA256 2fe607acbd85f0d6d4fcad4d3f7339d9635beb16204735d3592886159383e584 files/digest-xscreensaver-5.02 256
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
 }