* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2015-10-14 21:27 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2015-10-14 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 81dc29045a3d6ca711c589fbc44513cf5411cea8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 21:27:03 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 21:27:44 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dc2904
x11-misc/xlockmore: Fixed compilation with freetype-2.6.1 (bug #562342).
Package-Manager: portage-2.2.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch | 11 +++++++++++
x11-misc/xlockmore/xlockmore-5.46.ebuild | 7 ++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
new file mode 100644
index 0000000..5258121
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.46-freetype261.patch
@@ -0,0 +1,11 @@
+--- xlockmore-5.46/configure.ac
++++ xlockmore-5.46/configure.ac
+@@ -1912,7 +1912,7 @@
+ AC_DEFUN([AC_PATH_FREETYPE_DIRECT],
+ [test -z "$freetype_direct_test_library" && freetype_direct_test_library=freetype
+ test -z "$freetype_direct_test_function" && freetype_direct_test_function=FT_Init_FreeType
+-test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/freetype.h
++test -z "$freetype_direct_test_include" && freetype_direct_test_include=freetype2/ft2build.h
+ for ac_dir in \
+ /usr/X11R6.5.1/include \
+ /usr/X11R6.4/include \
diff --git a/x11-misc/xlockmore/xlockmore-5.46.ebuild b/x11-misc/xlockmore/xlockmore-5.46.ebuild
index f3b9d03..038393a 100644
--- a/x11-misc/xlockmore/xlockmore-5.46.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.46.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit flag-o-matic pam
+inherit autotools eutils flag-o-matic pam
DESCRIPTION="Just another screensaver application for X"
HOMEPAGE="http://www.tux.org/~bagleyd/xlockmore.html"
@@ -44,6 +44,11 @@ DEPEND="
x11-proto/xineramaproto
"
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-5.46-freetype261.patch
+ eautoreconf
+}
+
src_configure() {
local myconf=""
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2016-05-02 10:25 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2016-05-02 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 8e2682249c9f4a2844476b3b0cf7584a4c6a3f6a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 2 10:10:11 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 2 10:25:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e268224
x11-misc/xlockmore: Added slotdep for imagemagick. Bumped to EAPI-6.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../xlockmore/files/xlockmore-5.46-destdir.patch | 116 +++++++++++++++++++++
x11-misc/xlockmore/xlockmore-5.46.ebuild | 27 +++--
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 0000000..b41bf9d
--- /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 038393a..7aaf856 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
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2017-01-02 10:28 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2017-01-02 10:28 UTC (permalink / raw
To: gentoo-commits
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
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2017-01-15 23:24 Lars Wendler
0 siblings, 0 replies; 9+ messages in thread
From: Lars Wendler @ 2017-01-15 23:24 UTC (permalink / raw
To: gentoo-commits
commit: 99d8a90d637b85eda709f252f48845c079cda084
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 23:18:59 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 23:23:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99d8a90d
x11-misc/xlockmore: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-misc/xlockmore/Manifest | 1 -
.../files/xlockmore-5.31-configure.in.patch | 22 ---
.../xlockmore/files/xlockmore-5.31-ldflags.patch | 185 ---------------------
.../files/xlockmore-5.43-freetype251.patch | 18 --
x11-misc/xlockmore/xlockmore-5.45.ebuild | 103 ------------
5 files changed, 329 deletions(-)
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index a64db59..5fe81d1 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,3 +1,2 @@
-DIST xlockmore-5.45.tar.bz2 1968176 SHA256 7f81a80cb486c05269d71e9cc2d9c51645b59f09779fc24d01b858b7563015f7 SHA512 ab7ad1d1a066176cb8fb77d8c93181dad437b75d1c163f3ea49892477b4a4404129ce169d2fa38f131272a0a8b834ea61c88dd8bb8963d9dfed21c41af120fde WHIRLPOOL 2e890583c6105808821ae447e136fcea4cc782a4eb5a8e55f67195f91a0db23a9121e5bf53e9046139f3cc59e5d7d38ec97a42ce0c31df573674b3644c548cd7
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.31-configure.in.patch b/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch
deleted file mode 100644
index a0b8f6d..00000000
--- a/x11-misc/xlockmore/files/xlockmore-5.31-configure.in.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: xlockmore-5.31/configure.in
-===================================================================
---- xlockmore-5.31.orig/configure.in
-+++ xlockmore-5.31/configure.in
-@@ -8,17 +8,7 @@ AC_CANONICAL_HOST
- canonical=$host
-
- AC_PROG_CC
--dnl Check if C++ compiler is present. If not set CXX to the C-compiler used
--dnl for the other compilations.
--if test "$CC" = gcc; then
-- AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc)
--else
-- AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc)
--fi
- AC_PROG_CXX
--if test "${CXX}" = "xlC" ; then
-- CXXFLAGS="${CXXFLAGS} -+"
--fi
-
- dnl If you're using g++-2.95 or later and have old X11 includes, you may need
- dnl to use "g++ -fpermissive" in the Makefiles
diff --git a/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch b/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch
deleted file mode 100644
index 85ca2fe..00000000
--- a/x11-misc/xlockmore/files/xlockmore-5.31-ldflags.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-Index: xlockmore-5.31/modes/Makefile.in
-===================================================================
---- xlockmore-5.31.orig/modes/Makefile.in
-+++ xlockmore-5.31/modes/Makefile.in
-@@ -329,6 +329,7 @@ DEFS = @DEFS@ $(DEFINES)
- XLOCKINC = -I. -I.. -I$(top_srcdir) -I$(UTILDIR) -I../.. @XLOCKINC@
- CFLAGS = @CFLAGS@
- CXXFLAGS = @CXXFLAGS@
-+LDFLAGS = @LDFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
- XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
-@@ -367,7 +368,7 @@ PURIFY = @PURIFY@
-
- @MODULES@$(NORMMODULES) : %.xlk:%.o
- @MODULES@ $(RM) $@
--@MODULES@ $(CXX) $(CXXFLAGS) -shared -o $@ $<
-+@MODULES@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $<
-
- $(DOG)fire.xlk : $(DOG)xpm-ximage.o
- $(DOG)lament.xlk : $(DOG)xpm-ximage.o
-@@ -375,60 +376,60 @@ $(DOG)sballs.xlk : $(DOG)xpm-ximage.o
-
- @MODULES@@GL@$(DOG)fire.xlk $(DOG)lament.xlk $(DOG)sballs.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)xpm-ximage.o $<
-
- $(DOG)pipes.xlk : $(DOG)buildlwo.o $(DOG)pipeobjs.o
-
- @MODULES@@GL@$(DOG)pipes.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(DOG)buildlwo.o $(DOG)pipeobjs.o $<
-
- $(DOG)sproingies.xlk : $(SPROINGIESOBJS)
-
- @MODULES@@GL@$(DOG)sproingies.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(SPROINGIESOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(SPROINGIESOBJS) $<
-
- $(DOG)atlantis.xlk : $(ATLANTISOBJS)
-
- @MODULES@@GL@$(DOG)atlantis.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(ATLANTISOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(ATLANTISOBJS) $<
-
- $(DOG)bubble3d.xlk : $(BUBBLE3DOBJS)
-
- @MODULES@@GL@$(DOG)bubble3d.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(BUBBLE3DOBJS) $<
-
- $(DOG)glplanet.xlk : $(GLPLANETOBJS)
-
- @MODULES@@GL@$(DOG)glplanet.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(GLPLANETOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(GLPLANETOBJS) $<
-
- $(DOG)molecul.xlk : $(MOLECULEOBJS)
-
- @MODULES@@GL@$(DOG)molecule.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(MOLECULEOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(MOLECULEOBJS) $<
-
- $(DOG)juggler3d.xlk : $(JUGGLER3DOBJS)
-
- @MODULES@@GL@$(DOG)juggler3d.xlk : %.xlk:%.o
- @MODULES@@GL@ $(RM) $@
--@MODULES@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $<
-+@MODULES@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(JUGGLER3DOBJS) $<
-
- $(DOG)invert.xlk : $(INVERTOBJS)
-
- @MODULES@@CCC@@GL@$(DOG)invert.xlk : %.xlk:%.o
- @MODULES@@CCC@@GL@ $(RM) $@
--@MODULES@@CCC@@GL@ $(CXX) $(CXXFLAGS) -shared -o $@ $(INVERTOBJS) $<
-+@MODULES@@CCC@@GL@ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $@ $(INVERTOBJS) $<
-
- xlock : $(UTILOBJDIR)xlock
-
- $(UTILOBJDIR)xlock : $(XLOCKOBJS)
-- $(PURIFY) $(CXX) $(CXXFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS)
-+ $(PURIFY) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(XLOCKOBJS) $(XLOCKLDFLAGS) $(XLOCKLIBS) $(MODULEFLAGS)
- @ $(ECHO) "$@ BUILD COMPLETE"
- @ $(ECHO) ""
-
-@@ -587,10 +588,10 @@ $(GLOBJDIR)tunnel_draw.o : $(GLDIR)tunne
- .SUFFIXES : $(C) $(CX) $(O) $(M)
-
- $(C)$(O) :
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
-+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
-
- $(CX)$(O) :
-- $(CXX) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $<
-+ $(CXX) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CXXFLAGS) $<
-
- install : install-program install-man install-ad
- @ $(ECHO) "$@ COMPLETE"
-Index: xlockmore-5.31/xglock/Makefile.in
-===================================================================
---- xlockmore-5.31.orig/xglock/Makefile.in
-+++ xlockmore-5.31/xglock/Makefile.in
-@@ -90,6 +90,7 @@ ECHO = echo
- DEFS = @DEFS@ $(DEFINES) -DXGLOCKRC_FILE=\"$(datadir)/xlock/xglockrc\"
- XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_srcdir)
- CFLAGS = @GTK_CFLAGS@ @CFLAGS@
-+LDFLAGS= @LDFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
- XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
-@@ -101,14 +102,14 @@ XGLOCKLIBS = @XGLOCKLIBS@
- PURIFY = @PURIFY@
-
- xglock : $(XGLOCKOBJS)
-- $(PURIFY) $(CC) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS)
-+ $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XGLOCKOBJS) $(XGLOCKLDFLAGS) $(XGLOCKLIBS)
- @ $(ECHO) "$@ BUILD COMPLETE"
- @ $(ECHO) ""
-
- .SUFFIXES : $(C) $(O)
-
- $(C)$(O) :
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $<
-+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XGLOCKINC) $(CFLAGS) $<
-
- install : @INSTALL_XGLOCK@
-
-Index: xlockmore-5.31/xlock/Makefile.in
-===================================================================
---- xlockmore-5.31.orig/xlock/Makefile.in
-+++ xlockmore-5.31/xlock/Makefile.in
-@@ -118,6 +118,7 @@ XLOCKINC = -I. -I.. -I$(top_srcdir) @XLO
- CFLAGS = @CFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
-+LDFLAGS = @LDFLAGS@
-
- #If you have purify, and want to use it, uncomment this definition or
- # run the make as `make PURIFY=purify'
-@@ -127,7 +128,7 @@ PURIFY = @PURIFY@
- .SUFFIXES : $(C) $(O)
-
- $(C)$(O) :
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
-+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XLOCKINC) $(CFLAGS) $<
-
- install :
-
-Index: xlockmore-5.31/xmlock/Makefile.in
-===================================================================
---- xlockmore-5.31.orig/xmlock/Makefile.in
-+++ xlockmore-5.31/xmlock/Makefile.in
-@@ -92,6 +92,8 @@ ECHO = echo
- DEFS = @DEFS@ $(DEFINES)
- XMLOCKINC = @XMLOCKINC@ -I.. -I$(top_srcdir)
- CFLAGS = @CFLAGS@
-+LDFLAGS= @LDFLAGS@
-+
- #CFLAGS = -O
- #CFLAGS = -g
- XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
-@@ -103,14 +105,14 @@ XMLOCKLIBS = @XMLOCKLIBS@
- PURIFY = @PURIFY@
-
- xmlock : $(XMLOCKOBJS)
-- $(PURIFY) $(CC) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS)
-+ $(PURIFY) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(XMLOCKOBJS) $(XMLOCKLDFLAGS) $(XMLOCKLIBS)
- @ $(ECHO) "$@ BUILD COMPLETE"
- @ $(ECHO) ""
-
- .SUFFIXES : $(C) $(O)
-
- $(C)$(O) :
-- $(CC) -c $(CPPFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $<
-+ $(CC) -c $(CPPFLAGS) $(LDFLAGS) $(DEFS) $(XMLOCKINC) $(CFLAGS) $<
-
- install : @INSTALL_XMLOCK@
-
diff --git a/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch b/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch
deleted file mode 100644
index da34870..00000000
--- a/x11-misc/xlockmore/files/xlockmore-5.43-freetype251.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Kludge to find >=freetyp2.5.1
-
---- a/configure.in
-+++ b/configure.in
-@@ -1983,6 +1983,13 @@
- fi
- done
-
-+if test -z "$ac_freetype_includes" ; then
-+ tt_inc=/usr/include/freetype2
-+ if test -r "$tt_inc/freetype.h" ; then
-+ no_freetype= ac_freetype_includes=$tt_inc
-+ fi
-+fi
-+
- # Check for the libraries.
- # See if we find them without any special options.
- # Do not add to $LIBS permanently.
diff --git a/x11-misc/xlockmore/xlockmore-5.45.ebuild b/x11-misc/xlockmore/xlockmore-5.45.ebuild
deleted file mode 100644
index 13a8428..00000000
--- a/x11-misc/xlockmore/xlockmore-5.45.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-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://ftp.tux.org/pub/tux/bagleyd/${PN}/${P}/${P}.tar.bz2"
-
-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"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-5.31-configure.in.patch \
- "${FILESDIR}"/${PN}-5.31-ldflags.patch \
- "${FILESDIR}"/${PN}-5.43-freetype251.patch
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=""
-
- if use opengl && use truetype; then
- myconf="${myconf} --with-ftgl"
- append-flags -DFTGL213
- else
- myconf="${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() {
- einstall xapploaddir="${D}/usr/share/X11/app-defaults" \
- mandir="${D}/usr/share/man/man1" INSTPGMFLAGS=""
-
- pamd_mimic_system xlock auth
-
- if use pam; then
- fperms 755 /usr/bin/xlock
- else
- fperms 4755 /usr/bin/xlock
- fi
-
- dohtml docs/xlock.html
- dodoc README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO}
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2017-12-21 15:45 Jeroen Roovers
0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2017-12-21 15:45 UTC (permalink / raw
To: gentoo-commits
commit: f4dad4a9874528e5901543cdf68979fac0b7103b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 15:43:50 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 15:45:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4dad4a9
x11-misc/xlockmore: Version bump.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
x11-misc/xlockmore/Manifest | 1 +
.../xlockmore/files/xlockmore-5.55-soundpath.patch | 19 ++++
x11-misc/xlockmore/xlockmore-5.55.ebuild | 108 +++++++++++++++++++++
3 files changed, 128 insertions(+)
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 03228d1e42f..143526d123d 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,3 +1,4 @@
DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
DIST xlockmore-5.54.tar.xz 1647652 BLAKE2B 2d949adab766d0509cf6af7a44fdc25db58aa38973ceb00faf82bb6694a1a4848a6e88c93297ac8eb18ee5b8e0448e1d70853edf4585fb758445052c36ed6b0a SHA512 027a750d8fb9d17619441a8f76456614e0b91b4963a80810e24d4aff46a8c3217464347b0910c00ce54c25ab6678159dec3c3ea60ee61f7624015950590d7f5d
+DIST xlockmore-5.55.tar.xz 1650116 BLAKE2B 4c50f9a0f4f4c5d02c002363e75eef22b19f52cb05db305f013bb105d47f3981b00f65ee66937c9bb7d971772cda90e2565345fff25fb8c593cdeefa0cf10ca7 SHA512 b6d322bbfbf5710c0fb94da6ee894902fe6c2c87f949c80a27f7924c26a20ede5a3bc40a085c00d4a41dae450c862edaa4d50f716bf3041668d89c7c1d8b4902
DIST xlockmore-5.55ALPHA.tar.xz 1647904 BLAKE2B decd205ea4cccf9f3c30a59716878de082e18b1aab3a6ae10661daea72e1bde7ed66c3a35651fb40090b0391c70028298755336418685c82a966743993f1ef3e SHA512 ff3c9c1897f9ba5ab6eaf507fab595004cfecf20dd05d4264be0765b8fa78dd4b61add1362e3f509401b6f8e4d6daf13c6aeb1c375060ed14921564a0a819e5e
diff --git a/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch b/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch
new file mode 100644
index 00000000000..81163e69f4a
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch
@@ -0,0 +1,19 @@
+--- a/modes/Makefile.in
++++ b/modes/Makefile.in
+@@ -623,11 +623,11 @@
+ install-sound :
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ @NOPLAY@$(INSTALL_PROGRAM) $(ETCDIR)play.sh $(DESTDIR)$(bindir)
+- $(top_srcdir)/mkinstalldirs $(SOUNDPATH)
+- $(INSTALL_DATA) $(SOUNDDIR)complete.au $(SOUNDPATH)
+- $(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(SOUNDPATH)
+- $(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(SOUNDPATH)
+- $(INSTALL_DATA) $(SOUNDDIR)thank-you.au $(SOUNDPATH)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDPATH)
++ $(INSTALL_DATA) $(SOUNDDIR)complete.au $(DESTDIR)$(SOUNDPATH)
++ $(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(DESTDIR)$(SOUNDPATH)
++ $(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(DESTDIR)$(SOUNDPATH)
++ $(INSTALL_DATA) $(SOUNDDIR)thank-you.au $(DESTDIR)$(SOUNDPATH)
+
+ uninstall : uninstall-program uninstall-man uninstall-ad uninstall-sound
+
diff --git a/x11-misc/xlockmore/xlockmore-5.55.ebuild b/x11-misc/xlockmore/xlockmore-5.55.ebuild
new file mode 100644
index 00000000000..8277ee4c2f0
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.55.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.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 vtlock"
+
+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.47-CXX.patch
+ "${FILESDIR}"/${PN}-5.47-strip.patch
+ "${FILESDIR}"/${PN}-5.55-soundpath.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+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
+
+ myconf+=(
+ $(use_enable pam)
+ $(use_enable xlockrc)
+ $(use_enable vtlock)
+ $(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
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+ default
+
+ pamd_mimic_system xlock auth
+
+ if use pam; then
+ fperms 755 /usr/bin/xlock
+ else
+ fperms 4755 /usr/bin/xlock
+ fi
+
+ docinto html
+ dodoc docs/xlock.html
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2018-08-07 7:04 Jeroen Roovers
0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2018-08-07 7:04 UTC (permalink / raw
To: gentoo-commits
commit: 71402458e9e7e8fe5a02a355370c1f47e3277423
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 7 07:02:52 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 7 07:04:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71402458
x11-misc/xlockmore: Version 5.56.
Package-Manager: Portage-2.3.44, Repoman-2.3.10
x11-misc/xlockmore/Manifest | 2 +
.../xlockmore/files/xlockmore-5.56-soundpath.patch | 11 ++
x11-misc/xlockmore/xlockmore-5.56.ebuild | 116 +++++++++++++++++++++
3 files changed, 129 insertions(+)
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 28e63f4b21c..448eaeaf4ab 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,3 +1,5 @@
+DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac357012c5d19b0a506c2d77201145eb90cdb15217190926cdad09cf5897e49dc3644be41ccac30e60ee2 SHA512 04dddd91a98a4f544d065de1b70340e6835657015385959d98c3c5eedea175f58657db73b60011af181a8cf2ff5d48d533cedfa6020943d8b41770bdc4aae329
DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
DIST xlockmore-5.54.tar.xz 1647652 BLAKE2B 2d949adab766d0509cf6af7a44fdc25db58aa38973ceb00faf82bb6694a1a4848a6e88c93297ac8eb18ee5b8e0448e1d70853edf4585fb758445052c36ed6b0a SHA512 027a750d8fb9d17619441a8f76456614e0b91b4963a80810e24d4aff46a8c3217464347b0910c00ce54c25ab6678159dec3c3ea60ee61f7624015950590d7f5d
DIST xlockmore-5.55.tar.xz 1650116 BLAKE2B 4c50f9a0f4f4c5d02c002363e75eef22b19f52cb05db305f013bb105d47f3981b00f65ee66937c9bb7d971772cda90e2565345fff25fb8c593cdeefa0cf10ca7 SHA512 b6d322bbfbf5710c0fb94da6ee894902fe6c2c87f949c80a27f7924c26a20ede5a3bc40a085c00d4a41dae450c862edaa4d50f716bf3041668d89c7c1d8b4902
+DIST xlockmore-5.56.tar.xz 1649808 BLAKE2B 82d56a3570bd1be52014503d7c0a36cf27f68aaf31fe4a7ed06159dc796dbd1410711a56fa8e72709499b1ceb3063b2acd9646ba38400669d3671d04e9fb5745 SHA512 1ae5cde5d0167897229e9cb8ebd15e26fdeadc9b0e2d221e6334980f23403385bf1adbd44a955b455e3ecdf8b02b18b0e06273d8dc566b17ac3692ee5ae44f4d
diff --git a/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch b/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
new file mode 100644
index 00000000000..a5c9079e3ae
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.56-soundpath.patch
@@ -0,0 +1,11 @@
+--- a/modes/Makefile.in
++++ b/modes/Makefile.in
+@@ -624,7 +624,7 @@
+ install-sound :
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ @NOPLAY@$(INSTALL_SCRIPT) $(ETCDIR)play.sh $(DESTDIR)$(bindir)
+- $(top_srcdir)/mkinstalldirs $(SOUNDPATH)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(SOUNDPATH)
+ $(INSTALL_DATA) $(SOUNDDIR)complete.au $(DESTDIR)$(SOUNDPATH)
+ $(INSTALL_DATA) $(SOUNDDIR)identify-please.au $(DESTDIR)$(SOUNDPATH)
+ $(INSTALL_DATA) $(SOUNDDIR)not-programmed.au $(DESTDIR)$(SOUNDPATH)
diff --git a/x11-misc/xlockmore/xlockmore-5.56.ebuild b/x11-misc/xlockmore/xlockmore-5.56.ebuild
new file mode 100644
index 00000000000..7679ed6cc89
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.56.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+ http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+ https://dev.gentoo.org/~jer/ax_pthread.m4.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 vtlock"
+
+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-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.46-freetype261.patch
+ "${FILESDIR}"/${PN}-5.47-CXX.patch
+ "${FILESDIR}"/${PN}-5.47-strip.patch
+ "${FILESDIR}"/${PN}-5.56-soundpath.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_unpack() {
+ unpack ${P/_alpha/ALPHA}.tar.xz
+ xz -cd ${DISTDIR}/ax_pthread.m4.xz > ${S}/ax_pthread.m4 || die
+}
+
+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
+
+ myconf+=(
+ $(use_enable pam)
+ $(use_enable xlockrc)
+ $(use_enable vtlock)
+ $(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
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+ default
+
+ pamd_mimic_system xlock auth
+
+ if use pam; then
+ fperms 755 /usr/bin/xlock
+ else
+ fperms 4755 /usr/bin/xlock
+ fi
+
+ docinto html
+ dodoc docs/xlock.html
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2020-05-30 14:49 Jeroen Roovers
0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2020-05-30 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 922539a7c779164aba0bc14f6ef7a1eff057def4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat May 30 14:49:13 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat May 30 14:49:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=922539a7
x11-misc/xlockmore: Inject LDFLAGS
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Closes: https://bugs.gentoo.org/726280
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../files/xlockmore-5.64_alpha0-LDFLAGS.patch | 33 ++++++++++++++++++++++
x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild | 1 +
2 files changed, 34 insertions(+)
diff --git a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
new file mode 100644
index 00000000000..f36e3ab0b7a
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch
@@ -0,0 +1,33 @@
+--- a/modes/Makefile.in
++++ b/modes/Makefile.in
+@@ -344,7 +344,7 @@
+ CXXFLAGS = @CXXFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+-XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
++XLOCKLDFLAGS = $(LDFLAGS) @XLOCKLDFLAGS@ $(CHECKLDFLAG)
+ XLIBS = @XLIBS@
+ XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@
+
+--- a/xmlock/Makefile.in
++++ b/xmlock/Makefile.in
+@@ -94,7 +94,7 @@
+ CFLAGS = @CFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+-XMLOCKLDFLAGS = @XMLOCKLDFLAGS@
++XMLOCKLDFLAGS = $(LDFLAGS) @XMLOCKLDFLAGS@
+ XLIBS = @XLIBS@
+ XMLOCKLIBS = @XMLOCKLIBS@
+ #If you have purify, and want to use it, uncomment this definition or
+--- a/xglock/Makefile.in
++++ b/xglock/Makefile.in
+@@ -92,7 +92,7 @@
+ CFLAGS = @GTK_CFLAGS@ @CFLAGS@
+ #CFLAGS = -O
+ #CFLAGS = -g
+-XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
++XGLOCKLDFLAGS = $(LDFLAGS) @XGLOCKLDFLAGS@
+ XLIBS = @XLIBS@
+ XGLOCKLIBS = @XGLOCKLIBS@
+ #If you have purify, and want to use it, uncomment this definition or
diff --git a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
index 2071d070081..26cf0a2b072 100644
--- a/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.64_alpha0.ebuild
@@ -50,6 +50,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.46-freetype261.patch
"${FILESDIR}"/${PN}-5.47-CXX.patch
"${FILESDIR}"/${PN}-5.47-strip.patch
+ "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
)
S=${WORKDIR}/${P/_alpha/ALPHA}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2020-09-25 9:56 Jeroen Roovers
0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2020-09-25 9:56 UTC (permalink / raw
To: gentoo-commits
commit: fc8b885a957c0d592785f08ac08afe5f9f1b77f3
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 09:54:16 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 09:56:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8b885a
x11-misc/xlockmore: Version 5.66_alpha06
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/xlockmore/Manifest | 1 +
.../files/xlockmore-5.66_alpha06-rotator.patch | 13 +++
x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild | 119 +++++++++++++++++++++
3 files changed, 133 insertions(+)
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 307819c2126..a3720c56231 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -6,3 +6,4 @@ DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329
DIST xlockmore-5.66ALPHA00.tar.xz 1944644 BLAKE2B 0b52cc3a5cb77645174084eec3e81838e96a4b5e849955e9090efabb62cb38f477ae3a23664b4dc27bb8b79af62d946b4702244bc3b601ede7097f60de6b0fbd SHA512 7216fc3b034c382ab02d06e22a9e572e3602e4745b2a055a8ee51f6a4c014776ea27b665fe7638719303b9bea3f957a27e1da47e15d5de44c3717136dae82ee2
DIST xlockmore-5.66ALPHA04.tar.xz 1946880 BLAKE2B a02290052459df4424cca7205a932de603733176323331024514a61682e581706a66a5591f57e6a041eb0e725cbcf04d9641a9d59be4bfbea88d77605973a58b SHA512 2a2b59e733ade48810e85ac0fc58ae2433035db9bfc1653e73359d921a425d7d67156588ce1c428ef756b1604125a151221f64c719c4da20dc0de83fb4d2bc23
DIST xlockmore-5.66ALPHA05.tar.xz 1945728 BLAKE2B df0d5a8b0122673204c30f416c4bb599476340f0a0a4a80e08efe42c77a5dfa2408d74375dfcf2d68740d0b2c0147faff8ee01fe96e106eeed14fc779bcb3344 SHA512 259a8b2b0e7f487e5bb025a8a6961c38933ae259b3544c66823e09ea2f0fc44e19155bd335870adca653c268dc4811d41570882b021977e4981f0ded36ce3909
+DIST xlockmore-5.66ALPHA06.tar.xz 1947244 BLAKE2B 998d1438bc8ad95c21ebcace2e390936c56fe975331d2a82d10899a00b43fd245fc71c34050459d88fcc47c9b97bc074bd91be432df0a2933db0fd9153091888 SHA512 cd4d47a677b2e00f993b6a32cd2cd98a88fa04dca1d2a62303b58ebe2a4b26b4e4308a5c25883dbe8adade98ae85dbe7b61422ec05579a82b193eecb642b057c
diff --git a/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch b/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
new file mode 100644
index 00000000000..6400ba33fe3
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
@@ -0,0 +1,13 @@
+--- a/modes/glx/text3d2.cc
++++ b/modes/glx/text3d2.cc
+@@ -83,7 +83,10 @@
+ #endif
+ #endif
+
++extern "C"
++{
+ #include "rotator.h"
++}
+ #include "text3d2.h"
+ #include <GL/glu.h>
+
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
new file mode 100644
index 00000000000..46cad1c85f0
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic pam
+
+DESCRIPTION="Just another screensaver application for X"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="
+ https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+ https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.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 vtlock"
+
+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? ( sys-libs/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-base/xorg-proto
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.46-freetype261.patch
+ "${FILESDIR}"/${PN}-5.47-CXX.patch
+ "${FILESDIR}"/${PN}-5.47-strip.patch
+ "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
+ "${FILESDIR}"/${PN}-5.66_alpha06-rotator.patch
+)
+S=${WORKDIR}/${P/_alpha/ALPHA}
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/XLOCKLIBPATHS="-L/d' \
+ -e '/XMLOCKLIBPATHS="-L/d' \
+ -e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=()
+
+ if use opengl && use truetype; then
+ myconf=( --with-ftgl )
+ append-cppflags -DFTGL213
+ else
+ myconf=( --without-ftgl )
+ fi
+
+ myconf+=(
+ $(use_enable pam)
+ $(use_enable xlockrc)
+ $(use_enable vtlock)
+ $(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
+ )
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
+ default
+
+ pamd_mimic_system xlock auth
+
+ if use pam; then
+ fperms 755 /usr/bin/xlock
+ else
+ fperms 4755 /usr/bin/xlock
+ fi
+
+ docinto html
+ dodoc docs/xlock.html
+}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/
@ 2020-10-04 11:59 Jeroen Roovers
0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2020-10-04 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 51f727eceef391dcee1f5f9d3d9215f779f1b8fd
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 08:55:58 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 11:59:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f727ec
x11-misc/xlockmore: Old
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
x11-misc/xlockmore/Manifest | 2 -
.../files/xlockmore-5.66_alpha06-rotator.patch | 13 ---
x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild | 118 --------------------
x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild | 119 ---------------------
4 files changed, 252 deletions(-)
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index a80a965db10..07b5f020839 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,6 +1,4 @@
DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
DIST xlockmore-5.65.tar.xz 1945636 BLAKE2B d026975551e8ceafdcc7b8d8b6e404634f329d8d1f65e153b51798981103a023479dd58f2485c774aaf58f5928ea28a9f409c733ccfc75f98b65302e7e478ac5 SHA512 ecbf7e5c087843265eb4a537b3fe06a0d86d5f67d88c45137b6a7f4f5b30522d44fb87b5628cd9e042f90af129863fd3a4c2b5e2305df2dc3dfd867a03469ad8
-DIST xlockmore-5.66ALPHA05.tar.xz 1945728 BLAKE2B df0d5a8b0122673204c30f416c4bb599476340f0a0a4a80e08efe42c77a5dfa2408d74375dfcf2d68740d0b2c0147faff8ee01fe96e106eeed14fc779bcb3344 SHA512 259a8b2b0e7f487e5bb025a8a6961c38933ae259b3544c66823e09ea2f0fc44e19155bd335870adca653c268dc4811d41570882b021977e4981f0ded36ce3909
-DIST xlockmore-5.66ALPHA06.tar.xz 1947244 BLAKE2B 998d1438bc8ad95c21ebcace2e390936c56fe975331d2a82d10899a00b43fd245fc71c34050459d88fcc47c9b97bc074bd91be432df0a2933db0fd9153091888 SHA512 cd4d47a677b2e00f993b6a32cd2cd98a88fa04dca1d2a62303b58ebe2a4b26b4e4308a5c25883dbe8adade98ae85dbe7b61422ec05579a82b193eecb642b057c
DIST xlockmore-5.66ALPHA08.tar.xz 1947004 BLAKE2B 44ad1f877d214a8b719db57df8f502391f635a4a9cd12bd470610c27543c4523acd6824cf01cb9bf6ca73628d4bc59bc25dafc436d4ee818d5590ae058a7b02d SHA512 a7bc5ffe09be91a5a903067c1e9cbdd5808207fc2ff0507e9bdfeb4156c187ee00da2a8d790a539b97e26985adb51326e1dcde9cdaa194bab4b8705117dc97ce
DIST xlockmore-5.66ALPHA09.tar.xz 1946744 BLAKE2B 98d30a00e9e770e4bf1def27000a51b3cf0bc9ccfcb5b5cebf5af97727ff5b896c11dafee8350c96ef05b7a1d698a7badbbd6e62239e86ee5575a257b9c5415d SHA512 530e7da94cb6d21fb26b2904859e5c33e55f1e32a3cadb6f649cab39590bfc6512d2fcd2167fc8aa22120601129a0a3e459c61ed7b30d8ea417abeb609442c11
diff --git a/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch b/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
deleted file mode 100644
index 6400ba33fe3..00000000000
--- a/x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/modes/glx/text3d2.cc
-+++ b/modes/glx/text3d2.cc
-@@ -83,7 +83,10 @@
- #endif
- #endif
-
-+extern "C"
-+{
- #include "rotator.h"
-+}
- #include "text3d2.h"
- #include <GL/glu.h>
-
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild
deleted file mode 100644
index 2bb52c63b8e..00000000000
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
- https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
- https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.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 vtlock"
-
-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? ( sys-libs/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-base/xorg-proto
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.46-freetype261.patch
- "${FILESDIR}"/${PN}-5.47-CXX.patch
- "${FILESDIR}"/${PN}-5.47-strip.patch
- "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
- default
-
- sed -i \
- -e '/XLOCKLIBPATHS="-L/d' \
- -e '/XMLOCKLIBPATHS="-L/d' \
- -e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
- configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
-
- if use opengl && use truetype; then
- myconf=( --with-ftgl )
- append-cppflags -DFTGL213
- else
- myconf=( --without-ftgl )
- fi
-
- myconf+=(
- $(use_enable pam)
- $(use_enable xlockrc)
- $(use_enable vtlock)
- $(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
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
- default
-
- pamd_mimic_system xlock auth
-
- if use pam; then
- fperms 755 /usr/bin/xlock
- else
- fperms 4755 /usr/bin/xlock
- fi
-
- docinto html
- dodoc docs/xlock.html
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild b/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
deleted file mode 100644
index 46cad1c85f0..00000000000
--- a/x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic pam
-
-DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
-SRC_URI="
- https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
- https://www.sillycycle.com/xlock/recent-releases/${P/_alpha/ALPHA}.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 vtlock"
-
-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? ( sys-libs/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-base/xorg-proto
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.46-freetype261.patch
- "${FILESDIR}"/${PN}-5.47-CXX.patch
- "${FILESDIR}"/${PN}-5.47-strip.patch
- "${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch
- "${FILESDIR}"/${PN}-5.66_alpha06-rotator.patch
-)
-S=${WORKDIR}/${P/_alpha/ALPHA}
-
-src_prepare() {
- default
-
- sed -i \
- -e '/XLOCKLIBPATHS="-L/d' \
- -e '/XMLOCKLIBPATHS="-L/d' \
- -e 's|/lib|'"${EPREFIX}/$(get_libdir)"'|g' \
- configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myconf=()
-
- if use opengl && use truetype; then
- myconf=( --with-ftgl )
- append-cppflags -DFTGL213
- else
- myconf=( --without-ftgl )
- fi
-
- myconf+=(
- $(use_enable pam)
- $(use_enable xlockrc)
- $(use_enable vtlock)
- $(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
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- local DOCS=( README docs/{3d.howto,cell_automata,HACKERS.GUIDE,Purify,Revisions,TODO} )
- default
-
- pamd_mimic_system xlock auth
-
- if use pam; then
- fperms 755 /usr/bin/xlock
- else
- fperms 4755 /usr/bin/xlock
- fi
-
- docinto html
- dodoc docs/xlock.html
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-10-04 12:00 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-21 15:45 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2020-10-04 11:59 Jeroen Roovers
2020-09-25 9:56 Jeroen Roovers
2020-05-30 14:49 Jeroen Roovers
2018-08-07 7:04 Jeroen Roovers
2017-01-15 23:24 Lars Wendler
2017-01-02 10:28 Lars Wendler
2016-05-02 10:25 Lars Wendler
2015-10-14 21:27 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox