Modular X fixes, bug 132732.

Package-Manager: portage-2.1.2_pre2-r6

5 files changed, 97 insertions, 5 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/Manifest b/x11-plugins/asmon/Manifest
index 318db9bc20a8..03cef4df3c23 100644
--- a/x11-plugins/asmon/Manifest
+++ b/x11-plugins/asmon/Manifest
@@ -1,16 +1,25 @@
+AUX asmon-0.7.cflags.diff 687 RMD160 9a5479cddd553c74f057183a2a5542b64f74df52 SHA1 267225b12c9f1fb41162a7d5b29014a48a729748 SHA256 ff83b577b68bbbf18a1aecc419622afc2592c6d60b043e09dc245802cfead25d
+MD5 7369fb483970250b5787d3b40e1c7bc0 files/asmon-0.7.cflags.diff 687
+RMD160 9a5479cddd553c74f057183a2a5542b64f74df52 files/asmon-0.7.cflags.diff 687
+SHA256 ff83b577b68bbbf18a1aecc419622afc2592c6d60b043e09dc245802cfead25d files/asmon-0.7.cflags.diff 687
 AUX asmon-cflags.diff 512 RMD160 038001b058904d74ec0a6e8c86fd3dfaf7f5fbaa SHA1 9c01d8d8441420bb401bffe426bb26450fb885f5 SHA256 a016f3bc1b3af52a39644e3db9dfa785f7630d43d419f3c4ceb3e480e8617760
 MD5 bf02e91d30bd8f286faac1484d86a30f files/asmon-cflags.diff 512
 RMD160 038001b058904d74ec0a6e8c86fd3dfaf7f5fbaa files/asmon-cflags.diff 512
 SHA256 a016f3bc1b3af52a39644e3db9dfa785f7630d43d419f3c4ceb3e480e8617760 files/asmon-cflags.diff 512
 DIST asmon-0.65.tar.gz 31833 RMD160 bd5dcfef5a7ee97e31fe79562a58a56124630c0a SHA1 caed3aa8dea2a31ae8a0007dee7f34d736df621f SHA256 99d27be193f4fad48fa8ac4a3f36cca3de6b9b9010769e57a2abd56606839f38
+DIST asmon-0.7.tar.bz2 41861 RMD160 5e1480b8053fcb0cb829bd76d1634780c42d2eb7 SHA1 749b414badf08f209ccab8c4c71d24a3ac5d7c61 SHA256 96139b689e806427b6f7f50c161f5f886f16f6b2450db35ac8b12d10df707c0c
 EBUILD asmon-0.65.ebuild 678 RMD160 30b914598d56e4eb3c7aede148125a9fb98199a2 SHA1 0bcc8912cead812dfc44f7249881bd476cf06d04 SHA256 115ffe7076a05673bbf4360a2e4fa4fc11c546d6051b4e995f855097f782156a
 MD5 4277df9bf59ea371873032e448daaafa asmon-0.65.ebuild 678
 RMD160 30b914598d56e4eb3c7aede148125a9fb98199a2 asmon-0.65.ebuild 678
 SHA256 115ffe7076a05673bbf4360a2e4fa4fc11c546d6051b4e995f855097f782156a asmon-0.65.ebuild 678
-MISC ChangeLog 1727 RMD160 27996367f9deab98e434c432941af0e8d65ccac1 SHA1 0cd08c9e9293404f175eb12b5302f1bee426a4ed SHA256 982e0adec901ce61383ce126639a1fbfdddcb763d5a4e7b674d5c0c276382b87
-MD5 d4cc95bfcdba096bb9a0a11d8a86368c ChangeLog 1727
-RMD160 27996367f9deab98e434c432941af0e8d65ccac1 ChangeLog 1727
-SHA256 982e0adec901ce61383ce126639a1fbfdddcb763d5a4e7b674d5c0c276382b87 ChangeLog 1727
+EBUILD asmon-0.7.ebuild 955 RMD160 1b82cb4b9f0b0ead4c3db817c10fba264e1ce2d2 SHA1 1a53f2acfd544ebfd104164d9ce05e82c28008cc SHA256 b58b4960ad6145bad6ccc461f6637c12932f6612087207f5b6f8e6c8eeb474c3
+MD5 65d96643d575b614bb6f86b5ff82eac3 asmon-0.7.ebuild 955
+RMD160 1b82cb4b9f0b0ead4c3db817c10fba264e1ce2d2 asmon-0.7.ebuild 955
+SHA256 b58b4960ad6145bad6ccc461f6637c12932f6612087207f5b6f8e6c8eeb474c3 asmon-0.7.ebuild 955
+MISC ChangeLog 1890 RMD160 a79ae302d9111136aee0f6b152333d750a30d306 SHA1 bfb02cab2e26d45fdf5c5b7ef56a39a27687b2b7 SHA256 471a8e5545d60ada2b38ad94809835a8769ed55692727a2fcf6b8258c83c56d8
+MD5 e03241ffc8bf50ccab331740a6ee4845 ChangeLog 1890
+RMD160 a79ae302d9111136aee0f6b152333d750a30d306 ChangeLog 1890
+SHA256 471a8e5545d60ada2b38ad94809835a8769ed55692727a2fcf6b8258c83c56d8 ChangeLog 1890
 MISC metadata.xml 163 RMD160 46208909b296ad228342e5181a46ef97a03129c7 SHA1 deae2be5c8bfd52bb2842f43b9dc83a8e9a222a6 SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c
 MD5 477586a3ede65c312df804aea35d1a30 metadata.xml 163
 RMD160 46208909b296ad228342e5181a46ef97a03129c7 metadata.xml 163
@@ -18,3 +27,6 @@ SHA256 27db507976bc3b54b88de916fc7a04aed51f3cc08c72ba9a1d012ef904bbc57c metadata
 MD5 a5db44f40eab33e91736b8d3981aef39 files/digest-asmon-0.65 229
 RMD160 e93d8547e3f351600689e2964edf668be6f189d7 files/digest-asmon-0.65 229
 SHA256 dbe890869948e119ee56e59455a455381783e30e51bb3ed1a7c6ac129fa32a36 files/digest-asmon-0.65 229
+MD5 faa8fb0c503ac810779482dc0773cf74 files/digest-asmon-0.7 229
+RMD160 acbaa3618f9bfbe8b632465a8e8e28a0142260c2 files/digest-asmon-0.7 229
+SHA256 407968040c23a08719273e4c6034bfe12f9655967246e1a94d6c2c0ed2f26bf0 files/digest-asmon-0.7 229
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