diff options
| author |   Seemant Kulleen <seemant@gentoo.org> | 2003-02-23 22:32:16 +0000 |
|---|---|---|
| committer | Seemant Kulleen <seemant@gentoo.org> | 2003-02-23 22:32:16 +0000 |
| commit | 705b04bf31a54886b74414e4aac6887e93d434e5 (patch) | |
| tree | 4cf10491df399eeba80f6dd788d81bfbbf307246 /app-admin | |
| parent | cause of Openssl revision bumped. (diff) | |
| download | gentoo-2-705b04bf31a54886b74414e4aac6887e93d434e5.tar.gz gentoo-2-705b04bf31a54886b74414e4aac6887e93d434e5.tar.bz2 gentoo-2-705b04bf31a54886b74414e4aac6887e93d434e5.zip | |
fix non-gtk install
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/gkrellm/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/gkrellm/gkrellm-2.1.7a.ebuild | 48 |
2 files changed, 27 insertions, 26 deletions
diff --git a/app-admin/gkrellm/ChangeLog b/app-admin/gkrellm/ChangeLog index 77e6a1ac8b13..19f434da5461 100644 --- a/app-admin/gkrellm/ChangeLog +++ b/app-admin/gkrellm/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for app-admin/gkrellm # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.34 2003/02/22 08:56:11 gerk Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/ChangeLog,v 1.35 2003/02/23 22:32:16 seemant Exp $ *gkrellm-2.1.7a (17 Feb 2003) + 23 Feb 2003; Seemant Kulleen <seemant@gentoo.org> gkrellm-2.1.7a.ebuild : + fixed non-gtk installs closes bug #16051 by Richard M. Ferko <rmferko@columbus.rr.com> + 19 Feb 2003; Martin Holzer <mholzer@gentoo.org> gkrellm-2.1.7a.ebuild : Marked as stable. diff --git a/app-admin/gkrellm/gkrellm-2.1.7a.ebuild b/app-admin/gkrellm/gkrellm-2.1.7a.ebuild index 39934290a56b..e6a3719489aa 100644 --- a/app-admin/gkrellm/gkrellm-2.1.7a.ebuild +++ b/app-admin/gkrellm/gkrellm-2.1.7a.ebuild @@ -1,8 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.7a.ebuild,v 1.4 2003/02/19 21:46:08 mholzer Exp $ - -IUSE="gtk gtk2 nls" +# $Header: /var/cvsroot/gentoo-x86/app-admin/gkrellm/gkrellm-2.1.7a.ebuild,v 1.5 2003/02/23 22:32:16 seemant Exp $ DESCRIPTION="Single process stack of various system monitors" SRC_URI="http://web.wt.net/~billw/${PN}/${P}.tar.bz2" @@ -10,16 +8,18 @@ HOMEPAGE="http://www.gkrellm.net/" SLOT="2" LICENSE="GPL-2" -KEYWORDS="x86 ~ppc ~alpha ~sparc" +KEYWORDS="x86 ppc alpha ~sparc" +IUSE="gtk gtk2 nls" -DEPEND=">=sys-apps/sed-4.0.5 - gtk? ( >=x11-libs/gtk+-2.0.5 ) +DEPEND="gtk? ( >=x11-libs/gtk+-2.0.5 ) gtk2? ( >=x11-libs/gtk+-2.0.5 )" RDEPEND="nls? ( sys-devel/gettext )" src_compile() { - - use nls || sed -i "s:enable_nls=1:enable_nls=0:" Makefile + if [ ! "`use nls`" ]; then + cp Makefile Makefile.orig + sed -e "s:enable_nls=1:enable_nls=0:" Makefile.orig > Makefile + fi if use gtk2 || use gtk then @@ -33,38 +33,36 @@ src_compile() { src_install() { dodir /usr/{bin,include,share/man} - make \ - INSTALLDIR=${D}/usr/bin \ - SINSTALLDIR=${D}/usr/bin \ - MANDIR=${D}/usr/share/man/man1 \ - SMANDIR=${D}/usr/share/man/man1 \ - INCLUDEDIR=${D}/usr/include \ - LOCALEDIR=${D}/usr/share/locale \ - install || die - - rm -f ${D}/usr/share/man/man1/* - doman *.1 - if use gtk2 || use gtk then keepdir /usr/share/gkrellm2/themes keepdir /usr/lib/gkrellm2/plugins + + make install \ + INSTALLDIR=${D}/usr/bin \ + MANDIR=${D}/usr/share/man/man1 \ + INCLUDEDIR=${D}/usr/include \ + LOCALEDIR=${D}/usr/share/locale + cd ${S} mv gkrellm.1 gkrellm2.1 + mv src/gkrellm src/gkrellm2 + dobin src/gkrellm2 rm -f ${D}/usr/bin/gkrellm - exeinto /usr/bin - newexe src/gkrellm gkrellm2 else + cd ${S}/server + dobin gkrellmd cd ${S} rm gkrellm.1 fi - # The GKrellM daemon - into /usr -# dobin server/gkrellmd + rm -f ${D}/usr/share/man/man1/* + doman *.1 + exeinto /etc/init.d doexe ${FILESDIR}/gkrellmd + insinto /etc doins server/gkrellmd.conf |