Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
Date: Mon, 02 Jan 2017 10:28:05
Message-Id: 1483352876.393a7fae1b29a1b097ec512084ecf3c799d29afc.polynomial-c@gentoo
1 commit: 393a7fae1b29a1b097ec512084ecf3c799d29afc
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 2 10:26:48 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 2 10:27:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393a7fae
7
8 x11-misc/xlockmore: Removed old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 x11-misc/xlockmore/Manifest | 1 -
13 .../xlockmore/files/xlockmore-5.46-destdir.patch | 116 ---------------------
14 x11-misc/xlockmore/xlockmore-5.46.ebuild | 104 ------------------
15 3 files changed, 221 deletions(-)
16
17 diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
18 index fa10e68..a64db59 100644
19 --- a/x11-misc/xlockmore/Manifest
20 +++ b/x11-misc/xlockmore/Manifest
21 @@ -1,4 +1,3 @@
22 DIST xlockmore-5.45.tar.bz2 1968176 SHA256 7f81a80cb486c05269d71e9cc2d9c51645b59f09779fc24d01b858b7563015f7 SHA512 ab7ad1d1a066176cb8fb77d8c93181dad437b75d1c163f3ea49892477b4a4404129ce169d2fa38f131272a0a8b834ea61c88dd8bb8963d9dfed21c41af120fde WHIRLPOOL 2e890583c6105808821ae447e136fcea4cc782a4eb5a8e55f67195f91a0db23a9121e5bf53e9046139f3cc59e5d7d38ec97a42ce0c31df573674b3644c548cd7
23 -DIST xlockmore-5.46.tar.xz 1610356 SHA256 32b3be122c4fde5ae70dba5899bbcc20cd7e80119e246d79455d84046d6d40df SHA512 4be4c70f72f9a820e26204fbd8450f2f920b6ed1583d413ba3983c4ced778c9d4e6dfa40a4c7919557b3fa7ecccba08e1a0bb0403924fa84770401d6758c7d9c WHIRLPOOL 6bfd885cb6e460ccbb2ebd682d2096e454c4a5ccb58244495451973bd16d5410f3ba347afdba6c747a34a50bcb1612bae5fa16f1c09f54f2f82c1257ed59105d
24 DIST xlockmore-5.47.tar.xz 1610604 SHA256 94e3adee284eec09dc27405bfc24651446e8c6edd6a5bc565550b08f563a0d8d SHA512 0690255cafa0e32d5b2920a611a76107565591331ef12e442069d4a7fba38b18b43a581f29488969695390aef92d4868681efb9b2a06fbb73960d4bcd4b13484 WHIRLPOOL c76dd5c9111d7e17fcbf4572d95773fd40b14f3895fb5b2e86aa36bc2b15da0b6d1fc5bcbf776da976113a76c7f14caf2507495359e0f8a15996cf574c498903
25 DIST xlockmore-5.50.tar.xz 1632968 SHA256 635f72df44589d028200acf604093959968a7e19f79c4363a76599615f563a29 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569 WHIRLPOOL 2485b7805632581077554b7f2e460d94c0c094d7470e26550e8f32fb4d794ea4c2a111403542d9c07560cf0a0b2e8076cdc789336d09f3798827546ed68b8451
26
27 diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch b/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch
28 deleted file mode 100644
29 index b41bf9d..00000000
30 --- a/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch
31 +++ /dev/null
32 @@ -1,116 +0,0 @@
33 -Use DESTDIR where necessary.
34 -
35 ---- xlockmore-5.46/modes/Makefile.in
36 -+++ xlockmore-5.46/modes/Makefile.in
37 -@@ -325,7 +325,7 @@
38 -
39 - MODULEFLAGS = @MODULEFLAGS@
40 - @MODULES@MODULELIB = -ldl
41 --DEF_MODULEPATH = $(prefix)/lib/X11/xlock/modules
42 -+DEF_MODULEPATH = $(DESTDIR)$(prefix)/lib/X11/xlock/modules
43 - @MODULES@MODULEDEF = -DDEF_MODULEPATH=\"$(DEF_MODULEPATH)\"
44 - DEFINES = -DDEF_FILESEARCHPATH=\"$(xapploaddir)/%N%C%S:$(xapploaddir)/%N%S\" $(MODULEDEF) $(CHECKDEF)
45 - DEFS = @DEFS@ $(DEFINES)
46 -@@ -600,15 +600,15 @@
47 - @ $(ECHO) ""
48 -
49 - install-program : xlock
50 -- $(top_srcdir)/mkinstalldirs $(bindir)
51 -- $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(bindir)
52 -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
53 -+ $(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir)
54 - @MODULES@mkdir -p $(DEF_MODULEPATH)
55 - @MODULES@cp *.xlk $(DEF_MODULEPATH)
56 - @MODULES@cp glx/*.xlk $(DEF_MODULEPATH)
57 -
58 - install-man :
59 -- $(top_srcdir)/mkinstalldirs $(mandir)
60 -- $(INSTALL_DATA) $(UTILDIR)xlock.man $(mandir)/xlock.1
61 -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)
62 -+ $(INSTALL_DATA) $(UTILDIR)xlock.man $(DESTDIR)$(mandir)/xlock.1
63 -
64 - install-ad :
65 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
66 -@@ -620,10 +620,10 @@
67 - uninstall : uninstall-program uninstall-man uninstall-ad
68 -
69 - uninstall-program :
70 -- $(RM) $(bindir)/xlock$(E)
71 -+ $(RM) $(DESTDIR)$(bindir)/xlock$(E)
72 -
73 - uninstall-man :
74 -- $(RM) $(mandir)/xlock.1
75 -+ $(RM) $(DESTDIR)$(mandir)/xlock.1
76 -
77 - uninstall-ad :
78 - $(RM) $(DESTDIR)$(xapploaddir)/XLock
79 ---- xlockmore-5.46/xglock/Makefile.in
80 -+++ xlockmore-5.46/xglock/Makefile.in
81 -@@ -117,26 +117,26 @@
82 - @ $(ECHO) ""
83 -
84 - install-program : xglock
85 -- $(top_srcdir)/mkinstalldirs $(bindir)
86 -- $(INSTALL_PROGRAM) xglock$(E) $(bindir)
87 -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
88 -+ $(INSTALL_PROGRAM) xglock$(E) $(DESTDIR)$(bindir)
89 -
90 - install-man :
91 -
92 - install-ad :
93 -- $(top_srcdir)/mkinstalldirs $(datadir)/xlock
94 -- $(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc
95 -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/xlock
96 -+ $(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(DESTDIR)$(datadir)/xlock/xglockrc
97 -
98 - uninstall : @UNINSTALL_XGLOCK@
99 -
100 - uninstall_xglock : uninstall-program uninstall-man uninstall-ad
101 -
102 - uninstall-program :
103 -- $(RM) $(bindir)/xglock$(E)
104 -+ $(RM) $(DESTDIR)$(bindir)/xglock$(E)
105 -
106 - uninstall-man :
107 -
108 - uninstall-ad :
109 -- $(RM) $(datadir)/xlock/xglockrc
110 -+ $(RM) $(DESTDIR)$(datadir)/xlock/xglockrc
111 -
112 - install.program : install-program
113 -
114 ---- xlockmore-5.46/xmlock/Makefile.in
115 -+++ xlockmore-5.46/xmlock/Makefile.in
116 -@@ -119,26 +119,26 @@
117 - @ $(ECHO) ""
118 -
119 - install-program : xmlock
120 -- $(top_srcdir)/mkinstalldirs $(bindir)
121 -- $(INSTALL_PROGRAM) xmlock$(E) $(bindir)
122 -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
123 -+ $(INSTALL_PROGRAM) xmlock$(E) $(DESTDIR)$(bindir)
124 -
125 - install-man :
126 -
127 - install-ad :
128 -- $(top_srcdir)/mkinstalldirs $(xapploaddir)
129 -- $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(xapploaddir)/XmLock
130 -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
131 -+ $(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(DESTDIR)$(xapploaddir)/XmLock
132 -
133 - uninstall : @UNINSTALL_XMLOCK@
134 -
135 - uninstall_xmlock : uninstall-program uninstall-man uninstall-ad
136 -
137 - uninstall-program :
138 -- $(RM) $(bindir)/xmlock$(E)
139 -+ $(RM) $(DESTDIR)$(bindir)/xmlock$(E)
140 -
141 - uninstall-man :
142 -
143 - uninstall-ad :
144 -- $(RM) $(xapploaddir)/XmLock
145 -+ $(RM) $(DESTDIR)$(xapploaddir)/XmLock
146 -
147 - install.program : install-program
148 -
149
150 diff --git a/x11-misc/xlockmore/xlockmore-5.46.ebuild b/x11-misc/xlockmore/xlockmore-5.46.ebuild
151 deleted file mode 100644
152 index 7aaf856..00000000
153 --- a/x11-misc/xlockmore/xlockmore-5.46.ebuild
154 +++ /dev/null
155 @@ -1,104 +0,0 @@
156 -# Copyright 1999-2016 Gentoo Foundation
157 -# Distributed under the terms of the GNU General Public License v2
158 -# $Id$
159 -
160 -EAPI=6
161 -inherit autotools eutils flag-o-matic pam
162 -
163 -DESCRIPTION="Just another screensaver application for X"
164 -HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
165 -SRC_URI="http://www.tux.org/~bagleyd/xlock/${P}.tar.xz"
166 -
167 -LICENSE="BSD GPL-2"
168 -SLOT="0"
169 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
170 -IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc"
171 -
172 -REQUIRED_USE="
173 - || ( crypt pam )
174 - pam? ( !xlockrc )
175 - xlockrc? ( !pam )
176 -"
177 -RDEPEND="
178 - gtk? ( x11-libs/gtk+:2 )
179 - imagemagick? ( media-gfx/imagemagick:= )
180 - motif? ( >=x11-libs/motif-2.3:0 )
181 - nas? ( media-libs/nas )
182 - opengl? (
183 - virtual/opengl
184 - virtual/glu
185 - truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
186 - )
187 - pam? ( virtual/pam )
188 - truetype? ( media-libs/freetype:2 )
189 - x11-libs/libX11
190 - x11-libs/libXext
191 - x11-libs/libXmu
192 - x11-libs/libXpm
193 - x11-libs/libXt
194 - xinerama? ( x11-libs/libXinerama )
195 -"
196 -DEPEND="
197 - ${RDEPEND}
198 - virtual/pkgconfig
199 - x11-proto/xineramaproto
200 -"
201 -
202 -PATCHES=(
203 - "${FILESDIR}"/${PN}-5.46-freetype261.patch
204 - "${FILESDIR}"/${PN}-5.46-destdir.patch
205 -)
206 -
207 -src_prepare() {
208 - default
209 - eautoreconf
210 -}
211 -
212 -src_configure() {
213 - local myconf=()
214 -
215 - if use opengl && use truetype; then
216 - myconf=( --with-ftgl )
217 - append-flags -DFTGL213
218 - else
219 - myconf=( --without-ftgl )
220 - fi
221 -
222 - econf \
223 - $(use_enable pam) \
224 - $(use_enable xlockrc) \
225 - $(use_with crypt) \
226 - $(use_with debug editres) \
227 - $(use_with gtk gtk2) \
228 - $(use_with imagemagick magick) \
229 - $(use_with motif) \
230 - $(use_with nas) \
231 - $(use_with opengl mesa) \
232 - $(use_with opengl) \
233 - $(use_with truetype freetype) \
234 - $(use_with truetype ttf) \
235 - $(use_with xinerama) \
236 - --disable-mb \
237 - --enable-appdefaultdir=/usr/share/X11/app-defaults \
238 - --enable-syslog \
239 - --enable-vtlock \
240 - --without-esound \
241 - --without-gtk \
242 - ${myconf[@]}
243 -}
244 -
245 -src_install() {
246 - default
247 -
248 - pamd_mimic_system xlock auth
249 -
250 - if use pam; then
251 - fperms 755 /usr/bin/xlock
252 - else
253 - fperms 4755 /usr/bin/xlock
254 - fi
255 -
256 - dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
257 - docinto html
258 - dodoc docs/xlock.html
259 -}