Missing x11-misc/imake DEPEND for xmkmf command as used by src_prepare(). Change HOMEPAGE and SRC_URI wrt #415835 by "df".

Package-Manager: portage-2.2.0_alpha104/cvs/Linux x86_64

3 files changed, 32 insertions, 31 deletions

diff --git a/x11-misc/xtoolwait/ChangeLog b/x11-misc/xtoolwait/ChangeLog
index 61c76dfc0ea4..a49a3fc576d2 100644
--- a/x11-misc/xtoolwait/ChangeLog
+++ b/x11-misc/xtoolwait/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xtoolwait
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/ChangeLog,v 1.34 2012/05/14 15:15:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/ChangeLog,v 1.35 2012/05/14 15:21:02 ssuominen Exp $
+
+  14 May 2012; Samuli Suominen <ssuominen@gentoo.org> xtoolwait-1.3-r2.ebuild:
+  Missing x11-misc/imake DEPEND for xmkmf command as used by src_prepare().
+  Change HOMEPAGE and SRC_URI wrt #415835 by "df".
 
   14 May 2012; Samuli Suominen <ssuominen@gentoo.org> -xtoolwait-1.3-r1.ebuild:
   old
diff --git a/x11-misc/xtoolwait/Manifest b/x11-misc/xtoolwait/Manifest
index e519af959380..72319fe90f0d 100644
--- a/x11-misc/xtoolwait/Manifest
+++ b/x11-misc/xtoolwait/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST xtoolwait-1.3.tar.gz 14315 RMD160 db75a684c5655d2cafad9eadedcf875e812f98d7 SHA1 544fbf1deca73324087272d22655a67cf72a5c6f SHA256 c6d075b75294d92440a37a45a6b8bbda07b9d58df5bf585f5a265679f16cb485
-EBUILD xtoolwait-1.3-r2.ebuild 1214 RMD160 adaaffa34b5a72bac0f2ffeb4e5f4b56c61b8547 SHA1 11bdfb61f7ab6ee07ccd246f9ec6012736955bdd SHA256 03340fd3040f082273659066d487e3fecd93dad13130d8f73bf0804917ed95aa
-MISC ChangeLog 3899 RMD160 d868efadcbc649a2bed1b82800766184c49334f4 SHA1 011b19a038525bc0fd3c5ba96c1b721c20bfcf4d SHA256 4ea2434eadb40cc50d91bcd5e43d69127c8bdb62a5b7580b0180d6ff0d695a8c
+EBUILD xtoolwait-1.3-r2.ebuild 1010 RMD160 d13a3a2cec5b684b67c719d44fd2b47b99b3856c SHA1 c2eb1af2e8cdffd33a3d30fe9146bdedb71c59d7 SHA256 b6482da15952437efd716f9a56cf986df6e980a1c178fcad70bb94716b951c80
+MISC ChangeLog 4106 RMD160 232fddb58573d3f50c374ae27633de8af13a2280 SHA1 31727d832cac04bde43ea4e7755f15fe92e7b132 SHA256 09d527d51524c910f6276e923f8b57dc53e08af5392ed8d7bb84ea9826902eeb
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPsSDSAAoJEEdUh39IaPFNyd4H/372Mi+0XvreiFtJ9v/oksFp
-UntJ0Uy13dU9fM5UGS6KduOUuJYQ9vBfUIFXzN8HPOCRWgpctHl9Ban8r3M+jx5V
-ypLyn3yqu0oJyDwOcK/5bl9IeVJkvOQJ3J2XqUOxXHUI0Qjh4c1payfWnO3TDG0M
-WDjPHFfJV/FQ4pPz2PJ5nr2zX50YtPe2iQma5qo0B+kUWG8S77ZrMvbGxkaQ/bHw
-91fDSYi8y+jsI9eQagQB3xHCA6o5nFojCEpER4oz0UWkS12Cd7eDgEqU2jujVON2
-BicYMiWuX6N5yPS1IITzUmjAJ+xcnJ/AUZzpjS80SeH5jOo160vuQkVY64Sy0Xw=
-=35dm
+iQEcBAEBAgAGBQJPsSIcAAoJEEdUh39IaPFNGysH/3YqS4utHZbnhORMnJXXyZlB
+0JmmES7v30iXHNd1cBvAB18jEht0ri8IsfzYRLQ1NiTOlyHkftxT8lRrYUjZ2jeT
+nXPfaqrbZEENzuu7r17ktcowNVoWw6grXNysL4+mA544R3J4YYqZp9uVqiLdygLy
+VWkA0QeVqm6OjGDMKDwZ1LUNlFAl+97JUM2qClqHt09QeCf1oNWpZFlTeIg+Pilk
+g3CTwsyh+xTnyKEqDrPSDsz5a53nxKTYkc9NjYB6ZqUypjy6e8/lNlmy1vmqsgk/
+2f2zfSEPaGFXTbnmFxJCAnWYFA2pvas7nu2y4Apzwgj05llVaOxWLTUi1MMWOaE=
+=tiU/
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index a17111dc74a1..8fa9f2360972 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild,v 1.4 2012/02/12 15:18:51 armin76 Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild,v 1.5 2012/05/14 15:21:02 ssuominen Exp $
 
+EAPI=4
 inherit toolchain-funcs
 
 DESCRIPTION="Xtoolwait notably decreases the startup time of an X session"
-HOMEPAGE="http://www.hacom.nl/~richard/software/xtoolwait.html"
-SRC_URI="http://www.hacom.nl/~richard/software/${P}.tar.gz"
+HOMEPAGE="http://ftp.x.org/contrib/utilities/xtoolwait-1.3.README"
+SRC_URI="http://ftp.x.org/contrib/utilities/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,33 +17,31 @@ IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	app-text/rman"
+	app-text/rman
+	x11-misc/imake
+	x11-proto/xproto"
 
 src_prepare() {
-	xmkmf || die "xmkmf failed"
-	sed -i Makefile \
-		-e '/CC = /d' \
-		-e '/EXTRA_LDOPTIONS = /d' \
-		|| die "sed Makefile"
+	xmkmf || die
+	sed -i \
+		-e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \
+		Makefile || die
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
+		CC="$(tc-getCC)" \
 		CCOPTIONS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		|| die "emake failed"
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
-	emake BINDIR=/usr/bin \
-		MANPATH=/usr/share/man \
-		DOCDIR=/usr/share/doc/${PF} \
-		DESTDIR="${D}" install || die "emake install failed"
-	emake BINDIR=/usr/bin \
+	emake \
+		BINDIR=/usr/bin \
 		MANPATH=/usr/share/man \
 		DOCDIR=/usr/share/doc/${PF} \
-		DESTDIR="${D}" install.man || die "emake install.man failed"
+		DESTDIR="${D}" \
+		install{,.man}
+
 	dodoc CHANGES README
 }