Fix imlib linking wrt bug #311819 and bumped to v94

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 83 insertions, 3 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/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;