Version bump, using a patch to modify build system which is broken more or less.

(Portage version: 2.1.4)

4 files changed, 98 insertions, 2 deletions

diff --git a/x11-plugins/wmmisc/ChangeLog b/x11-plugins/wmmisc/ChangeLog
index 36bf326ef867..0ae2b53d1eb8 100644
--- a/x11-plugins/wmmisc/ChangeLog
+++ b/x11-plugins/wmmisc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmmisc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/ChangeLog,v 1.6 2007/07/22 04:28:27 dberkholz Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/ChangeLog,v 1.7 2008/01/16 18:58:45 drac Exp $
+
+*wmmisc-1.1 (16 Jan 2008)
+
+  16 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/wmmisc-1.1-build.patch, +wmmisc-1.1.ebuild:
+  Version bump, using a patch to modify build system which is broken more or
+  less.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmmisc-0.9.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-plugins/wmmisc/files/digest-wmmisc-1.1 b/x11-plugins/wmmisc/files/digest-wmmisc-1.1
new file mode 100644
index 000000000000..06ea86680bc4
--- /dev/null
+++ b/x11-plugins/wmmisc/files/digest-wmmisc-1.1
@@ -0,0 +1,3 @@
+MD5 9d7413ba628a03517216f17655e5e95e wmmisc_1.1.orig.tar.gz 18032
+RMD160 385bcdd1eea53b504151d93a1ddf9824a54f01bf wmmisc_1.1.orig.tar.gz 18032
+SHA256 1dbe229ab31cc1767a62bdbf0397bf75a664583769a3d3d4bbbdc076280566f6 wmmisc_1.1.orig.tar.gz 18032
diff --git a/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch b/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch
new file mode 100644
index 000000000000..d42400ab0132
--- /dev/null
+++ b/x11-plugins/wmmisc/files/wmmisc-1.1-build.patch
@@ -0,0 +1,48 @@
+diff -ur wmmisc-1.1.orig/src/general.mk wmmisc-1.1/src/general.mk
+--- wmmisc-1.1.orig/src/general.mk	2006-01-07 19:50:31.000000000 +0200
++++ wmmisc-1.1/src/general.mk	2008-01-16 20:44:59.000000000 +0200
+@@ -16,7 +16,7 @@
+ MANDIR      = $(PREFIX)/share/man
+ # Set some destination locations.
+ 
+-CC          = gcc
++CC         ?= gcc
+ CXX         = g++
+ # Set the compilers.
+ 
+@@ -45,13 +45,7 @@
+ # Set the assembler and flags.
+ 
+ LD          = ld
+-LDFLAGS     = -lm
+-ifeq ($(MODULAR_X),1)
+-LDFLAGS    += $(shell pkg-config --libs x11 xpm xext)
+-else
+-LDFLAGS    += -L/usr/X11R6/lib -lX11 -lXpm -lXext
+-endif
+-LDFLAGS    += -Wl,-O1
++LIBS        = -lm -lX11 -lXpm -lXext
+ # Set the linker and flags.
+ 
+ AR          = ar
+@@ -64,7 +58,7 @@
+ ifeq ($(MODULAR_X),1)
+ INCLUDES    = $(shell pkg-config --cflags x11 xpm xext)
+ else
+-INCLUDES    = -I/usr/X11R6/include
++INCLUDES    = -I/usr/include
+ endif
+ INCLUDES   += -I.
+ # Set the include locations.
+diff -ur wmmisc-1.1.orig/src/Makefile wmmisc-1.1/src/Makefile
+--- wmmisc-1.1.orig/src/Makefile	2006-01-07 20:45:59.000000000 +0200
++++ wmmisc-1.1/src/Makefile	2008-01-16 20:43:31.000000000 +0200
+@@ -23,7 +23,7 @@
+ 
+ $(package): $(objects)
+ 	rm -f $(package)
+-	$(CC) $(CFLAGS) -o $(package) $(objects) $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $(package) $(objects) $(LIBS)
+ 
+ wmgeneral.o: wmgeneral.c wmgeneral.h
+ 	rm -f wmgeneral.o
diff --git a/x11-plugins/wmmisc/wmmisc-1.1.ebuild b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
new file mode 100644
index 000000000000..c71343439b1e
--- /dev/null
+++ b/x11-plugins/wmmisc/wmmisc-1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmmisc/wmmisc-1.1.ebuild,v 1.1 2008/01/16 18:58:45 drac Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a monitoring dockapp for system load, user amount, fork amount and processes."
+HOMEPAGE="http://packages.qa.debian.org/w/wmmisc.html"
+SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${P}/src
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ../{ChangeLog,README}
+}