public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-misc/xscreensaver: xscreensaver-5.05.ebuild ChangeLog xscreensaver-5.05-r1.ebuild
@ 2008-05-07 19:03 Samuli Suominen (drac)
  0 siblings, 0 replies; only message in thread
From: Samuli Suominen (drac) @ 2008-05-07 19:03 UTC (permalink / raw
  To: gentoo-commits

drac        08/05/07 19:03:33

  Modified:             xscreensaver-5.05.ebuild ChangeLog
  Added:                xscreensaver-5.05-r1.ebuild
  Log:
  Remove NotShowIn=GNOME; and use xscreensaver.xpm for unique appearance in desktop entry. Split -5.04-gentoo.patch into separate patches. Add directory for cracklib-words. Fix bug with Xinerama wrt bug #219172.
  (Portage version: 2.1.5_rc6)

Revision  Changes    Path
1.11                 x11-misc/xscreensaver/xscreensaver-5.05.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild?r1=1.10&r2=1.11

Index: xscreensaver-5.05.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xscreensaver-5.05.ebuild	20 Apr 2008 02:30:26 -0000	1.10
+++ xscreensaver-5.05.ebuild	7 May 2008 19:03:33 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v 1.10 2008/04/20 02:30:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05.ebuild,v 1.11 2008/05/07 19:03:33 drac Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -40,12 +40,7 @@
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# phew, posted everything to upstream so lets
-	# see what version 5.06 brings us..
-	epatch "${FILESDIR}"/${PN}-5.04-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-5.04-nsfw.patch
-	epatch "${FILESDIR}"/${P}-desktop-entry.patch
-	epatch "${FILESDIR}"/${P}-posix-head.patch
+	EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="07_all_xinerama.patch" epatch	"${FILESDIR}"/${PV}
 	eautoreconf # bug 113681
 }
 



1.233                x11-misc/xscreensaver/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.233&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?rev=1.233&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/ChangeLog?r1=1.232&r2=1.233

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- ChangeLog	2 Apr 2008 17:48:04 -0000	1.232
+++ ChangeLog	7 May 2008 19:03:33 -0000	1.233
@@ -1,6 +1,19 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.232 2008/04/02 17:48:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.233 2008/05/07 19:03:33 drac Exp $
+
+*xscreensaver-5.05-r1 (07 May 2008)
+
+  07 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/5.05/01_all_default_settings.patch,
+  +files/5.05/03_all_desktop_entry.patch,
+  +files/5.05/05_all_offensive.patch,
+  +files/5.05/02_all_cracklib_words.patch,
+  +files/5.05/04_all_posix_head.patch, +files/5.05/06_all_rpm.patch,
+  +files/5.05/07_all_xinerama.patch, +xscreensaver-5.05-r1.ebuild:
+  Remove NotShowIn=GNOME; and use xscreensaver.xpm for unique appearance in
+  desktop entry. Split -5.04-gentoo.patch into separate patches. Add
+  directory for cracklib-words. Fix bug with Xinerama wrt bug #219172.
 
   02 Apr 2008; Raúl Porcel <armin76@gentoo.org> xscreensaver-5.05.ebuild:
   ia64 stable



1.1                  x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild?rev=1.1&content-type=text/plain

Index: xscreensaver-5.05-r1.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.05-r1.ebuild,v 1.1 2008/05/07 19:03:33 drac Exp $

inherit autotools eutils flag-o-matic multilib pam

DESCRIPTION="A modular screen saver and locker for the X Window System"
SRC_URI="http://www.jwz.org/xscreensaver/${P}.tar.gz"
HOMEPAGE="http://www.jwz.org/xscreensaver"

LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="jpeg new-login opengl pam suid xinerama"

RDEPEND="x11-libs/libXmu
	x11-libs/libXxf86vm
	x11-libs/libXrandr
	x11-libs/libXxf86misc
	x11-libs/libXt
	x11-libs/libX11
	x11-libs/libXext
	x11-apps/xwininfo
	x11-apps/appres
	media-libs/netpbm
	>=dev-libs/libxml2-2.5
	>=x11-libs/gtk+-2
	>=gnome-base/libglade-1.99
	pam? ( virtual/pam )
	jpeg? ( media-libs/jpeg )
	opengl? ( virtual/opengl )
	xinerama? ( x11-libs/libXinerama )
	new-login? ( gnome-base/gdm )"
DEPEND="${RDEPEND}
	x11-proto/xf86vidmodeproto
	x11-proto/xextproto
	x11-proto/scrnsaverproto
	x11-proto/recordproto
	x11-proto/xf86miscproto
	sys-devel/bc
	dev-util/pkgconfig
	sys-devel/gettext
	dev-util/intltool
	xinerama? ( x11-proto/xineramaproto )"

src_unpack() {
	unpack ${A}
	cd "${S}"
	EPATCH_SUFFIX="patch" epatch "${FILESDIR}"/${PV}
	eautoreconf # bug 113681
}

src_compile() {
	if use ppc || use ppc64; then
		# Still fails to build "flurry" screensaver.
		filter-flags -mabi=altivec
		filter-flags -maltivec
		append-flags -U__VEC__
	fi

	unset BC_ENV_ARGS

	econf \
		--with-x-app-defaults=/usr/share/X11/app-defaults \
		--with-hackdir=/usr/$(get_libdir)/misc/${PN} \
		--with-configdir=/usr/share/${PN}/config \
		--x-libraries=/usr/$(get_libdir) \
		--x-includes=/usr/include \
		--with-dpms-ext \
		--with-xf86vmode-ext \
		--with-xf86gamma-ext \
		--with-randr-ext \
		--with-proc-interrupts \
		--with-xpm \
		--with-xshm-ext \
		--with-xdbe-ext \
		--enable-locking \
		--without-kerberos \
		--without-gle \
		--with-gtk \
		$(use_with suid setuid-hacks) \
		$(use_with new-login login-manager) \
		$(use_with xinerama xinerama-ext) \
		$(use_with pam) \
		$(use_with opengl gl) \
		$(use_with jpeg)

	emake -j1 || die "emake failed." # bug 155049
}

src_install() {
	emake install_prefix="${D}" install || die "emake install failed."

	dodoc README{,.hacking}

	use pam && fperms 755 /usr/bin/${PN}
	pamd_mimic_system ${PN} auth

	# bug 135549
	rm -f "${D}"/usr/share/${PN}/config/{electricsheep,fireflies}.xml
	dodir /usr/share/man/man6x
	mv "${D}"/usr/share/man/man6/worm.6 \
		"${D}"/usr/share/man/man6x/worm.6x
}



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-05-07 19:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-07 19:03 [gentoo-commits] gentoo-x86 commit in x11-misc/xscreensaver: xscreensaver-5.05.ebuild ChangeLog xscreensaver-5.05-r1.ebuild Samuli Suominen (drac)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox