From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0095C138359 for ; Sun, 4 Oct 2020 12:00:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F042E0936; Sun, 4 Oct 2020 11:59:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0753BE0936 for ; Sun, 4 Oct 2020 11:59:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CAD02335D87 for ; Sun, 4 Oct 2020 11:59:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40DC7373 for ; Sun, 4 Oct 2020 11:59:56 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1601812794.51f727eceef391dcee1f5f9d3d9215f779f1b8fd.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xlockmore/, x11-misc/xlockmore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xlockmore/Manifest x11-misc/xlockmore/files/xlockmore-5.66_alpha06-rotator.patch x11-misc/xlockmore/xlockmore-5.66_alpha05.ebuild x11-misc/xlockmore/xlockmore-5.66_alpha06.ebuild X-VCS-Directories: x11-misc/xlockmore/ x11-misc/xlockmore/files/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 51f727eceef391dcee1f5f9d3d9215f779f1b8fd X-VCS-Branch: master Date: Sun, 4 Oct 2020 11:59:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cb5dcb0b-4e40-4abe-ad93-332558c5b6d0 X-Archives-Hash: 590b242e3bb356715c57bda1afd26bb2 commit: 51f727eceef391dcee1f5f9d3d9215f779f1b8fd Author: Jeroen Roovers gentoo org> AuthorDate: Sun Oct 4 08:55:58 2020 +0000 Commit: Jeroen Roovers gentoo 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 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 - 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 -}