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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
Date: Mon,  2 Jan 2017 10:28:00 +0000 (UTC)	[thread overview]
Message-ID: <1483352876.393a7fae1b29a1b097ec512084ecf3c799d29afc.polynomial-c@gentoo> (raw)

commit:     393a7fae1b29a1b097ec512084ecf3c799d29afc
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 10:26:48 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 10:27:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393a7fae

x11-misc/xlockmore: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 x11-misc/xlockmore/Manifest                        |   1 -
 .../xlockmore/files/xlockmore-5.46-destdir.patch   | 116 ---------------------
 x11-misc/xlockmore/xlockmore-5.46.ebuild           | 104 ------------------
 3 files changed, 221 deletions(-)

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index fa10e68..a64db59 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,4 +1,3 @@
 DIST xlockmore-5.45.tar.bz2 1968176 SHA256 7f81a80cb486c05269d71e9cc2d9c51645b59f09779fc24d01b858b7563015f7 SHA512 ab7ad1d1a066176cb8fb77d8c93181dad437b75d1c163f3ea49892477b4a4404129ce169d2fa38f131272a0a8b834ea61c88dd8bb8963d9dfed21c41af120fde WHIRLPOOL 2e890583c6105808821ae447e136fcea4cc782a4eb5a8e55f67195f91a0db23a9121e5bf53e9046139f3cc59e5d7d38ec97a42ce0c31df573674b3644c548cd7
-DIST xlockmore-5.46.tar.xz 1610356 SHA256 32b3be122c4fde5ae70dba5899bbcc20cd7e80119e246d79455d84046d6d40df SHA512 4be4c70f72f9a820e26204fbd8450f2f920b6ed1583d413ba3983c4ced778c9d4e6dfa40a4c7919557b3fa7ecccba08e1a0bb0403924fa84770401d6758c7d9c WHIRLPOOL 6bfd885cb6e460ccbb2ebd682d2096e454c4a5ccb58244495451973bd16d5410f3ba347afdba6c747a34a50bcb1612bae5fa16f1c09f54f2f82c1257ed59105d
 DIST xlockmore-5.47.tar.xz 1610604 SHA256 94e3adee284eec09dc27405bfc24651446e8c6edd6a5bc565550b08f563a0d8d SHA512 0690255cafa0e32d5b2920a611a76107565591331ef12e442069d4a7fba38b18b43a581f29488969695390aef92d4868681efb9b2a06fbb73960d4bcd4b13484 WHIRLPOOL c76dd5c9111d7e17fcbf4572d95773fd40b14f3895fb5b2e86aa36bc2b15da0b6d1fc5bcbf776da976113a76c7f14caf2507495359e0f8a15996cf574c498903
 DIST xlockmore-5.50.tar.xz 1632968 SHA256 635f72df44589d028200acf604093959968a7e19f79c4363a76599615f563a29 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569 WHIRLPOOL 2485b7805632581077554b7f2e460d94c0c094d7470e26550e8f32fb4d794ea4c2a111403542d9c07560cf0a0b2e8076cdc789336d09f3798827546ed68b8451

diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch b/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch
deleted file mode 100644
index b41bf9d..00000000
--- a/x11-misc/xlockmore/files/xlockmore-5.46-destdir.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-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
deleted file mode 100644
index 7aaf856..00000000
--- a/x11-misc/xlockmore/xlockmore-5.46.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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
-}

next             reply	other threads:[~2017-01-02 10:28 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-02 10:28 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-10-04 11:59 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/ Jeroen Roovers
2020-09-25  9:56 Jeroen Roovers
2020-05-30 14:49 Jeroen Roovers
2018-08-07  7:04 Jeroen Roovers
2017-12-21 15:45 Jeroen Roovers
2017-01-15 23:24 Lars Wendler
2016-05-02 10:25 Lars Wendler
2015-10-14 21:27 Lars Wendler

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:fa10e68 dfblob:a64db59 dfblob:b41bf9d dfblob:7aaf856 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1483352876.393a7fae1b29a1b097ec512084ecf3c799d29afc.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox