Fix bug #118028. Removed old version.

Package-Manager: portage-2.1_pre3-r1

6 files changed, 58 insertions, 199 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index cc409b0878c4..1b536df35b25 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.125 2006/01/03 23:30:16 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.126 2006/01/15 12:59:15 nelchael Exp $
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xscreensaver-4.23-norpm.patch, -xscreensaver-4.22-r2.ebuild,
+  xscreensaver-4.23.ebuild:
+  Fix bug #118028 - sandbox violation when rpm is installed. Removed old version.
 
   03 Jan 2006; Luis Medinas <metalgod@gentoo.org> xscreensaver-4.23.ebuild:
   Stable on amd64.
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index e7eb615ad8ea..fbf9f3846bd0 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,10 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3f07baf6f1bc5e1c77f3b878c6b2b470 ChangeLog 21001
+MD5 1bac3ba003c9983ccca0e473a0dfe6cf ChangeLog 21235
 MD5 51377e1938cf119bd11972b3c30c0a25 files/desktop_entries/screensaver-properties.desktop 1000
 MD5 64d504c9ea04705ce78f9ffb87c96321 files/digest-xscreensaver-4.20 70
-MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r2 70
 MD5 24bb039b898635c9224f9866f29757ed files/digest-xscreensaver-4.22-r4 70
 MD5 4e81a52673c939318a008be6a0835435 files/digest-xscreensaver-4.23 70
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
@@ -16,17 +12,10 @@ MD5 e6a4444e1548adf83be31a933c5e19bf files/xscreensaver-4.22-interaggregate.patc
 MD5 cab8a426e9f99c0b49f598983b896b80 files/xscreensaver-4.22-nsfw-webcollage.patch 5029
 MD5 0802ff58ba46dfdc9d155798ef4936e5 files/xscreensaver-4.22-settings.patch 1766
 MD5 bd61d24250fdc129cf9b86e154c8c27a files/xscreensaver-4.23-app-defaults.patch 1080
+MD5 0ed894eebbc461f9523539a8d273535e files/xscreensaver-4.23-norpm.patch 1775
 MD5 e24f49eb6b4473a5fd9f0869065cfe85 files/xscreensaver-4.23-nsfw.patch 6634
 MD5 7528066fa9a88bd1b6d46224d118dd7b files/xscreensaver-blank-screen.patch 487
 MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
 MD5 30baa75aa8ad6b15fa87c15cce9d3f40 xscreensaver-4.20.ebuild 4842
-MD5 ec122eaf5cf8ae7c3738b52c5d3d42c1 xscreensaver-4.22-r2.ebuild 5474
 MD5 eca40273355199f6c11a72010194217e xscreensaver-4.22-r4.ebuild 5657
-MD5 1d53f49b3d175911ed29b0998d10b43b xscreensaver-4.23.ebuild 5851
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDuwkFwUpWvClEHQoRAmH0AKCIVtGIhW3OE5dgKU63M4TnFQFeuACggNoU
-VKN1iQkyOqO7rZVUjx+9q9A=
-=daQY
------END PGP SIGNATURE-----
+MD5 8d800b1bdb32ff691b97ca0df3fe70ae xscreensaver-4.23.ebuild 5857
diff --git a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r2 b/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r2
deleted file mode 100644
index 6f0f6e359c66..000000000000
--- a/x11-misc/xscreensaver/files/digest-xscreensaver-4.22-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9f37c428f034e581026e243445378195 xscreensaver-4.22.tar.gz 4620066
diff --git a/x11-misc/xscreensaver/files/xscreensaver-4.23-norpm.patch b/x11-misc/xscreensaver/files/xscreensaver-4.23-norpm.patch
new file mode 100644
index 000000000000..a7502f259118
--- /dev/null
+++ b/x11-misc/xscreensaver/files/xscreensaver-4.23-norpm.patch
@@ -0,0 +1,46 @@
+diff -Nru xscreensaver-4.23/configure.in xscreensaver-4.23.norpm/configure.in
+--- xscreensaver-4.23/configure.in	2005-10-17 03:05:49.000000000 +0200
++++ xscreensaver-4.23.norpm/configure.in	2006-01-14 00:21:20.000000000 +0100
+@@ -4070,41 +4070,7 @@
+ # Now let's warn if there's a previous RPM version already installed.
+ # But don't bother with this test if we are currently *building* an RPM.
+ 
+-if test -z "$RPM_PACKAGE_VERSION" ; then
+-
+-  rpmnames="xscreensaver xscreensaver-base xscreensaver-extras"
+-
+-  # M4 sucks!!
+-  changequote(X,Y)
+-  rpmv=`(rpm -qv $rpmnames) 2>/dev/null | \
+-        sed -n 's/^[-a-z]*-\([0-9][0-9]*[.][0-9][0-9a-z]*\)-.*$/\1/p' | \
+-        head -1`
+-  changequote([,])
+-
+-  if test \! -z "$rpmv" ; then
+-    rpmbdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/xscreensaver-demo$@\1@p'`
+-    rpmhdir=`rpm -ql $rpmnames | sed -n 's@^\(.*\)/attraction$@\1@p'`
+-
+-    warning=no
+-    warnL "There is already an installed RPM of xscreensaver $rpmv"
+-    warn2 'on this system.  You might want to remove it ("rpm -ve")'
+-    warn2 'before running "make install" in this directory.'
+-    echo ""
+-    warn2 "Alternately, you could build this version of xscreensaver"
+-    warn2 'as an RPM, and then install that.  An "xscreensaver.spec"'
+-    warn2 'file is included.  Try "rpmbuild -v -ba xscreensaver.spec".'
+-    warn2 "See the RPM documentation for more info."
+-    echo ""
+-
+-    if test "$rpmbdir" = "$rpmhdir" ; then
+-      warn2 "The RPM version was installed in $rpmbdir/."
+-      do_dir_warning=yes
+-    else
+-      warn2 "The RPM version was installed in $rpmbdir/,"
+-      warn2 "with demos in $rpmhdir/."
+-    fi
+-  fi
+-fi
++# Nope - breaks compilation with sandbox violation
+ 
+ if test "${bindir}" = "${HACKDIR}" ; then
+   do_dir_warning=yes
diff --git a/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild
deleted file mode 100644
index ad69377427b2..000000000000
--- a/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.22-r2.ebuild,v 1.10 2005/08/23 21:47:19 agriffis Exp $
-
-inherit eutils flag-o-matic pam
-
-IUSE="gnome gtk jpeg kde kerberos krb4 motif new-login nls offensive opengl pam xinerama"
-
-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"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sparc x86"
-SLOT="0"
-
-# NOTE: ignore app-games/fortune-mod as a dep. it is pluggable and won't
-#       really matter if it isn't there. Maybe we should have a 'games'
-#       USE flag
-
-RDEPEND="virtual/x11
-	media-libs/netpbm
-	>=sys-libs/zlib-1.1.4
-	gtk? (
-		>=dev-libs/libxml2-2.5
-		>=x11-libs/gtk+-2
-		>=gnome-base/libglade-1.99
-		>=dev-libs/glib-2
-	)
-	motif? ( x11-libs/openmotif )
-	pam? ( virtual/pam )
-	kerberos? ( krb4? ( >=app-crypt/mit-krb5-1.2.5 ) )
-	jpeg? ( media-libs/jpeg )
-	opengl? ( virtual/opengl
-	          >=media-libs/gle-3.0.1 )
-	!arm? ( new-login? ( gnome-base/gdm ) )"
-
-DEPEND="${RDEPEND}
-	sys-devel/bc
-	dev-lang/perl
-	gtk? ( dev-util/pkgconfig )
-	nls? ( sys-devel/gettext )"
-
-# simple workaround for the flurry screensaver
-filter-flags -mabi=altivec
-filter-flags -maltivec
-append-flags -U__VEC__
-
-pkg_setup() {
-	if ! use gtk ; then
-		if use motif ; then
-			ewarn "From the configure script:"
-			ewarn
-			ewarn "  Though the Motif front-end to xscreensaver is still"
-			ewarn "  maintained, it is no longer being updated with new"
-			ewarn "  features: all new development on the xscreensaver-demo"
-			ewarn "  program is happening in the GTK version, and not in the"
-			ewarn "  Motif version."
-			ewarn
-			ewarn "It is recommended that you use the \"gtk\" USE flag."
-		else
-			ewarn "You have enabled neither gtk nor motif USE flags.  xscreensaver-demo"
-			ewarn "requires either GTK+ 2 or Motif (GTK+ 2 is recommended, as the Motif"
-			ewarn "version is no longer being maintained), so xscreensaver-demo will not"
-			ewarn "be built.  This is most likely NOT what you want."
-		fi
-		ewarn
-		epause
-	fi
-	if use kerberos && ! use krb4 ; then
-		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
-		ewarn "disabled unless kerberos 4 support has been compiled with your"
-		ewarn "kerberos libraries. To do that, you should abort now and do:"
-		ewarn
-		ewarn " USE=\"krb4\" emerge mit-krb5"
-		ewarn
-		epause
-	fi
-	if use arm && use new-login; then
-		ewarn "gnome-base/gdm is required for USE=\"new-login\", and is not"
-		ewarn "available for the arm platform. please disable this use flag"
-		die "new-login USE is not supported on arm"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
-	# use gnome-terminal in tests rather than gnome-open (bug #94708)
-	epatch ${FILESDIR}/${PN}-4.22-configure.patch
-	# tweaks the default configuration (driver/XScreenSaver.ad.in)
-	epatch ${FILESDIR}/${PN}-4.22-settings.patch
-	# fixes wrong argument for inter-aggregate screensaver
-	epatch ${FILESDIR}/${PN}-4.22-interaggregate.patch
-	# disable not-safe-for-work xscreensavers
-	use offensive || epatch ${FILESDIR}/${PN}-4.16-nsfw.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use gtk ; then
-		myconf="${myconf} --without-motif --with-xml"
-	elif use motif; then
-		myconf="${myconf} --with-motif --without-pixbuf"
-	else
-		myconf="${myconf} --without-motif --without-pixbuf"
-	fi
-
-	use kerberos && use krb4 \
-		&& myconf="${myconf} --with-kerberos" \
-		|| myconf="${myconf} --without-kerberos"
-
-	econf \
-		--with-hackdir=/usr/lib/misc/xscreensaver \
-		--with-configdir=/usr/share/xscreensaver/config \
-		--x-libraries=/usr/$(get_libdir) \
-		--x-includes=/usr/include \
-		--with-mit-ext \
-		--with-dpms-ext \
-		--with-xf86vmode-ext \
-		--with-xf86gamma-ext \
-		--with-proc-interrupts \
-		--with-xpm \
-		--with-xshm-ext \
-		--with-xdbe-ext \
-		--enable-locking \
-		$(use_with gtk) \
-		$(use_with new-login login-manager) \
-		$(use_with xinerama xinerama-ext) \
-		$(use_with pam) \
-		$(use_with opengl gl) $(use_with opengl gle) \
-		$(use_with jpeg) \
-		$(use_enable nls) \
-		${myconf} || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	[ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
-
-	make install_prefix="${D}" install || die "make install failed"
-
-	dodoc README
-
-	# install correctly in gnome2
-	if use gnome ; then
-		dodir /usr/share/gnome/capplets
-		insinto /usr/share/gnome/capplets
-		doins driver/screensaver-properties.desktop
-	fi
-
-	# install symlink to satisfy kde
-	use kde && dosym /usr/share/xscreensaver/config /usr/$(get_libdir)/xscreensaver/config
-
-	# Remove "extra" capplet
-	rm -f ${D}/usr/share/applications/gnome-screensaver-properties.desktop
-
-	if use gnome ; then
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
-	fi
-
-	use pam && fperms 755 /usr/bin/xscreensaver
-	pamd_mimic_system xscreensaver auth
-}
-
-pkg_postinst() {
-	if ! use new-login; then
-		einfo "You have chosen to not use the new-login USE flag."
-		einfo "This is a new USE flag which enables individuals to"
-		einfo "create new logins when the screensaver is active,"
-		einfo "allowing others to use their account, even though the"
-		einfo "screen is locked to another account. If you want this"
-		einfo "feature, please recompile with USE=\"new-login\"."
-	fi
-}
diff --git a/x11-misc/xscreensaver/xscreensaver-4.23.ebuild b/x11-misc/xscreensaver/xscreensaver-4.23.ebuild
index 94afa742bb23..ad901e275bb9 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.23.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.23.ebuild,v 1.10 2006/01/03 23:30:16 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.23.ebuild,v 1.11 2006/01/15 12:59:15 nelchael Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -85,7 +85,8 @@ src_unpack() {
 
 	# disable rpm -q checking, otherwise it breaks sandbox if rpm is installed
 	# use gnome-terminal in tests rather than gnome-open (bug #94708)
-	epatch ${FILESDIR}/${PN}-4.22-configure.patch
+	# and bug 118028:
+	epatch "${FILESDIR}/${PN}-4.23-norpm.patch"
 
 	# tweaks the default configuration (driver/XScreenSaver.ad.in)
 	epatch ${FILESDIR}/${PN}-4.22-settings.patch
@@ -101,7 +102,6 @@ src_unpack() {
 	eautoreconf
 
 	# change old head/tail to POSIX ones
-	#cd hacks
 	ht_fix_all
 }