Use make install DESTDIR.

5 files changed, 26 insertions, 61 deletions

diff --git a/app-admin/newsyslog/ChangeLog b/app-admin/newsyslog/ChangeLog
index 68635de3e3a8..19f6a592a0f6 100644
--- a/app-admin/newsyslog/ChangeLog
+++ b/app-admin/newsyslog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/newsyslog
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/newsyslog/ChangeLog,v 1.14 2004/11/03 16:30:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/newsyslog/ChangeLog,v 1.15 2004/11/17 16:29:57 vapier Exp $
+
+  17 Nov 2004; Mike Frysinger <vapier@gentoo.org> -newsyslog-1.0.103.ebuild,
+  newsyslog-1.1.ebuild:
+  Use make install DESTDIR.
 
   03 Nov 2004; Markus Rothe <corsair@gentoo.org> newsyslog-1.1.ebuild:
   Marked ~ppc64; bug #69502
diff --git a/app-admin/newsyslog/Manifest b/app-admin/newsyslog/Manifest
index e6b7df8b496e..e5b2991216be 100644
--- a/app-admin/newsyslog/Manifest
+++ b/app-admin/newsyslog/Manifest
@@ -1,7 +1,15 @@
-MD5 946abb3c768ea7bf56765bd1c376fbf8 ChangeLog 1736
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ad19e50db28a17b9eec9beb625941ee0 ChangeLog 1865
+MD5 b566704319376891e05e51876b4977c6 newsyslog-1.1.ebuild 1158
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 629cda7e96dc9fba91960d3bcda616c6 newsyslog-1.0.103.ebuild 1131
-MD5 f888adf63a00ac2883013509e2fc5332 newsyslog-1.1.ebuild 1133
-MD5 481746f23b0ca7fd8a696c0f7197e611 files/digest-newsyslog-1.0.103 69
 MD5 ebd330386233c527897b821b2a2c524c files/digest-newsyslog-1.1 65
 MD5 3ead41144e79173c79f70ac7f83d4c39 files/newsyslog-html.patch 589
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBm3zcHTu7gpaalycRAgM5AKDvnXn+l9RaZ4tdEpwLDUt0O/kwEwCgiADj
+O+MswmHBFFyCGdAJB0dZb3w=
+=s+qM
+-----END PGP SIGNATURE-----
diff --git a/app-admin/newsyslog/files/digest-newsyslog-1.0.103 b/app-admin/newsyslog/files/digest-newsyslog-1.0.103
deleted file mode 100644
index cd3a7d5df351..000000000000
--- a/app-admin/newsyslog/files/digest-newsyslog-1.0.103
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b86f1f1228960fed4e6631b1d9739cec newsyslog-1.0.103.tar.gz 142759
diff --git a/app-admin/newsyslog/newsyslog-1.0.103.ebuild b/app-admin/newsyslog/newsyslog-1.0.103.ebuild
deleted file mode 100644
index e38670eee1a7..000000000000
--- a/app-admin/newsyslog/newsyslog-1.0.103.ebuild
+++ /dev/null
@@ -1,47 +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/newsyslog/newsyslog-1.0.103.ebuild,v 1.18 2004/10/05 02:58:11 pvdabeel Exp $
-
-inherit eutils
-
-DESCRIPTION="An enhanced version of newsyslog originally written by Theodore Ts'o"
-HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
-SRC_URI="ftp://ftp.weird.com/pub/local/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~mips ~alpha hppa"
-IUSE=""
-
-DEPEND="sys-apps/groff"
-RDEPEND="virtual/cron
-	app-arch/gzip"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/newsyslog-html.patch
-}
-
-src_compile() {
-	myconf="--with-syslogd_pid=/var/run/syslog.pid"
-
-	has_version 'app-admin/syslog-ng' \
-	    && myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
-
-	econf \
-	    --with-gzip \
-	    --with-newsyslog_conf=/etc/newsyslog.conf \
-	    ${myconf} || die "econf failed"
-
-	emake || die
-}
-
-src_install() {
-	einstall catmandir=${D}/usr/share/man
-
-	rm -rf ${D}/usr/share/man/cat?
-
-	dodoc newsyslog.conf AUTHORS ChangeLog INSTALL NEWS README.* ToDo
-	prepalldocs
-}
diff --git a/app-admin/newsyslog/newsyslog-1.1.ebuild b/app-admin/newsyslog/newsyslog-1.1.ebuild
index e9680822188e..69061bf92973 100644
--- a/app-admin/newsyslog/newsyslog-1.1.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1.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/newsyslog/newsyslog-1.1.ebuild,v 1.13 2004/11/03 16:30:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/newsyslog/newsyslog-1.1.ebuild,v 1.14 2004/11/17 16:29:57 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.weird.com/pub/local/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~mips alpha hppa ~ppc64"
+KEYWORDS="alpha hppa ~mips ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="sys-apps/groff"
@@ -18,12 +18,13 @@ RDEPEND="virtual/cron
 	app-arch/gzip"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/newsyslog-html.patch
 }
 
 src_compile() {
-	myconf="--with-syslogd_pid=/var/run/syslog.pid"
+	local myconf="--with-syslogd_pid=/var/run/syslog.pid"
 
 	has_version 'app-admin/syslog-ng' \
 	    && myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
@@ -37,10 +38,10 @@ src_compile() {
 }
 
 src_install() {
-	einstall catmandir=${D}/usr/share/man
-
-	rm -rf ${D}/usr/share/man/cat?
-
+	make \
+		DESTDIR="${D}" \
+		catmandir=${D}/usr/share/man \
+		install || die "install failed"
 	dodoc newsyslog.conf AUTHORS ChangeLog INSTALL NEWS README.* ToDo
 	prepalldocs
 }