Version bump. Added desktop file. Removed old versions.

(Portage version: 2.1_pre4-r1)

12 files changed, 100 insertions, 135 deletions

diff --git a/x11-wm/evilwm/ChangeLog b/x11-wm/evilwm/ChangeLog
index bc789e41247d..77dd87dccaeb 100644
--- a/x11-wm/evilwm/ChangeLog
+++ b/x11-wm/evilwm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/evilwm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/ChangeLog,v 1.30 2006/01/22 16:53:47 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/ChangeLog,v 1.31 2006/01/31 11:50:03 tove Exp $
+
+*evilwm-0.99.22 (31 Jan 2006)
+
+  31 Jan 2006; Torsten Veller <tove@gentoo.org> +files/evilwm.desktop,
+  -evilwm-0.99.4.ebuild, -evilwm-0.99.14.ebuild, evilwm-0.99.17.ebuild,
+  -evilwm-0.99.18.ebuild, +evilwm-0.99.22.ebuild:
+  Version bump. Added desktop file. Removed old versions.
 
 *evilwm-0.99.21 (22 Jan 2006)
 
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index dc4ccb156b65..c8adeb931dd2 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,22 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cc7e2ce0fd982c1d43a8ba8be606d4e4 ChangeLog 3613
-MD5 f4a3f615c0ebf96b2c71df418cded1e9 evilwm-0.99.14.ebuild 859
-MD5 243275325d21d425faf787cbf1380c31 evilwm-0.99.17.ebuild 949
-MD5 9e5f5d5aae14742d30260afe1a50579b evilwm-0.99.18.ebuild 1044
+MD5 d12ef300475fd7ae4df1c170b9a6c799 ChangeLog 3896
+RMD160 a44444c5345ca8a8ac9d1710691e8fa91e90531e ChangeLog 3896
+SHA256 2e005c93f0cf7517bd432b0870ac3c38eb9a8697639a06c9fa1db5969f88ab42 ChangeLog 3896
+MD5 152d2e5c9426477097549264119a5043 evilwm-0.99.17.ebuild 1042
+RMD160 0d87998680e1b76ddf1e37b33835fa7d0ba5ddfb evilwm-0.99.17.ebuild 1042
+SHA256 865a977b628548f0ae69e212772df79408edc5e2d128b68bee91cd86879e1475 evilwm-0.99.17.ebuild 1042
 MD5 9de8566df3718d256ce75da6a233e3c1 evilwm-0.99.21.ebuild 1180
-MD5 6acba9a88caec6e09a76c8e70ff5ec95 evilwm-0.99.4.ebuild 642
-MD5 87249d20528e6e0f7ed6fa59fb73ebfa files/digest-evilwm-0.99.14 70
+RMD160 58d5c32d71d88b027f91a94be492d07fead1656f evilwm-0.99.21.ebuild 1180
+SHA256 5185eac6988b5d528ef5f17a722c021eed5567b0fd33edb27661b093fb029b5d evilwm-0.99.21.ebuild 1180
+MD5 6f1cd5910a76ffff88e10b230cc6143c evilwm-0.99.22.ebuild 1277
+RMD160 d5a934f1b3e2f2734ffc64704b09cb8c6bb50f28 evilwm-0.99.22.ebuild 1277
+SHA256 89cf45a85c86c9a78320742e5d4e4cda0c56b924afbfac77edeaf0463735fa34 evilwm-0.99.22.ebuild 1277
 MD5 1e8b24dfa1f73166710560f5c0b56751 files/digest-evilwm-0.99.17 70
-MD5 9e2d8ad64be70e4805d96ce330be3bbf files/digest-evilwm-0.99.18 65
+RMD160 40ef7098b706f1e420f983052a4274bb94421425 files/digest-evilwm-0.99.17 70
+SHA256 32760836e55a8b0a15310c22c95a0293f4c40e6f4edfd5607347e88cd2132253 files/digest-evilwm-0.99.17 70
 MD5 323d80361f7c93e49bca12f2e5e6468d files/digest-evilwm-0.99.21 65
-MD5 f1c3baa65c3f9d38f66da5acd242f087 files/digest-evilwm-0.99.4 66
+RMD160 cd72607b6a58966626b6348530aec88cdc8eeee5 files/digest-evilwm-0.99.21 65
+SHA256 8d700ca4f1cee84171e31446ecfd4e2e7cfb87df0c66723b877b22e73b8a11e0 files/digest-evilwm-0.99.21 65
+MD5 ed5f582d87005bda63211db2e4023464 files/digest-evilwm-0.99.22 241
+RMD160 f39b4b3dec99015ca09bb95fa2b1c3f398bc2d34 files/digest-evilwm-0.99.22 241
+SHA256 efb6f989ea82f23262a21a6068e5ab0e03a540b8a6ca10b7b3249e2c22b2735a files/digest-evilwm-0.99.22 241
+MD5 a747ad125b94879197610200ed297125 files/evilwm.desktop 182
+RMD160 dab3a82cac2809d19b1ac05061fe622ec87e22b9 files/evilwm.desktop 182
+SHA256 2c033978db6abc4bc3aa99851e956ad0cd68d540202823af0839508ddb415816 files/evilwm.desktop 182
 MD5 ab5c7d15679acb15af8d4f8ba3ae2084 metadata.xml 360
+RMD160 b5ebb7c354adb9b7e7ce3e110835f8f08bc0af24 metadata.xml 360
+SHA256 634576adf481fa9e17e5b0ec600305539a6405bc8329d376fabfa28573b3d4df metadata.xml 360
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD0777V3J2n04EauwRAvakAJ9EI6oHO+pST8dXhHguy43/XnIY/ACeO2wM
-PzPMs3gyEMURRsDDuldapLw=
-=TqOH
+iD8DBQFD307SV3J2n04EauwRAkTZAJ9ND8sxUXNG2JEpX5RZlWykAW4QLACffmpp
+bPIPb4e3TP1VbAl9GqCdW1s=
+=oe9P
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/evilwm/evilwm-0.99.14.ebuild b/x11-wm/evilwm/evilwm-0.99.14.ebuild
deleted file mode 100644
index b1fe6b21fe8e..000000000000
--- a/x11-wm/evilwm/evilwm-0.99.14.ebuild
+++ /dev/null
@@ -1,42 +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/evilwm/evilwm-0.99.14.ebuild,v 1.14 2004/07/15 01:11:43 agriffis Exp $
-
-MY_P="${PN}_${PV}.orig"
-S=${WORKDIR}/${MY_P/_/-}
-
-DESCRIPTION="A minimalist, no frills window manager for X."
-SRC_URI="http://download.sourceforge.net/evilwm/${MY_P}.tar.gz"
-HOMEPAGE="http://evilwm.sourceforge.net"
-
-IUSE="motif"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="virtual/x11
-	motif? ( x11-libs/openmotif )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	if ! use motif
-	then
-		cp Makefile ${T}
-		sed "s:DEFINES += -DMWM_HINTS::" \
-			${T}/Makefile > Makefile
-	fi
-}
-
-src_compile() {
-	emake allinone || die
-}
-
-src_install () {
-	exeinto /usr/bin
-	doexe evilwm
-
-	doman evilwm.1
-	dodoc ChangeLog README* INSTALL TODO
-}
diff --git a/x11-wm/evilwm/evilwm-0.99.17.ebuild b/x11-wm/evilwm/evilwm-0.99.17.ebuild
index dc8422429416..e7291d5c8748 100644
--- a/x11-wm/evilwm/evilwm-0.99.17.ebuild
+++ b/x11-wm/evilwm/evilwm-0.99.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.17.ebuild,v 1.13 2005/05/08 15:13:02 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.17.ebuild,v 1.14 2006/01/31 11:50:03 tove Exp $
 
 MY_P="${PN}_${PV}.orig"
 S=${WORKDIR}/${MY_P/_/-}
@@ -14,10 +14,14 @@ SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 ppc sparc alpha amd64"
 
-DEPEND="virtual/x11
-	sys-apps/coreutils
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )
 	motif? ( x11-libs/openmotif )"
 
+DEPEND="${RDEPEND}
+	|| ( (  x11-proto/xextproto
+			x11-proto/xproto )
+		virtual/x11 )"
+
 src_unpack() {
 
 	unpack ${A}
diff --git a/x11-wm/evilwm/evilwm-0.99.18.ebuild b/x11-wm/evilwm/evilwm-0.99.18.ebuild
deleted file mode 100644
index 22a71685fe2d..000000000000
--- a/x11-wm/evilwm/evilwm-0.99.18.ebuild
+++ /dev/null
@@ -1,44 +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/evilwm/evilwm-0.99.18.ebuild,v 1.3 2005/12/24 08:04:17 cardoe Exp $
-
-DESCRIPTION="A minimalist, no frills window manager for X."
-SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
-HOMEPAGE="http://evilwm.sourceforge.net"
-
-IUSE="motif"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
-
-RDEPEND="|| ( x11-libs/libXext virtual/x11 )
-	motif? ( virtual/motif )"
-
-DEPEND="${RDEPEND}
-	|| ( (	x11-proto/xextproto
-		x11-proto/xproto )
-	virtual/x11 )"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	sed -i 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' evilwm.h
-	if ! use motif
-	then
-		cp Makefile ${T}
-		sed "s:DEFINES += -DMWM_HINTS::" \
-			${T}/Makefile > Makefile
-	fi
-}
-
-src_compile() {
-	use ppc-macos && use motif && CFLAGS="${CFLAGS} -I/usr/include/openmotif-2.2"
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc ChangeLog README* INSTALL TODO
-}
diff --git a/x11-wm/evilwm/evilwm-0.99.22.ebuild b/x11-wm/evilwm/evilwm-0.99.22.ebuild
new file mode 100644
index 000000000000..c7d6efba0571
--- /dev/null
+++ b/x11-wm/evilwm/evilwm-0.99.22.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.22.ebuild,v 1.1 2006/01/31 11:50:03 tove Exp $
+
+inherit toolchain-funcs multilib
+
+DESCRIPTION="A minimalist, no frills window manager for X."
+SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
+HOMEPAGE="http://evilwm.sourceforge.net"
+
+IUSE=""
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	|| ( (	x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' evilwm.h \
+		|| die "sed font failed"
+	sed -i '/^CFLAGS/s/ -Os / /' Makefile || die "sed opt failed"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" XROOT="/usr" LDPATH="-L/usr/$(get_libdir)" || die
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ChangeLog README TODO || die "dodoc failed"
+
+	echo -e "#!/bin/sh\n/usr/bin/${PN}" > "${T}/${PN}"
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${PN}" || die "/etc/X11/Sessions failed"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop" || die "${PN}.desktop failed."
+}
diff --git a/x11-wm/evilwm/evilwm-0.99.4.ebuild b/x11-wm/evilwm/evilwm-0.99.4.ebuild
deleted file mode 100644
index 07c594fd1fb7..000000000000
--- a/x11-wm/evilwm/evilwm-0.99.4.ebuild
+++ /dev/null
@@ -1,30 +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/evilwm/evilwm-0.99.4.ebuild,v 1.11 2004/07/15 01:11:43 agriffis Exp $
-
-DESCRIPTION="A minimalist, no frills window manager for X."
-SRC_URI="http://download.sourceforge.net/evilwm/${PN}_${PV}-1.tar.gz"
-HOMEPAGE="http://evilwm.sourceforge.net"
-
-IUSE=""
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc ppc"
-
-DEPEND="virtual/x11
-	virtual/libc"
-
-RDEPEND="$DEPEND"
-
-src_compile() {
-	emake allinone || die
-}
-
-src_install () {
-	dodoc ChangeLog README*
-
-	exeinto /usr/bin
-	doexe evilwm
-
-	doman evilwm.1
-}
diff --git a/x11-wm/evilwm/files/digest-evilwm-0.99.14 b/x11-wm/evilwm/files/digest-evilwm-0.99.14
deleted file mode 100644
index e657b7a5f8c0..000000000000
--- a/x11-wm/evilwm/files/digest-evilwm-0.99.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d8503f30ec92454ba178b211216e7066 evilwm_0.99.14.orig.tar.gz 22887
diff --git a/x11-wm/evilwm/files/digest-evilwm-0.99.18 b/x11-wm/evilwm/files/digest-evilwm-0.99.18
deleted file mode 100644
index 478d0ed7104b..000000000000
--- a/x11-wm/evilwm/files/digest-evilwm-0.99.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af8a9d4bb1167fd546cde99ac6e1a820 evilwm-0.99.18.tar.gz 25688
diff --git a/x11-wm/evilwm/files/digest-evilwm-0.99.22 b/x11-wm/evilwm/files/digest-evilwm-0.99.22
new file mode 100644
index 000000000000..5cada5c0c621
--- /dev/null
+++ b/x11-wm/evilwm/files/digest-evilwm-0.99.22
@@ -0,0 +1,3 @@
+MD5 a55674f7f4557d086249ae5bd5ddc9c8 evilwm-0.99.22.tar.gz 27723
+RMD160 32c83b60f5b8b9dad6904bf3a20976aeebcb4df1 evilwm-0.99.22.tar.gz 27723
+SHA256 47b0a74a401eaf3c4dccc3d44260cd9ca3a15f573aa13e21af2640368c3cc1df evilwm-0.99.22.tar.gz 27723
diff --git a/x11-wm/evilwm/files/digest-evilwm-0.99.4 b/x11-wm/evilwm/files/digest-evilwm-0.99.4
deleted file mode 100644
index 6c3ee35e7b2e..000000000000
--- a/x11-wm/evilwm/files/digest-evilwm-0.99.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0b12f67ed744a5b73fcde842d4e6cab evilwm_0.99.4-1.tar.gz 19505
diff --git a/x11-wm/evilwm/files/evilwm.desktop b/x11-wm/evilwm/files/evilwm.desktop
new file mode 100644
index 000000000000..235e84fb2c42
--- /dev/null
+++ b/x11-wm/evilwm/files/evilwm.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=evilwm
+Comment=A minimalist window manager
+Exec=evilwm
+TryExec=evilwm
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application