public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/
Date: Tue, 24 May 2016 14:37:45 +0000 (UTC)	[thread overview]
Message-ID: <1464100664.810c4d2bc5fb2d31c93c4f45b18f4235281be626.jer@gentoo> (raw)

commit:     810c4d2bc5fb2d31c93c4f45b18f4235281be626
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 14:36:29 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue May 24 14:37:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=810c4d2b

x11-misc/xscreensaver: Version bump.

Package-Manager: portage-2.3.0_rc1

 x11-misc/xscreensaver/Manifest                     |   1 +
 .../files/xscreensaver-5.35-comments.patch         |  16 +++
 x11-misc/xscreensaver/xscreensaver-5.35.ebuild     | 143 +++++++++++++++++++++
 3 files changed, 160 insertions(+)

diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 18776af..6a85174 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1 +1,2 @@
 DIST xscreensaver-5.34.tar.gz 10788657 SHA256 6fff7ec4be743e5c042647ea9687dd0cdf48d1dd5e8e15098e5018bbd02e5e27 SHA512 58d0beb6556ee77122feb04090ceed80f9ffa67070f28305a00cc42adeae678305d43594c38d00539d2f13f2474311cb82cda6fdafc2bdc918a28438d6b51e75 WHIRLPOOL c7969e5b762cbeabd0564328aefdb895acfcd1c37e2b84c628718b613ca309f4c1222103c0d6ab0fd046eb355f02ee36b11fb57b55eb72e65944ea72e4fa7419
+DIST xscreensaver-5.35.tar.gz 10502254 SHA256 477882be0d829050c0883e4d7e3d08603857b019b79ad358948e45158f876e66 SHA512 c2b9c766b240439b472e9d2d85d2bbdb883fcc1803b1302d8c273e3fa7b3319a245f6d1c8f79c383c2f04ab9d19fc0f7d1302dadbb254e12c46d7309f051cfad WHIRLPOOL b97e6ebc0e368e75a02fdb793a9ac9c81fb1b505cce3a1b73679143b82efc6561769743aff0b77ee40251d63a0a1b7eb73d8ff7870e663fe9e6c45a1e8fd9594

diff --git a/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch b/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch
new file mode 100644
index 0000000..0794f4e
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-5.35-comments.patch
@@ -0,0 +1,16 @@
+--- a/utils/grabclient.c
++++ b/utils/grabclient.c
+@@ -127,11 +127,11 @@
+   XtInputId pipe_id;
+   FILE *pipe;
+ 
+-# if !defined(USE_IPHONE) && !defined(HAVE_COCOA)  // Real X11
++# if !defined(USE_IPHONE) && !defined(HAVE_COCOA)  /* Real X11 */
+   pid_t pid;
+ # endif
+ 
+-# if !defined(USE_IPHONE) && defined(HAVE_COCOA)   // Desktop OSX
++# if !defined(USE_IPHONE) && defined(HAVE_COCOA)   /* Desktop OSX */
+   char *directory;
+ # endif
+ 

diff --git a/x11-misc/xscreensaver/xscreensaver-5.35.ebuild b/x11-misc/xscreensaver/xscreensaver-5.35.ebuild
new file mode 100644
index 0000000..43b10c5
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-5.35.ebuild
@@ -0,0 +1,143 @@
+# 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 multilib pam
+
+DESCRIPTION="A modular screen saver and locker for the X Window System"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+SRC_URI="
+	http://www.jwz.org/xscreensaver/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="gdm jpeg new-login opengl pam +perl selinux suid xinerama"
+
+COMMON_DEPEND="
+	>=gnome-base/libglade-2
+	dev-libs/libxml2
+	media-libs/netpbm
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86misc
+	x11-libs/libXxf86vm
+	jpeg? ( virtual/jpeg:0 )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm kde-base/kdm ) )
+		)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( virtual/pam )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/recordproto
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+src_prepare() {
+	sed -i configure.in -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.in} || die
+	fi
+
+	epatch \
+		"${FILESDIR}"/${PN}-5.33-gentoo.patch \
+		"${FILESDIR}"/${PN}-5.05-interix.patch \
+		"${FILESDIR}"/${PN}-5.20-blurb-hndl-test-passwd.patch \
+		"${FILESDIR}"/${PN}-5.20-test-passwd-segv-tty.patch \
+		"${FILESDIR}"/${PN}-5.20-tests-miscfix.patch \
+		"${FILESDIR}"/${PN}-5.28-comment-style.patch \
+		"${FILESDIR}"/${PN}-5.31-pragma.patch \
+		"${FILESDIR}"/${PN}-5.35-comments.patch
+
+	eapply_user
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+	export RPM_PACKAGE_VERSION=no #368025
+
+	econf \
+		$(use_with jpeg) \
+		$(use_with new-login login-manager) \
+		$(use_with opengl gl) \
+		$(use_with pam) \
+		$(use_with suid setuid-hacks) \
+		$(use_with xinerama xinerama-ext) \
+		--enable-locking \
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config \
+		--with-dpms-ext \
+		--with-gtk \
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} \
+		--with-pixbuf \
+		--with-proc-interrupts \
+		--with-randr-ext \
+		--with-text-file="${EPREFIX}"/etc/gentoo-release \
+		--with-x-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults \
+		--with-xdbe-ext \
+		--with-xf86gamma-ext \
+		--with-xf86vmode-ext \
+		--with-xinput-ext \
+		--with-xshm-ext \
+		--without-gle \
+		--without-kerberos \
+		--x-includes="${EPREFIX}"/usr/include \
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	emake install_prefix="${D}" install
+
+	dodoc README{,.hacking}
+
+	use pam && fperms 755 /usr/bin/${PN}
+	pamd_mimic_system ${PN} auth
+
+	rm -f "${ED}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
+}


             reply	other threads:[~2016-05-24 14:37 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-24 14:37 Jeroen Roovers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-12-29  0:04 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xscreensaver/files/, x11-misc/xscreensaver/ Jeroen Roovers
2019-07-03  6:40 Jeroen Roovers
2019-11-07  8:28 Jeroen Roovers
2020-03-22  7:33 Jeroen Roovers
2021-03-16  0:16 Sebastian Pipping
2021-06-14  0:53 Sebastian Pipping
2021-06-14 10:18 Sebastian Pipping
2022-10-31 17:32 Ulrich Müller
2023-08-09  8:30 Florian Schmaus
2024-05-05  9:39 Florian Schmaus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1464100664.810c4d2bc5fb2d31c93c4f45b18f4235281be626.jer@gentoo \
    --to=jer@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox