| 1 |
commit: 8e2682249c9f4a2844476b3b0cf7584a4c6a3f6a |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 2 10:10:11 2016 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 2 10:25:12 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e268224 |
| 7 |
|
| 8 |
x11-misc/xlockmore: Added slotdep for imagemagick. Bumped to EAPI-6. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
.../xlockmore/files/xlockmore-5.46-destdir.patch | 116 +++++++++++++++++++++ |
| 14 |
x11-misc/xlockmore/xlockmore-5.46.ebuild | 27 +++-- |
| 15 |
2 files changed, 132 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch b/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..b41bf9d |
| 20 |
--- /dev/null |
| 21 |
+++ b/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch |
| 22 |
@@ -0,0 +1,116 @@ |
| 23 |
+Use DESTDIR where necessary. |
| 24 |
+ |
| 25 |
+--- xlockmore-5.46/modes/Makefile.in |
| 26 |
++++ xlockmore-5.46/modes/Makefile.in |
| 27 |
+@@ -325,7 +325,7 @@ |
| 28 |
+ |
| 29 |
+ MODULEFLAGS = @MODULEFLAGS@ |
| 30 |
+ @MODULES@MODULELIB = -ldl |
| 31 |
+-DEF_MODULEPATH = $(prefix)/lib/X11/xlock/modules |
| 32 |
++DEF_MODULEPATH = $(DESTDIR)$(prefix)/lib/X11/xlock/modules |
| 33 |
+ @MODULES@MODULEDEF = -DDEF_MODULEPATH=\"$(DEF_MODULEPATH)\" |
| 34 |
+ DEFINES = -DDEF_FILESEARCHPATH=\"$(xapploaddir)/%N%C%S:$(xapploaddir)/%N%S\" $(MODULEDEF) $(CHECKDEF) |
| 35 |
+ DEFS = @DEFS@ $(DEFINES) |
| 36 |
+@@ -600,15 +600,15 @@ |
| 37 |
+ @ $(ECHO) "" |
| 38 |
+ |
| 39 |
+ install-program : xlock |
| 40 |
+- $(top_srcdir)/mkinstalldirs $(bindir) |
| 41 |
+- $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(bindir) |
| 42 |
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) |
| 43 |
++ $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir) |
| 44 |
+ @MODULES@mkdir -p $(DEF_MODULEPATH) |
| 45 |
+ @MODULES@cp *.xlk $(DEF_MODULEPATH) |
| 46 |
+ @MODULES@cp glx/*.xlk $(DEF_MODULEPATH) |
| 47 |
+ |
| 48 |
+ install-man : |
| 49 |
+- $(top_srcdir)/mkinstalldirs $(mandir) |
| 50 |
+- $(INSTALL_DATA) $(UTILDIR)xlock.man $(mandir)/xlock.1 |
| 51 |
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir) |
| 52 |
++ $(INSTALL_DATA) $(UTILDIR)xlock.man $(DESTDIR)$(mandir)/xlock.1 |
| 53 |
+ |
| 54 |
+ install-ad : |
| 55 |
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir) |
| 56 |
+@@ -620,10 +620,10 @@ |
| 57 |
+ uninstall : uninstall-program uninstall-man uninstall-ad |
| 58 |
+ |
| 59 |
+ uninstall-program : |
| 60 |
+- $(RM) $(bindir)/xlock$(E) |
| 61 |
++ $(RM) $(DESTDIR)$(bindir)/xlock$(E) |
| 62 |
+ |
| 63 |
+ uninstall-man : |
| 64 |
+- $(RM) $(mandir)/xlock.1 |
| 65 |
++ $(RM) $(DESTDIR)$(mandir)/xlock.1 |
| 66 |
+ |
| 67 |
+ uninstall-ad : |
| 68 |
+ $(RM) $(DESTDIR)$(xapploaddir)/XLock |
| 69 |
+--- xlockmore-5.46/xglock/Makefile.in |
| 70 |
++++ xlockmore-5.46/xglock/Makefile.in |
| 71 |
+@@ -117,26 +117,26 @@ |
| 72 |
+ @ $(ECHO) "" |
| 73 |
+ |
| 74 |
+ install-program : xglock |
| 75 |
+- $(top_srcdir)/mkinstalldirs $(bindir) |
| 76 |
+- $(INSTALL_PROGRAM) xglock$(E) $(bindir) |
| 77 |
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) |
| 78 |
++ $(INSTALL_PROGRAM) xglock$(E) $(DESTDIR)$(bindir) |
| 79 |
+ |
| 80 |
+ install-man : |
| 81 |
+ |
| 82 |
+ install-ad : |
| 83 |
+- $(top_srcdir)/mkinstalldirs $(datadir)/xlock |
| 84 |
+- $(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc |
| 85 |
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/xlock |
| 86 |
++ $(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(DESTDIR)$(datadir)/xlock/xglockrc |
| 87 |
+ |
| 88 |
+ uninstall : @UNINSTALL_XGLOCK@ |
| 89 |
+ |
| 90 |
+ uninstall_xglock : uninstall-program uninstall-man uninstall-ad |
| 91 |
+ |
| 92 |
+ uninstall-program : |
| 93 |
+- $(RM) $(bindir)/xglock$(E) |
| 94 |
++ $(RM) $(DESTDIR)$(bindir)/xglock$(E) |
| 95 |
+ |
| 96 |
+ uninstall-man : |
| 97 |
+ |
| 98 |
+ uninstall-ad : |
| 99 |
+- $(RM) $(datadir)/xlock/xglockrc |
| 100 |
++ $(RM) $(DESTDIR)$(datadir)/xlock/xglockrc |
| 101 |
+ |
| 102 |
+ install.program : install-program |
| 103 |
+ |
| 104 |
+--- xlockmore-5.46/xmlock/Makefile.in |
| 105 |
++++ xlockmore-5.46/xmlock/Makefile.in |
| 106 |
+@@ -119,26 +119,26 @@ |
| 107 |
+ @ $(ECHO) "" |
| 108 |
+ |
| 109 |
+ install-program : xmlock |
| 110 |
+- $(top_srcdir)/mkinstalldirs $(bindir) |
| 111 |
+- $(INSTALL_PROGRAM) xmlock$(E) $(bindir) |
| 112 |
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) |
| 113 |
++ $(INSTALL_PROGRAM) xmlock$(E) $(DESTDIR)$(bindir) |
| 114 |
+ |
| 115 |
+ install-man : |
| 116 |
+ |
| 117 |
+ install-ad : |
| 118 |
+- $(top_srcdir)/mkinstalldirs $(xapploaddir) |
| 119 |
+- $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(xapploaddir)/XmLock |
| 120 |
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir) |
| 121 |
++ $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(DESTDIR)$(xapploaddir)/XmLock |
| 122 |
+ |
| 123 |
+ uninstall : @UNINSTALL_XMLOCK@ |
| 124 |
+ |
| 125 |
+ uninstall_xmlock : uninstall-program uninstall-man uninstall-ad |
| 126 |
+ |
| 127 |
+ uninstall-program : |
| 128 |
+- $(RM) $(bindir)/xmlock$(E) |
| 129 |
++ $(RM) $(DESTDIR)$(bindir)/xmlock$(E) |
| 130 |
+ |
| 131 |
+ uninstall-man : |
| 132 |
+ |
| 133 |
+ uninstall-ad : |
| 134 |
+- $(RM) $(xapploaddir)/XmLock |
| 135 |
++ $(RM) $(DESTDIR)$(xapploaddir)/XmLock |
| 136 |
+ |
| 137 |
+ install.program : install-program |
| 138 |
+ |
| 139 |
|
| 140 |
diff --git a/x11-misc/xlockmore/xlockmore-5.46.ebuild b/x11-misc/xlockmore/xlockmore-5.46.ebuild |
| 141 |
index 038393a..7aaf856 100644 |
| 142 |
--- a/x11-misc/xlockmore/xlockmore-5.46.ebuild |
| 143 |
+++ b/x11-misc/xlockmore/xlockmore-5.46.ebuild |
| 144 |
@@ -1,8 +1,8 @@ |
| 145 |
-# Copyright 1999-2015 Gentoo Foundation |
| 146 |
+# Copyright 1999-2016 Gentoo Foundation |
| 147 |
# Distributed under the terms of the GNU General Public License v2 |
| 148 |
# $Id$ |
| 149 |
|
| 150 |
-EAPI=5 |
| 151 |
+EAPI=6 |
| 152 |
inherit autotools eutils flag-o-matic pam |
| 153 |
|
| 154 |
DESCRIPTION="Just another screensaver application for X" |
| 155 |
@@ -21,7 +21,7 @@ REQUIRED_USE=" |
| 156 |
" |
| 157 |
RDEPEND=" |
| 158 |
gtk? ( x11-libs/gtk+:2 ) |
| 159 |
- imagemagick? ( media-gfx/imagemagick ) |
| 160 |
+ imagemagick? ( media-gfx/imagemagick:= ) |
| 161 |
motif? ( >=x11-libs/motif-2.3:0 ) |
| 162 |
nas? ( media-libs/nas ) |
| 163 |
opengl? ( |
| 164 |
@@ -44,19 +44,24 @@ DEPEND=" |
| 165 |
x11-proto/xineramaproto |
| 166 |
" |
| 167 |
|
| 168 |
+PATCHES=( |
| 169 |
+ "${FILESDIR}"/${PN}-5.46-freetype261.patch |
| 170 |
+ "${FILESDIR}"/${PN}-5.46-destdir.patch |
| 171 |
+) |
| 172 |
+ |
| 173 |
src_prepare() { |
| 174 |
- epatch "${FILESDIR}"/${PN}-5.46-freetype261.patch |
| 175 |
+ default |
| 176 |
eautoreconf |
| 177 |
} |
| 178 |
|
| 179 |
src_configure() { |
| 180 |
- local myconf="" |
| 181 |
+ local myconf=() |
| 182 |
|
| 183 |
if use opengl && use truetype; then |
| 184 |
- myconf="${myconf} --with-ftgl" |
| 185 |
+ myconf=( --with-ftgl ) |
| 186 |
append-flags -DFTGL213 |
| 187 |
else |
| 188 |
- myconf="${myconf} --without-ftgl" |
| 189 |
+ myconf=( --without-ftgl ) |
| 190 |
fi |
| 191 |
|
| 192 |
econf \ |
| 193 |
@@ -79,12 +84,11 @@ src_configure() { |
| 194 |
--enable-vtlock \ |
| 195 |
--without-esound \ |
| 196 |
--without-gtk \ |
| 197 |
- ${myconf} |
| 198 |
+ ${myconf[@]} |
| 199 |
} |
| 200 |
|
| 201 |
src_install() { |
| 202 |
- einstall xapploaddir="${D}/usr/share/X11/app-defaults" \ |
| 203 |
- mandir="${D}/usr/share/man/man1" INSTPGMFLAGS="" |
| 204 |
+ default |
| 205 |
|
| 206 |
pamd_mimic_system xlock auth |
| 207 |
|
| 208 |
@@ -94,6 +98,7 @@ src_install() { |
| 209 |
fperms 4755 /usr/bin/xlock |
| 210 |
fi |
| 211 |
|
| 212 |
- dohtml docs/xlock.html |
| 213 |
dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} |
| 214 |
+ docinto html |
| 215 |
+ dodoc docs/xlock.html |
| 216 |
} |
Archives