5 files changed, 29 insertions, 18 deletions
diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index 5eb637fb3d03..7429422d9949 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.1 2005/04/21 10:25:52 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.2 2005/05/04 20:26:25 tove Exp $
+
+*wmii-0.20050504 (04 May 2005)
+
+  04 May 2005; Torsten Veller <tove@gentoo.org> -wmii-0.20050420.ebuild,
+  +wmii-0.20050504.ebuild:
+  New snapshot.
 
 *wmii-0.20050420 (21 Apr 2005)
 
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index 1ecbb5bbfb7c..de67fe2eda5c 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 48915b90f6cfedf5f37dedbc13338960 wmii-0.20050420.ebuild 1904
-MD5 26c2f1b70d6c2ba18cce81d46f816a1d ChangeLog 467
+MD5 a1bb924dacb5ec990a87f87b417eaa6c wmii-0.20050504.ebuild 1985
+MD5 5a484f984a83592963ad3547cde9804c ChangeLog 616
 MD5 9dfc07930dff89a3773796c3296c9d39 metadata.xml 505
 MD5 48b2aadadc04fa539467a05f3afa031e files/wmii.desktop 174
-MD5 bd57e7e27c47a0e7574ca22a31f04a5b files/digest-wmii-0.20050420 67
+MD5 66548310c6431a224cdfea6d9ae589ed files/digest-wmii-0.20050504 67
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCZ3/FV3J2n04EauwRAvBdAKCKrMzyfQg9KErNkTL+fuWkMQZ4qQCgvjP9
-6C2Ukh5YG/psiTcsl+Xb2JA=
-=QR9X
+iD8DBQFCeTAIV3J2n04EauwRAmC5AKCWH2yPG9eVhgxNYqpb6Nf8hwKbkQCdE85/
+OyQieGbQg5KOs37E3fnxM5k=
+=ZMrl
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/wmii/files/digest-wmii-0.20050420 b/x11-wm/wmii/files/digest-wmii-0.20050420
deleted file mode 100644
index fe78ab546c3f..000000000000
--- a/x11-wm/wmii/files/digest-wmii-0.20050420
+++ /dev/null
@@ -1 +0,0 @@
-MD5 85460a6ef25c396c569ba504852f6438 wmii-0-20050420.tar.bz2 56672
diff --git a/x11-wm/wmii/files/digest-wmii-0.20050504 b/x11-wm/wmii/files/digest-wmii-0.20050504
new file mode 100644
index 000000000000..993e889b77e6
--- /dev/null
+++ b/x11-wm/wmii/files/digest-wmii-0.20050504
@@ -0,0 +1 @@
+MD5 7f12b6db299d50532f7b9706005c0790 wmii-0-20050504.tar.bz2 56008
diff --git a/x11-wm/wmii/wmii-0.20050420.ebuild b/x11-wm/wmii/wmii-0.20050504.ebuild
index 011b5c13d10f..dc3cf12c11cd 100644
--- a/x11-wm/wmii/wmii-0.20050420.ebuild
+++ b/x11-wm/wmii/wmii-0.20050504.ebuild
@@ -1,13 +1,13 @@
 # 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-0.20050420.ebuild,v 1.1 2005/04/21 10:25:52 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-0.20050504.ebuild,v 1.1 2005/05/04 20:26:25 tove Exp $
 
 #inherit toolchain-funcs distutils
 inherit toolchain-funcs
 
 MY_P="${P/./-}"
 
-DESCRIPTION="window manager improved 2 -- is the next generation of the WMI project."
+DESCRIPTION="window manager improved 2 -- the next generation of the WMI project."
 HOMEPAGE="http://wmi.modprobe.de/index.php?n=WMII.Overview"
 SRC_URI="http://wmi.modprobe.de/snaps/${MY_P}.tar.bz2"
 
@@ -19,11 +19,9 @@ IUSE="python cairo"
 DEPEND=">=sys-apps/sed-4
 	${RDEPEND}"
 RDEPEND="virtual/x11
-	virtual/libc
 	cairo? ( >=x11-libs/cairo-0.3
 		>=media-libs/freetype-2 )
-	python? ( virtual/python
-		dev-python/pyrex )"
+	python? ( dev-python/pyrex )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,13 +35,16 @@ src_unpack() {
 
 	if useq cairo; then
 		sed -i \
-			-e "/^#DRAW/,/^#CAIROINC/ s/^#//g" \
+			-e "/^#DRAW/,/^#CAIROINC/ s/^#//" \
 			"${S}"/config.mk
 	fi
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CONFPREFIX=/etc || die "emake failed"
+	emake CC="$(tc-getCC)" \
+		AR="$(tc-getAR) cr" \
+		RANLIB="$(tc-getRANLIB)" \
+		CONFPREFIX=/etc || die "emake failed"
 
 #	useq python && cd "${S}"/libixp/python && distutils_src_compile
 	if useq python ; then
@@ -53,17 +54,21 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" PREFIX=/usr CONFPREFIX=/etc install || die
+	make DESTDIR="${D}" \
+		AR="$(tc-getAR) cr" \
+		RANLIB="$(tc-getRANLIB)" \
+		PREFIX=/usr \
+		CONFPREFIX=/etc install || die
 	dodoc CHANGES README LICENSE || die "dodoc failed."
 
-#	useq python && cd "${S}"/libixp/python && distutils_src_instal
+#	useq python && cd "${S}"/libixp/python && distutils_src_install
 	if useq python ; then
 		cd "${S}"/libixp/python
 		python setup.py install --root="${D}" || die "python install failed."
 	fi
 
 	exeinto /usr/share/"${PN}"/contrib
-	doexe "${S}"/contrib/*.py || die "contrib failed."
+	doexe "${S}"/contrib/* || die "contrib failed."
 
 	echo -e "#!/bin/sh\n/usr/bin/wmii" > "${T}"/"${PN}"
 	exeinto /etc/X11/Sessions