Apply the crash fix patch on every arch, since upstream like it. Remove the possibly flaky unpatched version.

5 files changed, 25 insertions, 67 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index ee9b63ad6242..a46192fe0f6e 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.116 2004/09/03 20:12:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.117 2004/09/04 23:37:25 ciaranm Exp $
+
+  05 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.10-r1.ebuild,
+  -fluxbox-0.9.10.ebuild:
+  Apply the crash fix patch on every arch, since upstream like it. Remove the
+  possibly flaky unpatched version.
 
 *fluxbox-0.9.10-r1 (03 Sep 2004)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 4b932362404a..6941cd15b081 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,13 +1,21 @@
-MD5 9c643cacce729b4e0fbf730db3e0a5bf ChangeLog 21752
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 72eaed6596c18b00e8764b9b8d141d94 fluxbox-0.9.8-r1.ebuild 1628
-MD5 010fb64778d2657638b423bd53e90e58 fluxbox-0.9.9.ebuild 1695
+MD5 e4adb1e77b8b44123388ef448c33ba5e ChangeLog 21973
+MD5 e2cbad89f55f3744bcc2a9db7a139442 fluxbox-0.9.10-r1.ebuild 1812
 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
-MD5 5844c3f3e999b80b06e1d44306010eb1 fluxbox-0.9.10-r1.ebuild 1729
-MD5 8897651d647e0a64d135b95aadeab41e fluxbox-0.9.10.ebuild 1627
+MD5 010fb64778d2657638b423bd53e90e58 fluxbox-0.9.9.ebuild 1695
 MD5 c11d6a60aaece3dd919a1802a23ecc7a files/digest-fluxbox-0.9.8-r1 65
+MD5 ee36523cd5cf3281d0261244260840c9 files/fluxbox-0.9.10.amd64_fix.patch 774
+MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r1 67
 MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
 MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
-MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10 67
-MD5 ee36523cd5cf3281d0261244260840c9 files/fluxbox-0.9.10.amd64_fix.patch 774
-MD5 c4565cd7f88b9897ccb504eef29fa8f3 files/digest-fluxbox-0.9.10-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBOlEOLLFUmVNQ7rkRAphOAKCKGu9EWu8VLkXX6Np8iPfI/2FaRgCdG62T
+b4HrRAYwe2HzS6Rm0hwznKo=
+=Vwgf
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.10 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.10
deleted file mode 100644
index 102f1b571a9e..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a04a21960b8bc364bcc002389008989 fluxbox-0.9.10.tar.bz2 556030
diff --git a/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild
index b4ef7105ff74..8207efb27d37 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild,v 1.1 2004/09/03 20:12:04 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10-r1.ebuild,v 1.2 2004/09/04 23:37:25 ciaranm Exp $
 
 inherit eutils
 
@@ -29,7 +29,9 @@ KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ~ppc64 ~macos"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use amd64 && epatch ${FILESDIR}/${PN}-${PV}.amd64_fix.patch
+	# Fix crashy badness on amd64. Upstream sanctioned this, so we'll
+	# apply it to everyone...
+	epatch ${FILESDIR}/${PN}-${PV}.amd64_fix.patch
 }
 
 src_compile() {
diff --git a/x11-wm/fluxbox/fluxbox-0.9.10.ebuild b/x11-wm/fluxbox/fluxbox-0.9.10.ebuild
deleted file mode 100644
index 14cc4bb93aa7..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.10.ebuild,v 1.1 2004/09/01 16:11:02 ciaranm Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome"
-
-DESCRIPTION="Fluxbox is a lightweight windowmanager for X featuring tabs."
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-# Please note that USE="kde gnome" simply adds support for the respective
-# protocols, and does not depend on external libraries. They do, however,
-# make the binary a fair bit bigger, so we don't want to turn them on unless
-# the user actually wants them.
-
-RDEPEND="virtual/x11
-	truetype? ( media-libs/freetype )
-	nls? ( sys-devel/gettext )"
-DEPEND=">=sys-devel/autoconf-2.52
-		${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ~ppc64 ~macos"
-
-src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-	econf \
-		`use_enable nls` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		--sysconfdir=/etc/X11/${PN} \
-		${myconf} || die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/share/fluxbox
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README* AUTHORS TODO* COPYING
-
-	dodir /usr/share/xsessions
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/${PN}.desktop
-
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/startfluxbox" > ${D}/etc/X11/Sessions/fluxbox
-	fperms a+x /etc/X11/Sessions/fluxbox
-}
-