summaryrefslogtreecommitdiff
path: root/x11-misc/xlockmore
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-12-21 20:47:17 +0000
committerV3n3RiX <venerix@redcorelinux.org>2017-12-21 20:47:17 +0000
commit4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 (patch)
treef7640b8b96a04499f1ce44a2cad122d45a8373bd /x11-misc/xlockmore
parent48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (diff)
gentoo resync : 21.12.2017
Diffstat (limited to 'x11-misc/xlockmore')
-rw-r--r--x11-misc/xlockmore/Manifest9
-rw-r--r--x11-misc/xlockmore/files/xlockmore-5.55-soundpath.patch19
-rw-r--r--x11-misc/xlockmore/xlockmore-5.47.ebuild106
-rw-r--r--x11-misc/xlockmore/xlockmore-5.50.ebuild2
-rw-r--r--x11-misc/xlockmore/xlockmore-5.55.ebuild (renamed from x11-misc/xlockmore/xlockmore-5.55_alpha.ebuild)1
5 files changed, 25 insertions, 112 deletions
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 32dd4f48e924..3a84b9d7e228 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -2,12 +2,11 @@ AUX xlockmore-5.46-freetype261.patch 587 BLAKE2B a5666fd2c06d23b388d20cc8fbb6b64
AUX xlockmore-5.47-CXX.patch 613 BLAKE2B ace9eb868bcdf4fa7fda07d5a0dfc316f992fd176616c531aa71ff5d051169165f991dd8a586685b5a0b8e1a66b0da247a441fd7a56ecd24cc39bd58f2267e8b SHA512 4eef79a2b791401433ae0c6e55179975f88b74c4e57cd64ca81df48a232723e5edaccbd7045c9f67ba81ba159e70257d5e070ea59808f52430ac08539ea91087
AUX xlockmore-5.47-_BSD_SOURCE.patch 449 BLAKE2B 72e9dae6b4f0013848d744c5103d5ae06c4458cf12db893dc2cef0c572281b47a6e13cdca2d40e04b629607aa26e746737c6d2fe07953bc4c5f666755ced016f SHA512 c0b6c4a245792b91ad3ebee91f81cb6fecdf2ea2175a284203fc049b93cc51ba7cd6ba27b08bef464de96760077e6575c10c73fc237708033ee0db742c8acef3
AUX xlockmore-5.47-strip.patch 2048 BLAKE2B 0f0f00a38e1d3b5edebf40416698ad3b87323ce9167e7a3e0a44ca2fca853b16e9c1ff59ff74b0bf50b3484e25722a3ee840b312f2f249644614aef55095bfcc SHA512 2de24cbacab2a54e7a41f4604625096030763ad6212ec30b34be2c2fc4035b44f146bfb9d0a34df9c9ce4fa96a0eb1c9c7701b512a917fdf3eb56a5195c8585e
-DIST xlockmore-5.47.tar.xz 1610604 BLAKE2B 45b06d0743bfcdae6b552252d3b61471e33c4b93f61870e51b8d8a7298d7771bb6f1d40a63c35bd4152fdefc8b156c7b79f3768d5c1d20ec54adef8829bd4802 SHA512 0690255cafa0e32d5b2920a611a76107565591331ef12e442069d4a7fba38b18b43a581f29488969695390aef92d4868681efb9b2a06fbb73960d4bcd4b13484
+AUX xlockmore-5.55-soundpath.patch 877 BLAKE2B ede21934cdf23055c6177d6441bef5fb3b9cee4ee478d1aaa30a6a92ff357071a4e931af24afae81080d8eae03a012cf1cca29bcebe7540969d88385a0bafec2 SHA512 562eb7992972adad5b5f688b6f822453e878a79297e9517ce4920c2907bdc60e08f9d854a7bc4491fa740a3551474c432c59c1be6e2750504935f4209df4b9be
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.55ALPHA.tar.xz 1647904 BLAKE2B decd205ea4cccf9f3c30a59716878de082e18b1aab3a6ae10661daea72e1bde7ed66c3a35651fb40090b0391c70028298755336418685c82a966743993f1ef3e SHA512 ff3c9c1897f9ba5ab6eaf507fab595004cfecf20dd05d4264be0765b8fa78dd4b61add1362e3f509401b6f8e4d6daf13c6aeb1c375060ed14921564a0a819e5e
-EBUILD xlockmore-5.47.ebuild 2236 BLAKE2B 7587789b6b76af7b5a95fda7cbea4905b12134f85badb5889c4c53d8044cdda0c15f88d36cf2f3196296782c439d4af458122cfca626bca4fefcea5ee541a182 SHA512 2598b3f050f8bea8e5c1f71529a6a1d97fdc6902062f8985a9e31697a7bc048c1a07835dd97212b729766c2350a7b2df68e6ee69f45bee0a00161af38c24f53c
-EBUILD xlockmore-5.50.ebuild 2170 BLAKE2B c347bcc172e392e33d6bb06c0b0cb7fb833df282a8624769db58af028a441e2fd6fb79e2160f3080e950dae3a947843474ce74e28f488541f8013eea70a7ef6a SHA512 fd6f4bc897d68f7cf2674b0a4e378064f8ce18402bc124d0e1559182515132e99972a9b05b576e62b2b649911c14a95c5d46bf073f22480a7a9bf2679ca477ee
+DIST xlockmore-5.55.tar.xz 1650116 BLAKE2B 4c50f9a0f4f4c5d02c002363e75eef22b19f52cb05db305f013bb105d47f3981b00f65ee66937c9bb7d971772cda90e2565345fff25fb8c593cdeefa0cf10ca7 SHA512 b6d322bbfbf5710c0fb94da6ee894902fe6c2c87f949c80a27f7924c26a20ede5a3bc40a085c00d4a41dae450c862edaa4d50f716bf3041668d89c7c1d8b4902
+EBUILD xlockmore-5.50.ebuild 2169 BLAKE2B 428696632946a97126481c717350d87d3ce6cb73cc1c3e2ab6fd8cd64c67c4172e4889adaeb29001dda63fd4fe3ff9d44f2bed4ecd8f46f6e1ce86b14e25674f SHA512 4ac9d8f19cdca22d137bebfa97b4739214065b8ec9037f1ebafca1f4f9e62a07569fdec9195d0c1f67a4279da57b777da935abdc5bb0f5371ceecc9d1547d515
EBUILD xlockmore-5.54.ebuild 2176 BLAKE2B 682794c14940a58cdd6ebdadb6b010735f6543f5217b0a67c0fed5002a4c6c055e23e59c6a6302a2d78939ef7f4f7d896f29f15604d334b14303f4fafc9d9852 SHA512 f2ac190a0ef5421cf4faeeca936663bf7b134fae212cbf0fa597e9feaceaee91475965dd9d0cfd4d2180d7e2fb80776f1b4ab581fcfffcfee7641f70e43d0ab3
-EBUILD xlockmore-5.55_alpha.ebuild 2220 BLAKE2B 6d32a68d749a681a6f545c5a74615c7c10d256b4c4026b3c50b468f213be140184d459d83971bae3b5b106a245c63e9ee3c1cc31328ba5f7b34a3aba761ce7b3 SHA512 99bfca284e7bf037002c5c89688e49fa3a23d55c2e611280a1cf8c1e33c59064330e9ee63ba974c10049c6a71bb4062f8b090e3686efa268f312facfb25f8665
+EBUILD xlockmore-5.55.ebuild 2262 BLAKE2B 48aacb3f5c34af746d94fb33d11f285ffde94fc54dbfdde757289cf48887a722ba803a58be9a93551c47da4cd02f61ee76bcb6ab2e494071775925a9618af472 SHA512 1226e039c666d53ec09a89b7b895602d53cd838c7c79b6342769c739365fb811e4a74ed8b75099b679cca1a1eb3bfd0903f692e1c57a10d38d85667b7e439865
MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
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 000000000000..81163e69f4aa
--- /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.47.ebuild b/x11-misc/xlockmore/xlockmore-5.47.ebuild
deleted file mode 100644
index 102232ab3b5e..000000000000
--- a/x11-misc/xlockmore/xlockmore-5.47.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.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 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-_BSD_SOURCE.patch
- "${FILESDIR}"/${PN}-5.47-CXX.patch
- "${FILESDIR}"/${PN}-5.47-strip.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_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 \
- ${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
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild
index a8b965034af0..529559f87230 100644
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.sillycycle.com/xlock/${P}.tar.xz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
REQUIRED_USE="
diff --git a/x11-misc/xlockmore/xlockmore-5.55_alpha.ebuild b/x11-misc/xlockmore/xlockmore-5.55.ebuild
index 1cfdbd5a51e2..8277ee4c2f00 100644
--- a/x11-misc/xlockmore/xlockmore-5.55_alpha.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.55.ebuild
@@ -47,6 +47,7 @@ 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}