Use make install DESTDIR.

6 files changed, 18 insertions, 38 deletions

diff --git a/app-admin/gpsui/ChangeLog b/app-admin/gpsui/ChangeLog
index 97e4626f918b..df7e02f25145 100644
--- a/app-admin/gpsui/ChangeLog
+++ b/app-admin/gpsui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/gpsui
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gpsui/ChangeLog,v 1.6 2004/11/03 19:21:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gpsui/ChangeLog,v 1.7 2004/11/17 16:21:45 vapier Exp $
+
+  17 Nov 2004; Mike Frysinger <vapier@gentoo.org> gpsui-2.2.ebuild:
+  Use make install DESTDIR.
 
   03 Nov 2004; Markus Rothe <corsair@gentoo.org> gpsui-2.2.ebuild:
   Marked ~ppc64; bug #69837
diff --git a/app-admin/gpsui/gpsui-2.2.ebuild b/app-admin/gpsui/gpsui-2.2.ebuild
index deedd1916d65..b2fb805b48da 100644
--- a/app-admin/gpsui/gpsui-2.2.ebuild
+++ b/app-admin/gpsui/gpsui-2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gpsui/gpsui-2.2.ebuild,v 1.12 2004/11/03 19:21:23 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gpsui/gpsui-2.2.ebuild,v 1.13 2004/11/17 16:21:45 vapier Exp $
 
 DESCRIPTION="GUI program for managing running processes"
 HOMEPAGE="http://gpsui.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/gpsui/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~ppc64"
+KEYWORDS="ppc ~ppc64 x86"
 IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
@@ -18,11 +18,11 @@ DEPEND="=x11-libs/gtk+-1.2*
 S="${WORKDIR}/${PN}"
 
 src_compile() {
-	econf `use_enable nls` || die "econf failed"
+	econf $(use_enable nls) || die "econf failed"
 	emake || die "Compilation failed"
 }
 
 src_install() {
-	einstall || die
+	make install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog README
 }
diff --git a/app-admin/gtkdiskfree/ChangeLog b/app-admin/gtkdiskfree/ChangeLog
index d3ea2efb95a9..162dfa10f100 100644
--- a/app-admin/gtkdiskfree/ChangeLog
+++ b/app-admin/gtkdiskfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/gtkdiskfree
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v 1.9 2004/11/03 19:24:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/ChangeLog,v 1.10 2004/11/17 16:23:37 vapier Exp $
+
+  17 Nov 2004; Mike Frysinger <vapier@gentoo.org> gtkdiskfree-1.8.4.ebuild,
+  -gtkdiskfree-1.9.3.ebuild:
+  Use make install DESTDIR.
 
   03 Nov 2004; Markus Rothe <corsair@gentoo.org> gtkdiskfree-1.9.3.ebuild:
   Marked ~ppc64; bug #69838
diff --git a/app-admin/gtkdiskfree/files/digest-gtkdiskfree-1.9.3 b/app-admin/gtkdiskfree/files/digest-gtkdiskfree-1.9.3
deleted file mode 100644
index 64f070a4addc..000000000000
--- a/app-admin/gtkdiskfree/files/digest-gtkdiskfree-1.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66dea9f2cb3bf83e6b45702900a97a03 gtkdiskfree-1.9.3.tar.gz 255448
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild
index 052bcc5067cc..74c07c378531 100644
--- a/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild,v 1.10 2004/10/05 02:58:10 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.8.4.ebuild,v 1.11 2004/11/17 16:23:37 vapier Exp $
 
 DESCRIPTION="shows free space on your mounted filesystems"
 HOMEPAGE="http://gtkdiskfree.tuxfamily.org/"
 SRC_URI="http://gtkdiskfree.tuxfamily.org/src_tgz/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
+SLOT="0"
+KEYWORDS="ppc x86"
 IUSE="nls"
 
 DEPEND="=x11-libs/gtk+-1.2*
@@ -16,11 +16,11 @@ DEPEND="=x11-libs/gtk+-1.2*
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	econf `use_enable nls` || die
+	econf $(use_enable nls) || die
 	emake all || die "emake failed"
 }
 
 src_install() {
-	einstall DESTDIR=${D} || die
+	make install DESTDIR=${D} || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-1.9.3.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-1.9.3.ebuild
deleted file mode 100644
index ba14c77f9cab..000000000000
--- a/app-admin/gtkdiskfree/gtkdiskfree-1.9.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gtkdiskfree/gtkdiskfree-1.9.3.ebuild,v 1.7 2004/11/03 19:24:27 corsair Exp $
-
-DESCRIPTION="Graphical tool to show free disk space"
-HOMEPAGE="http://gtkdiskfree.tuxfamily.org/"
-SRC_URI="http://gtkdiskfree.tuxfamily.org/src_tgz/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~ppc64"
-IUSE="nls"
-
-DEPEND=">=x11-libs/gtk+-2
-	>=dev-libs/glib-2
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	econf `use_enable nls` || die
-	emake all || die "emake failed"
-}
-
-src_install() {
-	einstall DESTDIR=${D} || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}