From: Samuli Suominen <ssuominen@gentoo.org>
Date: Sat, 3 Apr 2010 00:55:17 +0000 (+0000)
Subject: Use small Makefile instead of obsolete X11R6 imake.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=73908be9adaeaf712f3d19230ae75322e4d4f41e;p=gentoo.git

Use small Makefile instead of obsolete X11R6 imake.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/x11-misc/xwit/ChangeLog b/x11-misc/xwit/ChangeLog
index 1965647487b1..b655b7c9b671 100644
--- a/x11-misc/xwit/ChangeLog
+++ b/x11-misc/xwit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xwit
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xwit/ChangeLog,v 1.9 2007/02/22 00:13:05 jokey Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xwit/ChangeLog,v 1.10 2010/04/03 00:55:17 ssuominen Exp $
+
+  03 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> xwit-3.4.ebuild,
+  +files/Makefile:
+  Use small Makefile instead of obsolete X11R6 imake.
 
   22 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-misc/xwit/Manifest b/x11-misc/xwit/Manifest
index a578b96b271b..a1ec76bfdbfa 100644
--- a/x11-misc/xwit/Manifest
+++ b/x11-misc/xwit/Manifest
@@ -1,5 +1,6 @@
+AUX Makefile 187 RMD160 0dfde40555e4ce92e2de91b3467b18d11f2a98ee SHA1 f9eef3d2bdf7af77ea5099c968f62bf5eaef496a SHA256 2cdfce1ba097e4adf6ccf490e15070a6abf60c465ba2702c02a9b3583b5e702a
 AUX malloc.patch 284 RMD160 48443930f101382ac20ac7c1041e73bf36097669 SHA1 11a36a40805e57896a72ae2169e5854520932b8a SHA256 c2d0b344343c556dc5092f71dc91b4626d8aa337b658d661cf802ff9c192de92
 DIST xwit-3.4.tar.gz 14536 RMD160 62a92780352e81130e8d894e377744b61c67bd90 SHA1 916f32c200f8bd5d30738b9added84612c1366ae SHA256 d915a7f2f8809da41edcc7784c2618be3f8ce179d82d8ace6d27ba264332c729
-EBUILD xwit-3.4.ebuild 875 RMD160 35321b0aae8ab60bd5116e3949f4fdcf70a8d2e7 SHA1 86d34e8adc44231b46b582c67e6ccb7bc4cfd902 SHA256 e3063db65b5e858b28a5b35e21aab2de86b5bb9c109f9befb5879bd7efbb05e1
-MISC ChangeLog 1076 RMD160 68f320a4aef6a99fad3d0b539942a17e6a62faae SHA1 46d005a8367975674097e4551ac33dc3c56d5a1a SHA256 6405c9b8747d381241b8256e03a376b3db11a2a33fae580be333dfbd6712ad7e
+EBUILD xwit-3.4.ebuild 785 RMD160 5d61685e31efbf240c7c7491e413d5890f2f6c4c SHA1 c7f6a0f5d00de144c4a9cded21484c7a02e852d6 SHA256 a081347377f8ae9f3e9890afe806f22ecba20a1ee14c7c7603ad15319e02c4ef
+MISC ChangeLog 1226 RMD160 67637c391d89930792cc56c7f56339b2de3f6b52 SHA1 7f260227bfbe45f0e12f3dfb5179fee4c951cbbc SHA256 a5684a958fa1acea7a519fc011b8fef23ffba28445a9fce97ff799a6e32c2cab
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
diff --git a/x11-misc/xwit/files/Makefile b/x11-misc/xwit/files/Makefile
new file mode 100644
index 000000000000..d16ec11641a6
--- /dev/null
+++ b/x11-misc/xwit/files/Makefile
@@ -0,0 +1,10 @@
+src = xwit.c dsimple.c ClientWin.c
+o = $(addsuffix .o,$(basename ${src}))
+
+all: xwit
+
+%.o: %.cpp
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+xwit: $(o)
+	$(CC) $(LDFLAGS) $(o) -o xwit -lX11
diff --git a/x11-misc/xwit/xwit-3.4.ebuild b/x11-misc/xwit/xwit-3.4.ebuild
index 69a9118be31a..0051b33ba370 100644
--- a/x11-misc/xwit/xwit-3.4.ebuild
+++ b/x11-misc/xwit/xwit-3.4.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xwit/xwit-3.4.ebuild,v 1.9 2006/10/22 01:43:00 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xwit/xwit-3.4.ebuild,v 1.10 2010/04/03 00:55:17 ssuominen Exp $
 
-inherit eutils
+EAPI=2
+inherit eutils toolchain-funcs
 
-DESCRIPTION="xwit (x window interface tool) is a hodge-podge collection of simple routines to call some of those X11 functions that don't already have any utility commands built around them."
+DESCRIPTION="A collection of simple routines to call some of those X11 functions"
 HOMEPAGE="http://ftp.x.org/contrib/utilities/xwit-3.4.README"
 SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz"
 
@@ -13,21 +14,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext"
+RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
-	x11-misc/imake
 	x11-proto/xproto"
 
-src_compile() {
-	epatch "${FILESDIR}/malloc.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/malloc.patch
+	cp -vf "${FILESDIR}"/Makefile .
+}
 
-	xmkmf || die "xmkmf failed"
-	emake || die "Make failed"
+src_compile() {
+	tc-export CC
+	emake || die
 }
 
 src_install() {
-	dobin xwit
-	cp xwit.man xwit.1
-	doman xwit.1
+	dobin xwit || die
+	newman xwit.man xwit.1 || die
 }