+++ /dev/null
-Use DESTDIR where necessary.
-
---- xlockmore-5.46/modes/Makefile.in
-+++ xlockmore-5.46/modes/Makefile.in
-@@ -325,7 +325,7 @@
-
- MODULEFLAGS = @MODULEFLAGS@
- @MODULES@MODULELIB = -ldl
--DEF_MODULEPATH = $(prefix)/lib/X11/xlock/modules
-+DEF_MODULEPATH = $(DESTDIR)$(prefix)/lib/X11/xlock/modules
- @MODULES@MODULEDEF = -DDEF_MODULEPATH=\"$(DEF_MODULEPATH)\"
- DEFINES = -DDEF_FILESEARCHPATH=\"$(xapploaddir)/%N%C%S:$(xapploaddir)/%N%S\" $(MODULEDEF) $(CHECKDEF)
- DEFS = @DEFS@ $(DEFINES)
-@@ -600,15 +600,15 @@
- @ $(ECHO) ""
-
- install-program : xlock
-- $(top_srcdir)/mkinstalldirs $(bindir)
-- $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(bindir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+ $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir)
- @MODULES@mkdir -p $(DEF_MODULEPATH)
- @MODULES@cp *.xlk $(DEF_MODULEPATH)
- @MODULES@cp glx/*.xlk $(DEF_MODULEPATH)
-
- install-man :
-- $(top_srcdir)/mkinstalldirs $(mandir)
-- $(INSTALL_DATA) $(UTILDIR)xlock.man $(mandir)/xlock.1
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
-+ $(INSTALL_DATA) $(UTILDIR)xlock.man $(DESTDIR)$(mandir)/xlock.1
-
- install-ad :
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
-@@ -620,10 +620,10 @@
- uninstall : uninstall-program uninstall-man uninstall-ad
-
- uninstall-program :
-- $(RM) $(bindir)/xlock$(E)
-+ $(RM) $(DESTDIR)$(bindir)/xlock$(E)
-
- uninstall-man :
-- $(RM) $(mandir)/xlock.1
-+ $(RM) $(DESTDIR)$(mandir)/xlock.1
-
- uninstall-ad :
- $(RM) $(DESTDIR)$(xapploaddir)/XLock
---- xlockmore-5.46/xglock/Makefile.in
-+++ xlockmore-5.46/xglock/Makefile.in
-@@ -117,26 +117,26 @@
- @ $(ECHO) ""
-
- install-program : xglock
-- $(top_srcdir)/mkinstalldirs $(bindir)
-- $(INSTALL_PROGRAM) xglock$(E) $(bindir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+ $(INSTALL_PROGRAM) xglock$(E) $(DESTDIR)$(bindir)
-
- install-man :
-
- install-ad :
-- $(top_srcdir)/mkinstalldirs $(datadir)/xlock
-- $(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/xlock
-+ $(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(DESTDIR)$(datadir)/xlock/xglockrc
-
- uninstall : @UNINSTALL_XGLOCK@
-
- uninstall_xglock : uninstall-program uninstall-man uninstall-ad
-
- uninstall-program :
-- $(RM) $(bindir)/xglock$(E)
-+ $(RM) $(DESTDIR)$(bindir)/xglock$(E)
-
- uninstall-man :
-
- uninstall-ad :
-- $(RM) $(datadir)/xlock/xglockrc
-+ $(RM) $(DESTDIR)$(datadir)/xlock/xglockrc
-
- install.program : install-program
-
---- xlockmore-5.46/xmlock/Makefile.in
-+++ xlockmore-5.46/xmlock/Makefile.in
-@@ -119,26 +119,26 @@
- @ $(ECHO) ""
-
- install-program : xmlock
-- $(top_srcdir)/mkinstalldirs $(bindir)
-- $(INSTALL_PROGRAM) xmlock$(E) $(bindir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+ $(INSTALL_PROGRAM) xmlock$(E) $(DESTDIR)$(bindir)
-
- install-man :
-
- install-ad :
-- $(top_srcdir)/mkinstalldirs $(xapploaddir)
-- $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(xapploaddir)/XmLock
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
-+ $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(DESTDIR)$(xapploaddir)/XmLock
-
- uninstall : @UNINSTALL_XMLOCK@
-
- uninstall_xmlock : uninstall-program uninstall-man uninstall-ad
-
- uninstall-program :
-- $(RM) $(bindir)/xmlock$(E)
-+ $(RM) $(DESTDIR)$(bindir)/xmlock$(E)
-
- uninstall-man :
-
- uninstall-ad :
-- $(RM) $(xapploaddir)/XmLock
-+ $(RM) $(DESTDIR)$(xapploaddir)/XmLock
-
- install.program : install-program
-
+++ /dev/null
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-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://www.tux.org/~bagleyd/xlock/${P}.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"
-
-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.46-destdir.patch
-)
-
-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
-
- 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-mb \
- --enable-appdefaultdir=/usr/share/X11/app-defaults \
- --enable-syslog \
- --enable-vtlock \
- --without-esound \
- --without-gtk \
- ${myconf[@]}
-}
-
-src_install() {
- default
-
- pamd_mimic_system xlock auth
-
- if use pam; then
- fperms 755 /usr/bin/xlock
- else
- fperms 4755 /usr/bin/xlock
- fi
-
- dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
- docinto html
- dodoc docs/xlock.html
-}