Run make clean to remove i386 objects before building wrt #204544. Respect CC and CFLAGS targets. Fix QA compiler warnings due to missing include string.h.

Package-Manager: portage-2.1.4_rc14

4 files changed, 54 insertions, 20 deletions

diff --git a/x11-plugins/wmdots/ChangeLog b/x11-plugins/wmdots/ChangeLog
index e982d046c711..aa6cea65ba56 100644
--- a/x11-plugins/wmdots/ChangeLog
+++ b/x11-plugins/wmdots/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmdots
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/ChangeLog,v 1.8 2007/07/22 05:11:15 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/ChangeLog,v 1.9 2008/01/06 13:30:06 drac Exp $
+
+  06 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/wmdots-0.2_beta-stringh.patch, wmdots-0.2_beta.ebuild:
+  Run make clean to remove i386 objects before building wrt #204544. Respect
+  CC and CFLAGS targets. Fix QA compiler warnings due to missing include
+  string.h.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   wmdots-0.2_beta.ebuild:
diff --git a/x11-plugins/wmdots/Manifest b/x11-plugins/wmdots/Manifest
index ca1e6e593476..a1bbed4bdaca 100644
--- a/x11-plugins/wmdots/Manifest
+++ b/x11-plugins/wmdots/Manifest
@@ -1,12 +1,16 @@
+AUX wmdots-0.2_beta-stringh.patch 325 RMD160 3503a51063ad8be7a97c83ded44d112426751aea SHA1 057c82a38b96cb62349040ff4bfb721a2695f8f1 SHA256 acf85edff94d3589c9c1b7d8b6a5d00e315b685311c9d73d6e9ebffeb406a566
+MD5 1b4ec76d604f67624cb12c8b0271153e files/wmdots-0.2_beta-stringh.patch 325
+RMD160 3503a51063ad8be7a97c83ded44d112426751aea files/wmdots-0.2_beta-stringh.patch 325
+SHA256 acf85edff94d3589c9c1b7d8b6a5d00e315b685311c9d73d6e9ebffeb406a566 files/wmdots-0.2_beta-stringh.patch 325
 DIST wmdots-0.2beta.tar.gz 94933 RMD160 11ffec8d242ed0d2835589565457f72dfe28a215 SHA1 7f021a3a66eaa26aff54473ad33321e4bc0fcd96 SHA256 c25be89d9f0ae840dff68034663524591f9e33fc7bba0c7b264f39ca08fc8c9e
-EBUILD wmdots-0.2_beta.ebuild 605 RMD160 3ee8ca2b7fad9d12561f47bbe2da24eea1d3f14b SHA1 00bb8955dbf1a429c9a4803b3dc569e05414a3d7 SHA256 ba4eef10c1912ddc11ade08c918dcca77529e27860555c33eb5e59b0c20b3f2a
-MD5 c16836bfa1bb4ccb5cc76e4f2ce3dfe7 wmdots-0.2_beta.ebuild 605
-RMD160 3ee8ca2b7fad9d12561f47bbe2da24eea1d3f14b wmdots-0.2_beta.ebuild 605
-SHA256 ba4eef10c1912ddc11ade08c918dcca77529e27860555c33eb5e59b0c20b3f2a wmdots-0.2_beta.ebuild 605
-MISC ChangeLog 892 RMD160 c2be861d9c57da4ea57fa849e3904fa0a3007db4 SHA1 b0f39a7a327eb631f49e92a8962e5083ed6c054c SHA256 7111a58f4fa763aa160c8c61cd2a57da22e4b212c9efa11535541925e0093ede
-MD5 ee270b085e68f322e66a1cc738621b35 ChangeLog 892
-RMD160 c2be861d9c57da4ea57fa849e3904fa0a3007db4 ChangeLog 892
-SHA256 7111a58f4fa763aa160c8c61cd2a57da22e4b212c9efa11535541925e0093ede ChangeLog 892
+EBUILD wmdots-0.2_beta.ebuild 888 RMD160 573c68fd35e75a0bfca7cd0421ab7309ef4ed1a0 SHA1 70912d2b12626fcf88884e5932b4a66b4d4991f2 SHA256 60f65ad2978a40d6d1091aeab3c62063d839b3475f1ab1bc2da7f123d1ca1881
+MD5 dbf0710b54f7fb04a4265d64351afeee wmdots-0.2_beta.ebuild 888
+RMD160 573c68fd35e75a0bfca7cd0421ab7309ef4ed1a0 wmdots-0.2_beta.ebuild 888
+SHA256 60f65ad2978a40d6d1091aeab3c62063d839b3475f1ab1bc2da7f123d1ca1881 wmdots-0.2_beta.ebuild 888
+MISC ChangeLog 1163 RMD160 aec03ca70908eeb5332e762a1db6baa21cb1c064 SHA1 28c98fdb52ce8332f3543614d59e1994af9fafb2 SHA256 4a177ce476e3ae5a81ca4782d25c067db1f7bf4edb151bddf00e26329958514b
+MD5 9ebe3dacb546ae7b2f3a353f9da5f8bd ChangeLog 1163
+RMD160 aec03ca70908eeb5332e762a1db6baa21cb1c064 ChangeLog 1163
+SHA256 4a177ce476e3ae5a81ca4782d25c067db1f7bf4edb151bddf00e26329958514b ChangeLog 1163
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
diff --git a/x11-plugins/wmdots/files/wmdots-0.2_beta-stringh.patch b/x11-plugins/wmdots/files/wmdots-0.2_beta-stringh.patch
new file mode 100644
index 000000000000..129b938619ee
--- /dev/null
+++ b/x11-plugins/wmdots/files/wmdots-0.2_beta-stringh.patch
@@ -0,0 +1,11 @@
+diff -ur wmdots.orig/wmdots.c wmdots/wmdots.c
+--- wmdots.orig/wmdots.c	1999-10-11 22:39:11.000000000 +0300
++++ wmdots/wmdots.c	2008-01-06 15:18:26.000000000 +0200
+@@ -83,6 +83,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <string.h>
+ 
+ #include <X11/xpm.h>
+ #include "../wmgeneral/wmgeneral.h"
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
index 89d3dc782712..57fb20c68e68 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/wmdots-0.2_beta.ebuild,v 1.11 2007/07/22 05:11:15 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmdots/wmdots-0.2_beta.ebuild,v 1.12 2008/01/06 13:30:06 drac Exp $
 
-MY_P=wmdots-0.2beta
-S=${WORKDIR}/${PN}
-DESCRIPTION="Multi shape 3d rotating dots"
-SRC_URI="http://dockapps.org/download.php/id/153/${MY_P}.tar.gz"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="multishape 3d rotating dots"
 HOMEPAGE="http://dockapps.org/file.php/id/116"
+SRC_URI="http://dockapps.org/download.php/id/153/${P/_/}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 -ppc"
 SLOT="0"
-
+KEYWORDS="amd64 -ppc x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
@@ -18,8 +18,21 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}"
 
-src_install () {
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-stringh.patch
+	sed -e "s:cc:$(tc-getCC):g" \
+		-e "s:-g -O2:${CFLAGS}:g" -i Makefile
+}
 
-	dobin ${S}/wmdots
+src_compile() {
+	emake clean || die "emake clean failed."
+	emake LIBDIR="-L/usr/$(get_libdir)" || die "emake failed."
+}
 
+src_install() {
+	dobin wmdots
 }