ppc64 stable wrt #306107

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 7 insertions, 158 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 6ce9d7cdbdf4..76e09825af56 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.94 2010/06/27 11:15:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.95 2010/07/04 09:14:04 ssuominen Exp $
+
+  04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  afterstep-2.2.9.ebuild:
+  ppc64 stable wrt #306107
 
   27 Jun 2010; Raúl Porcel <armin76@gentoo.org> afterstep-2.2.9.ebuild:
   alpha/ia64/sparc stable wrt #306107
diff --git a/x11-wm/afterstep/afterstep-2.2.4.ebuild b/x11-wm/afterstep/afterstep-2.2.4.ebuild
deleted file mode 100644
index f33a8be56641..000000000000
--- a/x11-wm/afterstep/afterstep-2.2.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.4.ebuild,v 1.17 2010/04/14 13:03:57 voyageur Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
-
-# libAfterBase/libAfterImage are LGPL
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
-
-RDEPEND="media-libs/freetype
-	png? ( >=media-libs/libpng-1.2.5 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	gif?  ( >=media-libs/giflib-4.1.0 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto
-	xinerama? ( x11-proto/xineramaproto )
-	!media-libs/libafterimage"
-
-S=${WORKDIR}/AfterStep-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/no-alternatives.patch
-}
-
-src_compile() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	#implied intent of debug means you need the frame pointers.
-	use debug && filter-flags -fomit-frame-pointer
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --with-ungif=no - Use giflib instead of libungif
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-
-	econf \
-		$(use_enable nls i18n) \
-		$(use_enable mmx mmx-optimization) \
-		$(use_enable xinerama) \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with gif) \
-		$(use_with tiff) \
-		--with-helpcommand="xterm -e man" \
-		--with-ungif=no \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf} || die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# see bug #31541
-	dodir /usr/share/gnome/wm-properties
-
-	# afterstep tries to detect the current resolution
-	# for documentation generation, causing access violations
-	# for the video device.  bug #87356
-	unset DISPLAY
-
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm "${D}"/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR "${S}"/libAfterImage/libAfterImage.so* "${D}"/usr/lib
-	cp -pPR "${S}"/libAfterBase/libAfterBase.so* "${D}"/usr/lib
-	cp -pPR "${S}"/libAfterConf/libAfterConf.so* "${D}"/usr/lib
-	cp -pPR "${S}"/libAfterStep/libAfterStep.so* "${D}"/usr/lib
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm "${D}"/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR "${S}"/TODO "${D}"/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR "${S}"/doc/* "${D}"/usr/share/doc/${PF}/html
-	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins "${S}"/AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/afterstep
-}
-
-pkg_postinst() {
-	echo
-	einfo "To use AfterStep issue the following commands:"
-	einfo "mv ~/.xinitrc ~/xinitrc.old"
-	einfo "echo afterstep > ~/.xinitrc"
-	echo
-	einfo "If you like AfterStep please vote for it at"
-	einfo "http://www.PLiG.org/xwinman/vote.html !"
-	echo
-}
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
index 020c9c9f8e25..5afeee8ec86d 100644
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.13 2010/06/27 11:15:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.14 2010/07/04 09:14:04 ssuominen Exp $
 
 EAPI=2
 inherit autotools flag-o-matic eutils
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
 # libAfterBase/libAfterImage are LGPL
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="alsa debug dbus gif gtk jpeg mmx nls png svg tiff xinerama"
 
 RDEPEND="media-libs/freetype
diff --git a/x11-wm/afterstep/files/no-alternatives.patch b/x11-wm/afterstep/files/no-alternatives.patch
deleted file mode 100644
index f2308b07778a..000000000000
--- a/x11-wm/afterstep/files/no-alternatives.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.in.orig	2006-11-01 12:28:46.000000000 -0500
-+++ Makefile.in	2006-11-01 12:29:16.000000000 -0500
-@@ -70,7 +70,8 @@
- 
- module.clean:
-  
--install:  install.alternative install.desktop install.wmprops mkdir
-+#install:  install.alternative install.desktop install.wmprops mkdir
-+install:  install.desktop install.wmprops mkdir
- 	@for I in ${subdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} install || exit 1); fi; done
- 
- install.bin: mkdir.bin
-@@ -85,11 +86,11 @@
- install.script: mkdir.bin
- 	@for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} install.script || exit 1); fi; done
- 
--install.alternative:
--	@if update-alternatives --version > /dev/null 2>&1 ; then 	\
--		update-alternatives --install x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \
--		echo "added AfterStep as an x-window-manager alternative"; \
--	fi
-+#install.alternative:
-+#	@if update-alternatives --version > /dev/null 2>&1 ; then 	\
-+#		update-alternatives --install x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \
-+#		echo "added AfterStep as an x-window-manager alternative"; \
-+#	fi
- 	
- 
- install.desktop: AfterStep.desktop.final mkdir.share