Version bump.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 111 insertions, 15 deletions

diff --git a/x11-misc/xlockmore/ChangeLog b/x11-misc/xlockmore/ChangeLog
index 5712d00a715b..5eb5631451c7 100644
--- a/x11-misc/xlockmore/ChangeLog
+++ b/x11-misc/xlockmore/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xlockmore
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.118 2012/10/24 19:48:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/ChangeLog,v 1.119 2012/10/30 20:05:43 jer Exp $
+
+*xlockmore-5.41 (30 Oct 2012)
+
+  30 Oct 2012; Jeroen Roovers <jer@gentoo.org> +xlockmore-5.41.ebuild:
+  Version bump.
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> xlockmore-5.38.ebuild,
   xlockmore-5.39.ebuild, xlockmore-5.40.ebuild:
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index ffdc5c0eec79..7d65a3ab6e3e 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -6,25 +6,17 @@ AUX xlockmore-5.31-ldflags.patch 6398 SHA256 22b18ad9120875ac7c3af4b81d0f863488b
 DIST xlockmore-5.38.tar.bz2 1970750 SHA256 c45920682535ed001b6c7f0a7f11156d43a1d3d73755e17a40c8caf607a1a597 SHA512 d63f41f35b6c5717b5641c6e1cfe8071689078d93f1574e24ad8c464bb3b4f13fcaad426a0175f895a00dbfa9e89190f9f4166d9d0e3a88bc4201d6412f5a5f0 WHIRLPOOL d43e7f1f2fbdf3127e3caabcba13fc98edbe50b3de1c2e51c09b8b2d42bf08efb0f1610da9eaee1878684b4183406732de59aa9999112dc708361cf33d8411a9
 DIST xlockmore-5.39.tar.bz2 1991460 SHA256 7caca406a17407ec1633bd2ccfe688903bb1d5a45ea3c3c9fa262fbfe6b0b6f9 SHA512 18459a16b5a291504bac716815ca3d21813c65b92bc569baed7ed1c7ff3c847bc945a76ca895765ac2886cf3a98abdaaa91eba2f4eb1e44061c79ed0eb8c0364 WHIRLPOOL f40964b25e9048c678c2fdf1af247b0341e4c996ba21a18798a2d7f7bcb0c07acd8921d01fac3ae53f7ea5f8fe407e2a71538bb014ad9da6b9eb55682131e355
 DIST xlockmore-5.40.tar.bz2 1962001 SHA256 38ff3e32983b3f9df957431f7f8ed50e823d10246aeb0319e83876793ce5c1b3 SHA512 ac3d6240f5d40031874ef2c6d8ac23bcce01cd29c660e412b280a52a3c46288d9fb869016d87dc2817505737f4e9cef06df6dadb4a14b9615f2a50b90122be0b WHIRLPOOL b7942552576e3cbf08a6bc589de51459e40ef85356ab8489cae43ff403d032abbc586311fdff8a1999c470ff7951e86b8605d7ebc436082ff84c601cc960fb2a
+DIST xlockmore-5.41.tar.bz2 1962608 SHA256 a1feb0120f5caf806656db06180e1a937db5ef84467b2227db11039bb5dba323 SHA512 c57001dfe5b469a15243c96875480688cfe38e0f3c740dcb28da01b51566e43d72834779ca23b80d0d0156129ecb46ac1e5c4f6d310f7b303137125a94cd8488 WHIRLPOOL b307ea7ed97eb5fdf775fec1c693bb1164fdcba515e36e9c8d1ff1b4ecda72adac92844720314c1bbc44a985567064effcbcc2e1512dca632aa192a2c62b1617
 EBUILD xlockmore-5.38.ebuild 2321 SHA256 e747b553cc3627c92e1fdd2598570ef87cf0afaca46eb3d65734a7a561d6fc3d SHA512 9198ee5bc43541a33289506831903f0dc49081f82a5209f911492379ab7e04b2b3ca6b7d0e3077730a7af0c88f38cf0ddff1a1b722b5ba425a711ddfbda51051 WHIRLPOOL be5a1e0b9af0f63a0fd0c9489b401a56687624b5f238d69c56e2cc2b527f98e5744bc2d15818ea84113a0a7e9d674b1dba015f17c4cca498599fb8487a072789
 EBUILD xlockmore-5.39.ebuild 2328 SHA256 39f7e81dc9b5d2647ac966861e3e76aa5f659adef4e8f051a0aa6b1e4d5c0f1d SHA512 b8564ff3c7aff8af12e504c0af9019bd3a9c895841698d03066befb0a482b7c78a55dde452e8c8fd9312b3189a479b3b6457c48731d54e070ba173f3b371a0aa WHIRLPOOL 80bdd50d7e0b3910a92af56a888f38ebcaa4f7a2e67335370e46751d162702e1800e948d8469cc97e18af8f05cde8c8967e65f8fb5f7d1dcf3c868428f37bf82
 EBUILD xlockmore-5.40.ebuild 2328 SHA256 c20090903a08c651b890d3d40cd71bee79e9d3d8b5c45291251399ebea731daf SHA512 b6ca3cf6dcb234a86124a546676984e226a960fe060936117e86bccd883ce6b488ae7c351cb51816449fc88d8f5d13437fa0b3e688a8f294890c407358262800 WHIRLPOOL c95bd86407e4e82db3bd70e4c62ffac1bee686f2a914d2e678b03ae346b795a0776ffeeafd4758cfed4d2d2ae2dbe54e8bafbd01d7b9e8b60478875eaeaab688
-MISC ChangeLog 17185 SHA256 77b50980f865cd338e83044cad22c44506e72eb5f7cad43393eda1bc81a03615 SHA512 f69822d7966571f0de4b939c71866b80e86812ab8cf2816b7fdbf4a6922a5ee1fe8f35234b226708db2a7bc682910e277c3b374e1160adf6496c2017caf571fc WHIRLPOOL 05f3421478f3857db2225e87b2968d3bf0c30d4031b0794b20c609c5f5ef51a4c8e8b5fa099b80d79f7eb3ea246c9ccc738666e6e79327dc0d1a1460bb6241ab
+EBUILD xlockmore-5.41.ebuild 2328 SHA256 5f08c6f0ae8061b8f41199383e027ae1b61b96185ceb3d8cf49532f19355c7a9 SHA512 56637c2aafe47226087c5939628fad1a294072cbe306cc6a19ae8872995158439d3da3369758fc60c3d12359d9a7163ac98bbb483c1bfbe9d8132716f55374b3 WHIRLPOOL 6affcacd47b115dce2eaa15c3b84d8a250036f6c25aafbf8b91ea8cc40db06a09aa6342b7ca1f62cf468b4f80c88bb3ae92e2a4a69f3b340eb6b28634efd0a89
+MISC ChangeLog 17304 SHA256 a42a122669b405a1d08e63dd7b016a97bf17d45820036ad4fbf47dfffc25ea81 SHA512 05a36c81fb2e9838f4acdb9ae213b44411fa8aacf19270f847f7fdb959eb0632bdf2ea9f35d4b8557b1f9d217e03dd7ccf910eeee0ae3e001771a183d210d223 WHIRLPOOL 7b56fe9425f610167c1b2ee978a0fb504cf40c5b7fa3b5dbed49a41d658357c9fab1b36380bd28c14f54ba3e9c39cf2176f01ccad5744b94aee9f050b6e82cd7
 MISC metadata.xml 255 SHA256 23193825c01ae6c6d66fd3604398bc108f0d263706c1842600f1ce6718128a4b SHA512 fecfe57a1c21d6d8eafa36f5236708e6031a5ed0f6f08d6306f7414705e3acd1f1cf897d63b895c071192aa3eb8ccfaefa01c0912a467d7034a723d37020b5a6 WHIRLPOOL 70526e97de5d2ed0cff4000ee58fb971f0d92a7113b2cf3b9291f292f9d3b6f4b3f1f56ef294a8f4e656515bd1a17341b6b0ed3cb9974d5f34978800693d6f4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiEYPAAoJEDxpGckxwJCBpnAP/0ODG0Uad9hW3hgeH/6xla0G
-3CdIQWdGS1DkMjpsUEAq3ZzB62sDtE/RMydR0ZaE/F0L1rApj9gBE5weTplMfMyZ
-QdE3qElrT6a0GYd6Fdz3tVusRibtOHw34tUle3m+dMP7kRqab+C12KOG3FQxuIl0
-GIErGhu1j5mEBUgUmUafIOvOMY25G2M2tF3cRCdaEC2t0mYocOTTZ7Llfye/RlKz
-J19w/n3a6mkSjjXpEMpQKFhqmNEpQB6r2UR30+fsq70d3yHVvU5DMQiocaTlkLjo
-cHtZKAOQbPhNIj3sxZJn2ifyX1psgLOcjtb3L8+gv0WlNyomovBOWSjIuUkDvQcC
-opL8D8JMjc02WosGu5gYeZlSUkq1ZF134PeyoPSh0NQR14KpEv3BrKOum0aNcyCQ
-jd5fNSms5qZOr3BdCP68/IfnEZvt2/+eVkmgS3qG8iZW9NebpLHiWWdTmxlXrNFx
-r6w3AMFs4RI+v7XlVZN2sDEi2FR42+YrAxjwhDpJE7PJTb2lpE5lG4wkkrDRw/0j
-HVYtkWOaqGuGBTXd1FRmNsiP1RVHvrii/8ShZI8RyN4P85yaq/p13xWrstAi/cvR
-QzJcAOzLKDWU4d1BXbH6luYRdrxWKREn0x+avlPZomdJIPM82c96w8QaUUftpDAU
-zA6ebdRaOxin4M4FL5Cp
-=MD0a
+iEUEAREIAAYFAlCQMxkACgkQVWmRsqeSphPIfQCYxtWoIHx1QUe9xto0IynpcCEG
+7gCcCtMW4jnl+TCPD4fcDrmRkyIWI+4=
+=r45V
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xlockmore/xlockmore-5.41.ebuild b/x11-misc/xlockmore/xlockmore-5.41.ebuild
new file mode 100644
index 000000000000..8f4859f29365
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.41.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xlockmore/xlockmore-5.41.ebuild,v 1.1 2012/10/30 20:05:43 jer Exp $
+
+EAPI=4
+inherit autotools eutils 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="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		media-libs/mesa
+		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
+	)
+	pam? ( virtual/pam )
+	truetype? ( media-libs/freetype:2 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-5.31-configure.in.patch \
+		"${FILESDIR}"/${PN}-5.31-ldflags.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use opengl && use truetype; then
+			myconf="${myconf} --with-ftgl"
+			append-flags -DFTGL213
+		else
+			myconf="${myconf} --without-ftgl"
+	fi
+
+	econf \
+		$(use_enable pam) \
+		$(use_enable xlockrc) \
+		$(use_with crypt) \
+		$(use_with debug editres) \
+		$(use_with gtk gtk2) \
+		$(use_with imagemagick magick) \
+		$(use_with motif) \
+		$(use_with nas) \
+		$(use_with opengl mesa) \
+		$(use_with opengl) \
+		$(use_with truetype freetype) \
+		$(use_with truetype ttf) \
+		$(use_with xinerama) \
+		--disable-use-mb \
+		--enable-appdefaultdir=/usr/share/X11/app-defaults \
+		--enable-syslog \
+		--enable-vtlock \
+		--without-esound \
+		--without-gtk \
+		${myconf}
+}
+
+src_install() {
+	einstall xapploaddir="${D}/usr/share/X11/app-defaults" \
+		mandir="${D}/usr/share/man/man1" INSTPGMFLAGS=""
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	dohtml docs/xlock.html
+	dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
+}