x11-misc/xlockmore: Added slotdep for imagemagick. Bumped to EAPI-6.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

2 files changed, 132 insertions, 11 deletions

diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch b/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch
new file mode 100644
index 000000000000..b41bf9de9d6e
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch
@@ -0,0 +1,116 @@
+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
+ 
diff --git a/x11-misc/xlockmore/xlockmore-5.46.ebuild b/x11-misc/xlockmore/xlockmore-5.46.ebuild
index 038393a175d7..7aaf85604a38 100644
--- a/x11-misc/xlockmore/xlockmore-5.46.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.46.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit autotools eutils flag-o-matic pam
 
 DESCRIPTION="Just another screensaver application for X"
@@ -21,7 +21,7 @@ REQUIRED_USE="
 "
 RDEPEND="
 	gtk? ( x11-libs/gtk+:2 )
-	imagemagick? ( media-gfx/imagemagick )
+	imagemagick? ( media-gfx/imagemagick:= )
 	motif? ( >=x11-libs/motif-2.3:0 )
 	nas? ( media-libs/nas )
 	opengl? (
@@ -44,19 +44,24 @@ DEPEND="
 	x11-proto/xineramaproto
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.46-freetype261.patch
+	"${FILESDIR}"/${PN}-5.46-destdir.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.46-freetype261.patch
+	default
 	eautoreconf
 }
 
 src_configure() {
-	local myconf=""
+	local myconf=()
 
 	if use opengl && use truetype; then
-			myconf="${myconf} --with-ftgl"
+			myconf=( --with-ftgl )
 			append-flags -DFTGL213
 		else
-			myconf="${myconf} --without-ftgl"
+			myconf=( --without-ftgl )
 	fi
 
 	econf \
@@ -79,12 +84,11 @@ src_configure() {
 		--enable-vtlock \
 		--without-esound \
 		--without-gtk \
-		${myconf}
+		${myconf[@]}
 }
 
 src_install() {
-	einstall xapploaddir="${D}/usr/share/X11/app-defaults" \
-		mandir="${D}/usr/share/man/man1" INSTPGMFLAGS=""
+	default
 
 	pamd_mimic_system xlock auth
 
@@ -94,6 +98,7 @@ src_install() {
 		fperms 4755 /usr/bin/xlock
 	fi
 
-	dohtml docs/xlock.html
 	dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
+	docinto html
+	dodoc docs/xlock.html
 }