Fix imlib linking wrt bug #311819 and bumped to v94

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 88 insertions, 5 deletions

diff --git a/x11-misc/alock/ChangeLog b/x11-misc/alock/ChangeLog
index c64cfe3b5b66..297df63c843b 100644
--- a/x11-misc/alock/ChangeLog
+++ b/x11-misc/alock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/alock
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/ChangeLog,v 1.15 2010/01/09 15:22:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/ChangeLog,v 1.16 2010/06/05 10:19:09 hwoarang Exp $
+
+*alock-94 (05 Jun 2010)
+
+  05 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  +files/implicit_pointer_conversion_fix_amd64.patch, alock-60-r3.ebuild,
+  +alock-94.ebuild:
+  Fix imlib linking wrt bug #311819 and bumped to v94
 
   09 Jan 2010; Patrick Lauer <patrick@gentoo.org> alock-60-r3.ebuild:
   Fixing deps for #227715
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index bd73fc48e83e..cc88af82e4cd 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -1,4 +1,7 @@
+AUX implicit_pointer_conversion_fix_amd64.patch 440 RMD160 4b85a4428ab920ab16fd9585923dc79df561cc75 SHA1 fbdafb1588648039850947764251a34dbe3b415e SHA256 54a5f954c8469cf20473e01f2905818fd18e6779d93e927a181cd392a0ea5ffe
 DIST alock-svn-60.tar.bz2 64818 RMD160 30448c69817efb4d7979958ca32f07e9276c1795 SHA1 508edc150517963310eb1518eeb1831552f68d54 SHA256 27e7b6b0c8dc2443c349f12288d11d2b01f20fd2e61e55ef712362176577667d
-EBUILD alock-60-r3.ebuild 1397 RMD160 949c7d7bfe444285d331dd7c3f8a4731285847b8 SHA1 590b209c55a93568963efa10ea2b1885dac1c47a SHA256 e905ec0174d8ba48e8d3824d7f753b79aec70a98b01bfaf58d87a573dcd3f748
-MISC ChangeLog 2090 RMD160 7b24338a02baf623bce410ee02708797368936ac SHA1 3c35d6230cb719878204e2714ea373e552f19754 SHA256 521b6d65c9532d239c3fc6576a24e78569cdcc4ab1d43a9e860145f22c8d848f
+DIST alock-svn-94.tar.bz2 68140 RMD160 791ae96a87a0fc2c6c5fec76090277407e68bd66 SHA1 2e07e92abfc43950505c8af35a6b5f474f1a22de SHA256 37938b56588e0e9bdfdf52097bccd000f992ea725c87cd8c8b3ea4df847e8f26
+EBUILD alock-60-r3.ebuild 1405 RMD160 9d5328809bdf1512a0421553b0edfa00bb6a78d9 SHA1 6b823b9abd9248896b8b3231519756e3a39177ee SHA256 0cef571611a7ad64fdc6dcc7c780a6d098a24cf83724463bc0296838dbe65a6d
+EBUILD alock-94.ebuild 1395 RMD160 119b1b6bcee5264a719138b6cdeceb532e01f1ec SHA1 0e265172c1035fcbb6ae6123882e109de1b76645 SHA256 bbd2a606f8b1e6de908c15e38b52b2906ae17f1fdbd4e8d36be0ba8bb5f0e70b
+MISC ChangeLog 2318 RMD160 1b5982579e0d68f6d3ec0282f136a144954b7fca SHA1 63a2317f797b0c914aec86f189cdf7ae8f8144eb SHA256 898e4a91aced9e5e38be46199bd355a00e30c9cf273d54496270830e828e38dc
 MISC metadata.xml 169 RMD160 4fad9c5ecad215e6869da62d62e4d931a268016c SHA1 c4cecb360c99d4c8bd3229e222cc41e7004a2b3f SHA256 75640c6c40b6aa0c17dfa48a775783a6148124bb005dfd764bb8afc943b071e1
diff --git a/x11-misc/alock/alock-60-r3.ebuild b/x11-misc/alock/alock-60-r3.ebuild
index f31c8f2b0423..68330c96fd85 100644
--- a/x11-misc/alock/alock-60-r3.ebuild
+++ b/x11-misc/alock/alock-60-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/alock-60-r3.ebuild,v 1.7 2010/01/09 15:22:25 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/alock-60-r3.ebuild,v 1.8 2010/06/05 10:19:09 hwoarang Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@ src_prepare() {
 src_configure() {
 	econf --with-all \
 		$(use_with pam) \
-		$(use_with imlib) \
+		$(use_with imlib imlib2) \
 	|| die "configure failed"
 }
 
diff --git a/x11-misc/alock/alock-94.ebuild b/x11-misc/alock/alock-94.ebuild
new file mode 100644
index 000000000000..f9825a969a94
--- /dev/null
+++ b/x11-misc/alock/alock-94.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/alock-94.ebuild,v 1.1 2010/06/05 10:19:10 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="locks the local X display until a password is entered"
+HOMEPAGE="http://code.google.com/p/alock/
+	http://darkshed.net/projects/alock"
+SRC_URI="http://alock.googlecode.com/files/alock-svn-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="imlib pam"
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXcursor
+	imlib? ( media-libs/imlib2[X] )
+	pam? ( virtual/pam )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/alock-svn-${PV}
+
+src_prepare() {
+	# fix pointer declaration for amd64
+	epatch "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
+}
+
+src_configure() {
+	econf --with-all \
+		$(use_with pam) \
+		$(use_with imlib imlib2) \
+	|| die "configure failed"
+}
+
+src_install() {
+	dobin src/alock || die
+	doman alock.1 || die
+	dodoc README.txt LICENSE.txt CHANGELOG.txt || die
+
+	insinto /usr/share/alock/xcursors
+	doins contrib/xcursor-* || die
+
+	insinto /usr/share/alock/bitmaps
+	doins bitmaps/* || die
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		einfo "pam support disabled"
+		einfo "In order to authenticate against /etc/passwd, "
+		einfo "/usr/bin/alock will need to be SUID"
+	fi
+}
diff --git a/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch b/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch
new file mode 100644
index 000000000000..1184ee73a612
--- /dev/null
+++ b/x11-misc/alock/files/implicit_pointer_conversion_fix_amd64.patch
@@ -0,0 +1,13 @@
+Index: alock-svn-94/src/auth_passwd.c
+===================================================================
+--- alock-svn-94.orig/src/auth_passwd.c
++++ alock-svn-94/src/auth_passwd.c
+@@ -43,7 +43,7 @@
+ \* ---------------------------------------------------------------- */
+ 
+ static struct passwd* pwd_entry = NULL;
+-
++char * crypt (const char *key, const char *salt);
+ static int alock_auth_passwd_init(const char* args) {
+ 
+     errno = 0;