Revision bump, with fixes for multilib, LDFLAGS, crosscompile, ecc. Closes bug #207766.

Package-Manager: portage-2.1.3.19

5 files changed, 97 insertions, 5 deletions

diff --git a/x11-plugins/wmMatrix/ChangeLog b/x11-plugins/wmMatrix/ChangeLog
index c7ba68f4bfbd..01a9b222e465 100644
--- a/x11-plugins/wmMatrix/ChangeLog
+++ b/x11-plugins/wmMatrix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmMatrix
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/ChangeLog,v 1.12 2007/07/22 05:35:02 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/ChangeLog,v 1.13 2008/01/28 13:57:14 s4t4n Exp $
+
+*wmMatrix-0.2-r1 (28 Jan 2008)
+
+  28 Jan 2008; Michele Noberasco <s4t4n@gentoo.org> wmMatrix-0.2-r1.ebuild,
+  wmMatrix-0.2-makefile.patch, digest-wmMatrix-0.2-r1 :
+  Revision bump, with fixes for LDFLAGS, crosscompile, multilib, etc...
+  Closes bug #207766.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmMatrix-0.2.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index 1419593b3d4b..28e6df9cd97c 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -1,12 +1,20 @@
+AUX wmMatrix-0.2-makefile.patch 867 RMD160 5ec669b97d3ed3f91acf04146a9799111242d559 SHA1 e8102d8472eaa84988003579b8d430614ac14e0a SHA256 2e184dd2e402adfd5c7afdb37d49cea44752b561d87d9579f32c0e01538a198d
+MD5 3e6c9d4929f4de3c97aae32f182cbb2e files/wmMatrix-0.2-makefile.patch 867
+RMD160 5ec669b97d3ed3f91acf04146a9799111242d559 files/wmMatrix-0.2-makefile.patch 867
+SHA256 2e184dd2e402adfd5c7afdb37d49cea44752b561d87d9579f32c0e01538a198d files/wmMatrix-0.2-makefile.patch 867
 DIST wmMatrix-0.2.tar.gz 225343 RMD160 af7734e6fab719329d4f2170941e6c219c17159e SHA1 e7d63a9872d38386af95eee082235b0267a66ee9 SHA256 ce7b18b1046985237388846332234fd5aaae7b6ba2476ba465e4e57208b75053
+EBUILD wmMatrix-0.2-r1.ebuild 994 RMD160 0aafc7a28e7e53a740b3a2bc0bea8306795d1858 SHA1 6d3755bc03a2b864874ab8303acd56615201c97b SHA256 a259386a26d88b2ec126023f88bfb05f826495c9713c9422683fcb87d499822e
+MD5 02aa45a526e4f4821331c074a833df07 wmMatrix-0.2-r1.ebuild 994
+RMD160 0aafc7a28e7e53a740b3a2bc0bea8306795d1858 wmMatrix-0.2-r1.ebuild 994
+SHA256 a259386a26d88b2ec126023f88bfb05f826495c9713c9422683fcb87d499822e wmMatrix-0.2-r1.ebuild 994
 EBUILD wmMatrix-0.2.ebuild 766 RMD160 1ce923f6b226a05998f83dcbba0229de10056d6b SHA1 b02652414c1dab6aeebf67eb54659e5a90b4539e SHA256 9f1704b466b4dbab9b029dd9f94507b89f335af697d2c4a68a7b16e9424003bf
 MD5 ca5bb997053216d63a16e6ef2b52922a wmMatrix-0.2.ebuild 766
 RMD160 1ce923f6b226a05998f83dcbba0229de10056d6b wmMatrix-0.2.ebuild 766
 SHA256 9f1704b466b4dbab9b029dd9f94507b89f335af697d2c4a68a7b16e9424003bf wmMatrix-0.2.ebuild 766
-MISC ChangeLog 1314 RMD160 574d53d03232f37ec36aa2f50453bee8f5af9b47 SHA1 081c34307d5d934417495b44b7314caf6cbf0af4 SHA256 2c429e708e3488d42744fd745fe85fcda433f1c43948a027ec697de2dbc5422d
-MD5 5131425c5a3e1f29cbe9e03868d3d6b4 ChangeLog 1314
-RMD160 574d53d03232f37ec36aa2f50453bee8f5af9b47 ChangeLog 1314
-SHA256 2c429e708e3488d42744fd745fe85fcda433f1c43948a027ec697de2dbc5422d ChangeLog 1314
+MISC ChangeLog 1569 RMD160 74e8e0a11be7c2dd713f3ee79ce48796cb49abf4 SHA1 fe5183724c92655b8f355ed5279a96cc4832920d SHA256 0cd13d30d1864ce773a8c0ec64be13e2d30a1112f224f8b972c6881fcb1f1ae3
+MD5 ae7f043c11afe7bb2f1bc5f7646aeffe ChangeLog 1569
+RMD160 74e8e0a11be7c2dd713f3ee79ce48796cb49abf4 ChangeLog 1569
+SHA256 0cd13d30d1864ce773a8c0ec64be13e2d30a1112f224f8b972c6881fcb1f1ae3 ChangeLog 1569
 MISC metadata.xml 313 RMD160 e5dba4ab255e8b81ad98fcead8f4807c1d2b6d4f SHA1 968aa926d30c0be2390afcb400657be883e28193 SHA256 b7b55e5cd7a9aa03293f03984c3e1c58ba7dcd54389f96a61b5e8fb1c8266717
 MD5 2ea0152367e7a91b28a311440c6a4b7c metadata.xml 313
 RMD160 e5dba4ab255e8b81ad98fcead8f4807c1d2b6d4f metadata.xml 313
@@ -14,3 +22,6 @@ SHA256 b7b55e5cd7a9aa03293f03984c3e1c58ba7dcd54389f96a61b5e8fb1c8266717 metadata
 MD5 a368b03caae58611660fa55d2b3c8489 files/digest-wmMatrix-0.2 238
 RMD160 5b88354c546a775868194a04b6dd99d867ff3f90 files/digest-wmMatrix-0.2 238
 SHA256 d14b2147250ec63c8feb8a59d5da9e5e531b7e247f5665aee0dccdb966b14f75 files/digest-wmMatrix-0.2 238
+MD5 a368b03caae58611660fa55d2b3c8489 files/digest-wmMatrix-0.2-r1 238
+RMD160 5b88354c546a775868194a04b6dd99d867ff3f90 files/digest-wmMatrix-0.2-r1 238
+SHA256 d14b2147250ec63c8feb8a59d5da9e5e531b7e247f5665aee0dccdb966b14f75 files/digest-wmMatrix-0.2-r1 238
diff --git a/x11-plugins/wmMatrix/files/digest-wmMatrix-0.2-r1 b/x11-plugins/wmMatrix/files/digest-wmMatrix-0.2-r1
new file mode 100644
index 000000000000..b1924861c02d
--- /dev/null
+++ b/x11-plugins/wmMatrix/files/digest-wmMatrix-0.2-r1
@@ -0,0 +1,3 @@
+MD5 4e9f0c94e78ad65ea9a564fba5f7a187 wmMatrix-0.2.tar.gz 225343
+RMD160 af7734e6fab719329d4f2170941e6c219c17159e wmMatrix-0.2.tar.gz 225343
+SHA256 ce7b18b1046985237388846332234fd5aaae7b6ba2476ba465e4e57208b75053 wmMatrix-0.2.tar.gz 225343
diff --git a/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch b/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch
new file mode 100644
index 000000000000..5225ad38f679
--- /dev/null
+++ b/x11-plugins/wmMatrix/files/wmMatrix-0.2-makefile.patch
@@ -0,0 +1,34 @@
+--- Makefile.orig	1999-08-16 18:01:58.000000000 +0200
++++ Makefile	2008-01-27 23:23:36.000000000 +0100
+@@ -1,8 +1,8 @@
+-CC     = gcc
+-CFLAGS = -O2 -Wall 
+-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
+-DESTDIR= /usr/X11R6
+-LIBDIR = -L/usr/X11R6/lib
++CC     ?= gcc
++CFLAGS += -Wall 
++INCDIR = -I/usr/include/X11 -I/usr/include
++PREFIX ?= /usr
++LIBDIR ?= /usr/lib
+ 
+ # for Linux
+ LIBS   = -lXpm -lX11 -lXext
+@@ -24,7 +24,7 @@
+ 
+ wmMatrix.o: wmMatrix_master.xpm wmMatrix_mask.xbm
+ wmMatrix:	$(OBJS) 
+-	$(CC) $(COPTS) $(SYSTEM) -o wmMatrix $^ $(INCDIR) $(LIBDIR) $(LIBS)
++	$(CC) $(COPTS) $(SYSTEM) -o wmMatrix $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS)
+ 
+ 
+ clean:
+@@ -34,5 +34,6 @@
+ 	rm -f wmMatrix
+ 
+ install:: wmMatrix
+-	install -c -s -m 0755 wmMatrix $(DESTDIR)/bin
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install -m 0755 wmMatrix $(DESTDIR)$(PREFIX)/bin
+ 
+
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
new file mode 100644
index 000000000000..5e1bf82f476f
--- /dev/null
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild,v 1.1 2008/01/28 13:57:14 s4t4n Exp $
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack."
+SRC_URI="http://www.dockapps.org/download.php/id/17/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.org/file.php/id/10"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-proto/xproto
+	x11-proto/xextproto"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~ppc64"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	# this version is distributed with compiled binaries!
+	make clean
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "install failed"
+}