Clean up patch. Version bump.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 92 insertions, 17 deletions

diff --git a/x11-wm/jwm/ChangeLog b/x11-wm/jwm/ChangeLog
index b0b26fc9017e..e5430ffbde32 100644
--- a/x11-wm/jwm/ChangeLog
+++ b/x11-wm/jwm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/jwm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.21 2010/11/08 18:48:32 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.22 2012/01/31 23:02:05 jer Exp $
+
+*jwm-2.1.0 (31 Jan 2012)
+
+  31 Jan 2012; Jeroen Roovers <jer@gentoo.org> jwm-2.0.1.ebuild,
+  files/jwm-2.0.1-nostrip.patch, +jwm-2.1.0.ebuild:
+  Clean up patch. Version bump.
 
   08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> jwm-2.0.1.ebuild:
   media-libs/jpeg -> virtual/jpeg
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 0c2d88db43ec..d6440e99fa67 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX jwm-2.0.1-nostrip.patch 324 RMD160 c47aeb260395224e389500b47573dfe241def34d SHA1 c64b3aa37b30daf6677e7b1636abc42ced3c1b75 SHA256 ca7163e3cfe06ae9db0224bdf054ead954efff0e8d0ca542a32054c8cd2486a4
+AUX jwm-2.0.1-nostrip.patch 165 RMD160 75cced6f66f6c26f0d550cdb4f089c30713ab6f3 SHA1 29fc58c41d08b9f39539f217dc86b50baf75058b SHA256 d70f89b94d280feacc86cdf9684a4150d7d0358b9171bac6c24f8b784811d3f2
 DIST jwm-2.0.1.tar.bz2 248607 RMD160 84d16886056e77abd65717852df1530cebb6817b SHA1 209bc5e8c41f6a827d38a9b365405a2dc9bef082 SHA256 dcd6a6bd519578dfc2f3cfde269cea1f9090c87ebf2940bff26cbcca00f0a5c7
-EBUILD jwm-2.0.1.ebuild 1718 RMD160 6c06fde546de221595a92154344dfffe9f3a504b SHA1 5943c9aa66a027d0bae71a092e85223cb201df61 SHA256 46c76fc0ea0f4470f15189f399d6c219e112866fe11fbe5d420aa7ea234190a4
-MISC ChangeLog 2920 RMD160 85fa38bda07abd24a1e83697bccc6dfb940ae744 SHA1 250db93659a711b514a08221a67206fe7ca6de28 SHA256 cb737ae6fbb2c12ac4c713f3fbaee785349f4eea76a18659b6a7ca4871d64a97
+DIST jwm-2.1.0.tar.bz2 163590 RMD160 1977e14b1acfadec759de3c227860b063d166be8 SHA1 5b7973d8b3621087485b6e14be23693e92f21628 SHA256 5c99f9023dc8c2597effdaacc240ff4c2e07e77c8244f3bf1de5cc483bcf08ab
+EBUILD jwm-2.0.1.ebuild 1711 RMD160 547c96378030d45f41fa0fbd8ae38663e7885cb1 SHA1 4f37a9242ca66ead319cacb397835ecee6a8a2dc SHA256 690d4b098891d9af484978f7655ed71566b98e9f45c981db1f36f3564a69b983
+EBUILD jwm-2.1.0.ebuild 1713 RMD160 a6589003dcd123e933b2ec55f98aff81adefe469 SHA1 1b23520e412b9d3d5886653bd2db42cc8a231927 SHA256 7efbd324f241e4c2b538f35738511bc9fe3bd4db710fed385a6a974a79998106
+MISC ChangeLog 3089 RMD160 b751f56859085ba260e7e410de62ee9d199c3c1c SHA1 aec997b4c3d30f3996a2ef7fb04fc3bb23ef0c11 SHA256 a3b08e61da9fe9819937f1f41146a8eeb219cc44c437f57c3d1e806281077d0b
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAkzYRgkACgkQIiMqcbOVdxR7FAP/RoP0lHtPlRCcBTLqTPeY6F/4
-7lHISOHINwDpYXz21Fg9i5OwRVC1Hnq53zdawhfvtTIjwbji5uw96r7jFrcMEaqq
-Rab7BJZrLlMC8C8nsBOc/TuGWBY1DSXdTTynG0p5kcVbNwjwA1CMFrW4N3l4wmtF
-OoJDZraxlWndd7veoUw=
-=sxRZ
+iEYEARECAAYFAk8ocvEACgkQVWmRsqeSphOQJwCfaMCvqdzH/G0QOfxBv/sbtOIo
+hSsAn3JNIr8tKXhr4yxs6wJHkwuQhUkI
+=sbPx
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/jwm/files/jwm-2.0.1-nostrip.patch b/x11-wm/jwm/files/jwm-2.0.1-nostrip.patch
index f58f97f30bfb..7b1eb1c7fc83 100644
--- a/x11-wm/jwm/files/jwm-2.0.1-nostrip.patch
+++ b/x11-wm/jwm/files/jwm-2.0.1-nostrip.patch
@@ -1,6 +1,5 @@
-diff -ur jwm-2.0.1.orig/src/Makefile.in jwm-2.0.1/src/Makefile.in
---- jwm-2.0.1.orig/src/Makefile.in	2007-12-09 18:51:46.000000000 +0100
-+++ jwm-2.0.1/src/Makefile.in	2007-12-09 18:52:02.000000000 +0100
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -20,7 +20,6 @@
  all: $(EXE)
  
diff --git a/x11-wm/jwm/jwm-2.0.1.ebuild b/x11-wm/jwm/jwm-2.0.1.ebuild
index 4a9693d4dff9..247efa9c8ccb 100644
--- a/x11-wm/jwm/jwm-2.0.1.ebuild
+++ b/x11-wm/jwm/jwm-2.0.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-2.0.1.ebuild,v 1.9 2010/11/08 18:48:32 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-2.0.1.ebuild,v 1.10 2012/01/31 23:02:05 jer Exp $
 
 EAPI=3
 inherit eutils
 
-DESCRIPTION="Very fast and lightweight still powerfull window manager for X"
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
 HOMEPAGE="http://joewing.net/programs/jwm/"
 SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.bz2"
 
diff --git a/x11-wm/jwm/jwm-2.1.0.ebuild b/x11-wm/jwm/jwm-2.1.0.ebuild
new file mode 100644
index 000000000000..9453cb8a2f77
--- /dev/null
+++ b/x11-wm/jwm/jwm-2.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-2.1.0.ebuild,v 1.1 2012/01/31 23:02:03 jer Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Very fast and lightweight still powerful window manager for X"
+HOMEPAGE="http://joewing.net/programs/jwm/"
+SRC_URI="http://joewing.net/programs/jwm/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="bidi debug jpeg png truetype xinerama xpm"
+
+RDEPEND="xpm? ( x11-libs/libXpm )
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	truetype? ( x11-libs/libXft )
+	png? ( media-libs/libpng )
+	jpeg? ( virtual/jpeg )
+	bidi? ( dev-libs/fribidi )
+	dev-libs/expat"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.1-nostrip.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable jpeg) \
+		$(use_enable png) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		$(use_enable xpm) \
+		$(use_enable bidi fribidi) \
+		--enable-shape \
+		--enable-xrender
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /etc
+	dodir /usr/share/man
+	emake BINDIR="${D}/usr/bin" SYSCONF="${D}/etc" \
+		MANDIR="${D}/usr/share/man" install
+	rm "${D}"/etc/system.jwmrc
+
+	echo "#!/bin/sh" > jwm
+	echo "exec /usr/bin/jwm" >> jwm
+	exeinto /etc/X11/Sessions
+	doexe jwm
+
+	dodoc README example.jwmrc todo.txt
+}
+
+pkg_postinst() {
+	einfo "Put an appropriate configuration file in /etc/system.jwmrc"
+	einfo "or in ~/.jwmrc."
+	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
+}