summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-14 15:21:02 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-14 15:21:02 +0000
commitbdaab553ba7f4ba4dd7f5ad095f8d58970171399 (patch)
tree5981ad8a28d1ce428e23f06c68429e37a1ad60dd /x11-misc/xtoolwait
parentCleanup old versions (diff)
downloadgentoo-2-bdaab553ba7f4ba4dd7f5ad095f8d58970171399.tar.gz
gentoo-2-bdaab553ba7f4ba4dd7f5ad095f8d58970171399.tar.bz2
gentoo-2-bdaab553ba7f4ba4dd7f5ad095f8d58970171399.zip
Missing x11-misc/imake DEPEND for xmkmf command as used by src_prepare(). Change HOMEPAGE and SRC_URI wrt #415835 by "df".
(Portage version: 2.2.0_alpha104/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xtoolwait')
-rw-r--r--x11-misc/xtoolwait/ChangeLog6
-rw-r--r--x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild39
2 files changed, 23 insertions, 22 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/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
}