summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2012-01-31 23:02:05 +0000
committerJeroen Roovers <jer@gentoo.org>2012-01-31 23:02:05 +0000
commitaf7f706f9391e74d7ae2ddc09858583890983e0f (patch)
tree5efe918b7b690897ffe66b21cc5d55bd1f356651 /x11-wm
parentInitial EAPI4 support in qt4-build eclass (diff)
downloadgentoo-2-af7f706f9391e74d7ae2ddc09858583890983e0f.tar.gz
gentoo-2-af7f706f9391e74d7ae2ddc09858583890983e0f.tar.bz2
gentoo-2-af7f706f9391e74d7ae2ddc09858583890983e0f.zip
Clean up patch. Version bump.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/jwm/ChangeLog10
-rw-r--r--x11-wm/jwm/files/jwm-2.0.1-nostrip.patch5
-rw-r--r--x11-wm/jwm/jwm-2.0.1.ebuild6
-rw-r--r--x11-wm/jwm/jwm-2.1.0.ebuild70
4 files changed, 83 insertions, 8 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/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}/"
+}