x11-misc/xlockmore: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index a64db590bd78f2ad39c0193f929400df23e3557d..5fe81d10713fcc0d190005aaa5a661d85dee77f0 100644 (file)
--- 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 (file)
index a0b8f6d..0000000
--- 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 (file)
index 85ca2fe..0000000
--- 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 (file)
index da34870..0000000
--- 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 (file)
index 13a8428..0000000
--- 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}
-}