Bump 2.16 series to 2.16.3. Update screensaver migration help text to work with 2.16+ versions, bug 166647

Package-Manager: portage-2.1.2.7

7 files changed, 179 insertions, 17 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 20188c3bfcb0..0c07c5801b06 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.38 2007/04/17 03:41:50 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.39 2007/05/25 20:36:09 leio Exp $
+
+*gnome-screensaver-2.16.3 (25 May 2007)
+
+  25 May 2007; Mart Raudsepp <leio@gentoo.org> +files/xss-conversion-2.txt,
+  +gnome-screensaver-2.16.3.ebuild, gnome-screensaver-2.18.0.ebuild,
+  gnome-screensaver-2.18.1.ebuild:
+  Bump 2.16 series to 2.16.3. Update screensaver migration help text to work
+  with 2.16+ versions, bug 166647
 
 *gnome-screensaver-2.18.1 (17 Apr 2007)
 
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index fceb903fe97f..604c784f3402 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -1,13 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-screensaver-2.16.2-openpam.patch 729 RMD160 7c21188af7a05618667f7b0aa7098a89153c446f SHA1 21dbc7e4419cef2f59adaaddcd5fef84f2d8dd38 SHA256 771644bc11b3c3d750175fda208a44b1747789578c2b19c436c5ba65d5a8fa4c
 MD5 4120f4d802a72346a164ab012a5b5c34 files/gnome-screensaver-2.16.2-openpam.patch 729
 RMD160 7c21188af7a05618667f7b0aa7098a89153c446f files/gnome-screensaver-2.16.2-openpam.patch 729
 SHA256 771644bc11b3c3d750175fda208a44b1747789578c2b19c436c5ba65d5a8fa4c files/gnome-screensaver-2.16.2-openpam.patch 729
+AUX xss-conversion-2.txt 1026 RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 SHA1 477743e8fd025cff16c1b2ed538a57ce9550a9cf SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8
+MD5 f0e588886dab697633a9c3ab2ac7d6ce files/xss-conversion-2.txt 1026
+RMD160 5a1810d1f41999907ff39adf0e6396d1d6f5c5d7 files/xss-conversion-2.txt 1026
+SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8 files/xss-conversion-2.txt 1026
 AUX xss-conversion.txt 922 RMD160 88de6927c2db0db9c0f6ad26defe52d41a536af7 SHA1 1602c4c4c8de01c841b656c68b67350765fd27e1 SHA256 da83b6709d30d676baf4f2b10ee80f10c3b79f64361c22d1535c9dc76213ff63
 MD5 310b89420e12f58729dea40364f9b1a9 files/xss-conversion.txt 922
 RMD160 88de6927c2db0db9c0f6ad26defe52d41a536af7 files/xss-conversion.txt 922
 SHA256 da83b6709d30d676baf4f2b10ee80f10c3b79f64361c22d1535c9dc76213ff63 files/xss-conversion.txt 922
 DIST gnome-screensaver-2.14.2.tar.bz2 1917457 RMD160 58309fd1e127bb6099274753c6fcf666d2e91a6b SHA1 3a483149884d8326f8c987a4e693bed0bcef5d3f SHA256 a281edf52ff95023cb4321a01ed1c0295a758b40067949dfc82815d61c108d26
 DIST gnome-screensaver-2.16.2.tar.bz2 2035452 RMD160 fd0adf8dfaa2a7685bd935b6a213429c799e95ef SHA1 9076b5dd33fb642da3ab12ceeecbc0300d4008c5 SHA256 2149d7fed556a86825d1c9537d1a9dd7b0960baf6a571645715ecd3be0e6c17b
+DIST gnome-screensaver-2.16.3.tar.bz2 2034974 RMD160 031880cbbd401f51d0ecc0cef69932c09221567c SHA1 d39ca0a7ea271dcd05ea0142079b883d4e6ecf54 SHA256 c07bb2b7d9e32851fc119092ca604a7054ef88804f831daaf3122a02f38761c7
 DIST gnome-screensaver-2.18.0.tar.bz2 2012668 RMD160 e5cb829fa337a87a77f69dd81a74afa218bce9d5 SHA1 69fe1588123e79ce7f5ece1eaedcd5fa5ca264af SHA256 7651a7c1205d2bc207ac6c317017b469efca9274b4ad4eb6ed739ea6293ce163
 DIST gnome-screensaver-2.18.1.tar.bz2 2009807 RMD160 7a5b55ac53079af0bc96c490e056be0217dd0869 SHA1 0b50a31e10c0c0a7eefa791fb37035e5bf796d5d SHA256 bf96618debd0f6fe857f8385250b440b515ae149362094dc2156142a1cb40953
 EBUILD gnome-screensaver-2.14.2.ebuild 2783 RMD160 008f2dbddd4a43c2b5d670d972ce57fa49f5cdfc SHA1 e9219723dccbd1d4c1cd42f8bf4cb41722b9d20a SHA256 d82ead29dd13672379a00c4115a10d308a867847abc61d4a712353695a47dbf2
@@ -18,18 +26,22 @@ EBUILD gnome-screensaver-2.16.2.ebuild 2879 RMD160 d532a1d45bded2a3fabc2aa81f3ec
 MD5 25f28206aa7614a420e7d9cb892aa997 gnome-screensaver-2.16.2.ebuild 2879
 RMD160 d532a1d45bded2a3fabc2aa81f3ecb73d9910138 gnome-screensaver-2.16.2.ebuild 2879
 SHA256 11dcb579567aa494227211eaaff8320e1078e7279dae3e222f8ef3372d2fcb0a gnome-screensaver-2.16.2.ebuild 2879
-EBUILD gnome-screensaver-2.18.0.ebuild 2882 RMD160 e4552c75786aab8b49cd5f1aae91e1167f40facb SHA1 9ae5bce465b8d19753cc21facd857ca289125c2c SHA256 96b37696b22c2a1becc4b00e4d2d788d6c57c33b4dcdf9028e5a2a90857d4620
-MD5 c909db94292ab3886c570a4b740624a7 gnome-screensaver-2.18.0.ebuild 2882
-RMD160 e4552c75786aab8b49cd5f1aae91e1167f40facb gnome-screensaver-2.18.0.ebuild 2882
-SHA256 96b37696b22c2a1becc4b00e4d2d788d6c57c33b4dcdf9028e5a2a90857d4620 gnome-screensaver-2.18.0.ebuild 2882
-EBUILD gnome-screensaver-2.18.1.ebuild 2882 RMD160 9840908d0ab5d89222aaf18f4aa1e5409781fec0 SHA1 4e58d46ce0674c9cdac2c86af10137d6a22282be SHA256 ea80d197678885b1f08d42002c70b4cfaea00963b3ca3d1f537bcc3ea6b9db86
-MD5 754420b731e108d3abdd2757b50aee7c gnome-screensaver-2.18.1.ebuild 2882
-RMD160 9840908d0ab5d89222aaf18f4aa1e5409781fec0 gnome-screensaver-2.18.1.ebuild 2882
-SHA256 ea80d197678885b1f08d42002c70b4cfaea00963b3ca3d1f537bcc3ea6b9db86 gnome-screensaver-2.18.1.ebuild 2882
-MISC ChangeLog 5654 RMD160 6bf2e16a6b040b7dae51b87a9ceb8b6f5bac1d0f SHA1 79cc7f906d698c3054d91b2c6058d5c34b05e439 SHA256 baed4202d4c54f07b02e99097758266f2f6b1c29c7851185dffe6ba5151f3e9e
-MD5 bcce1f0f1d47895622d8449ae86e5700 ChangeLog 5654
-RMD160 6bf2e16a6b040b7dae51b87a9ceb8b6f5bac1d0f ChangeLog 5654
-SHA256 baed4202d4c54f07b02e99097758266f2f6b1c29c7851185dffe6ba5151f3e9e ChangeLog 5654
+EBUILD gnome-screensaver-2.16.3.ebuild 2920 RMD160 8e2f680bfd6de7b44c9aa1d1ecf49f8348845c14 SHA1 b49f77938e2367282640aa4e984db289553ee1f1 SHA256 06c9760af8d486a0bfaf3f8a6bfc29cdb19967ff668b5e145172b22db13043ae
+MD5 033d980157131cee21147286485cd8ac gnome-screensaver-2.16.3.ebuild 2920
+RMD160 8e2f680bfd6de7b44c9aa1d1ecf49f8348845c14 gnome-screensaver-2.16.3.ebuild 2920
+SHA256 06c9760af8d486a0bfaf3f8a6bfc29cdb19967ff668b5e145172b22db13043ae gnome-screensaver-2.16.3.ebuild 2920
+EBUILD gnome-screensaver-2.18.0.ebuild 2880 RMD160 73564921f2e10edfd3389bbe7d5eaa7ecf584f94 SHA1 dd0a2f865c3874c849db924e8aa705df770857ec SHA256 8156eccd4d365c97398e1393fed0e249ea48a84bf54b56696cfba6238b4aee92
+MD5 e14c7d95d5a38791dcb11a97e7007dda gnome-screensaver-2.18.0.ebuild 2880
+RMD160 73564921f2e10edfd3389bbe7d5eaa7ecf584f94 gnome-screensaver-2.18.0.ebuild 2880
+SHA256 8156eccd4d365c97398e1393fed0e249ea48a84bf54b56696cfba6238b4aee92 gnome-screensaver-2.18.0.ebuild 2880
+EBUILD gnome-screensaver-2.18.1.ebuild 2880 RMD160 3c30bb262a3bd44c38514be70bd36b88e3b37606 SHA1 0dc5de842672e5c5c6dcb7a4fcc95be56306fce5 SHA256 c3ea023a18430ccf15974aac48330480381662cb1647e64eb3dda98be4504f9f
+MD5 4d1518cbe51b0a161acc5a183726984a gnome-screensaver-2.18.1.ebuild 2880
+RMD160 3c30bb262a3bd44c38514be70bd36b88e3b37606 gnome-screensaver-2.18.1.ebuild 2880
+SHA256 c3ea023a18430ccf15974aac48330480381662cb1647e64eb3dda98be4504f9f gnome-screensaver-2.18.1.ebuild 2880
+MISC ChangeLog 5983 RMD160 98cdd590e7405b049205b5270351954e7898d8ec SHA1 90bd50f604b5f91ab4f0d09642300ff3b7f84346 SHA256 8dfca311a7b91bc45d5c8bfe84592c340488aa2cb03c2fb49fc7330a4d9ec2db
+MD5 d3f134a3a28d69a603d43f7d77e4a113 ChangeLog 5983
+RMD160 98cdd590e7405b049205b5270351954e7898d8ec ChangeLog 5983
+SHA256 8dfca311a7b91bc45d5c8bfe84592c340488aa2cb03c2fb49fc7330a4d9ec2db ChangeLog 5983
 MISC metadata.xml 472 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 SHA1 18913172dba9d94ca5952b7f8bfb2aa13808bb67 SHA256 e70be8f69acbda81bd1e90c1bd3a57a0b5ccb5fa09c7a6f04427ef888e1872bc
 MD5 77f62dae0c1bc21d5cf698695368d2d8 metadata.xml 472
 RMD160 3fe1221d0cb389cf1be040c98fa9c40dbf3c07e5 metadata.xml 472
@@ -40,9 +52,19 @@ SHA256 38e6496a445c3296e134ca8ed02fb64307fff77b75ee20c54dfe5d66410ea1fd files/di
 MD5 d6d9d3848c89f0fa52d0b19ddb40af65 files/digest-gnome-screensaver-2.16.2 280
 RMD160 e3fbec708dd075275c72001daecc867dc9969992 files/digest-gnome-screensaver-2.16.2 280
 SHA256 f481877a69608e5e36f45cdeafd1159ab497f8e490dce100b1bf4774ed59035a files/digest-gnome-screensaver-2.16.2 280
+MD5 e0f3b597969710579093d0cb8ed5e20a files/digest-gnome-screensaver-2.16.3 280
+RMD160 6d04584cbbf0163d49c39443ec937d361cdb0002 files/digest-gnome-screensaver-2.16.3 280
+SHA256 d9bd76a951258e51e1639028dbe97078f298d73dcbfdab96c944a42e20344bbc files/digest-gnome-screensaver-2.16.3 280
 MD5 d56210ea9ed6a74ea0e65542f2dda549 files/digest-gnome-screensaver-2.18.0 280
 RMD160 2fbfb28eb51e3e6aa2cd76fc72e628d61d2b0794 files/digest-gnome-screensaver-2.18.0 280
 SHA256 3dc85257082faa8199c2806fd4c453a191d0e6361828813949f0ce99cbfe2c1b files/digest-gnome-screensaver-2.18.0 280
 MD5 149fda8339a8201692d85f3dd96a88a1 files/digest-gnome-screensaver-2.18.1 280
 RMD160 69b92f588dc1a5dd031080c48906fcdbb460ea34 files/digest-gnome-screensaver-2.18.1 280
 SHA256 e2d7ac88aae5a12f33f4fbe9d521cd017a1de1bd7a74e1006ca07f459f36cdea files/digest-gnome-screensaver-2.18.1 280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGV0iWkeYb6olFHJcRArNtAJsHTGPBismdzomVXywoHWcqfutIHACfXlOx
+w+lxPOWVzYw1MSW+j4mRfYQ=
+=AKAN
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/files/digest-gnome-screensaver-2.16.3 b/gnome-extra/gnome-screensaver/files/digest-gnome-screensaver-2.16.3
new file mode 100644
index 000000000000..d3400ef7fb4a
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/digest-gnome-screensaver-2.16.3
@@ -0,0 +1,3 @@
+MD5 cbd3e3b96b24038c7838b89acae318dd gnome-screensaver-2.16.3.tar.bz2 2034974
+RMD160 031880cbbd401f51d0ecc0cef69932c09221567c gnome-screensaver-2.16.3.tar.bz2 2034974
+SHA256 c07bb2b7d9e32851fc119092ca604a7054ef88804f831daaf3122a02f38761c7 gnome-screensaver-2.16.3.tar.bz2 2034974
diff --git a/gnome-extra/gnome-screensaver/files/xss-conversion-2.txt b/gnome-extra/gnome-screensaver/files/xss-conversion-2.txt
new file mode 100644
index 000000000000..d69e50619589
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/files/xss-conversion-2.txt
@@ -0,0 +1,22 @@
+There is a conversion script which you can use to convert XScreenSaver
+screensavers to the gnome-screensaver format.  The conversion script is located
+in the documentation directory (/usr/share/doc/${PF}/).
+
+The migrate-xscreensaver-config.sh and xscreensaver-config.xsl files will be
+needed to convert the screensaver.  Make sure to enable the executable bit on
+the script (chmod +x migrate-xscreensaver-config.sh).
+
+The script takes the module to convert and creates a .desktop file corresponding
+to the module.
+
+migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml
+
+The above command should convert all xscreensaver modules.
+
+You must copy the desktop files into /usr/share/applications/gnome-screensavers (cp
+*.desktop /usr/share/applications/screensavers), and the executables from
+/usr/lib/misc/xscreensaver into /usr/libexec/gnome-screensaver
+(cp /usr/lib/misc/xscreensaver/* /usr/libexec/gnome-screensaver)
+
+Going to the gnome-screensaver-preferences dialog should now show the new
+modules in the list.
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3.ebuild
new file mode 100644
index 000000000000..303f3c04b5d7
--- /dev/null
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.16.3.ebuild,v 1.1 2007/05/25 20:36:09 leio Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Replaces xscreensaver, integrating with the desktop."
+HOMEPAGE="http://live.gnome.org/GnomeScreensaver"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc xinerama opengl pam"
+
+RDEPEND=">=gnome-base/gconf-2.6.1
+	>=x11-libs/gtk+-2.8
+	>=gnome-base/gnome-vfs-2.12
+	>=gnome-base/libgnomeui-2.12
+	>=gnome-base/libglade-2.5.0
+	>=gnome-base/gnome-menus-2.12
+	>=media-libs/libexif-0.6.12
+	>=dev-libs/glib-2.8
+	|| (
+		>=dev-libs/dbus-glib-0.71
+		~sys-apps/dbus-0.62 )
+	opengl?	( virtual/opengl )
+	xinerama? (
+		x11-libs/libXinerama
+		x11-proto/xineramaproto	)
+	pam? ( virtual/pam )
+	!pam? ( kernel_linux? ( sys-apps/shadow ) )
+
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	doc? (
+		app-text/xmlto
+		~app-text/docbook-xml-dtd-4.1.2
+		~app-text/docbook-xml-dtd-4.4 )
+
+	x11-proto/xextproto
+	x11-proto/randrproto
+	x11-proto/scrnsaverproto
+	x11-proto/xf86miscproto"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} \
+		$(use_enable doc docbook-docs) \
+		$(use_enable debug) \
+		$(use_enable pam) \
+		$(use_enable xinerama) \
+		$(use_with opengl gl) \
+		--enable-locking \
+		--with-libexif \
+		--with-dpms-ext \
+		--with-gdm-config=/usr/share/gdm/defaults.conf \
+		--with-xscreensaverdir=/usr/share/xscreensaver/config \
+		--with-xscreensaverhackdir=/usr/lib/misc/xscreensaver"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}"/${PN}-2.16.2-openpam.patch
+	intltoolize --force || die
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Install the conversion script in the documentation
+	dodoc ${S}/data/migrate-xscreensaver-config.sh
+	dodoc ${S}/data/xscreensaver-config.xsl
+
+	# Conversion information
+	sed -e "s:\${PF}:${PF}:" \
+		< ${FILESDIR}/xss-conversion-2.txt > ${S}/xss-conversion.txt
+
+	dodoc ${S}/xss-conversion.txt
+
+	# Non PAM users will need this suid to read the password hashes.
+	# OpenPAM users will probably need this too when
+	# http://bugzilla.gnome.org/show_bug.cgi?id=370847
+	# is fixed.
+	if ! use pam ; then
+		fperms +s /usr/libexec/gnome-screensaver-dialog
+	fi
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	ewarn "If you have xscreensaver installed, you probably want to disable it."
+	ewarn "To prevent a duplicate Screensaver entry in the menu, you need to"
+	ewarn "build xscreensaver with -gnome in the USE flags."
+	ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+	echo
+	elog "Information for converting screensavers is located in "
+	elog "/usr/share/doc/${PF}/xss-conversion.txt.gz"
+}
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild
index 0340c4832f3c..cf4f6b529fd8 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild,v 1.2 2007/03/28 12:34:41 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.0.ebuild,v 1.3 2007/05/25 20:36:09 leio Exp $
 
 inherit gnome2
 
@@ -75,7 +75,7 @@ src_install() {
 
 	# Conversion information
 	sed -e "s:\${PF}:${PF}:" \
-		< ${FILESDIR}/xss-conversion.txt > ${S}/xss-conversion.txt
+		< ${FILESDIR}/xss-conversion-2.txt > ${S}/xss-conversion.txt
 
 	dodoc ${S}/xss-conversion.txt
 
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.1.ebuild
index 5b6c782871b5..f7560c7cf8a2 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.1.ebuild,v 1.1 2007/04/17 03:41:50 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-2.18.1.ebuild,v 1.2 2007/05/25 20:36:09 leio Exp $
 
 inherit gnome2
 
@@ -75,7 +75,7 @@ src_install() {
 
 	# Conversion information
 	sed -e "s:\${PF}:${PF}:" \
-		< ${FILESDIR}/xss-conversion.txt > ${S}/xss-conversion.txt
+		< ${FILESDIR}/xss-conversion-2.txt > ${S}/xss-conversion.txt
 
 	dodoc ${S}/xss-conversion.txt