Version bump wrt #263317 and remove bindnow-flags wrt #255938.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

4 files changed, 93 insertions, 19 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index ac6169f37a26..38c8ba0afccf 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for x11-misc/xlockmore
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.67 2008/05/12 18:31:14 corsair Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.68 2009/04/29 20:34:55 ssuominen Exp $
+
+*xlockmore-5.28 (29 Apr 2009)
+
+  29 Apr 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xlockmore-5.23-r1.ebuild, xlockmore-5.25.ebuild, +xlockmore-5.28.ebuild:
+  Version bump wrt #263317 and remove bindnow-flags wrt #255938.
 
   12 May 2008; Markus Rothe <corsair@gentoo.org> xlockmore-5.25.ebuild:
   Stable on ppc64
 
-  14 Feb 2008; Samuli Suominen <drac@gentoo.org> xlockmore-5.25.ebuild:
+  14 Feb 2008; Samuli Suominen <ssuominen@gentoo.org> xlockmore-5.25.ebuild:
   amd64 stable
 
   13 Feb 2008; Jeroen Roovers <jer@gentoo.org> xlockmore-5.25.ebuild:
@@ -13,7 +19,7 @@
 
 *xlockmore-5.25 (12 Jan 2008)
 
-  12 Jan 2008; Samuli Suominen <drac@gentoo.org> +xlockmore-5.25.ebuild:
+  12 Jan 2008; Samuli Suominen <ssuominen@gentoo.org> +xlockmore-5.25.ebuild:
   Version bump.
 
   06 May 2007; Tobias Scherbaum <dertobi123@gentoo.org>
@@ -38,15 +44,15 @@
 
 *xlockmore-5.23-r1 (02 May 2007)
 
-  02 May 2007; Samuli Suominen <drac@gentoo.org> +xlockmore-5.23-r1.ebuild:
+  02 May 2007; Samuli Suominen <ssuominen@gentoo.org> +xlockmore-5.23-r1.ebuild:
   Fix linking with OpenGL libraries for bug 157402.
 
 *xlockmore-5.23 (22 Feb 2007)
 
-  22 Feb 2007; Samuli Suominen <drac@gentoo.org> +xlockmore-5.23.ebuild:
+  22 Feb 2007; Samuli Suominen <ssuominen@gentoo.org> +xlockmore-5.23.ebuild:
   Version bump. Change from GTK+-1.2 to GTK+-2.0. Fix bug #133881
 
-  22 Feb 2007; Samuli Suominen <drac@gentoo.org> xlockmore-5.21-r1.ebuild:
+  22 Feb 2007; Samuli Suominen <ssuominen@gentoo.org> xlockmore-5.21-r1.ebuild:
   Kill virtual/x11.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
diff --git a/x11-misc/xlockmore/xlockmore-5.23-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.23-r1.ebuild
index 28a782c75777..d92abfc67552 100644
--- a/x11-misc/xlockmore/xlockmore-5.23-r1.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.23-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 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.23-r1.ebuild,v 1.7 2007/05/06 15:04:38 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.23-r1.ebuild,v 1.8 2009/04/29 20:34:55 ssuominen Exp $
 
-inherit eutils pam flag-o-matic
+inherit eutils pam
 
 IUSE="crypt debug nas esd motif opengl truetype gtk pam xlockrc unicode"
 
@@ -47,9 +47,6 @@ src_compile() {
 		$(use_with nas) \
 		$(use_with debug editres)
 
-	# fixes suid-with-lazy-bindings problem
-	append-flags $(bindnow-flags)
-
 	emake || die "emake failed."
 }
 
diff --git a/x11-misc/xlockmore/xlockmore-5.25.ebuild b/x11-misc/xlockmore/xlockmore-5.25.ebuild
index 9128cf22ca4f..ce5f9c146617 100644
--- a/x11-misc/xlockmore/xlockmore-5.25.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.25.ebuild
@@ -1,8 +1,8 @@
-# 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: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.25.ebuild,v 1.6 2009/04/29 20:34:55 ssuominen Exp $
 
-inherit flag-o-matic pam
+inherit pam
 
 DESCRIPTION="Just another screensaver application for X"
 HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
@@ -45,9 +45,6 @@ src_compile() {
 		$(use_with nas) \
 		$(use_with debug editres)
 
-	# suid-with-lazy-bindings problem
-	append-flags $(bindnow-flags)
-
 	emake || die "emake failed."
 }
 
diff --git a/x11-misc/xlockmore/xlockmore-5.28.ebuild b/x11-misc/xlockmore/xlockmore-5.28.ebuild
new file mode 100644
index 000000000000..2c778e80fac2
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.28.ebuild
@@ -0,0 +1,74 @@
+# 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.28.ebuild,v 1.1 2009/04/29 20:34:55 ssuominen Exp $
+
+EAPI=2
+inherit flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
+SRC_URI="http://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug esd gtk motif nas opengl pam truetype unicode xlockrc"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXt
+	x11-libs/libXmu
+	opengl? ( media-libs/mesa
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) )
+	truetype? ( media-libs/freetype:2 )
+	pam? ( virtual/pam )
+	nas? ( media-libs/nas )
+	esd? ( media-sound/esound )
+	motif? ( x11-libs/openmotif )
+	gtk? ( >=x11-libs/gtk+-2:2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-proto/xineramaproto"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_configure() {
+	local myconf
+
+	if use opengl && use truetype; then
+			myconf+=" --with-ftgl"
+			append-flags -DFTGL213
+		else
+			myconf+=" --without-ftgl"
+	fi
+
+	econf --enable-vtlock \
+		--enable-syslog \
+		$(use_enable xlockrc) \
+		$(use_enable pam) \
+		$(use_enable unicode use-mb) \
+		--enable-appdefaultdir=/usr/share/X11/app-defaults \
+		$(use_with motif) \
+		$(use_with debug editres) \
+		$(use_with truetype freetype) \
+		$(use_with opengl) \
+		$(use_with opengl mesa) \
+		$(use_with esd esound) \
+		$(use_with nas) \
+		$(use_with crypt) \
+		$(use_with gtk gtk2) \
+		${myconf}
+}
+
+src_install() {
+	einstall xapploaddir="${D}/usr/share/X11/app-defaults" \
+		mandir="${D}/usr/share/man/man1" INSTPGMFLAGS="" \
+		|| die "einstall failed"
+
+	pamd_mimic_system xlock auth
+	use pam && fperms 755 /usr/bin/xlock
+
+	dohtml docs/xlock.html
+	dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
+}