Version bump. Closes bug #95973.

(Portage version: 2.0.51.22-r1)

5 files changed, 17 insertions, 19 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index 1fa7e1091e1c..87dd9f616143 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/wmii
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.7 2005/06/04 20:17:27 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.8 2005/06/13 17:15:28 tove Exp $
+
+*wmii-1.1 (13 Jun 2005)
+
+  13 Jun 2005; Torsten Veller <tove@gentoo.org> -wmii-1.ebuild,
+  +wmii-1.1.ebuild:
+  Version bump.  Thanks to Yann Lamontagne (bug #95973).
 
   04 Jun 2005; Olivier Crête <tester@gentoo.org> wmii-1.ebuild:
   Add ~amd64 keyword per bug #94998
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index 65ff40084798..526006519ab8 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 01e53f321d5d6ab0061bcbefffc4fe89 ChangeLog 1304
+MD5 cd963c7f31418c69766c56c2d705219e wmii-1.1.ebuild 2014
+MD5 e58f47a1891b8b6ff5a4407ddfb2fc67 ChangeLog 1471
 MD5 f5ba35e50e57b9e6df75d700acc82da8 metadata.xml 700
-MD5 282852aa6089fbab5705754e48a4150a wmii-1.ebuild 1906
-MD5 8a7a9c0fee724824de19a9dfbcf8d701 files/digest-wmii-1 58
+MD5 080701816705482fee573518bbe73bec files/digest-wmii-1.1 60
 MD5 48b2aadadc04fa539467a05f3afa031e files/wmii.desktop 174
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCogyjmOfEJZHYOKcRAnOEAJ9OBtwi+cLVAJDeGKML2FxqFMt4jgCg5hMH
-mJIOYhrVnN0lvk6voOQeHrw=
-=swrO
------END PGP SIGNATURE-----
diff --git a/x11-wm/wmii/files/digest-wmii-1 b/x11-wm/wmii/files/digest-wmii-1
deleted file mode 100644
index b93fd211c852..000000000000
--- a/x11-wm/wmii/files/digest-wmii-1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 160f0f59138df262a9ea9764dfa5655e wmii-1.tar.bz2 71003
diff --git a/x11-wm/wmii/files/digest-wmii-1.1 b/x11-wm/wmii/files/digest-wmii-1.1
new file mode 100644
index 000000000000..27233f4d5273
--- /dev/null
+++ b/x11-wm/wmii/files/digest-wmii-1.1
@@ -0,0 +1 @@
+MD5 8ad9da67501b2d85745ff472466be57c wmii-1.1.tar.bz2 70191
diff --git a/x11-wm/wmii/wmii-1.ebuild b/x11-wm/wmii/wmii-1.1.ebuild
index 0a8427864465..30d3dcaf6e93 100644
--- a/x11-wm/wmii/wmii-1.ebuild
+++ b/x11-wm/wmii/wmii-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/wmii/wmii-1.ebuild,v 1.2 2005/06/04 20:17:27 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-1.1.ebuild,v 1.1 2005/06/13 17:15:28 tove Exp $
 
 inherit toolchain-funcs
 
@@ -25,8 +25,8 @@ src_unpack() {
 	unpack "${A}"
 
 	sed -i \
-		-e "/^CFLAGS/ s/-O0 -g/${CFLAGS}/" \
-		-e "/^LDFLAGS/ s/-g/${LDFLAGS}/" \
+		-e "/^CFLAGS/ s/-O0/${CFLAGS}/" \
+		-e "/^LDFLAGS/ s/-g/-g ${LDFLAGS}/" \
 		"${S}"/config.mk
 
 # removed because cairo backend crashes much too often
@@ -62,8 +62,10 @@ src_install() {
 		python setup.py install --root="${D}" || die "python install failed."
 	fi
 
+	insinto /usr/share/"${PN}"/contrib
+	doins "${S}"/contrib/README || die "contrib README failed."
 	exeinto /usr/share/"${PN}"/contrib
-	doexe "${S}"/contrib/* || die "contrib failed."
+	doexe "${S}"/contrib/*.{py,rb,sh} || die "contrib failed."
 
 	echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}"/"${PN}"
 	exeinto /etc/X11/Sessions