[gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     f4dad4a9874528e5901543cdf68979fac0b7103b
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 15:43:50 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 15:45:08 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4dad4a9

x11-misc/xlockmore: Version bump.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 x11-misc/xlockmore/Manifest                        |   1 +
 .../xlockmore/files/xlockmore-5.55-soundpath.patch |  19 ++++
 x11-misc/xlockmore/xlockmore-5.55.ebuild           | 108 +++++++++++++++++++++
 3 files changed, 128 insertions(+)

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 03228d1e42f..143526d123d 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,3 +1,4 @@
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.54.tar.xz 1647652 BLAKE2B 2d949adab766d0509cf6af7a44fdc25db58aa38973ceb00faf82bb6694a1a4848a6e88c93297ac8eb18ee5b8e0448e1d70853edf4585fb758445052c36ed6b0a SHA512 027a750d8fb9d17619441a8f76456614e0b91b4963a80810e24d4aff46a8c3217464347b0910c00ce54c25ab6678159dec3c3ea60ee61f7624015950590d7f5d
+DIST xlockmore-5.55.tar.xz 1650116 BLAKE2B 4c50f9a0f4f4c5d02c002363e75eef22b19f52cb05db305f013bb105d47f3981b00f65ee66937c9bb7d971772cda90e2565345fff25fb8c593cdeefa0cf10ca7 SHA512 b6d322bbfbf5710c0fb94da6ee894902fe6c2c87f949c80a27f7924c26a20ede5a3bc40a085c00d4a41dae450c862edaa4d50f716bf3041668d89c7c1d8b4902
 DIST xlockmore-5.55ALPHA.tar.xz 1647904 BLAKE2B decd205ea4cccf9f3c30a59716878de082e18b1aab3a6ae10661daea72e1bde7ed66c3a35651fb40090b0391c70028298755336418685c82a966743993f1ef3e SHA512 ff3c9c1897f9ba5ab6eaf507fab595004cfecf20dd05d4264be0765b8fa78dd4b61add1362e3f509401b6f8e4d6daf13c6aeb1c375060ed14921564a0a819e5e

diff --git a/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch b/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch
new file mode 100644
index 00000000000..81163e69f4a
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch
@@ -0,0 +1,19 @@
+--- a/modes/Makefile.in
++++ b/modes/Makefile.in
+@@ -623,11 +623,11 @@
+ install-sound :
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	@NOPLAY@$(INSTALL_PROGRAM) $(ETCDIR)play.sh $(DESTDIR)$(bindir)
+-	$(top_srcdir)/mkinstalldirs $(SOUNDPATH)
+-	$(INSTALL_DATA) $(SOUNDDIR)complete.au $(SOUNDPATH)
+-	$(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(SOUNDPATH)
+-	$(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(SOUNDPATH)
+-	$(INSTALL_DATA) $(SOUNDDIR)thank-you.au $(SOUNDPATH)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDPATH)
++	$(INSTALL_DATA) $(SOUNDDIR)complete.au $(DESTDIR)$(SOUNDPATH)
++	$(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(DESTDIR)$(SOUNDPATH)
++	$(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(DESTDIR)$(SOUNDPATH)
++	$(INSTALL_DATA) $(SOUNDDIR)thank-you.au $(DESTDIR)$(SOUNDPATH)
+ 
+ uninstall : uninstall-program uninstall-man uninstall-ad uninstall-sound
+ 

diff --git a/x11-misc/xlockmore/xlockmore-5.55.ebuild b/x11-misc/xlockmore/xlockmore-5.55.ebuild
new file mode 100644
index 00000000000..8277ee4c2f0
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.55.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz"
+
+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 vtlock"
+
+REQUIRED_USE="
+	|| ( crypt pam )
+	pam? ( !xlockrc )
+	xlockrc? ( !pam )
+"
+RDEPEND="
+	gtk? ( x11-libs/gtk+:2 )
+	imagemagick? ( media-gfx/imagemagick:= )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( media-libs/nas )
+	opengl? (
+		virtual/opengl
+		virtual/glu
+		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
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.47-CXX.patch
+	"${FILESDIR}"/${PN}-5.47-strip.patch
+	"${FILESDIR}"/${PN}-5.55-soundpath.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	if use opengl && use truetype; then
+			myconf=( --with-ftgl )
+			append-flags -DFTGL213
+		else
+			myconf=( --without-ftgl )
+	fi
+
+	myconf+=(
+		$(use_enable pam)
+		$(use_enable xlockrc)
+		$(use_enable vtlock)
+		$(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-mb
+		--enable-appdefaultdir=/usr/share/X11/app-defaults
+		--enable-syslog
+		--enable-vtlock
+		--without-esound
+		--without-gtk
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+	default
+
+	pamd_mimic_system xlock auth
+
+	if use pam; then
+		fperms 755 /usr/bin/xlock
+	else
+		fperms 4755 /usr/bin/xlock
+	fi
+
+	docinto html
+	dodoc docs/xlock.html
+}