Modular X fixes, bug 132732.

(Portage version: 2.1.2_pre2-r6)

4 files changed, 81 insertions, 1 deletions

diff --git a/x11-plugins/asmon/ChangeLog b/x11-plugins/asmon/ChangeLog
index ce657a4bb596..a4209e9c1f75 100644
--- a/x11-plugins/asmon/ChangeLog
+++ b/x11-plugins/asmon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/asmon
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/ChangeLog,v 1.14 2006/06/06 22:54:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/ChangeLog,v 1.15 2006/10/10 19:35:24 kloeri Exp $
+
+*asmon-0.7 (10 Oct 2006)
+
+  10 Oct 2006; Bryan Østergaard <kloeri@gentoo.org>
+  +files/asmon-0.7.cflags.diff, +asmon-0.7.ebuild:
+  Modular X fixes, bug 132732.
 
   06 Jun 2006; Jason Wever <weeve@gentoo.org> asmon-0.65.ebuild:
   Stable on SPARC.
diff --git a/x11-plugins/asmon/asmon-0.7.ebuild b/x11-plugins/asmon/asmon-0.7.ebuild
new file mode 100644
index 000000000000..87e52706441f
--- /dev/null
+++ b/x11-plugins/asmon/asmon-0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/asmon/asmon-0.7.ebuild,v 1.1 2006/10/10 19:35:24 kloeri Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="WindowMaker/AfterStep system monitor dockapp"
+HOMEPAGE="http://rio.vg/asmon/"
+SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+
+RDEPEND="|| ( ( x11-libs/libXpm )
+	<virtual/x11-7 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto )
+	<virtual/x11-7 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.cflags.diff
+	sed -i -e "s:gcc -c:$(tc-getCC) -c:g" \
+	    asmon/Makefile || die "sed failed in Makefile"
+}
+
+src_compile() {
+	cd ${S}/asmon
+	make clean
+	emake || die
+}
+
+src_install() {
+	dodoc Changelog
+	newicon ${PN}.icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} ${PN} ${PN}.xpm "System;Monitor"
+	dobin asmon/${PN}
+}
diff --git a/x11-plugins/asmon/files/asmon-0.7.cflags.diff b/x11-plugins/asmon/files/asmon-0.7.cflags.diff
new file mode 100644
index 000000000000..b69c692abb90
--- /dev/null
+++ b/x11-plugins/asmon/files/asmon-0.7.cflags.diff
@@ -0,0 +1,31 @@
+--- asmon/Makefile.orig	1999-06-26 03:35:13.000000000 +0200
++++ asmon/Makefile	2006-08-24 20:21:52.000000000 +0200
+@@ -4,7 +4,7 @@
+ #SOLARIS_LIBS = -lsocket -lkstat
+ #SOLARIS_OBJS = solaris26.o
+ 
+-LIBDIR = -L/usr/X11R6/lib
++LIBDIR = -L/usr/lib
+ LIBS   = -lXpm -lXext -lX11 $(SOLARIS_LIBS)
+ OBJS =  asmon.o $(SOLARIS_OBJS) \
+ 		../wmgeneral/wmgeneral.o \
+@@ -12,16 +12,16 @@
+ 		../wmgeneral/list.o
+ 
+ .c.o:
+-	gcc -c -Wall $(SOLARIS) $< -o $*.o
++	gcc -c -Wall $(CFLAGS) $(SOLARIS) $< -o $*.o
+ 
+ asmon: $(OBJS)
+ 	gcc -o asmon $(OBJS) $(LIBDIR) $(LIBS)
+ 
+ clean::
+ 	for i in $(OBJS) ; do \
+-		rm $$i;\
++		rm -f $$i;\
+ 	done
+-	rm asmon
++	rm -f asmon
+ 
+ install::
+ 	cp -f asmon /usr/local/bin
diff --git a/x11-plugins/asmon/files/digest-asmon-0.7 b/x11-plugins/asmon/files/digest-asmon-0.7
new file mode 100644
index 000000000000..fad7b273c922
--- /dev/null
+++ b/x11-plugins/asmon/files/digest-asmon-0.7
@@ -0,0 +1,3 @@
+MD5 8fe44235e152fa5fcf853e912c19361d asmon-0.7.tar.bz2 41861
+RMD160 5e1480b8053fcb0cb829bd76d1634780c42d2eb7 asmon-0.7.tar.bz2 41861
+SHA256 96139b689e806427b6f7f50c161f5f886f16f6b2450db35ac8b12d10df707c0c asmon-0.7.tar.bz2 41861