Version bump; tidy'd old ebuilds/patches.

(Portage version: 2.0.51.22-r1)

10 files changed, 34 insertions, 259 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 09bfd9a55320..a7fe4d0c0b7e 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.37 2005/06/09 23:08:18 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.38 2005/06/12 09:09:58 ka0ttic Exp $
+
+*afterstep-2.1.1 (12 Jun 2005)
+
+  12 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> -files/as2-gnome.diff,
+  -files/afterstep-2.00.01-fix-makefile.diff, -files/as2-gnome-r1.diff,
+  -afterstep-2.00.01.ebuild, -afterstep-2.00.02.ebuild,
+  +afterstep-2.1.1.ebuild:
+  Version bump; tidy'd old ebuilds/patches.
 
   09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   afterstep-2.00.05.ebuild:
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 8513b239eda1..30bb051e9d7a 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,29 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d6c3cad8f9e500b622dd5dac00cdd83f afterstep-2.00.05.ebuild 3358
 MD5 61ac082c6563be2e5790a287988a4674 afterstep-1.8.11-r2.ebuild 1543
-MD5 ee92461f26ba5338a6a1333c1e5f14a1 afterstep-2.00.02.ebuild 3692
+MD5 8424c9368cf00500faf961341cc53fc7 afterstep-2.1.1.ebuild 3357
 MD5 849422948d5fed5843fccb8a0732e80c afterstep-2.00.04.ebuild 3358
 MD5 8424c9368cf00500faf961341cc53fc7 afterstep-2.1.0.ebuild 3357
-MD5 dc7330ad6bd325f8de130c85b38d7766 ChangeLog 5669
+MD5 809647c8880d79b2d136d1c214fb510e ChangeLog 5973
 MD5 5fcb6c5011c265ab4d4268662ee0dac9 metadata.xml 353
-MD5 fca9d0ef8f9ab0142654d2cf85544310 afterstep-2.00.01.ebuild 3673
 MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
-MD5 776a43b6b57674eb3b1ec1f026707be5 files/as2-gnome-r1.diff 1802
 MD5 720723e9a9846b9d6a7e64a25b1adbbc files/afterstep 29
 MD5 7d3868b85f7325c35e5165a8c10ce77d files/afterstep-1.8.11-gentoo.diff 1321
-MD5 1e30a65a7a4daf379a4159eb28ac2d0f files/afterstep-2.00.01-fix-makefile.diff 656
-MD5 68d5b5bcaa6c2e3102dbde6b1314326e files/digest-afterstep-2.00.01 71
-MD5 ddd133fa16578493d349b8cdaa531986 files/digest-afterstep-2.00.02 71
 MD5 3b881a3589ee178d1ae956067a4ff6d0 files/digest-afterstep-2.00.04 71
 MD5 aa6dd1f671415f2083b1161571752859 files/digest-afterstep-2.00.05 71
-MD5 9dfd9962d8a60e264920c6d4e742d74c files/as2-gnome.diff 1524
 MD5 6fd5efab342e44e4d18dc1d98b940093 files/digest-afterstep-2.1.0 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCqMvzKRy60XGEcJIRAi1FAJ9/xIwxkROBlUSVfkslykJ/0+83GACgr+ML
-wPT93H6gX/LUx20Wn+OSSY4=
-=nNrU
------END PGP SIGNATURE-----
+MD5 63287632615c6757362d18ec54ef615d files/digest-afterstep-2.1.1 69
diff --git a/x11-wm/afterstep/afterstep-2.00.01.ebuild b/x11-wm/afterstep/afterstep-2.00.01.ebuild
deleted file mode 100644
index b309df48bfe4..000000000000
--- a/x11-wm/afterstep/afterstep-2.00.01.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.01.ebuild,v 1.3 2005/02/15 12:52:15 gustavoz Exp $
-
-inherit 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"
-
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
-IUSE="debug gif jpeg mmx nls png tiff truetype xinerama"
-
-DEPEND="virtual/libc
-	virtual/x11
-	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 )"
-
-S="${WORKDIR}/AfterStep-${PV}"
-
-src_unpack () {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fix-makefile.diff
-}
-
-src_compile() {
-	local myconf
-
-	use nls && myconf="--enable-i18n" \
-		|| myconf="--enable-i18n=no"
-
-	use png && myconf="${myconf} --with-png" \
-		|| myconf="${myconf} --with-png=no"
-
-	use jpeg && myconf="${myconf} --with-jpeg" \
-		|| myconf="${myconf} --with-jpeg=no"
-
-	use gif && myconf="${myconf} --with-gif" \
-		|| myconf="${myconf} --with-gif=no"
-
-	use tiff && myconf="${myconf} --with-tiff" \
-		|| myconf="${myconf} --with-tiff=no"
-
-	use truetype && myconf="${myconf} --with-ttf --enable-reuse-font=no" \
-		|| myconf="${myconf} --with-ttf=no"
-
-	use xinerama && myconf="${myconf} --enable-xinerama" \
-		|| myconf="${myconf} --enable-xinerama=no"
-
-	use mmx && myconf="${myconf} --enable-mmx-optimization" \
-		|| myconf="${myconf} --enable-mmx-optimization=no"
-
-	use debug && myconf="${myconf} --enable-gdb --enable-warn --enable-gprof --enable-audit --enable-trace --enable-trace-x"
-
-	use !ppc && use debug && myconf="${myconf} --with-libefence"
-
-	# 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 \
-		--with-helpcommand="xterm -e man" \
-		--with-xpm \
-		--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
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	# This fixes a bug with shared libraries
-	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -a ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -a ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -a ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -a ${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 -a ${S}/TODO ${D}/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -a ${S}/doc/* ${D}/usr/share/doc/${PF}/html
-	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	dodir /usr/share/xsessions
-	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.00.02.ebuild b/x11-wm/afterstep/afterstep-2.1.1.ebuild
index 1b2c834a1c88..81d7847c0758 100644
--- a/x11-wm/afterstep/afterstep-2.00.02.ebuild
+++ b/x11-wm/afterstep/afterstep-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.02.ebuild,v 1.4 2005/03/30 20:29:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.1.1.ebuild,v 1.1 2005/06/12 09:09:58 ka0ttic Exp $
 
 inherit flag-o-matic
 
@@ -10,11 +10,13 @@ SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
 
 LICENSE="AFTERSTEP"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
+KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="debug gif jpeg mmx nls png tiff truetype xinerama"
 
 DEPEND="virtual/libc
 	virtual/x11
+	media-libs/freetype
+	debug? ( !ppc? ( dev-util/efence ) )
 	png? ( >=media-libs/libpng-1.2.5 )
 	jpeg? ( >=media-libs/jpeg-6b )
 	gif?  ( >=media-libs/giflib-4.1.0 )
@@ -25,39 +27,16 @@ S="${WORKDIR}/AfterStep-${PV}"
 src_compile() {
 	local myconf
 
-	use nls && myconf="--enable-i18n" \
-		|| myconf="--enable-i18n=no"
-
-	use png && myconf="${myconf} --with-png" \
-		|| myconf="${myconf} --with-png=no"
-
-	use jpeg && myconf="${myconf} --with-jpeg" \
-		|| myconf="${myconf} --with-jpeg=no"
-
-	use gif && myconf="${myconf} --with-gif" \
-		|| myconf="${myconf} --with-gif=no"
-
-	use tiff && myconf="${myconf} --with-tiff" \
-		|| myconf="${myconf} --with-tiff=no"
-
-	use truetype && myconf="${myconf} --with-ttf --enable-reuse-font=no" \
-		|| myconf="${myconf} --with-ttf=no"
-
-	use xinerama && myconf="${myconf} --enable-xinerama" \
-		|| myconf="${myconf} --enable-xinerama=no"
-
-	use mmx && myconf="${myconf} --enable-mmx-optimization" \
-		|| myconf="${myconf} --enable-mmx-optimization=no"
-
-	use debug && myconf="${myconf} --enable-gdb --enable-warn --enable-gprof --enable-audit --enable-trace --enable-trace-x"
-
-	use !ppc && use debug && myconf="${myconf} --with-libefence"
+	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
+		--enable-audit --enable-trace --enable-trace-x"
 
+	if ! use ppc && use debug ; then
+		myconf="${myconf} --with-libefence"
+	fi
 
 	#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
@@ -65,9 +44,15 @@ src_compile() {
 	# --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 \
@@ -82,6 +67,11 @@ 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
+
 	make DESTDIR=${D} install || die "make install failed"
 
 	# This fixes a bug with shared libraries
diff --git a/x11-wm/afterstep/files/afterstep-2.00.01-fix-makefile.diff b/x11-wm/afterstep/files/afterstep-2.00.01-fix-makefile.diff
deleted file mode 100644
index 70c207264727..000000000000
--- a/x11-wm/afterstep/files/afterstep-2.00.01-fix-makefile.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.in.old      2004-11-30 17:57:13.000000000 -0500
-+++ Makefile.in       2004-12-04 18:48:23.260595280 -0500
-@@ -72,10 +72,8 @@
- install.desktop: AfterStep.desktop.final
- 	@if [ -d /usr/share/xsessions ] && [ -w /usr/share/xsessions ] ; then \
-		echo "installing AfterStep.desktop into /usr/share/xsessions/" ; \
--		$(INSTALL_DATA)  AfterStep.desktop.final /usr/share/xsessions/AfterStep.desktop ; \
- 	else if [ -d /etc/X11/sessions ] && [ -w /etc/X11/sessions ] ; then \
- 		echo "installing AfterStep.desktop /etc/X11/xsessions/" ; \
--		$(INSTALL_DATA)  AfterStep.desktop.final /etc/X11/xsessions/AfterStep.desktop ; \
-	fi; fi
-
- install.data:
-
-
diff --git a/x11-wm/afterstep/files/as2-gnome-r1.diff b/x11-wm/afterstep/files/as2-gnome-r1.diff
deleted file mode 100644
index 57dc09d18e50..000000000000
--- a/x11-wm/afterstep/files/as2-gnome-r1.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -urN AfterStep-2.00.beta4b/Makefile.in AfterStep-2.00.beta4b-modified/Makefile.in
---- AfterStep-2.00.beta4b/Makefile.in	2004-03-05 14:19:54.000000000 -0600
-+++ AfterStep-2.00.beta4b-modified/Makefile.in	2004-03-18 19:01:20.807818448 -0600
-@@ -66,12 +66,13 @@
- 	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
- 	fi \
- 	fi
--	@if [ -d /usr/share/gnome/wm-properties ] ; then \
--	if [ -w /usr/share/gnome/wm-properties ] ; then \
--	 echo $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
--	 $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
-+	@if [ -d $(GNOME_SHAREDIR)/wm-properties ] ; then \
-+	if [ -w $(GNOME_SHAREDIR)/wm-properties ] ; then \
-+	 echo $(CP) AfterStep.desktop $(GNOME_SHAREDESTDIR)/wm-properties/; \
-+	$(MKDIR) -p $(GNOME_SHAREDESTDIR)/wm-properties; \
-+	$(CP) AfterStep.desktop $(GNOME_SHAREDESTDIR)/wm-properties/; \
- 	else \
--	echo "/usr/share/gnome/wm-properties exists but is not writable."; \
-+	echo "$(GNOME_SHAREDIR)/wm-properties exists but is not writable."; \
- 	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
- 	fi \
- 	fi
-diff -urN AfterStep-2.00.beta4b/autoconf/Makefile.defines.in AfterStep-2.00.beta4b-modified/autoconf/Makefile.defines.in
---- AfterStep-2.00.beta4b/autoconf/Makefile.defines.in	2004-03-05 14:19:52.000000000 -0600
-+++ AfterStep-2.00.beta4b-modified/autoconf/Makefile.defines.in	2004-03-18 18:59:38.244410456 -0600
-@@ -54,6 +54,8 @@
- AFTER_BIN_DIR	= $(DESTDIR)@bindir@
- AFTER_MAN_DIR	= $(DESTDIR)@mandir@/man1
- AFTER_SHAREDIR	= $(DESTDIR)@datadir@/afterstep
-+GNOME_SHAREDIR	= @datadir@/gnome
-+GNOME_SHAREDESTDIR = $(DESTDIR)$(GNOME_SHAREDIR)
- AFTER_DOC_DIR	= $(AFTER_SHAREDIR)/doc
- AFTER_DIR	= @with_afterdir@
- AFTER_SAVE	= @with_afterdir@/.workspace_state
diff --git a/x11-wm/afterstep/files/as2-gnome.diff b/x11-wm/afterstep/files/as2-gnome.diff
deleted file mode 100644
index 57b9343f62b9..000000000000
--- a/x11-wm/afterstep/files/as2-gnome.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- Makefile.in.old	2003-09-25 14:07:20.000000000 -0700
-+++ Makefile.in	2003-10-19 16:17:00.000000000 -0700
-@@ -63,12 +63,13 @@
- 	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
- 	fi \
- 	fi
--	@if [ -d /usr/share/gnome/wm-properties ] ; then \
--	if [ -w /usr/share/gnome/wm-properties ] ; then \
--	 echo $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
--	 $(CP) AfterStep.desktop /usr/share/gnome/wm-properties/; \
-+	@if [ -d $(GNOME_SHAREDIR)/wm-properties ] ; then \
-+	if [ -w $(GNOME_SHAREDIR)/wm-properties ] ; then \
-+	 echo $(CP) AfterStep.desktop $(GNOME_SHAREDESTDIR)/wm-properties/; \
-+	 $(MKDIR) -p $(GNOME_SHAREDESTDIR)/wm-properties; \
-+	 $(CP) AfterStep.desktop $(GNOME_SHAREDESTDIR)/wm-properties/; \
- 	else \
--	echo "/usr/share/gnome/wm-properties exists but is not writable."; \
-+	echo "$(GNOME_SHAREDIR)/wm-properties exists but is not writable."; \
- 	echo "If you want AfterStep to appear in your Gnome menu, please install as root."; \
- 	fi \
- 	fi
---- autoconf/Makefile.defines.in.old	2003-08-22 23:28:44.000000000 -0700
-+++ autoconf/Makefile.defines.in	2003-10-19 16:20:53.000000000 -0700
-@@ -55,6 +55,8 @@
- AFTER_MAN_DIR	= $(DESTDIR)@mandir@/man1
- AFTER_DOC_DIR	= $(DESTDIR)@datadir@/afterstep/doc
- AFTER_SHAREDIR	= $(DESTDIR)@datadir@/afterstep
-+GNOME_SHAREDIR  = @datadir@/gnome
-+GNOME_SHAREDESTDIR  = $(DESTDIR)$(GNOME_SHAREDIR)
- AFTER_DIR	= @with_afterdir@
- AFTER_SAVE	= @with_afterdir@/.workspace_state
- AFTER_NONCF	= @with_afterdir@/non-configurable
diff --git a/x11-wm/afterstep/files/digest-afterstep-2.00.01 b/x11-wm/afterstep/files/digest-afterstep-2.00.01
deleted file mode 100644
index 28fa6971827e..000000000000
--- a/x11-wm/afterstep/files/digest-afterstep-2.00.01
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5111d0ea47f60b70ce5cba907479ea22 AfterStep-2.00.01.tar.bz2 4508159
diff --git a/x11-wm/afterstep/files/digest-afterstep-2.00.02 b/x11-wm/afterstep/files/digest-afterstep-2.00.02
deleted file mode 100644
index 8b43f1172f84..000000000000
--- a/x11-wm/afterstep/files/digest-afterstep-2.00.02
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8d6a690ddcd699adcf2cc7c1567fb9e8 AfterStep-2.00.02.tar.bz2 4687666
diff --git a/x11-wm/afterstep/files/digest-afterstep-2.1.1 b/x11-wm/afterstep/files/digest-afterstep-2.1.1
new file mode 100644
index 000000000000..1a368c649c10
--- /dev/null
+++ b/x11-wm/afterstep/files/digest-afterstep-2.1.1
@@ -0,0 +1 @@
+MD5 5b02ebcab3be1227cd227e39ab169bd3 AfterStep-2.1.1.tar.bz2 5025858