[patch] Ebuild patch

xlockmore-5.12.patch (text/plain), 2.44 KB, created by Diego Elio Pettenò (RETIRED) on 2005-05-19 01:59:29 UTC

--- /home/flame/devel/gentoo-x86/x11-misc/xlockmore/xlockmore-5.12.ebuild	2005-05-19 02:27:47.372350984 +0200
+++ xlockmore-5.12.ebuild	2005-05-19 10:44:59.265213928 +0200
@@ -2,7 +2,7 @@
 # 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.13 2005/04/29 09:51:43 corsair Exp $
 
-inherit gnuconfig eutils
+inherit gnuconfig eutils pam
 
 IUSE="nas esd motif opengl truetype gtk pam"
 
@@ -17,34 +17,39 @@
 DEPEND="virtual/x11
 	media-libs/freetype
 	opengl? ( virtual/opengl )
-	pam? ( sys-libs/pam )
+	pam? ( virtual/pam )
 	nas? ( media-libs/nas )
 	esd? ( media-sound/esound )
 	motif? ( x11-libs/openmotif )
 	gtk? ( =x11-libs/gtk+-1.2* )"
 
-src_compile() {
-	gnuconfig_update
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-	local myconf
-	myconf="--enable-vtlock"
-	use pam && myconf="${myconf} --enable-pam" \
-		|| myconf="${myconf} --disable-pam --enable-xlockrc"
-	use nas || myconf="${myconf} --without-nas"
-	use esd && myconf="${myconf} --with-esound"
-	use opengl || myconf="${myconf} --without-opengl --without-gltt --without-mesa"
-	use truetype || myconf="${myconf} --without-ttf"
+	epatch ${FILESDIR}/XLock.ad.patch
+
+	gnuconfig_update
+}
 
-	use motif || myconf="${myconf} --without-motif"
-	use gtk || myconf="${myconf} --without-gtk"
+src_compile() {
 
-	epatch ${FILESDIR}/XLock.ad.patch || die "epatch failed"
+	local myconf
+	use pam || myconf="${myconf} --enable-xlockrc"
 
-	./configure \
-		--prefix=/usr \
-		--mandir=${prefix}/share/man/man1 \
+	use opengl || myconf="${myconf} --without-opengl --without-gltt --without-mesa"
+	
+	econf \
 		--sharedstatedir=/usr/share/xlockmore \
-		--host=${CHOST} ${myconf} || die "Configure failed"
+		--enable-vtlock \
+		$(use_enable pam) \
+		$(use_with truetype ttf) \
+		$(use_with gtk) \
+		$(use_with motif) \
+		$(use_with esd esound) \
+		$(use_with nas) \
+		${myconf} \
+		|| die "econf failed"
 
 	emake || die "Make failed"
 
@@ -54,15 +59,12 @@
 	make install \
 		prefix=${D}/usr \
 		mandir=${D}/usr/share/man/man1 \
-		xapploaddir=${D}/usr/X11R6/lib/X11/app-defaults \
+		xapploaddir=${D}/etc/X11/app-defaults \
 		|| die "Install failed"
 
 	#Install pam.d file and unset setuid root
-	if use pam; then
-		insinto /etc/pam.d
-		newins etc/xlock.pamd xlock
-		chmod 111 ${D}/usr/bin/xlock
-	fi
+	pamd_mimic_system xlock auth
+	use pam && chmod 755 ${D}/usr/bin/xlock
 
 	insinto /usr/share/xlockmore/sounds
 	doins sounds/*