Use precompiled manpage wrt #327467 (set XMLTO to true). Fix license from GPL-2 to MIT. Respect CC.

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

3 files changed, 24 insertions, 20 deletions

diff --git a/x11-misc/alock/ChangeLog b/x11-misc/alock/ChangeLog
index e377b09603f0..9032169d8586 100644
--- a/x11-misc/alock/ChangeLog
+++ b/x11-misc/alock/ChangeLog
@@ -1,6 +1,10 @@
 # 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.17 2010/06/05 10:50:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/ChangeLog,v 1.18 2010/07/08 11:45:16 ssuominen Exp $
+
+  08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> alock-94.ebuild:
+  Use precompiled manpage wrt #327467 (set XMLTO to true). Fix license from
+  GPL-2 to MIT. Respect CC.
 
   05 Jun 2010; Markos Chandras <hwoarang@gentoo.org> alock-60-r3.ebuild,
   alock-94.ebuild:
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index 09e43558f761..54bec7c9bf80 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -2,6 +2,6 @@ AUX implicit_pointer_conversion_fix_amd64.patch 440 RMD160 4b85a4428ab920ab16fd9
 DIST alock-svn-60.tar.bz2 64818 RMD160 30448c69817efb4d7979958ca32f07e9276c1795 SHA1 508edc150517963310eb1518eeb1831552f68d54 SHA256 27e7b6b0c8dc2443c349f12288d11d2b01f20fd2e61e55ef712362176577667d
 DIST alock-svn-94.tar.bz2 68140 RMD160 791ae96a87a0fc2c6c5fec76090277407e68bd66 SHA1 2e07e92abfc43950505c8af35a6b5f474f1a22de SHA256 37938b56588e0e9bdfdf52097bccd000f992ea725c87cd8c8b3ea4df847e8f26
 EBUILD alock-60-r3.ebuild 1393 RMD160 03a49557f62ef5f973e49911a8e28952ce863041 SHA1 c603c4477ca0320b227ced5dffc49e5b53d02b08 SHA256 b25b6c6e98905e7d45d0fb2a4dd2278f6382de371bd726b42bdbe41cf1a9ad79
-EBUILD alock-94.ebuild 1383 RMD160 6cdb01bf0a5ba2a55a8cfc811516dc8a78eec636 SHA1 10543ce96103e30424f1c1a468f0cf3a063da1f7 SHA256 94592429bd108e3bbe975e0be4a0697e7579ebeceff9f2047caf7fa4aecdc68d
-MISC ChangeLog 2444 RMD160 3a077b3c30a44865ca254a905e45e3fd371f9eb7 SHA1 4310681f737074efeaa546578f8a086f9e50c451 SHA256 9855aa3f94d46bdb273cf6fdf90bef22c4668953d976e2f7c293709cfd0c79c7
+EBUILD alock-94.ebuild 1282 RMD160 5ba55ce386dd57e5a186b5f5485a2872d1a99a5b SHA1 ba7a529a624c2d63fee260879ec5a5ebc7857201 SHA256 7fb0cb97a56bd876c1c02ce4b3048b45da7c94c96f1f5372fa37c67410238a6f
+MISC ChangeLog 2621 RMD160 ef04400d2e37a7f3c819b2b4543ee68e21ed00a6 SHA1 12c55fb4c8d46c31d08f188d6d781aae4a86d0a4 SHA256 c6c9c6b4c151942c135e41fb1d3af2446a877b881f440657567caa08817c9fc4
 MISC metadata.xml 169 RMD160 4fad9c5ecad215e6869da62d62e4d931a268016c SHA1 c4cecb360c99d4c8bd3229e222cc41e7004a2b3f SHA256 75640c6c40b6aa0c17dfa48a775783a6148124bb005dfd764bb8afc943b071e1
diff --git a/x11-misc/alock/alock-94.ebuild b/x11-misc/alock/alock-94.ebuild
index 825b31d115d8..d91dfe8eb209 100644
--- a/x11-misc/alock/alock-94.ebuild
+++ b/x11-misc/alock/alock-94.ebuild
@@ -1,17 +1,16 @@
 # 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.2 2010/06/05 10:50:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/alock-94.ebuild,v 1.3 2010/07/08 11:45:16 ssuominen Exp $
 
-EAPI="2"
-
-inherit eutils
+EAPI=2
+inherit eutils toolchain-funcs
 
 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"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="imlib pam"
@@ -23,38 +22,39 @@ DEPEND="x11-libs/libX11
 	x11-libs/libXcursor
 	imlib? ( media-libs/imlib2[X] )
 	pam? ( virtual/pam )"
-RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/alock-svn-${PV}
+S=${WORKDIR}/${PN}-svn-${PV}
 
 src_prepare() {
-	# fix pointer declaration for amd64
 	epatch "${FILESDIR}"/implicit_pointer_conversion_fix_amd64.patch
 }
 
 src_configure() {
-	econf --with-all \
+	tc-export CC
+
+	./configure \
+		--prefix=/usr \
+		--with-all \
 		$(use_with pam) \
-		$(use_with imlib imlib2) \
-	|| die "configure failed"
+		$(use_with imlib imlib2) || die
+}
+
+src_compile() {
+	emake XMLTO=true || die
 }
 
 src_install() {
 	dobin src/alock || die
 	doman alock.1 || die
-	dodoc README.txt CHANGELOG.txt || die
+	dodoc {CHANGELOG,README,TODO}.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"
+		fperms 4755 /usr/bin/alock
 	fi
 }