x11-misc/xlockmore: Version bump.

Package-Manager: portage-2.2.28

6 files changed, 203 insertions, 0 deletions

diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index bf1002f007f..0d080d35dc1 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -1,2 +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
diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch b/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch
new file mode 100644
index 00000000000..0617c5199d4
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-CXX.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,11 +10,11 @@
+ 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
++dnl if test "$CC" = gcc; then
++dnl   AC_CHECK_PROGS(CXX, $CCC g++ CC C++ c++ cxx cc++ xlC $CC, gcc)
++dnl else
++dnl   AC_CHECK_PROGS(CXX, $CCC CC C++ g++ c++ cxx cc++ xlC $CC, gcc)
++dnl fi
+ AC_PROG_CXX
+ if test "${CXX}" = "xlC" ; then
+   CXXFLAGS="${CXXFLAGS} -+"
diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch b/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch
new file mode 100644
index 00000000000..9d88a342db5
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-_BSD_SOURCE.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3946,7 +3946,7 @@
+     AC_DEFINE([linux], [1], [Linux OS])
+ dnl    AC_DEFINE([__i386__], [1], [Intel 386 machine])
+     AC_DEFINE([_POSIX_SOURCE], [1], [POSIX source])
+-    AC_DEFINE([_BSD_SOURCE], [1], [BSD source])
++    AC_DEFINE([_DEFAULT_SOURCE], [1], [DEFAULT source])
+     AC_DEFINE([_GNU_SOURCE], [1], [GNU source])
+ dnl    AC_DEFINE([DX_LOCALE], [1], [DX Locale])
+     if test -e /etc/shadow ; then
diff --git a/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch b/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch
new file mode 100644
index 00000000000..e2d76251b4d
--- /dev/null
+++ b/x11-misc/xlockmore/files/xlockmore-5.47-strip.patch
@@ -0,0 +1,64 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3895,7 +3895,7 @@
+     BITMAPTYPE="bsd"
+     PIXMAPTYPE="bsd"
+     FORTUNE=""
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     cpp_name=`echo $CC | cut -f1 -d' '`
+     if test "$cpp_name" = "gcc"; then
+         dirname=`which gcc`
+@@ -3960,7 +3960,6 @@
+           ;;
+       esac
+     fi
+-    INSTPGMFLAGS="-s $INSTPGMFLAGS"
+     BITMAPTYPE="linux"
+     PIXMAPTYPE="linux"
+ dnl if Shadow and not elf
+@@ -3985,7 +3984,7 @@
+         AC_SUBST(OSF1_ENH_SEC)
+         XLOCKLIBS="${XLOCKLIBS} -lsecurity"
+         # SETGID auth may not be enough for Tru64 5.x.
+-        INSTPGMFLAGS="-s -g auth -m 2111"
++        INSTPGMFLAGS="-g auth -m 2111"
+       else
+         AC_MSG_RESULT(no)
+       fi
+@@ -4011,7 +4010,7 @@
+         PIXMAPTYPE="sol"
+       ;;
+     esac
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     AC_DEFINE([HAVE_SHADOW], [1], [Shadow passwording])
+     AC_DEFINE([SYSV], [1], [System 5])
+     AC_DEFINE([SVR4], [1], [System 5 Release 4])
+@@ -4040,7 +4039,7 @@
+   ;;
+ 
+   *-*-sysv5* )
+-    INSTPGMFLAGS="-s -o root -m 4111"
++    INSTPGMFLAGS="-o root -m 4111"
+     AC_DEFINE([HAVE_SHADOW], [1], [Shadow passwording])
+     AC_DEFINE([SYSV], [1], [System 5])
+     AC_DEFINE([SVR4], [1], [System 5 Release 4])
+@@ -4820,7 +4819,7 @@
+   case ${canonical} in
+   *-*-linux*)
+     if test "$vtlock" = "yes"; then
+-      INSTPGMFLAGS="-s -o root -g bin -m 4111"
++      INSTPGMFLAGS="-o root -g bin -m 4111"
+       AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS" for vtlock])
+        echo "experimental: Big buffer overrun security risk"
+     else
+@@ -4838,7 +4837,7 @@
+   case ${canonical} in
+   *-*-linux*)
+     if test "$vtlock" = "yes"; then
+-      INSTPGMFLAGS="-s -o root -g bin -m 4111"
++      INSTPGMFLAGS="-o root -g bin -m 4111"
+       AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS" for vtlock])
+     else
+   AC_MSG_RESULT([defining install options (setuid/setgid) = "$INSTPGMFLAGS"])
diff --git a/x11-misc/xlockmore/metadata.xml b/x11-misc/xlockmore/metadata.xml
index 9f3a1ef40ba..673b683e242 100644
--- a/x11-misc/xlockmore/metadata.xml
+++ b/x11-misc/xlockmore/metadata.xml
@@ -7,5 +7,6 @@
   </maintainer>
   <use>
     <flag name="xlockrc">Enables xlockrc for people without PAM</flag>
+    <flag name="vtlock">Enables support for virtual terminal locking</flag>
   </use>
 </pkgmetadata>
diff --git a/x11-misc/xlockmore/xlockmore-5.47.ebuild b/x11-misc/xlockmore/xlockmore-5.47.ebuild
new file mode 100644
index 00000000000..6f246b15deb
--- /dev/null
+++ b/x11-misc/xlockmore/xlockmore-5.47.ebuild
@@ -0,0 +1,107 @@
+# 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 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
+}