--- xlockmore-5.25.ebuild	2009-04-05 03:37:41.000000000 -0700
+++ xlockmore-5.28.ebuild	2009-04-23 04:27:39.377716095 -0700
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.25.ebuild,v 1.5 2008/05/12 18:31:14 corsair Exp $
+# $Header: $
 
-inherit flag-o-matic pam
+EAPI="2"
+
+inherit pam autotools
 
 DESCRIPTION="Just another screensaver application for X"
 HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
@@ -10,8 +12,8 @@
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 ~sparc ~x86"
-IUSE="crypt debug nas esd motif opengl truetype gtk pam xlockrc unicode"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug esd gtk motif nas opengl pam syslog truetype unicode xlockrc"
 
 RDEPEND="opengl? ( media-libs/mesa )
 	x11-libs/libX11
@@ -19,36 +21,38 @@
 	x11-libs/libXext
 	x11-libs/libXt
 	x11-libs/libXpm
-	media-libs/freetype
+	media-libs/freetype:2
 	pam? ( virtual/pam )
 	nas? ( media-libs/nas )
 	esd? ( media-sound/esound )
 	motif? ( x11-libs/openmotif )
-	gtk? ( >=x11-libs/gtk+-2 )"
+	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	x11-proto/xineramaproto"
 
-src_compile() {
+src_prepare() {
+	# Let the package manager handle striping binaries
+	sed -i -e "s/\(INSTPGMFLAGS=\"\)-s /\1/" configure.in
+	eautoreconf
+}
+
+src_configure() {
 	econf --enable-appdefaultdir=/usr/share/X11/app-defaults \
 		--enable-vtlock --without-ftgl --without-gltt \
-		$(use_enable crypt) \
-		$(use_with opengl) \
-		$(use_with opengl mesa) \
-		$(use_enable xlockrc) \
-		$(use_enable unicode use-mb) \
 		$(use_enable pam) \
-		$(use_with truetype ttf) \
+		$(use_enable syslog) \
+		$(use_enable unicode use-mb) \
+		$(use_enable xlockrc) \
+		$(use_with crypt) \
+		$(use_with debug editres) \
+		$(use_with esd esound) \
 		$(use_with gtk gtk2) \
+		$(use_with opengl) \
+		$(use_with opengl mesa) \
 		$(use_with motif) \
-		$(use_with esd esound) \
 		$(use_with nas) \
-		$(use_with debug editres)
-
-	# suid-with-lazy-bindings problem
-	append-flags $(bindnow-flags)
-
-	emake || die "emake failed."
+		$(use_with truetype ttf)
 }
 
 src_install() {