removed the dirty hacks and replaced with a manual compile and install. :)

4 files changed, 14 insertions, 49 deletions

diff --git a/x11-plugins/wmsmixer/ChangeLog b/x11-plugins/wmsmixer/ChangeLog
index c9a66675c96f..671e00bd28c5 100644
--- a/x11-plugins/wmsmixer/ChangeLog
+++ b/x11-plugins/wmsmixer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-plugins/wmsmixer
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/ChangeLog,v 1.3 2003/06/04 23:38:57 robh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/ChangeLog,v 1.4 2003/10/18 01:41:37 raker Exp $
+
+  17 Oct 2003; Nick hadaway <raker@gentoo.org> wmsmixer-0.5.ebuild:
+  Reworked the ebuild again. :)
 
   05 Jun 2003; robh <robh@gentoo.org> files/makefile.diff:
   corrected diff. thanks to: Georgi Georgiev <chutz@chubaka.net>
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index f6953540ac1c..1e38c1711c1f 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -1,5 +1,4 @@
-MD5 1d7de10dea711cfeb4de85bfccf30944 wmsmixer-0.5.ebuild 830
-MD5 319a4333d92b7d120b5745711c355311 ChangeLog 563
+MD5 13847da997114794703f25929547a3c1 wmsmixer-0.5.ebuild 841
+MD5 f411f85dcdb38785564c40e0aa227441 ChangeLog 665
 MD5 2a88cef104773c371d0b8d96362d47d5 files/digest-wmsmixer-0.5 63
-MD5 4c7cf285cf1f40d571ff7e80783bc3bd files/makefile.diff 750
 MD5 2888240d41fcb8a0569feba2cb252dfa files/gcc3.diff 398
diff --git a/x11-plugins/wmsmixer/files/makefile.diff b/x11-plugins/wmsmixer/files/makefile.diff
deleted file mode 100644
index cabae38dac92..000000000000
--- a/x11-plugins/wmsmixer/files/makefile.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- Makefile	2003-05-27 03:46:06.000000000 +0900
-+++ Makefile.new	2003-05-27 03:48:27.000000000 +0900
-@@ -154,12 +154,12 @@
- # from  top Makefile
-   BOOTSTRAPCFLAGS =
- 
--               CC = gcc -m32
-+               CC = g++ -m32
-                AS = gcc -m32 -c -x assembler
- 
- .SUFFIXES: .cc
- 
--              CXX = c++ -m32
-+              CXX = g++ -m32
- 
-           CXXFILT = c++filt
-            CXXLIB =
-@@ -958,13 +958,6 @@
- 	fi
- 	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS)  wmsmixer $(DESTDIR)$(BINDIR)/wmsmixer
- 
--all:: wmsmixer.$(MANNEWSUFFIX)
--
--wmsmixer.$(MANNEWSUFFIX): wmsmixer.$(MANSRCSUFFIX)
--	$(RM) $@
--	cd `dirname wmsmixer` && \
--	$(LN) `basename wmsmixer.$(MANSRCSUFFIX)` `basename $@`
--
- cleandir::
- 	$(RM) wmsmixer.$(MANNEWSUFFIX)
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild
index 98c21988da8d..1de82e6e89d7 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild,v 1.4 2003/10/16 16:10:23 drobbins Exp $
-
-S="${WORKDIR}/${P}"
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsmixer/wmsmixer-0.5.ebuild,v 1.5 2003/10/18 01:41:37 raker Exp $
 
 DESCRIPTION="fork of wmmixer adding scrollwheel support and other features"
 HOMEPAGE="http://www.hibernaculum.net/wmsmixer.html"
@@ -16,25 +14,20 @@ DEPEND="virtual/glibc
 	virtual/x11"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/gcc3.diff || die "patch failed"
-
+	epatch ${FILESDIR}/gcc3.diff
 }
 
 src_compile() {
-
-	xmkmf || die "xmkmf failed"
-
-	patch -p0 < ${FILESDIR}/makefile.diff
-
-	make || die "parallel make failed"
-
+	g++ -m32 ${CFLAGS} -I/usr/X11R6/include -c -o wmsmixer.o wmsmixer.cc
+	rm -f wmsmixer
+	g++ -o wmsmixer ${CFLAGS} -L/usr/X11R6/lib wmsmixer.o -lXpm -lXext -lX11
 }
 
 src_install() {
+	insinto /usr/X11R6/bin
+	doins wmsmixer
 
-	make DESTDIR=${D} install || die "make install failed"
-
+	dodoc README README.wmmixer
 }