Version bump, drop old and broken, will segfault with glibc-2.12

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

4 files changed, 8 insertions, 70 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index c5ae860491a8..d1d69cc0765b 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/wmii
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.33 2010/06/22 15:10:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.34 2010/06/26 14:01:17 ssuominen Exp $
+
+*wmii-3.9.2 (26 Jun 2010)
+
+  26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +wmii-3.9.2.ebuild:
+  Version bump.
 
   22 Jun 2010; Jeroen Roovers <jer@gentoo.org> wmii-3.6-r2.ebuild,
   wmii-3.9.ebuild:
diff --git a/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch b/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch
deleted file mode 100644
index 6cdf06833dca..000000000000
--- a/x11-wm/wmii/files/wmii-3.6-64bit-safe.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- mk/gcc.mk.orig	2009-06-11 12:06:32.819113775 +0200
-+++ mk/gcc.mk	2009-06-11 12:07:37.719827797 +0200
-@@ -1,5 +1,4 @@
- CFLAGS += \
--	-std=c99 \
- 	-pipe \
- 	-Wall \
- 	-Wno-parentheses \
diff --git a/x11-wm/wmii/wmii-3.6-r2.ebuild b/x11-wm/wmii/wmii-3.6-r2.ebuild
deleted file mode 100644
index 0d768559278f..000000000000
--- a/x11-wm/wmii/wmii-3.6-r2.ebuild
+++ /dev/null
@@ -1,58 +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/wmii/wmii-3.6-r2.ebuild,v 1.4 2010/06/22 15:10:52 jer Exp $
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A dynamic window manager for X11"
-HOMEPAGE="http://wmii.suckless.org/"
-SRC_URI="http://www.suckless.org/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="~sys-libs/libixp-0.4
-	x11-libs/libX11"
-RDEPEND="${DEPEND}
-	x11-apps/xmessage
-	x11-apps/xsetroot
-	x11-misc/dmenu
-	media-fonts/font-misc-misc"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/dmenu -b/dmenu/" \
-		rc/{rc.wmii.rc,sh.wmii,wmiirc.sh} || die "sed failed"
-
-	sed -i \
-		-e "/^PREFIX/s|=.*|= ${D}/usr|" \
-		-e "/^ETC/s|=.*|= ${D}/etc|" \
-		-e "/^LIBDIR/s|=.*|= /usr/$(get_libdir)|" \
-		config.mk || die "sed failed"
-
-	# bug 231299
-	epatch "${FILESDIR}"/${P}-64bit-safe.patch
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	dodoc NOTES README TODO
-
-	# Rid paths of temporary install directory. (bug #199551)
-	sed -i -e "s|${D}||g" "${D}/usr/bin/wmiistartrc"
-
-	echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}/${PN}"
-	exeinto /etc/X11/Sessions
-	doexe "${T}/${PN}"
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}/${PN}.desktop"
-}
diff --git a/x11-wm/wmii/wmii-3.9.ebuild b/x11-wm/wmii/wmii-3.9.2.ebuild
index 788ac9623eb3..a67dfd3420a7 100644
--- a/x11-wm/wmii/wmii-3.9.ebuild
+++ b/x11-wm/wmii/wmii-3.9.2.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.ebuild,v 1.4 2010/06/22 15:10:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.2.ebuild,v 1.1 2010/06/26 14:01:17 ssuominen Exp $
 
 EAPI=2
 inherit flag-o-matic multilib
 
 MY_P=wmii+ixp-${PV}
-PVER=4
 
 DESCRIPTION="A dynamic window manager for X11"
 HOMEPAGE="http://wmii.suckless.org/"
-SRC_URI="http://dl.suckless.org/wmii/${MY_P}-${PVER}.tbz"
+SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz"
 
 LICENSE="MIT"
 SLOT="0"