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

Package-Manager: portage-2.1.4

5 files changed, 114 insertions, 6 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/Manifest b/x11-plugins/wmmisc/Manifest
index 23b7c5ab270a..ed3b5ca59417 100644
--- a/x11-plugins/wmmisc/Manifest
+++ b/x11-plugins/wmmisc/Manifest
@@ -1,12 +1,21 @@
+AUX wmmisc-1.1-build.patch 1366 RMD160 989812a942d2f8dc479af534c13604f96c7152f7 SHA1 083f098955946154b3f054f42bd74c398e77bc1d SHA256 ef551f740ecb2513c4c9ee19311a1cfa02d7f14a2ad5fbbbc8ba5d8aabe152aa
+MD5 d279b82ba6a6db8d9b8536d33c92ebf8 files/wmmisc-1.1-build.patch 1366
+RMD160 989812a942d2f8dc479af534c13604f96c7152f7 files/wmmisc-1.1-build.patch 1366
+SHA256 ef551f740ecb2513c4c9ee19311a1cfa02d7f14a2ad5fbbbc8ba5d8aabe152aa files/wmmisc-1.1-build.patch 1366
 DIST wmmisc-0.9.tar.bz2 16651 RMD160 2c612c7c2b9183181920b7fd781b858a664a66d9 SHA1 183268aaabd3ce0916a28a7f9217b118a7f4df19 SHA256 8051099fac68a431f2d15993218f8f9a87900b355178568faa17c5d0c457d254
+DIST wmmisc_1.1.orig.tar.gz 18032 RMD160 385bcdd1eea53b504151d93a1ddf9824a54f01bf SHA1 262adde4a9ae66690bcccc8e26b696ed5e96e17e SHA256 1dbe229ab31cc1767a62bdbf0397bf75a664583769a3d3d4bbbdc076280566f6
 EBUILD wmmisc-0.9.ebuild 835 RMD160 3aeb1c815e6c146c0a3c3f5f375d2f7f5acb1117 SHA1 af46f2d4cbf03de65b86b46b085ff1404269c445 SHA256 7e5e22772fd20cf55060dfda8719beaba0be8f1105b57aec1b4457ffb171aded
 MD5 b54330424ef5dbaa1395013405b52ba5 wmmisc-0.9.ebuild 835
 RMD160 3aeb1c815e6c146c0a3c3f5f375d2f7f5acb1117 wmmisc-0.9.ebuild 835
 SHA256 7e5e22772fd20cf55060dfda8719beaba0be8f1105b57aec1b4457ffb171aded wmmisc-0.9.ebuild 835
-MISC ChangeLog 828 RMD160 143e3eed12f6bc1a413a0ce7e3424ebb8963e605 SHA1 5e46477099a44fdb7ff4efa5f64cb5b4e76f2f25 SHA256 7a0e155f68b8147ebecd352296fb1c5904d7c269bf930d976b083fe9f16bf074
-MD5 d78ffcbda2ebd72bb0910e550e947dee ChangeLog 828
-RMD160 143e3eed12f6bc1a413a0ce7e3424ebb8963e605 ChangeLog 828
-SHA256 7a0e155f68b8147ebecd352296fb1c5904d7c269bf930d976b083fe9f16bf074 ChangeLog 828
+EBUILD wmmisc-1.1.ebuild 857 RMD160 4ee73afdf3885bed80dfca03b41d1324ebeef623 SHA1 15a7c6ffa9a6e78bf14d9bbf8e186689c8f79d4e SHA256 89041167eece9a3826282fbba292120c3c69cdd3401050744bb936f4d1c18aa8
+MD5 fafcec3928722f138fbebeedb16b6e7b wmmisc-1.1.ebuild 857
+RMD160 4ee73afdf3885bed80dfca03b41d1324ebeef623 wmmisc-1.1.ebuild 857
+SHA256 89041167eece9a3826282fbba292120c3c69cdd3401050744bb936f4d1c18aa8 wmmisc-1.1.ebuild 857
+MISC ChangeLog 1038 RMD160 90cae5bb299974d2eba4d15623629ad7bdac636a SHA1 3c90fb39f3dcc6f031256ba7d69ad8ec77a9d0da SHA256 c4fcdd9a280b35da10ca2e99cbba98811983ffc97f9b8ad93263792fc34a50fc
+MD5 8b41a4008efbc4778d7cc3b3423e5472 ChangeLog 1038
+RMD160 90cae5bb299974d2eba4d15623629ad7bdac636a ChangeLog 1038
+SHA256 c4fcdd9a280b35da10ca2e99cbba98811983ffc97f9b8ad93263792fc34a50fc ChangeLog 1038
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
@@ -14,3 +23,6 @@ SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b metadata
 MD5 078a2aa6805ef0b08547e8c709933f55 files/digest-wmmisc-0.9 232
 RMD160 88779ff3f8bd2a69e27b10449fd1b3f14d5337c3 files/digest-wmmisc-0.9 232
 SHA256 3c6e986734f4c00f671d08e0aa32206c65996dd28f64fc5cb2a04bd3d32cc3c0 files/digest-wmmisc-0.9 232
+MD5 2f2321db46bf38ec5f8dda759c0864a2 files/digest-wmmisc-1.1 244
+RMD160 871d6ca21b94f0a32e892f50f944e949cbde071e files/digest-wmmisc-1.1 244
+SHA256 916eb980831d7599118455d564618854cf393602053e733b109a36b58fea4670 files/digest-wmmisc-1.1 244
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}
+}