From: Markus Nigbur <pyrania@gentoo.org>
Date: Sun, 5 Dec 2004 15:41:00 +0000 (+0000)
Subject: Fixed bug #48457.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=923f4fcc40f6f9e5476c19d5827efb9c5b1a1082;p=gentoo.git

Fixed bug #48457.
---

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index a306e2a5a0ed..9b8f941af652 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xlockmore
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.16 2004/10/19 09:06:21 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.17 2004/12/05 15:41:00 pyrania Exp $
+
+  05 Dec 2004; Markus Nigbur <pyrania@gentoo.org> +files/XLock.ad.patch,
+  xlockmore-5.12.ebuild:
+  Fixed bug #48457.
 
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> xlockmore-5.12.ebuild:
   Stable on amd64.
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 4dee59287e06..60d09f933277 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,10 +1,21 @@
-MD5 52b12d64626da825347d248b86b24880 ChangeLog 5084
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 32481c2a84bacdfa71084d50b8e7f7ed ChangeLog 5202
+MD5 03fbd622aa71ec61772fee5f902cabd1 xlockmore-5.11.1.ebuild 1879
+MD5 5808700f91cbb541c684b2e024936be0 xlockmore-5.12.ebuild 1937
+MD5 250748679bc8da624f2dafff102d7019 xlockmore-5.08.2.ebuild 1875
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 MD5 1beae149d4ad5cccebea7904c02ad479 xlockmore-5.04.ebuild 1820
-MD5 250748679bc8da624f2dafff102d7019 xlockmore-5.08.2.ebuild 1875
-MD5 03fbd622aa71ec61772fee5f902cabd1 xlockmore-5.11.1.ebuild 1879
-MD5 f917d393c9b4b7cfe5f9f3ed30e7c678 xlockmore-5.12.ebuild 1877
 MD5 589c4732f3e791a2cad0f52c7ec09908 files/digest-xlockmore-5.04 68
+MD5 65f2645fbf61038ec856ee0a3897c587 files/XLock.ad.patch 773
 MD5 7c6285fb6c9ff44a2590f166ecd553ef files/digest-xlockmore-5.08.2 70
-MD5 ed71265bdbcff414270728e5eef3196d files/digest-xlockmore-5.11.1 70
 MD5 be40cedb5d46e442958e0a182a87380c files/digest-xlockmore-5.12 68
+MD5 ed71265bdbcff414270728e5eef3196d files/digest-xlockmore-5.11.1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBsyxJI7fK2cqeyXkRArtNAJsGgtr+8ShuMs2JehAPe5GFYnhfXgCgwWEh
+c59ZR3wuDZ52grfuYyJH5jY=
+=ou/7
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xlockmore/files/XLock.ad.patch b/x11-misc/xlockmore/files/XLock.ad.patch
new file mode 100644
index 000000000000..b16bfa2b5471
--- /dev/null
+++ b/x11-misc/xlockmore/files/XLock.ad.patch
@@ -0,0 +1,17 @@
+--- xlock/XLock.ad	2004-04-12 10:33:03.000000000 -0400
++++ xlock/XLock.ad.new	2004-05-26 13:33:39.553577432 -0400
+@@ -43,10 +43,10 @@
+ !XLock.icongeometry: 256x256
+ 
+ ! For sound
+-XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au
+-XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au
+-XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au
+-XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au
++XLock.locksound: /usr/share/xlockmore/sounds/thank-you.au
++XLock.infosound: /usr/share/xlockmore/sounds/identify-please.au
++XLock.validsound: /usr/share/xlockmore/sounds/complete.au
++XLock.invalidsound: /usr/share/xlockmore/sounds/not-programmed.au
+ !XLock.locksound: complete.au
+ !XLock.infosound: identify-please.au
+ !XLock.validsound: thank-you.au
diff --git a/x11-misc/xlockmore/xlockmore-5.12.ebuild b/x11-misc/xlockmore/xlockmore-5.12.ebuild
index 951946997ddf..9c2c6e014be9 100644
--- a/x11-misc/xlockmore/xlockmore-5.12.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.12.ebuild,v 1.9 2004/10/19 09:06:21 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.12.ebuild,v 1.10 2004/12/05 15:41:00 pyrania Exp $
 
 inherit gnuconfig
 
@@ -25,7 +25,7 @@ DEPEND="virtual/x11
 
 src_compile() {
 	gnuconfig_update
-
+	
 	local myconf
 	myconf="--enable-vtlock"
 	use pam && myconf="${myconf} --enable-pam" \
@@ -38,6 +38,8 @@ src_compile() {
 	use motif || myconf="${myconf} --without-motif"
 	use gtk || myconf="${myconf} --without-gtk"
 
+	epatch ${FILESDIR}/XLock.ad.patch || die "epatch failed"
+
 	./configure \
 		--prefix=/usr \
 		--mandir=${prefix}/share/man/man1 \